From 80217d8c900916ae8fa023478299ee0c9c78fbb2 Mon Sep 17 00:00:00 2001
From: Arnaud Roques <plantuml@gmail.com>
Date: Tue, 13 Dec 2022 18:30:41 +0100
Subject: [PATCH] wip

---
 .../sourceforge/plantuml/PSystemBuilder.java  |   3 +-
 .../sourceforge/plantuml/ScaleProtected.java  |   8 +-
 .../sourceforge/plantuml/UmlDiagramType.java  |   5 +-
 .../plantuml/command/CommandScale.java        |   8 +-
 .../plantuml/core/DiagramType.java            |   5 +-
 .../plantuml/creole/atom/AtomImg.java         |  53 ++--
 .../plantuml/ebnf/CharIterator.java           |   2 +-
 .../plantuml/ebnf/CharIteratorImpl.java       |   2 +-
 .../plantuml/ebnf/ETileAlternation.java       |   1 +
 .../sourceforge/plantuml/ebnf/ETileBox.java   |   8 +
 .../plantuml/ebnf/ETileConcatenation.java     |   8 +
 .../plantuml/ebnf/EbnfExpression.java         |   4 -
 .../plantuml/eggs/PSystemWelcome.java         |   4 +-
 .../plantuml/hcl/HclDiagramFactory.java       |   2 +-
 .../sourceforge/plantuml/hcl/HclParser.java   |   1 +
 .../plantuml/jsondiagram/JsonDiagram.java     |  10 +-
 .../jsondiagram/JsonDiagramFactory.java       |   2 +-
 .../plantuml/jsondiagram/StyleExtractor.java  |  44 ++-
 .../regex/CommandRegexfSingleLine.java        |  72 +++++
 .../plantuml/regex/PSystemRegex.java          | 284 ++++++++++++++++++
 .../plantuml/regex/PSystemRegexFactory.java   |  69 +++++
 .../sourceforge/plantuml/regex/ReToken.java   |  61 ++++
 .../plantuml/regex/ReTokenType.java           |  65 ++++
 .../plantuml/regex/RegexExpression.java       | 223 ++++++++++++++
 .../plantuml/regex/ShuntingYard.java          | 108 +++++++
 src/net/sourceforge/plantuml/style/SName.java |   1 +
 .../sourceforge/plantuml/svg/SvgGraphics.java |   7 +-
 .../sourceforge/plantuml/version/Version.java |   2 +-
 .../plantuml/wbs/CommandWBSLink.java          |  34 ++-
 .../sourceforge/plantuml/wbs/WBSDiagram.java  |  21 +-
 src/net/sourceforge/plantuml/wbs/WBSLink.java |  10 +-
 .../plantuml/yaml/YamlDiagramFactory.java     |   2 +-
 stdlib/c4-abx.repx                            | Bin 9882 -> 11997 bytes
 stdlib/c4-dex.repx                            | Bin 301 -> 564 bytes
 34 files changed, 1057 insertions(+), 72 deletions(-)
 create mode 100644 src/net/sourceforge/plantuml/regex/CommandRegexfSingleLine.java
 create mode 100644 src/net/sourceforge/plantuml/regex/PSystemRegex.java
 create mode 100644 src/net/sourceforge/plantuml/regex/PSystemRegexFactory.java
 create mode 100644 src/net/sourceforge/plantuml/regex/ReToken.java
 create mode 100644 src/net/sourceforge/plantuml/regex/ReTokenType.java
 create mode 100644 src/net/sourceforge/plantuml/regex/RegexExpression.java
 create mode 100644 src/net/sourceforge/plantuml/regex/ShuntingYard.java

diff --git a/src/net/sourceforge/plantuml/PSystemBuilder.java b/src/net/sourceforge/plantuml/PSystemBuilder.java
index 63280653e..c63aaab93 100644
--- a/src/net/sourceforge/plantuml/PSystemBuilder.java
+++ b/src/net/sourceforge/plantuml/PSystemBuilder.java
@@ -85,6 +85,7 @@ import net.sourceforge.plantuml.openiconic.PSystemListOpenIconicFactory;
 import net.sourceforge.plantuml.openiconic.PSystemOpenIconicFactory;
 import net.sourceforge.plantuml.oregon.PSystemOregonFactory;
 import net.sourceforge.plantuml.project.GanttDiagramFactory;
+import net.sourceforge.plantuml.regex.PSystemRegexFactory;
 import net.sourceforge.plantuml.salt.PSystemSaltFactory2;
 import net.sourceforge.plantuml.security.SecurityProfile;
 import net.sourceforge.plantuml.security.SecurityUtils;
@@ -212,7 +213,6 @@ public class PSystemBuilder {
 			factories.add(new PSystemXearthFactory());
 		}
 		factories.add(new GanttDiagramFactory(DiagramType.GANTT));
-		// factories.add(new GanttDiagramFactory(DiagramType.UML));
 		GanttDiagramFactory.clearCache();
 		factories.add(new FlowDiagramFactory());
 		// factories.add(new PSystemTreeFactory(DiagramType.JUNGLE));
@@ -227,6 +227,7 @@ public class PSystemBuilder {
 		factories.add(new YamlDiagramFactory());
 		factories.add(new HclDiagramFactory());
 		factories.add(new PSystemEbnfFactory());
+		factories.add(new PSystemRegexFactory());
 	}
 
 	private boolean isOk(Diagram ps) {
diff --git a/src/net/sourceforge/plantuml/ScaleProtected.java b/src/net/sourceforge/plantuml/ScaleProtected.java
index 6a30af096..7fc5b4469 100644
--- a/src/net/sourceforge/plantuml/ScaleProtected.java
+++ b/src/net/sourceforge/plantuml/ScaleProtected.java
@@ -41,12 +41,12 @@ abstract class ScaleProtected implements Scale {
 
 	final public double getScale(double width, double height) {
 		final double result = getScaleInternal(width, height);
-		if (result <= 0) {
+		if (result <= 0)
 			return 1;
-		}
-		if (result > 4) {
+
+		if (result > 4)
 			return 4;
-		}
+
 		return result;
 	}
 
diff --git a/src/net/sourceforge/plantuml/UmlDiagramType.java b/src/net/sourceforge/plantuml/UmlDiagramType.java
index 092916032..a5934810e 100644
--- a/src/net/sourceforge/plantuml/UmlDiagramType.java
+++ b/src/net/sourceforge/plantuml/UmlDiagramType.java
@@ -39,7 +39,7 @@ import net.sourceforge.plantuml.style.SName;
 
 public enum UmlDiagramType {
 	SEQUENCE, STATE, CLASS, OBJECT, ACTIVITY, DESCRIPTION, COMPOSITE, FLOW, TIMING, BPM, NWDIAG, MINDMAP, WBS, WIRE,
-	HELP, GANTT, SALT, JSON, GIT, BOARD, YAML, HCL, EBNF;
+	HELP, GANTT, SALT, JSON, GIT, BOARD, YAML, HCL, EBNF, REGEX;
 
 	public SName getStyleName() {
 		if (this == SEQUENCE) 
@@ -93,6 +93,9 @@ public enum UmlDiagramType {
 		if (this == EBNF) 
 			return SName.ebnf;
 		
+		if (this == REGEX) 
+			return SName.regex;
+		
 		return SName.activityDiagram;
 	}
 }
diff --git a/src/net/sourceforge/plantuml/command/CommandScale.java b/src/net/sourceforge/plantuml/command/CommandScale.java
index bf04fb1f5..0dd5a7399 100644
--- a/src/net/sourceforge/plantuml/command/CommandScale.java
+++ b/src/net/sourceforge/plantuml/command/CommandScale.java
@@ -67,14 +67,14 @@ public class CommandScale extends SingleLineCommand2<AbstractPSystem> {
 	@Override
 	protected CommandExecutionResult executeArg(AbstractPSystem diagram, LineLocation location, RegexResult arg) {
 		double scale = Double.parseDouble(arg.get("SCALE", 0));
-		if (scale == 0) {
+		if (scale == 0)
 			return CommandExecutionResult.error("Scale cannot be zero");
-		}
+
 		if (arg.get("DIV", 0) != null) {
 			final double div = Double.parseDouble(arg.get("DIV", 0));
-			if (div == 0) {
+			if (div == 0)
 				return CommandExecutionResult.error("Scale cannot be zero");
-			}
+
 			scale /= div;
 		}
 		diagram.setScale(new ScaleSimple(scale));
diff --git a/src/net/sourceforge/plantuml/core/DiagramType.java b/src/net/sourceforge/plantuml/core/DiagramType.java
index d9c7d7640..59ecd96f8 100644
--- a/src/net/sourceforge/plantuml/core/DiagramType.java
+++ b/src/net/sourceforge/plantuml/core/DiagramType.java
@@ -39,7 +39,7 @@ import net.sourceforge.plantuml.utils.StartUtils;
 
 public enum DiagramType {
 	UML, BPM, DITAA, DOT, PROJECT, JCCKIT, SALT, FLOW, CREOLE, JUNGLE, CUTE, MATH, LATEX, DEFINITION, GANTT, NW,
-	MINDMAP, WBS, WIRE, JSON, GIT, BOARD, YAML, HCL, EBNF, UNKNOWN;
+	MINDMAP, WBS, WIRE, JSON, GIT, BOARD, YAML, HCL, EBNF, REGEX, UNKNOWN;
 
 	static public DiagramType getTypeFromArobaseStart(String s) {
 		s = s.toLowerCase();
@@ -121,6 +121,9 @@ public enum DiagramType {
 		if (StartUtils.startsWithSymbolAnd("startebnf", s))
 			return EBNF;
 
+		if (StartUtils.startsWithSymbolAnd("startregex", s))
+			return REGEX;
+
 		return UNKNOWN;
 	}
 }
diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomImg.java b/src/net/sourceforge/plantuml/creole/atom/AtomImg.java
index 028e9fb8b..89d555317 100644
--- a/src/net/sourceforge/plantuml/creole/atom/AtomImg.java
+++ b/src/net/sourceforge/plantuml/creole/atom/AtomImg.java
@@ -84,9 +84,9 @@ public class AtomImg extends AbstractAtom implements Atom {
 	public static Atom createQrcode(String flash, double scale) {
 		final FlashCodeUtils utils = FlashCodeFactory.getFlashCodeUtils();
 		BufferedImage im = utils.exportFlashcode(flash, Color.BLACK, Color.WHITE);
-		if (im == null) {
+		if (im == null)
 			im = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB);
-		}
+
 		return new AtomImg(
 				new UImage(new PixelImage(im, AffineTransformType.TYPE_NEAREST_NEIGHBOR)).scale(scale).getImage(1), 1,
 				null, null);
@@ -120,38 +120,38 @@ public class AtomImg extends AbstractAtom implements Atom {
 		try {
 			// Check if valid URL
 			if (src.startsWith("http:") || src.startsWith("https:")) {
-				if (src.endsWith(".svg")) 
+				if (src.endsWith(".svg"))
 					return buildSvgFromUrl(src, fc, SURL.create(src), scale, url);
-				
+
 				return buildRasterFromUrl(src, fc, SURL.create(src), scale, url);
 			}
 			final SFile f = FileSystem.getInstance().getFile(src);
 			if (f.exists() == false) {
-				if (SecurityUtils.getSecurityProfile() == SecurityProfile.UNSECURE) 
+				if (SecurityUtils.getSecurityProfile() == SecurityProfile.UNSECURE)
 					return AtomTextUtils.createLegacy("(File not found: " + f.getPrintablePath() + ")", fc);
-				
+
 				return AtomTextUtils.createLegacy("(Cannot decode)", fc);
 			}
 			if (f.getName().endsWith(".svg")) {
 				final String tmp = FileUtils.readSvg(f);
-				if (tmp == null) 
+				if (tmp == null)
 					return AtomTextUtils.createLegacy("(Cannot decode)", fc);
-				
+
 				return new AtomImgSvg(new TileImageSvg(tmp, scale));
 			}
 			final BufferedImage read = f.readRasterImageFromFile();
 			if (read == null) {
-				if (SecurityUtils.getSecurityProfile() == SecurityProfile.UNSECURE) 
+				if (SecurityUtils.getSecurityProfile() == SecurityProfile.UNSECURE)
 					return AtomTextUtils.createLegacy("(Cannot decode: " + f.getPrintablePath() + ")", fc);
-				
+
 				return AtomTextUtils.createLegacy("(Cannot decode)", fc);
 			}
 			return new AtomImg(f.readRasterImageFromFile(), scale, url, src);
 		} catch (IOException e) {
 			Logme.error(e);
-			if (SecurityUtils.getSecurityProfile() == SecurityProfile.UNSECURE) 
+			if (SecurityUtils.getSecurityProfile() == SecurityProfile.UNSECURE)
 				return AtomTextUtils.createLegacy("ERROR " + e.toString(), fc);
-			
+
 			return AtomTextUtils.createLegacy("ERROR", fc);
 		}
 	}
@@ -159,33 +159,33 @@ public class AtomImg extends AbstractAtom implements Atom {
 	private static Atom buildRasterFromData(String source, final FontConfiguration fc, final byte[] data, double scale,
 			Url url) throws IOException {
 		final BufferedImage read = SImageIO.read(data);
-		if (read == null) {
+		if (read == null)
 			return AtomTextUtils.createLegacy("(Cannot decode: " + source + ")", fc);
-		}
+
 		return new AtomImg(read, scale, url, null);
 	}
 
 	private static Atom buildRasterFromUrl(String text, final FontConfiguration fc, SURL source, double scale, Url url)
 			throws IOException {
-		if (source == null) {
+		if (source == null)
 			return AtomTextUtils.createLegacy("(Cannot decode: " + text + ")", fc);
-		}
+
 		final BufferedImage read = source.readRasterImageFromURL();
-		if (read == null) {
+		if (read == null)
 			return AtomTextUtils.createLegacy("(Cannot decode: " + text + ")", fc);
-		}
+
 		return new AtomImg(read, scale, url, "http");
 	}
 
 	private static Atom buildSvgFromUrl(String text, final FontConfiguration fc, SURL source, double scale, Url url)
 			throws IOException {
-		if (source == null) {
+		if (source == null)
 			return AtomTextUtils.createLegacy("(Cannot decode SVG: " + text + ")", fc);
-		}
+
 		final byte[] read = source.getBytes();
-		if (read == null) {
+		if (read == null)
 			return AtomTextUtils.createLegacy("(Cannot decode SVG: " + text + ")", fc);
-		}
+
 		return new AtomImgSvg(new TileImageSvg(new String(read, UTF_8), scale));
 	}
 
@@ -200,14 +200,15 @@ public class AtomImg extends AbstractAtom implements Atom {
 	}
 
 	public void drawU(UGraphic ug) {
-		if (url != null) {
+		if (url != null)
 			ug.startUrl(url);
-		}
+
 		ug.draw(new UImage(new PixelImage(image, AffineTransformType.TYPE_BILINEAR)).withRawFileName(rawFileName)
 				.scale(scale));
-		if (url != null) {
+
+		if (url != null)
 			ug.closeUrl();
-		}
+
 	}
 
 }
diff --git a/src/net/sourceforge/plantuml/ebnf/CharIterator.java b/src/net/sourceforge/plantuml/ebnf/CharIterator.java
index 8616f69c8..0c1b4cad4 100644
--- a/src/net/sourceforge/plantuml/ebnf/CharIterator.java
+++ b/src/net/sourceforge/plantuml/ebnf/CharIterator.java
@@ -35,7 +35,7 @@
  */
 package net.sourceforge.plantuml.ebnf;
 
-interface CharIterator {
+public interface CharIterator {
 	char peek(int ahead);
 
 	void next();
diff --git a/src/net/sourceforge/plantuml/ebnf/CharIteratorImpl.java b/src/net/sourceforge/plantuml/ebnf/CharIteratorImpl.java
index 033cedd81..84049cbb1 100644
--- a/src/net/sourceforge/plantuml/ebnf/CharIteratorImpl.java
+++ b/src/net/sourceforge/plantuml/ebnf/CharIteratorImpl.java
@@ -37,7 +37,7 @@ package net.sourceforge.plantuml.ebnf;
 
 import net.sourceforge.plantuml.command.BlocLines;
 
-class CharIteratorImpl implements CharIterator {
+public class CharIteratorImpl implements CharIterator {
 
 	final private BlocLines data;
 	private int line = 0;
diff --git a/src/net/sourceforge/plantuml/ebnf/ETileAlternation.java b/src/net/sourceforge/plantuml/ebnf/ETileAlternation.java
index 9af35f688..a906143ff 100644
--- a/src/net/sourceforge/plantuml/ebnf/ETileAlternation.java
+++ b/src/net/sourceforge/plantuml/ebnf/ETileAlternation.java
@@ -42,6 +42,7 @@ import net.sourceforge.plantuml.awt.geom.XDimension2D;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.ugraphic.UGraphic;
 import net.sourceforge.plantuml.ugraphic.UTranslate;
+import net.sourceforge.plantuml.ugraphic.color.HColor;
 
 public class ETileAlternation extends ETile {
 
diff --git a/src/net/sourceforge/plantuml/ebnf/ETileBox.java b/src/net/sourceforge/plantuml/ebnf/ETileBox.java
index c2f425004..d88ac8a39 100644
--- a/src/net/sourceforge/plantuml/ebnf/ETileBox.java
+++ b/src/net/sourceforge/plantuml/ebnf/ETileBox.java
@@ -68,6 +68,10 @@ public class ETileBox extends ETile {
 	private String commentAbove;
 	private String commentBelow;
 
+	public ETileBox mergeWith(ETileBox other) {
+		return new ETileBox(this.value + other.value, symbol, fc, style, colorSet, skinParam);
+	}
+
 	public ETileBox(String value, Symbol symbol, FontConfiguration fc, Style style, HColorSet colorSet,
 			ISkinParam skinParam) {
 		this.symbol = symbol;
@@ -225,4 +229,8 @@ public class ETileBox extends ETile {
 		return value;
 	}
 
+	public final Symbol getSymbol() {
+		return symbol;
+	}
+
 }
diff --git a/src/net/sourceforge/plantuml/ebnf/ETileConcatenation.java b/src/net/sourceforge/plantuml/ebnf/ETileConcatenation.java
index 25cb56300..78c0dbb54 100644
--- a/src/net/sourceforge/plantuml/ebnf/ETileConcatenation.java
+++ b/src/net/sourceforge/plantuml/ebnf/ETileConcatenation.java
@@ -52,6 +52,10 @@ public class ETileConcatenation extends ETile {
 		tiles.add(0, tile);
 	}
 
+	public void overideFirst(ETile tile) {
+		tiles.set(0, tile);
+	}
+
 	@Override
 	public void drawU(UGraphic ug) {
 		final StringBounder stringBounder = ug.getStringBounder();
@@ -104,4 +108,8 @@ public class ETileConcatenation extends ETile {
 		return width;
 	}
 
+	public ETile getFirst() {
+		return tiles.get(0);
+	}
+
 }
diff --git a/src/net/sourceforge/plantuml/ebnf/EbnfExpression.java b/src/net/sourceforge/plantuml/ebnf/EbnfExpression.java
index 842916d4f..c63830d20 100644
--- a/src/net/sourceforge/plantuml/ebnf/EbnfExpression.java
+++ b/src/net/sourceforge/plantuml/ebnf/EbnfExpression.java
@@ -39,15 +39,11 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import net.sourceforge.plantuml.Direction;
 import net.sourceforge.plantuml.ISkinParam;
 import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.FloatingNote;
-import net.sourceforge.plantuml.awt.geom.XDimension2D;
-import net.sourceforge.plantuml.awt.geom.XPoint2D;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.graphic.FontConfiguration;
 import net.sourceforge.plantuml.graphic.HorizontalAlignment;
-import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.TextBlock;
 import net.sourceforge.plantuml.graphic.TextBlockUtils;
 import net.sourceforge.plantuml.style.PName;
diff --git a/src/net/sourceforge/plantuml/eggs/PSystemWelcome.java b/src/net/sourceforge/plantuml/eggs/PSystemWelcome.java
index e298035d0..fc2400703 100644
--- a/src/net/sourceforge/plantuml/eggs/PSystemWelcome.java
+++ b/src/net/sourceforge/plantuml/eggs/PSystemWelcome.java
@@ -85,9 +85,9 @@ public class PSystemWelcome extends PlainDiagram {
 	}
 
 	public TextBlockBackcolored getGraphicStrings() {
-		if (position != null) {
+		if (position != null)
 			return GraphicStrings.createBlackOnWhite(strings, PSystemVersion.getPlantumlImage(), position);
-		}
+
 		return GraphicStrings.createBlackOnWhite(strings);
 	}
 
diff --git a/src/net/sourceforge/plantuml/hcl/HclDiagramFactory.java b/src/net/sourceforge/plantuml/hcl/HclDiagramFactory.java
index eb71b1bbe..51075f19e 100644
--- a/src/net/sourceforge/plantuml/hcl/HclDiagramFactory.java
+++ b/src/net/sourceforge/plantuml/hcl/HclDiagramFactory.java
@@ -78,7 +78,7 @@ public class HclDiagramFactory extends PSystemAbstractFactory {
 		} catch (Exception e) {
 			Logme.error(e);
 		}
-		final JsonDiagram result = new JsonDiagram(source, UmlDiagramType.HCL, data, highlighted);
+		final JsonDiagram result = new JsonDiagram(source, UmlDiagramType.HCL, data, highlighted, styleExtractor);
 //		if (styleExtractor != null) {
 //			styleExtractor.applyStyles(result.getSkinParam());
 //			final String title = styleExtractor.getTitle();
diff --git a/src/net/sourceforge/plantuml/hcl/HclParser.java b/src/net/sourceforge/plantuml/hcl/HclParser.java
index 564f432fd..673b36aaf 100644
--- a/src/net/sourceforge/plantuml/hcl/HclParser.java
+++ b/src/net/sourceforge/plantuml/hcl/HclParser.java
@@ -49,6 +49,7 @@ import net.sourceforge.plantuml.json.JsonObject;
 import net.sourceforge.plantuml.json.JsonString;
 import net.sourceforge.plantuml.json.JsonValue;
 
+// https://github.com/hashicorp/hcl
 public class HclParser {
 
 	private final List<HclTerm> terms = new ArrayList<HclTerm>();
diff --git a/src/net/sourceforge/plantuml/jsondiagram/JsonDiagram.java b/src/net/sourceforge/plantuml/jsondiagram/JsonDiagram.java
index 0835fe90d..ff025ecad 100644
--- a/src/net/sourceforge/plantuml/jsondiagram/JsonDiagram.java
+++ b/src/net/sourceforge/plantuml/jsondiagram/JsonDiagram.java
@@ -39,6 +39,7 @@ import java.io.OutputStream;
 import java.util.List;
 
 import net.sourceforge.plantuml.FileFormatOption;
+import net.sourceforge.plantuml.ScaleSimple;
 import net.sourceforge.plantuml.TitledDiagram;
 import net.sourceforge.plantuml.UmlDiagramType;
 import net.sourceforge.plantuml.awt.geom.XDimension2D;
@@ -60,14 +61,18 @@ import net.sourceforge.plantuml.ugraphic.MinMax;
 import net.sourceforge.plantuml.ugraphic.UFont;
 import net.sourceforge.plantuml.ugraphic.UGraphic;
 import net.sourceforge.plantuml.ugraphic.color.HColor;
+import net.sourceforge.plantuml.ugraphic.hand.UGraphicHandwritten;
 
 public class JsonDiagram extends TitledDiagram {
 
 	private final JsonValue root;
 	private final List<String> highlighted;
+	private final boolean handwritten;
 
-	public JsonDiagram(UmlSource source, UmlDiagramType type, JsonValue json, List<String> highlighted) {
+	public JsonDiagram(UmlSource source, UmlDiagramType type, JsonValue json, List<String> highlighted,
+			StyleExtractor styleExtractor) {
 		super(source, type, null);
+		this.handwritten = styleExtractor.isHandwritten();
 		if (json != null && (json.isString() || json.isBoolean() || json.isNumber())) {
 			this.root = new JsonArray();
 			((JsonArray) this.root).add(json);
@@ -75,6 +80,7 @@ public class JsonDiagram extends TitledDiagram {
 			this.root = json;
 		}
 		this.highlighted = highlighted;
+		setScale(new ScaleSimple(styleExtractor.getScale()));
 	}
 
 	public DiagramDescription getDescription() {
@@ -95,6 +101,8 @@ public class JsonDiagram extends TitledDiagram {
 	}
 
 	private void drawInternal(UGraphic ug) {
+		if (handwritten)
+			ug = new UGraphicHandwritten(ug);
 		if (root == null) {
 			final Display display = Display
 					.getWithNewlines("Your data does not sound like " + getUmlDiagramType() + " data");
diff --git a/src/net/sourceforge/plantuml/jsondiagram/JsonDiagramFactory.java b/src/net/sourceforge/plantuml/jsondiagram/JsonDiagramFactory.java
index a2d93ddf5..b24ead5ca 100644
--- a/src/net/sourceforge/plantuml/jsondiagram/JsonDiagramFactory.java
+++ b/src/net/sourceforge/plantuml/jsondiagram/JsonDiagramFactory.java
@@ -85,7 +85,7 @@ public class JsonDiagramFactory extends PSystemAbstractFactory {
 		} catch (ParseException e) {
 			json = null;
 		}
-		final JsonDiagram result = new JsonDiagram(source, UmlDiagramType.JSON, json, highlighted);
+		final JsonDiagram result = new JsonDiagram(source, UmlDiagramType.JSON, json, highlighted, styleExtractor);
 		if (styleExtractor != null)
 			styleExtractor.applyStyles(result.getSkinParam());
 
diff --git a/src/net/sourceforge/plantuml/jsondiagram/StyleExtractor.java b/src/net/sourceforge/plantuml/jsondiagram/StyleExtractor.java
index d31ae9c37..5a40cb272 100644
--- a/src/net/sourceforge/plantuml/jsondiagram/StyleExtractor.java
+++ b/src/net/sourceforge/plantuml/jsondiagram/StyleExtractor.java
@@ -51,27 +51,42 @@ public class StyleExtractor {
 	private final List<String> list = new ArrayList<>();
 	private final List<StringLocated> style = new ArrayList<>();
 	private String title = null;
+	private boolean handwritten = false;
+	private double scale = 1;
 
 	public StyleExtractor(Iterator<StringLocated> data) {
 		while (data.hasNext()) {
 			StringLocated line = data.next();
-			if (startStyle(line)) {
+			final String s = line.getString().trim();
+			if (s.length() == 0)
+				continue;
+			if (startStyle(s)) {
 				while (data.hasNext()) {
 					style.add(line);
 					if (endStyle(line))
 						break;
 					line = data.next();
 				}
-			} else if (line.getString().trim().startsWith("!assume ")) {
+			} else if (list.size() >= 1 && s.startsWith("!assume ")) {
 				// Ignore
-			} else if (line.getString().trim().startsWith("!pragma ")) {
+			} else if (list.size() >= 1 && s.startsWith("!pragma ")) {
 				// Ignore
-			} else if (line.getString().trim().startsWith("hide ")) {
+			} else if (list.size() >= 1 && s.startsWith("hide ")) {
 				// Ignore
-			} else if (line.getString().trim().startsWith("title ")) {
-				this.title = line.getString().trim().substring("title ".length()).trim();
-			} else if (line.getString().trim().startsWith("skinparam ")) {
-				if (line.getString().trim().contains("{")) {
+			} else if (list.size() >= 1 && s.startsWith("scale ")) {
+				// Ignore
+				try {
+					final double v = Double.parseDouble(s.replaceAll("\\D", ""));
+					if (v > 0)
+						scale = v;
+				} catch (Exception e) {
+				}
+			} else if (list.size() >= 1 && s.startsWith("title ")) {
+				this.title = s.substring("title ".length()).trim();
+			} else if (list.size() >= 1 && s.startsWith("skinparam ")) {
+				if (s.contains("handwritten") && s.contains("true"))
+					handwritten = true;
+				if (s.contains("{")) {
 					while (data.hasNext()) {
 						if (line.getString().trim().equals("}"))
 							break;
@@ -82,10 +97,11 @@ public class StyleExtractor {
 				list.add(line.getString());
 			}
 		}
+
 	}
 
-	private boolean startStyle(StringLocated line) {
-		return line.getString().trim().equals("<style>");
+	private boolean startStyle(String line) {
+		return line.equals("<style>");
 	}
 
 	private boolean endStyle(StringLocated line) {
@@ -110,4 +126,12 @@ public class StyleExtractor {
 		return title;
 	}
 
+	public final boolean isHandwritten() {
+		return handwritten;
+	}
+
+	public double getScale() {
+		return scale;
+	}
+
 }
diff --git a/src/net/sourceforge/plantuml/regex/CommandRegexfSingleLine.java b/src/net/sourceforge/plantuml/regex/CommandRegexfSingleLine.java
new file mode 100644
index 000000000..70dabec53
--- /dev/null
+++ b/src/net/sourceforge/plantuml/regex/CommandRegexfSingleLine.java
@@ -0,0 +1,72 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2023, Arnaud Roques
+ *
+ * Project Info:  http://plantuml.com
+ * 
+ * If you like this project or if you find it useful, you can support us at:
+ * 
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ * 
+ * This file is part of PlantUML.
+ *
+ * PlantUML is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlantUML distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+ * USA.
+ *
+ *
+ * Original Author:  Arnaud Roques
+ * 
+ *
+ */
+package net.sourceforge.plantuml.regex;
+
+import java.util.Collections;
+
+import net.sourceforge.plantuml.LineLocation;
+import net.sourceforge.plantuml.StringLocated;
+import net.sourceforge.plantuml.command.BlocLines;
+import net.sourceforge.plantuml.command.CommandExecutionResult;
+import net.sourceforge.plantuml.command.SingleLineCommand2;
+import net.sourceforge.plantuml.command.regex.IRegex;
+import net.sourceforge.plantuml.command.regex.RegexConcat;
+import net.sourceforge.plantuml.command.regex.RegexLeaf;
+import net.sourceforge.plantuml.command.regex.RegexResult;
+import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException;
+
+public class CommandRegexfSingleLine extends SingleLineCommand2<PSystemRegex> {
+
+	public CommandRegexfSingleLine() {
+		super(true, getRegexConcat());
+	}
+
+	static IRegex getRegexConcat() {
+		return RegexConcat.build(CommandRegexfSingleLine.class.getName(), RegexLeaf.start(), //
+				RegexLeaf.spaceZeroOrMore(), //
+				new RegexLeaf("LINE", "(.*)"), //
+				RegexLeaf.end());
+	}
+
+	@Override
+	protected CommandExecutionResult executeArg(PSystemRegex diagram, LineLocation location, RegexResult arg)
+			throws NoSuchColorException {
+		final String line = arg.get("LINE", 0);
+
+		final StringLocated string = new StringLocated(line, location);
+		return diagram.addBlocLines(BlocLines.from(Collections.singletonList(string)));
+	}
+}
diff --git a/src/net/sourceforge/plantuml/regex/PSystemRegex.java b/src/net/sourceforge/plantuml/regex/PSystemRegex.java
new file mode 100644
index 000000000..0f19fae35
--- /dev/null
+++ b/src/net/sourceforge/plantuml/regex/PSystemRegex.java
@@ -0,0 +1,284 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2023, Arnaud Roques
+ *
+ * Project Info:  http://plantuml.com
+ * 
+ * If you like this project or if you find it useful, you can support us at:
+ * 
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ * 
+ * This file is part of PlantUML.
+ *
+ * PlantUML is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlantUML distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+ * USA.
+ *
+ *
+ * Original Author:  Arnaud Roques
+ * 
+ *
+ */
+package net.sourceforge.plantuml.regex;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Deque;
+import java.util.List;
+
+import net.sourceforge.plantuml.FileFormatOption;
+import net.sourceforge.plantuml.ISkinParam;
+import net.sourceforge.plantuml.TitledDiagram;
+import net.sourceforge.plantuml.UmlDiagramType;
+import net.sourceforge.plantuml.awt.geom.XDimension2D;
+import net.sourceforge.plantuml.command.BlocLines;
+import net.sourceforge.plantuml.command.CommandExecutionResult;
+import net.sourceforge.plantuml.core.DiagramDescription;
+import net.sourceforge.plantuml.core.ImageData;
+import net.sourceforge.plantuml.core.UmlSource;
+import net.sourceforge.plantuml.ebnf.CharIterator;
+import net.sourceforge.plantuml.ebnf.CharIteratorImpl;
+import net.sourceforge.plantuml.ebnf.ETile;
+import net.sourceforge.plantuml.ebnf.ETileAlternation;
+import net.sourceforge.plantuml.ebnf.ETileBox;
+import net.sourceforge.plantuml.ebnf.ETileConcatenation;
+import net.sourceforge.plantuml.ebnf.ETileOneOrMore;
+import net.sourceforge.plantuml.ebnf.ETileOptional;
+import net.sourceforge.plantuml.ebnf.ETileZeroOrMore;
+import net.sourceforge.plantuml.ebnf.Symbol;
+import net.sourceforge.plantuml.ebnf.TextBlockable;
+import net.sourceforge.plantuml.graphic.AbstractTextBlock;
+import net.sourceforge.plantuml.graphic.FontConfiguration;
+import net.sourceforge.plantuml.graphic.StringBounder;
+import net.sourceforge.plantuml.graphic.TextBlock;
+import net.sourceforge.plantuml.graphic.TextBlockUtils;
+import net.sourceforge.plantuml.style.PName;
+import net.sourceforge.plantuml.style.Style;
+import net.sourceforge.plantuml.svek.TextBlockBackcolored;
+import net.sourceforge.plantuml.ugraphic.UGraphic;
+import net.sourceforge.plantuml.ugraphic.color.HColor;
+import net.sourceforge.plantuml.ugraphic.color.HColorSet;
+import net.sourceforge.plantuml.ugraphic.color.HColors;
+
+public class PSystemRegex extends TitledDiagram {
+
+	private final List<TextBlockable> expressions = new ArrayList<>();
+
+	public PSystemRegex(UmlSource source) {
+		super(source, UmlDiagramType.REGEX, null);
+		final ISkinParam skinParam = getSkinParam();
+		this.style = ETile.getStyleSignature().getMergedStyle(skinParam.getCurrentStyleBuilder());
+		this.fontConfiguration = style.getFontConfiguration(skinParam.getIHtmlColorSet());
+		this.colorSet = skinParam.getIHtmlColorSet();
+		this.lineColor = style.value(PName.LineColor).asColor(skinParam.getIHtmlColorSet());
+	}
+
+	public DiagramDescription getDescription() {
+		return new DiagramDescription("(Regular Expression)");
+	}
+
+	private final Deque<ETile> stack = new ArrayDeque<>();
+	private final FontConfiguration fontConfiguration;
+	private final Style style;
+	private final HColorSet colorSet;
+	private final HColor lineColor;
+
+//	public CommandExecutionResult addBlocLines(BlocLines blines, String commentAbove, String commentBelow) {
+//		final boolean isCompact = getPragma().isDefine("compact");
+//		final CharIterator it = new CharIteratorImpl(blines);
+//		final EbnfExpression tmp1 = EbnfExpression.create(it, isCompact, commentAbove, commentBelow);
+//		if (tmp1.isEmpty())
+//			return CommandExecutionResult.error("Unparsable expression");
+//		expressions.add(tmp1);
+//		return CommandExecutionResult.ok();
+//
+//	}
+//
+//	public CommandExecutionResult addNote(final Display note, Colors colors) {
+//		expressions.add(new TextBlockable() {
+//			@Override
+//			public TextBlock getUDrawable(ISkinParam skinParam) {
+//				final FloatingNote f = FloatingNote.create(note, skinParam, SName.ebnf);
+//				return TextBlockUtils.withMargin(f, 0, 0, 5, 15);
+//			}
+//		});
+//		return CommandExecutionResult.ok();
+//	}
+
+	@Override
+	protected ImageData exportDiagramNow(OutputStream os, int index, FileFormatOption fileFormatOption)
+			throws IOException {
+		return createImageBuilder(fileFormatOption).drawable(getTextBlock()).write(os);
+	}
+
+	private TextBlockBackcolored getTextBlock() {
+//		while (stack.size() > 1)
+//			concatenation();
+		final ETile peekFirst = stack.peekFirst();
+		final TextBlock tb = new AbstractTextBlock() {
+
+			@Override
+			public void drawU(UGraphic ug) {
+				peekFirst.drawU(ug.apply(HColors.BLACK));
+			}
+
+			@Override
+			public XDimension2D calculateDimension(StringBounder stringBounder) {
+				return peekFirst.calculateDimension(stringBounder);
+			}
+		};
+		return TextBlockUtils.addBackcolor(tb, null);
+
+	}
+
+	public CommandExecutionResult addBlocLines(BlocLines from) {
+		final CharIterator it = new CharIteratorImpl(from);
+		final List<ReToken> parsed1 = RegexExpression.parse(it);
+		System.err.println("parsed1=" + parsed1);
+		final List<ReToken> parsed2 = addImplicitConcatenation(parsed1);
+		System.err.println("parsed2=" + parsed2);
+		final ShuntingYard shuntingYard = new ShuntingYard(parsed2.iterator());
+		final List<ReToken> result = shuntingYard.getOuputQueue();
+		System.err.println("result=" + result);
+		for (ReToken token : result)
+			if (token.getType() == ReTokenType.SIMPLE_CHAR)
+				push(token, Symbol.TERMINAL_STRING1);
+			else if (token.getType() == ReTokenType.ESCAPED_CHAR)
+				push(token, Symbol.TERMINAL_STRING1);
+			else if (token.getType() == ReTokenType.GROUP)
+				push(token, Symbol.SPECIAL_SEQUENCE);
+			else if (token.getType() == ReTokenType.CLASS)
+				push(token, Symbol.LITTERAL);
+			else if (token.getType() == ReTokenType.ANCHOR)
+				push(token, Symbol.LITTERAL);
+			else if (token.getType() == ReTokenType.CONCATENATION_IMPLICIT)
+				concatenation();
+			else if (token.getType() == ReTokenType.ALTERNATIVE)
+				alternation();
+			else if (token.getType() == ReTokenType.QUANTIFIER && token.getData().equals("*"))
+				repetitionZeroOrMore(false);
+			else if (token.getType() == ReTokenType.QUANTIFIER && token.getData().equals("+"))
+				repetitionOneOrMore();
+			else if (token.getType() == ReTokenType.QUANTIFIER && token.getData().equals("?"))
+				optional();
+			else
+				throw new UnsupportedOperationException(token.toString());
+
+		return CommandExecutionResult.ok();
+	}
+
+	private List<ReToken> addImplicitConcatenation(List<ReToken> list) {
+		final List<ReToken> result = new ArrayList<>();
+		for (ReToken token : list) {
+			if (result.size() > 0
+					&& ReTokenType.needImplicitConcatenation(result.get(result.size() - 1).getType(), token.getType()))
+				result.add(new ReToken(ReTokenType.CONCATENATION_IMPLICIT, ""));
+			result.add(token);
+		}
+		return result;
+	}
+
+	private void push(ReToken element, Symbol type) {
+		// final Symbol type = Symbol.LITTERAL;
+		stack.addFirst(new ETileBox(element.getData(), type, fontConfiguration, style, colorSet, getSkinParam()));
+	}
+
+	private void repetitionZeroOrMore(boolean isCompact) {
+		final ETile arg1 = stack.removeFirst();
+		if (isCompact)
+			stack.addFirst(new ETileZeroOrMore(arg1));
+		else
+			stack.addFirst(new ETileOptional(new ETileOneOrMore(arg1), getSkinParam()));
+	}
+
+	private void optional() {
+		final ETile arg1 = stack.removeFirst();
+		stack.addFirst(new ETileOptional(arg1, getSkinParam()));
+	}
+
+	private void repetitionOneOrMore() {
+		final ETile arg1 = stack.removeFirst();
+		stack.addFirst(new ETileOneOrMore(arg1));
+	}
+
+	private void alternation() {
+		final ETile arg1 = stack.removeFirst();
+		final ETile arg2 = stack.removeFirst();
+		if (arg1 instanceof ETileAlternation) {
+			arg1.push(arg2);
+			stack.addFirst(arg1);
+		} else if (arg2 instanceof ETileAlternation) {
+			arg2.push(arg1);
+			stack.addFirst(arg2);
+		} else {
+			final ETile concat = new ETileAlternation();
+			concat.push(arg1);
+			concat.push(arg2);
+			stack.addFirst(concat);
+		}
+	}
+
+	private void concatenation() {
+		final ETile arg1 = stack.removeFirst();
+		final ETile arg2 = stack.removeFirst();
+		if (isBoxMergeable(arg1) && isBoxMergeable(arg2)) {
+			final ETileBox box1 = (ETileBox) arg1;
+			final ETileBox box2 = (ETileBox) arg2;
+			stack.addFirst(box2.mergeWith(box1));
+			return;
+		}
+		if (isConcatenation1Mergeable(arg1) && isBoxMergeable(arg2)) {
+			final ETileConcatenation concat1 = (ETileConcatenation) arg1;
+			final ETileBox box1 = (ETileBox) concat1.getFirst();
+			final ETileBox box2 = (ETileBox) arg2;
+			concat1.overideFirst(box2.mergeWith(box1));
+			stack.addFirst(concat1);
+			return;
+		}
+		if (arg1 instanceof ETileConcatenation) {
+			arg1.push(arg2);
+			stack.addFirst(arg1);
+		} else if (arg2 instanceof ETileConcatenation) {
+			arg2.push(arg1);
+			stack.addFirst(arg2);
+		} else {
+			final ETile concat = new ETileConcatenation();
+			concat.push(arg1);
+			concat.push(arg2);
+			stack.addFirst(concat);
+		}
+	}
+
+	private boolean isConcatenation1Mergeable(ETile tile) {
+		if (tile instanceof ETileConcatenation) {
+			final ETileConcatenation concat = (ETileConcatenation) tile;
+			return isBoxMergeable(concat.getFirst());
+		}
+		return false;
+	}
+
+	private boolean isBoxMergeable(ETile tile) {
+		if (tile instanceof ETileBox) {
+			final ETileBox box = (ETileBox) tile;
+			return box.getSymbol() == Symbol.TERMINAL_STRING1;
+		}
+		return false;
+	}
+
+}
diff --git a/src/net/sourceforge/plantuml/regex/PSystemRegexFactory.java b/src/net/sourceforge/plantuml/regex/PSystemRegexFactory.java
new file mode 100644
index 000000000..82700bc70
--- /dev/null
+++ b/src/net/sourceforge/plantuml/regex/PSystemRegexFactory.java
@@ -0,0 +1,69 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2023, Arnaud Roques
+ *
+ * Project Info:  http://plantuml.com
+ * 
+ * If you like this project or if you find it useful, you can support us at:
+ * 
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ * 
+ * This file is part of PlantUML.
+ *
+ * PlantUML is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlantUML distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+ * USA.
+ *
+ *
+ * Original Author:  Arnaud Roques
+ * 
+ *
+ */
+package net.sourceforge.plantuml.regex;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import net.sourceforge.plantuml.command.Command;
+import net.sourceforge.plantuml.command.CommonCommands;
+import net.sourceforge.plantuml.command.PSystemCommandFactory;
+import net.sourceforge.plantuml.core.DiagramType;
+import net.sourceforge.plantuml.core.UmlSource;
+
+public class PSystemRegexFactory extends PSystemCommandFactory {
+
+	public PSystemRegexFactory() {
+		super(DiagramType.REGEX);
+	}
+
+	@Override
+	protected List<Command> createCommands() {
+
+		final List<Command> cmds = new ArrayList<>();
+		CommonCommands.addCommonCommands1(cmds);
+		cmds.add(new CommandRegexfSingleLine());
+
+		return cmds;
+	}
+
+	@Override
+	public PSystemRegex createEmptyDiagram(UmlSource source, Map<String, String> skinParam) {
+		return new PSystemRegex(source);
+	}
+
+}
diff --git a/src/net/sourceforge/plantuml/regex/ReToken.java b/src/net/sourceforge/plantuml/regex/ReToken.java
new file mode 100644
index 000000000..7703f7240
--- /dev/null
+++ b/src/net/sourceforge/plantuml/regex/ReToken.java
@@ -0,0 +1,61 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2020, Arnaud Roques
+ *
+ * Project Info:  http://plantuml.com
+ * 
+ * If you like this project or if you find it useful, you can support us at:
+ * 
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ * 
+ * This file is part of PlantUML.
+ *
+ * PlantUML is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlantUML distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+ * USA.
+ *
+ *
+ * Original Author:  Arnaud Roques
+ *
+ *
+ */
+package net.sourceforge.plantuml.regex;
+
+public class ReToken {
+
+	private final ReTokenType type;
+	private final String data;
+
+	public ReToken(ReTokenType type, String data) {
+		this.type = type;
+		this.data = data;
+	}
+
+	@Override
+	public String toString() {
+		return type.toString() + "[" + data + "]";
+	}
+
+	public final ReTokenType getType() {
+		return type;
+	}
+
+	public final String getData() {
+		return data;
+	}
+
+}
diff --git a/src/net/sourceforge/plantuml/regex/ReTokenType.java b/src/net/sourceforge/plantuml/regex/ReTokenType.java
new file mode 100644
index 000000000..02d08546a
--- /dev/null
+++ b/src/net/sourceforge/plantuml/regex/ReTokenType.java
@@ -0,0 +1,65 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2020, Arnaud Roques
+ *
+ * Project Info:  http://plantuml.com
+ * 
+ * If you like this project or if you find it useful, you can support us at:
+ * 
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ * 
+ * This file is part of PlantUML.
+ *
+ * PlantUML is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlantUML distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+ * USA.
+ *
+ *
+ * Original Author:  Arnaud Roques
+ *
+ *
+ */
+package net.sourceforge.plantuml.regex;
+
+public enum ReTokenType {
+
+	SIMPLE_CHAR, //
+	ESCAPED_CHAR, //
+	CLASS, //
+	QUANTIFIER, //
+	ANCHOR, //
+	GROUP, //
+	ALTERNATIVE, //
+	PARENTHESIS_OPEN, //
+	PARENTHESIS_CLOSE, //
+	CONCATENATION_IMPLICIT;
+
+	static public boolean needImplicitConcatenation(ReTokenType token1, ReTokenType token2) {
+		if (token1 == ALTERNATIVE)
+			return false;
+		if (token2 == ALTERNATIVE)
+			return false;
+		if (token2 == QUANTIFIER)
+			return false;
+		if (token1 == PARENTHESIS_OPEN)
+			return false;
+		if (token2 == PARENTHESIS_CLOSE)
+			return false;
+		return true;
+	}
+
+}
diff --git a/src/net/sourceforge/plantuml/regex/RegexExpression.java b/src/net/sourceforge/plantuml/regex/RegexExpression.java
new file mode 100644
index 000000000..c87777587
--- /dev/null
+++ b/src/net/sourceforge/plantuml/regex/RegexExpression.java
@@ -0,0 +1,223 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2020, Arnaud Roques
+ *
+ * Project Info:  http://plantuml.com
+ * 
+ * If you like this project or if you find it useful, you can support us at:
+ * 
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ * 
+ * This file is part of PlantUML.
+ *
+ * PlantUML is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlantUML distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+ * USA.
+ *
+ *
+ * Original Author:  Arnaud Roques
+ *
+ *
+ */
+package net.sourceforge.plantuml.regex;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import net.sourceforge.plantuml.ebnf.CharIterator;
+
+public class RegexExpression {
+
+	public static List<ReToken> parse(CharIterator it) {
+		final List<ReToken> result = new ArrayList<>();
+		while (true) {
+			final char current = it.peek(0);
+			if (current == '\0')
+				break;
+			// System.err.println("current=" + current);
+			if (isStartAnchor(it)) {
+				final String s = readAnchor(it);
+				result.add(new ReToken(ReTokenType.ANCHOR, s));
+			} else if (isEscapedChar(it)) {
+				result.add(new ReToken(ReTokenType.ESCAPED_CHAR, "" + it.peek(1)));
+				it.next();
+				it.next();
+			} else if (current == '|') {
+				result.add(new ReToken(ReTokenType.ALTERNATIVE, "|"));
+				it.next();
+			} else if (current == '[') {
+				final String s = readGroup(it);
+				result.add(new ReToken(ReTokenType.GROUP, s));
+			} else if (isStartOpenParenthesis(it)) {
+				final String s = readOpenParenthesis(it);
+				result.add(new ReToken(ReTokenType.PARENTHESIS_OPEN, s));
+			} else if (current == ')') {
+				result.add(new ReToken(ReTokenType.PARENTHESIS_CLOSE, ")"));
+				it.next();
+			} else if (isStartQuantifier(it)) {
+				final String s = readQuantifier(it);
+				result.add(new ReToken(ReTokenType.QUANTIFIER, s));
+			} else if (isStartClass(it)) {
+				final String s = readClass(it);
+				result.add(new ReToken(ReTokenType.CLASS, s));
+			} else if (isSimpleLetter(current)) {
+				result.add(new ReToken(ReTokenType.SIMPLE_CHAR, "" + current));
+				it.next();
+			} else {
+				throw new IllegalStateException();
+			}
+		}
+		// System.err.println("result=" + result);
+		return result;
+
+	}
+
+	private static boolean isStartOpenParenthesis(CharIterator it) {
+		final char current0 = it.peek(0);
+		if (current0 == '(')
+			return true;
+		return false;
+	}
+
+	private static String readOpenParenthesis(CharIterator it) {
+		final char current0 = it.peek(0);
+		it.next();
+		final StringBuilder result = new StringBuilder();
+		result.append(current0);
+		return result.toString();
+	}
+
+	private static boolean isStartQuantifier(CharIterator it) {
+		final char current0 = it.peek(0);
+		if (current0 == '*' || current0 == '+' || current0 == '?' || current0 == '{')
+			return true;
+		return false;
+	}
+
+	private static String readQuantifier(CharIterator it) {
+		final char current0 = it.peek(0);
+		it.next();
+		final StringBuilder result = new StringBuilder();
+		result.append(current0);
+		if (current0 == '{')
+			while (it.peek(0) != 0) {
+				final char ch = it.peek(0);
+				result.append(ch);
+				it.next();
+				if (ch == '}')
+					break;
+			}
+		if (it.peek(0) == '?') {
+			result.append('?');
+			it.next();
+		}
+		return result.toString();
+	}
+
+	private static boolean isEscapedChar(CharIterator it) {
+		final char current0 = it.peek(0);
+		if (current0 == '\\') {
+			final char current1 = it.peek(1);
+			if (current1 == '.' || current1 == '*' || current1 == '\\' || current1 == '?' || current1 == '^'
+					|| current1 == '$' || current1 == '|' || current1 == '(' || current1 == ')' || current1 == '['
+					|| current1 == ']' || current1 == '{' || current1 == '}')
+				return true;
+		}
+		return false;
+	}
+
+	private static String readGroup(CharIterator it) {
+		final char current0 = it.peek(0);
+		if (current0 != '[')
+			throw new IllegalStateException();
+		it.next();
+		final StringBuilder result = new StringBuilder();
+		while (it.peek(0) != 0) {
+			char ch = it.peek(0);
+			it.next();
+			if (ch == ']')
+				break;
+			result.append(ch);
+			if (ch == '\\') {
+				ch = it.peek(0);
+				it.next();
+				result.append(ch);
+			}
+
+		}
+		return result.toString();
+	}
+
+	private static String readClass(CharIterator it) {
+		final char current0 = it.peek(0);
+		if (current0 == '.') {
+			it.next();
+			return "" + current0;
+		}
+		if (current0 == '\\') {
+			it.next();
+			final String result = "" + current0 + it.peek(0);
+			it.next();
+			return result;
+		}
+		throw new IllegalStateException();
+	}
+
+	private static boolean isStartClass(CharIterator it) {
+		final char current0 = it.peek(0);
+		if (current0 == '.')
+			return true;
+		if (current0 == '\\')
+			return true;
+		return false;
+	}
+
+	private static boolean isSimpleLetter(char ch) {
+		if (ch == '\\' || ch == '.')
+			return false;
+		return true;
+	}
+
+	private static boolean isStartAnchor(CharIterator it) {
+		final char current0 = it.peek(0);
+		if (current0 == '^' || current0 == '$')
+			return true;
+		if (current0 == '\\') {
+			final char current1 = it.peek(1);
+			if (current1 == 'A' || current1 == 'Z' || current1 == 'z' || current1 == 'G' || current1 == 'b'
+					|| current1 == 'B')
+				return true;
+		}
+		return false;
+	}
+
+	private static String readAnchor(CharIterator it) {
+		final char current0 = it.peek(0);
+		if (current0 == '^' || current0 == '$') {
+			it.next();
+			return "" + current0;
+		}
+		if (current0 == '\\') {
+			it.next();
+			final String result = "" + current0 + it.peek(0);
+			it.next();
+			return result;
+		}
+		throw new IllegalStateException();
+	}
+
+}
diff --git a/src/net/sourceforge/plantuml/regex/ShuntingYard.java b/src/net/sourceforge/plantuml/regex/ShuntingYard.java
new file mode 100644
index 000000000..5dc50d3e8
--- /dev/null
+++ b/src/net/sourceforge/plantuml/regex/ShuntingYard.java
@@ -0,0 +1,108 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2020, Arnaud Roques
+ *
+ * Project Info:  http://plantuml.com
+ * 
+ * If you like this project or if you find it useful, you can support us at:
+ * 
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ * 
+ * This file is part of PlantUML.
+ *
+ * PlantUML is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlantUML distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+ * USA.
+ *
+ *
+ * Original Author:  Arnaud Roques
+ *
+ *
+ */
+package net.sourceforge.plantuml.regex;
+
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Deque;
+import java.util.Iterator;
+import java.util.List;
+
+public class ShuntingYard {
+
+	final private List<ReToken> ouputQueue = new ArrayList<>();
+	final private Deque<ReToken> operatorStack = new ArrayDeque<>();
+
+	public ShuntingYard(Iterator<ReToken> it) {
+		while (it.hasNext()) {
+			final ReToken token = it.next();
+//			System.err.println("token=" + token);
+//			System.err.println("ouputQueue=" + ouputQueue);
+//			System.err.println("operatorStack=" + operatorStack);
+			if (token.getType() == ReTokenType.SIMPLE_CHAR) {
+				ouputQueue.add(token);
+			} else if (token.getType() == ReTokenType.ESCAPED_CHAR) {
+				ouputQueue.add(token);
+			} else if (token.getType() == ReTokenType.GROUP) {
+				ouputQueue.add(token);
+			} else if (token.getType() == ReTokenType.CLASS) {
+				ouputQueue.add(token);
+			} else if (token.getType() == ReTokenType.ANCHOR) {
+				ouputQueue.add(token);
+			} else if (token.getType() == ReTokenType.QUANTIFIER) {
+				ouputQueue.add(token);
+			} else if (token.getType() == ReTokenType.CONCATENATION_IMPLICIT) {
+				// push it onto the operator stack.
+				operatorStack.addFirst(token);
+			} else if (token.getType() == ReTokenType.ALTERNATIVE) {
+				while (thereIsAConcatenationAtTheTopOfTheOperatorStack())
+					ouputQueue.add(operatorStack.removeFirst());
+				// push it onto the operator stack.
+				operatorStack.addFirst(token);
+			} else if (token.getType() == ReTokenType.PARENTHESIS_OPEN) {
+				operatorStack.addFirst(token);
+			} else if (token.getType() == ReTokenType.PARENTHESIS_CLOSE) {
+				while (operatorStack.peekFirst() != null
+						&& operatorStack.peekFirst().getType() != ReTokenType.PARENTHESIS_OPEN)
+					ouputQueue.add(operatorStack.removeFirst());
+				final ReToken first = operatorStack.removeFirst();
+//				ouputQueue.add(first);
+
+			} else {
+				throw new UnsupportedOperationException(token.toString());
+			}
+
+		}
+
+		while (operatorStack.isEmpty() == false) {
+			final ReToken token = operatorStack.removeFirst();
+			ouputQueue.add(token);
+		}
+
+		// System.err.println("ouputQueue=" + ouputQueue);
+	}
+
+	private boolean thereIsAConcatenationAtTheTopOfTheOperatorStack() {
+		final ReToken top = operatorStack.peekFirst();
+		return top != null && top.getType() == ReTokenType.CONCATENATION_IMPLICIT;
+	}
+
+	public final List<ReToken> getOuputQueue() {
+		return Collections.unmodifiableList(ouputQueue);
+	}
+
+}
diff --git a/src/net/sourceforge/plantuml/style/SName.java b/src/net/sourceforge/plantuml/style/SName.java
index 52fd468b8..7249f97b2 100644
--- a/src/net/sourceforge/plantuml/style/SName.java
+++ b/src/net/sourceforge/plantuml/style/SName.java
@@ -115,6 +115,7 @@ public enum SName {
 	rectangle, //
 	reference, //
 	referenceHeader, //
+	regex, //
 	requirement, //
 	root, //
 	rootNode, //
diff --git a/src/net/sourceforge/plantuml/svg/SvgGraphics.java b/src/net/sourceforge/plantuml/svg/SvgGraphics.java
index 23734695a..dda2ef32f 100644
--- a/src/net/sourceforge/plantuml/svg/SvgGraphics.java
+++ b/src/net/sourceforge/plantuml/svg/SvgGraphics.java
@@ -260,11 +260,14 @@ public class SvgGraphics {
 	private static String getData(final String name) {
 		try {
 			final InputStream is = SvgGraphics.class.getResourceAsStream("/svg/" + name);
-			return FileUtils.readText(is);
+			if (is == null)
+				Log.error("Cannot retrieve " + name);
+			else
+				return FileUtils.readText(is);
 		} catch (IOException e) {
 			Logme.error(e);
-			return null;
 		}
+		return null;
 	}
 
 	private Element getPathHover(String hover) {
diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java
index ec0b74d7a..df50fa4dc 100644
--- a/src/net/sourceforge/plantuml/version/Version.java
+++ b/src/net/sourceforge/plantuml/version/Version.java
@@ -81,7 +81,7 @@ public class Version {
 	}
 
 	public static int beta() {
-		final int beta = 0;
+		final int beta = 1;
 		return beta;
 	}
 
diff --git a/src/net/sourceforge/plantuml/wbs/CommandWBSLink.java b/src/net/sourceforge/plantuml/wbs/CommandWBSLink.java
index 4e34a657c..447c95470 100644
--- a/src/net/sourceforge/plantuml/wbs/CommandWBSLink.java
+++ b/src/net/sourceforge/plantuml/wbs/CommandWBSLink.java
@@ -42,6 +42,11 @@ import net.sourceforge.plantuml.command.regex.IRegex;
 import net.sourceforge.plantuml.command.regex.RegexConcat;
 import net.sourceforge.plantuml.command.regex.RegexLeaf;
 import net.sourceforge.plantuml.command.regex.RegexResult;
+import net.sourceforge.plantuml.cucadiagram.Stereotype;
+import net.sourceforge.plantuml.graphic.color.ColorParser;
+import net.sourceforge.plantuml.graphic.color.ColorType;
+import net.sourceforge.plantuml.graphic.color.Colors;
+import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException;
 
 public class CommandWBSLink extends SingleLineCommand2<WBSDiagram> {
 
@@ -53,19 +58,38 @@ public class CommandWBSLink extends SingleLineCommand2<WBSDiagram> {
 		return RegexConcat.build(CommandWBSLink.class.getName(), RegexLeaf.start(), //
 				new RegexLeaf("CODE1", "([%pLN_]+)"), //
 				RegexLeaf.spaceZeroOrMore(), //
-				new RegexLeaf("LINK", "-+\\>"), //
+				new RegexLeaf("LINK", "[.-]+\\>"), //
 				RegexLeaf.spaceZeroOrMore(), //
 				new RegexLeaf("CODE2", "([%pLN_]+)"), //
 				RegexLeaf.spaceZeroOrMore(), //
-				new RegexLeaf("MESSAGE", "(?::[%s]*(.*))?"), RegexLeaf.end());
+				color().getRegex(), //
+				RegexLeaf.spaceZeroOrMore(), //
+				new RegexLeaf("STEREOTYPE", "(\\<\\<.*\\>\\>)?"), //
+				RegexLeaf.spaceZeroOrMore(), //
+				new RegexLeaf("LABEL_LINK", "(?::[%s]*(.+))?"), //
+				RegexLeaf.end());
+	}
+
+	private static ColorParser color() {
+		return ColorParser.simpleColor(ColorType.LINE);
 	}
 
 	@Override
-	protected CommandExecutionResult executeArg(WBSDiagram diagram, LineLocation location, RegexResult arg) {
+	protected CommandExecutionResult executeArg(WBSDiagram diagram, LineLocation location, RegexResult arg)
+			throws NoSuchColorException {
 		final String code1 = arg.get("CODE1", 0);
 		final String code2 = arg.get("CODE2", 0);
-//		final String message = arg.get("MESSAGE", 0);
-		return diagram.link(code1, code2);
+//		final String message = arg.get("LABEL_LINK", 0);
+
+		final Colors colors = color().getColor(arg, diagram.getSkinParam().getIHtmlColorSet());
+//		link.setColors(color);
+//		link.applyStyle(arg.getLazzy("ARROW_STYLE", 0));
+		Stereotype stereotype = null;
+		if (arg.get("STEREOTYPE", 0) != null) {
+			stereotype = Stereotype.build(arg.get("STEREOTYPE", 0));
+		}
+
+		return diagram.link(code1, code2, colors, stereotype);
 	}
 
 }
diff --git a/src/net/sourceforge/plantuml/wbs/WBSDiagram.java b/src/net/sourceforge/plantuml/wbs/WBSDiagram.java
index 50ba4ce26..ddbbb7cdd 100644
--- a/src/net/sourceforge/plantuml/wbs/WBSDiagram.java
+++ b/src/net/sourceforge/plantuml/wbs/WBSDiagram.java
@@ -46,6 +46,7 @@ import net.sourceforge.plantuml.Direction;
 import net.sourceforge.plantuml.FileFormatOption;
 import net.sourceforge.plantuml.UmlDiagram;
 import net.sourceforge.plantuml.UmlDiagramType;
+import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.FtileGroup;
 import net.sourceforge.plantuml.awt.geom.XDimension2D;
 import net.sourceforge.plantuml.awt.geom.XRectangle2D;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
@@ -56,10 +57,18 @@ import net.sourceforge.plantuml.core.DiagramDescription;
 import net.sourceforge.plantuml.core.ImageData;
 import net.sourceforge.plantuml.core.UmlSource;
 import net.sourceforge.plantuml.cucadiagram.Display;
+import net.sourceforge.plantuml.cucadiagram.Stereotype;
 import net.sourceforge.plantuml.graphic.InnerStrategy;
 import net.sourceforge.plantuml.graphic.StringBounder;
+import net.sourceforge.plantuml.graphic.color.ColorType;
+import net.sourceforge.plantuml.graphic.color.Colors;
 import net.sourceforge.plantuml.mindmap.IdeaShape;
 import net.sourceforge.plantuml.style.NoStyleAvailableException;
+import net.sourceforge.plantuml.style.PName;
+import net.sourceforge.plantuml.style.SName;
+import net.sourceforge.plantuml.style.Style;
+import net.sourceforge.plantuml.style.StyleSignature;
+import net.sourceforge.plantuml.style.StyleSignatureBasic;
 import net.sourceforge.plantuml.svek.TextBlockBackcolored;
 import net.sourceforge.plantuml.ugraphic.AbstractCommonUGraphic;
 import net.sourceforge.plantuml.ugraphic.MinMax;
@@ -231,15 +240,23 @@ public class WBSDiagram extends UmlDiagram {
 		}
 	}
 
-	public CommandExecutionResult link(String code1, String code2) {
+	public CommandExecutionResult link(String code1, String code2, Colors colors, Stereotype stereotype) {
 		final WElement element1 = codes.get(code1);
 		if (element1 == null)
 			return CommandExecutionResult.error("No such node " + code1);
 		final WElement element2 = codes.get(code2);
 		if (element2 == null)
 			return CommandExecutionResult.error("No such node " + code2);
+		HColor color = colors.getColor(ColorType.LINE);
 
-		links.add(new WBSLink(element1, element2));
+		if (color == null) {
+			final Style style = StyleSignatureBasic.of(SName.root, SName.element, SName.wbsDiagram, SName.arrow)
+					.withTOBECHANGED(stereotype).getMergedStyle(getCurrentStyleBuilder());
+
+			color = style.value(PName.LineColor).asColor(getSkinParam().getIHtmlColorSet());
+		}
+
+		links.add(new WBSLink(element1, element2, color));
 
 		return CommandExecutionResult.ok();
 	}
diff --git a/src/net/sourceforge/plantuml/wbs/WBSLink.java b/src/net/sourceforge/plantuml/wbs/WBSLink.java
index 30ea1abef..dcdd71079 100644
--- a/src/net/sourceforge/plantuml/wbs/WBSLink.java
+++ b/src/net/sourceforge/plantuml/wbs/WBSLink.java
@@ -43,16 +43,20 @@ import net.sourceforge.plantuml.graphic.UDrawable;
 import net.sourceforge.plantuml.svek.extremity.ExtremityArrow;
 import net.sourceforge.plantuml.ugraphic.UGraphic;
 import net.sourceforge.plantuml.ugraphic.UTranslate;
-import net.sourceforge.plantuml.ugraphic.color.HColors;
+import net.sourceforge.plantuml.ugraphic.color.HColor;
 
 class WBSLink implements UDrawable {
 
 	private final WElement element1;
 	private final WElement element2;
+	private final HColor color;
 
-	public WBSLink(WElement element1, WElement element2) {
+	public WBSLink(WElement element1, WElement element2, HColor color) {
 		this.element1 = element1;
 		this.element2 = element2;
+		this.color = color;
+		if (color == null)
+			throw new IllegalArgumentException();
 	}
 
 	public final WElement getElement1() {
@@ -83,7 +87,7 @@ class WBSLink implements UDrawable {
 			final XPoint2D c2 = rect2.intersect(line);
 
 			line = new XLine2D(c1, c2);
-			ug = ug.apply(HColors.RED);
+			ug = ug.apply(color);
 			line.drawU(ug);
 
 			final double angle = line.getAngle();
diff --git a/src/net/sourceforge/plantuml/yaml/YamlDiagramFactory.java b/src/net/sourceforge/plantuml/yaml/YamlDiagramFactory.java
index 3eb283b75..322a8ba36 100644
--- a/src/net/sourceforge/plantuml/yaml/YamlDiagramFactory.java
+++ b/src/net/sourceforge/plantuml/yaml/YamlDiagramFactory.java
@@ -85,7 +85,7 @@ public class YamlDiagramFactory extends PSystemAbstractFactory {
 		} catch (Exception e) {
 			Logme.error(e);
 		}
-		final JsonDiagram result = new JsonDiagram(source, UmlDiagramType.YAML, yaml, highlighted);
+		final JsonDiagram result = new JsonDiagram(source, UmlDiagramType.YAML, yaml, highlighted, styleExtractor);
 		if (styleExtractor != null) {
 			styleExtractor.applyStyles(result.getSkinParam());
 			final String title = styleExtractor.getTitle();
diff --git a/stdlib/c4-abx.repx b/stdlib/c4-abx.repx
index 8b8103b9c9edf8f80ee7c1e57181f9498a5412be..d7bc21daddfd5b96715b76948d37bb360ec266a8 100644
GIT binary patch
literal 11997
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

literal 9882
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
MRQ`58Ov)Yq1I>4kMF0Q*

diff --git a/stdlib/c4-dex.repx b/stdlib/c4-dex.repx
index d9b833048a0a86f12a56504fa84d4bdf7662cc99..547fbbdf1b97ea86dc2d3eebb0b020d3c67525d4 100644
GIT binary patch
literal 564
zcmV-40?Yjy{}BKlg>l2(hSoyF<nXZ>ru?t9>;)L@MmRtjmOy?dEVsiQY#*9PU<;&(
z4%l9uTEL#0srdmA|5x|=ASoTwsoDciquizz%S14<=^ZR0$y{o&Hr_xiLf`aT3_pN;
z1UGG}B3|n;@fZWQi}G3F@lER0>+6xt5)*<54a$Ed-))ib6!Ge#H3)=s0;(Wg608vx
z3C2PC2^)at9+RN|;7QTRXJ2Ay;+szX`IP@n^P4B|U)MFiYbz1)10&)r-8LaA<D$Yt
zLqb9$ViLNAur?LMgdVu8$w9)e@`B+<h?QI&IsS!Qk*pK;ZjhuLb_bDU0d^<RCeI%3
zslE6sGY6jsb9sG2JZ}}h{&!09h8Q`MlOky#dWasPhv+R_L~pG`h_zk#!3v36xjwxL
zy%0HJ_P^lJy8bRTPmlnhculqbUWn__n|mf8%O9S9+I3uoh#K8}MR6Qzeh7dz^61C}
z*OSd>fICQL$1u{Ws*TAoZ>kCvf7!f#Q3%kes;~s<pJ|-22Ozn;3WX9HBI+>y!=R?<
z$hf02Ra)c9m@-`^zYocP#RdcOYud=6jBtf@@6|NvPW%T5TxFWSjS0<O;{xp+&2r+m
z61JiRG}?3Mi*GNXq-}z2gTx8IaY3XIyb2NN1E-)9_kl@yXDQh?Paa{~AQ;o#*e1~;
zH7(uA#@*6>F*eU%q7*H`5uCm`&I)Ojw1S)C4q(Q>U>FpzW8qh^XiBrf6g^cvOjrf?
C?+{l2

literal 301
zcmV+|0n+{({|Eq%($w-3!YG=w&is$H^>K}osBCD^h)XD9eV33_L$XMd>LJ>lPrtc_
z%1eNa4*&me9&arx3@nk4|NYiDo>-TqWdkIz0?~vr4H!Z=oGD0uQyokFEUA`l&*t-9
z!le>Xv<0>~$|vOVWOJ0{1UOa@+jvvZyu<{pi1!OxjPgS-Q2*ueca%Qrwe^cTsvUX%
z#<$p?Z}<E4wC(6AUMSPJf{8}Mtx-tDB9U08(ghn0j<u`A3+LE1bY}~xf`~(Uoob>P
zJU>;XCR`_B0o*cS1NIy}Z752A!7J`QCAWv8)_%eG{BH^_#Au;bOIQi41Xcp8fXx--
z_R;T1U6+2?7Z(>fVl#IFib~P`P?eaI{~AyaBL46S?@Nbat`@u8`SL|h*=^rLkbaf~