diff --git a/gradle.properties b/gradle.properties index 0073d3563..f7aac4a60 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ # Warning, "version" should be the same in gradle.properties and Version.java # Any idea anyone how to magically synchronize those :-) ? -version = 1.2023.10beta2 +version = 1.2023.10beta3 org.gradle.workers.max = 3 \ No newline at end of file diff --git a/src/net/sourceforge/plantuml/style/CommandStyleImport.java b/src/net/sourceforge/plantuml/style/CommandStyleImport.java index 5206df4df..fe2f68f51 100644 --- a/src/net/sourceforge/plantuml/style/CommandStyleImport.java +++ b/src/net/sourceforge/plantuml/style/CommandStyleImport.java @@ -38,7 +38,6 @@ package net.sourceforge.plantuml.style; import java.io.IOException; import java.io.InputStream; import java.net.MalformedURLException; -import java.net.URL; import net.sourceforge.plantuml.FileSystem; import net.sourceforge.plantuml.TitledDiagram; @@ -56,7 +55,7 @@ import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.utils.LineLocation; public class CommandStyleImport extends SingleLineCommand2 { - // ::remove file when __HAXE__ + // ::remove file when __HAXE__ public static final CommandStyleImport ME = new CommandStyleImport(); @@ -84,8 +83,8 @@ public class CommandStyleImport extends SingleLineCommand2 { final String path = arg.get("PATH", 0); try { BlocLines lines = null; - if (path.startsWith("http")) { - SURL url = SURL.create (path); + if (path.startsWith("http://") || path.startsWith("https://")) { + SURL url = SURL.create(path); try (InputStream remoteInputStream = url.openStream()) { lines = BlocLines.load(remoteInputStream, location); } diff --git a/src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java b/src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java index 7bf7acc1a..feba17b8c 100644 --- a/src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java +++ b/src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java @@ -224,6 +224,7 @@ public class LanguageDescriptor { keyword.add("dashed"); keyword.add("bold"); keyword.add("map"); + keyword.add("together"); preproc.add("!exit"); preproc.add("!include"); @@ -255,21 +256,21 @@ public class LanguageDescriptor { public Cypher getCypher() { final Cypher cypher = new Cypher(); - for (String s : type) { + for (String s : type) cypher.addException(s); - } - for (String s : keyword) { + + for (String s : keyword) cypher.addException(s.replace("@", "")); - } - for (String s : preproc) { + + for (String s : preproc) cypher.addException(s.substring(1)); - } - for (String s : SkinParam.getPossibleValues()) { + + for (String s : SkinParam.getPossibleValues()) cypher.addException(s); - } - for (String s : HColorSet.instance().names()) { + + for (String s : HColorSet.instance().names()) cypher.addException(s); - } + cypher.addException("o"); return cypher; } @@ -286,9 +287,9 @@ public class LanguageDescriptor { private static void print(PrintStream ps, String name, Collection data) { ps.println(";" + name); ps.println(";" + data.size()); - for (String k : data) { + for (String k : data) ps.println(k); - } + ps.println(); } diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index 8126a1583..c3c9d4685 100644 --- a/src/net/sourceforge/plantuml/version/Version.java +++ b/src/net/sourceforge/plantuml/version/Version.java @@ -46,7 +46,7 @@ public class Version { // Warning, "version" should be the same in gradle.properties and Version.java // Any idea anyone how to magically synchronize those :-) ? - private static final String version = "1.2023.10beta2"; + private static final String version = "1.2023.10beta3"; public static String versionString() { return version;