From 2cf0987e500c1a4694ed7bef7412d5a15c1a66a1 Mon Sep 17 00:00:00 2001
From: Diomidis Spinellis <dds@aueb.gr>
Date: Fri, 28 Sep 2007 07:14:07 +0000
Subject: [PATCH] Make the -noguillemot option output escaped characters
 compatible with version 1.13 of Graphviz.

---
 doc/ver.xml                                   | 5 +++++
 src/gr/spinellis/umlgraph/doclet/Options.java | 4 ++--
 src/org/umlgraph/doclet/Options.java          | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/doc/ver.xml b/doc/ver.xml
index 2ab9594..5a59ade 100644
--- a/doc/ver.xml
+++ b/doc/ver.xml
@@ -5,6 +5,11 @@
 
 <dt>Version 4.9 Under development </dt><dd>
 <ul>
+<li> Test data is now compatible with the output of the Java 6.0 javadoc</li>
+<li> Java 6.0 deprecated methods are marked in the code as such.</li>
+<li> The -noguillemot option now outputs escaped characters compatible
+with version 1.13 of Graphviz.
+(reported by Roger Alexander).</li>
 <li> Fix inferred relations of maps to primitive Java types.
 (reported by Przemyslaw Wesolek).</li>
 </ul>
diff --git a/src/gr/spinellis/umlgraph/doclet/Options.java b/src/gr/spinellis/umlgraph/doclet/Options.java
index 5d00520..6730e3f 100644
--- a/src/gr/spinellis/umlgraph/doclet/Options.java
+++ b/src/gr/spinellis/umlgraph/doclet/Options.java
@@ -402,8 +402,8 @@ public class Options implements Cloneable, OptionProvider {
 	} else if (opt[0].equals("-!apidocmap")) {
 	    apiDocMap.clear();
 	} else if(opt[0].equals("-noguillemot")) {
-	    guilOpen = "\\<\\<";
-	    guilClose = "\\>\\>";
+	    guilOpen = "&lt;&lt;";
+	    guilClose = "&gt;&gt;";
 	} else if (opt[0].equals("-!noguillemot")) {
 	    guilOpen = "\u00ab";
 	    guilClose = "\u00bb";
diff --git a/src/org/umlgraph/doclet/Options.java b/src/org/umlgraph/doclet/Options.java
index 5d00520..6730e3f 100644
--- a/src/org/umlgraph/doclet/Options.java
+++ b/src/org/umlgraph/doclet/Options.java
@@ -402,8 +402,8 @@ public class Options implements Cloneable, OptionProvider {
 	} else if (opt[0].equals("-!apidocmap")) {
 	    apiDocMap.clear();
 	} else if(opt[0].equals("-noguillemot")) {
-	    guilOpen = "\\<\\<";
-	    guilClose = "\\>\\>";
+	    guilOpen = "&lt;&lt;";
+	    guilClose = "&gt;&gt;";
 	} else if (opt[0].equals("-!noguillemot")) {
 	    guilOpen = "\u00ab";
 	    guilClose = "\u00bb";