author | wenzelm |
Sun, 19 Jun 2011 21:34:55 +0200 | |
changeset 43460 | 2852f309174a |
parent 43446 | src/Tools/jEdit/patches/scriptstyles@9064e1a72c5d |
child 43482 | ebb90ff55b79 |
permissions | -rw-r--r-- |
43460 | 1 |
diff -ru jEdit/org/gjt/sp/jedit/Buffer.java jEdit-patched/org/gjt/sp/jedit/Buffer.java |
2 |
--- jEdit/org/gjt/sp/jedit/Buffer.java 2010-05-09 14:29:25.000000000 +0200 |
|
3 |
+++ jEdit-patched/org/gjt/sp/jedit/Buffer.java 2011-06-18 18:28:19.000000000 +0200 |
|
4 |
@@ -2232,7 +2232,7 @@ |
|
43446
9064e1a72c5d
Buffer.editSyntaxStyle: mask extended syntax styles;
wenzelm
parents:
43394
diff
changeset
|
5 |
start = next; |
9064e1a72c5d
Buffer.editSyntaxStyle: mask extended syntax styles;
wenzelm
parents:
43394
diff
changeset
|
6 |
token = token.next; |
9064e1a72c5d
Buffer.editSyntaxStyle: mask extended syntax styles;
wenzelm
parents:
43394
diff
changeset
|
7 |
} |
9064e1a72c5d
Buffer.editSyntaxStyle: mask extended syntax styles;
wenzelm
parents:
43394
diff
changeset
|
8 |
- if (token.id == Token.END || token.id == Token.NULL) |
9064e1a72c5d
Buffer.editSyntaxStyle: mask extended syntax styles;
wenzelm
parents:
43394
diff
changeset
|
9 |
+ if (token.id == Token.END || (token.id % Token.ID_COUNT) == Token.NULL) |
9064e1a72c5d
Buffer.editSyntaxStyle: mask extended syntax styles;
wenzelm
parents:
43394
diff
changeset
|
10 |
{ |
9064e1a72c5d
Buffer.editSyntaxStyle: mask extended syntax styles;
wenzelm
parents:
43394
diff
changeset
|
11 |
JOptionPane.showMessageDialog(jEdit.getActiveView(), |
9064e1a72c5d
Buffer.editSyntaxStyle: mask extended syntax styles;
wenzelm
parents:
43394
diff
changeset
|
12 |
jEdit.getProperty("syntax-style-no-token.message"), |
43460 | 13 |
diff -ru jEdit/org/gjt/sp/jedit/syntax/Token.java jEdit-patched/org/gjt/sp/jedit/syntax/Token.java |
14 |
--- jEdit/org/gjt/sp/jedit/syntax/Token.java 2010-05-09 14:29:24.000000000 +0200 |
|
15 |
+++ jEdit-patched/org/gjt/sp/jedit/syntax/Token.java 2011-06-18 18:28:10.000000000 +0200 |
|
16 |
@@ -57,7 +57,7 @@ |
|
43394 | 17 |
*/ |
18 |
public static String tokenToString(byte token) |
|
19 |
{ |
|
20 |
- return (token == Token.END) ? "END" : TOKEN_TYPES[token]; |
|
21 |
+ return (token == Token.END) ? "END" : TOKEN_TYPES[token % ID_COUNT]; |
|
22 |
} //}}} |
|
23 |
||
24 |
//{{{ Token types |
|
43460 | 25 |
diff -ru jEdit/org/gjt/sp/util/SyntaxUtilities.java jEdit-patched/org/gjt/sp/util/SyntaxUtilities.java |
26 |
--- jEdit/org/gjt/sp/util/SyntaxUtilities.java 2010-05-09 14:29:29.000000000 +0200 |
|
27 |
+++ jEdit-patched/org/gjt/sp/util/SyntaxUtilities.java 2011-06-19 21:24:41.000000000 +0200 |
|
28 |
@@ -26,6 +26,7 @@ |
|
43394 | 29 |
//{{{ Imports |
30 |
import java.awt.Color; |
|
31 |
import java.awt.Font; |
|
32 |
+import java.awt.font.TextAttribute; |
|
33 |
import java.util.Locale; |
|
34 |
import java.util.StringTokenizer; |
|
35 |
import org.gjt.sp.jedit.syntax.SyntaxStyle; |
|
43460 | 36 |
@@ -194,6 +195,22 @@ |
43394 | 37 |
} |
38 |
||
39 |
/** |
|
40 |
+ * Style with sub/superscript font attribute. |
|
41 |
+ */ |
|
42 |
+ public static SyntaxStyle scriptStyle(SyntaxStyle style, int script) |
|
43 |
+ { |
|
44 |
+ java.util.Map attributes = new java.util.HashMap(); |
|
45 |
+ attributes.put(TextAttribute.SUPERSCRIPT, new Integer(script)); |
|
46 |
+ return new SyntaxStyle(style.getForegroundColor(), style.getBackgroundColor(), |
|
47 |
+ style.getFont().deriveFont(attributes)); |
|
48 |
+ } |
|
43460 | 49 |
+ |
50 |
+ public static SyntaxStyle boldStyle(SyntaxStyle style) { |
|
51 |
+ return new SyntaxStyle(style.getForegroundColor(), style.getBackgroundColor(), |
|
52 |
+ style.getFont().deriveFont(Font.BOLD)); |
|
53 |
+ } |
|
43394 | 54 |
+ |
55 |
+ /** |
|
56 |
* Loads the syntax styles from the properties, giving them the specified |
|
57 |
* base font family and size. |
|
58 |
* @param family The font family |
|
43460 | 59 |
@@ -203,10 +220,10 @@ |
43394 | 60 |
*/ |
61 |
public static SyntaxStyle[] loadStyles(String family, int size, boolean color) |
|
62 |
{ |
|
63 |
- SyntaxStyle[] styles = new SyntaxStyle[Token.ID_COUNT]; |
|
43460 | 64 |
+ SyntaxStyle[] styles = new SyntaxStyle[4 * Token.ID_COUNT + 1]; |
43394 | 65 |
|
66 |
// start at 1 not 0 to skip Token.NULL |
|
67 |
- for(int i = 1; i < styles.length; i++) |
|
68 |
+ for(int i = 1; i < Token.ID_COUNT; i++) |
|
69 |
{ |
|
70 |
try |
|
71 |
{ |
|
43460 | 72 |
@@ -223,6 +240,17 @@ |
43394 | 73 |
} |
74 |
} |
|
75 |
||
76 |
+ styles[0] = new SyntaxStyle(Color.black, null, new Font(family, 0, size)); |
|
77 |
+ for(int i = 0; i < Token.ID_COUNT; i++) |
|
78 |
+ { |
|
79 |
+ styles[i + Token.ID_COUNT] = scriptStyle(styles[i], -1); |
|
80 |
+ styles[i + 2 * Token.ID_COUNT] = scriptStyle(styles[i], 1); |
|
43460 | 81 |
+ styles[i + 3 * Token.ID_COUNT] = boldStyle(styles[i]); |
43394 | 82 |
+ } |
83 |
+ styles[0] = null; |
|
43460 | 84 |
+ styles[4 * Token.ID_COUNT] = |
85 |
+ new SyntaxStyle(Color.white, null, new Font(family, 0, 1)); |
|
43394 | 86 |
+ |
87 |
return styles; |
|
88 |
} //}}} |
|
89 |