From 76f99a232fff82208836ca0d4ce33820522df6e3 Mon Sep 17 00:00:00 2001
From: REAS <reas@reas.com>
Date: Sat, 26 Oct 2013 21:02:36 -0700
Subject: [PATCH] Reference changes for 2.1, new keywords.txt

---
 core/src/processing/core/PApplet.java | 29 +++++++++++++++++++++------
 java/keywords.txt                     |  2 ++
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
index 45e5a2482..9a63631bd 100755
--- a/core/src/processing/core/PApplet.java
+++ b/core/src/processing/core/PApplet.java
@@ -4336,8 +4336,9 @@ public class PApplet extends Applet
    * ( end auto-generated )
  * @webref output:text_area
  * @usage IDE
- * @param what boolean, byte, char, color, int, float, String, Object
- * @see PApplet#println(byte)
+ * @param what data to print to console
+ * @see PApplet#println()
+ * @see PApplet#printArray(Object)
  * @see PApplet#join(String[], char)
  */
   static public void print(byte what) {
@@ -4380,7 +4381,9 @@ public class PApplet extends Applet
     System.out.flush();
   }
 
-
+  /**
+   * @param variables list of data, separated by commas
+   */
   static public void print(Object... variables) {
     StringBuilder sb = new StringBuilder();
     for (Object o : variables) {
@@ -4428,6 +4431,7 @@ public class PApplet extends Applet
  * @webref output:text_area
  * @usage IDE
  * @see PApplet#print(byte)
+ * @see PApplet#printArray(Object)
  */
   static public void println() {
     System.out.println();
@@ -4435,7 +4439,7 @@ public class PApplet extends Applet
 
 
 /**
- * @param what boolean, byte, char, color, int, float, String, Object
+ * @param what data to print to console
  */
   static public void println(byte what) {
     System.out.println(what);
@@ -4477,7 +4481,9 @@ public class PApplet extends Applet
     System.out.flush();
   }
 
-
+  /**
+   * @param variables list of data, separated by commas
+   */
   static public void println(Object... variables) {
 //    System.out.println("got " + variables.length + " variables");
     print(variables);
@@ -4514,7 +4520,18 @@ public class PApplet extends Applet
     }
   }
 
-
+  /**
+   * ( begin auto-generated from printArray.xml )
+   *
+   * To come...
+   *
+   * ( end auto-generated )
+ * @webref output:text_area
+ * @param what one-dimensional array
+ * @usage IDE
+ * @see PApplet#print(byte)
+ * @see PApplet#println()
+ */
   static public void printArray(Object what) {
     if (what == null) {
       // special case since this does fuggly things on > 1.1
diff --git a/java/keywords.txt b/java/keywords.txt
index 5ba33d3ab..1a3505f3e 100644
--- a/java/keywords.txt
+++ b/java/keywords.txt
@@ -661,6 +661,7 @@ popMatrix	FUNCTION1	popMatrix_
 popStyle	FUNCTION1	popStyle_
 pow	FUNCTION1	pow_
 print	FUNCTION1	print_
+printArray	FUNCTION1	printArray_
 printCamera	FUNCTION1	printCamera_
 println	FUNCTION1	println_
 printMatrix	FUNCTION1	printMatrix_
@@ -670,6 +671,7 @@ PShader	FUNCTION2	PShader_set_
 PShape	KEYWORD5	PShape
 addChild	FUNCTION2	PShape_addChild_
 beginContour	FUNCTION2	PShape_beginContour_
+beginShape	FUNCTION2	PShape_beginShape_
 disableStyle	FUNCTION2	PShape_disableStyle_
 enableStyle	FUNCTION2	PShape_enableStyle_
 endContour	FUNCTION2	PShape_endContour_