New code colors for testing 2b8

REAS · REAS · commit 2de6caa6ea2b · 2012-12-09T21:49:22.000Z
diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
@@ -5846,9 +5846,8 @@ static public String[] fixOptions(String options) {
    * ( end auto-generated )
   * @webref typography:loading_displaying
   * @param filename name of the font to load
-  * @see PFont#PFont
+  * @see PFont#PFont(Font, boolean)
   * @see PGraphics#textFont(PFont, float)
-  * @see PGraphics#text(String, float, float, float, float, float)
   * @see PApplet#createFont(String, float, boolean, char[])
   */
   public PFont loadFont(String filename) {
@@ -12300,7 +12299,6 @@ public float textWidth(char[] chars, int start, int length) {
    * @see PGraphics#textAlign(int, int)
    * @see PGraphics#textMode(int)
    * @see PApplet#loadFont(String)
-   * @see PFont#PFont
    * @see PGraphics#textFont(PFont)
    * @see PGraphics#rectMode(int)
    * @see PGraphics#fill(int, float)
diff --git a/core/src/processing/core/PFont.java b/core/src/processing/core/PFont.java
@@ -52,6 +52,9 @@
  *   ^^^^^^^^^^^^^^ setWidth (width displaced by char)
  * </PRE>
  * @webref typography
+ * @see PApplet#loadFont(String)
+ * @see PGraphics#textFont(PFont)
+ * @see PGraphics#text(char, float, float)
  */
 public class PFont implements PConstants {
 
@@ -181,11 +184,8 @@ public PFont() { }  // for subclasses
    * ( end auto-generated )
    *
    * @webref typography:pfont
-   * @param font
-   * @param smooth
-   * @see PApplet#loadFont(String)
-   * @see PGraphics#textFont(PFont, float)
-   * @see PGraphics#text(String, float, float)
+   * @param font font the font object to create from
+   * @param smooth smooth true to enable smoothing/anti-aliasing
    */
   public PFont(Font font, boolean smooth) {
     this(font, smooth, null);
@@ -196,9 +196,7 @@ public PFont(Font font, boolean smooth) {
    * Create a new image-based font on the fly. If charset is set to null,
    * the characters will only be created as bitmaps when they're drawn.
    *
-   * @param font the font object to create from
    * @param charset array of all unicode chars that should be included
-   * @param smooth true to enable smoothing/anti-aliasing
    */
   public PFont(Font font, boolean smooth, char charset[]) {
     // save this so that we can use the native version
diff --git a/core/src/processing/core/PGraphics.java b/core/src/processing/core/PGraphics.java
@@ -4188,7 +4188,6 @@ protected float textWidthImpl(char buffer[], int start, int stop) {
    * @see PGraphics#textAlign(int, int)
    * @see PGraphics#textMode(int)
    * @see PApplet#loadFont(String)
-   * @see PFont#PFont
    * @see PGraphics#textFont(PFont)
    * @see PGraphics#rectMode(int)
    * @see PGraphics#fill(int, float)
diff --git a/java/examples/Basics/Typography/Letters/Letters.pde b/java/examples/Basics/Typography/Letters/Letters.pde
@@ -6,14 +6,18 @@
  */
 
 // The next line is needed if running in JavaScript Mode with Processing.js
-/* @pjs font="Georgia.ttf"; */
+/* @pjs font="Courier.ttf"; */
+
+PFont f;
 
 void setup() {
   size(640, 360);
   background(0);
 
   // Create the font
-  textFont(createFont("Georgia",24));
+  println(PFont.list());
+  f = createFont("Monospaced", 24);
+  textFont(f);
   textAlign(CENTER, CENTER);
 } 
 
@@ -33,10 +37,10 @@ void draw() {
       char letter = char(counter);
       
       if (letter == 'A' || letter == 'E' || letter == 'I' || letter == 'O' || letter == 'U') {
-        fill(255);
+        fill(255, 204, 0);
       } 
       else {
-        fill(102);
+        fill(255);
       }
 
       // Draw the letter to the screen
diff --git a/java/examples/Basics/Typography/Words/Words.pde b/java/examples/Basics/Typography/Words/Words.pde
@@ -9,10 +9,15 @@
 // The next line is needed if running in JavaScript Mode with Processing.js
 /* @pjs font="Georgia.ttf"; */
   
+PFont f;
+  
 void setup() {
   size(640, 360);
+  
   // Create the font
-  textFont(createFont("Georgia", 24));
+  println(PFont.list());
+  f = createFont("Serif", 24);
+  textFont(f);
 }
 
 void draw() {
diff --git a/java/keywords.txt b/java/keywords.txt
@@ -247,7 +247,7 @@ catch	FUNCTION3	catch
 do	FUNCTION3
 for	FUNCTION3	for
 if	FUNCTION3	if
-#else	FUNCTION3	else
+else	FUNCTION3	else
 switch	FUNCTION3	switch
 synchronized	FUNCTION3
 while	FUNCTION3	while
@@ -279,7 +279,6 @@ saveFile	FUNCTION1
 savePath	FUNCTION1
 sketchFile	FUNCTION1
 sketchPath	FUNCTION1
-string	KEYWORD2	strconvert_
 
 readLine	FUNCTION2	BufferedReader_readLine_
 close	FUNCTION2	PrintWriter_close_
@@ -294,6 +293,8 @@ substring	FUNCTION2	String_substring_
 toLowerCase	FUNCTION2	String_toLowerCase_
 toUpperCase	FUNCTION2	String_toUpperCase_
 
+length	KEYWORD2	String
+
 
 # Temporary additions 3 September 2012 as the reference is getting updated
 
@@ -340,8 +341,8 @@ addChild	FUNCTION1
 
 # Suppressed from Generate to avoid conflicts with variables inside methods
 
-width	KEYWORD3	width_
-height	KEYWORD3	height_
+width	KEYWORD4	width_
+height	KEYWORD4	height_
 
 PVector	FUNCTION1	PVector
 ArrayList	FUNCTION1	ArrayList
diff --git a/java/theme/theme.txt b/java/theme/theme.txt
@@ -78,13 +78,13 @@ editor.brackethighlight.color = #006699
 editor.function1.style = #006699,plain
 editor.function2.style = #006699,plain
 editor.function3.style = #669933,plain
-editor.keyword1.style = #7e3d22,plain
-editor.keyword2.style = #EE3C96,plain
+editor.keyword1.style = #996633,plain
+editor.keyword2.style = #996633,plain
 editor.keyword3.style = #669933,plain
-editor.keyword4.style = #EE3C96,plain
-editor.keyword5.style = #D86736,plain
+editor.keyword4.style = #ff6699,plain
+editor.keyword5.style = #cc6633,plain
 editor.literal1.style = #7D4793,plain
-editor.literal2.style = #5F6C53,plain
+editor.literal2.style = #666666,plain
 
 # e.g. + - = /
 editor.operator.style = #006699,plain
