@@ -82,6 +82,9 @@ editor.brackethighlight.color = #006699
 
 # TEXT - syntax highlighting
 
+editor.function1.style = #627516,plain
+editor.function2.style = #627516,bold
+
 # e.g abstract, final, private
 editor.keyword1.style = #627516,plain
 # e.g. beginShape, point, line
 
@@ -76,7 +76,7 @@ public byte lookup(Segment text, int offset, int length, boolean paren) {
 //        continue;
 //      }
       if (length == k.keyword.length) {
-        if (SyntaxUtilities.regionMatches(ignoreCase,text,offset, k.keyword)) {
+        if (SyntaxUtilities.regionMatches(ignoreCase, text, offset, k.keyword)) {
           return k.id;
         }
       }
 
@@ -48,14 +48,17 @@ public void addColoring(String keyword, String coloring) {
     if (keywordColoring == null) {
       keywordColoring = new KeywordMap(false);
     }
-    // text will be KEYWORD or LITERAL
-    boolean isKey = (coloring.charAt(0) == 'K');
     // KEYWORD1 -> 0, KEYWORD2 -> 1, etc
     int num = coloring.charAt(coloring.length() - 1) - '1';
-    byte id = (byte) ((isKey ? Token.KEYWORD1 : Token.LITERAL1) + num);
-    // Making an assumption (..., you, me) that KEYWORD2 and KEYWORD3 
-    // are the functions (at least that's what we're doing in P5 right now)
-    keywordColoring.add(keyword, id, id == Token.KEYWORD2 || id == Token.KEYWORD3);
+//    byte id = (byte) ((isKey ? Token.KEYWORD1 : Token.LITERAL1) + num);
+    int id = 0;
+    boolean paren = false;
+    switch (coloring.charAt(0)) {
+      case 'K': id = Token.KEYWORD1 + num; break;
+      case 'L': id = Token.LITERAL1 + num; break; 
+      case 'F': id = Token.FUNCTION1 + num; paren = true; break;
+    }
+    keywordColoring.add(keyword, (byte) id, paren);
   }
 
 
 
@@ -212,6 +212,12 @@ public PdeTextAreaDefaults(Mode theme) {
     // byte, char, short, color
     styles[Token.KEYWORD3] = theme.getStyle("keyword3");
 
+    // beginShape, point, line
+    styles[Token.FUNCTION1] = theme.getStyle("function1");
+
+    // byte, char, short, color
+    styles[Token.FUNCTION2] = theme.getStyle("function2");
+
     // constants: null, true, this, RGB, TWO_PI
     styles[Token.LITERAL1] = theme.getStyle("literal1");
 
 
@@ -20,8 +20,8 @@
  * @author Slava Pestov
  * @version $Id$
  */
-public class SyntaxUtilities
-{
+public class SyntaxUtilities {
+  
   /**
    * Checks if a subregion of a <code>Segment</code> is equal to a
    * string.
@@ -31,8 +31,7 @@ public class SyntaxUtilities
    * @param match The string to match
    */
   public static boolean regionMatches(boolean ignoreCase, Segment text,
-                                      int offset, String match)
-  {
+                                      int offset, String match) {
     int length = offset + match.length();
     char[] textArray = text.array;
     if(length > text.offset + text.count)
@@ -62,8 +61,7 @@ public static boolean regionMatches(boolean ignoreCase, Segment text,
    * @param match The character array to match
    */
   public static boolean regionMatches(boolean ignoreCase, Segment text,
-                                      int offset, char[] match)
-  {
+                                      int offset, char[] match) {
     int length = offset + match.length;
     char[] textArray = text.array;
     if(length > text.offset + text.count)
@@ -84,28 +82,29 @@ public static boolean regionMatches(boolean ignoreCase, Segment text,
   }
 
 
-  /**
-   * Returns the default style table. This can be passed to the
-   * <code>setStyles()</code> method of <code>SyntaxDocument</code>
-   * to use the default syntax styles.
-   */
-  public static SyntaxStyle[] getDefaultSyntaxStyles()
-  {
-    SyntaxStyle[] styles = new SyntaxStyle[Token.ID_COUNT];
-
-    styles[Token.COMMENT1] = new SyntaxStyle(Color.black,true,false);
-    styles[Token.COMMENT2] = new SyntaxStyle(new Color(0x990033),true,false);
-    styles[Token.KEYWORD1] = new SyntaxStyle(Color.black,false,true);
-    styles[Token.KEYWORD2] = new SyntaxStyle(Color.magenta,false,false);
-    styles[Token.KEYWORD3] = new SyntaxStyle(new Color(0x009600),false,false);
-    styles[Token.LITERAL1] = new SyntaxStyle(new Color(0x650099),false,false);
-    styles[Token.LITERAL2] = new SyntaxStyle(new Color(0x650099),false,true);
-    styles[Token.LABEL] = new SyntaxStyle(new Color(0x990033),false,true);
-    styles[Token.OPERATOR] = new SyntaxStyle(Color.black,false,true);
-    styles[Token.INVALID] = new SyntaxStyle(Color.red,false,true);
-
-    return styles;
-  }
+//  /**
+//   * Returns the default style table. This can be passed to the
+//   * <code>setStyles()</code> method of <code>SyntaxDocument</code>
+//   * to use the default syntax styles.
+//   */
+//  public static SyntaxStyle[] getDefaultSyntaxStyles() {
+//    SyntaxStyle[] styles = new SyntaxStyle[Token.ID_COUNT];
+//
+//    styles[Token.COMMENT1] = new SyntaxStyle(Color.black,true,false);
+//    styles[Token.COMMENT2] = new SyntaxStyle(new Color(0x990033),true,false);
+//    styles[Token.KEYWORD1] = new SyntaxStyle(Color.black,false,true);
+//    styles[Token.KEYWORD2] = new SyntaxStyle(Color.magenta,false,false);
+//    styles[Token.KEYWORD3] = new SyntaxStyle(new Color(0x009600),false,false);
+//    styles[Token.FUNCTION1] = new SyntaxStyle(Color.magenta,false,false);
+//    styles[Token.FUNCTION2] = new SyntaxStyle(new Color(0x009600),false,false);
+//    styles[Token.LITERAL1] = new SyntaxStyle(new Color(0x650099),false,false);
+//    styles[Token.LITERAL2] = new SyntaxStyle(new Color(0x650099),false,true);
+//    styles[Token.LABEL] = new SyntaxStyle(new Color(0x990033),false,true);
+//    styles[Token.OPERATOR] = new SyntaxStyle(Color.black,false,true);
+//    styles[Token.INVALID] = new SyntaxStyle(Color.red,false,true);
+//
+//    return styles;
+//  }
 
 
   /**
 
@@ -76,9 +76,9 @@ public class Token
          */
         public static final byte KEYWORD3 = 8;
 
-        public static final byte KEYWORD4 = 9;
+        public static final byte FUNCTION1 = 9;
 
-        public static final byte KEYWORD5 = 10;
+        public static final byte FUNCTION2 = 10;
 
         /**
          * Operator token id. This can be used to mark an
 
@@ -88,8 +88,8 @@ PROCESSING 2.0b7 (REV 0215) - 25 November 2012
 + mousePressed() coloring now different from mousePressed
   http://code.google.com/p/processing/issues/detail?id=41
   Still not necessarily perfect, but it's a big improvement.
-  Note for people implementing their own Modes: KEYWORD2 and 
-  KEYWORD3 are now reserved for functions with parens.
+  Note for people implementing their own Modes: FUNCTION1 and 
+  FUNCTION2 have now been added for functions with parens.
 
 + Fix ugly results from resize() command on PImage:
   http://code.google.com/p/processing/issues/detail?id=332
@@ -102,7 +102,7 @@ PROCESSING 2.0b7 (REV 0215) - 25 November 2012
 + image(pgraphics, x, y, w, h) was only drawing once when shrinking.
   http://code.google.com/p/processing/issues/detail?id=1382
 
-+ beginShape(QUAD) was not working with Java2D
++ beginShape(QUAD) was not working with Java2D.
   http://code.google.com/p/processing/issues/detail?id=1365
 
 + Relative coordinates not updated properly on closepath with SVG files.
@@ -179,6 +179,12 @@ PROCESSING 2.0b7 (REV 0215) - 25 November 2012
 + Resizeable frame crashes sketch with AMD video card.
   http://code.google.com/p/processing/issues/detail?id=1175
 
++ set(x, y, PImage) doesn't work with P2D/P3D.
+  http://code.google.com/p/processing/issues/detail?id=1185
+
++ begin/endShape with a single vertex causing crash on P2D/P3D.
+  http://code.google.com/p/processing/issues/detail?id=1421
+
 [ android ] 
 
 + Like the desktop release, removed default imports. This includes:
 
@@ -74,6 +74,10 @@ A ortho() displays strange line widths
 A   http://code.google.com/p/processing/issues/detail?id=1285
 A resizeable frame crashes sketch with AMD video card
 A   http://code.google.com/p/processing/issues/detail?id=1175
+A set(x, y, PImage) doesn't work with P2D/P3D
+A   http://code.google.com/p/processing/issues/detail?id=1185
+A Processing 2.0b6 p2d / p3d arraylist pvector display issues
+A   http://code.google.com/p/processing/issues/detail?id=1421
 
 _ implement mousePressed(Event) etc
 _   better to do this instead of bringing back the magic event
Original file line number	Diff line number	Diff line change
@@ -76,7 +76,7 @@ public byte lookup(Segment text, int offset, int length, boolean paren) {
76	76	// continue;
77	77	// }
78	78	if (length == k.keyword.length) {
79		- if (SyntaxUtilities.regionMatches(ignoreCase,text,offset, k.keyword)) {
	79	+ if (SyntaxUtilities.regionMatches(ignoreCase, text, offset, k.keyword)) {
80	80	return k.id;
81	81	}
82	82	}