From adc23450c82e822d6fe8836defa01277f7901f71 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Fri, 14 Jan 2022 18:06:05 +0100 Subject: [PATCH] wip --- skin/plantuml.skin | 3 +++ src/net/sourceforge/plantuml/nwdiag/CommandNetwork.java | 2 +- .../sourceforge/plantuml/project/draw/TaskDrawRegular.java | 5 +++-- src/net/sourceforge/plantuml/style/SName.java | 1 + src/net/sourceforge/plantuml/version/Version.java | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/skin/plantuml.skin b/skin/plantuml.skin index e9d8f6c50..6fbb6a95d 100644 --- a/skin/plantuml.skin +++ b/skin/plantuml.skin @@ -313,6 +313,9 @@ ganttDiagram { Margin 2 2 2 2 Padding 0 } + undone { + BackGroundColor white + } milestone { Margin 2 Padding 3 diff --git a/src/net/sourceforge/plantuml/nwdiag/CommandNetwork.java b/src/net/sourceforge/plantuml/nwdiag/CommandNetwork.java index 70c1c442c..f49b07486 100644 --- a/src/net/sourceforge/plantuml/nwdiag/CommandNetwork.java +++ b/src/net/sourceforge/plantuml/nwdiag/CommandNetwork.java @@ -54,7 +54,7 @@ public class CommandNetwork extends SingleLineCommand2 { RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("network"), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("NAME", "([%pLN_]+)?"), // + new RegexLeaf("NAME", "([-.%pLN_]+)?"), // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("\\{"), RegexLeaf.end()); } diff --git a/src/net/sourceforge/plantuml/project/draw/TaskDrawRegular.java b/src/net/sourceforge/plantuml/project/draw/TaskDrawRegular.java index 1f0e008f2..466493b5e 100644 --- a/src/net/sourceforge/plantuml/project/draw/TaskDrawRegular.java +++ b/src/net/sourceforge/plantuml/project/draw/TaskDrawRegular.java @@ -69,6 +69,7 @@ import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.style.StyleSignature; +import net.sourceforge.plantuml.style.Value; import net.sourceforge.plantuml.svek.image.Opale; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.ULine; @@ -291,13 +292,13 @@ public class TaskDrawRegular extends AbstractTaskDraw { off.add(new Segment(x1, x2)); } - final HColor back2 = StyleSignature.of(SName.root, SName.document, SName.ganttDiagram) + final HColor backUndone = StyleSignature.of(SName.root, SName.element, SName.ganttDiagram, SName.undone) .getMergedStyle(getStyleBuilder()).value(PName.BackGroundColor) .asColor(skinParam.getThemeStyle(), getColorSet()); final RectangleTask rectangleTask = new RectangleTask(startPos, endPos, round, getCompletion(), off); - rectangleTask.draw(ug, getShapeHeight(stringBounder), back2, oddStart, oddEnd); + rectangleTask.draw(ug, getShapeHeight(stringBounder), backUndone, oddStart, oddEnd); if (url != null) { ug.closeUrl(); diff --git a/src/net/sourceforge/plantuml/style/SName.java b/src/net/sourceforge/plantuml/style/SName.java index 8e368e622..64f18ce7b 100644 --- a/src/net/sourceforge/plantuml/style/SName.java +++ b/src/net/sourceforge/plantuml/style/SName.java @@ -118,6 +118,7 @@ public enum SName { timeline, // timingDiagram, // title, // + undone, // unstarted, // usecase, // wbsDiagram, // diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index 81ee67ddc..21eafff2b 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 = 1; + final int beta = 3; return beta; }