js reference description title update and some updated description text

fjenett · fjenett · commit 10ff41381079 · 2012-12-09T18:16:17.000Z
diff --git a/content/api_en/createFont.xml b/content/api_en/createFont.xml
@@ -28,6 +28,14 @@ void setup() {
 
 <js_mode>
 	<description><![CDATA[
+Font support in JavaScript mode is limited and different from the default Java mode.
+
+Use a font that's installed on the computer, or from a .ttf or .otf file inside current folder.
+
+If you have a @font-face rule in your CSS, you can use it by passing the @font-face name into the name parameter.
+
+All "smooth" and "charset" parameters are ignored in JavaScript mode.
+
 Font support for the canvas element varies across browsers. Firefox currently has the best support, but still uses a pre-defined set of fonts. Good alternatives to the browser's canvas-font functions are available: such as the <a href="http://bocoup.com/processing-js/docs/index.php?page=Cross-Browser%20Canvas%20Fonts">Glyph method</a>. See also: <a href="http://jim.studt.net/canvastext/">Canvas Text</a>, <a href="http://canvas.burnttoys.net/bauhaus.html">BurntToys Bauhaus</a>.
 <br /><br />
 <p><b>Please use the following demos to learn how fonts can be rendered in Firefox with Processing.js: <a href="http://processingjs.org/learning/basic/letters">Letters</a>, <a href="http://processingjs.org/learning/basic/words">Words</a>, <a href="http://processingjs.org/source/text-width/text-width.html">width()</a></b></p>
diff --git a/content/api_en/loadFont.xml b/content/api_en/loadFont.xml
@@ -22,9 +22,7 @@ text("word", 10, 50);
 
 <js_mode>
 	<description><![CDATA[
-Font support for the canvas element varies across browsers. Firefox currently has the best support, but still uses a pre-defined set of fonts. Good alternatives to the browser's canvas-font functions are available: such as the <a href="http://bocoup.com/processing-js/docs/index.php?page=Cross-Browser%20Canvas%20Fonts">Glyph method</a>. See also: <a href="http://jim.studt.net/canvastext/">Canvas Text</a>, <a href="http://canvas.burnttoys.net/bauhaus.html">BurntToys Bauhaus</a>.
-<br /><br />
-<p><b>Please use the following demos to learn how fonts can be rendered in Firefox with Processing.js: <a href="http://processingjs.org/learning/basic/letters">Letters</a>, <a href="http://processingjs.org/learning/basic/words">Words</a>, <a href="http://processingjs.org/source/text-width/text-width.html">width()</a></b></p>
+Currently JavaScript mode does not support .plw font files and will just call <a href="createFont_.html">createFont()</a> instead.
 ]]></description>
 </js_mode>
 
diff --git a/java_generate/ReferenceGenerator/bin/writers/BaseWriter.class b/java_generate/ReferenceGenerator/bin/writers/BaseWriter.class
diff --git a/java_generate/ReferenceGenerator/src/writers/BaseWriter.java b/java_generate/ReferenceGenerator/src/writers/BaseWriter.java
@@ -387,7 +387,7 @@ protected static String getXMLDescription(Document doc)
 				String result = (String) expr.evaluate(doc, XPathConstants.STRING);
 				HashMap<String, String> vars = getDefaultDescriptionVars();
 				if ( component.indexOf("js_mode") != -1 ) {
-					vars.put( "description title", "JavaScript" );
+					vars.put( "description title", "JavaScript<br>\nNotes" );
 				}
 				if ( !result.equals("") )
 				{

Original file line number	Diff line number	Diff line change
`@@ -387,7 +387,7 @@ protected static String getXMLDescription(Document doc)`
`387`	`387`	`String result = (String) expr.evaluate(doc, XPathConstants.STRING);`
`388`	`388`	`HashMap<String, String> vars = getDefaultDescriptionVars();`
`389`	`389`	`if ( component.indexOf("js_mode") != -1 ) {`
`390`		`- vars.put( "description title", "JavaScript" );`
	`390`	`+ vars.put( "description title", "JavaScript<br>\nNotes" );`
`391`	`391`	`}`
`392`	`392`	`if ( !result.equals("") )`
`393`	`393`	`{`