diff --git a/src/net/sourceforge/plantuml/UrlBuilder.java b/src/net/sourceforge/plantuml/UrlBuilder.java index c400d4d89..2bafb0ca2 100644 --- a/src/net/sourceforge/plantuml/UrlBuilder.java +++ b/src/net/sourceforge/plantuml/UrlBuilder.java @@ -137,7 +137,8 @@ public class UrlBuilder { } private String withTopUrl(String url) { - if (url.startsWith("http:") == false && url.startsWith("https:") == false && topurl != null) { + if (url.startsWith("http:") == false && url.startsWith("https:") == false && url.startsWith("file:") == false + && topurl != null) { return topurl + url; } return url; diff --git a/src/net/sourceforge/plantuml/dedication/Dedications.java b/src/net/sourceforge/plantuml/dedication/Dedications.java index f800c39a1..5a5c4c215 100644 --- a/src/net/sourceforge/plantuml/dedication/Dedications.java +++ b/src/net/sourceforge/plantuml/dedication/Dedications.java @@ -51,6 +51,7 @@ public class Dedications { addNormal("linux_china", "linux_china"); addNormal("ARKBAN", "arkban"); addNormal("Boundaries allow discipline to create true strength", "boundaries"); + addNormal("Thank you, Dr. Chet. I wouldn't be where I am without you", "dr_chet"); addCrypted("0", "pOhci6rKgPXw32AeYXhOpSY0suoauHq5VUSwFqHLHsLYgSO6WaJ7BW5vtHBAoU6ePbcW7d8Flx99MWjPSKQTDm00"); addCrypted("1", "LTxN3hdnhSJ515qcA7IQ841axt4GXfUd3n2wgNirYCdLnyX2360Gv1OEOnJ1-gwFzRW5B3HAqLBkR6Ge0WW_Z000"); addCrypted("2", "lZqLduj4j1yRqSfAvkhbqVpqK8diklatiFeenDUXSdna9bKYQTzdS264YfUBScUVDYCp2Vcq04updoN98RwxE000"); diff --git a/src/net/sourceforge/plantuml/dedication/dr_chet.png b/src/net/sourceforge/plantuml/dedication/dr_chet.png new file mode 100644 index 000000000..9d9c3930a Binary files /dev/null and b/src/net/sourceforge/plantuml/dedication/dr_chet.png differ diff --git a/src/net/sourceforge/plantuml/graphic/QuoteUtils.java b/src/net/sourceforge/plantuml/graphic/QuoteUtils.java index 6b4194bdd..4a3cc0b2f 100644 --- a/src/net/sourceforge/plantuml/graphic/QuoteUtils.java +++ b/src/net/sourceforge/plantuml/graphic/QuoteUtils.java @@ -293,7 +293,9 @@ public class QuoteUtils { "Gebyy gur erfcnja, Wrerzl", "Bhoyvr dhr g'nf nhphar punapr. Fhe ha znyragraqh pn crhg znepure.", "Obl, gur fhcrevagraqrag'f tbaan or cvffrq!", "BX, jub oebhtug gur qbt?", "Rg yn, p'rfg yr qenzr...", "V'z shmml ba gur jubyr tbbq/onq guvat. Jung qb lbh zrna, 'onq'?", - "Lbh'er evtug. Ab uhzna orvat jbhyq fgnpx obbxf yvxr guvf."); + "Lbh'er evtug. Ab uhzna orvat jbhyq fgnpx obbxf yvxr guvf.", + "V nz fb pyrire gung fbzrgvzrf V qba'g haqrefgnaq n fvatyr jbeq bs jung V nz fnlvat.", + "Jnxr zr hc orsber lbh tb-tb"); private QuoteUtils() { } diff --git a/src/net/sourceforge/plantuml/timingdiagram/command/CommandConstraint.java b/src/net/sourceforge/plantuml/timingdiagram/command/CommandConstraint.java index 4edf7328d..22beedadc 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/command/CommandConstraint.java +++ b/src/net/sourceforge/plantuml/timingdiagram/command/CommandConstraint.java @@ -92,8 +92,10 @@ public class CommandConstraint extends SingleLineCommand2 { if (tick1 == null) { return CommandExecutionResult.error("Unknown time label"); } + final TimeTick restore = diagram.getNow(); diagram.updateNow(tick1); final TimeTick tick2 = TimeTickBuilder.parseTimeTick("TIME2", arg, diagram); + diagram.updateNow(restore); if (tick2 == null) { return CommandExecutionResult.error("Unknown time label"); } diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index e9d864606..05fc9a50c 100644 --- a/src/net/sourceforge/plantuml/version/Version.java +++ b/src/net/sourceforge/plantuml/version/Version.java @@ -80,7 +80,7 @@ public class Version { } public static int beta() { - final int beta = 2; + final int beta = 3; return beta; }