propane 3.4.2-java → 3.5.0-java

data/src/main/java/processing/core/PGraphics.java

@@ -30,9 +30,11 @@ import java.awt.Color;
 
 // Used for the 'image' object that's been here forever
 import java.awt.Font;
+import java.awt.FontFormatException;
 import java.awt.Image;
 
 import java.io.File;
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
 import java.util.HashMap;
@@ -61,7 +63,7 @@ import processing.opengl.PShader;
    * methods for this class are extensive. For a complete list, visit the <a
    * href="http://processing.googlecode.com/svn/trunk/processing/build/javadoc/core/">developer's reference.</a>
    *
-   * ( end auto-generated )
+   * 
    *
    * <h3>Advanced</h3>
    * Main graphics and rendering context, as well as the base API implementation.
@@ -107,7 +109,7 @@ import processing.opengl.PShader;
    * instance, imageImpl() handles drawing an image whose x/y/w/h and u/v coords
    * have been specified, and screen placement (independent of imageMode) has
    * been determined. There's no point in all renderers implementing the
-   * <tt>if (imageMode == BLAH)</tt> placement/sizing logic, so that's handled
+   * <code>if (imageMode == BLAH)</code> placement/sizing logic, so that's handled
    * by PGraphics, which then calls imageImpl() once all that is figured out.
    *
    * <h2>His brother PImage</h2>
@@ -134,7 +136,7 @@ import processing.opengl.PShader;
    *
    * <h2>What's in the PGraphics documentation, what ain't</h2>
    * Some things are noted here, some things are not. For public API, always
-   * refer to the <a href="http://processing.org/reference">reference</A>
+   * refer to the <a href="http://processing.org/reference">reference</a>
    * on Processing.org for proper explanations. <b>No attempt has been made to
    * keep the javadoc up to date or complete.</b> It's an enormous task for
    * which we simply do not have the time. That is, it's not something that
@@ -570,7 +572,7 @@ public class PGraphics extends PImage implements PConstants {
 
   // vertices
   public static final int DEFAULT_VERTICES = 512;
-  protected float vertices[][] =
+  protected float[][] vertices =
     new float[DEFAULT_VERTICES][VERTEX_FIELD_COUNT];
   protected int vertexCount; // total number of vertices
 
@@ -605,7 +607,7 @@ public class PGraphics extends PImage implements PConstants {
 
   // spline vertices
 
-  protected float curveVertices[][];
+  protected float[][] curveVertices;
   protected int curveVertexCount;
 
   // ........................................................
@@ -618,8 +620,8 @@ public class PGraphics extends PImage implements PConstants {
   // [toxi 031031]
   // changed table's precision to 0.5 degree steps
   // introduced new vars for more flexible code
-  static final protected float sinLUT[];
-  static final protected float cosLUT[];
+  static final protected float[] sinLUT;
+  static final protected float[] cosLUT;
   static final protected float SINCOS_PRECISION = 0.5f;
   static final protected int SINCOS_LENGTH = (int) (360f / SINCOS_PRECISION);
   static {
@@ -702,7 +704,9 @@ public class PGraphics extends PImage implements PConstants {
 
   // [toxi031031] new & faster sphere code w/ support flexible resolutions
   // will be set by sphereDetail() or 1st call to sphere()
-  protected float sphereX[], sphereY[], sphereZ[];
+  protected float[] sphereX;
+  protected float[] sphereY;
+  protected float[] sphereZ;
 
   /// Number of U steps (aka "theta") around longitudinally spanning 2*pi
   public int sphereDetailU = 0;
@@ -891,7 +895,7 @@ public class PGraphics extends PImage implements PConstants {
    * Sets the default properties for a PGraphics object. It should be called
    * before anything is drawn into the object.
    *
-   * ( end auto-generated )
+   * 
    * <h3>Advanced</h3>
    * When creating your own PGraphics, you should call this before
    * drawing anything.
@@ -908,7 +912,7 @@ public class PGraphics extends PImage implements PConstants {
    *
    * Finalizes the rendering of a PGraphics object so that it can be shown on screen.
    *
-   * ( end auto-generated )
+   * 
    * <h3>Advanced</h3>
    * 
    * When creating your own PGraphics, you should call this when
@@ -1152,7 +1156,7 @@ public class PGraphics extends PImage implements PConstants {
    * prevents the double negatives, and also reinforces which hints can be
    * enabled or disabled.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref rendering
    * @param which name of the hint to be enabled or disabled
@@ -1220,7 +1224,7 @@ public class PGraphics extends PImage implements PConstants {
    * <b>strokeJoin()</b> cannot be changed while inside a
    * <b>beginShape()</b>/<b>endShape()</b> block with any renderer.
    *
-   * ( end auto-generated )
+   * 
    * @webref shape:vertex
    * @param kind Either POINTS, LINES, TRIANGLES, TRIANGLE_FAN, TRIANGLE_STRIP, QUADS, or QUAD_STRIP
    * @see PShape
@@ -1253,7 +1257,7 @@ public class PGraphics extends PImage implements PConstants {
    * imperfect, this is a better option when you want more control. This
    * function is identical to glNormal3f() in OpenGL.
    *
-   * ( end auto-generated )
+   * 
    * @webref lights_camera:lights
    * @param nx x direction
    * @param ny y direction
@@ -1322,7 +1326,7 @@ public class PGraphics extends PImage implements PConstants {
    * the points (0,0) (0,100) (100,200) (0,200). The same mapping in
    * NORMAL_SPACE is (0,0) (0,1) (1,1) (0,1).
    *
-   * ( end auto-generated )
+   * 
    * @webref image:textures
    * @param mode either IMAGE or NORMAL
    * @see PGraphics#texture(PImage)
@@ -1362,7 +1366,7 @@ public class PGraphics extends PImage implements PConstants {
    * When textures are in use, the fill color is ignored. Instead, use tint()
    * to specify the color of the texture as it is applied to the shape.
    *
-   * ( end auto-generated )
+   * 
    * @webref image:textures
    * @param image reference to a PImage object
    * @see PGraphics#textureMode(int)
@@ -1388,7 +1392,7 @@ public class PGraphics extends PImage implements PConstants {
 
   protected void vertexCheck() {
     if (vertexCount == vertices.length) {
-      float temp[][] = new float[vertexCount << 1][VERTEX_FIELD_COUNT];
+      float[][] temp = new float[vertexCount << 1][VERTEX_FIELD_COUNT];
       System.arraycopy(vertices, 0, temp, 0, vertexCount);
       vertices = temp;
     }
@@ -1480,7 +1484,7 @@ public class PGraphics extends PImage implements PConstants {
     // http://dev.processing.org/bugs/show_bug.cgi?id=444
     if (shape == POLYGON) {
       if (vertexCount > 0) {
-        float pvertex[] = vertices[vertexCount-1];
+        float[] pvertex = vertices[vertexCount-1];
         if ((Math.abs(pvertex[X] - x) < EPSILON) &&
             (Math.abs(pvertex[Y] - y) < EPSILON) &&
             (Math.abs(pvertex[Z] - z) < EPSILON)) {
@@ -1617,7 +1621,7 @@ public class PGraphics extends PImage implements PConstants {
    * <b>v</b> are specified in relation to the image's size in pixels, but
    * this relation can be changed with <b>textureMode()</b>.
    *
-   * ( end auto-generated )
+   * 
  * @webref shape:vertex
  * @param x x-coordinate of the vertex
  * @param y y-coordinate of the vertex
@@ -1718,7 +1722,7 @@ public class PGraphics extends PImage implements PConstants {
    * as the value for the MODE parameter to close the shape (to connect the
    * beginning and the end).
    *
-   * ( end auto-generated )
+   * 
    * @webref shape:vertex
    * @param mode use CLOSE to close the shape
    * @see PShape
@@ -1886,7 +1890,7 @@ public class PGraphics extends PImage implements PConstants {
    *
    * This is a new reference entry for Processing 2.0. It will be updated shortly.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref rendering:shaders
    * @param fragFilename name of fragment shader file
@@ -1911,7 +1915,7 @@ public class PGraphics extends PImage implements PConstants {
    *
    * This is a new reference entry for Processing 2.0. It will be updated shortly.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref rendering:shaders
    * @param shader name of shader file
@@ -1934,7 +1938,7 @@ public class PGraphics extends PImage implements PConstants {
    *
    * This is a new reference entry for Processing 2.0. It will be updated shortly.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref rendering:shaders
    */
@@ -1971,7 +1975,7 @@ public class PGraphics extends PImage implements PConstants {
    * by the parameters. The boundaries are drawn based on the state
    * of the <b>imageMode()</b> fuction, either CORNER, CORNERS, or CENTER.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref rendering
    * @param a x-coordinate of the rectangle, by default
@@ -2022,7 +2026,7 @@ public class PGraphics extends PImage implements PConstants {
    *
    * Disables the clipping previously started by the <b>clip()</b> function.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref rendering
    */
@@ -2041,7 +2045,7 @@ public class PGraphics extends PImage implements PConstants {
    *
    * This is a new reference entry for Processing 2.0. It will be updated shortly.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref rendering
    * @param mode the blending mode to use
@@ -2123,7 +2127,7 @@ public class PGraphics extends PImage implements PConstants {
    * 3D version requires rendering with P3D (see the Environment reference
    * for more information).
    *
-   * ( end auto-generated )
+   * 
  * @webref shape:vertex
  * @param x2 the x-coordinate of the 1st control point
  * @param y2 the y-coordinate of the 1st control point
@@ -2256,7 +2260,7 @@ public class PGraphics extends PImage implements PConstants {
    * version requires rendering with P3D (see the Environment reference for
    * more information).
    *
-   * ( end auto-generated )
+   * 
   *
   * @webref shape:vertex
   * @param x the x-coordinate of the vertex
@@ -2407,7 +2411,7 @@ public class PGraphics extends PImage implements PConstants {
    * requires the P3D parameter in combination with <b>size()</b> as shown in
    * the above example.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref shape:2d_primitives
    * @param x x-coordinate of the point
@@ -2442,7 +2446,7 @@ public class PGraphics extends PImage implements PConstants {
    * Drawing this shape in 3D with the <b>z</b> parameter requires the P3D
    * parameter in combination with <b>size()</b> as shown in the above example.
    *
-   * ( end auto-generated )
+   * 
    * @webref shape:2d_primitives
    * @param x1 x-coordinate of the first point
    * @param y1 y-coordinate of the first point
@@ -2479,7 +2483,7 @@ public class PGraphics extends PImage implements PConstants {
    * arguments specify the first point, the middle two arguments specify the
    * second point, and the last two arguments specify the third point.
    *
-   * ( end auto-generated )
+   * 
    * @webref shape:2d_primitives
    * @param x1 x-coordinate of the first point
    * @param y1 y-coordinate of the first point
@@ -2508,7 +2512,7 @@ public class PGraphics extends PImage implements PConstants {
    * vertex and the subsequent pairs should proceed clockwise or
    * counter-clockwise around the defined shape.
    *
-   * ( end auto-generated )
+   * 
    * @webref shape:2d_primitives
    * @param x1 x-coordinate of the first corner
    * @param y1 y-coordinate of the first corner
@@ -2554,7 +2558,7 @@ public class PGraphics extends PImage implements PConstants {
    * sensitive language. Note: In version 125, the mode named CENTER_RADIUS
    * was shortened to RADIUS.
    *
-   * ( end auto-generated )
+   * 
    * @webref shape:attributes
    * @param mode either CORNER, CORNERS, CENTER, or RADIUS
    * @see PGraphics#rect(float, float, float, float)
@@ -2573,7 +2577,7 @@ public class PGraphics extends PImage implements PConstants {
    * fourth sets the height. These parameters may be changed with the
    * <b>rectMode()</b> function.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref shape:2d_primitives
    * @param a x-coordinate of the rectangle by default
@@ -2732,14 +2736,14 @@ public class PGraphics extends PImage implements PConstants {
   /**
    * ( begin auto-generated from square.xml )
    *
-   * Draws a square to the screen. A square is a four-sided shape with 
-   * every angle at ninety degrees and each side is the same length. 
-   * By default, the first two parameters set the location of the 
-   * upper-left corner, the third sets the width and height. The way 
-   * these parameters are interpreted, however, may be changed with the 
+   * Draws a square to the screen. A square is a four-sided shape with
+   * every angle at ninety degrees and each side is the same length.
+   * By default, the first two parameters set the location of the
+   * upper-left corner, the third sets the width and height. The way
+   * these parameters are interpreted, however, may be changed with the
    * <b>rectMode()</b> function.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref shape:2d_primitives
    * @param x x-coordinate of the rectangle by default
@@ -2773,7 +2777,7 @@ public class PGraphics extends PImage implements PConstants {
    * ellipse's bounding box. The parameter must be written in ALL CAPS
    * because Processing is a case-sensitive language.
    *
-   * ( end auto-generated )
+   * 
    * @webref shape:attributes
    * @param mode either CENTER, RADIUS, CORNER, or CORNERS
    * @see PApplet#ellipse(float, float, float, float)
@@ -2792,7 +2796,7 @@ public class PGraphics extends PImage implements PConstants {
    * the location, the third sets the width, and the fourth sets the height.
    * The origin may be changed with the <b>ellipseMode()</b> function.
    *
-   * ( end auto-generated )
+   * 
    * @webref shape:2d_primitives
    * @param a x-coordinate of the ellipse
    * @param b y-coordinate of the ellipse
@@ -2807,19 +2811,23 @@ public class PGraphics extends PImage implements PConstants {
     float w = c;
     float h = d;
 
-    if (ellipseMode == CORNERS) {
-      w = c - a;
-      h = d - b;
-
-    } else if (ellipseMode == RADIUS) {
-      x = a - c;
-      y = b - d;
-      w = c * 2;
-      h = d * 2;
-
-    } else if (ellipseMode == DIAMETER) {
-      x = a - c/2f;
-      y = b - d/2f;
+    switch (ellipseMode) {
+      case CORNERS:
+        w = c - a;
+        h = d - b;
+        break;
+      case RADIUS:
+        x = a - c;
+        y = b - d;
+        w = c * 2;
+        h = d * 2;
+        break;
+      case DIAMETER:
+        x = a - c/2f;
+        y = b - d/2f;
+        break;
+      default:
+        break;
     }
 
     if (w < 0) {  // undo negative width
@@ -2849,7 +2857,7 @@ public class PGraphics extends PImage implements PConstants {
    * with the <b>ellipseMode()</b> function. The <b>start</b> and <b>stop</b>
    * parameters specify the angles at which to draw the arc.
    *
-   * ( end auto-generated )
+   * 
    * @webref shape:2d_primitives
    * @param a x-coordinate of the arc's ellipse
    * @param b y-coordinate of the arc's ellipse
@@ -2877,19 +2885,23 @@ public class PGraphics extends PImage implements PConstants {
     float w = c;
     float h = d;
 
-    if (ellipseMode == CORNERS) {
-      w = c - a;
-      h = d - b;
-
-    } else if (ellipseMode == RADIUS) {
-      x = a - c;
-      y = b - d;
-      w = c * 2;
-      h = d * 2;
-
-    } else if (ellipseMode == CENTER) {
-      x = a - c/2f;
-      y = b - d/2f;
+    switch (ellipseMode) {
+      case CORNERS:
+        w = c - a;
+        h = d - b;
+        break;
+      case RADIUS:
+        x = a - c;
+        y = b - d;
+        w = c * 2;
+        h = d * 2;
+        break;
+      case CENTER:
+        x = a - c/2f;
+        y = b - d/2f;
+        break;
+      default:
+        break;
     }
 
     // make sure the loop will exit before starting while
@@ -2931,12 +2943,12 @@ public class PGraphics extends PImage implements PConstants {
   /**
    * ( begin auto-generated from circle.xml )
    *
-   * Draws a circle to the screen. By default, the first two parameters 
-   * set the location of the center, and the third sets the shape's width 
-   * and height. The origin may be changed with the <b>ellipseMode()</b> 
+   * Draws a circle to the screen. By default, the first two parameters
+   * set the location of the center, and the third sets the shape's width
+   * and height. The origin may be changed with the <b>ellipseMode()</b>
    * function.
    *
-   * ( end auto-generated )
+   * 
    * @webref shape:2d_primitives
    * @param x x-coordinate of the ellipse
    * @param y y-coordinate of the ellipse
@@ -2959,7 +2971,7 @@ public class PGraphics extends PImage implements PConstants {
    * A box is an extruded rectangle. A box with equal dimension on all sides
    * is a cube.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref shape:3d_primitives
    * @param size dimension of the box in all dimensions (creates a cube)
@@ -3052,7 +3064,7 @@ public class PGraphics extends PImage implements PConstants {
    * and vertical resolution independently, use the version of the functions
    * with two parameters.
    *
-   * ( end auto-generated )
+   * 
    *
    * <h3>Advanced</h3>
    * Code for sphereDetail() submitted by toxi [031031].
@@ -3118,7 +3130,7 @@ public class PGraphics extends PImage implements PConstants {
    *
    * A sphere is a hollow ball made from tessellated triangles.
    *
-   * ( end auto-generated )
+   * 
    *
    * <h3>Advanced</h3>
    * <P>
@@ -3225,7 +3237,7 @@ public class PGraphics extends PImage implements PConstants {
    * second time with the y coordinates to get the location of a bezier curve
    * at t.
    *
-   * ( end auto-generated )
+   * 
    *
    * <h3>Advanced</h3>
    * For instance, to convert the following example:<PRE>
@@ -3269,7 +3281,7 @@ public class PGraphics extends PImage implements PConstants {
    * definition of <a href="http://en.wikipedia.org/wiki/Tangent"
    * target="new"><em>tangent</em> on Wikipedia</a>.
    *
-   * ( end auto-generated )
+   * 
    *
    * <h3>Advanced</h3>
    * Code submitted by Dave Bollinger (davol) for release 0136.
@@ -3312,7 +3324,7 @@ public class PGraphics extends PImage implements PConstants {
    * This function is only useful when using the P3D renderer as the default
    * P2D renderer does not use this information.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref shape:curves
    * @param detail resolution of the curves
@@ -3360,7 +3372,7 @@ public class PGraphics extends PImage implements PConstants {
    * Bezier. Using the 3D version requires rendering with P3D (see the
    * Environment reference for more information).
    *
-   * ( end auto-generated )
+   * 
    *
    * <h3>Advanced</h3>
    * Draw a cubic bezier curve. The first and last points are
@@ -3424,17 +3436,17 @@ public class PGraphics extends PImage implements PConstants {
    * ( begin auto-generated from curvePoint.xml )
    *
    * Evalutes the curve at point t for points a, b, c, d. The parameter t
-   * varies between 0 and 1, a and d are points on the curve, and b and c are
-   * the control points. This can be done once with the x coordinates and a
+   * varies between 0 and 1, a and d are the control points, and b and c are
+   * the points on the curve. This can be done once with the x coordinates and a
    * second time with the y coordinates to get the location of a curve at t.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref shape:curves
-   * @param a coordinate of first point on the curve
-   * @param b coordinate of second point on the curve
-   * @param c coordinate of third point on the curve
-   * @param d coordinate of fourth point on the curve
+   * @param a coordinate of first control point
+   * @param b coordinate of first point on the curve
+   * @param c coordinate of second point on the curve
+   * @param d coordinate of second control point
    * @param t value between 0 and 1
    * @see PGraphics#curve(float, float, float, float, float, float, float, float, float, float, float, float)
    * @see PGraphics#curveVertex(float, float)
@@ -3460,9 +3472,9 @@ public class PGraphics extends PImage implements PConstants {
    *
    * Calculates the tangent of a point on a curve. There's a good definition
    * of <em><a href="http://en.wikipedia.org/wiki/Tangent"
-   * target="new">tangent</em> on Wikipedia</a>.
+   * target="new">tangent on Wikipedia</a></em>.
    *
-   * ( end auto-generated )
+   * 
    *
    * <h3>Advanced</h3>
    * Code thanks to Dave Bollinger (Bug #715)
@@ -3500,7 +3512,7 @@ public class PGraphics extends PImage implements PConstants {
    * This function is only useful when using the P3D renderer as the default
    * P2D renderer does not use this information.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref shape:curves
    * @param detail resolution of the curves
@@ -3525,7 +3537,7 @@ public class PGraphics extends PImage implements PConstants {
    * within the range -5.0 and 5.0 will deform the curves but will leave them
    * recognizable and as values increase in magnitude, they will continue to deform.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref shape:curves
    * @param tightness amount of deformation from the original vertices
@@ -3604,7 +3616,7 @@ public class PGraphics extends PImage implements PConstants {
    * implementation of Catmull-Rom splines. Using the 3D version requires
    * rendering with P3D (see the Environment reference for more information).
    *
-   * ( end auto-generated )
+   * 
    *
    * <h3>Advanced</h3>
    * As of revision 0070, this function no longer doubles the first
@@ -3751,7 +3763,7 @@ public class PGraphics extends PImage implements PConstants {
    * The parameter to <b>imageMode()</b> must be written in ALL CAPS because
    * Processing is a case-sensitive language.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref image:loading_displaying
    * @param mode either CORNER, CORNERS, or CENTER
@@ -3791,7 +3803,7 @@ public class PGraphics extends PImage implements PConstants {
    * The color of an image may be modified with the <b>tint()</b> function.
    * This function will maintain transparency for GIF and PNG images.
    *
-   * ( end auto-generated )
+   * 
    *
    * <h3>Advanced</h3>
    * Starting with release 0124, when using the default (JAVA2D) renderer,
@@ -3850,40 +3862,37 @@ public class PGraphics extends PImage implements PConstants {
     // loadImageAsync() sets width and height to -1 when loading fails.
     if (img.width == -1 || img.height == -1) return;
 
-    if (imageMode == CORNER) {
-      if (c < 0) {  // reset a negative width
-        a += c; c = -c;
-      }
-      if (d < 0) {  // reset a negative height
-        b += d; d = -d;
-      }
-
-      imageImpl(img,
-                a, b, a + c, b + d,
-                u1, v1, u2, v2);
-
-    } else if (imageMode == CORNERS) {
-      if (c < a) {  // reverse because x2 < x1
-        float temp = a; a = c; c = temp;
-      }
-      if (d < b) {  // reverse because y2 < y1
-        float temp = b; b = d; d = temp;
-      }
-
-      imageImpl(img,
-                a, b, c, d,
-                u1, v1, u2, v2);
-
-    } else if (imageMode == CENTER) {
-      // c and d are width/height
-      if (c < 0) c = -c;
-      if (d < 0) d = -d;
-      float x1 = a - c/2;
-      float y1 = b - d/2;
-
-      imageImpl(img,
-                x1, y1, x1 + c, y1 + d,
-                u1, v1, u2, v2);
+    switch (imageMode) {
+      case CORNER:
+        if (c < 0) {  // reset a negative width
+          a += c; c = -c;
+        } if (d < 0) {  // reset a negative height
+          b += d; d = -d;
+        } imageImpl(img,
+          a, b, a + c, b + d,
+          u1, v1, u2, v2);
+        break;
+      case CORNERS:
+        if (c < a) {  // reverse because x2 < x1
+          float temp = a; a = c; c = temp;
+        } if (d < b) {  // reverse because y2 < y1
+          float temp = b; b = d; d = temp;
+        } imageImpl(img,
+          a, b, c, d,
+          u1, v1, u2, v2);
+        break;
+      case CENTER:
+        // c and d are width/height
+        if (c < 0) c = -c;
+        if (d < 0) d = -d;
+        float x1 = a - c/2;
+        float y1 = b - d/2;
+        imageImpl(img,
+          x1, y1, x1 + c, y1 + d,
+          u1, v1, u2, v2);
+        break;
+      default:
+        break;
     }
   }
 
@@ -3969,7 +3978,7 @@ public class PGraphics extends PImage implements PConstants {
    * and height. The parameter must be written in "ALL CAPS" because
    * Processing is a case sensitive language.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref shape:loading_displaying
    * @param mode either CORNER, CORNERS, CENTER
@@ -4016,11 +4025,11 @@ public class PGraphics extends PImage implements PConstants {
    * to <b>shapeMode(CORNERS)</b>, for example, will change the width and
    * height parameters to define the x and y values of the opposite corner of
    * the shape.
-  
+   * 
    * Note complex shapes may draw awkwardly with P3D. This renderer does not
    * yet support shapes that have holes or complicated breaks.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref shape:loading_displaying
    * @param shape the shape to display
@@ -4069,22 +4078,26 @@ public class PGraphics extends PImage implements PConstants {
 
       pushMatrix();
 
-      if (shapeMode == CENTER) {
-        // x and y are center, c and d refer to a diameter
-        translate(a - c/2f, b - d/2f);
-        scale(c / shape.getWidth(), d / shape.getHeight());
-
-      } else if (shapeMode == CORNER) {
-        translate(a, b);
-        scale(c / shape.getWidth(), d / shape.getHeight());
-
-      } else if (shapeMode == CORNERS) {
-        // c and d are x2/y2, make them into width/height
-        c -= a;
-        d -= b;
-        // then same as above
-        translate(a, b);
-        scale(c / shape.getWidth(), d / shape.getHeight());
+      switch (shapeMode) {
+        case CENTER:
+          // x and y are center, c and d refer to a diameter
+          translate(a - c/2f, b - d/2f);
+          scale(c / shape.getWidth(), d / shape.getHeight());
+          break;
+        case CORNER:
+          translate(a, b);
+          scale(c / shape.getWidth(), d / shape.getHeight());
+          break;
+        case CORNERS:
+          // c and d are x2/y2, make them into width/height
+          c -= a;
+          d -= b;
+          // then same as above
+          translate(a, b);
+          scale(c / shape.getWidth(), d / shape.getHeight());
+          break;
+        default:
+          break;
       }
       shape.draw(this);
 
@@ -4137,9 +4150,8 @@ public class PGraphics extends PImage implements PConstants {
       }
       return createFont(baseFont, size, smooth, charset, stream != null);
 
-    } catch (Exception e) {
+    } catch (FontFormatException | IOException e) {
       System.err.println("Problem with createFont(\"" + name + "\")");
-      e.printStackTrace();
       return null;
     }
   }
@@ -4186,7 +4198,7 @@ public class PGraphics extends PImage implements PConstants {
    * <b>textAscent()</b> or <b>textDescent()</b> so that the hack works even
    * if you change the size of the font.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref typography:attributes
    * @param alignX horizontal alignment, either LEFT, CENTER, or RIGHT
@@ -4212,7 +4224,7 @@ public class PGraphics extends PImage implements PConstants {
    * example, adding the <b>textAscent()</b> and <b>textDescent()</b> values
    * will give you the total height of the line.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref typography:metrics
    * @see PGraphics#textDescent()
@@ -4233,7 +4245,7 @@ public class PGraphics extends PImage implements PConstants {
    * baseline. For example, adding the <b>textAscent()</b> and
    * <b>textDescent()</b> values will give you the total height of the line.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref typography:metrics
    * @see PGraphics#textAscent()
@@ -4254,18 +4266,18 @@ public class PGraphics extends PImage implements PConstants {
    * used. This font will be used in all subsequent calls to the
    * <b>text()</b> function. If no <b>size</b> parameter is input, the font
    * will appear at its original size (the size it was created at with the
-   * "Create Font..." tool) until it is changed with <b>textSize()</b>. <br
-   * />  Because fonts are usually bitmaped, you should create fonts at
+   * "Create Font..." tool) until it is changed with <b>textSize()</b>. 
+   *  Because fonts are usually bitmaped, you should create fonts at
    * the sizes that will be used most commonly. Using <b>textFont()</b>
-   * without the size parameter will result in the cleanest-looking text. <br
-   * /> With the default (JAVA2D) and PDF renderers, it's also possible
+   * without the size parameter will result in the cleanest-looking text. 
+   * With the default (JAVA2D) and PDF renderers, it's also possible
    * to enable the use of native fonts via the command
    * <b>hint(ENABLE_NATIVE_FONTS)</b>. This will produce vector text in
    * JAVA2D sketches and PDF output in cases where the vector data is
    * available: when the font is still installed, or the font is created via
    * the <b>createFont()</b> function (rather than the Create Font tool).
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref typography:loading_displaying
    * @param which any variable of the type PFont
@@ -4352,7 +4364,7 @@ public class PGraphics extends PImage implements PConstants {
    * Sets the spacing between lines of text in units of pixels. This setting
    * will be used in all subsequent calls to the <b>text()</b> function.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref typography:attributes
    * @param leading the size in pixels for spacing between lines
@@ -4388,7 +4400,7 @@ public class PGraphics extends PImage implements PConstants {
    * not currently optimized for <b>P3D</b>, so if recording shape data, use
    * <b>textMode(MODEL)</b> until you're ready to capture the geometry with <b>beginRaw()</b>.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref typography:attributes
    * @param mode either MODEL or SHAPE
@@ -4434,7 +4446,7 @@ public class PGraphics extends PImage implements PConstants {
    * Sets the current font size. This size will be used in all subsequent
    * calls to the <b>text()</b> function. Font size is measured in units of pixels.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref typography:attributes
    * @param size the size of the letters in units of pixels
@@ -4498,7 +4510,7 @@ public class PGraphics extends PImage implements PConstants {
    *
    * Calculates and returns the width of any character or text string.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref typography:attributes
    * @param str the String of characters to measure
@@ -4551,7 +4563,7 @@ public class PGraphics extends PImage implements PConstants {
    * Unlike the previous version that was inside PFont, this will
    * return the size not of a 1 pixel font, but the actual current size.
    */
-  protected float textWidthImpl(char buffer[], int start, int stop) {
+  protected float textWidthImpl(char[] buffer, int start, int stop) {
     float wide = 0;
     for (int i = start; i < stop; i++) {
       // could add kerning here, but it just ain't implemented
@@ -4575,13 +4587,13 @@ public class PGraphics extends PImage implements PConstants {
    * with the <b>fill()</b> function. The text displays in relation to the
    * <b>textAlign()</b> function, which gives the option to draw to the left,
    * right, and center of the coordinates.
-  
+   * 
    * The <b>x2</b> and <b>y2</b> parameters define a rectangular area to
    * display within and may only be used with string data. For text drawn
    * inside a rectangle, the coordinates are interpreted based on the current
    * <b>rectMode()</b> setting.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref typography:loading_displaying
    * @param c the alphanumeric character to be displayed
@@ -4683,21 +4695,27 @@ public class PGraphics extends PImage implements PConstants {
         high += textLeading;
       }
     }
-    if (textAlignY == CENTER) {
-      // for a single line, this adds half the textAscent to y
-      // for multiple lines, subtract half the additional height
-      //y += (textAscent() - textDescent() - high)/2;
-      y += (textAscent() - high)/2;
-    } else if (textAlignY == TOP) {
-      // for a single line, need to add textAscent to y
-      // for multiple lines, no different
-      y += textAscent();
-    } else if (textAlignY == BOTTOM) {
-      // for a single line, this is just offset by the descent
-      // for multiple lines, subtract leading for each line
-      y -= textDescent() + high;
-    //} else if (textAlignY == BASELINE) {
-      // do nothing
+    switch (textAlignY) {
+      case CENTER:
+        // for a single line, this adds half the textAscent to y
+        // for multiple lines, subtract half the additional height
+        //y += (textAscent() - textDescent() - high)/2;
+        y += (textAscent() - high)/2;
+        break;
+      case TOP:
+        // for a single line, need to add textAscent to y
+        // for multiple lines, no different
+        y += textAscent();
+        break;
+      case BOTTOM:
+        // for a single line, this is just offset by the descent
+        // for multiple lines, subtract leading for each line
+        y -= textDescent() + high;
+        //} else if (textAlignY == BASELINE) {
+        // do nothing
+        break;
+      default:
+        break;
     }
 
 //    int start = 0;
@@ -4848,27 +4866,33 @@ public class PGraphics extends PImage implements PConstants {
     int lineFitCount = 1 + PApplet.floor((boxHeight - topAndBottom) / textLeading);
     int lineCount = Math.min(textBreakCount, lineFitCount);
 
-    if (textAlignY == CENTER) {
-      float lineHigh = textAscent() + textLeading * (lineCount - 1);
-      float y = y1 + textAscent() + (boxHeight - lineHigh) / 2;
-      for (int i = 0; i < lineCount; i++) {
-        textLineAlignImpl(textBuffer, textBreakStart[i], textBreakStop[i], lineX, y);
-        y += textLeading;
-      }
-
-    } else if (textAlignY == BOTTOM) {
-      float y = y2 - textDescent() - textLeading * (lineCount - 1);
-      for (int i = 0; i < lineCount; i++) {
-        textLineAlignImpl(textBuffer, textBreakStart[i], textBreakStop[i], lineX, y);
-        y += textLeading;
-      }
-
-    } else {  // TOP or BASELINE just go to the default
-      float y = y1 + textAscent();
-      for (int i = 0; i < lineCount; i++) {
-        textLineAlignImpl(textBuffer, textBreakStart[i], textBreakStop[i], lineX, y);
-        y += textLeading;
-      }
+    switch (textAlignY) {
+      case CENTER:
+        {
+          float lineHigh = textAscent() + textLeading * (lineCount - 1);
+          float y = y1 + textAscent() + (boxHeight - lineHigh) / 2;
+          for (int i = 0; i < lineCount; i++) {
+            textLineAlignImpl(textBuffer, textBreakStart[i], textBreakStop[i], lineX, y);
+            y += textLeading;
+          }   break;
+        }
+      case BOTTOM:
+        {
+          float y = y2 - textDescent() - textLeading * (lineCount - 1);
+          for (int i = 0; i < lineCount; i++) {
+            textLineAlignImpl(textBuffer, textBreakStart[i], textBreakStop[i], lineX, y);
+            y += textLeading;
+          }   break;
+        }
+      default:
+        {
+          // TOP or BASELINE just go to the default
+          float y = y1 + textAscent();
+          for (int i = 0; i < lineCount; i++) {
+            textLineAlignImpl(textBuffer, textBreakStart[i], textBreakStop[i], lineX, y);
+            y += textLeading;
+          }   break;
+        }
     }
   }
 
@@ -5019,7 +5043,7 @@ public class PGraphics extends PImage implements PConstants {
    * Handles placement of a text line, then calls textLineImpl
    * to actually render at the specific point.
    */
-  protected void textLineAlignImpl(char buffer[], int start, int stop,
+  protected void textLineAlignImpl(char[] buffer, int start, int stop,
                                    float x, float y) {
     if (textAlign == CENTER) {
       x -= textWidthImpl(buffer, start, stop) / 2f;
@@ -5035,7 +5059,7 @@ public class PGraphics extends PImage implements PConstants {
   /**
    * Implementation of actual drawing for a line of text.
    */
-  protected void textLineImpl(char buffer[], int start, int stop,
+  protected void textLineImpl(char[] buffer, int start, int stop,
                               float x, float y) {
     for (int index = start; index < stop; index++) {
       textCharImpl(buffer[index], x, y);
@@ -5167,31 +5191,31 @@ public class PGraphics extends PImage implements PConstants {
   /**
    * ( begin auto-generated from push.xml )
    *
-   * The <b>push()</b> function saves the current drawing style 
-   * settings and transformations, while <b>pop()</b> restores these 
-   * settings. Note that these functions are always used together. 
-   * They allow you to change the style and transformation settings 
-   * and later return to what you had. When a new state is started 
-   * with push(), it builds on the current style and transform 
+   * The <b>push()</b> function saves the current drawing style
+   * settings and transformations, while <b>pop()</b> restores these
+   * settings. Note that these functions are always used together.
+   * They allow you to change the style and transformation settings
+   * and later return to what you had. When a new state is started
+   * with push(), it builds on the current style and transform
    * information.
    * 
-   * <b>push()</b> stores information related to the current 
-   * transformation state and style settings controlled by the 
-   * following functions: <b>rotate()</b>, <b>translate()</b>, 
-   * <b>scale()</b>, <b>fill()</b>, <b>stroke()</b>, <b>tint()</b>, 
-   * <b>strokeWeight()</b>, <b>strokeCap()</b>, <b>strokeJoin()</b>, 
-   * <b>imageMode()</b>, <b>rectMode()</b>, <b>ellipseMode()</b>, 
-   * <b>colorMode()</b>, <b>textAlign()</b>, <b>textFont()</b>, 
+   * <b>push()</b> stores information related to the current
+   * transformation state and style settings controlled by the
+   * following functions: <b>rotate()</b>, <b>translate()</b>,
+   * <b>scale()</b>, <b>fill()</b>, <b>stroke()</b>, <b>tint()</b>,
+   * <b>strokeWeight()</b>, <b>strokeCap()</b>, <b>strokeJoin()</b>,
+   * <b>imageMode()</b>, <b>rectMode()</b>, <b>ellipseMode()</b>,
+   * <b>colorMode()</b>, <b>textAlign()</b>, <b>textFont()</b>,
    * <b>textMode()</b>, <b>textSize()</b>, <b>textLeading()</b>.
    * 
-   * The <b>push()</b> and <b>pop()</b> functions were added with 
-   * Processing 3.5. They can be used in place of <b>pushMatrix()</b>, 
-   * <b>popMatrix()</b>, <b>pushStyles()</b>, and <b>popStyles()</b>. 
-   * The difference is that push() and pop() control both the 
-   * transformations (rotate, scale, translate) and the drawing styles 
+   * The <b>push()</b> and <b>pop()</b> functions were added with
+   * Processing 3.5. They can be used in place of <b>pushMatrix()</b>,
+   * <b>popMatrix()</b>, <b>pushStyles()</b>, and <b>popStyles()</b>.
+   * The difference is that push() and pop() control both the
+   * transformations (rotate, scale, translate) and the drawing styles
    * at the same time.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref structure
    * @see PGraphics#pop()
@@ -5204,31 +5228,31 @@ public class PGraphics extends PImage implements PConstants {
   /**
    * ( begin auto-generated from pop.xml )
    *
-   * The <b>pop()</b> function restores the previous drawing style 
-   * settings and transformations after <b>push()</b> has changed them. 
-   * Note that these functions are always used together. They allow 
-   * you to change the style and transformation settings and later 
-   * return to what you had. When a new state is started with push(), 
+   * The <b>pop()</b> function restores the previous drawing style
+   * settings and transformations after <b>push()</b> has changed them.
+   * Note that these functions are always used together. They allow
+   * you to change the style and transformation settings and later
+   * return to what you had. When a new state is started with push(),
    * it builds on the current style and transform information.
    * 
    * 
-   * <b>push()</b> stores information related to the current 
-   * transformation state and style settings controlled by the 
-   * following functions: <b>rotate()</b>, <b>translate()</b>, 
-   * <b>scale()</b>, <b>fill()</b>, <b>stroke()</b>, <b>tint()</b>, 
-   * <b>strokeWeight()</b>, <b>strokeCap()</b>, <b>strokeJoin()</b>, 
-   * <b>imageMode()</b>, <b>rectMode()</b>, <b>ellipseMode()</b>, 
-   * <b>colorMode()</b>, <b>textAlign()</b>, <b>textFont()</b>, 
+   * <b>push()</b> stores information related to the current
+   * transformation state and style settings controlled by the
+   * following functions: <b>rotate()</b>, <b>translate()</b>,
+   * <b>scale()</b>, <b>fill()</b>, <b>stroke()</b>, <b>tint()</b>,
+   * <b>strokeWeight()</b>, <b>strokeCap()</b>, <b>strokeJoin()</b>,
+   * <b>imageMode()</b>, <b>rectMode()</b>, <b>ellipseMode()</b>,
+   * <b>colorMode()</b>, <b>textAlign()</b>, <b>textFont()</b>,
    * <b>textMode()</b>, <b>textSize()</b>, <b>textLeading()</b>.
    * 
-   * The <b>push()</b> and <b>pop()</b> functions were added with 
-   * Processing 3.5. They can be used in place of <b>pushMatrix()</b>, 
-   * <b>popMatrix()</b>, <b>pushStyles()</b>, and <b>popStyles()</b>. 
-   * The difference is that push() and pop() control both the 
-   * transformations (rotate, scale, translate) and the drawing styles 
+   * The <b>push()</b> and <b>pop()</b> functions were added with
+   * Processing 3.5. They can be used in place of <b>pushMatrix()</b>,
+   * <b>popMatrix()</b>, <b>pushStyles()</b>, and <b>popStyles()</b>.
+   * The difference is that push() and pop() control both the
+   * transformations (rotate, scale, translate) and the drawing styles
    * at the same time.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref structure
    * @see PGraphics#push()
@@ -5257,7 +5281,7 @@ public class PGraphics extends PImage implements PConstants {
    * the other transformation functions and may be embedded to control the
    * scope of the transformations.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref transform
    * @see PGraphics#popMatrix()
@@ -5284,7 +5308,7 @@ public class PGraphics extends PImage implements PConstants {
    * in conjuction with the other transformation functions and may be
    * embedded to control the scope of the transformations.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref transform
    * @see PGraphics#pushMatrix()
@@ -5316,7 +5340,7 @@ public class PGraphics extends PImage implements PConstants {
    * transformation is reset when the loop begins again. This function can be
    * further controlled by the <b>pushMatrix()</b> and <b>popMatrix()</b>.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref transform
    * @param x left/right translation
@@ -5361,7 +5385,7 @@ public class PGraphics extends PImage implements PConstants {
    * matrix by a rotation matrix. This function can be further controlled by
    * the <b>pushMatrix()</b> and <b>popMatrix()</b>.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref transform
    * @param angle angle of rotation specified in radians
@@ -5394,7 +5418,7 @@ public class PGraphics extends PImage implements PConstants {
    * This function requires using P3D as a third parameter to <b>size()</b>
    * as shown in the example above.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref transform
    * @param angle angle of rotation specified in radians
@@ -5427,7 +5451,7 @@ public class PGraphics extends PImage implements PConstants {
    * This function requires using P3D as a third parameter to <b>size()</b>
    * as shown in the examples above.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref transform
    * @param angle angle of rotation specified in radians
@@ -5460,7 +5484,7 @@ public class PGraphics extends PImage implements PConstants {
    * This function requires using P3D as a third parameter to <b>size()</b>
    * as shown in the examples above.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref transform
    * @param angle angle of rotation specified in radians
@@ -5506,7 +5530,7 @@ public class PGraphics extends PImage implements PConstants {
    * parameter for <b>size()</b> as shown in the example above. This function
    * can be further controlled by <b>pushMatrix()</b> and <b>popMatrix()</b>.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref transform
    * @param s percentage to scale the object
@@ -5564,7 +5588,7 @@ public class PGraphics extends PImage implements PConstants {
    * matrix by a rotation matrix. This function can be further controlled by
    * the <b>pushMatrix()</b> and <b>popMatrix()</b> functions.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref transform
    * @param angle angle of shear specified in radians
@@ -5598,7 +5622,7 @@ public class PGraphics extends PImage implements PConstants {
    * matrix by a rotation matrix. This function can be further controlled by
    * the <b>pushMatrix()</b> and <b>popMatrix()</b> functions.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref transform
    * @param angle angle of shear specified in radians
@@ -5625,7 +5649,7 @@ public class PGraphics extends PImage implements PConstants {
    * Replaces the current matrix with the identity matrix. The equivalent
    * function in OpenGL is glLoadIdentity().
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref transform
    * @see PGraphics#pushMatrix()
@@ -5645,7 +5669,7 @@ public class PGraphics extends PImage implements PConstants {
    * inverse of the transform, so avoid it whenever possible. The equivalent
    * function in OpenGL is glMultMatrix().
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref transform
    * @source
@@ -5776,7 +5800,7 @@ public class PGraphics extends PImage implements PConstants {
    * Prints the current matrix to the Console (the text window at the bottom
    * of Processing).
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref transform
    * @see PGraphics#pushMatrix()
@@ -5799,21 +5823,21 @@ public class PGraphics extends PImage implements PConstants {
    * The <b>beginCamera()</b> and <b>endCamera()</b> functions enable
    * advanced customization of the camera space. The functions are useful if
    * you want to more control over camera movement, however for most users,
-   * the <b>camera()</b> function will be sufficient..containsThe camera
+   * the <b>camera()</b> function will be sufficient.The camera
    * functions will replace any transformations (such as <b>rotate()</b> or
    * <b>translate()</b>) that occur before them in <b>draw()</b>, but they
    * will not automatically replace the camera transform itself. For this
    * reason, camera functions should be placed at the beginning of
    * <b>draw()</b> (so that transformations happen afterwards), and the
    * <b>camera()</b> function can be used after <b>beginCamera()</b> if you
-   * want to reset the camera before applying transformations.<br
-   * />This function sets the matrix mode to the camera matrix so calls such
+   * want to reset the camera before applying transformations.
+   This function sets the matrix mode to the camera matrix so calls such
    * as <b>translate()</b>, <b>rotate()</b>, applyMatrix() and resetMatrix()
    * affect the camera. <b>beginCamera()</b> should always be used with a
    * following <b>endCamera()</b> and pairs of <b>beginCamera()</b> and
    * <b>endCamera()</b> cannot be nested.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref lights_camera:camera
    * @see PGraphics#camera()
@@ -5834,7 +5858,7 @@ public class PGraphics extends PImage implements PConstants {
    * advanced customization of the camera space. Please see the reference for
    * <b>beginCamera()</b> for a description of how the functions are used.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref lights_camera:camera
    * @see PGraphics#beginCamera()
@@ -5857,7 +5881,7 @@ public class PGraphics extends PImage implements PConstants {
    * 180.0), width/2.0, height/2.0, 0, 0, 1, 0)</b>. This function is similar
    * to <b>gluLookAt()</b> in OpenGL, but it first clears the current camera settings.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref lights_camera:camera
    * @see PGraphics#beginCamera()
@@ -5891,7 +5915,7 @@ public class PGraphics extends PImage implements PConstants {
    * Prints the current camera matrix to the Console (the text window at the
    * bottom of Processing).
    *
-   * ( end auto-generated )
+   * 
  * @webref lights_camera:camera
  * @see PGraphics#camera(float, float, float, float, float, float, float, float, float)
  */
@@ -5917,7 +5941,7 @@ public class PGraphics extends PImage implements PConstants {
    * parameters are given, the default is used: ortho(0, width, 0, height,
    * -10, 10).
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref lights_camera:camera
    */
@@ -5960,7 +5984,7 @@ public class PGraphics extends PImage implements PConstants {
    * default values are: perspective(PI/3.0, width/height, cameraZ/10.0,
    * cameraZ*10.0) where cameraZ is ((height/2.0) / tan(PI*60.0/360.0));
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref lights_camera:camera
    */
@@ -5985,7 +6009,7 @@ public class PGraphics extends PImage implements PConstants {
    * glFrustum, except it wipes out the current perspective matrix rather
    * than muliplying itself with it.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref lights_camera:camera
    * @param left left coordinate of the clipping plane
@@ -6011,7 +6035,7 @@ public class PGraphics extends PImage implements PConstants {
    * Prints the current projection matrix to the Console (the text window at
    * the bottom of Processing).
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref lights_camera:camera
    * @see PGraphics#camera(float, float, float, float, float, float, float, float, float)
@@ -6033,7 +6057,7 @@ public class PGraphics extends PImage implements PConstants {
    * Takes a three-dimensional X, Y, Z position and returns the X value for
    * where it will appear on a (two-dimensional) screen.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref lights_camera:coordinates
    * @param x 3D x-coordinate to be mapped
@@ -6053,7 +6077,7 @@ public class PGraphics extends PImage implements PConstants {
    * Takes a three-dimensional X, Y, Z position and returns the Y value for
    * where it will appear on a (two-dimensional) screen.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref lights_camera:coordinates
    * @param x 3D x-coordinate to be mapped
@@ -6092,7 +6116,7 @@ public class PGraphics extends PImage implements PConstants {
    * Takes a three-dimensional X, Y, Z position and returns the Z value for
    * where it will appear on a (two-dimensional) screen.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref lights_camera:coordinates
    * @param x 3D x-coordinate to be mapped
@@ -6123,7 +6147,7 @@ public class PGraphics extends PImage implements PConstants {
    * (x, y, z) coordinate returned by the model functions is used to place
    * another box in the same location.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref lights_camera:coordinates
    * @param x 3D x-coordinate to be mapped
@@ -6154,7 +6178,7 @@ public class PGraphics extends PImage implements PConstants {
    * (x, y, z) coordinate returned by the model functions is used to place
    * another box in the same location.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref lights_camera:coordinates
    * @param x 3D x-coordinate to be mapped
@@ -6185,7 +6209,7 @@ public class PGraphics extends PImage implements PConstants {
    * (x, y, z) coordinate returned by the model functions is used to place
    * another box in the same location.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref lights_camera:coordinates
    * @param x 3D x-coordinate to be mapped
@@ -6215,7 +6239,7 @@ public class PGraphics extends PImage implements PConstants {
    * <b>pushStyle()</b>, it builds on the current style information. The
    * <b>pushStyle()</b> and <b>popStyle()</b> functions can be embedded to
    * provide more control (see the second example above for a demonstration.)
-  
+   * 
    * The style information controlled by the following functions are included
    * in the style:
    * fill(), stroke(), tint(), strokeWeight(), strokeCap(), strokeJoin(),
@@ -6223,7 +6247,7 @@ public class PGraphics extends PImage implements PConstants {
    * textAlign(), textFont(), textMode(), textSize(), textLeading(),
    * emissive(), specular(), shininess(), ambient()
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref structure
    * @see PGraphics#popStyle()
@@ -6250,7 +6274,7 @@ public class PGraphics extends PImage implements PConstants {
    * <b>pushStyle()</b> and <b>popStyle()</b> functions can be embedded to
    * provide more control (see the second example above for a demonstration.)
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref structure
    * @see PGraphics#pushStyle()
@@ -6418,7 +6442,7 @@ public class PGraphics extends PImage implements PConstants {
    * operating system's OpenGL implementation. For instance, the thickness
    * may not go higher than 10 pixels.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref shape:attributes
    * @param weight the weight (in pixels) of the stroke
@@ -6443,7 +6467,7 @@ public class PGraphics extends PImage implements PConstants {
    * Issue 123</a>). More information about the renderers can be found in the
    * <b>size()</b> reference.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref shape:attributes
    * @param join either MITER, BEVEL, ROUND
@@ -6467,7 +6491,7 @@ public class PGraphics extends PImage implements PConstants {
    * Issue 123</a>). More information about the renderers can be found in the
    * <b>size()</b> reference.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref shape:attributes
    * @param cap either SQUARE, PROJECT, or ROUND
@@ -6493,7 +6517,7 @@ public class PGraphics extends PImage implements PConstants {
    * Disables drawing the stroke (outline). If both <b>noStroke()</b> and
    * <b>noFill()</b> are called, nothing will be drawn to the screen.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref color:setting
    * @see PGraphics#stroke(int, float)
@@ -6525,7 +6549,7 @@ public class PGraphics extends PImage implements PConstants {
    * current maximum value as specified by <b>colorMode()</b>. The default
    * maximum value is 255.
    *
-   * ( end auto-generated )
+   * 
    *
    * @param rgb color value in hexadecimal notation
    * @see PGraphics#noStroke()
@@ -6613,7 +6637,7 @@ public class PGraphics extends PImage implements PConstants {
    * Removes the current fill value for displaying images and reverts to
    * displaying images with their original hues.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref image:loading_displaying
    * @usage web_application
@@ -6651,7 +6675,7 @@ public class PGraphics extends PImage implements PConstants {
    * The <b>tint()</b> function is also used to control the coloring of
    * textures in 3D.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref image:loading_displaying
    * @usage web_application
@@ -6732,7 +6756,7 @@ public class PGraphics extends PImage implements PConstants {
    * Disables filling geometry. If both <b>noStroke()</b> and <b>noFill()</b>
    * are called, nothing will be drawn to the screen.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref color:setting
    * @usage web_application
@@ -6768,7 +6792,7 @@ public class PGraphics extends PImage implements PConstants {
    * 
    * To change the color of an image (or a texture), use tint().
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref color:setting
    * @usage web_application
@@ -6857,7 +6881,7 @@ public class PGraphics extends PImage implements PConstants {
    * reflect. Used in combination with <b>emissive()</b>, <b>specular()</b>,
    * and <b>shininess()</b> in setting the material properties of shapes.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref lights_camera:material_properties
    * @usage web_application
@@ -6915,7 +6939,7 @@ public class PGraphics extends PImage implements PConstants {
    * with <b>emissive()</b>, <b>ambient()</b>, and <b>shininess()</b> in
    * setting the material properties of shapes.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref lights_camera:material_properties
    * @usage web_application
@@ -6940,6 +6964,8 @@ public class PGraphics extends PImage implements PConstants {
 
 /**
  * gray number specifying value between white and black
+ *
+ * @param gray value between black and white, by default 0 to 255
  */
   public void specular(float gray) {
     colorCalc(gray);
@@ -6973,7 +6999,7 @@ public class PGraphics extends PImage implements PConstants {
    * with <b>ambient()</b>, <b>specular()</b>, and <b>emissive()</b> in
    * setting the material properties of shapes.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref lights_camera:material_properties
    * @usage web_application
@@ -6994,7 +7020,7 @@ public class PGraphics extends PImage implements PConstants {
    * <b>specular()</b>, and <b>shininess()</b> in setting the material
    * properties of shapes.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref lights_camera:material_properties
    * @usage web_application
@@ -7017,6 +7043,8 @@ public class PGraphics extends PImage implements PConstants {
 
   /**
    * gray number specifying value between white and black
+   *
+   * @param gray value between black and white, by default 0 to 255
    */
   public void emissive(float gray) {
     colorCalc(gray);
@@ -7062,7 +7090,7 @@ public class PGraphics extends PImage implements PConstants {
    * looping program will cause them to only have an effect the first time
    * through the loop.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref lights_camera:lights
    * @usage web_application
@@ -7084,7 +7112,7 @@ public class PGraphics extends PImage implements PConstants {
    * lighting so that 2D geometry (which does not require lighting) can be
    * drawn after a set of lighted 3D geometry.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref lights_camera:lights
    * @usage web_application
@@ -7106,7 +7134,7 @@ public class PGraphics extends PImage implements PConstants {
    * have an effect the first time through the loop. The effect of the
    * parameters is determined by the current color mode.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref lights_camera:lights
    * @usage web_application
@@ -7147,7 +7175,7 @@ public class PGraphics extends PImage implements PConstants {
    * direction the light is facing. For example, setting <b>ny</b> to -1 will
    * cause the geometry to be lit from below (the light is facing directly upward).
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref lights_camera:lights
    * @usage web_application
@@ -7178,7 +7206,7 @@ public class PGraphics extends PImage implements PConstants {
    * mode. The <b>x</b>, <b>y</b>, and <b>z</b> parameters set the position
    * of the light.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref lights_camera:lights
    * @usage web_application
@@ -7211,7 +7239,7 @@ public class PGraphics extends PImage implements PConstants {
    * direction or light. The <b>angle</b> parameter affects angle of the
    * spotlight cone.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref lights_camera:lights
    * @usage web_application
@@ -7243,9 +7271,9 @@ public class PGraphics extends PImage implements PConstants {
    *
    * Sets the falloff rates for point lights, spot lights, and ambient
    * lights. The parameters are used to determine the falloff with the
-   * following equation:.containsd = distance from light position to
+   * following equation:d = distance from light position to
    * vertex positionfalloff = 1 / (CONSTANT + d * LINEAR + (d*d) *
-   * QUADRATIC).containsLike <b>fill()</b>, it affects only the elements
+   * QUADRATIC)Like <b>fill()</b>, it affects only the elements
    * which are created after it in the code. The default value if
    * <b>LightFalloff(1.0, 0.0, 0.0)</b>. Thinking about an ambient light with
    * a falloff can be tricky. It is used, for example, if you wanted a region
@@ -7254,7 +7282,7 @@ public class PGraphics extends PImage implements PConstants {
    * and falloff. You can think of it as a point light that doesn't care
    * which direction a surface is facing.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref lights_camera:lights
    * @usage web_application
@@ -7282,7 +7310,7 @@ public class PGraphics extends PImage implements PConstants {
    * specular material qualities set through the <b>specular()</b> and
    * <b>shininess()</b> functions.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref lights_camera:lights
    * @usage web_application
@@ -7323,7 +7351,7 @@ public class PGraphics extends PImage implements PConstants {
    * It is not possible to use transparency (alpha) in background colors with
    * the main drawing surface, however they will work properly with <b>createGraphics()</b>.
    *
-   * ( end auto-generated )
+   * 
    *
    * <h3>Advanced</h3>
    * <p>Clear the background with a color that includes an alpha value. This can
@@ -7543,7 +7571,7 @@ public class PGraphics extends PImage implements PConstants {
    * are specified between 0 and 1. The limits for defining colors are
    * altered by setting the parameters range1, range2, range3, and range 4.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref color:setting
    * @usage web_application
@@ -7881,7 +7909,7 @@ public class PGraphics extends PImage implements PConstants {
    *
    * Extracts the alpha value from a color.
    *
-   * ( end auto-generated )
+   * 
    * @webref color:creating_reading
    * @usage web_application
    * @param rgb any value of the color datatype
@@ -7904,15 +7932,15 @@ public class PGraphics extends PImage implements PConstants {
    *
    * Extracts the red value from a color, scaled to match current
    * <b>colorMode()</b>. This value is always returned as a  float so be
-   * careful not to assign it to an int value..containsThe red() function
+   * careful not to assign it to an int value.The red() function
    * is easy to use and undestand, but is slower than another technique. To
    * achieve the same results when working in <b>colorMode(RGB, 255)</b>, but
    * with greater speed, use the &gt;&gt; (right shift) operator with a bit
-   * mask. For example, the following two lines of code are equivalent:<br
-   * /><pre>float r1 = red(myColor);float r2 = myColor &gt;&gt; 16
+   * mask. For example, the following two lines of code are equivalent:
+   <pre>float r1 = red(myColor);float r2 = myColor &gt;&gt; 16
    * &amp; 0xFF;</pre>
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref color:creating_reading
    * @usage web_application
@@ -7937,7 +7965,7 @@ public class PGraphics extends PImage implements PConstants {
    *
    * Extracts the green value from a color, scaled to match current
    * <b>colorMode()</b>. This value is always returned as a  float so be
-   * careful not to assign it to an int value..containsThe <b>green()</b>
+   * careful not to assign it to an int value.The <b>green()</b>
    * function is easy to use and undestand, but is slower than another
    * technique. To achieve the same results when working in <b>colorMode(RGB,
    * 255)</b>, but with greater speed, use the &gt;&gt; (right shift)
@@ -7945,7 +7973,7 @@ public class PGraphics extends PImage implements PConstants {
    * are equivalent:<pre>float r1 = green(myColor);float r2 =
    * myColor &gt;&gt; 8 &amp; 0xFF;</pre>
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref color:creating_reading
    * @usage web_application
@@ -7970,7 +7998,7 @@ public class PGraphics extends PImage implements PConstants {
    *
    * Extracts the blue value from a color, scaled to match current
    * <b>colorMode()</b>. This value is always returned as a  float so be
-   * careful not to assign it to an int value..containsThe <b>blue()</b>
+   * careful not to assign it to an int value.The <b>blue()</b>
    * function is easy to use and undestand, but is slower than another
    * technique. To achieve the same results when working in <b>colorMode(RGB,
    * 255)</b>, but with greater speed, use a bit mask to remove the other
@@ -7978,7 +8006,7 @@ public class PGraphics extends PImage implements PConstants {
    * equivalent:<pre>float r1 = blue(myColor);float r2 = myColor
    * &amp; 0xFF;</pre>
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref color:creating_reading
    * @usage web_application
@@ -8003,7 +8031,7 @@ public class PGraphics extends PImage implements PConstants {
    *
    * Extracts the hue value from a color.
    *
-   * ( end auto-generated )
+   * 
    * @webref color:creating_reading
    * @usage web_application
    * @param rgb any value of the color datatype
@@ -8029,7 +8057,7 @@ public class PGraphics extends PImage implements PConstants {
    *
    * Extracts the saturation value from a color.
    *
-   * ( end auto-generated )
+   * 
    * @webref color:creating_reading
    * @usage web_application
    * @param rgb any value of the color datatype
@@ -8055,7 +8083,7 @@ public class PGraphics extends PImage implements PConstants {
    *
    * Extracts the brightness value from a color.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref color:creating_reading
    * @usage web_application
@@ -8093,7 +8121,7 @@ public class PGraphics extends PImage implements PConstants {
    * values where 0.0 equal to the first point, 0.1 is very near the first
    * point, 0.5 is half-way in between, etc.
    *
-   * ( end auto-generated )
+   * 
    *
    * @webref color:creating_reading
    * @usage web_application