octoleo/plantuml
1
0
Fork 0
mirror of https://github.com/octoleo/plantuml.git synced 2024-12-22 10:59:01 +00:00
Code Issues Releases Wiki Activity

fix: improve pipemap option

Browse Source 
https://github.com/plantuml/plantuml/issues/1429
This commit is contained in:
Arnaud Roques 2023-05-22 18:48:42 +02:00
parent 92c5183386
commit 892dd6c8e9
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -1,4 +1,4 @@
# Warning, "version" should be the same in gradle.properties and Version.java # Warning, "version" should be the same in gradle.properties and Version.java
# Any idea anyone how to magically synchronize those :-) ? # Any idea anyone how to magically synchronize those :-) ?
version = 1.2023.8 version = 1.2023.9beta1
org.gradle.workers.max = 3 org.gradle.workers.max = 3

8
src/net/sourceforge/plantuml/Pipe.java
View File

@ -53,6 +53,7 @@ import net.sourceforge.plantuml.core.DiagramDescription;
import net.sourceforge.plantuml.error.PSystemError; import net.sourceforge.plantuml.error.PSystemError;
import net.sourceforge.plantuml.preproc.Defines; import net.sourceforge.plantuml.preproc.Defines;
import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.security.SFile;
import net.sourceforge.plantuml.url.CMapData;
public class Pipe { public class Pipe {
// ::remove file when __CORE__ // ::remove file when __CORE__
@ -124,9 +125,10 @@ public class Pipe {
// https://forum.plantuml.net/10049/2019-pipemap-diagrams-containing-links-give-zero-exit-code // https://forum.plantuml.net/10049/2019-pipemap-diagrams-containing-links-give-zero-exit-code
// We don't check errors // We don't check errors
error.goOk(); error.goOk();
if (result == null) if (result == null) {
ps.println(); final CMapData empty = new CMapData();
else ps.println(empty.asString("plantuml"));
} else
ps.println(result); ps.println(result);
} }

2
src/net/sourceforge/plantuml/timingdiagram/command/TimeTickBuilder.java
View File

@ -50,7 +50,7 @@ public class TimeTickBuilder {
public static IRegex expressionAtWithoutArobase(String name) { public static IRegex expressionAtWithoutArobase(String name) {
return new RegexOr( // return new RegexOr( //
new RegexLeaf(name + "CODE", ":([%pLN_.]+)([-+]\\d+)?"), // new RegexLeaf(name + "CODE", ":([%pLN_.]+)([-+][.\\d]+)?"), //
new RegexLeaf(name + "DATE", "(\\d+)/(\\d+)/(\\d+)"), // new RegexLeaf(name + "DATE", "(\\d+)/(\\d+)/(\\d+)"), //
new RegexLeaf(name + "HOUR", "(\\d+):(\\d+):(\\d+)"), // new RegexLeaf(name + "HOUR", "(\\d+):(\\d+):(\\d+)"), //
new RegexLeaf(name + "DIGIT", "(\\+?)(-?\\d+\\.?\\d*)"), // new RegexLeaf(name + "DIGIT", "(\\+?)(-?\\d+\\.?\\d*)"), //

2
src/net/sourceforge/plantuml/version/Version.java
View File

@ -46,7 +46,7 @@ public class Version {
// Warning, "version" should be the same in gradle.properties and Version.java // Warning, "version" should be the same in gradle.properties and Version.java
// Any idea anyone how to magically synchronize those :-) ? // Any idea anyone how to magically synchronize those :-) ?
private static final String version = "1.2023.8"; private static final String version = "1.2023.9beta1";
public static String versionString() { public static String versionString() {
return version; return version;