diff --git a/tool/src/org/antlr/v4/gui/TreeViewer.java b/tool/src/org/antlr/v4/gui/TreeViewer.java
index 2c000aa90b..5d58aff4ac 100644
--- a/tool/src/org/antlr/v4/gui/TreeViewer.java
+++ b/tool/src/org/antlr/v4/gui/TreeViewer.java
@@ -273,7 +273,7 @@ protected void generateBox(Writer writer, Tree parent) throws IOException {
 			"fill:orange; stroke:rgb(0,0,0);", "rx=\"1\""));
 
 		// draw the text on top of the box (possibly multiple lines)
-		String line = getText(parent).replace("<","&lt;").replace(">","&gt;");
+		String line = getText(parent).replace("&","&amp;").replace("<","&lt;").replace(">","&gt;").replace("\"","&quot;").replace("'","&apos;");
 		int fontSize = 10;
 		int x = (int) box.x + 2;
 		int y = (int) box.y + fontSize - 1;
@@ -588,6 +588,14 @@ private static void generateSVGFile(TreeViewer viewer, JFrame dialog) {
 		}
 	}
 
+	public void toSVG(Writer writer) throws IOException {
+		writer.write("<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\">");
+		paintSVG(writer);
+		writer.write("</svg>");
+		writer.flush();
+		writer.close();
+	}
+
 	private static File generateNonExistingFile(String extension) {
 
 		final String parent = ".";