src/Tools/jEdit/patches/scriptstyles
author wenzelm
Wed, 15 Jun 2011 14:32:35 +0200
changeset 43394 47e60a27a496
parent 43390 7ee98a3802af
child 43446 9064e1a72c5d
permissions -rw-r--r--
more elaborate syntax styles;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
43394
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
     1
diff -ru jEdit/org/gjt/sp/jedit/syntax/Token.java jEdit-patched/org/gjt/sp/jedit/syntax/Token.java
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
     2
--- jEdit/org/gjt/sp/jedit/syntax/Token.java	2010-05-09 14:29:24.000000000 +0200
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
     3
+++ jEdit-patched/org/gjt/sp/jedit/syntax/Token.java	2011-06-15 13:48:42.000000000 +0200
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
     4
@@ -57,7 +57,7 @@
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
     5
 	 */
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
     6
 	public static String tokenToString(byte token)
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
     7
 	{
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
     8
-		return (token == Token.END) ? "END" : TOKEN_TYPES[token];
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
     9
+		return (token == Token.END) ? "END" : TOKEN_TYPES[token % ID_COUNT];
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    10
 	} //}}}
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    11
 
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    12
 	//{{{ Token types
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    13
diff -ru jEdit/org/gjt/sp/util/SyntaxUtilities.java jEdit-patched/org/gjt/sp/util/SyntaxUtilities.java
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    14
--- jEdit/org/gjt/sp/util/SyntaxUtilities.java	2010-05-09 14:29:29.000000000 +0200
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    15
+++ jEdit-patched/org/gjt/sp/util/SyntaxUtilities.java	2011-06-15 14:11:30.000000000 +0200
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    16
@@ -26,6 +26,7 @@
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    17
 //{{{ Imports
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    18
 import java.awt.Color;
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    19
 import java.awt.Font;
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    20
+import java.awt.font.TextAttribute;
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    21
 import java.util.Locale;
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    22
 import java.util.StringTokenizer;
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    23
 import org.gjt.sp.jedit.syntax.SyntaxStyle;
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    24
@@ -194,6 +195,17 @@
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    25
 	}
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    26
 	
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    27
 	/**
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    28
+	 * Style with sub/superscript font attribute.
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    29
+	 */
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    30
+	public static SyntaxStyle scriptStyle(SyntaxStyle style, int script)
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    31
+	{
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    32
+		java.util.Map attributes = new java.util.HashMap();
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    33
+		attributes.put(TextAttribute.SUPERSCRIPT, new Integer(script));
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    34
+		return new SyntaxStyle(style.getForegroundColor(), style.getBackgroundColor(),
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    35
+                  style.getFont().deriveFont(attributes));
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    36
+	}
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    37
+	
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    38
+	/**
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    39
 	 * Loads the syntax styles from the properties, giving them the specified
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    40
 	 * base font family and size.
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    41
 	 * @param family The font family
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    42
@@ -203,10 +215,10 @@
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    43
 	 */
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    44
 	public static SyntaxStyle[] loadStyles(String family, int size, boolean color)
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    45
 	{
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    46
-		SyntaxStyle[] styles = new SyntaxStyle[Token.ID_COUNT];
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    47
+		SyntaxStyle[] styles = new SyntaxStyle[3 * Token.ID_COUNT + 1];
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    48
 
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    49
 		// start at 1 not 0 to skip Token.NULL
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    50
-		for(int i = 1; i < styles.length; i++)
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    51
+		for(int i = 1; i < Token.ID_COUNT; i++)
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    52
 		{
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    53
 			try
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    54
 			{
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    55
@@ -223,6 +235,16 @@
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    56
 			}
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    57
 		}
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    58
 
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    59
+		styles[0] = new SyntaxStyle(Color.black, null, new Font(family, 0, size));
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    60
+		for(int i = 0; i < Token.ID_COUNT; i++)
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    61
+		{
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    62
+			styles[i + Token.ID_COUNT] = scriptStyle(styles[i], -1);
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    63
+			styles[i + 2 * Token.ID_COUNT] = scriptStyle(styles[i], 1);
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    64
+		}
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    65
+		styles[0] = null;
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    66
+		styles[3 * Token.ID_COUNT] =
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    67
+			new SyntaxStyle(Color.black, null, new Font(family, 0, 1));
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    68
+
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    69
 		return styles;
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    70
 	} //}}}
47e60a27a496 more elaborate syntax styles;
wenzelm
parents: 43390
diff changeset
    71