diff --git a/core/src/processing/data/XML.java b/core/src/processing/data/XML.java index bc1fd7fac..656f6ede5 100644 --- a/core/src/processing/data/XML.java +++ b/core/src/processing/data/XML.java @@ -61,7 +61,9 @@ public class XML implements Serializable { /** Child elements, once loaded. */ protected XML[] children; - + /** + * @nowebref + */ protected XML() { } @@ -81,6 +83,8 @@ public class XML implements Serializable { /** * Advanced users only; see loadXML() in PApplet. + * + * @nowebref */ public XML(File file) throws IOException, ParserConfigurationException, SAXException { this(file, null); @@ -89,12 +93,16 @@ public class XML implements Serializable { /** * Advanced users only; see loadXML() in PApplet. + * + * @nowebref */ public XML(File file, String options) throws IOException, ParserConfigurationException, SAXException { this(PApplet.createReader(file), options); } - + /** + * @nowebref + */ public XML(InputStream input) throws IOException, ParserConfigurationException, SAXException { this(input, null); } @@ -104,6 +112,8 @@ public class XML implements Serializable { * Shouldn't be part of main p5 reference, this is for advanced users. * Note that while it doesn't accept anything but UTF-8, this is preserved * so that we have some chance of implementing that in the future. + * + * @nowebref */ public XML(InputStream input, String options) throws IOException, ParserConfigurationException, SAXException { this(PApplet.createReader(input), options); @@ -112,6 +122,8 @@ public class XML implements Serializable { /** * Advanced users only; see loadXML() in PApplet. + * + * @nowebref */ public XML(Reader reader) throws IOException, ParserConfigurationException, SAXException { this(reader, null); @@ -120,6 +132,8 @@ public class XML implements Serializable { /** * Advanced users only; see loadXML() in PApplet. + * + * @nowebref */ public XML(Reader reader, String options) throws IOException, ParserConfigurationException, SAXException { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); @@ -166,6 +180,8 @@ public class XML implements Serializable { /** * @param name description TBD + * + * @nowebref */ public XML(String name) { try { @@ -181,7 +197,9 @@ public class XML implements Serializable { } } - + /** + * @nowebref + */ protected XML(XML parent, Node node) { this.node = node; this.parent = parent; @@ -197,12 +215,15 @@ public class XML implements Serializable { * @throws SAXException * @throws ParserConfigurationException * @throws IOException + * @nowebref */ static public XML parse(String data) throws IOException, ParserConfigurationException, SAXException { return XML.parse(data, null); } - + /** + * @nowebref + */ static public XML parse(String data, String options) throws IOException, ParserConfigurationException, SAXException { return new XML(new StringReader(data), null); } diff --git a/java/examples/Basics/Typography/Letters/Letters.pde b/java/examples/Basics/Typography/Letters/Letters.pde index 6f0314c73..781d2aac7 100644 --- a/java/examples/Basics/Typography/Letters/Letters.pde +++ b/java/examples/Basics/Typography/Letters/Letters.pde @@ -5,9 +5,6 @@ * setting the font, and then drawing the letters. */ -// The next line is needed if running in JavaScript Mode with Processing.js -/* @pjs font="Courier.ttf"; */ - PFont f; void setup() { @@ -16,7 +13,7 @@ void setup() { // Create the font println(PFont.list()); - f = createFont("Monospaced", 24); + f = createFont("Georgia", 24); textFont(f); textAlign(CENTER, CENTER); } diff --git a/java/examples/Basics/Typography/Words/Words.pde b/java/examples/Basics/Typography/Words/Words.pde index 445a6fef9..c86bdcbb6 100644 --- a/java/examples/Basics/Typography/Words/Words.pde +++ b/java/examples/Basics/Typography/Words/Words.pde @@ -5,9 +5,6 @@ * The letters can be aligned left, center, or right with the * textAlign() function. */ - -// The next line is needed if running in JavaScript Mode with Processing.js -/* @pjs font="Georgia.ttf"; */ PFont f; @@ -16,7 +13,7 @@ void setup() { // Create the font println(PFont.list()); - f = createFont("Serif", 24); + f = createFont("Georgia", 24); textFont(f); }