propane 3.5.0-java → 3.9.0-java

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

@@ -135,7 +135,7 @@ public interface PConstants {
    * useful in combination with the trigonometric functions <b>sin()</b> and
    * <b>cos()</b>.
    *
-   * 
+   * ( end auto-generated )
    * @webref constants
    * @see PConstants#TWO_PI
    * @see PConstants#TAU
@@ -152,7 +152,7 @@ public interface PConstants {
    * circle to its diameter. It is useful in combination with the
    * trigonometric functions <b>sin()</b> and <b>cos()</b>.
    *
-   * 
+   * ( end auto-generated )
    * @webref constants
    * @see PConstants#PI
    * @see PConstants#TWO_PI
@@ -169,7 +169,7 @@ public interface PConstants {
    * It is useful in combination with the trigonometric functions
    * <b>sin()</b> and <b>cos()</b>.
    *
-   * 
+   * ( end auto-generated )
    * @webref constants
    * @see PConstants#PI
    * @see PConstants#TWO_PI
@@ -185,7 +185,7 @@ public interface PConstants {
    * It is useful in combination with the trigonometric functions
    * <b>sin()</b> and <b>cos()</b>.
    *
-   * 
+   * ( end auto-generated )
    * @webref constants
    * @see PConstants#PI
    * @see PConstants#TAU
@@ -201,7 +201,7 @@ public interface PConstants {
    * of a circle to its diameter. It is useful in combination with the
    * trigonometric functions <b>sin()</b> and <b>cos()</b>.
    *
-   * 
+   * ( end auto-generated )
    * @webref constants
    * @see PConstants#PI
    * @see PConstants#TWO_PI

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

@@ -24,24 +24,12 @@
 
 package processing.core;
 
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Graphics2D;
-import java.awt.GraphicsEnvironment;
-import java.awt.RenderingHints;
-import java.awt.Shape;
-import java.awt.Toolkit;
+import java.awt.*;
 import java.awt.font.FontRenderContext;
 import java.awt.font.GlyphVector;
 import java.awt.geom.PathIterator;
-import java.awt.image.BufferedImage;
-import java.awt.image.WritableRaster;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.awt.image.*;
+import java.io.*;
 import java.util.Arrays;
 import java.util.HashMap;
 
@@ -198,7 +186,7 @@ public class PFont implements PConstants {
    * <b>createFont()</b> function for dynamically converting fonts into a
    * format to use with Processing.
    *
-   * 
+   * ( end auto-generated )
    *
    * @nowebref
    * @param font font the font object to create from
@@ -890,7 +878,7 @@ public class PFont implements PConstants {
    * fonts. This function is meant as a tool for programming local
    * applications and is not recommended for use in applets.
    *
-   * 
+   * ( end auto-generated )
    *
    * @webref pfont
    * @usage application

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

@@ -63,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.
@@ -109,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
-   * <code>if (imageMode == BLAH)</code> placement/sizing logic, so that's handled
+   * <tt>if (imageMode == BLAH)</tt> placement/sizing logic, so that's handled
    * by PGraphics, which then calls imageImpl() once all that is figured out.
    *
    * <h2>His brother PImage</h2>
@@ -136,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
@@ -628,8 +628,8 @@ public class PGraphics extends PImage implements PConstants {
     sinLUT = new float[SINCOS_LENGTH];
     cosLUT = new float[SINCOS_LENGTH];
     for (int i = 0; i < SINCOS_LENGTH; i++) {
-      sinLUT[i] = (float) Math.sin(i * DEG_TO_RAD * SINCOS_PRECISION);
-      cosLUT[i] = (float) Math.cos(i * DEG_TO_RAD * SINCOS_PRECISION);
+      sinLUT[i] = (float) Math.sin(Math.toRadians(i * SINCOS_PRECISION));
+      cosLUT[i] = (float) Math.cos(Math.toRadians(i * SINCOS_PRECISION));
     }
   }
 
@@ -741,9 +741,10 @@ public class PGraphics extends PImage implements PConstants {
 
 
   /**
-   * Set (or unset) this as the main drawing surface. Meaning that it can
-   * safely be set to opaque (and given a default gray background), or anything
-   * else that goes along with that.
+   * Set (or unset) this as the main drawing surface.Meaning that it can
+ safely be set to opaque (and given a default gray background), or anything
+ else that goes along with that.
+   * @param primary
    */
   public void setPrimary(boolean primary) {  // ignore
     this.primaryGraphics = primary;
@@ -768,15 +769,14 @@ public class PGraphics extends PImage implements PConstants {
 
 
   /**
-   * The final step in setting up a renderer, set its size of this renderer.
-   * This was formerly handled by the constructor, but instead it's been broken
-   * out so that setParent/setPrimary/setPath can be handled differently.
-   *
-   * Important: this is ignored by the Methods task because otherwise it will
-   * override setSize() in PApplet/Applet/Component, which will 1) not call
-   * super.setSize(), and 2) will cause the renderer to be resized from the
-   * event thread (EDT), causing a nasty crash as it collides with the
-   * animation thread.
+   * The final step in setting up a renderer, set its size of this renderer.This was formerly handled by the constructor, but instead it's been broken
+ out so that setParent/setPrimary/setPath can be handled differently.Important: this is ignored by the Methods task because otherwise it will
+ override setSize() in PApplet/Applet/Component, which will 1) not call
+ super.setSize(), and 2) will cause the renderer to be resized from the
+ event thread (EDT), causing a nasty crash as it collides with the
+ animation thread.
+   * @param w
+   * @param h
    */
   public void setSize(int w, int h) {  // ignore
     width = w;
@@ -845,10 +845,11 @@ public class PGraphics extends PImage implements PConstants {
 
 
   /**
-   * Get cache storage data for the specified renderer. Because each renderer
-   * will cache data in different formats, it's necessary to store cache data
-   * keyed by the renderer object. Otherwise, attempting to draw the same
-   * image to both a PGraphicsJava2D and a PGraphicsOpenGL will cause errors.
+   * Get cache storage data for the specified renderer.Because each renderer
+ will cache data in different formats, it's necessary to store cache data
+ keyed by the renderer object. Otherwise, attempting to draw the same
+ image to both a PGraphicsJava2D and a PGraphicsOpenGL will cause errors.
+   * @param image
    * @return metadata stored for the specified renderer
    */
   public Object getCache(PImage image) {  // ignore
@@ -895,7 +896,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.
@@ -912,7 +913,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
@@ -1156,7 +1157,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
@@ -1224,7 +1225,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
@@ -1239,8 +1240,8 @@ public class PGraphics extends PImage implements PConstants {
 
 
   /**
-   * Sets whether the upcoming vertex is part of an edge.
-   * Equivalent to glEdgeFlag(), for people familiar with OpenGL.
+   * Sets whether the upcoming vertex is part of an edge.Equivalent to glEdgeFlag(), for people familiar with OpenGL.
+   * @param edge
    */
   public void edge(boolean edge) {
    this.edge = edge;
@@ -1257,7 +1258,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
@@ -1326,7 +1327,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)
@@ -1366,7 +1367,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)
@@ -1621,7 +1622,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
@@ -1651,18 +1652,18 @@ public class PGraphics extends PImage implements PConstants {
 
 
   /**
-   * Set (U, V) coords for the next vertex in the current shape.
-   * This is ugly as its own function, and will (almost?) always be
-   * coincident with a call to vertex. As of beta, this was moved to
-   * the protected method you see here, and called from an optional
-   * param of and overloaded vertex().
-   * 
+   * Set (U, V) coords for the next vertex in the current shape.This is ugly as its own function, and will (almost?) always be
+ coincident with a call to vertex.As of beta, this was moved to
+ the protected method you see here, and called from an optional
+ param of and overloaded vertex().
    * The parameters depend on the current textureMode. When using
-   * textureMode(IMAGE), the coordinates will be relative to the size
-   * of the image texture, when used with textureMode(NORMAL),
-   * they'll be in the range 0..1.
-   * 
-   * Used by both PGraphics2D (for images) and PGraphics3D.
+ textureMode(IMAGE), the coordinates will be relative to the size
+ of the image texture, when used with textureMode(NORMAL),
+ they'll be in the range 0..1.
+ 
+ Used by both PGraphics2D (for images) and PGraphics3D.
+   * @param u
+   * @param v
    */
   protected void vertexTexture(float u, float v) {
     if (textureImage == null) {
@@ -1722,7 +1723,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
@@ -1739,6 +1740,7 @@ public class PGraphics extends PImage implements PConstants {
 
 
   /**
+   * @return 
    * @webref shape
    * @param filename name of file to load, can be .svg or .obj
    * @see PShape
@@ -1890,7 +1892,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
@@ -1915,7 +1917,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
@@ -1938,7 +1940,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
    */
@@ -1975,7 +1977,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
@@ -1984,35 +1986,32 @@ public class PGraphics extends PImage implements PConstants {
    * @param d height of the rectangle, by default
    */
   public void clip(float a, float b, float c, float d) {
-    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;
-      }
-
-      clipImpl(a, b, a + c, b + d);
-
-    } 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;
+      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;
+              }       clipImpl(a, b, a + c, b + d);
+              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;
+              }       clipImpl(a, b, c, d);
+              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;
+              clipImpl(x1, y1, x1 + c, y1 + d);
+              break;
+          default:
+              break;
       }
-
-      clipImpl(a, b, c, d);
-
-    } 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;
-
-      clipImpl(x1, y1, x1 + c, y1 + d);
-    }
   }
 
 
@@ -2026,7 +2025,7 @@ public class PGraphics extends PImage implements PConstants {
    *
    * Disables the clipping previously started by the <b>clip()</b> function.
    *
-   * 
+   * ( end auto-generated )
    *
    * @webref rendering
    */
@@ -2045,7 +2044,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
@@ -2127,7 +2126,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
@@ -2260,7 +2259,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
@@ -2411,7 +2410,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
@@ -2446,7 +2445,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
@@ -2483,7 +2482,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
@@ -2512,7 +2511,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
@@ -2558,7 +2557,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)
@@ -2577,7 +2576,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
@@ -2743,7 +2742,7 @@ public class PGraphics extends PImage implements PConstants {
    * 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
@@ -2777,7 +2776,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)
@@ -2796,7 +2795,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
@@ -2811,24 +2810,24 @@ public class PGraphics extends PImage implements PConstants {
     float w = c;
     float h = d;
 
-    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;
-    }
+      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
       x += w;
@@ -2857,7 +2856,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
@@ -2885,24 +2884,24 @@ public class PGraphics extends PImage implements PConstants {
     float w = c;
     float h = d;
 
-    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;
-    }
+      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
     if (!Float.isInfinite(start) && !Float.isInfinite(stop)) {
@@ -2948,7 +2947,7 @@ public class PGraphics extends PImage implements PConstants {
    * 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
@@ -2971,7 +2970,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)
@@ -3064,7 +3063,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].
@@ -3130,7 +3129,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>
@@ -3237,7 +3236,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>
@@ -3281,7 +3280,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.
@@ -3324,7 +3323,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
@@ -3372,7 +3371,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
@@ -3440,7 +3439,7 @@ public class PGraphics extends PImage implements PConstants {
    * 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 control point
@@ -3474,7 +3473,7 @@ public class PGraphics extends PImage implements PConstants {
    * of <em><a href="http://en.wikipedia.org/wiki/Tangent"
    * target="new">tangent on Wikipedia</a></em>.
    *
-   * 
+   * ( end auto-generated )
    *
    * <h3>Advanced</h3>
    * Code thanks to Dave Bollinger (Bug #715)
@@ -3512,7 +3511,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
@@ -3537,7 +3536,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
@@ -3616,7 +3615,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
@@ -3763,7 +3762,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
@@ -3803,7 +3802,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,
@@ -3862,38 +3861,38 @@ 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;
 
-    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;
-    }
+      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;
+      }
   }
 
 
@@ -3978,7 +3977,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
@@ -4029,7 +4028,7 @@ public class PGraphics extends PImage implements PConstants {
    * 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
@@ -4067,6 +4066,7 @@ public class PGraphics extends PImage implements PConstants {
 
 
   /**
+     * @param shape
    * @param a x-coordinate of the shape
    * @param b y-coordinate of the shape
    * @param c width to display the shape
@@ -4078,27 +4078,26 @@ public class PGraphics extends PImage implements PConstants {
 
       pushMatrix();
 
-      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;
-      }
+        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);
 
       popMatrix();
@@ -4198,7 +4197,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
@@ -4224,7 +4223,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()
@@ -4245,7 +4244,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()
@@ -4266,18 +4265,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>. 
-   *  Because fonts are usually bitmaped, you should create fonts at
+   * "Create Font..." tool) until it is changed with <b>textSize()</b>. <br
+   * />  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. 
-   * With the default (JAVA2D) and PDF renderers, it's also possible
+   * without the size parameter will result in the cleanest-looking text. <br
+   * /> 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
@@ -4364,7 +4363,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
@@ -4400,7 +4399,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
@@ -4446,7 +4445,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
@@ -4510,7 +4509,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
@@ -4593,7 +4592,7 @@ public class PGraphics extends PImage implements PConstants {
    * 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
@@ -4695,27 +4694,21 @@ public class PGraphics extends PImage implements PConstants {
         high += textLeading;
       }
     }
-    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;
+    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
     }
 
 //    int start = 0;
@@ -4866,33 +4859,27 @@ public class PGraphics extends PImage implements PConstants {
     int lineFitCount = 1 + PApplet.floor((boxHeight - topAndBottom) / textLeading);
     int lineCount = Math.min(textBreakCount, lineFitCount);
 
-    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;
-        }
+    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;
+      }
     }
   }
 
@@ -5215,7 +5202,7 @@ public class PGraphics extends PImage implements PConstants {
    * transformations (rotate, scale, translate) and the drawing styles
    * at the same time.
    *
-   * 
+   * ( end auto-generated )
    *
    * @webref structure
    * @see PGraphics#pop()
@@ -5252,7 +5239,7 @@ public class PGraphics extends PImage implements PConstants {
    * transformations (rotate, scale, translate) and the drawing styles
    * at the same time.
    *
-   * 
+   * ( end auto-generated )
    *
    * @webref structure
    * @see PGraphics#push()
@@ -5281,7 +5268,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()
@@ -5308,7 +5295,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()
@@ -5340,7 +5327,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
@@ -5385,7 +5372,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
@@ -5418,7 +5405,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
@@ -5451,7 +5438,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
@@ -5484,7 +5471,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
@@ -5530,7 +5517,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
@@ -5588,7 +5575,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
@@ -5622,7 +5609,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
@@ -5649,7 +5636,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()
@@ -5669,7 +5656,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
@@ -5800,7 +5787,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()
@@ -5831,13 +5818,13 @@ public class PGraphics extends PImage implements PConstants {
    * <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.
-   This function sets the matrix mode to the camera matrix so calls such
+   * 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()
@@ -5858,7 +5845,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()
@@ -5881,7 +5868,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()
@@ -5915,7 +5902,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)
  */
@@ -5941,7 +5928,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
    */
@@ -5984,7 +5971,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
    */
@@ -6009,7 +5996,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
@@ -6035,7 +6022,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)
@@ -6057,7 +6044,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
@@ -6077,7 +6064,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
@@ -6093,6 +6080,7 @@ public class PGraphics extends PImage implements PConstants {
 
   /**
    * @param z 3D z-coordinate to be mapped
+   * @return 
    */
   public float screenX(float x, float y, float z) {
     showMissingWarning("screenX");
@@ -6114,10 +6102,10 @@ public class PGraphics extends PImage implements PConstants {
    * ( begin auto-generated from screenZ.xml )
    *
    * Takes a three-dimensional X, Y, Z position and returns the Z value for
-   * where it will appear on a (two-dimensional) screen.
+   * where it will appear on a (two-dimensional) screen.( end auto-generated )
    *
-   * 
    *
+   * @return 
    * @webref lights_camera:coordinates
    * @param x 3D x-coordinate to be mapped
    * @param y 3D y-coordinate to be mapped
@@ -6134,21 +6122,20 @@ public class PGraphics extends PImage implements PConstants {
   /**
    * ( begin auto-generated from modelX.xml )
    *
-   * Returns the three-dimensional X, Y, Z position in model space. This
-   * returns the X value for a given coordinate based on the current set of
-   * transformations (scale, rotate, translate, etc.) The X value can be used
-   * to place an object in space relative to the location of the original
-   * point once the transformations are no longer in use.
-   * 
-   * In the example, the <b>modelX()</b>, <b>modelY()</b>, and
+   * Returns the three-dimensional X, Y, Z position in model space.This
+ returns the X value for a given coordinate based on the current set of
+ transformations (scale, rotate, translate, etc.) The X value can be used
+ to place an object in space relative to the location of the original
+ point once the transformations are no longer in use. In the example, the <b>modelX()</b>, <b>modelY()</b>, and
    * <b>modelZ()</b> functions record the location of a box in space after
    * being placed using a series of translate and rotate commands. After
    * popMatrix() is called, those transformations no longer apply, but the
    * (x, y, z) coordinate returned by the model functions is used to place
    * another box in the same location.
    *
-   * 
+   * ( end auto-generated )
    *
+   * @return 
    * @webref lights_camera:coordinates
    * @param x 3D x-coordinate to be mapped
    * @param y 3D y-coordinate to be mapped
@@ -6165,21 +6152,20 @@ public class PGraphics extends PImage implements PConstants {
   /**
    * ( begin auto-generated from modelY.xml )
    *
-   * Returns the three-dimensional X, Y, Z position in model space. This
-   * returns the Y value for a given coordinate based on the current set of
-   * transformations (scale, rotate, translate, etc.) The Y value can be used
-   * to place an object in space relative to the location of the original
-   * point once the transformations are no longer in use.
-   * 
-   * In the example, the <b>modelX()</b>, <b>modelY()</b>, and
+   * Returns the three-dimensional X, Y, Z position in model space.This
+ returns the Y value for a given coordinate based on the current set of
+ transformations (scale, rotate, translate, etc.) The Y value can be used
+ to place an object in space relative to the location of the original
+ point once the transformations are no longer in use. In the example, the <b>modelX()</b>, <b>modelY()</b>, and
    * <b>modelZ()</b> functions record the location of a box in space after
    * being placed using a series of translate and rotate commands. After
    * popMatrix() is called, those transformations no longer apply, but the
    * (x, y, z) coordinate returned by the model functions is used to place
    * another box in the same location.
    *
-   * 
+   * ( end auto-generated )
    *
+   * @return 
    * @webref lights_camera:coordinates
    * @param x 3D x-coordinate to be mapped
    * @param y 3D y-coordinate to be mapped
@@ -6196,21 +6182,20 @@ public class PGraphics extends PImage implements PConstants {
   /**
    * ( begin auto-generated from modelZ.xml )
    *
-   * Returns the three-dimensional X, Y, Z position in model space. This
-   * returns the Z value for a given coordinate based on the current set of
-   * transformations (scale, rotate, translate, etc.) The Z value can be used
-   * to place an object in space relative to the location of the original
-   * point once the transformations are no longer in use.
-   * 
-   * In the example, the <b>modelX()</b>, <b>modelY()</b>, and
+   * Returns the three-dimensional X, Y, Z position in model space.This
+ returns the Z value for a given coordinate based on the current set of
+ transformations (scale, rotate, translate, etc.) The Z value can be used
+ to place an object in space relative to the location of the original
+ point once the transformations are no longer in use. In the example, the <b>modelX()</b>, <b>modelY()</b>, and
    * <b>modelZ()</b> functions record the location of a box in space after
    * being placed using a series of translate and rotate commands. After
    * popMatrix() is called, those transformations no longer apply, but the
    * (x, y, z) coordinate returned by the model functions is used to place
    * another box in the same location.
    *
-   * 
+   * ( end auto-generated )
    *
+   * @return 
    * @webref lights_camera:coordinates
    * @param x 3D x-coordinate to be mapped
    * @param y 3D y-coordinate to be mapped
@@ -6247,7 +6232,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()
@@ -6274,7 +6259,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()
@@ -6442,7 +6427,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
@@ -6467,7 +6452,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
@@ -6491,7 +6476,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
@@ -6517,7 +6502,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)
@@ -6549,7 +6534,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()
@@ -6637,7 +6622,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
@@ -6675,7 +6660,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
@@ -6756,7 +6741,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
@@ -6792,7 +6777,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
@@ -6881,7 +6866,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
@@ -6939,7 +6924,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
@@ -6999,7 +6984,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
@@ -7020,7 +7005,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
@@ -7090,7 +7075,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
@@ -7112,7 +7097,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
@@ -7134,7 +7119,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
@@ -7175,7 +7160,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
@@ -7206,7 +7191,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
@@ -7239,7 +7224,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
@@ -7282,7 +7267,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
@@ -7310,7 +7295,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
@@ -7351,7 +7336,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
@@ -7571,7 +7556,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
@@ -7909,7 +7894,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
@@ -7936,11 +7921,11 @@ public class PGraphics extends PImage implements PConstants {
    * 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:
-   <pre>float r1 = red(myColor);float r2 = myColor &gt;&gt; 16
+   * mask. For example, the following two lines of code are equivalent:<br
+   * /><pre>float r1 = red(myColor);float r2 = myColor &gt;&gt; 16
    * &amp; 0xFF;</pre>
    *
-   * 
+   * ( end auto-generated )
    *
    * @webref color:creating_reading
    * @usage web_application
@@ -7973,7 +7958,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
@@ -8006,7 +7991,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
@@ -8029,9 +8014,9 @@ public class PGraphics extends PImage implements PConstants {
   /**
    * ( begin auto-generated from hue.xml )
    *
-   * Extracts the hue value from a color.
+   * Extracts the hue value from a color.( end auto-generated )
    *
-   * 
+   * @return
    * @webref color:creating_reading
    * @usage web_application
    * @param rgb any value of the color datatype
@@ -8055,9 +8040,9 @@ public class PGraphics extends PImage implements PConstants {
   /**
    * ( begin auto-generated from saturation.xml )
    *
-   * Extracts the saturation value from a color.
+   * Extracts the saturation value from a color.( end auto-generated )
    *
-   * 
+   * @return
    * @webref color:creating_reading
    * @usage web_application
    * @param rgb any value of the color datatype
@@ -8081,10 +8066,10 @@ public class PGraphics extends PImage implements PConstants {
   /**
    * ( begin auto-generated from brightness.xml )
    *
-   * Extracts the brightness value from a color.
+   * Extracts the brightness value from a color.( end auto-generated )
    *
-   * 
    *
+   * @return 
    * @webref color:creating_reading
    * @usage web_application
    * @param rgb any value of the color datatype
@@ -8121,7 +8106,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
@@ -8220,6 +8205,7 @@ public class PGraphics extends PImage implements PConstants {
 
   /**
    * Record individual lines and triangles by echoing them to another renderer.
+   * @param rawGraphics
    */
   public void beginRaw(PGraphics rawGraphics) {  // ignore
     this.raw = rawGraphics;
@@ -8277,6 +8263,8 @@ public class PGraphics extends PImage implements PConstants {
 
   /**
    * Version of showWarning() that takes a parsed String.
+   * @param msg
+   * @param args
    */
   static public void showWarning(String msg, Object... args) {  // ignore
     showWarning(String.format(msg, args));
@@ -8308,6 +8296,7 @@ public class PGraphics extends PImage implements PConstants {
 
   /**
    * Display a warning that the specified method is simply unavailable.
+   * @param method
    */
   static public void showMethodWarning(String method) {
     showWarning(method + "() is not available with this renderer.");
@@ -8316,8 +8305,9 @@ public class PGraphics extends PImage implements PConstants {
 
   /**
    * Error that a particular variation of a method is unavailable (even though
-   * other variations are). For instance, if vertex(x, y, u, v) is not
-   * available, but vertex(x, y) is just fine.
+   * other variations are).For instance, if vertex(x, y, u, v) is not
+ available, but vertex(x, y) is just fine.
+   * @param str
    */
   static public void showVariationWarning(String str) {
     showWarning(str + " is not available with this renderer.");
@@ -8328,6 +8318,7 @@ public class PGraphics extends PImage implements PConstants {
    * Display a warning that the specified method is not implemented, meaning
    * that it could be either a completely missing function, although other
    * variations of it may still work properly.
+   * @param method
    */
   static public void showMissingWarning(String method) {
     showWarning(method + "(), or this particular variation of it, " +
@@ -8336,9 +8327,10 @@ public class PGraphics extends PImage implements PConstants {
 
 
   /**
-   * Show an renderer-related exception that halts the program. Currently just
-   * wraps the message as a RuntimeException and throws it, but might do
-   * something more specific might be used in the future.
+   * Show an renderer-related exception that halts the program.Currently just
+ wraps the message as a RuntimeException and throws it, but might do
+ something more specific might be used in the future.
+   * @param msg
    */
   static public void showException(String msg) {  // ignore
     throw new RuntimeException(msg);
@@ -8347,6 +8339,7 @@ public class PGraphics extends PImage implements PConstants {
 
   /**
    * Same as below, but defaults to a 12 point font, just as MacWrite intended.
+   * @param method
    */
   protected void defaultFontOrDeath(String method) {
     defaultFontOrDeath(method, 12);
@@ -8357,6 +8350,8 @@ public class PGraphics extends PImage implements PConstants {
    * First try to create a default font, but if that's not possible, throw
    * an exception that halts the program because textFont() has not been used
    * prior to the specified method.
+   * @param method
+   * @param size
    */
   protected void defaultFontOrDeath(String method, float size) {
     if (parent != null) {