New colors for text editor

REAS · REAS · commit 52a1a9c0fa43 · 2012-11-29T19:06:05.000Z
diff --git a/generate/keywords_base.txt b/generate/keywords_base.txt
@@ -1,7 +1,7 @@
 # KEY 2.0b7+
 
 # LITERAL2 - Constants (QUARTER_PI, CORNERS, etc.)
-# KEYWORD1 - Java datatypes and keywords (void, int, boolean, etc.)
+# KEYWORD1 - Datatypes and keywords (void, int, boolean, etc.)
 # KEYWORD2 - Fields [variables within a class]
 # KEYWORD3 - Processing variables (width, height, focused, etc.)
 # FUNCTION1 - Functions
@@ -339,6 +339,11 @@ addChild	FUNCTION1
 ;		semicolon
 -=		subtractassign
 
+# Suppressed from Generate to avoid conflicts with variables inside methods
+
+width	KEYWORD3	width_
+height	KEYWORD3	height_
+
 
 # THE TEXT ABOVE IS HAND-WRITTEN AND FOUND IN THE FILE "keywords_base.txt"
 # THE TEXT BELOW IS AUTO-GENERATED
diff --git a/generate/keywords_create.cgi b/generate/keywords_create.cgi
@@ -37,9 +37,11 @@ foreach $temp (@tempfiles) {
   if($temp =~ ".xml" && !($temp =~ "~")) {
     get_data("$temp");
     $tempname = strip_name($name);
-    #$namelength = length($tempname);
-    if ($tempname ne "x" && $tempname ne "y" && $tempname ne "z" && $tempname ne "") {
-    #if ($tempname ne "") {
+    
+    # 29 Nov. Because the PDE can't differentiate between variables inside a class
+    # or the main Processing variables, we leave these out of the generated reference
+    if ($tempname ne "x" && $tempname ne "y" && $tempname ne "z" && 
+        $tempname ne "width" && $tempname ne "height" && $tempname ne "") {
       push(@modfiles, strip_name($name) . "\t" . set_category() . "\t" . file_name_convert($temp));
     }
   }
