Start major packages refactoring

src/com/plantuml/wasm/RunInit.java

@@ -41,12 +41,12 @@ import net.sourceforge.plantuml.version.Version;
 
 public class RunInit {
 
-	public static String pathStdlib;
+	public static String cheerpjPath;
 
 	public static void main(String[] argsArray) throws IOException {
-		pathStdlib = argsArray[0];
+		cheerpjPath = argsArray[0];
 		System.err.println("RunInit: " + Version.versionString());
-		System.err.println("Internal path for stblib: " + pathStdlib);
+		System.err.println("cheerpjPath is " + cheerpjPath);
 	}
 
 }

src/jcckit/util/ConfigParameters.java

@@ -21,9 +21,9 @@ package jcckit.util;
 import java.awt.Color;
 import java.util.StringTokenizer;
 
-import net.sourceforge.plantuml.ugraphic.color.ColorMapper;
+import net.sourceforge.plantuml.klimt.color.ColorMapper;
-import net.sourceforge.plantuml.ugraphic.color.HColorSet;
+import net.sourceforge.plantuml.klimt.color.HColorSet;
-import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException;
+import net.sourceforge.plantuml.klimt.color.NoSuchColorException;
 
 
 /**

src/net/atmp/ISkinSimple.java

@@ -33,15 +33,16 @@
  *
  *
  */
-package net.sourceforge.plantuml;
+package net.atmp;
 
 import java.util.Map;
 
 import net.sourceforge.plantuml.creole.CreoleMode;
 import net.sourceforge.plantuml.creole.SheetBuilder;
-import net.sourceforge.plantuml.graphic.FontConfiguration;
+import net.sourceforge.plantuml.klimt.color.HColorSet;
-import net.sourceforge.plantuml.graphic.HorizontalAlignment;
+import net.sourceforge.plantuml.klimt.font.FontConfiguration;
-import net.sourceforge.plantuml.ugraphic.color.HColorSet;
+import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment;
+import net.sourceforge.plantuml.sprite.SpriteContainer;
 
 public interface ISkinSimple extends SpriteContainer {
 

src/net/atmp/SpecialText.java

@@ -33,14 +33,15 @@
  * 
  *
  */
-package net.sourceforge.plantuml.graphic;
+package net.atmp;
 
 import net.sourceforge.plantuml.awt.geom.XDimension2D;
+import net.sourceforge.plantuml.graphic.TextBlock;
+import net.sourceforge.plantuml.klimt.UShapeIgnorableForCompression;
+import net.sourceforge.plantuml.klimt.UTranslate;
+import net.sourceforge.plantuml.klimt.comp.CompressionMode;
 import net.sourceforge.plantuml.ugraphic.UEmpty;
 import net.sourceforge.plantuml.ugraphic.UGraphic;
-import net.sourceforge.plantuml.ugraphic.UShapeIgnorableForCompression;
-import net.sourceforge.plantuml.ugraphic.UTranslate;
-import net.sourceforge.plantuml.ugraphic.comp.CompressionMode;
 
 public class SpecialText implements UShapeIgnorableForCompression {
 

src/net/sourceforge/plantuml/AbstractPSystem.java

@@ -50,13 +50,14 @@ import net.sourceforge.plantuml.core.UmlSource;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.cucadiagram.DisplayPositioned;
 import net.sourceforge.plantuml.cucadiagram.DisplayPositionned;
-import net.sourceforge.plantuml.graphic.HorizontalAlignment;
 import net.sourceforge.plantuml.graphic.VerticalAlignment;
+import net.sourceforge.plantuml.klimt.color.ColorMapper;
+import net.sourceforge.plantuml.klimt.color.NoSuchColorException;
+import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment;
 import net.sourceforge.plantuml.stats.StatsUtilsIncrement;
 import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft;
+import net.sourceforge.plantuml.text.BackSlash;
 import net.sourceforge.plantuml.ugraphic.ImageBuilder;
-import net.sourceforge.plantuml.ugraphic.color.ColorMapper;
-import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException;
 import net.sourceforge.plantuml.utils.BlocLines;
 import net.sourceforge.plantuml.version.License;
 import net.sourceforge.plantuml.version.Version;

src/net/sourceforge/plantuml/AlignmentParam.java

@@ -35,7 +35,7 @@
  */
 package net.sourceforge.plantuml;
 
-import net.sourceforge.plantuml.graphic.HorizontalAlignment;
+import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment;
 
 
 public enum AlignmentParam {

src/net/sourceforge/plantuml/AnnotatedBuilder.java

@@ -42,23 +42,24 @@ import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.cucadiagram.DisplayPositioned;
 import net.sourceforge.plantuml.cucadiagram.DisplaySection;
 import net.sourceforge.plantuml.graphic.BigFrame;
-import net.sourceforge.plantuml.graphic.FontConfiguration;
-import net.sourceforge.plantuml.graphic.HorizontalAlignment;
 import net.sourceforge.plantuml.graphic.InnerStrategy;
-import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.SymbolContext;
 import net.sourceforge.plantuml.graphic.TextBlock;
 import net.sourceforge.plantuml.graphic.TextBlockUtils;
+import net.sourceforge.plantuml.klimt.UTranslate;
+import net.sourceforge.plantuml.klimt.color.HColor;
+import net.sourceforge.plantuml.klimt.font.FontConfiguration;
+import net.sourceforge.plantuml.klimt.font.FontParam;
+import net.sourceforge.plantuml.klimt.font.StringBounder;
+import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment;
+import net.sourceforge.plantuml.klimt.geom.MinMax;
 import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft;
 import net.sourceforge.plantuml.style.SName;
 import net.sourceforge.plantuml.style.Style;
 import net.sourceforge.plantuml.style.StyleSignatureBasic;
 import net.sourceforge.plantuml.svek.DecorateEntityImage;
 import net.sourceforge.plantuml.svek.TextBlockBackcolored;
-import net.sourceforge.plantuml.ugraphic.MinMax;
 import net.sourceforge.plantuml.ugraphic.UGraphic;
-import net.sourceforge.plantuml.ugraphic.UTranslate;
-import net.sourceforge.plantuml.ugraphic.color.HColor;
 
 public class AnnotatedBuilder {
 

src/net/sourceforge/plantuml/AnnotatedWorker.java

@@ -36,9 +36,9 @@
 package net.sourceforge.plantuml;
 
 import net.sourceforge.plantuml.cucadiagram.DisplayPositioned;
-import net.sourceforge.plantuml.graphic.HorizontalAlignment;
-import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.TextBlock;
+import net.sourceforge.plantuml.klimt.font.StringBounder;
+import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment;
 import net.sourceforge.plantuml.svek.DecorateEntityImage;
 import net.sourceforge.plantuml.svek.TextBlockBackcolored;
 

src/net/sourceforge/plantuml/BlockUml.java

@@ -48,20 +48,22 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import net.atmp.ISkinSimple;
 import net.sourceforge.plantuml.code.AsciiEncoder;
 import net.sourceforge.plantuml.code.Transcoder;
 import net.sourceforge.plantuml.code.TranscoderUtil;
-import net.sourceforge.plantuml.command.regex.Matcher2;
 import net.sourceforge.plantuml.core.Diagram;
 import net.sourceforge.plantuml.error.PSystemErrorPreprocessor;
 import net.sourceforge.plantuml.log.Logme;
 import net.sourceforge.plantuml.preproc.Defines;
 import net.sourceforge.plantuml.preproc.FileWithSuffix;
 import net.sourceforge.plantuml.preproc2.PreprocessorModeSet;
+import net.sourceforge.plantuml.regex.Matcher2;
+import net.sourceforge.plantuml.text.BackSlash;
+import net.sourceforge.plantuml.text.StringLocated;
 import net.sourceforge.plantuml.tim.TimLoader;
 import net.sourceforge.plantuml.utils.LineLocationImpl;
 import net.sourceforge.plantuml.utils.StartUtils;
-import net.sourceforge.plantuml.utils.StringLocated;
 import net.sourceforge.plantuml.version.Version;
 
 public class BlockUml {

src/net/sourceforge/plantuml/BlockUmlBuilder.java

@@ -55,8 +55,8 @@ import net.sourceforge.plantuml.preproc.ReadLineReader;
 import net.sourceforge.plantuml.preproc.UncommentReadLine;
 import net.sourceforge.plantuml.preproc2.Preprocessor;
 import net.sourceforge.plantuml.security.SFile;
+import net.sourceforge.plantuml.text.StringLocated;
 import net.sourceforge.plantuml.utils.StartUtils;
-import net.sourceforge.plantuml.utils.StringLocated;
 
 public final class BlockUmlBuilder implements DefinitionsContainer {
 

src/net/sourceforge/plantuml/ColorParam.java

@@ -35,12 +35,12 @@
  */
 package net.sourceforge.plantuml;
 
-import net.sourceforge.plantuml.annotation.HaxeIgnored;
-import net.sourceforge.plantuml.graphic.color.ColorType;
-import net.sourceforge.plantuml.ugraphic.color.HColor;
-import net.sourceforge.plantuml.ugraphic.color.HColors;
 
-@HaxeIgnored
+import net.sourceforge.plantuml.klimt.color.ColorType;
+import net.sourceforge.plantuml.klimt.color.HColor;
+import net.sourceforge.plantuml.klimt.color.HColors;
+
+
 public enum ColorParam {
 	background(HColors.WHITE, true, ColorType.BACK), 
 	hyperlink(HColors.BLUE),

src/net/sourceforge/plantuml/EmbeddedDiagram.java

@@ -43,24 +43,25 @@ import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
+import net.atmp.ISkinSimple;
 import net.sourceforge.plantuml.awt.geom.XDimension2D;
 import net.sourceforge.plantuml.core.Diagram;
 import net.sourceforge.plantuml.creole.Neutron;
 import net.sourceforge.plantuml.creole.atom.Atom;
 import net.sourceforge.plantuml.graphic.AbstractTextBlock;
-import net.sourceforge.plantuml.graphic.HorizontalAlignment;
 import net.sourceforge.plantuml.graphic.Line;
-import net.sourceforge.plantuml.graphic.StringBounder;
+import net.sourceforge.plantuml.klimt.UImage;
+import net.sourceforge.plantuml.klimt.UShape;
+import net.sourceforge.plantuml.klimt.font.StringBounder;
+import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment;
 import net.sourceforge.plantuml.log.Logme;
 import net.sourceforge.plantuml.preproc.Defines;
 import net.sourceforge.plantuml.security.SImageIO;
+import net.sourceforge.plantuml.text.StringLocated;
 import net.sourceforge.plantuml.ugraphic.AffineTransformType;
 import net.sourceforge.plantuml.ugraphic.PixelImage;
 import net.sourceforge.plantuml.ugraphic.UGraphic;
-import net.sourceforge.plantuml.ugraphic.UImage;
 import net.sourceforge.plantuml.ugraphic.UImageSvg;
-import net.sourceforge.plantuml.ugraphic.UShape;
-import net.sourceforge.plantuml.utils.StringLocated;
 
 public class EmbeddedDiagram extends AbstractTextBlock implements Line, Atom {
 
@@ -154,7 +155,7 @@ public class EmbeddedDiagram extends AbstractTextBlock implements Line, Atom {
 
 	public XDimension2D calculateDimension(StringBounder stringBounder) {
 		try {
-			if (stringBounder.getNativeFormat() == FileFormat.SVG) {
+			if (stringBounder.matchesProperty("SVG")) {
 				final String imageSvg = getImageSvg();
 				final UImageSvg svg = new UImageSvg(imageSvg, 1);
 				return new XDimension2D(svg.getWidth(), svg.getHeight());

src/net/sourceforge/plantuml/EmptyImageBuilder.java

@@ -46,11 +46,11 @@ import java.util.ArrayList;
 import java.util.List;
 
 import net.sourceforge.plantuml.cucadiagram.dot.GraphvizUtils;
-import net.sourceforge.plantuml.graphic.StringBounder;
+import net.sourceforge.plantuml.klimt.UAntiAliasing;
-import net.sourceforge.plantuml.ugraphic.UAntiAliasing;
+import net.sourceforge.plantuml.klimt.color.ColorMapper;
-import net.sourceforge.plantuml.ugraphic.color.ColorMapper;
+import net.sourceforge.plantuml.klimt.color.HColor;
-import net.sourceforge.plantuml.ugraphic.color.HColor;
+import net.sourceforge.plantuml.klimt.color.HColors;
-import net.sourceforge.plantuml.ugraphic.color.HColors;
+import net.sourceforge.plantuml.klimt.font.StringBounder;
 import net.sourceforge.plantuml.ugraphic.g2d.UGraphicG2d;
 import net.sourceforge.plantuml.utils.Log;
 

src/net/sourceforge/plantuml/FileFormat.java

@@ -46,13 +46,14 @@ import java.io.IOException;
 import net.sourceforge.plantuml.awt.geom.XDimension2D;
 import net.sourceforge.plantuml.braille.BrailleCharFactory;
 import net.sourceforge.plantuml.braille.UGraphicBraille;
-import net.sourceforge.plantuml.graphic.StringBounder;
+import net.sourceforge.plantuml.klimt.font.StringBounder;
-import net.sourceforge.plantuml.graphic.StringBounderRaw;
+import net.sourceforge.plantuml.klimt.font.StringBounderRaw;
+import net.sourceforge.plantuml.klimt.font.UFont;
 import net.sourceforge.plantuml.log.Logme;
 import net.sourceforge.plantuml.png.MetadataTag;
 import net.sourceforge.plantuml.security.SFile;
 import net.sourceforge.plantuml.svg.SvgGraphics;
-import net.sourceforge.plantuml.ugraphic.UFont;
+import net.sourceforge.plantuml.text.SvgCharSizeHack;
 import net.sourceforge.plantuml.ugraphic.debug.StringBounderDebug;
 
 /**
@@ -168,8 +169,8 @@ public enum FileFormat {
 				return getJavaDimension(font, text);
 			}
 
-			public FileFormat getNativeFormat() {
+			public boolean matchesProperty(String propertyName) {
-				return FileFormat.this;
+				return "SVG".equalsIgnoreCase(propertyName);
 			}
 
 		};
@@ -185,8 +186,8 @@ public enum FileFormat {
 				return getJavaDimension(font, text);
 			}
 
-			public FileFormat getNativeFormat() {
+			public boolean matchesProperty(String propertyName) {
-				return FileFormat.this;
+				return false;
 			}
 
 		};
@@ -219,8 +220,8 @@ public enum FileFormat {
 				return UGraphicBraille.QUANTA;
 			}
 
-			public FileFormat getNativeFormat() {
+			public boolean matchesProperty(String propertyName) {
-				return FileFormat.this;
+				return false;
 			}
 
 		};
@@ -244,8 +245,8 @@ public enum FileFormat {
 				return w2.withWidth(Math.max(w1.getWidth(), magnify * w2.getWidth() - delta));
 			}
 
-			public FileFormat getNativeFormat() {
+			public boolean matchesProperty(String propertyName) {
-				return FileFormat.this;
+				return false;
 			}
 		};
 	}
@@ -273,13 +274,13 @@ public enum FileFormat {
 				OptionFlags.getInstance().getFileSeparator() + String.format("%03d", cpt) + getFileSuffix());
 	}
 
-	private SFile computeFilename(SFile pngFile, int i) {
+//	private SFile computeFilename(SFile pngFile, int i) {
-		if (i == 0)
+//		if (i == 0)
-			return pngFile;
+//			return pngFile;
-
+//
-		final SFile dir = pngFile.getParentFile();
+//		final SFile dir = pngFile.getParentFile();
-		return dir.file(computeFilenameInternal(pngFile.getName(), i));
+//		return dir.file(computeFilenameInternal(pngFile.getName(), i));
-	}
+//	}
 
 	private String changeName(String fileName, String replacement) {
 		String result = fileName.replaceAll("\\.\\w+$", replacement);
@@ -289,13 +290,13 @@ public enum FileFormat {
 		return result;
 	}
 
-	private String computeFilenameInternal(String name, int i) {
+//	private String computeFilenameInternal(String name, int i) {
-		if (i == 0)
+//		if (i == 0)
-			return name;
+//			return name;
-
+//
-		return name.replaceAll("\\" + getFileSuffix() + "$",
+//		return name.replaceAll("\\" + getFileSuffix() + "$",
-				OptionFlags.getInstance().getFileSeparator() + String.format("%03d", i) + getFileSuffix());
+//				OptionFlags.getInstance().getFileSeparator() + String.format("%03d", i) + getFileSuffix());
-	}
+//	}
 
 	public boolean doesSupportMetadata() {
 		return this == PNG || this == SVG;

src/net/sourceforge/plantuml/FileFormatOption.java

@@ -39,9 +39,9 @@ import java.awt.geom.AffineTransform;
 import java.io.Serializable;
 import java.util.Objects;
 
-import net.sourceforge.plantuml.annotation.HaxeIgnored;
+import net.sourceforge.plantuml.klimt.color.ColorMapper;
-import net.sourceforge.plantuml.graphic.StringBounder;
+import net.sourceforge.plantuml.klimt.font.StringBounder;
-import net.sourceforge.plantuml.ugraphic.color.ColorMapper;
+import net.sourceforge.plantuml.text.SvgCharSizeHack;
 
 /**
  * A FileFormat with some parameters.
@@ -67,13 +67,13 @@ public final class FileFormatOption implements Serializable {
 		return scale;
 	}
 
-	@HaxeIgnored
+	
 	public FileFormatOption(FileFormat fileFormat) {
 		this(fileFormat, true, false, null, false, null, TikzFontDistortion.getDefault(), 1.0, null, null,
 				ColorMapper.IDENTITY);
 	}
 
-	@HaxeIgnored
+	
 	public FileFormatOption(FileFormat fileFormat, boolean withMetadata) {
 		this(fileFormat, withMetadata, false, null, false, null, TikzFontDistortion.getDefault(), 1.0, null, null,
 				ColorMapper.IDENTITY);

src/net/sourceforge/plantuml/FileGroup.java

@@ -40,9 +40,9 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import net.sourceforge.plantuml.command.regex.Matcher2;
+import net.sourceforge.plantuml.regex.Matcher2;
-import net.sourceforge.plantuml.command.regex.MyPattern;
+import net.sourceforge.plantuml.regex.MyPattern;
-import net.sourceforge.plantuml.command.regex.Pattern2;
+import net.sourceforge.plantuml.regex.Pattern2;
 
 public class FileGroup {
 

src/net/sourceforge/plantuml/FileSystem.java

@@ -65,14 +65,21 @@ public class FileSystem {
 	}
 
 	public SFile getCurrentDir() {
+		// ::comment when WASM
 		final String path = this.currentDir.get();
-		if (path != null) {
+		if (path != null)
 			return new SFile(path);
-		}
+		// ::done
+
 		return null;
 	}
 
 	public SFile getFile(String nameOrPath) throws IOException {
+		// ::uncomment when WASM
+		// return null;
+		// ::done
+
+		// ::comment when WASM
 		if (isAbsolute(nameOrPath)) {
 			final SFile result = new SFile(nameOrPath);
 			Log.info("Trying " + result.getAbsolutePath());
@@ -107,12 +114,15 @@ public class FileSystem {
 		}
 		assert filecurrent != null;
 		return filecurrent;
+		// ::done
 	}
 
+	// ::comment when WASM
 	private boolean isAbsolute(String nameOrPath) {
 		final SFile f = new SFile(nameOrPath);
 		return f.isAbsolute();
 	}
+	// ::done
 
 	public void reset() {
 		setCurrentDir(new SFile("."));

src/net/sourceforge/plantuml/ISkinParam.java

@@ -37,12 +37,18 @@ package net.sourceforge.plantuml;
 
 import java.util.Collection;
 
-import net.sourceforge.plantuml.activitydiagram3.ftile.Arrows;
+import net.atmp.ISkinSimple;
-import net.sourceforge.plantuml.cucadiagram.Rankdir;
 import net.sourceforge.plantuml.cucadiagram.Stereotype;
 import net.sourceforge.plantuml.cucadiagram.dot.DotSplines;
-import net.sourceforge.plantuml.graphic.HorizontalAlignment;
 import net.sourceforge.plantuml.graphic.color.Colors;
+import net.sourceforge.plantuml.klimt.Arrows;
+import net.sourceforge.plantuml.klimt.UStroke;
+import net.sourceforge.plantuml.klimt.color.HColor;
+import net.sourceforge.plantuml.klimt.color.NoSuchColorException;
+import net.sourceforge.plantuml.klimt.font.FontParam;
+import net.sourceforge.plantuml.klimt.font.UFont;
+import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment;
+import net.sourceforge.plantuml.klimt.geom.Rankdir;
 import net.sourceforge.plantuml.skin.ActorStyle;
 import net.sourceforge.plantuml.skin.ArrowDirection;
 import net.sourceforge.plantuml.skin.Padder;
@@ -52,10 +58,7 @@ import net.sourceforge.plantuml.svek.ConditionEndStyle;
 import net.sourceforge.plantuml.svek.ConditionStyle;
 import net.sourceforge.plantuml.svek.PackageStyle;
 import net.sourceforge.plantuml.svg.LengthAdjust;
-import net.sourceforge.plantuml.ugraphic.UFont;
+import net.sourceforge.plantuml.text.Guillemet;
-import net.sourceforge.plantuml.ugraphic.UStroke;
-import net.sourceforge.plantuml.ugraphic.color.HColor;
-import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException;
 
 public interface ISkinParam extends ISkinSimple {
 

src/net/sourceforge/plantuml/LineConfigurable.java

@@ -35,9 +35,9 @@
  */
 package net.sourceforge.plantuml;
 
-import net.sourceforge.plantuml.graphic.color.ColorType;
 import net.sourceforge.plantuml.graphic.color.Colors;
-import net.sourceforge.plantuml.ugraphic.color.HColor;
+import net.sourceforge.plantuml.klimt.color.ColorType;
+import net.sourceforge.plantuml.klimt.color.HColor;
 
 public interface LineConfigurable {
 

src/net/sourceforge/plantuml/NewpagedDiagram.java

@@ -47,7 +47,7 @@ import net.sourceforge.plantuml.core.Diagram;
 import net.sourceforge.plantuml.core.DiagramDescription;
 import net.sourceforge.plantuml.core.ImageData;
 import net.sourceforge.plantuml.core.UmlSource;
-import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException;
+import net.sourceforge.plantuml.klimt.color.NoSuchColorException;
 import net.sourceforge.plantuml.utils.BlocLines;
 
 public class NewpagedDiagram extends AbstractPSystem {

src/net/sourceforge/plantuml/Option.java

@@ -46,19 +46,19 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import net.sourceforge.plantuml.annotation.HaxeIgnored;
+
 import net.sourceforge.plantuml.api.ApiWarning;
-import net.sourceforge.plantuml.command.regex.Matcher2;
-import net.sourceforge.plantuml.command.regex.MyPattern;
-import net.sourceforge.plantuml.command.regex.Pattern2;
 import net.sourceforge.plantuml.cucadiagram.dot.GraphvizUtils;
+import net.sourceforge.plantuml.klimt.color.ColorMapper;
 import net.sourceforge.plantuml.preproc.Defines;
+import net.sourceforge.plantuml.regex.Matcher2;
+import net.sourceforge.plantuml.regex.MyPattern;
+import net.sourceforge.plantuml.regex.Pattern2;
 import net.sourceforge.plantuml.security.SFile;
 import net.sourceforge.plantuml.stats.StatsUtils;
-import net.sourceforge.plantuml.ugraphic.color.ColorMapper;
 import net.sourceforge.plantuml.utils.Log;
 
-@HaxeIgnored
+
 public class Option {
 
 	private final List<String> excludes = new ArrayList<>();
@@ -407,6 +407,7 @@ public class Option {
 	// ::done
 
 	public Stdrpt getStdrpt() {
+		// ::comment when WASM
 		if (stdrpt == 1)
 			return new StdrptV1();
 
@@ -416,6 +417,7 @@ public class Option {
 		// Legacy case
 		if (isPipe() || isPipeMap() || isSyntax())
 			return new StdrptPipe0();
+		// ::done
 
 		return new StdrptNull();
 	}

src/net/sourceforge/plantuml/OptionFlags.java

@@ -228,6 +228,7 @@ public class OptionFlags {
 		// ::done
 	}
 
+	// ::comment when WASM
 	public final void setLogData(SFile logData) {
 		this.logData = logData;
 		logData.delete();
@@ -258,6 +259,7 @@ public class OptionFlags {
 	public final void setEncodesprite(boolean encodesprite) {
 		this.encodesprite = encodesprite;
 	}
+	// ::done
 
 	public final boolean isOverwrite() {
 		return overwrite;

src/net/sourceforge/plantuml/PSystemBuilder.java

@@ -47,7 +47,6 @@ import net.sourceforge.plantuml.api.PSystemFactory;
 import net.sourceforge.plantuml.board.BoardDiagramFactory;
 import net.sourceforge.plantuml.bpm.BpmDiagramFactory;
 import net.sourceforge.plantuml.classdiagram.ClassDiagramFactory;
-import net.sourceforge.plantuml.command.regex.RegexConcat;
 import net.sourceforge.plantuml.core.Diagram;
 import net.sourceforge.plantuml.core.DiagramType;
 import net.sourceforge.plantuml.core.UmlSource;
@@ -85,8 +84,9 @@ 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.regex.RegexConcat;
-import net.sourceforge.plantuml.salt.PSystemSaltFactory2;
+import net.sourceforge.plantuml.regexdiagram.PSystemRegexFactory;
+import net.sourceforge.plantuml.salt.PSystemSaltFactory;
 import net.sourceforge.plantuml.security.SecurityProfile;
 import net.sourceforge.plantuml.security.SecurityUtils;
 import net.sourceforge.plantuml.sequencediagram.SequenceDiagramFactory;
@@ -96,9 +96,9 @@ import net.sourceforge.plantuml.sprite.StdlibDiagramFactory;
 import net.sourceforge.plantuml.statediagram.StateDiagramFactory;
 import net.sourceforge.plantuml.stats.StatsUtilsIncrement;
 import net.sourceforge.plantuml.sudoku.PSystemSudokuFactory;
+import net.sourceforge.plantuml.text.StringLocated;
 import net.sourceforge.plantuml.timingdiagram.TimingDiagramFactory;
 import net.sourceforge.plantuml.utils.Log;
-import net.sourceforge.plantuml.utils.StringLocated;
 import net.sourceforge.plantuml.version.License;
 import net.sourceforge.plantuml.version.PSystemLicenseFactory;
 import net.sourceforge.plantuml.version.PSystemVersionFactory;
@@ -169,64 +169,59 @@ public class PSystemBuilder {
 		factories.add(new DescriptionDiagramFactory());
 		factories.add(new StateDiagramFactory());
 		factories.add(new ActivityDiagramFactory3());
-		// factories.add(new CompositeDiagramFactory(skinParam));
+
+		// ::comment when WASM
 		factories.add(new BpmDiagramFactory(DiagramType.BPM));
+		// ::done
+		
 		// factories.add(new PostIdDiagramFactory());
 		factories.add(new PSystemLicenseFactory());
 		factories.add(new PSystemVersionFactory());
 		factories.add(new PSystemDonorsFactory());
+		// ::comment when WASM
 		factories.add(new PSystemSkinparameterListFactory());
-		// ::comment when WASM
 		factories.add(new PSystemListFontsFactory());
-		// ::done
 		factories.add(new PSystemListEmojiFactory());
-		// ::comment when WASM
 		factories.add(new PSystemOpenIconicFactory());
 		factories.add(new PSystemListOpenIconicFactory());
 		factories.add(new PSystemListInternalSpritesFactory());
 		// ::done
-		factories.add(new PSystemSaltFactory2(DiagramType.SALT));
+		factories.add(new PSystemSaltFactory(DiagramType.UML));
-		factories.add(new PSystemSaltFactory2(DiagramType.UML));
+		factories.add(new PSystemSaltFactory(DiagramType.SALT));
 		// ::comment when WASM
 		factories.add(new PSystemDotFactory(DiagramType.DOT));
 		factories.add(new PSystemDotFactory(DiagramType.UML));
 		// ::done
-		factories.add(new NwDiagramFactory(DiagramType.NW));
 		factories.add(new NwDiagramFactory(DiagramType.UML));
+		factories.add(new NwDiagramFactory(DiagramType.NW));
 		factories.add(new MindMapDiagramFactory());
 		factories.add(new WBSDiagramFactory());
 		// ::comment when WASM
-		factories.add(new PSystemDitaaFactory(DiagramType.DITAA));
+		factories.add(new PSystemDitaaFactory());
-		factories.add(new PSystemDitaaFactory(DiagramType.UML));
 		// ::done
 		if (License.getCurrent() == License.GPL || License.getCurrent() == License.GPLV2) {
 			// ::comment when WASM
-			factories.add(new PSystemJcckitFactory(DiagramType.JCCKIT));
+			factories.add(new PSystemJcckitFactory());
-			factories.add(new PSystemJcckitFactory(DiagramType.UML));
 			// ::done
 			// factories.add(new PSystemLogoFactory());
 			factories.add(new PSystemSudokuFactory());
 		}
 		// ::comment when WASM
 		factories.add(new PSystemDefinitionFactory());
-		// ::done
 		factories.add(new ListSpriteDiagramFactory());
-		// ::comment when WASM
 		factories.add(new StdlibDiagramFactory());
 		factories.add(new PSystemMathFactory(DiagramType.MATH));
 		factories.add(new PSystemLatexFactory(DiagramType.LATEX));
-		// ::done
 		// factories.add(new PSystemStatsFactory());
 		factories.add(new PSystemCreoleFactory());
 		factories.add(new PSystemEggFactory());
 		factories.add(new PSystemAppleTwoFactory());
 		factories.add(new PSystemRIPFactory());
 		// factories.add(new PSystemLostFactory());
-		// ::comment when WASM
 		if (SecurityUtils.getSecurityProfile() == SecurityProfile.UNSECURE)
 			factories.add(new PSystemPathFactory());
-		// ::done
 		factories.add(new PSystemOregonFactory());
+		// ::done
 		factories.add(new PSystemCharlieFactory());
 		// ::comment when WASM
 		if (License.getCurrent() == License.GPL || License.getCurrent() == License.GPLV2) {
@@ -237,13 +232,19 @@ public class PSystemBuilder {
 		factories.add(new FlowDiagramFactory());
 		// factories.add(new PSystemTreeFactory(DiagramType.JUNGLE));
 		// factories.add(new PSystemCuteFactory(DiagramType.CUTE));
+		// ::comment when WASM
 		factories.add(new PSystemDedicationFactory());
+		// ::done
 		factories.add(new TimingDiagramFactory());
+		// ::comment when WASM
 		factories.add(new HelpFactory());
 		factories.add(new WireDiagramFactory());
+		// ::done
 		factories.add(new JsonDiagramFactory());
 		factories.add(new GitDiagramFactory());
+		// ::comment when WASM
 		factories.add(new BoardDiagramFactory());
+		// ::done
 		factories.add(new YamlDiagramFactory());
 		factories.add(new HclDiagramFactory());
 		factories.add(new PSystemEbnfFactory());

src/net/sourceforge/plantuml/PSystemUtils.java

@@ -48,11 +48,11 @@ import net.sourceforge.plantuml.baraye.CucaDiagram;
 import net.sourceforge.plantuml.core.Diagram;
 import net.sourceforge.plantuml.core.ImageData;
 import net.sourceforge.plantuml.html.CucaDiagramHtmlMaker;
+import net.sourceforge.plantuml.klimt.color.HColors;
 import net.sourceforge.plantuml.png.PngSplitter;
 import net.sourceforge.plantuml.project.GanttDiagram;
 import net.sourceforge.plantuml.security.SFile;
 import net.sourceforge.plantuml.sequencediagram.SequenceDiagram;
-import net.sourceforge.plantuml.ugraphic.color.HColors;
 import net.sourceforge.plantuml.utils.Log;
 
 public class PSystemUtils {

src/net/sourceforge/plantuml/SkinParam.java

@@ -53,24 +53,31 @@ import java.util.Set;
 import java.util.TreeSet;
 import java.util.regex.Pattern;
 
-import net.sourceforge.plantuml.activitydiagram3.ftile.Arrows;
 import net.sourceforge.plantuml.activitydiagram3.ftile.ArrowsRegular;
 import net.sourceforge.plantuml.activitydiagram3.ftile.ArrowsTriangle;
-import net.sourceforge.plantuml.command.regex.Matcher2;
-import net.sourceforge.plantuml.command.regex.MyPattern;
-import net.sourceforge.plantuml.command.regex.Pattern2;
 import net.sourceforge.plantuml.creole.CreoleMode;
 import net.sourceforge.plantuml.creole.Parser;
 import net.sourceforge.plantuml.creole.SheetBuilder;
 import net.sourceforge.plantuml.creole.legacy.CreoleParser;
 import net.sourceforge.plantuml.cucadiagram.LinkStyle;
-import net.sourceforge.plantuml.cucadiagram.Rankdir;
 import net.sourceforge.plantuml.cucadiagram.Stereotype;
 import net.sourceforge.plantuml.cucadiagram.dot.DotSplines;
-import net.sourceforge.plantuml.graphic.FontConfiguration;
-import net.sourceforge.plantuml.graphic.HorizontalAlignment;
 import net.sourceforge.plantuml.graphic.color.Colors;
+import net.sourceforge.plantuml.klimt.Arrows;
+import net.sourceforge.plantuml.klimt.UStroke;
+import net.sourceforge.plantuml.klimt.color.HColor;
+import net.sourceforge.plantuml.klimt.color.HColorSet;
+import net.sourceforge.plantuml.klimt.color.HColors;
+import net.sourceforge.plantuml.klimt.color.NoSuchColorException;
+import net.sourceforge.plantuml.klimt.font.FontConfiguration;
+import net.sourceforge.plantuml.klimt.font.FontParam;
+import net.sourceforge.plantuml.klimt.font.UFont;
+import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment;
+import net.sourceforge.plantuml.klimt.geom.Rankdir;
 import net.sourceforge.plantuml.log.Logme;
+import net.sourceforge.plantuml.regex.Matcher2;
+import net.sourceforge.plantuml.regex.MyPattern;
+import net.sourceforge.plantuml.regex.Pattern2;
 import net.sourceforge.plantuml.skin.ActorStyle;
 import net.sourceforge.plantuml.skin.ArrowDirection;
 import net.sourceforge.plantuml.skin.Padder;
@@ -86,12 +93,7 @@ import net.sourceforge.plantuml.svek.ConditionEndStyle;
 import net.sourceforge.plantuml.svek.ConditionStyle;
 import net.sourceforge.plantuml.svek.PackageStyle;
 import net.sourceforge.plantuml.svg.LengthAdjust;
-import net.sourceforge.plantuml.ugraphic.UFont;
+import net.sourceforge.plantuml.text.Guillemet;
-import net.sourceforge.plantuml.ugraphic.UStroke;
-import net.sourceforge.plantuml.ugraphic.color.HColor;
-import net.sourceforge.plantuml.ugraphic.color.HColorSet;
-import net.sourceforge.plantuml.ugraphic.color.HColors;
-import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException;
 import net.sourceforge.plantuml.utils.BlocLines;
 
 public class SkinParam implements ISkinParam {

src/net/sourceforge/plantuml/SkinParamBackcolored.java

@@ -38,11 +38,11 @@ package net.sourceforge.plantuml;
 import java.util.EnumMap;
 import java.util.Map;
 
-import net.sourceforge.plantuml.annotation.HaxeIgnored;
-import net.sourceforge.plantuml.cucadiagram.Stereotype;
-import net.sourceforge.plantuml.ugraphic.color.HColor;
 
-@HaxeIgnored
+import net.sourceforge.plantuml.cucadiagram.Stereotype;
+import net.sourceforge.plantuml.klimt.color.HColor;
+
+
 public class SkinParamBackcolored extends SkinParamDelegator {
 
 	final private HColor backColorElement;

src/net/sourceforge/plantuml/SkinParamBackcoloredReference.java

@@ -36,7 +36,7 @@
 package net.sourceforge.plantuml;
 
 import net.sourceforge.plantuml.cucadiagram.Stereotype;
-import net.sourceforge.plantuml.ugraphic.color.HColor;
+import net.sourceforge.plantuml.klimt.color.HColor;
 
 public class SkinParamBackcoloredReference extends SkinParamDelegator {
 

src/net/sourceforge/plantuml/SkinParamColors.java

@@ -36,9 +36,10 @@
 package net.sourceforge.plantuml;
 
 import net.sourceforge.plantuml.cucadiagram.Stereotype;
-import net.sourceforge.plantuml.graphic.color.ColorType;
 import net.sourceforge.plantuml.graphic.color.Colors;
-import net.sourceforge.plantuml.ugraphic.color.HColor;
+import net.sourceforge.plantuml.klimt.color.ColorType;
+import net.sourceforge.plantuml.klimt.color.HColor;
+import net.sourceforge.plantuml.klimt.font.FontParam;
 
 public class SkinParamColors extends SkinParamDelegator {
 

src/net/sourceforge/plantuml/SkinParamDelegator.java

@@ -38,15 +38,21 @@ package net.sourceforge.plantuml;
 import java.util.Collection;
 import java.util.Map;
 
-import net.sourceforge.plantuml.activitydiagram3.ftile.Arrows;
 import net.sourceforge.plantuml.creole.CreoleMode;
 import net.sourceforge.plantuml.creole.SheetBuilder;
-import net.sourceforge.plantuml.cucadiagram.Rankdir;
 import net.sourceforge.plantuml.cucadiagram.Stereotype;
 import net.sourceforge.plantuml.cucadiagram.dot.DotSplines;
-import net.sourceforge.plantuml.graphic.FontConfiguration;
-import net.sourceforge.plantuml.graphic.HorizontalAlignment;
 import net.sourceforge.plantuml.graphic.color.Colors;
+import net.sourceforge.plantuml.klimt.Arrows;
+import net.sourceforge.plantuml.klimt.UStroke;
+import net.sourceforge.plantuml.klimt.color.HColor;
+import net.sourceforge.plantuml.klimt.color.HColorSet;
+import net.sourceforge.plantuml.klimt.color.NoSuchColorException;
+import net.sourceforge.plantuml.klimt.font.FontConfiguration;
+import net.sourceforge.plantuml.klimt.font.FontParam;
+import net.sourceforge.plantuml.klimt.font.UFont;
+import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment;
+import net.sourceforge.plantuml.klimt.geom.Rankdir;
 import net.sourceforge.plantuml.skin.ActorStyle;
 import net.sourceforge.plantuml.skin.ArrowDirection;
 import net.sourceforge.plantuml.skin.Padder;
@@ -57,11 +63,7 @@ import net.sourceforge.plantuml.svek.ConditionEndStyle;
 import net.sourceforge.plantuml.svek.ConditionStyle;
 import net.sourceforge.plantuml.svek.PackageStyle;
 import net.sourceforge.plantuml.svg.LengthAdjust;
-import net.sourceforge.plantuml.ugraphic.UFont;
+import net.sourceforge.plantuml.text.Guillemet;
-import net.sourceforge.plantuml.ugraphic.UStroke;
-import net.sourceforge.plantuml.ugraphic.color.HColor;
-import net.sourceforge.plantuml.ugraphic.color.HColorSet;
-import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException;
 
 public class SkinParamDelegator implements ISkinParam {
 

src/net/sourceforge/plantuml/SkinParamForceColor.java

@@ -36,7 +36,7 @@
 package net.sourceforge.plantuml;
 
 import net.sourceforge.plantuml.cucadiagram.Stereotype;
-import net.sourceforge.plantuml.ugraphic.color.HColor;
+import net.sourceforge.plantuml.klimt.color.HColor;
 
 public class SkinParamForceColor extends SkinParamDelegator {
 

src/net/sourceforge/plantuml/SkinParamForecolored.java

@@ -36,7 +36,7 @@
 package net.sourceforge.plantuml;
 
 import net.sourceforge.plantuml.cucadiagram.Stereotype;
-import net.sourceforge.plantuml.ugraphic.color.HColor;
+import net.sourceforge.plantuml.klimt.color.HColor;
 
 public class SkinParamForecolored extends SkinParamDelegator {
 

src/net/sourceforge/plantuml/SkinParamUtils.java

@@ -36,9 +36,10 @@
 package net.sourceforge.plantuml;
 
 import net.sourceforge.plantuml.cucadiagram.Stereotype;
+import net.sourceforge.plantuml.klimt.color.HColor;
+import net.sourceforge.plantuml.klimt.font.FontParam;
+import net.sourceforge.plantuml.klimt.font.UFont;
 import net.sourceforge.plantuml.skin.rose.Rose;
-import net.sourceforge.plantuml.ugraphic.UFont;
-import net.sourceforge.plantuml.ugraphic.color.HColor;
 
 public class SkinParamUtils {
 

src/net/sourceforge/plantuml/SourceFileReader.java

@@ -41,12 +41,12 @@ import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 
-import net.sourceforge.plantuml.annotation.HaxeIgnored;
+
 import net.sourceforge.plantuml.preproc.Defines;
 import net.sourceforge.plantuml.security.SFile;
 import net.sourceforge.plantuml.utils.Log;
 
-@HaxeIgnored
+
 public class SourceFileReader extends SourceFileReaderAbstract implements ISourceFileReader {
 	// ::remove file when WASM
 

src/net/sourceforge/plantuml/SourceStringReader.java

@@ -47,7 +47,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import net.sourceforge.plantuml.annotation.HaxeIgnored;
+
 import net.sourceforge.plantuml.core.Diagram;
 import net.sourceforge.plantuml.core.DiagramDescription;
 import net.sourceforge.plantuml.core.ImageData;
@@ -57,7 +57,7 @@ import net.sourceforge.plantuml.security.SFile;
 import net.sourceforge.plantuml.svek.TextBlockBackcolored;
 import net.sourceforge.plantuml.utils.Log;
 
-@HaxeIgnored
+
 public class SourceStringReader {
 
 	final private List<BlockUml> blocks;

src/net/sourceforge/plantuml/SplitParam.java

@@ -37,8 +37,8 @@ package net.sourceforge.plantuml;
 
 import java.awt.Color;
 
-import net.sourceforge.plantuml.ugraphic.color.HColor;
+import net.sourceforge.plantuml.klimt.color.HColor;
-import net.sourceforge.plantuml.ugraphic.color.HColorSimple;
+import net.sourceforge.plantuml.klimt.color.HColorSimple;
 
 public class SplitParam {
 

src/net/sourceforge/plantuml/SpriteContainerEmpty.java

@@ -37,16 +37,19 @@ package net.sourceforge.plantuml;
 
 import java.util.Map;
 
+import net.atmp.ISkinSimple;
 import net.sourceforge.plantuml.creole.CreoleMode;
 import net.sourceforge.plantuml.creole.Parser;
 import net.sourceforge.plantuml.creole.SheetBuilder;
 import net.sourceforge.plantuml.creole.legacy.CreoleParser;
-import net.sourceforge.plantuml.graphic.FontConfiguration;
+import net.sourceforge.plantuml.klimt.color.HColorSet;
-import net.sourceforge.plantuml.graphic.HorizontalAlignment;
+import net.sourceforge.plantuml.klimt.font.FontConfiguration;
+import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment;
 import net.sourceforge.plantuml.sprite.Sprite;
+import net.sourceforge.plantuml.sprite.SpriteContainer;
 import net.sourceforge.plantuml.sprite.SpriteImage;
 import net.sourceforge.plantuml.style.Style;
-import net.sourceforge.plantuml.ugraphic.color.HColorSet;
+import net.sourceforge.plantuml.text.Guillemet;
 
 public class SpriteContainerEmpty implements SpriteContainer, ISkinSimple {
 

src/net/sourceforge/plantuml/StdrptV1.java

@@ -45,6 +45,7 @@ import net.sourceforge.plantuml.error.PSystemError;
 import net.sourceforge.plantuml.utils.Log;
 
 public class StdrptV1 implements Stdrpt {
+	// ::remove file when WASM
 
 	public void printInfo(final PrintStream output, Diagram sys) {
 		if (sys instanceof PSystemWelcome) {

src/net/sourceforge/plantuml/StdrptV2.java

@@ -44,6 +44,7 @@ import net.sourceforge.plantuml.eggs.PSystemWelcome;
 import net.sourceforge.plantuml.error.PSystemError;
 
 public class StdrptV2 implements Stdrpt {
+	// ::remove file when WASM
 
 	public void finalMessage() {
 	}

src/net/sourceforge/plantuml/StringUtils.java

@@ -43,10 +43,10 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import net.sourceforge.plantuml.asciiart.Wcwidth;
-import net.sourceforge.plantuml.command.regex.Matcher2;
-import net.sourceforge.plantuml.command.regex.MyPattern;
-import net.sourceforge.plantuml.command.regex.Pattern2;
 import net.sourceforge.plantuml.cucadiagram.Display;
+import net.sourceforge.plantuml.regex.Matcher2;
+import net.sourceforge.plantuml.regex.MyPattern;
+import net.sourceforge.plantuml.regex.Pattern2;
 import net.sourceforge.plantuml.utils.Direction;
 import net.sourceforge.plantuml.utils.Log;
 

src/net/sourceforge/plantuml/TitledDiagram.java

@@ -49,8 +49,12 @@ import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.cucadiagram.DisplayPositioned;
 import net.sourceforge.plantuml.cucadiagram.DisplayPositionned;
 import net.sourceforge.plantuml.cucadiagram.DisplaySection;
-import net.sourceforge.plantuml.graphic.HorizontalAlignment;
 import net.sourceforge.plantuml.graphic.VerticalAlignment;
+import net.sourceforge.plantuml.klimt.color.ColorMapper;
+import net.sourceforge.plantuml.klimt.color.ColorOrder;
+import net.sourceforge.plantuml.klimt.color.HColor;
+import net.sourceforge.plantuml.klimt.color.HColors;
+import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment;
 import net.sourceforge.plantuml.sprite.Sprite;
 import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft;
 import net.sourceforge.plantuml.style.PName;
@@ -60,10 +64,6 @@ import net.sourceforge.plantuml.style.StyleBuilder;
 import net.sourceforge.plantuml.style.StyleLoader;
 import net.sourceforge.plantuml.style.StyleSignatureBasic;
 import net.sourceforge.plantuml.ugraphic.ImageBuilder;
-import net.sourceforge.plantuml.ugraphic.color.ColorMapper;
-import net.sourceforge.plantuml.ugraphic.color.ColorOrder;
-import net.sourceforge.plantuml.ugraphic.color.HColor;
-import net.sourceforge.plantuml.ugraphic.color.HColors;
 
 public abstract class TitledDiagram extends AbstractPSystem implements Diagram, Annotated {
 

src/net/sourceforge/plantuml/UmlDiagram.java

@@ -65,6 +65,9 @@ import net.sourceforge.plantuml.fun.IconLoader;
 import net.sourceforge.plantuml.graphic.GraphicPosition;
 import net.sourceforge.plantuml.graphic.GraphicStrings;
 import net.sourceforge.plantuml.graphic.UDrawable;
+import net.sourceforge.plantuml.klimt.UImage;
+import net.sourceforge.plantuml.klimt.UTranslate;
+import net.sourceforge.plantuml.klimt.font.FontParam;
 import net.sourceforge.plantuml.log.Logme;
 import net.sourceforge.plantuml.mjpeg.MJPEGGenerator;
 import net.sourceforge.plantuml.pdf.PdfConverter;
@@ -78,8 +81,6 @@ import net.sourceforge.plantuml.svek.TextBlockBackcolored;
 import net.sourceforge.plantuml.ugraphic.AffineTransformType;
 import net.sourceforge.plantuml.ugraphic.PixelImage;
 import net.sourceforge.plantuml.ugraphic.UGraphic;
-import net.sourceforge.plantuml.ugraphic.UImage;
-import net.sourceforge.plantuml.ugraphic.UTranslate;
 import net.sourceforge.plantuml.utils.Log;
 import net.sourceforge.plantuml.version.Version;
 
@@ -200,6 +201,7 @@ public abstract class UmlDiagram extends TitledDiagram implements Diagram, Annot
 		plainImageBuilder(drawable, fileFormat).metadata(metadata).seed(seed).write(os);
 	}
 
+	// ::comment when WASM
 	private static void exportDiagramErrorText(OutputStream os, Throwable exception, List<String> strings) {
 		final PrintWriter pw = SecurityUtils.createPrintWriter(os);
 		exception.printStackTrace(pw);
@@ -211,6 +213,7 @@ public abstract class UmlDiagram extends TitledDiagram implements Diagram, Annot
 		}
 		pw.flush();
 	}
+	// ::done
 
 	public String getFlashData() {
 		final UmlSource source = getSource();

src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java

@@ -42,11 +42,11 @@ import java.util.Map;
 
 import ext.plantuml.com.ctreber.acearth.plugins.markers.Marker;
 import net.sourceforge.plantuml.command.PSystemBasicFactory;
-import net.sourceforge.plantuml.command.regex.Matcher2;
-import net.sourceforge.plantuml.command.regex.MyPattern;
-import net.sourceforge.plantuml.command.regex.Pattern2;
 import net.sourceforge.plantuml.core.UmlSource;
 import net.sourceforge.plantuml.log.Logme;
+import net.sourceforge.plantuml.regex.Matcher2;
+import net.sourceforge.plantuml.regex.MyPattern;
+import net.sourceforge.plantuml.regex.Pattern2;
 
 public class PSystemXearthFactory extends PSystemBasicFactory<PSystemXearth> {
 

src/net/sourceforge/plantuml/activitydiagram/command/CommandElse.java

@@ -39,10 +39,10 @@ import net.sourceforge.plantuml.activitydiagram.ActivityDiagram;
 import net.sourceforge.plantuml.baraye.EntityImp;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.command.SingleLineCommand2;
-import net.sourceforge.plantuml.command.regex.IRegex;
+import net.sourceforge.plantuml.regex.IRegex;
-import net.sourceforge.plantuml.command.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexConcat;
-import net.sourceforge.plantuml.command.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexLeaf;
-import net.sourceforge.plantuml.command.regex.RegexResult;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.LineLocation;
 
 public class CommandElse extends SingleLineCommand2<ActivityDiagram> {

src/net/sourceforge/plantuml/activitydiagram/command/CommandEndPartition.java

@@ -38,11 +38,11 @@ package net.sourceforge.plantuml.activitydiagram.command;
 import net.sourceforge.plantuml.activitydiagram.ActivityDiagram;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.command.SingleLineCommand2;
-import net.sourceforge.plantuml.command.regex.IRegex;
+import net.sourceforge.plantuml.regex.IRegex;
-import net.sourceforge.plantuml.command.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexConcat;
-import net.sourceforge.plantuml.command.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexLeaf;
-import net.sourceforge.plantuml.command.regex.RegexOr;
+import net.sourceforge.plantuml.regex.RegexOr;
-import net.sourceforge.plantuml.command.regex.RegexResult;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.LineLocation;
 
 public class CommandEndPartition extends SingleLineCommand2<ActivityDiagram> {

src/net/sourceforge/plantuml/activitydiagram/command/CommandEndif.java

@@ -38,10 +38,10 @@ package net.sourceforge.plantuml.activitydiagram.command;
 import net.sourceforge.plantuml.activitydiagram.ActivityDiagram;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.command.SingleLineCommand2;
-import net.sourceforge.plantuml.command.regex.IRegex;
+import net.sourceforge.plantuml.regex.IRegex;
-import net.sourceforge.plantuml.command.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexConcat;
-import net.sourceforge.plantuml.command.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexLeaf;
-import net.sourceforge.plantuml.command.regex.RegexResult;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.LineLocation;
 
 public class CommandEndif extends SingleLineCommand2<ActivityDiagram> {

src/net/sourceforge/plantuml/activitydiagram/command/CommandIf.java

@@ -41,18 +41,18 @@ import net.sourceforge.plantuml.baraye.EntityImp;
 import net.sourceforge.plantuml.classdiagram.command.CommandLinkClass;
 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.RegexOptional;
-import net.sourceforge.plantuml.command.regex.RegexOr;
-import net.sourceforge.plantuml.command.regex.RegexResult;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.cucadiagram.Link;
 import net.sourceforge.plantuml.cucadiagram.LinkArg;
 import net.sourceforge.plantuml.cucadiagram.LinkDecor;
 import net.sourceforge.plantuml.cucadiagram.LinkType;
 import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement;
+import net.sourceforge.plantuml.regex.IRegex;
+import net.sourceforge.plantuml.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexOptional;
+import net.sourceforge.plantuml.regex.RegexOr;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.Direction;
 import net.sourceforge.plantuml.utils.LineLocation;
 

src/net/sourceforge/plantuml/activitydiagram/command/CommandInnerConcurrent.java

@@ -39,10 +39,10 @@ import net.sourceforge.plantuml.activitydiagram.ActivityDiagram;
 import net.sourceforge.plantuml.baraye.EntityUtils;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.command.SingleLineCommand2;
-import net.sourceforge.plantuml.command.regex.IRegex;
+import net.sourceforge.plantuml.regex.IRegex;
-import net.sourceforge.plantuml.command.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexConcat;
-import net.sourceforge.plantuml.command.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexLeaf;
-import net.sourceforge.plantuml.command.regex.RegexResult;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.LineLocation;
 
 public class CommandInnerConcurrent extends SingleLineCommand2<ActivityDiagram> {

src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkActivity.java

@@ -36,22 +36,12 @@
 package net.sourceforge.plantuml.activitydiagram.command;
 
 import net.sourceforge.plantuml.StringUtils;
-import net.sourceforge.plantuml.Url;
-import net.sourceforge.plantuml.UrlBuilder;
-import net.sourceforge.plantuml.UrlMode;
 import net.sourceforge.plantuml.activitydiagram.ActivityDiagram;
 import net.sourceforge.plantuml.baraye.EntityImp;
 import net.sourceforge.plantuml.baraye.Quark;
 import net.sourceforge.plantuml.classdiagram.command.CommandLinkClass;
 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.RegexOptional;
-import net.sourceforge.plantuml.command.regex.RegexOr;
-import net.sourceforge.plantuml.command.regex.RegexPartialMatch;
-import net.sourceforge.plantuml.command.regex.RegexResult;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.cucadiagram.GroupType;
 import net.sourceforge.plantuml.cucadiagram.LeafType;
@@ -61,9 +51,19 @@ import net.sourceforge.plantuml.cucadiagram.LinkDecor;
 import net.sourceforge.plantuml.cucadiagram.LinkType;
 import net.sourceforge.plantuml.cucadiagram.Stereotype;
 import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement;
-import net.sourceforge.plantuml.graphic.color.ColorParser;
+import net.sourceforge.plantuml.klimt.color.ColorParser;
-import net.sourceforge.plantuml.graphic.color.ColorType;
+import net.sourceforge.plantuml.klimt.color.ColorType;
-import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException;
+import net.sourceforge.plantuml.klimt.color.NoSuchColorException;
+import net.sourceforge.plantuml.regex.IRegex;
+import net.sourceforge.plantuml.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexOptional;
+import net.sourceforge.plantuml.regex.RegexOr;
+import net.sourceforge.plantuml.regex.RegexPartialMatch;
+import net.sourceforge.plantuml.regex.RegexResult;
+import net.sourceforge.plantuml.url.Url;
+import net.sourceforge.plantuml.url.UrlBuilder;
+import net.sourceforge.plantuml.url.UrlMode;
 import net.sourceforge.plantuml.utils.Direction;
 import net.sourceforge.plantuml.utils.LineLocation;
 

src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkLongActivity.java

@@ -37,11 +37,7 @@ package net.sourceforge.plantuml.activitydiagram.command;
 
 import java.util.List;
 
-import net.sourceforge.plantuml.BackSlash;
 import net.sourceforge.plantuml.StringUtils;
-import net.sourceforge.plantuml.Url;
-import net.sourceforge.plantuml.UrlBuilder;
-import net.sourceforge.plantuml.UrlMode;
 import net.sourceforge.plantuml.activitydiagram.ActivityDiagram;
 import net.sourceforge.plantuml.baraye.EntityImp;
 import net.sourceforge.plantuml.baraye.Quark;
@@ -50,13 +46,6 @@ import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.command.CommandMultilines2;
 import net.sourceforge.plantuml.command.MultilinesStrategy;
 import net.sourceforge.plantuml.command.Trim;
-import net.sourceforge.plantuml.command.regex.IRegex;
-import net.sourceforge.plantuml.command.regex.MyPattern;
-import net.sourceforge.plantuml.command.regex.RegexConcat;
-import net.sourceforge.plantuml.command.regex.RegexLeaf;
-import net.sourceforge.plantuml.command.regex.RegexOptional;
-import net.sourceforge.plantuml.command.regex.RegexOr;
-import net.sourceforge.plantuml.command.regex.RegexResult;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.cucadiagram.GroupType;
 import net.sourceforge.plantuml.cucadiagram.LeafType;
@@ -66,11 +55,22 @@ import net.sourceforge.plantuml.cucadiagram.LinkDecor;
 import net.sourceforge.plantuml.cucadiagram.LinkType;
 import net.sourceforge.plantuml.cucadiagram.Stereotype;
 import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement;
-import net.sourceforge.plantuml.graphic.color.ColorType;
+import net.sourceforge.plantuml.klimt.color.ColorType;
-import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException;
+import net.sourceforge.plantuml.klimt.color.NoSuchColorException;
+import net.sourceforge.plantuml.regex.IRegex;
+import net.sourceforge.plantuml.regex.MyPattern;
+import net.sourceforge.plantuml.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexOptional;
+import net.sourceforge.plantuml.regex.RegexOr;
+import net.sourceforge.plantuml.regex.RegexResult;
+import net.sourceforge.plantuml.text.BackSlash;
+import net.sourceforge.plantuml.text.StringLocated;
+import net.sourceforge.plantuml.url.Url;
+import net.sourceforge.plantuml.url.UrlBuilder;
+import net.sourceforge.plantuml.url.UrlMode;
 import net.sourceforge.plantuml.utils.BlocLines;
 import net.sourceforge.plantuml.utils.Direction;
-import net.sourceforge.plantuml.utils.StringLocated;
 
 public class CommandLinkLongActivity extends CommandMultilines2<ActivityDiagram> {
 

src/net/sourceforge/plantuml/activitydiagram/command/CommandPartition.java

@@ -40,18 +40,18 @@ import net.sourceforge.plantuml.baraye.EntityImp;
 import net.sourceforge.plantuml.baraye.Quark;
 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.RegexOr;
-import net.sourceforge.plantuml.command.regex.RegexResult;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.cucadiagram.GroupType;
 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;
+import net.sourceforge.plantuml.klimt.color.ColorParser;
+import net.sourceforge.plantuml.klimt.color.ColorType;
+import net.sourceforge.plantuml.klimt.color.NoSuchColorException;
+import net.sourceforge.plantuml.regex.IRegex;
+import net.sourceforge.plantuml.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexOr;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.LineLocation;
 
 public class CommandPartition extends SingleLineCommand2<ActivityDiagram> {

src/net/sourceforge/plantuml/activitydiagram3/AbstractInstruction.java

@@ -37,12 +37,13 @@ package net.sourceforge.plantuml.activitydiagram3;
 
 import net.sourceforge.plantuml.ISkinParam;
 import net.sourceforge.plantuml.activitydiagram3.gtile.Gtile;
-import net.sourceforge.plantuml.graphic.StringBounder;
+import net.sourceforge.plantuml.klimt.font.StringBounder;
 
 abstract class AbstractInstruction {
 
+	// ::comment when WASM
 	public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) {
 		throw new UnsupportedOperationException("" + getClass());
 	}
-
+	// ::done
 }

src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagram3.java

@@ -43,7 +43,6 @@ import java.util.Objects;
 import net.sourceforge.plantuml.FileFormatOption;
 import net.sourceforge.plantuml.UmlDiagram;
 import net.sourceforge.plantuml.UmlDiagramType;
-import net.sourceforge.plantuml.Url;
 import net.sourceforge.plantuml.activitydiagram3.ftile.BoxStyle;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlanes;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
@@ -53,17 +52,18 @@ import net.sourceforge.plantuml.core.UmlSource;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.cucadiagram.Stereotype;
 import net.sourceforge.plantuml.graphic.Rainbow;
-import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.TextBlock;
 import net.sourceforge.plantuml.graphic.TextBlockRecentred;
 import net.sourceforge.plantuml.graphic.USymbol;
 import net.sourceforge.plantuml.graphic.color.Colors;
+import net.sourceforge.plantuml.klimt.color.HColor;
+import net.sourceforge.plantuml.klimt.comp.CompressionMode;
+import net.sourceforge.plantuml.klimt.font.StringBounder;
 import net.sourceforge.plantuml.sequencediagram.NotePosition;
 import net.sourceforge.plantuml.sequencediagram.NoteType;
 import net.sourceforge.plantuml.style.Style;
-import net.sourceforge.plantuml.ugraphic.color.HColor;
-import net.sourceforge.plantuml.ugraphic.comp.CompressionMode;
 import net.sourceforge.plantuml.ugraphic.comp.CompressionXorYBuilder;
+import net.sourceforge.plantuml.url.Url;
 
 public class ActivityDiagram3 extends UmlDiagram {
 

src/net/sourceforge/plantuml/activitydiagram3/Branch.java

@@ -48,13 +48,14 @@ import net.sourceforge.plantuml.activitydiagram3.gtile.Gtile;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.creole.CreoleMode;
 import net.sourceforge.plantuml.cucadiagram.Display;
-import net.sourceforge.plantuml.graphic.FontConfiguration;
-import net.sourceforge.plantuml.graphic.HorizontalAlignment;
 import net.sourceforge.plantuml.graphic.Rainbow;
-import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.TextBlock;
 import net.sourceforge.plantuml.graphic.TextBlockUtils;
 import net.sourceforge.plantuml.graphic.color.Colors;
+import net.sourceforge.plantuml.klimt.color.HColor;
+import net.sourceforge.plantuml.klimt.font.FontConfiguration;
+import net.sourceforge.plantuml.klimt.font.StringBounder;
+import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment;
 import net.sourceforge.plantuml.sequencediagram.NotePosition;
 import net.sourceforge.plantuml.sequencediagram.NoteType;
 import net.sourceforge.plantuml.style.PName;
@@ -62,7 +63,6 @@ import net.sourceforge.plantuml.style.SName;
 import net.sourceforge.plantuml.style.Style;
 import net.sourceforge.plantuml.style.StyleBuilder;
 import net.sourceforge.plantuml.style.StyleSignatureBasic;
-import net.sourceforge.plantuml.ugraphic.color.HColor;
 
 public class Branch {
 
@@ -78,7 +78,9 @@ public class Branch {
 	private final HColor color;
 
 	private Ftile ftile;
+	// ::comment when WASM
 	private Gtile gtile;
+	// ::done
 
 	public StyleSignatureBasic getDefaultStyleDefinitionArrow() {
 		return StyleSignatureBasic.of(SName.root, SName.element, SName.activityDiagram, SName.arrow);
@@ -130,9 +132,11 @@ public class Branch {
 		this.ftile = factory.decorateOut(list.createFtile(factory), inlinkRendering);
 	}
 
+	// ::comment when WASM
 	public void updateGtile(ISkinParam skinParam, StringBounder stringBounder) {
 		this.gtile = list.createGtile(skinParam, stringBounder);
 	}
+	// ::done
 
 	public Collection<? extends Swimlane> getSwimlanes() {
 		return list.getSwimlanes();
@@ -186,13 +190,17 @@ public class Branch {
 		return ftile;
 	}
 
+	// ::comment when WASM
 	public Gtile getGtile() {
 		return gtile;
 	}
-
+	// ::done
+	
 	public ISkinParam skinParam() {
+		// ::comment when WASM
 		if (gtile != null)
 			return gtile.skinParam();
+		// ::done
 		return ftile.skinParam();
 	}
 

src/net/sourceforge/plantuml/activitydiagram3/Instruction.java

@@ -43,8 +43,8 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane;
 import net.sourceforge.plantuml.activitydiagram3.gtile.Gtile;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.cucadiagram.Display;
-import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.color.Colors;
+import net.sourceforge.plantuml.klimt.font.StringBounder;
 import net.sourceforge.plantuml.sequencediagram.NotePosition;
 import net.sourceforge.plantuml.sequencediagram.NoteType;
 
@@ -52,8 +52,10 @@ public interface Instruction extends Swimable {
 
 	public Ftile createFtile(FtileFactory factory);
 
+	// ::comment when WASM
 	public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder);
-
+	// ::done
+	
 	public CommandExecutionResult add(Instruction other);
 
 	public boolean kill();

src/net/sourceforge/plantuml/activitydiagram3/InstructionBreak.java

@@ -45,7 +45,7 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane;
 import net.sourceforge.plantuml.activitydiagram3.gtile.Gtile;
 import net.sourceforge.plantuml.activitydiagram3.gtile.GtileBreak;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
-import net.sourceforge.plantuml.graphic.StringBounder;
+import net.sourceforge.plantuml.klimt.font.StringBounder;
 
 public class InstructionBreak extends MonoSwimable implements Instruction {
 
@@ -61,10 +61,12 @@ public class InstructionBreak extends MonoSwimable implements Instruction {
 		return new FtileBreak(factory.skinParam(), getSwimlaneIn());
 	}
 
+	// ::comment when WASM
 	@Override
 	public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) {
 		return new GtileBreak(stringBounder, skinParam, getSwimlaneIn());
 	}
+	// ::done
 
 	@Override
 	public CommandExecutionResult add(Instruction other) {

src/net/sourceforge/plantuml/activitydiagram3/InstructionEnd.java

@@ -44,9 +44,9 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane;
 import net.sourceforge.plantuml.activitydiagram3.gtile.Gtile;
 import net.sourceforge.plantuml.activitydiagram3.gtile.GtileCircleStart;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
-import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.VerticalAlignment;
-import net.sourceforge.plantuml.ugraphic.color.HColors;
+import net.sourceforge.plantuml.klimt.color.HColors;
+import net.sourceforge.plantuml.klimt.font.StringBounder;
 
 public class InstructionEnd extends MonoSwimable implements Instruction {
 
@@ -57,10 +57,12 @@ public class InstructionEnd extends MonoSwimable implements Instruction {
 		this.inlinkRendering = Objects.requireNonNull(inlinkRendering);
 	}
 
+	// ::comment when WASM
 	@Override
 	public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) {
 		return new GtileCircleStart(stringBounder, skinParam, HColors.BLACK, getSwimlaneIn());
 	}
+	// ::done
 
 	@Override
 	public Ftile createFtile(FtileFactory factory) {

src/net/sourceforge/plantuml/activitydiagram3/InstructionFork.java

@@ -52,9 +52,9 @@ import net.sourceforge.plantuml.activitydiagram3.gtile.Gtiles;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.graphic.Rainbow;
-import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.VerticalAlignment;
 import net.sourceforge.plantuml.graphic.color.Colors;
+import net.sourceforge.plantuml.klimt.font.StringBounder;
 import net.sourceforge.plantuml.sequencediagram.NotePosition;
 import net.sourceforge.plantuml.sequencediagram.NoteType;
 
@@ -98,6 +98,7 @@ public class InstructionFork extends WithNote implements Instruction {
 		return getLastList().add(ins);
 	}
 
+	// ::comment when WASM
 	@Override
 	public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) {
 		final List<Gtile> all = new ArrayList<>();
@@ -110,6 +111,7 @@ public class InstructionFork extends WithNote implements Instruction {
 
 		return new GtileSplit(all, swimlaneIn, getInLinkRenderingColor(skinParam).getColor());
 	}
+	// ::done
 
 	private Rainbow getInLinkRenderingColor(ISkinParam skinParam) {
 		Rainbow color;

src/net/sourceforge/plantuml/activitydiagram3/InstructionGoto.java

@@ -43,7 +43,7 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane;
 import net.sourceforge.plantuml.activitydiagram3.gtile.Gtile;
 import net.sourceforge.plantuml.activitydiagram3.gtile.GtileEmpty;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
-import net.sourceforge.plantuml.graphic.StringBounder;
+import net.sourceforge.plantuml.klimt.font.StringBounder;
 
 public class InstructionGoto extends MonoSwimable implements Instruction {
 
@@ -59,10 +59,12 @@ public class InstructionGoto extends MonoSwimable implements Instruction {
 		return new FtileGoto(factory.skinParam(), getSwimlaneIn(), name);
 	}
 	
+	// ::comment when WASM
 	@Override
 	public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) {
 		return new GtileEmpty(stringBounder, skinParam);
 	}
+	// ::done
 
 	@Override
 	public CommandExecutionResult add(Instruction other) {

src/net/sourceforge/plantuml/activitydiagram3/InstructionGroup.java

@@ -47,15 +47,15 @@ import net.sourceforge.plantuml.activitydiagram3.gtile.Gtile;
 import net.sourceforge.plantuml.activitydiagram3.gtile.GtileGroup;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.cucadiagram.Display;
-import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.USymbol;
 import net.sourceforge.plantuml.graphic.VerticalAlignment;
 import net.sourceforge.plantuml.graphic.color.Colors;
+import net.sourceforge.plantuml.klimt.color.HColor;
+import net.sourceforge.plantuml.klimt.color.HColors;
+import net.sourceforge.plantuml.klimt.font.StringBounder;
 import net.sourceforge.plantuml.sequencediagram.NotePosition;
 import net.sourceforge.plantuml.sequencediagram.NoteType;
 import net.sourceforge.plantuml.style.Style;
-import net.sourceforge.plantuml.ugraphic.color.HColor;
-import net.sourceforge.plantuml.ugraphic.color.HColors;
 
 public class InstructionGroup extends AbstractInstruction implements Instruction, InstructionCollection {
 
@@ -90,11 +90,13 @@ public class InstructionGroup extends AbstractInstruction implements Instruction
 		return list.add(ins);
 	}
 
+	// ::comment when WASM
 	@Override
 	public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) {
 		Gtile tmp = list.createGtile(skinParam, stringBounder);
 		return new GtileGroup(tmp, title, null, HColors.BLUE, backColor, tmp.skinParam(), type, style);
 	}
+	// ::done
 
 	@Override
 	public Ftile createFtile(FtileFactory factory) {

src/net/sourceforge/plantuml/activitydiagram3/InstructionIf.java

@@ -43,7 +43,6 @@ import java.util.Objects;
 import java.util.Set;
 
 import net.sourceforge.plantuml.ISkinParam;
-import net.sourceforge.plantuml.Url;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile;
 import net.sourceforge.plantuml.activitydiagram3.ftile.FtileDecorateWelding;
 import net.sourceforge.plantuml.activitydiagram3.ftile.FtileFactory;
@@ -55,12 +54,13 @@ import net.sourceforge.plantuml.activitydiagram3.gtile.GtileIfAlone;
 import net.sourceforge.plantuml.activitydiagram3.gtile.GtileIfHexagon;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.cucadiagram.Display;
-import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.VerticalAlignment;
 import net.sourceforge.plantuml.graphic.color.Colors;
+import net.sourceforge.plantuml.klimt.color.HColor;
+import net.sourceforge.plantuml.klimt.font.StringBounder;
 import net.sourceforge.plantuml.sequencediagram.NotePosition;
 import net.sourceforge.plantuml.sequencediagram.NoteType;
-import net.sourceforge.plantuml.ugraphic.color.HColor;
+import net.sourceforge.plantuml.url.Url;
 
 public class InstructionIf extends WithNote implements Instruction, InstructionCollection {
 
@@ -108,6 +108,7 @@ public class InstructionIf extends WithNote implements Instruction, InstructionC
 		return current.add(ins);
 	}
 
+	// ::comment when WASM
 	@Override
 	public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) {
 		for (Branch branch : thens)
@@ -129,6 +130,7 @@ public class InstructionIf extends WithNote implements Instruction, InstructionC
 			return new GtileIfAlone(swimlane, gtiles.get(0), branches.get(0));
 		return GtileIfHexagon.build(swimlane, gtiles, branches);
 	}
+	// ::done
 
 	@Override
 	public Ftile createFtile(FtileFactory factory) {

src/net/sourceforge/plantuml/activitydiagram3/InstructionLabel.java

@@ -43,7 +43,7 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane;
 import net.sourceforge.plantuml.activitydiagram3.gtile.Gtile;
 import net.sourceforge.plantuml.activitydiagram3.gtile.GtileEmpty;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
-import net.sourceforge.plantuml.graphic.StringBounder;
+import net.sourceforge.plantuml.klimt.font.StringBounder;
 
 public class InstructionLabel extends MonoSwimable implements Instruction {
 
@@ -59,10 +59,12 @@ public class InstructionLabel extends MonoSwimable implements Instruction {
 		return new FtileLabel(factory.skinParam(), getSwimlaneIn(), name);
 	}
 	
+	// ::comment when WASM
 	@Override
 	public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) {
 		return new GtileEmpty(stringBounder, skinParam);
 	}
+	// ::done
 
 	@Override
 	public CommandExecutionResult add(Instruction other) {

src/net/sourceforge/plantuml/activitydiagram3/InstructionList.java

@@ -53,9 +53,9 @@ import net.sourceforge.plantuml.activitydiagram3.gtile.GtileAssembly;
 import net.sourceforge.plantuml.activitydiagram3.gtile.GtileEmpty;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.cucadiagram.Display;
-import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.VerticalAlignment;
 import net.sourceforge.plantuml.graphic.color.Colors;
+import net.sourceforge.plantuml.klimt.font.StringBounder;
 import net.sourceforge.plantuml.sequencediagram.NotePosition;
 import net.sourceforge.plantuml.sequencediagram.NoteType;
 
@@ -101,6 +101,7 @@ public class InstructionList extends WithNote implements Instruction, Instructio
 		return CommandExecutionResult.ok();
 	}
 
+	// ::comment when WASM
 	@Override
 	public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) {
 		if (all.size() == 0)
@@ -118,6 +119,7 @@ public class InstructionList extends WithNote implements Instruction, Instructio
 		}
 		return result;
 	}
+	// ::done
 
 	@Override
 	public Ftile createFtile(FtileFactory factory) {

src/net/sourceforge/plantuml/activitydiagram3/InstructionRepeat.java

@@ -52,12 +52,12 @@ import net.sourceforge.plantuml.activitydiagram3.gtile.GtileBox;
 import net.sourceforge.plantuml.activitydiagram3.gtile.GtileRepeat;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.cucadiagram.Display;
-import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.VerticalAlignment;
 import net.sourceforge.plantuml.graphic.color.Colors;
+import net.sourceforge.plantuml.klimt.color.HColor;
+import net.sourceforge.plantuml.klimt.font.StringBounder;
 import net.sourceforge.plantuml.sequencediagram.NotePosition;
 import net.sourceforge.plantuml.sequencediagram.NoteType;
-import net.sourceforge.plantuml.ugraphic.color.HColor;
 
 public class InstructionRepeat extends AbstractInstruction implements Instruction {
 
@@ -127,6 +127,7 @@ public class InstructionRepeat extends AbstractInstruction implements Instructio
 		return repeatList.add(ins);
 	}
 
+	// ::comment when WASM
 	@Override
 	public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) {
 
@@ -146,6 +147,7 @@ public class InstructionRepeat extends AbstractInstruction implements Instructio
 //		}
 		return result;
 	}
+	// ::done
 
 	public Ftile createFtile(FtileFactory factory) {
 		final Ftile back = getFtileBackward(factory);

src/net/sourceforge/plantuml/activitydiagram3/InstructionSimple.java

@@ -39,7 +39,6 @@ import java.util.Collection;
 import java.util.Objects;
 
 import net.sourceforge.plantuml.ISkinParam;
-import net.sourceforge.plantuml.Url;
 import net.sourceforge.plantuml.activitydiagram3.ftile.BoxStyle;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile;
 import net.sourceforge.plantuml.activitydiagram3.ftile.FtileFactory;
@@ -52,9 +51,10 @@ import net.sourceforge.plantuml.activitydiagram3.gtile.GtileWithNotes;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.cucadiagram.Stereotype;
-import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.VerticalAlignment;
 import net.sourceforge.plantuml.graphic.color.Colors;
+import net.sourceforge.plantuml.klimt.font.StringBounder;
+import net.sourceforge.plantuml.url.Url;
 
 public class InstructionSimple extends MonoSwimable implements Instruction {
 
@@ -82,6 +82,7 @@ public class InstructionSimple extends MonoSwimable implements Instruction {
 		this.colors = Objects.requireNonNull(colors);
 	}
 
+	// ::comment when WASM
 	@Override
 	public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) {
 		GtileBox result = GtileBox.create(stringBounder, colors.mute(skinParam), label, getSwimlaneIn(), style,
@@ -98,6 +99,7 @@ public class InstructionSimple extends MonoSwimable implements Instruction {
 		}
 		return result;
 	}
+	// ::done
 
 	@Override
 	public Ftile createFtile(FtileFactory factory) {

src/net/sourceforge/plantuml/activitydiagram3/InstructionSplit.java

@@ -50,8 +50,8 @@ import net.sourceforge.plantuml.activitydiagram3.gtile.Gtiles;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.graphic.Rainbow;
-import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.color.Colors;
+import net.sourceforge.plantuml.klimt.font.StringBounder;
 import net.sourceforge.plantuml.sequencediagram.NotePosition;
 import net.sourceforge.plantuml.sequencediagram.NoteType;
 
@@ -89,6 +89,7 @@ public class InstructionSplit extends AbstractInstruction implements Instruction
 		return getLast().add(ins);
 	}
 
+	// ::comment when WASM
 	@Override
 	public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) {
 		final List<Gtile> all = new ArrayList<>();
@@ -101,6 +102,7 @@ public class InstructionSplit extends AbstractInstruction implements Instruction
 
 		return new GtileSplit(all, swimlaneIn, getInLinkRenderingColor(skinParam).getColor());
 	}
+	// ::done
 
 	private Rainbow getInLinkRenderingColor(ISkinParam skinParam) {
 		Rainbow color;

src/net/sourceforge/plantuml/activitydiagram3/InstructionSpot.java

@@ -37,7 +37,6 @@ package net.sourceforge.plantuml.activitydiagram3;
 
 import java.util.Objects;
 
-import net.sourceforge.plantuml.FontParam;
 import net.sourceforge.plantuml.ISkinParam;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile;
 import net.sourceforge.plantuml.activitydiagram3.ftile.FtileFactory;
@@ -46,10 +45,11 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane;
 import net.sourceforge.plantuml.activitydiagram3.gtile.Gtile;
 import net.sourceforge.plantuml.activitydiagram3.gtile.GtileCircleSpot;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
-import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.VerticalAlignment;
-import net.sourceforge.plantuml.ugraphic.UFont;
+import net.sourceforge.plantuml.klimt.color.HColor;
-import net.sourceforge.plantuml.ugraphic.color.HColor;
+import net.sourceforge.plantuml.klimt.font.FontParam;
+import net.sourceforge.plantuml.klimt.font.StringBounder;
+import net.sourceforge.plantuml.klimt.font.UFont;
 
 public class InstructionSpot extends MonoSwimable implements Instruction {
 
@@ -80,13 +80,15 @@ public class InstructionSpot extends MonoSwimable implements Instruction {
 		return result;
 	}
 
+	// ::comment when WASM
 	@Override
 	public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) {
 		final UFont font = skinParam.getFont(null, false, FontParam.ACTIVITY);
 		return new GtileCircleSpot(stringBounder, skinParam, color, getSwimlaneIn(), spot, font);
 
 	}
-
+	// ::done
+	
 	@Override
 	public CommandExecutionResult add(Instruction other) {
 		throw new UnsupportedOperationException();

src/net/sourceforge/plantuml/activitydiagram3/InstructionStart.java

@@ -44,9 +44,9 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane;
 import net.sourceforge.plantuml.activitydiagram3.gtile.Gtile;
 import net.sourceforge.plantuml.activitydiagram3.gtile.GtileCircleStart;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
-import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.VerticalAlignment;
-import net.sourceforge.plantuml.ugraphic.color.HColors;
+import net.sourceforge.plantuml.klimt.color.HColors;
+import net.sourceforge.plantuml.klimt.font.StringBounder;
 
 public class InstructionStart extends MonoSwimable implements Instruction {
 
@@ -62,10 +62,12 @@ public class InstructionStart extends MonoSwimable implements Instruction {
 		return false;
 	}
 
+	// ::comment when WASM
 	@Override
 	public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) {
 		return new GtileCircleStart(stringBounder, skinParam, HColors.BLACK, getSwimlaneIn());
 	}
+	// ::done
 
 	@Override
 	public Ftile createFtile(FtileFactory factory) {

src/net/sourceforge/plantuml/activitydiagram3/InstructionStop.java

@@ -44,9 +44,9 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane;
 import net.sourceforge.plantuml.activitydiagram3.gtile.Gtile;
 import net.sourceforge.plantuml.activitydiagram3.gtile.GtileCircleStart;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
-import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.VerticalAlignment;
-import net.sourceforge.plantuml.ugraphic.color.HColors;
+import net.sourceforge.plantuml.klimt.color.HColors;
+import net.sourceforge.plantuml.klimt.font.StringBounder;
 
 public class InstructionStop extends MonoSwimable implements Instruction {
 
@@ -62,10 +62,12 @@ public class InstructionStop extends MonoSwimable implements Instruction {
 		return false;
 	}
 
+	// ::comment when WASM
 	@Override
 	public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) {
 		return new GtileCircleStart(stringBounder, skinParam, HColors.BLACK, getSwimlaneIn());
 	}
+	// ::done
 
 	@Override
 	public Ftile createFtile(FtileFactory factory) {

src/net/sourceforge/plantuml/activitydiagram3/InstructionSwitch.java

@@ -50,12 +50,12 @@ import net.sourceforge.plantuml.activitydiagram3.gtile.Gtile;
 import net.sourceforge.plantuml.activitydiagram3.gtile.GtileIfHexagon;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.cucadiagram.Display;
-import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.VerticalAlignment;
 import net.sourceforge.plantuml.graphic.color.Colors;
+import net.sourceforge.plantuml.klimt.color.HColor;
+import net.sourceforge.plantuml.klimt.font.StringBounder;
 import net.sourceforge.plantuml.sequencediagram.NotePosition;
 import net.sourceforge.plantuml.sequencediagram.NoteType;
-import net.sourceforge.plantuml.ugraphic.color.HColor;
 
 public class InstructionSwitch extends WithNote implements Instruction, InstructionCollection {
 
@@ -97,6 +97,7 @@ public class InstructionSwitch extends WithNote implements Instruction, Instruct
 		return current.add(ins);
 	}
 
+	// ::comment when WASM
 	@Override
 	public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) {
 		for (Branch branch : switches)
@@ -111,6 +112,7 @@ public class InstructionSwitch extends WithNote implements Instruction, Instruct
 
 		return GtileIfHexagon.build(swimlane, gtiles, switches);
 	}
+	// ::done
 
 	public Ftile createFtile(FtileFactory factory) {
 		for (Branch branch : switches)

src/net/sourceforge/plantuml/activitydiagram3/InstructionWhile.java

@@ -50,12 +50,12 @@ import net.sourceforge.plantuml.activitydiagram3.gtile.GtileWhile;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.graphic.Rainbow;
-import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.VerticalAlignment;
 import net.sourceforge.plantuml.graphic.color.Colors;
+import net.sourceforge.plantuml.klimt.color.HColor;
+import net.sourceforge.plantuml.klimt.font.StringBounder;
 import net.sourceforge.plantuml.sequencediagram.NotePosition;
 import net.sourceforge.plantuml.sequencediagram.NoteType;
-import net.sourceforge.plantuml.ugraphic.color.HColor;
 
 public class InstructionWhile extends WithNote implements Instruction, InstructionCollection {
 
@@ -103,6 +103,7 @@ public class InstructionWhile extends WithNote implements Instruction, Instructi
 		return repeatList.add(ins);
 	}
 
+	// ::comment when WASM
 	@Override
 	public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) {
 		final Gtile back = null;
@@ -110,6 +111,7 @@ public class InstructionWhile extends WithNote implements Instruction, Instructi
 		tmp = GtileWhile.createWhile(swimlane, tmp, test, yes, specialOut, back);
 		return tmp;
 	}
+	// ::done
 
 	@Override
 	public Ftile createFtile(FtileFactory factory) {

src/net/sourceforge/plantuml/activitydiagram3/PositionedNote.java

@@ -36,7 +36,7 @@
 package net.sourceforge.plantuml.activitydiagram3;
 
 import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane;
-import net.sourceforge.plantuml.annotation.HaxeIgnored;
+
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.graphic.color.Colors;
 import net.sourceforge.plantuml.sequencediagram.NotePosition;
@@ -58,7 +58,7 @@ public class PositionedNote {
 		this.swimlaneNote = swimlaneNote;
 	}
 
-	@HaxeIgnored
+	
 	public PositionedNote(Display note, NotePosition position, NoteType type, Swimlane swimlaneNote) {
 		this(note, position, type, swimlaneNote, null);
 	}

src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivity3.java

@@ -38,23 +38,23 @@ package net.sourceforge.plantuml.activitydiagram3.command;
 import java.util.regex.Matcher;
 
 import net.sourceforge.plantuml.ColorParam;
-import net.sourceforge.plantuml.Url;
-import net.sourceforge.plantuml.UrlBuilder;
-import net.sourceforge.plantuml.UrlMode;
 import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3;
 import net.sourceforge.plantuml.activitydiagram3.ftile.BoxStyle;
 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.cucadiagram.Display;
 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;
+import net.sourceforge.plantuml.klimt.color.ColorParser;
+import net.sourceforge.plantuml.klimt.color.ColorType;
+import net.sourceforge.plantuml.klimt.color.NoSuchColorException;
+import net.sourceforge.plantuml.regex.IRegex;
+import net.sourceforge.plantuml.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexResult;
+import net.sourceforge.plantuml.url.Url;
+import net.sourceforge.plantuml.url.UrlBuilder;
+import net.sourceforge.plantuml.url.UrlMode;
 import net.sourceforge.plantuml.utils.LineLocation;
 
 public class CommandActivity3 extends SingleLineCommand2<ActivityDiagram3> {

src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLegacy1.java

@@ -39,12 +39,12 @@ import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3;
 import net.sourceforge.plantuml.activitydiagram3.ftile.BoxStyle;
 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.cucadiagram.Display;
 import net.sourceforge.plantuml.graphic.color.Colors;
+import net.sourceforge.plantuml.regex.IRegex;
+import net.sourceforge.plantuml.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.LineLocation;
 
 public class CommandActivityLegacy1 extends SingleLineCommand2<ActivityDiagram3> {

src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLong3.java

@@ -41,14 +41,14 @@ import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.command.CommandMultilines3;
 import net.sourceforge.plantuml.command.MultilinesStrategy;
 import net.sourceforge.plantuml.command.Trim;
-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.graphic.color.ColorParser;
-import net.sourceforge.plantuml.graphic.color.ColorType;
 import net.sourceforge.plantuml.graphic.color.Colors;
-import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException;
+import net.sourceforge.plantuml.klimt.color.ColorParser;
+import net.sourceforge.plantuml.klimt.color.ColorType;
+import net.sourceforge.plantuml.klimt.color.NoSuchColorException;
+import net.sourceforge.plantuml.regex.IRegex;
+import net.sourceforge.plantuml.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.BlocLines;
 
 public class CommandActivityLong3 extends CommandMultilines3<ActivityDiagram3> {

src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrow3.java

@@ -38,15 +38,15 @@ package net.sourceforge.plantuml.activitydiagram3.command;
 import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3;
 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.RegexOr;
-import net.sourceforge.plantuml.command.regex.RegexResult;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement;
 import net.sourceforge.plantuml.graphic.Rainbow;
-import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException;
+import net.sourceforge.plantuml.klimt.color.NoSuchColorException;
+import net.sourceforge.plantuml.regex.IRegex;
+import net.sourceforge.plantuml.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexOr;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.LineLocation;
 
 public class CommandArrow3 extends SingleLineCommand2<ActivityDiagram3> {

src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrowLong3.java

@@ -42,14 +42,14 @@ import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.command.CommandMultilines2;
 import net.sourceforge.plantuml.command.MultilinesStrategy;
 import net.sourceforge.plantuml.command.Trim;
-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.RegexOr;
-import net.sourceforge.plantuml.command.regex.RegexResult;
 import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement;
 import net.sourceforge.plantuml.graphic.Rainbow;
-import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException;
+import net.sourceforge.plantuml.klimt.color.NoSuchColorException;
+import net.sourceforge.plantuml.regex.IRegex;
+import net.sourceforge.plantuml.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexOr;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.BlocLines;
 
 public class CommandArrowLong3 extends CommandMultilines2<ActivityDiagram3> {

src/net/sourceforge/plantuml/activitydiagram3/command/CommandBackward3.java

@@ -40,16 +40,16 @@ import net.sourceforge.plantuml.activitydiagram3.LinkRendering;
 import net.sourceforge.plantuml.activitydiagram3.ftile.BoxStyle;
 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.RegexOptional;
-import net.sourceforge.plantuml.command.regex.RegexOr;
-import net.sourceforge.plantuml.command.regex.RegexResult;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement;
 import net.sourceforge.plantuml.graphic.Rainbow;
-import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException;
+import net.sourceforge.plantuml.klimt.color.NoSuchColorException;
+import net.sourceforge.plantuml.regex.IRegex;
+import net.sourceforge.plantuml.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexOptional;
+import net.sourceforge.plantuml.regex.RegexOr;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.LineLocation;
 
 public class CommandBackward3 extends SingleLineCommand2<ActivityDiagram3> {

src/net/sourceforge/plantuml/activitydiagram3/command/CommandBackwardLong3.java

@@ -42,11 +42,11 @@ import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.command.CommandMultilines3;
 import net.sourceforge.plantuml.command.MultilinesStrategy;
 import net.sourceforge.plantuml.command.Trim;
-import net.sourceforge.plantuml.command.regex.IRegex;
+import net.sourceforge.plantuml.klimt.color.NoSuchColorException;
-import net.sourceforge.plantuml.command.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.IRegex;
-import net.sourceforge.plantuml.command.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexConcat;
-import net.sourceforge.plantuml.command.regex.RegexResult;
+import net.sourceforge.plantuml.regex.RegexLeaf;
-import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.BlocLines;
 
 public class CommandBackwardLong3 extends CommandMultilines3<ActivityDiagram3> {

src/net/sourceforge/plantuml/activitydiagram3/command/CommandBreak.java

@@ -38,10 +38,10 @@ package net.sourceforge.plantuml.activitydiagram3.command;
 import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.command.SingleLineCommand2;
-import net.sourceforge.plantuml.command.regex.IRegex;
+import net.sourceforge.plantuml.regex.IRegex;
-import net.sourceforge.plantuml.command.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexConcat;
-import net.sourceforge.plantuml.command.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexLeaf;
-import net.sourceforge.plantuml.command.regex.RegexResult;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.LineLocation;
 
 public class CommandBreak extends SingleLineCommand2<ActivityDiagram3> {

src/net/sourceforge/plantuml/activitydiagram3/command/CommandCase.java

@@ -38,11 +38,11 @@ package net.sourceforge.plantuml.activitydiagram3.command;
 import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3;
 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.cucadiagram.Display;
+import net.sourceforge.plantuml.regex.IRegex;
+import net.sourceforge.plantuml.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.LineLocation;
 
 public class CommandCase extends SingleLineCommand2<ActivityDiagram3> {

src/net/sourceforge/plantuml/activitydiagram3/command/CommandCircleSpot3.java

@@ -38,13 +38,13 @@ package net.sourceforge.plantuml.activitydiagram3.command;
 import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.command.SingleLineCommand2;
-import net.sourceforge.plantuml.command.regex.IRegex;
+import net.sourceforge.plantuml.klimt.color.ColorParser;
-import net.sourceforge.plantuml.command.regex.RegexConcat;
+import net.sourceforge.plantuml.klimt.color.HColor;
-import net.sourceforge.plantuml.command.regex.RegexLeaf;
+import net.sourceforge.plantuml.klimt.color.NoSuchColorException;
-import net.sourceforge.plantuml.command.regex.RegexResult;
+import net.sourceforge.plantuml.regex.IRegex;
-import net.sourceforge.plantuml.graphic.color.ColorParser;
+import net.sourceforge.plantuml.regex.RegexConcat;
-import net.sourceforge.plantuml.ugraphic.color.HColor;
+import net.sourceforge.plantuml.regex.RegexLeaf;
-import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.LineLocation;
 
 public class CommandCircleSpot3 extends SingleLineCommand2<ActivityDiagram3> {

src/net/sourceforge/plantuml/activitydiagram3/command/CommandElse3.java

@@ -39,14 +39,14 @@ import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3;
 import net.sourceforge.plantuml.activitydiagram3.LinkRendering;
 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.RegexOptional;
-import net.sourceforge.plantuml.command.regex.RegexOr;
-import net.sourceforge.plantuml.command.regex.RegexResult;
 import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement;
-import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException;
+import net.sourceforge.plantuml.klimt.color.NoSuchColorException;
+import net.sourceforge.plantuml.regex.IRegex;
+import net.sourceforge.plantuml.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexOptional;
+import net.sourceforge.plantuml.regex.RegexOr;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.LineLocation;
 
 public class CommandElse3 extends SingleLineCommand2<ActivityDiagram3> {

src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseIf2.java

@@ -39,17 +39,17 @@ import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3;
 import net.sourceforge.plantuml.activitydiagram3.LinkRendering;
 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.RegexOptional;
-import net.sourceforge.plantuml.command.regex.RegexOr;
-import net.sourceforge.plantuml.command.regex.RegexResult;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement;
-import net.sourceforge.plantuml.graphic.color.ColorParser;
+import net.sourceforge.plantuml.klimt.color.ColorParser;
-import net.sourceforge.plantuml.ugraphic.color.HColor;
+import net.sourceforge.plantuml.klimt.color.HColor;
-import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException;
+import net.sourceforge.plantuml.klimt.color.NoSuchColorException;
+import net.sourceforge.plantuml.regex.IRegex;
+import net.sourceforge.plantuml.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexOptional;
+import net.sourceforge.plantuml.regex.RegexOr;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.LineLocation;
 
 public class CommandElseIf2 extends SingleLineCommand2<ActivityDiagram3> {

src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseIf3.java

@@ -39,17 +39,17 @@ import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3;
 import net.sourceforge.plantuml.activitydiagram3.LinkRendering;
 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.RegexOptional;
-import net.sourceforge.plantuml.command.regex.RegexOr;
-import net.sourceforge.plantuml.command.regex.RegexResult;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement;
-import net.sourceforge.plantuml.graphic.color.ColorParser;
+import net.sourceforge.plantuml.klimt.color.ColorParser;
-import net.sourceforge.plantuml.ugraphic.color.HColor;
+import net.sourceforge.plantuml.klimt.color.HColor;
-import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException;
+import net.sourceforge.plantuml.klimt.color.NoSuchColorException;
+import net.sourceforge.plantuml.regex.IRegex;
+import net.sourceforge.plantuml.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexOptional;
+import net.sourceforge.plantuml.regex.RegexOr;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.LineLocation;
 
 public class CommandElseIf3 extends SingleLineCommand2<ActivityDiagram3> {

src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseLegacy1.java

@@ -39,11 +39,11 @@ import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3;
 import net.sourceforge.plantuml.activitydiagram3.LinkRendering;
 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.cucadiagram.Display;
+import net.sourceforge.plantuml.regex.IRegex;
+import net.sourceforge.plantuml.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.LineLocation;
 
 public class CommandElseLegacy1 extends SingleLineCommand2<ActivityDiagram3> {

src/net/sourceforge/plantuml/activitydiagram3/command/CommandEnd3.java

@@ -38,10 +38,10 @@ package net.sourceforge.plantuml.activitydiagram3.command;
 import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.command.SingleLineCommand2;
-import net.sourceforge.plantuml.command.regex.IRegex;
+import net.sourceforge.plantuml.regex.IRegex;
-import net.sourceforge.plantuml.command.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexConcat;
-import net.sourceforge.plantuml.command.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexLeaf;
-import net.sourceforge.plantuml.command.regex.RegexResult;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.LineLocation;
 
 public class CommandEnd3 extends SingleLineCommand2<ActivityDiagram3> {

src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndPartition3.java

@@ -38,10 +38,10 @@ package net.sourceforge.plantuml.activitydiagram3.command;
 import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.command.SingleLineCommand2;
-import net.sourceforge.plantuml.command.regex.IRegex;
+import net.sourceforge.plantuml.regex.IRegex;
-import net.sourceforge.plantuml.command.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexConcat;
-import net.sourceforge.plantuml.command.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexLeaf;
-import net.sourceforge.plantuml.command.regex.RegexResult;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.LineLocation;
 
 public class CommandEndPartition3 extends SingleLineCommand2<ActivityDiagram3> {

src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndSwitch.java

@@ -38,10 +38,10 @@ package net.sourceforge.plantuml.activitydiagram3.command;
 import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.command.SingleLineCommand2;
-import net.sourceforge.plantuml.command.regex.IRegex;
+import net.sourceforge.plantuml.regex.IRegex;
-import net.sourceforge.plantuml.command.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexConcat;
-import net.sourceforge.plantuml.command.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexLeaf;
-import net.sourceforge.plantuml.command.regex.RegexResult;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.LineLocation;
 
 public class CommandEndSwitch extends SingleLineCommand2<ActivityDiagram3> {

src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndif3.java

@@ -38,10 +38,10 @@ package net.sourceforge.plantuml.activitydiagram3.command;
 import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.command.SingleLineCommand2;
-import net.sourceforge.plantuml.command.regex.IRegex;
+import net.sourceforge.plantuml.regex.IRegex;
-import net.sourceforge.plantuml.command.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexConcat;
-import net.sourceforge.plantuml.command.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexLeaf;
-import net.sourceforge.plantuml.command.regex.RegexResult;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.LineLocation;
 
 public class CommandEndif3 extends SingleLineCommand2<ActivityDiagram3> {

src/net/sourceforge/plantuml/activitydiagram3/command/CommandFork3.java

@@ -38,10 +38,10 @@ package net.sourceforge.plantuml.activitydiagram3.command;
 import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.command.SingleLineCommand2;
-import net.sourceforge.plantuml.command.regex.IRegex;
+import net.sourceforge.plantuml.regex.IRegex;
-import net.sourceforge.plantuml.command.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexConcat;
-import net.sourceforge.plantuml.command.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexLeaf;
-import net.sourceforge.plantuml.command.regex.RegexResult;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.LineLocation;
 
 public class CommandFork3 extends SingleLineCommand2<ActivityDiagram3> {

src/net/sourceforge/plantuml/activitydiagram3/command/CommandForkAgain3.java

@@ -38,10 +38,10 @@ package net.sourceforge.plantuml.activitydiagram3.command;
 import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.command.SingleLineCommand2;
-import net.sourceforge.plantuml.command.regex.IRegex;
+import net.sourceforge.plantuml.regex.IRegex;
-import net.sourceforge.plantuml.command.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexConcat;
-import net.sourceforge.plantuml.command.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexLeaf;
-import net.sourceforge.plantuml.command.regex.RegexResult;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.LineLocation;
 
 public class CommandForkAgain3 extends SingleLineCommand2<ActivityDiagram3> {

src/net/sourceforge/plantuml/activitydiagram3/command/CommandForkEnd3.java

@@ -39,11 +39,11 @@ import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3;
 import net.sourceforge.plantuml.activitydiagram3.ForkStyle;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.command.SingleLineCommand2;
-import net.sourceforge.plantuml.command.regex.IRegex;
+import net.sourceforge.plantuml.regex.IRegex;
-import net.sourceforge.plantuml.command.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexConcat;
-import net.sourceforge.plantuml.command.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexLeaf;
-import net.sourceforge.plantuml.command.regex.RegexOr;
+import net.sourceforge.plantuml.regex.RegexOr;
-import net.sourceforge.plantuml.command.regex.RegexResult;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.LineLocation;
 
 public class CommandForkEnd3 extends SingleLineCommand2<ActivityDiagram3> {

src/net/sourceforge/plantuml/activitydiagram3/command/CommandGoto.java

@@ -38,10 +38,10 @@ package net.sourceforge.plantuml.activitydiagram3.command;
 import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.command.SingleLineCommand2;
-import net.sourceforge.plantuml.command.regex.IRegex;
+import net.sourceforge.plantuml.regex.IRegex;
-import net.sourceforge.plantuml.command.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexConcat;
-import net.sourceforge.plantuml.command.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexLeaf;
-import net.sourceforge.plantuml.command.regex.RegexResult;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.LineLocation;
 
 public class CommandGoto extends SingleLineCommand2<ActivityDiagram3> {

src/net/sourceforge/plantuml/activitydiagram3/command/CommandGroupEnd3.java

@@ -38,10 +38,10 @@ package net.sourceforge.plantuml.activitydiagram3.command;
 import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.command.SingleLineCommand2;
-import net.sourceforge.plantuml.command.regex.IRegex;
+import net.sourceforge.plantuml.regex.IRegex;
-import net.sourceforge.plantuml.command.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexConcat;
-import net.sourceforge.plantuml.command.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexLeaf;
-import net.sourceforge.plantuml.command.regex.RegexResult;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.LineLocation;
 
 public class CommandGroupEnd3 extends SingleLineCommand2<ActivityDiagram3> {

src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf2.java

@@ -35,21 +35,21 @@
  */
 package net.sourceforge.plantuml.activitydiagram3.command;
 
-import net.sourceforge.plantuml.Url;
-import net.sourceforge.plantuml.UrlBuilder;
-import net.sourceforge.plantuml.UrlMode;
 import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3;
 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.RegexOptional;
-import net.sourceforge.plantuml.command.regex.RegexResult;
 import net.sourceforge.plantuml.cucadiagram.Display;
-import net.sourceforge.plantuml.graphic.color.ColorParser;
+import net.sourceforge.plantuml.klimt.color.ColorParser;
-import net.sourceforge.plantuml.ugraphic.color.HColor;
+import net.sourceforge.plantuml.klimt.color.HColor;
-import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException;
+import net.sourceforge.plantuml.klimt.color.NoSuchColorException;
+import net.sourceforge.plantuml.regex.IRegex;
+import net.sourceforge.plantuml.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexOptional;
+import net.sourceforge.plantuml.regex.RegexResult;
+import net.sourceforge.plantuml.url.Url;
+import net.sourceforge.plantuml.url.UrlBuilder;
+import net.sourceforge.plantuml.url.UrlMode;
 import net.sourceforge.plantuml.utils.LineLocation;
 
 public class CommandIf2 extends SingleLineCommand2<ActivityDiagram3> {

src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf4.java

@@ -38,14 +38,14 @@ package net.sourceforge.plantuml.activitydiagram3.command;
 import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3;
 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.cucadiagram.Display;
-import net.sourceforge.plantuml.graphic.color.ColorParser;
+import net.sourceforge.plantuml.klimt.color.ColorParser;
-import net.sourceforge.plantuml.ugraphic.color.HColor;
+import net.sourceforge.plantuml.klimt.color.HColor;
-import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException;
+import net.sourceforge.plantuml.klimt.color.NoSuchColorException;
+import net.sourceforge.plantuml.regex.IRegex;
+import net.sourceforge.plantuml.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.LineLocation;
 
 public class CommandIf4 extends SingleLineCommand2<ActivityDiagram3> {

src/net/sourceforge/plantuml/activitydiagram3/command/CommandIfLegacy1.java

@@ -38,11 +38,11 @@ package net.sourceforge.plantuml.activitydiagram3.command;
 import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3;
 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.cucadiagram.Display;
+import net.sourceforge.plantuml.regex.IRegex;
+import net.sourceforge.plantuml.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.LineLocation;
 
 public class CommandIfLegacy1 extends SingleLineCommand2<ActivityDiagram3> {

src/net/sourceforge/plantuml/activitydiagram3/command/CommandKill3.java

@@ -38,10 +38,10 @@ package net.sourceforge.plantuml.activitydiagram3.command;
 import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.command.SingleLineCommand2;
-import net.sourceforge.plantuml.command.regex.IRegex;
+import net.sourceforge.plantuml.regex.IRegex;
-import net.sourceforge.plantuml.command.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexConcat;
-import net.sourceforge.plantuml.command.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexLeaf;
-import net.sourceforge.plantuml.command.regex.RegexResult;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.LineLocation;
 
 public class CommandKill3 extends SingleLineCommand2<ActivityDiagram3> {

src/net/sourceforge/plantuml/activitydiagram3/command/CommandLabel.java

@@ -38,10 +38,10 @@ package net.sourceforge.plantuml.activitydiagram3.command;
 import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
 import net.sourceforge.plantuml.command.SingleLineCommand2;
-import net.sourceforge.plantuml.command.regex.IRegex;
+import net.sourceforge.plantuml.regex.IRegex;
-import net.sourceforge.plantuml.command.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexConcat;
-import net.sourceforge.plantuml.command.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexLeaf;
-import net.sourceforge.plantuml.command.regex.RegexResult;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.LineLocation;
 
 public class CommandLabel extends SingleLineCommand2<ActivityDiagram3> {

src/net/sourceforge/plantuml/activitydiagram3/command/CommandLink3.java

@@ -38,13 +38,13 @@ package net.sourceforge.plantuml.activitydiagram3.command;
 import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3;
 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.graphic.Rainbow;
-import net.sourceforge.plantuml.ugraphic.color.HColor;
+import net.sourceforge.plantuml.klimt.color.HColor;
-import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException;
+import net.sourceforge.plantuml.klimt.color.NoSuchColorException;
+import net.sourceforge.plantuml.regex.IRegex;
+import net.sourceforge.plantuml.regex.RegexConcat;
+import net.sourceforge.plantuml.regex.RegexLeaf;
+import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.utils.LineLocation;
 
 public class CommandLink3 extends SingleLineCommand2<ActivityDiagram3> {