Changeset 601

Timestamp:

01/31/10 14:47:12 (3 years ago)

Author:

stefan

Message:

added syntax highlighting for gobal.properties

Location:

trunk

Files:

• data/gproperties/styles/user.xml (modified) (1 diff)
• src/jlatexeditor/gproperties/GPropertiesSyntaxHighlighting.java (copied) (copied from trunk/src/jlatexeditor/syntaxhighlighting/LatexSyntaxHighlighting.java) (8 diffs)
• src/jlatexeditor/JLatexEditorJFrame.java (modified) (2 diffs)

trunk/data/gproperties/styles/user.xml

@@ -19 +19 @@
 
   <element name="number" style="plain">
-    <foreground><color r="0" g="0" b="0"/></foreground>
+    <foreground><color r="0" g="128" b="0"/></foreground>
   </element>
 

trunk/src/jlatexeditor/gproperties/GPropertiesSyntaxHighlighting.java

@@ -4 +4 @@
  */
 
-package jlatexeditor.syntaxhighlighting;
-
+package jlatexeditor.gproperties;
+
+import jlatexeditor.syntaxhighlighting.LatexStyles;
+import jlatexeditor.syntaxhighlighting.StyleableTerm;
 import jlatexeditor.syntaxhighlighting.states.MathMode;
 import jlatexeditor.syntaxhighlighting.states.RootState;
@@ -18 +20 @@
 import java.util.regex.Pattern;
 
-public class LatexSyntaxHighlighting extends SyntaxHighlighting implements SCEDocumentListener{
+public class GPropertiesSyntaxHighlighting extends SyntaxHighlighting implements SCEDocumentListener{
   private static final Pattern TERM_PATTERN = Pattern.compile("(\\\\?[\\w_\\-\\^]+)");
   private static final Pattern BAD_TERM_CHARS = Pattern.compile("[\\\\\\d_\\-\\^]");
@@ -30 +32 @@
   private boolean currentlyChanging = false;
 
-  private static Aspell aspell;
-  static {
-    try {
-      aspell = Aspell.getInstance();
-    } catch (IOException e) {
-      e.printStackTrace();
-    }
-  }
-
-  public LatexSyntaxHighlighting(SCEPane pane){
+  public GPropertiesSyntaxHighlighting(SCEPane pane){
     this.pane = pane;
     document = pane.getDocument();
@@ -129 +122 @@
   private void parseRow(int row_nr, int rowsCount, SCEDocumentRow rows[]){
     boolean ready = false;
-    LatexStyles.CommandStyle lastCommandStyle = null;
 
     while(!ready && row_nr < rowsCount){
@@ -144 +136 @@
 
       // parse the row
+      boolean parsingKey = true;
       SCEDocumentChar chars[] = row.chars;
       for(int char_nr = 0; char_nr < row.length; char_nr++){
@@ -151 +144 @@
         byte[] stateStyles = state.getStyles();
 
-        // search for a backslash '\'
-        if(c == '\\'){
-          String command = getCommandString(row, char_nr + 1);
-
-          if(command == null){
-            byte styleText = stateStyles[LatexStyles.TEXT];
-            // if there is no command -> '\' escapes the next character -> set style text
-            if(char_nr < row.length - 1){
-              sce_char.style = styleText;
-              chars[char_nr + 1].style = styleText;
-              char_nr += 1;
-            }else{
-              sce_char.style = stateStyles[LatexStyles.ERROR];
-            }
-            lastCommandStyle = null;
-          }else{
-            lastCommandStyle = LatexStyles.getCommandStyle(command);
-            // highlight the command
-            byte commandStyle = stateStyles[lastCommandStyle.commandStyle];
-            for(int i = 0; i <= command.length(); i++){
-              chars[char_nr + i].style = commandStyle;
-            }
-            char_nr += command.length();
-          }
-
-          continue;
-        }
-
-        // search for '$' and "$$"
-        if(c == '$'){
-          sce_char.style = stateStyles[LatexStyles.MATH];
-
-          boolean doubleMath = chars[char_nr + 1].character == '$';
-          if (doubleMath) {
-            char_nr++;
-            chars[char_nr].style = stateStyles[LatexStyles.MATH];
-          }
-
-          // if active math mode -> close; otherwise open
-          if (state instanceof MathMode) {
-            stateStack.pop();
-            state = stateStack.peek();
-          } else {
-            stateStack.push(state = new MathMode(doubleMath));
-          }
-
-          continue;
-        }
+        // search for '#' (comment)
+        if(c == '#'){
+          byte commentStyle = stateStyles[LatexStyles.COMMENT];
+          while(char_nr < row.length) chars[char_nr++].style = commentStyle;
+          continue;
+        }
+
+        if (parsingKey) {
+          // search for a backslash '\'
+          if(c == '='){
+            sce_char.style = stateStyles[GPropertiesStyles.TEXT];
+            parsingKey = false;
+            continue;
+          } else {
+            sce_char.style = stateStyles[GPropertiesStyles.KEY];
+            continue;
+          }
+        }
 
         // search for '{' and '}'
         if(c == '{'){
-          sce_char.style = stateStyles[LatexStyles.BRACKET];
+          sce_char.style = stateStyles[GPropertiesStyles.BRACKET];
           continue;
         }
         if(c == '}'){
-          sce_char.style = stateStyles[LatexStyles.BRACKET];
-          continue;
-        }
-
-        // search for '%' (comment)
-        if(c == '%'){
-          byte commentStyle = stateStyles[LatexStyles.COMMENT];
-          while(char_nr < row.length) chars[char_nr++].style = commentStyle;
+          sce_char.style = stateStyles[GPropertiesStyles.BRACKET];
           continue;
         }
@@ -219 +175 @@
         // default style is text or number
         if(c >= '0' && c <= '9'){
-          sce_char.style = stateStyles[LatexStyles.NUMBER];
+          sce_char.style = stateStyles[GPropertiesStyles.NUMBER];
         }else{
-          sce_char.style = stateStyles[LatexStyles.TEXT];
-        }
-      }
-
-      // extract word from row that shell be checked for misspellings
-      String rowString = document.getRow(row_nr);
-
-      // for each term in this row
-      Matcher matcher = TERM_PATTERN.matcher(rowString);
-      while(matcher.find()) {
-        // check if it's not a tex command and does not contain formula specific characters ("_" and numbers)
-        String termString = matcher.group(1);
-        StyleableTerm term;
-        if (BAD_TERM_CHARS.matcher(termString).find()) {
-          term = new StyleableTerm(termString, chars, matcher.start(1), LatexStyles.U_NORMAL);
-        } else {
-          // spell check
-          try {
-            Aspell.Result aspellResult = aspell.check(termString);
-            term = new StyleableTerm(termString, chars, matcher.start(1), aspellResult.isCorrect() ? LatexStyles.U_NORMAL : LatexStyles.U_MISSPELLED);
-          } catch (IOException e) {
-            term = new StyleableTerm(termString, chars, matcher.start(1), LatexStyles.U_NORMAL);
-            e.printStackTrace();
-          }
-        }
-
-        term.applyStyleToDoc();
-      }
+          sce_char.style = stateStyles[GPropertiesStyles.TEXT];
+        }
+      }
 
       // go to the next row
@@ -264 +195 @@
   }
 
-  /**
-   * Returns the command name found at the given position (after '\').
-   *
-   * @param row the row
-   * @param offset the offset
-   * @return the command string
-   */
-  private String getCommandString(SCEDocumentRow row, int offset){
-    String command = null;
-
-    SCEDocumentChar chars[] = row.chars;
-    int end_offset = offset;
-    for(; end_offset < row.length; end_offset++){
-      char character = chars[end_offset].character;
-
-      // only letters are allowed
-      if(character >= 'a' && character <= 'z') continue;
-      if(character >= 'A' && character <= 'Z') continue;
-
-      // we found the end of the command
-      break;
-    }
-    // command consists of at least 1 char
-    if (end_offset == offset) end_offset++;
-
-    // did we find a command?
-    if(offset != end_offset){
-      SCEString sceCommand = new SCEString(chars, offset, end_offset - offset);
-      command = sceCommand.toString();
-    }
-
-    return command;
-  }
-
   // SCEDocumentListener methods
   public void documentChanged(SCEDocument sender, SCEDocumentEvent event){

trunk/src/jlatexeditor/JLatexEditorJFrame.java

@@ -11 +11 @@
 import jlatexeditor.errorhighlighting.LatexErrorHighlighting;
 import jlatexeditor.gproperties.GPropertiesStyles;
+import jlatexeditor.gproperties.GPropertiesSyntaxHighlighting;
 import jlatexeditor.gui.AboutDialog;
 import jlatexeditor.gui.LocalHistory;
@@ -438 +439 @@
 
     // syntax highlighting
-//    SyntaxHighlighting syntaxHighlighting = new LatexSyntaxHighlighting(scePane);
-//    syntaxHighlighting.start();
+    GPropertiesSyntaxHighlighting syntaxHighlighting = new GPropertiesSyntaxHighlighting(scePane);
+    syntaxHighlighting.start();
 
     // code completion and quick help