Slight reference updates for 2.0

REAS · REAS · commit 23b1a3cc5ba4 · 2011-09-18T07:37:02.000Z
diff --git a/content/api_en/LIB_video/captureEvent.xml b/content/api_en/LIB_video/captureEvent.xml
@@ -31,7 +31,7 @@ void captureEvent(Capture myCapture) {
 </example>
 
 <description><![CDATA[
-Called when a new camera frame is available. Use the <b>read()</b> method to capture this frame. If there is more than one capture device in the program, <b>captureEvent()</b> is called each time any of the devices has a new frame available. Use an <b>if()</b> within the function to determine which device is triggering the event.]]></description>
+Called when a new camera frame is available. Use the <b>read()</b> method to capture this frame. If there is more than one capture device in the program, <b>captureEvent()</b> is called each time any of the devices has a new frame available. Use an <b>if</b> within the function to determine which device is triggering the event.]]></description>
 
 <syntax>
 void captureEvent(Capture <c>which</c>) {
diff --git a/content/api_en/LIB_video/movieEvent.xml b/content/api_en/LIB_video/movieEvent.xml
@@ -63,7 +63,7 @@ void movieEvent(Movie m) {
 </example>
 
 <description><![CDATA[
-Called when a new movie frame is available. Use the <b>read()</b> method to capture this frame. If there is more than one movie in the program, <b>movieEvent()</b> is called each time any of the movies has a new frame available. Use an <b>if()</b> to determine which movie is triggering the event. See the above example for implementation details.
+Called when a new movie frame is available. Use the <b>read()</b> method to capture this frame. If there is more than one movie in the program, <b>movieEvent()</b> is called each time any of the movies has a new frame available. Use an <b>if</b> to determine which movie is triggering the event. See the above example for implementation details.
 ]]></description>
 
 <syntax>
diff --git a/content/api_en/camera.xml b/content/api_en/camera.xml
@@ -22,7 +22,7 @@ box(45);
 </example>
 
 <description><![CDATA[
-Sets the position of the camera through setting the eye position, the center of the scene, and which axis is facing upward. Moving the eye position and the direction it is pointing (the center of the scene) allows the images to be seen from different angles. The version without any parameters sets the camera to the default position, pointing to the center of the display window with the Y axis as up. The default values are camera(width/2.0, height/2.0, (height/2.0) / tan(PI*60.0 / 360.0), width/2.0, height/2.0, 0, 0, 1, 0). This function is similar to gluLookAt() in OpenGL, but it first clears the current camera settings.
+Sets the position of the camera through setting the eye position, the center of the scene, and which axis is facing upward. Moving the eye position and the direction it is pointing (the center of the scene) allows the images to be seen from different angles. The version without any parameters sets the camera to the default position, pointing to the center of the display window with the Y axis as up. The default values are <b>camera(width/2.0, height/2.0, (height/2.0) / tan(PI*30.0 / 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.
 ]]></description>
 
 </root>
diff --git a/content/api_en/include/String.xml b/content/api_en/include/String.xml
@@ -46,7 +46,7 @@ println(quoted);  // This one has "quotes"
 <description><![CDATA[
 A string is a sequence of characters. The class <b>String</b> includes methods for examining individual characters, comparing strings, searching strings, extracting parts of strings, and for converting an entire string uppercase and lowercase. Strings are always defined inside double quotes ("Abc") and characters are always defined inside single quotes('A'). 
 <br /> <br />
-To compare the contents of two Strings, use the <b>equals()</b> method, as in "if (a.equals(b))", instead of "if (a == b)". A String is an Object, so comparing them with the == operator only compares whether both Strings are stored in the same memory location. Using the <b>equals()</b> method will ensure that the actual contents are compared. (The <a href="http://processing.org/reference/troubleshooting/index.html#strings">troubleshooting</a> reference has a longer explanation.)<br /> 
+To compare the contents of two Strings, use the <b>equals()</b> method, as in "if (a.equals(b))", instead of "if (a == b)". A String is an Object, so comparing them with the == operator only compares whether both Strings are stored in the same memory location. Using the <b>equals()</b> method will ensure that the actual contents are compared. (The <a href="http://wiki.processing.org/w/Troubleshooting#Why_don.27t_these_Strings_equal.3F">troubleshooting</a> reference has a longer explanation.)<br /> 
 <br />
 Because a String is defined within quotes, including quotes in a String requires the \\ (backslash) character to be used (see the second example above). This is known as an <em>escape sequence</em>. Other escape sequences include \\t for the tab character, and \\n for new line. A single backslash is indicated by \\.<br /> 
 <br />
diff --git a/content/api_en/include/bitwiseAND.xml b/content/api_en/include/bitwiseAND.xml
@@ -1,64 +1,74 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<root>
-    <name>&amp; (bitwise AND)</name>
-    <category>Math</category>
-    <subcategory>Bitwise Operators</subcategory>
-    <usage>Web &amp; Application</usage>
-    
-    <example>
-        <image></image>
-        <code><![CDATA[
-int a = 207;    // In binary: 11001111
-int b = 61;     // In binary: 00111101
-int c = a &amp; b; // In binary: 00001101
-println(c);     // Prints "13", the decimal equivalent to 00001101
-        ]]></code>
-    </example>
-    
-    <example>
-        <image></image>
-        <code><![CDATA[
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<root>
+
+<name>&amp; (bitwise AND)</name>
+
+<category>Math</category>
+
+<subcategory>Bitwise Operators</subcategory>
+
+<usage>Web &amp; Application</usage>
+    
+<example>
+<image></image>
+<code><![CDATA[
+int a = 207;    // In binary: 11001111
+int b = 61;     // In binary: 00111101
+int c = a &amp; b; // In binary: 00001101
+println(c);     // Prints "13", the decimal equivalent to 00001101
+]]></code>
+</example>
+    
+<example>
+<image></image>
+<code><![CDATA[
+
 color argb = color(204, 204, 51, 255);
-// The sytax "&amp; 0xFF" compares the binary
-// representation of the two values and 
+// The sytax "& 0xFF" compares the binary
+// representation of the two values and
 // makes all but the last 8 bits into a 0.
-// "0xFF" is 00000000000000000000000011111111 
-int a = argb &gt;&gt; 24 &amp; 0xFF;
-int r = argb &gt;&gt; 16 &amp; 0xFF;
-int g = argb &gt;&gt; 8 &amp; 0xFF;
-int b = argb &amp; 0xFF;        
+// "0xFF" is 00000000000000000000000011111111
+int a = argb >> 24 & 0xFF;
+int r = argb >> 16 & 0xFF;
+int g = argb >> 8 & 0xFF;
+int b = argb & 0xFF;
 fill(r, g, b, a);
-rect(30, 20, 55, 55);
-        ]]></code>
-    </example>
-    
-    <description><![CDATA[Compares each corresponding bit in the binary representation of the values. For each comparison two 1's yeild 1, 1 and 0 yeild 0, and two 0's yeild 0. This is easy to see when we look at the binary representation of numbers
-
-<pre>  11010110  // 214
-&amp; 01011100  // 92
-  --------
-  01010100  // 84
-</pre>
-
-To see the binary representation of a number, use the <b>binary()</b> function with <b>println()</b>.]]></description>
-    
-    <syntax><c>value</c> &amp; <c>value2</c></syntax>
-    
-    <parameter>
-        <label>value1</label>
-        <description><![CDATA[int, char, byte]]></description>
-    </parameter>
-    
-    <parameter>
-        <label>value2</label>
-        <description><![CDATA[int, char, byte]]></description>
-    </parameter>
-    
-    <returns></returns>
-    <related>| (bitwise OR)
-binary()</related>
-    <availability>1.0</availability>
-    <type>Operator</type>
-    <partof>PDE</partof>
-    <level>Extended</level>
+rect(30, 20, 55, 55);
+]]></code></example>
+    
+<description><![CDATA[Compares each corresponding bit in the binary representation of the values. For each comparison two 1's yield 1, 1 and 0 yield 0, and two 0's yield 0. This is easy to see when we look at the binary representation of numbers<br />
+<br />
+<pre>  11010110  // 214
+& 01011100  // 92
+  --------
+  01010100  // 84</pre>
+<br />
+To see the binary representation of a number, use the <b>binary()</b> function with <b>println()</b>.
+]]></description>
+    
+<syntax><c>value</c> &amp; <c>value2</c></syntax>
+    
+<parameter>
+    <label>value1</label>
+    <description><![CDATA[int, char, byte]]></description>
+</parameter>
+    
+<parameter>
+    <label>value2</label>
+    <description><![CDATA[int, char, byte]]></description>
+</parameter>
+    
+<returns></returns>
+
+<related>| (bitwise OR)
+binary()</related>
+
+<availability>1.0</availability>
+
+<type>Operator</type>
+
+<partof>PDE</partof>
+
+<level>Extended</level>
+
 </root>
diff --git a/content/api_en/include/bitwiseOR.xml b/content/api_en/include/bitwiseOR.xml
@@ -22,6 +22,7 @@ println(c);    // Prints "237", the decimal equivalent to 11101101
 <example>
 <image></image>
 <code><![CDATA[
+
 int a = 255 &lt;&lt; 24; // Binary: 11111111000000000000000000000000
 int r = 204 &lt;&lt; 16; // Binary: 00000000110011000000000000000000
 int g = 204 &lt;&lt; 8;  // Binary  00000000000000001100110000000000
@@ -34,7 +35,14 @@ rect(30, 20, 55, 55);
 </example>
 
 <description><![CDATA[
-Compares each corresponding bit in the binary representation of the values. For each comparison two 1's yeild 1, 1 and 0 yeild 1, and two 0's yeild 0. This is easy to see when we look at the binary representation of numbers<br /><br /><pre>  11010110  // 214<br />& 01011100  // 92<br />  --------<br />  11011110  // 222</pre><br />To see the binary representation of a number, use the <b>binary()</b> function with <b>println()</b>.
+Compares each corresponding bit in the binary representation of the values. For each comparison two 1's yield 1, 1 and 0 yield 1, and two 0's yield 0. This is easy to see when we look at the binary representation of numbers<br />
+<br />
+<pre>  11010110  // 214
+& 01011100  // 92
+  --------
+  11011110  // 222</pre>
+<br />
+To see the binary representation of a number, use the <b>binary()</b> function with <b>println()</b>.
 ]]></description>
 
 <syntax>
diff --git a/content/api_en/include/break.xml b/content/api_en/include/break.xml
@@ -28,7 +28,7 @@ switch(letter) {
 </example>
 
 <description><![CDATA[
-Ends the execution of a structure such as switch(), for(), or while() and jumps to the next statement after.
+Ends the execution of a structure such as <b>switch</b>, <b>for</b>, or <b>while</b> and jumps to the next statement after.
 ]]></description>
 
 <syntax></syntax>
@@ -37,9 +37,9 @@ Ends the execution of a structure such as switch(), for(), or while() and jumps
 <returns></returns>
 
 <related>
-switch()
-for()
-while()
+switch
+for
+while
 </related>
 
 <availability>1.0</availability>
diff --git a/content/api_en/include/case.xml b/content/api_en/include/case.xml
@@ -28,7 +28,7 @@ switch(letter) {
 </example>
 
 <description><![CDATA[
-Denotes the different labels to be evaluated with the parameter in the <b>switch()</b> structure.
+Denotes the different labels to be evaluated with the parameter in the <b>switch</b> structure.
 ]]></description>
 
 <syntax>
@@ -48,7 +48,7 @@ case <c>label</c>: <c>statements</c>
 <returns></returns>
 
 <related>
-switch()
+switch
 default
 break
 </related>
diff --git a/content/api_en/include/conditional.xml b/content/api_en/include/conditional.xml
@@ -55,7 +55,7 @@ is equivalent to this structure: <br />
 <returns>Variable, dependent on the datatype of the expressions</returns>
 
 <related>
-if()
+if
 else
 </related>
 
diff --git a/content/api_en/include/continue.xml b/content/api_en/include/continue.xml
@@ -21,7 +21,7 @@ for(int i = 0; i < 100; i += 10) {
 </example>
 
 <description><![CDATA[
-When run inside of a for() or while(), it skips the remainder of the block and starts the next iteration.
+When run inside of a <b>for</b> or <b>while</b>, it skips the remainder of the block and starts the next iteration.
 ]]></description>
 
 <syntax>
@@ -36,8 +36,8 @@ When run inside of a for() or while(), it skips the remainder of the block and s
 <returns></returns>
 
 <related>
-for()
-while()
+for
+while
 </related>
 
 <availability>1.0</availability>
diff --git a/content/api_en/include/curlybraces.xml b/content/api_en/include/curlybraces.xml
@@ -26,7 +26,7 @@ void draw() {
 </example>
 
 <description><![CDATA[
-Define the beginning and end of functions blocks and statement blocks such as the <b>for()</b> and <b>if()</b> structures. Curly braces are also used for defining inital values in array declarations.
+Define the beginning and end of functions blocks and statement blocks such as the <b>for</b> and <b>if</b> structures. Curly braces are also used for defining inital values in array declarations.
 ]]></description>
 
 <syntax>
diff --git a/content/api_en/include/default.xml b/content/api_en/include/default.xml
@@ -28,7 +28,7 @@ switch(letter) {
 </example>
 
 <description><![CDATA[
-Keyword for defining the default condition of a <b>switch()</b>. If none of the case labels match the <b>switch()</b> parameter, the statement(s) after the <b>default</b> syntax are executed. Switch structures don't require a <b>default</b>.
+Keyword for defining the default condition of a <b>switch</b>. If none of the case labels match the <b>switch</b> parameter, the statement(s) after the <b>default</b> syntax are executed. Switch structures don't require a <b>default</b>.
 ]]></description>
 
 <syntax>
@@ -43,7 +43,7 @@ default: <c>statements</c>
 <returns></returns>
 
 <related>
-switch()
+switch
 break
 case
 </related>
diff --git a/content/api_en/include/else.xml b/content/api_en/include/else.xml
@@ -37,7 +37,7 @@ for(int i = 5; i &lt; 95; i += 5) {
 </example>
 
 <description><![CDATA[
-Extends the <b>if()</b> structure allowing the program to choose between two or more block of code. It specifies a block of code to execute when the expression in <b>if()</b> is <b>false</b>.
+Extends the <b>if</b> structure allowing the program to choose between two or more block of code. It specifies a block of code to execute when the expression in <b>if</b> is <b>false</b>.
 ]]></description>
 
 <syntax>
diff --git a/content/api_en/include/logicalAND.xml b/content/api_en/include/logicalAND.xml
@@ -45,7 +45,7 @@ Compares two expressions and returns <b>true</b> only if both evaluate to <b>tru
 <related>
 || (logical OR)
 ! (logical NOT)
-if()
+if
 </related>
 
 <availability>1.0</availability>
diff --git a/content/api_en/include/logicalNOT.xml b/content/api_en/include/logicalNOT.xml
@@ -41,7 +41,7 @@ Inverts the Boolean value of an expression. Returns <b>true</b> if the expressio
 <related>
 || (logical OR)
 &amp;&amp; (logical AND)
-if()
+if
 </related>
 
 <availability>1.0</availability>
diff --git a/content/api_en/include/logicalOR.xml b/content/api_en/include/logicalOR.xml
@@ -42,7 +42,7 @@ Compares two expressions and returns <b>true</b> if one or both evaluate to <b>t
 <related>
 &amp;&amp; (logical AND)
 ! (logical NOT)
-if()
+if
 </related>
 
 <availability>1.0</availability>
diff --git a/content/api_en/include/switch.xml b/content/api_en/include/switch.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <root>
-<name>switch()</name>
+<name>switch</name>
 
 <category>Control</category>
 
@@ -66,7 +66,7 @@ switch(letter) {
 
 
 <description><![CDATA[
-Works like an <b>if else</b> structure, but <b>switch()</b> is more convenient when you need to select between three or more alternatives. Program controls jumps to the case with the same value as the expression. All remaining statements in the switch are executed unless redirected by a <b>break</b>. Only primitive datatypes which can convert to an integer (byte, char, and int) may be used as the <b>expression</b> parameter. The default is optional.
+Works like an <b>if else</b> structure, but <b>switch</b> is more convenient when you need to select between three or more alternatives. Program controls jumps to the case with the same value as the expression. All remaining statements in the switch are executed unless redirected by a <b>break</b>. Only primitive datatypes which can convert to an integer (byte, char, and int) may be used as the <b>expression</b> parameter. The default is optional.
 ]]></description>
 
 <syntax>
@@ -102,7 +102,7 @@ switch(<c>expression</c>)
 case
 default
 break
-if()
+if
 else
 </related>
 
diff --git a/content/api_en/include/while.xml b/content/api_en/include/while.xml
@@ -22,7 +22,7 @@ while(i&lt;80) {
 <description><![CDATA[
 Controls a sequence of repetitions. The <b>while</b> structure executes a series of statements continuously while the <b>expression</b> is <b>true</b>. The expression must be updated during the repetitions or the program will never "break out" of <b>while</b>.
 <br/> <br/>
-This function can be dangerous because the code inside the while() loop will not finish until the expression inside while() becomes true. It will lock out all other code from running (mouse events will not be updated, etc.) So be careful because this can lock up your code (and sometimes even the Processing environment itself) if used incorrectly.
+This function can be dangerous because the code inside the <b>while</b> loop will not finish until the expression inside <b>while</b> becomes true. It will lock out all other code from running (mouse events will not be updated, etc.) So be careful because this can lock up your code (and sometimes even the Processing environment itself) if used incorrectly.
 ]]></description>
 
 <syntax>
diff --git a/content/api_en/loadImage.xml b/content/api_en/loadImage.xml
diff --git a/generate/keywords_base.txt b/generate/keywords_base.txt
diff --git a/todo.txt b/todo.txt
