New upstream version (1.2018.9)debian/1%1.2018.9-1

 * Update pdf.patch; add libavalon-framework-java, libcommons-io-java,
   libcommons-logging-java, libxml-commons-external-java,
   libxmlgraphics-commons-java as dependencies
 * Fix "Upgrade to version 1.2018.4 and improve description" by updating to
   newest upstream and updating description with new features
   (Closes: #897414)
 * Update Standards-Version from 4.0.0 to 4.1.5 (no change needed)

1 files changed, 25 insertions, 2 deletions

diff --git a/src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java b/src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java
index f4dfb0a..eacb667 100644
--- a/src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java
+++ b/src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java
@@ -42,6 +42,7 @@ import java.util.TreeSet;
 
 import net.sourceforge.plantuml.SkinParam;
 import net.sourceforge.plantuml.graphic.HtmlColorSetSimple;
+import net.sourceforge.plantuml.utils.Cypher;
 
 public class LanguageDescriptor {
 
@@ -50,7 +51,7 @@ public class LanguageDescriptor {
 	private final Set<String> preproc = new TreeSet<String>();
 
 	public LanguageDescriptor() {
-		
+
 		type.add("actor");
 		type.add("participant");
 		type.add("usecase");
@@ -149,7 +150,9 @@ public class LanguageDescriptor {
 		keyword.add("fork");
 		keyword.add("again");
 		keyword.add("kill");
+		keyword.add("order");
 
+		preproc.add("!exit");
 		preproc.add("!include");
 		preproc.add("!pragma");
 		preproc.add("!define");
@@ -163,6 +166,26 @@ public class LanguageDescriptor {
 		preproc.add("!enddefinelong");
 	}
 
+	public Cypher getCypher() {
+		final Cypher cypher = new Cypher();
+		for (String s : type) {
+			cypher.addException(s);
+		}
+		for (String s : keyword) {
+			cypher.addException(s.replace("@", ""));
+		}
+		for (String s : preproc) {
+			cypher.addException(s.substring(1));
+		}
+		for (String s : SkinParam.getPossibleValues()) {
+			cypher.addException(s);
+		}
+		for (String s : new HtmlColorSetSimple().names()) {
+			cypher.addException(s);
+		}
+		return cypher;
+	}
+
 	public void print(PrintStream ps) {
 		print(ps, "type", type);
 		print(ps, "keyword", keyword);
@@ -173,7 +196,7 @@ public class LanguageDescriptor {
 	}
 
 	private static void print(PrintStream ps, String name, Collection<String> data) {
-		ps.println(";"+name);
+		ps.println(";" + name);
 		ps.println(";" + data.size());
 		for (String k : data) {
 			ps.println(k);