Getting keyword color up and running

REAS · REAS · commit 40978104f99d · 2012-09-04T03:43:15.000Z
diff --git a/generate/keywords_base.txt b/generate/keywords_base.txt
@@ -53,25 +53,32 @@ DIFFERENCE	LITERAL2	blend_
 DIFFUSE	LITERAL2
 DILATE	LITERAL2	filter_
 DIRECTIONAL	LITERAL2
+DISABLE_ACCURATE_2D	LITERAL2
 DISABLE_ACCURATE_TEXTURES	LITERAL2
+DISABLE_DEPTH_MASKS	LITERAL2
 DISABLE_DEPTH_SORT	LITERAL2
 DISABLE_DEPTH_TEST	LITERAL2
 DISABLE_NATIVE_FONTS	LITERAL2
-DISABLE_OPENGL_ERROR_REPORT	LITERAL2
-DISABLE_OPENGL_2X_SMOOTH	LITERAL2
-DISABLE_OPENGL_4X_SMOOTH	LITERAL2
-DISABLE_TEXT_SMOOTH	LITERAL2	
+DISABLE_OPENGL_ERRORS	LITERAL2
+DISABLE_TEXTURE_CACHE LITERAL2
+DISABLE_TEXTURE_MIPMAPS	LITERAL2
+DISABLE_TRANSFORM_CACHE	LITERAL2
+DISABLE_STROKE_PERSPECTIVE	LITERAL2
 DISABLED	LITERAL2
 DODGE	LITERAL2	blend_
 DOWN	LITERAL2	keyCode
 DXF	LITERAL2	size_
+ENABLE_ACCURATE_2D	LITERAL2
 ENABLE_ACCURATE_TEXTURES	LITERAL2
+ENABLE_DEPTH_MASKS	LITERAL2
 ENABLE_DEPTH_SORT	LITERAL2
 ENABLE_DEPTH_TEST	LITERAL2
 ENABLE_NATIVE_FONTS	LITERAL2
-ENABLE_OPENGL_2X_SMOOTH	LITERAL2
-ENABLE_OPENGL_4X_SMOOTH	LITERAL2
-ENABLE_OPENGL_ERROR_REPORT	LITERAL2
+ENABLE_OPENGL_ERRORS	LITERAL2
+ENABLE_TEXTURE_CACHE LITERAL2
+ENABLE_TEXTURE_MIPMAPS	LITERAL2
+ENABLE_TRANSFORM_CACHE	LITERAL2
+ENABLE_STROKE_PERSPECTIVE	LITERAL2
 ENTER	LITERAL2	keyCode
 EPSILON	LITERAL2
 ERODE	LITERAL2	filter_
@@ -279,6 +286,31 @@ substring	KEYWORD3	String_substring_
 toLowerCase	KEYWORD3	String_toLowerCase_
 toUpperCase	KEYWORD3	String_toUpperCase_
 
+# Temporary additions 3 September 2012 as the reference is getting updated
+PShape	KEYWORD1
+createShape	KEYWORD2
+beginContour	KEYWORD2
+endContour	KEYWORD2
+end	KEYWORD2
+addChild	KEYWORD2
+
+PShader	KEYWORD1
+loadShader	KEYWORD2
+resetShader	KEYWORD2
+bind	KEYWORD2
+shader	KEYWORD2
+  
+blendMode	KEYWORD2
+  
+selectInput	KEYWORD2
+selectOutput	KEYWORD2
+selectFolder	KEYWORD2
+  
+saveType	KEYWORD2
+loadType	KEYWORD2
+clip	KEYWORD2
+noClip	KEYWORD2
+
 
 # Operators are without KEYWORDS
 
@@ -314,7 +346,7 @@ toUpperCase	KEYWORD3	String_toUpperCase_
 *		multiply
 *=		multiplyassign
 ()		parentheses
-<<		rightshift
+>>		rightshift
 ;		semicolon
 -=		subtractassign
 
diff --git a/todo.txt b/todo.txt
@@ -51,7 +51,11 @@ REMOVE
 
 x Topics > Create Shapes > SVGPShape (Not needed, PShape examples in Basics)
 
-
+Functions removed from Processing reference after removing Applets. Should they stay
+for JS or are they used by JS?
+- link()
+- status()
+- param()
 
 NEW LANGUAGE ELEMENTS IN REFERENCE
 
@@ -60,30 +64,41 @@ NEW LANGUAGE ELEMENTS IN REFERENCE
 - TABLE  --SM
 o JSON  --SM  // This has been removed for 2.0
 - loadTable(), loadXML()  --SM
+- PVector changes --SM
 
-- all new PShape --CR
-- filter() now accepts shaders?
+Master 2.0 Beta List for CR
 
-- selectInput(), selectOutput(), and selectFolder() --CR
-- shaders and all related syntax --CR
-  . PShader
+- PShape --CR
+- createShape()
+- s.beginContour()
+- s.endContour()
+- s.end()
+- s.addChild()
+- s.getChild()
+
+- PShader --CR
   . loadShader()
   . resetShader()
   . PShader.bind()
-
+  . shader()
+  
+- textWrap(REPEAT) --CR
+- blendMode()  --CR
+  
+- filter() now accepts shaders?
+- selectInput(), selectOutput(), and selectFolder() --CR
 - saveType(), loadType()
-- PVector changes --CR
-- displayWidth, displayHeight --CR
-- Closely review all Video API --CR
-x quadraticVertex()  --CR
 - clear()  --CR  New method for PGraphics
 - new arc()  --CR
-- blendMode()  --CR
-- createShape()  --CR
-- begin/endContour()  --CR
+
+- Closely review all Video API --CR
+
 - clip()/noClip()  --CR
 ? thread()  --CR
 
+x quadraticVertex()  --CR
+x displayWidth, displayHeight --CR
+
 - Disambiguation pages for things like "copy" in PImage and PVector
 - Is there a way to catch for keywords like "run" and "init" in the parser?
 
