Updates for 2b8 color coding

REAS · REAS · commit f47bcf3acb04 · 2012-12-19T23:04:42.000Z
diff --git a/content/api_en/draw.xml b/content/api_en/draw.xml
@@ -6,7 +6,7 @@
 
 <subcategory></subcategory>
 
-<type></type>
+<type>p5function</type>
 
 <example>
 <image></image>
diff --git a/content/api_en/keyPressed.xml b/content/api_en/keyPressed.xml
@@ -6,7 +6,7 @@
 
 <subcategory>Keyboard</subcategory>
 
-<type></type>
+<type>p5function</type>
 
 <example>
 <image></image>
diff --git a/content/api_en/keyReleased.xml b/content/api_en/keyReleased.xml
@@ -6,7 +6,7 @@
 
 <subcategory>Keyboard</subcategory>
 
-<type></type>
+<type>p5function</type>
 
 <example>
 <image></image>
diff --git a/content/api_en/keyTyped.xml b/content/api_en/keyTyped.xml
@@ -6,7 +6,7 @@
 
 <subcategory>Keyboard</subcategory>
 
-<type></type>
+<type>p5function</type>
 
 <example>
 <image></image>
diff --git a/content/api_en/mouseClicked.xml b/content/api_en/mouseClicked.xml
@@ -6,7 +6,7 @@
 
 <subcategory>Mouse</subcategory>
 
-<type></type>
+<type>p5function</type>
 
 <example>
 <image></image>
diff --git a/content/api_en/mouseDragged.xml b/content/api_en/mouseDragged.xml
@@ -6,7 +6,7 @@
 
 <subcategory>Mouse</subcategory>
 
-<type></type>
+<type>p5function</type>
 
 <example>
 <image></image>
diff --git a/content/api_en/mouseMoved.xml b/content/api_en/mouseMoved.xml
@@ -6,7 +6,7 @@
 
 <subcategory>Mouse</subcategory>
 
-<type></type>
+<type>p5function</type>
 
 <example>
 <image></image>
diff --git a/content/api_en/mousePressed.xml b/content/api_en/mousePressed.xml
@@ -6,7 +6,7 @@
 
 <subcategory>Mouse</subcategory>
 
-<type></type>
+<type>p5function</type>
 
 <example>
 <image></image>
diff --git a/content/api_en/setup.xml b/content/api_en/setup.xml
@@ -6,7 +6,7 @@
 
 <subcategory></subcategory>
 
-<type></type>
+<type>p5function</type>
 
 <example>
 <image></image>
diff --git a/content/static/books.html b/content/static/books.html
diff --git a/generate/keywords_base.txt b/generate/keywords_base.txt
@@ -250,11 +250,11 @@ catch	FUNCTION3	catch
 do	FUNCTION3
 for	FUNCTION3	for
 if	FUNCTION3	if
-else	FUNCTION3	else
+#else	FUNCTION3	else
 switch	FUNCTION3	switch
 synchronized	FUNCTION3
 while	FUNCTION3	while
-try	FUNCTION3	try
+#try	FUNCTION3	try
 
 
 # These items are a part of Processing but, but pages don't generate
diff --git a/generate/keywords_create.cgi b/generate/keywords_create.cgi
@@ -170,6 +170,8 @@ sub set_category
 		$category = "KEYWORD5";
     } elsif($subcat =~ s/field/field/i) {
 		$category = "KEYWORD2";
+    } elsif($type eq "p5function") {
+    	$category = "FUNCTION4";
     } elsif($type eq "variable") {
     	$category = "KEYWORD4";
     } elsif(($lc_type eq "object") || ($lc_type eq "class")) {
diff --git a/todo.txt b/todo.txt
@@ -20,6 +20,8 @@ NEW LANGUAGE ELEMENTS IN REFERENCE
   - added parseXML() and saveXML() to PApplet, and "new XML()" and "XML.parse()" will be for advanced users who want to deal with exceptions
   - new XML(name) throws an ex, use createXML() or appendChild("name")
   - remove XML.parse() from the reference (it throws an ex), use parseXML() instead
+  - add .toString(), which is the same as format(2)
+  - add .format() with the possible parameters to format -1, 0, 2, 4, etc. to define the spacing
   
 - TABLE  --SM
   . loadTable()
@@ -28,6 +30,8 @@ NEW LANGUAGE ELEMENTS IN REFERENCE
   - saveTable() --SM
   - createTable() --SM
 
+- JSON  --SM
+  
 
 - update loadFont() and createFont() to work with NATIVE_FONT decision
 
