version 1.2019.9

pom.xml

@@ -30,7 +30,8 @@
 	Script Author: Julien Eluard
 	
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>net.sourceforge.plantuml</groupId>

skin/debug.skin

@@ -1,4 +1,4 @@
-style root {
+root {
   FontName SansSerif
   HyperLinkColor red
   FontColor green
@@ -13,57 +13,57 @@ style root {
   Shadowing 0.0
 }
 
-style stereotype {
+stereotype {
   FontColor blue
   FontSize 8
   FontStyle bold
 }
 
-style title {
+title {
   HorizontalAlignment right
   FontSize 24
   FontColor blue
 }
 
-style header {
+header {
   HorizontalAlignment center
   FontSize 26
   FontColor purple
 }
 
-style footer {
+footer {
   HorizontalAlignment left
   FontSize 28
   FontColor red
 }
 
-style legend {
+legend {
   FontSize 30
   BackGroundColor yellow
   Margin 30
   Padding 50
 }
 
-style caption {
+caption {
   FontSize 32
 }
 
 
-style element {
+element {
   BackGroundColor #CEFEFE
 }
 
-style sequenceDiagram {
+sequenceDiagram {
 }
 
-style classDiagram {
+classDiagram {
 }
 
-style activityDiagram {
+activityDiagram {
 }
 
 
-style group {
+group {
   LineThickness 3.5
   BackGroundColor MistyRose
   LineColor DarkOrange
@@ -73,7 +73,7 @@ style group {
   FontColor red
 }
 
-style groupHeader {
+groupHeader {
   BackGroundColor tan
   LineThickness 0.5
   LineColor yellow
@@ -83,15 +83,15 @@ style groupHeader {
   FontColor blue
 }
 
-style lifeLine {
+lifeLine {
   BackGroundColor gold
 }
 
-style destroy {
+destroy {
   LineColor red
 }
 
-style reference {
+reference {
   LineColor red
   FontSize 10
   FontStyle bold
@@ -100,7 +100,7 @@ style reference {
   HorizontalAlignment right
 }
 
-style box {
+box {
   LineThickness 0.1
   LineColor FireBrick
   BackGroundColor PowderBlue
@@ -110,7 +110,7 @@ style box {
   FontColor Maroon
 }
 
-style separator {
+separator {
   LineColor red
   BackGroundColor green
   
@@ -119,51 +119,103 @@ style separator {
   FontColor white
 }
 
-style delay {
+delay {
   FontSize 22
   FontStyle italic
 }
 
-style participant {
+participant {
   LineThickness 2.5
 }
 
-style actor {
+actor {
   LineThickness 0.5
 }
 
-style boundary {
+boundary {
   LineThickness 1.5
 }
 
-style control {
+control {
   LineThickness 1.5
 }
 
-style entity {
+entity {
   LineThickness 1.5
 }
 
-style queue {
+queue {
   LineThickness 1.5
 }
 
-style database {
+database {
   LineThickness 1.5
 }
 
-style collections {
+collections {
   LineThickness 1.5
 }
 
-style message {
+arrow {
+  FontSize 13
+  LineColor Lime
 }
 
-style note {
+note {
   BackGroundColor GoldenRod
 }
 
-style swimlane {
+diamond {
+}
+
+swimlane {
+}
+
+activity {
+  BackgroundColor #33668E
+  BorderColor #33668E
+  FontColor #888
+  FontName arial
 }
 
 
+activityDiagram {
+	diamond {
+	  BackgroundColor #dae4f1
+	  BorderColor #33668E
+	  FontColor red
+	  FontName arial
+	  FontSize 5
+	}
+	arrow {
+	  FontColor gold
+	  FontName arial
+	  FontSize 15
+	}
+	partition {
+	  LineColor red
+	  FontColor green
+	  RoundCorner 30
+	  BackColor PeachPuff
+	}
+	note {
+	  FontColor Blue
+	  LineColor yellow
+	}
+}
+
+circle {
+  LineColor yellow
+}
+
+activityBar {
+  LineColor lightGreen
+}
+
+mindmapDiagram {
+    Padding 10
+    Margin 10
+}
+
+node {
+}

skin/plantuml.skin

@@ -1,6 +1,6 @@
-style root {
+root {
   FontName SansSerif
-  HyperLinkColor red
+  HyperLinkColor blue
   FontColor black
   FontSize 14
   FontStyle plain
@@ -13,11 +13,11 @@ style root {
   Shadowing 0.0
 }
 
-style stereotype {
+stereotype {
   FontStyle italic
 }
 
-style title {
+title {
   HorizontalAlignment center
   FontSize 14
   FontStyle bold
@@ -27,19 +27,23 @@ style title {
   BackGroundColor none
 }
 
-style header {
+header {
+  HorizontalAlignment right
+  FontSize 10
+  FontColor #888888
+  BackGroundColor none
+  LineColor none
+}
+
+footer {
   HorizontalAlignment center
   FontSize 10
   FontColor #888888
+  BackGroundColor none
+  LineColor none
 }
 
-style footer {
+legend {
-  HorizontalAlignment left
-  FontSize 10
-  FontColor #888888
-}
-
-style legend {
   LineColor black
   BackGroundColor #DDDDDD
   FontSize 14
@@ -48,7 +52,7 @@ style legend {
   Margin 8
 }
 
-style caption {
+caption {
   HorizontalAlignment center
   FontSize 14
   Padding 0
@@ -58,21 +62,19 @@ style caption {
 }
 
 
-style element {
+element {
   Shadowing 4.0
 }
 
-style sequenceDiagram {
+sequenceDiagram {
 }
 
-style classDiagram {
+classDiagram {
 }
 
-style activityDiagram {
-}
 
-style group {
+group {
-  BackGroundColor none
+  BackGroundColor white
   LineColor black
   LineThickness 2.0
   FontSize 11
@@ -80,7 +82,7 @@ style group {
   FontStyle bold
 }
 
-style groupHeader {
+groupHeader {
   BackGroundColor #EEEEEE
   LineColor black
 
@@ -88,30 +90,38 @@ style groupHeader {
   FontStyle bold
 }
 
-style lifeLine {
+lifeLine {
-  BackGroundColor none
+  BackGroundColor white
 }
 
-style destroy {
+destroy {
 }
 
-style reference {
+reference {
-  LineColor red
+  FontSize 12
-  FontSize 10
+  LineColor black
+  BackGroundColor while
+  LineThickness 2.0
+  HorizontalAlignment center
+}
+
+referenceHeader {
+  LineColor black
+  BackGroundColor #EEEEEE
+  FontColor black
+  FontSize 13
   FontStyle bold
-  FontColor blue
+  LineThickness 2.0
-  BackGroundColor gold
-  HorizontalAlignment right
 }
 
-style box {
+box {
   BackGroundColor #DDDDDD
 
   FontSize 13
   FontStyle bold
 }
 
-style separator {
+separator {
   LineColor black
   LineThickness 2.0
   BackGroundColor #EEEEEE
@@ -120,45 +130,116 @@ style separator {
   FontStyle bold
 }
 
-style delay {
+delay {
-  FontSize 22
+  FontSize 11
-  FontStyle italic
+  FontStyle plain
+  HorizontalAlignment center
 }
 
-style participant {
+participant {
   LineThickness 1.5
 }
 
-style actor {
+actor {
   LineThickness 2.0
 }
 
-style boundary {
+boundary {
 }
 
-style control {
+control {
 }
 
-style entity {
+entity {
 }
 
-style queue {
+queue {
 }
 
-style database {
+database {
 }
 
-style collections {
+collections {
 }
 
-style swimlane {
+swimlane {
+  BackGroundColor none
+  LineColor black
+  LineThickness 2
+  FontSize 18
 }
 
-style message {
+diamond {
+  Shadowing 3.0
+}
+
+arrow {
   FontSize 13
 }
 
-style note {
+note {
   FontSize 13
   BackGroundColor #FBFB77
 }
+
+partition {
+}
+
+circle {
+}
+
+mindmapDiagram {
+}
+
+mindmapDiagram {
+	node {
+	    Padding 10
+	    Margin 10
+	    RoundCorner 25
+	    LineThickness 1.5
+	}
+	arrow {
+	    LineThickness 1.0
+	}
+}
+
+
+wbsDiagram {
+    Padding 10
+    Margin 15
+    RoundCorner 0
+    LineThickness 1.5
+    FontSize 12
+}
+
+activityDiagram {
+  Shadowing 3.0
+}
+
+activityDiagram {
+	activity {
+	    LineThickness 1.5
+	    Padding 10
+	    FontSize 12
+	    RoundCorner 25
+	}
+	partition {
+	    LineColor black
+	    BackgroundColor none
+	}
+	diamond {
+	    FontSize 11
+	}
+	arrow {
+	    FontSize 11
+	}
+}
+
+activityBar {
+	LineColor black
+}
+
+circle {
+	LineColor black
+	Shadowing 3.0
+}

src/net/sourceforge/plantuml/AnnotatedWorker.java

@@ -54,7 +54,7 @@ import net.sourceforge.plantuml.graphic.TextBlockUtils;
 import net.sourceforge.plantuml.graphic.USymbol;
 import net.sourceforge.plantuml.style.SName;
 import net.sourceforge.plantuml.style.Style;
-import net.sourceforge.plantuml.style.StyleDefinition;
+import net.sourceforge.plantuml.style.StyleSignature;
 import net.sourceforge.plantuml.svek.DecorateEntityImage;
 import net.sourceforge.plantuml.svek.TextBlockBackcolored;
 import net.sourceforge.plantuml.ugraphic.MinMax;
@@ -82,6 +82,10 @@ public class AnnotatedWorker {
 		return (TextBlockBackcolored) result;
 	}
 
+	public boolean hasMainFrame() {
+		return annotated.getMainFrame() != null;
+	}
+
 	public TextBlock addFrame(final TextBlock original) {
 		final Display mainFrame = annotated.getMainFrame();
 		if (mainFrame == null) {
@@ -94,33 +98,37 @@ public class AnnotatedWorker {
 		final double y2 = 10;
 
 		final SymbolContext symbolContext = new SymbolContext(getSkinParam().getBackgroundColor(), HtmlColorUtils.BLACK)
-				.withShadow(getSkinParam().shadowing(null));
+				.withShadow(getSkinParam().shadowing(null) ? 3 : 0);
+		final MinMax originalMinMax = TextBlockUtils.getMinMax(original, stringBounder);
 		final TextBlock title = mainFrame.create(new FontConfiguration(getSkinParam(), FontParam.CAPTION, null),
 				HorizontalAlignment.CENTER, getSkinParam());
 		final Dimension2D dimTitle = title.calculateDimension(stringBounder);
-		final Dimension2D dimOriginal = original.calculateDimension(stringBounder);
+		// final Dimension2D dimOriginal = original.calculateDimension(stringBounder);
-		final double width = x1 + Math.max(dimOriginal.getWidth(), dimTitle.getWidth()) + x2;
+		final double width = x1 + Math.max(originalMinMax.getWidth(), dimTitle.getWidth()) + x2;
-		final double height = dimTitle.getHeight() + y1 + dimOriginal.getHeight() + y2;
+		final double height = dimTitle.getHeight() + y1 + originalMinMax.getHeight() + y2;
-		final TextBlock result = USymbol.FRAME.asBig(title, HorizontalAlignment.LEFT, TextBlockUtils.empty(0, 0),
+		final TextBlock frame = USymbol.FRAME.asBig(title, HorizontalAlignment.LEFT, TextBlockUtils.empty(0, 0), width,
-				width, height, symbolContext, skinParam.getStereotypeAlignment());
+				height, symbolContext, skinParam.getStereotypeAlignment());
 
 		return new TextBlockBackcolored() {
 
 			public void drawU(UGraphic ug) {
-				result.drawU(ug);
+				frame.drawU(ug.apply(new UTranslate(originalMinMax.getMinX(), 0)));
 				original.drawU(ug.apply(new UTranslate(x1, y1 + dimTitle.getHeight())));
+				// original.drawU(ug);
 			}
 
 			public MinMax getMinMax(StringBounder stringBounder) {
-				return TextBlockUtils.getMinMax(result, stringBounder);
+				return TextBlockUtils.getMinMax(this, stringBounder);
 			}
 
 			public Rectangle2D getInnerPosition(String member, StringBounder stringBounder, InnerStrategy strategy) {
-				return result.getInnerPosition(member, stringBounder, strategy);
+				final Rectangle2D rect = original.getInnerPosition(member, stringBounder, strategy);
+				return new Rectangle2D.Double(rect.getX() + x1, rect.getY() + y1 + dimTitle.getHeight(),
+						rect.getWidth(), rect.getHeight());
 			}
 
 			public Dimension2D calculateDimension(StringBounder stringBounder) {
-				return result.calculateDimension(stringBounder);
+				return original.calculateDimension(stringBounder);
 			}
 
 			public HtmlColor getBackcolor() {
@@ -158,7 +166,7 @@ public class AnnotatedWorker {
 			return TextBlockUtils.empty(0, 0);
 		}
 		if (SkinParam.USE_STYLES()) {
-			final Style style = StyleDefinition.of(SName.root, SName.caption).getMergedStyle(
+			final Style style = StyleSignature.of(SName.root, SName.caption).getMergedStyle(
 					skinParam.getCurrentStyleBuilder());
 			return style.createTextBlockBordered(caption.getDisplay(), skinParam.getIHtmlColorSet(), skinParam);
 		}
@@ -171,13 +179,18 @@ public class AnnotatedWorker {
 		if (title.isNull()) {
 			return original;
 		}
-		ISkinParam skinParam = getSkinParam();
-		// if (SkinParam.USE_STYLES()) {
-		// throw new UnsupportedOperationException();
-		// }
-		final FontConfiguration fontConfiguration = new FontConfiguration(skinParam, FontParam.TITLE, null);
 
-		final TextBlock block = TextBlockUtils.title(fontConfiguration, title.getDisplay(), skinParam);
+		final TextBlock block;
+		if (SkinParam.USE_STYLES()) {
+			final Style style = StyleSignature.of(SName.root, SName.title).getMergedStyle(
+					skinParam.getCurrentStyleBuilder());
+			block = style.createTextBlockBordered(title.getDisplay(), skinParam.getIHtmlColorSet(), skinParam);
+		} else {
+			final ISkinParam skinParam = getSkinParam();
+			final FontConfiguration fontConfiguration = new FontConfiguration(skinParam, FontParam.TITLE, null);
+			block = TextBlockUtils.title(fontConfiguration, title.getDisplay(), skinParam);
+		}
+
 		return DecorateEntityImage.addTop(original, block, HorizontalAlignment.CENTER);
 	}
 

src/net/sourceforge/plantuml/BlockUml.java

@@ -113,7 +113,7 @@ public class BlockUml {
 			final TimLoader timLoader = new TimLoader(mode.getImportedFiles(), defines, mode.getCharset(),
 					(DefinitionsContainer) mode);
 			timLoader.load(strings);
-			this.data = timLoader.getResult();
+			this.data = timLoader.getResultList();
 			this.debug = timLoader.getDebug();
 			this.preprocessorError = timLoader.isPreprocessorError();
 		} else {

src/net/sourceforge/plantuml/FontParam.java

@@ -39,7 +39,7 @@ import java.awt.Font;
 
 import net.sourceforge.plantuml.graphic.FontConfiguration;
 import net.sourceforge.plantuml.style.SName;
-import net.sourceforge.plantuml.style.StyleDefinition;
+import net.sourceforge.plantuml.style.StyleSignature;
 
 interface FontParamConstant {
 	String FAMILY = "SansSerif";
@@ -181,15 +181,15 @@ public enum FontParam {
 		return new FontConfiguration(skinParam, this, null);
 	}
 
-	public StyleDefinition getStyleDefinition() {
+	public StyleSignature getStyleDefinition() {
 		if (this == FOOTER) {
-			return StyleDefinition.of(SName.root, SName.footer);
+			return StyleSignature.of(SName.root, SName.footer);
 		}
 		if (this == HEADER) {
-			return StyleDefinition.of(SName.root, SName.header);
+			return StyleSignature.of(SName.root, SName.header);
 		}
 		if (this == TITLE) {
-			return StyleDefinition.of(SName.root, SName.title);
+			return StyleSignature.of(SName.root, SName.title);
 		}
 		System.err.println("Warning " + this);
 		return null;

src/net/sourceforge/plantuml/ISkinParam.java

@@ -35,6 +35,8 @@
  */
 package net.sourceforge.plantuml;
 
+import java.util.Collection;
+
 import net.sourceforge.plantuml.cucadiagram.Rankdir;
 import net.sourceforge.plantuml.cucadiagram.Stereotype;
 import net.sourceforge.plantuml.cucadiagram.dot.DotSplines;
@@ -177,4 +179,11 @@ public interface ISkinParam extends ISkinSimple {
 
 	public void muteStyle(Style modifiedStyle);
 
+	public Collection<String> getAllSpriteNames();
+	
+	public String getDefaultSkin();
+	
+	public void setDefaultSkin(String newSkin);
+
+
 }

src/net/sourceforge/plantuml/PSystemBuilder.java

@@ -38,9 +38,6 @@ package net.sourceforge.plantuml;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
 
 import net.sourceforge.plantuml.acearth.PSystemXearthFactory;
 import net.sourceforge.plantuml.activitydiagram.ActivityDiagramFactory;
@@ -48,7 +45,6 @@ import net.sourceforge.plantuml.activitydiagram3.ActivityDiagramFactory3;
 import net.sourceforge.plantuml.api.PSystemFactory;
 import net.sourceforge.plantuml.bpm.BpmDiagramFactory;
 import net.sourceforge.plantuml.classdiagram.ClassDiagramFactory;
-import net.sourceforge.plantuml.command.UmlDiagramFactory;
 import net.sourceforge.plantuml.command.regex.RegexConcat;
 import net.sourceforge.plantuml.compositediagram.CompositeDiagramFactory;
 import net.sourceforge.plantuml.core.Diagram;
@@ -83,11 +79,12 @@ import net.sourceforge.plantuml.oregon.PSystemOregonFactory;
 import net.sourceforge.plantuml.project3.GanttDiagramFactory;
 import net.sourceforge.plantuml.salt.PSystemSaltFactory;
 import net.sourceforge.plantuml.sequencediagram.SequenceDiagramFactory;
+import net.sourceforge.plantuml.sprite.ListSpriteDiagramFactory;
+import net.sourceforge.plantuml.sprite.PSystemListInternalSpritesFactory;
 import net.sourceforge.plantuml.statediagram.StateDiagramFactory;
 import net.sourceforge.plantuml.stats.StatsUtilsIncrement;
 import net.sourceforge.plantuml.sudoku.PSystemSudokuFactory;
 import net.sourceforge.plantuml.timingdiagram.TimingDiagramFactory;
-import net.sourceforge.plantuml.ugraphic.sprite.PSystemListInternalSpritesFactory;
 import net.sourceforge.plantuml.version.License;
 import net.sourceforge.plantuml.version.PSystemLicenseFactory;
 import net.sourceforge.plantuml.version.PSystemVersionFactory;
@@ -148,6 +145,7 @@ public class PSystemBuilder {
 		final List<PSystemFactory> factories = new ArrayList<PSystemFactory>();
 		factories.add(new PSystemWelcomeFactory());
 		factories.add(new PSystemColorsFactory());
+		factories.add(new ListSpriteDiagramFactory(skinParam));
 		factories.add(new SequenceDiagramFactory(skinParam));
 		factories.add(new ClassDiagramFactory(skinParam));
 		factories.add(new ActivityDiagramFactory(skinParam));

src/net/sourceforge/plantuml/Run.java

@@ -66,12 +66,12 @@ import net.sourceforge.plantuml.objectdiagram.ObjectDiagramFactory;
 import net.sourceforge.plantuml.png.MetadataTag;
 import net.sourceforge.plantuml.preproc.Stdlib;
 import net.sourceforge.plantuml.sequencediagram.SequenceDiagramFactory;
+import net.sourceforge.plantuml.sprite.SpriteGrayLevel;
+import net.sourceforge.plantuml.sprite.SpriteUtils;
 import net.sourceforge.plantuml.statediagram.StateDiagramFactory;
 import net.sourceforge.plantuml.stats.StatsUtils;
 import net.sourceforge.plantuml.swing.MainWindow2;
 import net.sourceforge.plantuml.syntax.LanguageDescriptor;
-import net.sourceforge.plantuml.ugraphic.sprite.SpriteGrayLevel;
-import net.sourceforge.plantuml.ugraphic.sprite.SpriteUtils;
 import net.sourceforge.plantuml.utils.Cypher;
 import net.sourceforge.plantuml.version.Version;
 
@@ -479,10 +479,18 @@ public class Run {
 		}
 		final ISourceFileReader sourceFileReader;
 		if (option.getOutputFile() == null) {
-			sourceFileReader = new SourceFileReader(option.getDefaultDefines(f), f, option.getOutputDir(),
+			File outputDir = option.getOutputDir();
+			if (outputDir != null && outputDir.getPath().endsWith("$")) {
+				final String path = outputDir.getPath();
+				outputDir = new File(path.substring(0, path.length() - 1)).getAbsoluteFile();
+				sourceFileReader = new SourceFileReaderCopyCat(option.getDefaultDefines(f), f, outputDir,
 						option.getConfig(), option.getCharset(), option.getFileFormatOption());
 			} else {
-			sourceFileReader = new SourceFileReader2(option.getDefaultDefines(f), f, option.getOutputFile(),
+				sourceFileReader = new SourceFileReader(option.getDefaultDefines(f), f, outputDir, option.getConfig(),
+						option.getCharset(), option.getFileFormatOption());
+			}
+		} else {
+			sourceFileReader = new SourceFileReaderHardFile(option.getDefaultDefines(f), f, option.getOutputFile(),
 					option.getConfig(), option.getCharset(), option.getFileFormatOption());
 		}
 		sourceFileReader.setCheckMetadata(option.isCheckMetadata());

src/net/sourceforge/plantuml/SkinParam.java

@@ -64,6 +64,8 @@ import net.sourceforge.plantuml.graphic.SkinParameter;
 import net.sourceforge.plantuml.graphic.color.Colors;
 import net.sourceforge.plantuml.skin.ArrowDirection;
 import net.sourceforge.plantuml.skin.Padder;
+import net.sourceforge.plantuml.sprite.Sprite;
+import net.sourceforge.plantuml.sprite.SpriteImage;
 import net.sourceforge.plantuml.style.FromSkinparamToStyle;
 import net.sourceforge.plantuml.style.Style;
 import net.sourceforge.plantuml.style.StyleBuilder;
@@ -78,24 +80,77 @@ import net.sourceforge.plantuml.ugraphic.ColorMapperReverse;
 import net.sourceforge.plantuml.ugraphic.ColorOrder;
 import net.sourceforge.plantuml.ugraphic.UFont;
 import net.sourceforge.plantuml.ugraphic.UStroke;
-import net.sourceforge.plantuml.ugraphic.sprite.Sprite;
-import net.sourceforge.plantuml.ugraphic.sprite.SpriteImage;
 
 public class SkinParam implements ISkinParam {
 
-	public static final String DEFAULT_STYLE = "plantuml.skin";
+	// private String skin = "debug.skin";
 
-	// public static final String DEFAULT_STYLE = "debug.skin";
+	private String skin = "plantuml.skin";
-
-	static public boolean USE_STYLES() {
-		return USE_STYLE2.get();
-	}
-
-	private static ThreadLocal<Boolean> USE_STYLE2 = new ThreadLocal<Boolean>();
 
 	private SkinParam(UmlDiagramType type) {
 		USE_STYLE2.set(false);
 		this.type = type;
+		if (type == UmlDiagramType.MINDMAP) {
+			USE_STYLE2.set(true);
+		}
+		if (type == UmlDiagramType.WBS) {
+			USE_STYLE2.set(true);
+		}
+		// if (type == UmlDiagramType.SEQUENCE) {
+		// skin = "debug.skin";
+		// USE_STYLE2.set(true);
+		// }
+		// if (type == UmlDiagramType.ACTIVITY) {
+		// skin = "debug.skin";
+		// USE_STYLE2.set(true);
+		// }
+	}
+
+	private StyleBuilder styleBuilder;
+
+	public StyleBuilder getCurrentStyleBuilder() {
+		if (styleBuilder == null && SkinParam.USE_STYLES()) {
+			try {
+				this.styleBuilder = getCurrentStyleBuilderInternal();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+		return styleBuilder;
+	}
+
+	public void muteStyle(Style modifiedStyle) {
+		if (SkinParam.USE_STYLES()) {
+			styleBuilder = getCurrentStyleBuilder().muteStyle(modifiedStyle);
+		}
+	}
+
+	public String getDefaultSkin() {
+		return skin;
+	}
+
+	public void setDefaultSkin(String newSkin) {
+		this.skin = newSkin;
+	}
+
+	public StyleBuilder getCurrentStyleBuilderInternal() throws IOException {
+		final StyleLoader tmp = new StyleLoader(this);
+		StyleBuilder result = tmp.loadSkin(this.getDefaultSkin());
+		if (result == null) {
+			result = tmp.loadSkin("plantuml.skin");
+		}
+
+		return result;
+	}
+
+	private static ThreadLocal<Boolean> USE_STYLE2 = new ThreadLocal<Boolean>();
+
+	static public boolean USE_STYLES() {
+		final Boolean result = USE_STYLE2.get();
+		if (result == null) {
+			return false;
+		}
+		return result;
 	}
 
 	private static final String stereoPatternString = "\\<\\<(.*?)\\>\\>";
@@ -696,6 +751,10 @@ public class SkinParam implements ISkinParam {
 
 	private final Map<String, Sprite> sprites = new HashMap<String, Sprite>();
 
+	public Collection<String> getAllSpriteNames() {
+		return Collections.unmodifiableCollection(new TreeSet<String>(sprites.keySet()));
+	}
+
 	public void addSprite(String name, Sprite sprite) {
 		sprites.put(name, sprite);
 	}
@@ -1123,22 +1182,4 @@ public class SkinParam implements ISkinParam {
 				.withBorderColor(border).withRoundCorner(roundCorner);
 	}
 
-	private StyleBuilder styleBuilder;
-
-	public StyleBuilder getCurrentStyleBuilder() {
-		if (styleBuilder == null && SkinParam.USE_STYLES()) {
-			try {
-				this.styleBuilder = StyleLoader.mainStyle(this);
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-		return styleBuilder;
-	}
-
-	public void muteStyle(Style modifiedStyle) {
-		if (SkinParam.USE_STYLES()) {
-			styleBuilder = getCurrentStyleBuilder().muteStyle(modifiedStyle);
-		}
-	}
 }

src/net/sourceforge/plantuml/SkinParamColors.java

@@ -42,6 +42,10 @@ import net.sourceforge.plantuml.graphic.color.Colors;
 
 public class SkinParamColors extends SkinParamDelegator {
 
+	public final Colors getColors() {
+		return colors;
+	}
+
 	final private Colors colors;
 
 	public SkinParamColors(ISkinParam skinParam, Colors colors) {

src/net/sourceforge/plantuml/SkinParamDelegator.java

@@ -35,6 +35,7 @@
  */
 package net.sourceforge.plantuml;
 
+import java.util.Collection;
 import java.util.Map;
 
 import net.sourceforge.plantuml.cucadiagram.Rankdir;
@@ -47,6 +48,7 @@ import net.sourceforge.plantuml.graphic.SkinParameter;
 import net.sourceforge.plantuml.graphic.color.Colors;
 import net.sourceforge.plantuml.skin.ArrowDirection;
 import net.sourceforge.plantuml.skin.Padder;
+import net.sourceforge.plantuml.sprite.Sprite;
 import net.sourceforge.plantuml.style.Style;
 import net.sourceforge.plantuml.style.StyleBuilder;
 import net.sourceforge.plantuml.svek.ConditionEndStyle;
@@ -55,7 +57,6 @@ import net.sourceforge.plantuml.svek.PackageStyle;
 import net.sourceforge.plantuml.ugraphic.ColorMapper;
 import net.sourceforge.plantuml.ugraphic.UFont;
 import net.sourceforge.plantuml.ugraphic.UStroke;
-import net.sourceforge.plantuml.ugraphic.sprite.Sprite;
 
 public class SkinParamDelegator implements ISkinParam {
 
@@ -342,4 +343,16 @@ public class SkinParamDelegator implements ISkinParam {
 		skinParam.muteStyle(modifiedStyle);
 	}
 
+	public Collection<String> getAllSpriteNames() {
+		return skinParam.getAllSpriteNames();
+	}
+
+	public String getDefaultSkin() {
+		return skinParam.getDefaultSkin();
+	}
+
+	public void setDefaultSkin(String newFileName) {
+		skinParam.setDefaultSkin(newFileName);
+	}
+
 }

src/net/sourceforge/plantuml/SourceFileReaderCopyCat.java

@@ -0,0 +1,84 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2020, Arnaud Roques
+ *
+ * Project Info:  http://plantuml.com
+ * 
+ * If you like this project or if you find it useful, you can support us at:
+ * 
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ * 
+ * This file is part of PlantUML.
+ *
+ * PlantUML is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlantUML distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+ * USA.
+ *
+ *
+ * Original Author:  Arnaud Roques
+ *
+ *
+ */
+package net.sourceforge.plantuml;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+
+import net.sourceforge.plantuml.preproc.Defines;
+import net.sourceforge.plantuml.preproc.FileWithSuffix;
+
+public class SourceFileReaderCopyCat extends SourceFileReaderAbstract implements ISourceFileReader {
+
+	public SourceFileReaderCopyCat(Defines defines, final File file, File outputDirectory, List<String> config,
+			String charset, FileFormatOption fileFormatOption) throws IOException {
+		this.file = file;
+		this.fileFormatOption = fileFormatOption;
+		if (file.exists() == false) {
+			throw new IllegalArgumentException();
+		}
+		final String path = file.getParentFile().getPath();
+		// System.err.println("SourceFileReaderCopyCat::path=" + path);
+		// System.err.println("SourceFileReaderCopyCat::outputDirectory=" + outputDirectory);
+		this.outputDirectory = new File(outputDirectory, path).getAbsoluteFile();
+		if (outputDirectory.exists() == false) {
+			outputDirectory.mkdirs();
+		}
+		// System.err.println("SourceFileReaderCopyCat=" + this.outputDirectory.getPath() + " "
+		// + this.outputDirectory.getAbsolutePath());
+		builder = new BlockUmlBuilder(config, charset, defines, getReader(charset), file.getAbsoluteFile()
+				.getParentFile(), FileWithSuffix.getFileName(file));
+	}
+
+	@Override
+	protected SuggestedFile getSuggestedFile(BlockUml blockUml) {
+		final String newName = blockUml.getFileOrDirname();
+		SuggestedFile suggested = null;
+		if (newName == null) {
+			suggested = SuggestedFile.fromOutputFile(new File(outputDirectory, file.getName()),
+					fileFormatOption.getFileFormat(), cpt++);
+		} else {
+			suggested = SuggestedFile.fromOutputFile(new File(outputDirectory, newName),
+					fileFormatOption.getFileFormat(), cpt++);
+		}
+		// System.err.println("SourceFileReaderCopyCat::suggested=" + suggested);
+		suggested.getParentFile().mkdirs();
+		return suggested;
+	}
+
+}

src/net/sourceforge/plantuml/SourceFileReaderHardFile.java

@@ -42,9 +42,9 @@ import java.util.List;
 import net.sourceforge.plantuml.preproc.Defines;
 import net.sourceforge.plantuml.preproc.FileWithSuffix;
 
-public class SourceFileReader2 extends SourceFileReaderAbstract implements ISourceFileReader {
+public class SourceFileReaderHardFile extends SourceFileReaderAbstract implements ISourceFileReader {
 
-	public SourceFileReader2(Defines defines, final File file, File outputFile, List<String> config, String charset,
+	public SourceFileReaderHardFile(Defines defines, final File file, File outputFile, List<String> config, String charset,
 			FileFormatOption fileFormatOption) throws IOException {
 		this.file = file;
 		this.fileFormatOption = fileFormatOption;
@@ -54,8 +54,9 @@ public class SourceFileReader2 extends SourceFileReaderAbstract implements ISour
 		}
 		FileSystem.getInstance().setCurrentDir(file.getAbsoluteFile().getParentFile());
 
-		builder = new BlockUmlBuilder(config, charset, defines, getReader(charset), file.getAbsoluteFile()
+		final File parentFile = file.getAbsoluteFile().getParentFile();
-				.getParentFile(), FileWithSuffix.getFileName(file));
+		builder = new BlockUmlBuilder(config, charset, defines, getReader(charset), parentFile,
+				FileWithSuffix.getFileName(file));
 	}
 
 	@Override

src/net/sourceforge/plantuml/SpriteContainer.java

@@ -35,7 +35,7 @@
  */
 package net.sourceforge.plantuml;
 
-import net.sourceforge.plantuml.ugraphic.sprite.Sprite;
+import net.sourceforge.plantuml.sprite.Sprite;
 
 public interface SpriteContainer {
 

src/net/sourceforge/plantuml/SpriteContainerEmpty.java

@@ -40,10 +40,10 @@ import java.util.Map;
 import net.sourceforge.plantuml.creole.CommandCreoleMonospaced;
 import net.sourceforge.plantuml.graphic.HtmlColorSetSimple;
 import net.sourceforge.plantuml.graphic.IHtmlColorSet;
+import net.sourceforge.plantuml.sprite.Sprite;
+import net.sourceforge.plantuml.sprite.SpriteImage;
 import net.sourceforge.plantuml.ugraphic.ColorMapper;
 import net.sourceforge.plantuml.ugraphic.ColorMapperIdentity;
-import net.sourceforge.plantuml.ugraphic.sprite.Sprite;
-import net.sourceforge.plantuml.ugraphic.sprite.SpriteImage;
 
 public class SpriteContainerEmpty implements SpriteContainer, ISkinSimple {
 

src/net/sourceforge/plantuml/StringLocated.java

@@ -49,7 +49,7 @@ final public class StringLocated {
 
 	@Override
 	public String toString() {
-		return super.toString() + " " + s;
+		return s;
 	}
 
 	public StringLocated(String s, LineLocation location, String preprocessorError) {

src/net/sourceforge/plantuml/UmlDiagram.java

@@ -77,6 +77,7 @@ import net.sourceforge.plantuml.graphic.HtmlColorUtils;
 import net.sourceforge.plantuml.graphic.UDrawable;
 import net.sourceforge.plantuml.mjpeg.MJPEGGenerator;
 import net.sourceforge.plantuml.pdf.PdfConverter;
+import net.sourceforge.plantuml.sprite.Sprite;
 import net.sourceforge.plantuml.svek.EmptySvgException;
 import net.sourceforge.plantuml.svek.GraphvizCrash;
 import net.sourceforge.plantuml.svek.TextBlockBackcolored;
@@ -85,7 +86,6 @@ import net.sourceforge.plantuml.ugraphic.ImageBuilder;
 import net.sourceforge.plantuml.ugraphic.UGraphic;
 import net.sourceforge.plantuml.ugraphic.UImage;
 import net.sourceforge.plantuml.ugraphic.UTranslate;
-import net.sourceforge.plantuml.ugraphic.sprite.Sprite;
 import net.sourceforge.plantuml.version.Version;
 
 public abstract class UmlDiagram extends TitledDiagram implements Diagram, Annotated, WithSprite {
@@ -406,38 +406,39 @@ public abstract class UmlDiagram extends TitledDiagram implements Diagram, Annot
 		return useJDot;
 	}
 
-	public CommandExecutionResult loadSkin(String filename) throws IOException {
+	public CommandExecutionResult loadSkin(String newSkin) throws IOException {
-
+		getSkinParam().setDefaultSkin(newSkin + ".skin");
-		final String res = "/skin/" + filename + ".skin";
-		final InputStream internalIs = UmlDiagram.class.getResourceAsStream(res);
-		if (internalIs != null) {
-			final BlocLines lines2 = BlocLines.load(internalIs, new LineLocationImpl(filename, null));
-			return loadSkinInternal(lines2);
-		}
-		if (OptionFlags.ALLOW_INCLUDE == false) {
 		return CommandExecutionResult.ok();
-		}
+		// final String res = "/skin/" + filename + ".skin";
-		final File f = FileSystem.getInstance().getFile(filename + ".skin");
+		// final InputStream internalIs = UmlDiagram.class.getResourceAsStream(res);
-		if (f == null || f.exists() == false || f.canRead() == false) {
+		// if (internalIs != null) {
-			return CommandExecutionResult.error("Cannot load skin from " + filename);
+		// final BlocLines lines2 = BlocLines.load(internalIs, new LineLocationImpl(filename, null));
-		}
+		// return loadSkinInternal(lines2);
-		final BlocLines lines = BlocLines.load(f, new LineLocationImpl(f.getName(), null));
+		// }
-		return loadSkinInternal(lines);
+		// if (OptionFlags.ALLOW_INCLUDE == false) {
+		// return CommandExecutionResult.ok();
+		// }
+		// final File f = FileSystem.getInstance().getFile(filename + ".skin");
+		// if (f == null || f.exists() == false || f.canRead() == false) {
+		// return CommandExecutionResult.error("Cannot load skin from " + filename);
+		// }
+		// final BlocLines lines = BlocLines.load(f, new LineLocationImpl(f.getName(), null));
+		// return loadSkinInternal(lines);
 	}
 
-	private CommandExecutionResult loadSkinInternal(final BlocLines lines) {
+	// private CommandExecutionResult loadSkinInternal(final BlocLines lines) {
-		final CommandSkinParam cmd1 = new CommandSkinParam();
+	// final CommandSkinParam cmd1 = new CommandSkinParam();
-		final CommandSkinParamMultilines cmd2 = new CommandSkinParamMultilines();
+	// final CommandSkinParamMultilines cmd2 = new CommandSkinParamMultilines();
-		for (int i = 0; i < lines.size(); i++) {
+	// for (int i = 0; i < lines.size(); i++) {
-			final BlocLines ext1 = lines.subList(i, i + 1);
+	// final BlocLines ext1 = lines.subList(i, i + 1);
-			if (cmd1.isValid(ext1) == CommandControl.OK) {
+	// if (cmd1.isValid(ext1) == CommandControl.OK) {
-				cmd1.execute(this, ext1);
+	// cmd1.execute(this, ext1);
-			} else if (cmd2.isValid(ext1) == CommandControl.OK_PARTIAL) {
+	// } else if (cmd2.isValid(ext1) == CommandControl.OK_PARTIAL) {
-				i = tryMultilines(cmd2, i, lines);
+	// i = tryMultilines(cmd2, i, lines);
-			}
+	// }
-		}
+	// }
-		return CommandExecutionResult.ok();
+	// return CommandExecutionResult.ok();
-	}
+	// }
 
 	private int tryMultilines(CommandSkinParamMultilines cmd2, int i, BlocLines lines) {
 		for (int j = i + 1; j <= lines.size(); j++) {
@@ -455,5 +456,4 @@ public abstract class UmlDiagram extends TitledDiagram implements Diagram, Annot
 	public void setHideEmptyDescription(boolean hideEmptyDescription) {
 	}
 
-
 }

src/net/sourceforge/plantuml/WithSprite.java

@@ -36,7 +36,7 @@
 package net.sourceforge.plantuml;
 
 import net.sourceforge.plantuml.core.Diagram;
-import net.sourceforge.plantuml.ugraphic.sprite.Sprite;
+import net.sourceforge.plantuml.sprite.Sprite;
 
 public interface WithSprite extends Diagram {
 

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

@@ -51,6 +51,7 @@ import net.sourceforge.plantuml.cucadiagram.GroupType;
 import net.sourceforge.plantuml.cucadiagram.IEntity;
 import net.sourceforge.plantuml.cucadiagram.IGroup;
 import net.sourceforge.plantuml.cucadiagram.NamespaceStrategy;
+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;
@@ -71,7 +72,9 @@ public class CommandPartition extends SingleLineCommand2<ActivityDiagram> {
 						color().getRegex(), //
 						new RegexLeaf("LEGACYCOLORIGNORED", "(#[0-9a-fA-F]{6}|#?\\w+)?")), //
 				RegexLeaf.spaceZeroOrMore(), //
-				new RegexLeaf("\\{?"),
+				new RegexLeaf("STEREOTYPE", "(\\<\\<.*\\>\\>)?"), //
+				RegexLeaf.spaceZeroOrMore(), //
+				new RegexLeaf("\\{?"), //
 				RegexLeaf.end());
 	}
 
@@ -91,12 +94,10 @@ public class CommandPartition extends SingleLineCommand2<ActivityDiagram> {
 		if (colors.isEmpty() == false) {
 			p.setColors(colors);
 		}
+		if (arg.get("STEREOTYPE", 0) != null) {
+			p.setStereotype(new Stereotype(arg.get("STEREOTYPE", 0)));
+		}
 
-		// final String color = arg.get("COLOR", 0);
-		// if (color != null) {
-		// p.setSpecificColorTOBEREMOVED(ColorType.BACK,
-		// diagram.getSkinParam().getIHtmlColorSet().getColorIfValid(color));
-		// }
 		return CommandExecutionResult.ok();
 	}
 

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

@@ -38,6 +38,7 @@ package net.sourceforge.plantuml.activitydiagram3;
 import java.util.Collection;
 
 import net.sourceforge.plantuml.ISkinParam;
+import net.sourceforge.plantuml.SkinParam;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile;
 import net.sourceforge.plantuml.activitydiagram3.ftile.FtileFactory;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane;
@@ -48,6 +49,11 @@ import net.sourceforge.plantuml.graphic.Rainbow;
 import net.sourceforge.plantuml.graphic.color.Colors;
 import net.sourceforge.plantuml.sequencediagram.NotePosition;
 import net.sourceforge.plantuml.sequencediagram.NoteType;
+import net.sourceforge.plantuml.style.PName;
+import net.sourceforge.plantuml.style.SName;
+import net.sourceforge.plantuml.style.Style;
+import net.sourceforge.plantuml.style.StyleBuilder;
+import net.sourceforge.plantuml.style.StyleSignature;
 
 public class Branch {
 
@@ -60,11 +66,20 @@ public class Branch {
 
 	private Ftile ftile;
 
+	public StyleSignature getDefaultStyleDefinitionArrow() {
+		return StyleSignature.of(SName.root, SName.element, SName.activityDiagram, SName.arrow);
+	}
+
+	public StyleSignature getDefaultStyleDefinitionDiamond() {
+		return StyleSignature.of(SName.root, SName.element, SName.activityDiagram, SName.activity, SName.diamond);
+	}
+
 	public boolean containsBreak() {
 		return list.containsBreak();
 	}
 
-	public Branch(Swimlane swimlane, Display labelPositive, Display labelTest, HtmlColor color, Display inlabel) {
+	public Branch(StyleBuilder styleBuilder, Swimlane swimlane, Display labelPositive, Display labelTest,
+			HtmlColor color, Display inlabel) {
 		if (labelPositive == null) {
 			throw new IllegalArgumentException();
 		}
@@ -74,11 +89,18 @@ public class Branch {
 		if (inlabel == null) {
 			throw new IllegalArgumentException();
 		}
+		if (SkinParam.USE_STYLES()) {
+			final Style style = getDefaultStyleDefinitionDiamond().getMergedStyle(styleBuilder);
+			this.color = color == null ? style.value(PName.BackGroundColor).asColor(
+					styleBuilder.getSkinParam().getIHtmlColorSet()) : color;
+		} else {
+			this.color = color;
+		}
+
 		this.inlabel = inlabel;
 		this.list = new InstructionList(swimlane);
 		this.labelTest = labelTest;
 		this.labelPositive = labelPositive;
-		this.color = color;
 	}
 
 	public Collection<WeldingPoint> getWeldingPoints() {
@@ -166,5 +188,4 @@ public class Branch {
 		return special;
 	}
 
-
 }

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

@@ -91,7 +91,7 @@ public class InstructionFork extends WithNote implements Instruction {
 		for (InstructionList list : forks) {
 			all.add(list.createFtile(factory));
 		}
-		Ftile result = factory.createParallel(getSwimlaneIn(), all, style, label);
+		Ftile result = factory.createParallel(all, style, label);
 		if (getPositionedNotes().size() > 0) {
 			result = FtileWithNoteOpale.create(result, getPositionedNotes(), skinParam, false);
 		}

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

@@ -93,7 +93,8 @@ public class InstructionIf extends WithNote implements Instruction, InstructionC
 			throw new IllegalArgumentException();
 		}
 		this.swimlane = swimlane;
-		this.thens.add(new Branch(swimlane, whenThen, labelTest, color, Display.NULL));
+		this.thens.add(new Branch(skinParam.getCurrentStyleBuilder(), swimlane, whenThen, labelTest, color,
+				Display.NULL));
 		this.current = this.thens.get(0);
 	}
 
@@ -106,7 +107,8 @@ public class InstructionIf extends WithNote implements Instruction, InstructionC
 			branch.updateFtile(factory);
 		}
 		if (elseBranch == null) {
-			this.elseBranch = new Branch(swimlane, Display.NULL, Display.NULL, null, Display.NULL);
+			this.elseBranch = new Branch(skinParam.getCurrentStyleBuilder(), swimlane, Display.NULL, Display.NULL,
+					null, Display.NULL);
 		}
 		elseBranch.updateFtile(factory);
 		Ftile result = factory.createIf(swimlane, thens, elseBranch, afterEndwhile, topInlinkRendering, url);
@@ -133,7 +135,8 @@ public class InstructionIf extends WithNote implements Instruction, InstructionC
 			return false;
 		}
 		this.current.setInlinkRendering(nextLinkRenderer);
-		this.elseBranch = new Branch(swimlane, whenElse, Display.NULL, null, Display.NULL);
+		this.elseBranch = new Branch(skinParam.getCurrentStyleBuilder(), swimlane, whenElse, Display.NULL, null,
+				Display.NULL);
 		this.current = elseBranch;
 		return true;
 	}
@@ -145,7 +148,7 @@ public class InstructionIf extends WithNote implements Instruction, InstructionC
 		}
 		// this.current.setInlinkRendering(nextLinkRenderer);
 		this.current.setSpecial(nextLinkRenderer);
-		this.current = new Branch(swimlane, whenThen, test, color, inlabel);
+		this.current = new Branch(skinParam.getCurrentStyleBuilder(), swimlane, whenThen, test, color, inlabel);
 		this.thens.add(current);
 		return true;
 
@@ -154,7 +157,8 @@ public class InstructionIf extends WithNote implements Instruction, InstructionC
 	public void endif(LinkRendering nextLinkRenderer) {
 		endifCalled = true;
 		if (elseBranch == null) {
-			this.elseBranch = new Branch(swimlane, Display.NULL, Display.NULL, null, Display.NULL);
+			this.elseBranch = new Branch(skinParam.getCurrentStyleBuilder(), swimlane, Display.NULL, Display.NULL,
+					null, Display.NULL);
 		}
 		this.elseBranch.setSpecial(nextLinkRenderer);
 		this.current.setInlinkRendering(nextLinkRenderer);

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

@@ -88,7 +88,7 @@ public class InstructionSplit implements Instruction {
 		for (InstructionList list : splits) {
 			all.add(list.createFtile(factory));
 		}
-		return factory.createParallel(getSwimlaneIn(), all, ForkStyle.SPLIT, null);
+		return factory.createParallel(all, ForkStyle.SPLIT, null);
 	}
 
 	public Instruction getParent() {

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

@@ -137,7 +137,7 @@ public class InstructionSwitch extends WithNote implements Instruction, Instruct
 	}
 
 	public boolean switchCase(Display labelCase, LinkRendering nextLinkRenderer) {
-		this.current = new Branch(swimlane, labelCase, labelCase, null, labelCase);
+		this.current = new Branch(skinParam.getCurrentStyleBuilder(), swimlane, labelCase, labelCase, null, labelCase);
 		this.branches.add(this.current);
 		return true;
 	}

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

@@ -35,6 +35,7 @@
  */
 package net.sourceforge.plantuml.activitydiagram3.command;
 
+import net.sourceforge.plantuml.ColorParam;
 import net.sourceforge.plantuml.LineLocation;
 import net.sourceforge.plantuml.Url;
 import net.sourceforge.plantuml.UrlBuilder;
@@ -48,6 +49,7 @@ 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;
@@ -65,6 +67,8 @@ public class CommandActivity3 extends SingleLineCommand2<ActivityDiagram3> {
 				new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), //
 				color().getRegex(), //
 				RegexLeaf.spaceZeroOrMore(), //
+				new RegexLeaf("STEREO", "(\\<{2}.*\\>{2})?"), //
+				RegexLeaf.spaceZeroOrMore(), //
 				new RegexLeaf(":"), //
 				new RegexLeaf("LABEL", "(.*)"), //
 				new RegexLeaf("STYLE", ENDING_GROUP), //
@@ -86,7 +90,12 @@ public class CommandActivity3 extends SingleLineCommand2<ActivityDiagram3> {
 			url = urlBuilder.getUrl(arg.get("URL", 0));
 		}
 
-		final Colors colors = color().getColor(arg, diagram.getSkinParam().getIHtmlColorSet());
+		Colors colors = color().getColor(arg, diagram.getSkinParam().getIHtmlColorSet());
+		final String stereo = arg.get("STEREO", 0);
+		if (stereo != null) {
+			final Stereotype stereotype = new Stereotype(stereo);
+			colors = colors.applyStereotype(stereotype, diagram.getSkinParam(), ColorParam.activityBackground);
+		}
 		final BoxStyle style = BoxStyle.fromChar(arg.get("STYLE", 0).charAt(0));
 		diagram.addActivity(Display.getWithNewlines(arg.get("LABEL", 0)), style, url, colors);
 		return CommandExecutionResult.ok();

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

@@ -75,7 +75,7 @@ public class CommandArrowLong3 extends CommandMultilines2<ActivityDiagram3> {
 		lines = lines.removeEmptyColumns();
 		final RegexResult line0 = getStartingPattern().matcher(lines.getFirst499().getTrimmed().getString());
 		// final HtmlColor color = diagram.getSkinParam().getIHtmlColorSet().getColorIfValid(line0.get("COLOR", 0));
-		// diagram.setColorNextArrow(HtmlColorAndStyle.fromColor(color));
+		// diagram.setColorNextArrow(Rainbow.fromColor(color));
 		final String colorString = line0.get("COLOR", 0);
 		if (colorString != null) {
 			Rainbow rainbow = Rainbow.build(diagram.getSkinParam(), colorString, diagram.getSkinParam()

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

@@ -44,7 +44,7 @@ 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.HtmlColor;
-import net.sourceforge.plantuml.graphic.HtmlColorAndStyle;
+import net.sourceforge.plantuml.graphic.Rainbow;
 
 public class CommandLink3 extends SingleLineCommand2<ActivityDiagram3> {
 
@@ -65,7 +65,7 @@ public class CommandLink3 extends SingleLineCommand2<ActivityDiagram3> {
 	protected CommandExecutionResult executeArg(ActivityDiagram3 diagram, LineLocation location, RegexResult arg) {
 		final HtmlColor color = diagram.getSkinParam().getIHtmlColorSet().getColorIfValid(arg.get("COLOR", 0));
 		if (color != null) {
-			diagram.setColorNextArrow(HtmlColorAndStyle.fromColor(color));
+			diagram.setColorNextArrow(Rainbow.fromColor(color));
 		}
 		return CommandExecutionResult.ok();
 	}

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

@@ -37,6 +37,7 @@ package net.sourceforge.plantuml.activitydiagram3.command;
 
 import net.sourceforge.plantuml.ColorParam;
 import net.sourceforge.plantuml.LineLocation;
+import net.sourceforge.plantuml.SkinParam;
 import net.sourceforge.plantuml.StringUtils;
 import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3;
 import net.sourceforge.plantuml.command.CommandExecutionResult;
@@ -54,6 +55,10 @@ import net.sourceforge.plantuml.graphic.USymbol;
 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.style.PName;
+import net.sourceforge.plantuml.style.SName;
+import net.sourceforge.plantuml.style.Style;
+import net.sourceforge.plantuml.style.StyleSignature;
 
 public class CommandPartition3 extends SingleLineCommand2<ActivityDiagram3> {
 
@@ -126,20 +131,33 @@ public class CommandPartition3 extends SingleLineCommand2<ActivityDiagram3> {
 
 		final HtmlColor backColorInSkinparam = diagram.getSkinParam().getHtmlColor(getColorParamBack(symbol),
 				stereotype, false);
-		final HtmlColor backColor;
+		HtmlColor backColor;
 		if (backColorInSkinparam == null) {
 			backColor = colors.getColor(ColorType.BACK);
 		} else {
 			backColor = backColorInSkinparam;
 		}
-		final HtmlColor titleColor = colors.getColor(ColorType.HEADER);
+		HtmlColor titleColor = colors.getColor(ColorType.HEADER);
 
 		// Warning : titleColor unused in FTileGroupW
 		HtmlColor borderColor = diagram.getSkinParam().getHtmlColor(getColorParamBorder(symbol), stereotype, false);
 		if (borderColor == null) {
 			borderColor = HtmlColorUtils.BLACK;
 		}
-		final double roundCorner = symbol.getSkinParameter().getRoundCorner(diagram.getSkinParam(), stereotype);
+		double roundCorner = symbol.getSkinParameter().getRoundCorner(diagram.getSkinParam(), stereotype);
+
+		if (SkinParam.USE_STYLES()) {
+			final Style stylePartition = getDefaultStyleDefinitionPartition().getMergedStyle(
+					diagram.getSkinParam().getCurrentStyleBuilder());
+			borderColor = stylePartition.value(PName.LineColor).asColor(diagram.getSkinParam().getIHtmlColorSet());
+			backColor = colors.getColor(ColorType.BACK);
+			if (backColor == null) {
+				backColor = stylePartition.value(PName.BackGroundColor).asColor(
+						diagram.getSkinParam().getIHtmlColorSet());
+			}
+			titleColor = HtmlColorUtils.BLUE;// stylePartition.value(PName.FontColor).asColor(diagram.getSkinParam().getIHtmlColorSet());
+			roundCorner = stylePartition.value(PName.RoundCorner).asDouble();
+		}
 
 		diagram.startGroup(Display.getWithNewlines(partitionTitle), backColor, titleColor, borderColor, symbol,
 				roundCorner);
@@ -147,4 +165,8 @@ public class CommandPartition3 extends SingleLineCommand2<ActivityDiagram3> {
 		return CommandExecutionResult.ok();
 	}
 
+	final public StyleSignature getDefaultStyleDefinitionPartition() {
+		return StyleSignature.of(SName.root, SName.element, SName.activityDiagram, SName.partition);
+	}
+
 }

src/net/sourceforge/plantuml/activitydiagram3/ftile/AbstractFtile.java

@@ -45,6 +45,7 @@ import net.sourceforge.plantuml.LineParam;
 import net.sourceforge.plantuml.activitydiagram3.LinkRendering;
 import net.sourceforge.plantuml.graphic.AbstractTextBlock;
 import net.sourceforge.plantuml.graphic.HorizontalAlignment;
+import net.sourceforge.plantuml.graphic.IHtmlColorSet;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.ugraphic.MinMax;
 import net.sourceforge.plantuml.ugraphic.UStroke;
@@ -65,6 +66,10 @@ public abstract class AbstractFtile extends AbstractTextBlock implements Ftile {
 		return skinParam;
 	}
 
+	final public IHtmlColorSet getIHtmlColorSet() {
+		return skinParam.getIHtmlColorSet();
+	}
+
 	public LinkRendering getInLinkRendering() {
 		return LinkRendering.none();
 	}

src/net/sourceforge/plantuml/activitydiagram3/ftile/BoxStyle.java

@@ -49,13 +49,13 @@ import net.sourceforge.plantuml.ugraphic.UTranslate;
 public enum BoxStyle {
 	PLAIN {
 		@Override
-		protected Shadowable getShape(double width, double height) {
+		protected Shadowable getShape(double width, double height, double roundCorner) {
-			return new URectangle(width, height, CORNER, CORNER);
+			return new URectangle(width, height, roundCorner, roundCorner);
 		}
 	},
 	SDL_INPUT('<') {
 		@Override
-		protected Shadowable getShape(double width, double height) {
+		protected Shadowable getShape(double width, double height, double roundCorner) {
 			final UPolygon result = new UPolygon();
 			result.addPoint(0, 0);
 			result.addPoint(width + DELTA_INPUT_OUTPUT, 0);
@@ -67,7 +67,7 @@ public enum BoxStyle {
 	},
 	SDL_OUTPUT('>') {
 		@Override
-		protected Shadowable getShape(double width, double height) {
+		protected Shadowable getShape(double width, double height, double roundCorner) {
 			final UPolygon result = new UPolygon();
 			result.addPoint(0.0, 0.0);
 			result.addPoint(width, 0.0);
@@ -79,11 +79,9 @@ public enum BoxStyle {
 	},
 	SDL_PROCEDURE('|') {
 		@Override
-		protected void drawInternal(UGraphic ug, double width, double height, boolean shadowing) {
+		protected void drawInternal(UGraphic ug, double width, double height, double shadowing, double roundCorner) {
 			final URectangle rect = new URectangle(width, height);
-			if (shadowing) {
+			rect.setDeltaShadow(shadowing);
-				rect.setDeltaShadow(3);
-			}
 			ug.draw(rect);
 			final ULine vline = new ULine(0, height);
 			ug.apply(new UTranslate(PADDING, 0)).draw(vline);
@@ -92,7 +90,7 @@ public enum BoxStyle {
 	},
 	SDL_SAVE('\\') {
 		@Override
-		protected Shadowable getShape(double width, double height) {
+		protected Shadowable getShape(double width, double height, double roundCorner) {
 			final UPolygon result = new UPolygon();
 			result.addPoint(0.0, 0.0);
 			result.addPoint(width - DELTA_INPUT_OUTPUT, 0.0);
@@ -103,7 +101,7 @@ public enum BoxStyle {
 	},
 	SDL_ANTISAVE('/') {
 		@Override
-		protected Shadowable getShape(double width, double height) {
+		protected Shadowable getShape(double width, double height, double roundCorner) {
 			final UPolygon result = new UPolygon();
 			result.addPoint(DELTA_INPUT_OUTPUT, 0.0);
 			result.addPoint(width, 0.0);
@@ -114,7 +112,7 @@ public enum BoxStyle {
 	},
 	SDL_CONTINUOUS('}') {
 		@Override
-		protected Shadowable getShape(double width, double height) {
+		protected Shadowable getShape(double width, double height, double roundCorner) {
 			final UPath result = new UPath();
 			final double c1[] = { DELTA_CONTINUOUS, 0 };
 			final double c2[] = { 0, height / 2 };
@@ -136,12 +134,11 @@ public enum BoxStyle {
 	},
 	SDL_TASK(']') {
 		@Override
-		protected Shadowable getShape(double width, double height) {
+		protected Shadowable getShape(double width, double height, double roundCorner) {
 			return new URectangle(width, height);
 		}
 	};
 
-	private static final int CORNER = 25;
 	private final char style;
 	private static int DELTA_INPUT_OUTPUT = 10;
 	private static double DELTA_CONTINUOUS = 5.0;
@@ -164,23 +161,22 @@ public enum BoxStyle {
 		return PLAIN;
 	}
 
-	public final UDrawable getUDrawable(final double width, final double height, final boolean shadowing) {
+	public final UDrawable getUDrawable(final double width, final double height, final double shadowing,
+			final double roundCorner) {
 		return new UDrawable() {
 			public void drawU(UGraphic ug) {
-				drawInternal(ug, width, height, shadowing);
+				drawInternal(ug, width, height, shadowing, roundCorner);
 			}
 		};
 	}
 
-	protected Shadowable getShape(double width, double height) {
+	protected Shadowable getShape(double width, double height, double roundCorner) {
 		return null;
 	}
 
-	protected void drawInternal(UGraphic ug, double width, double height, boolean shadowing) {
+	protected void drawInternal(UGraphic ug, double width, double height, double shadowing, double roundCorner) {
-		final Shadowable s = getShape(width, height);
+		final Shadowable s = getShape(width, height, roundCorner);
-		if (shadowing) {
+		s.setDeltaShadow(shadowing);
-			s.setDeltaShadow(3);
-		}
 		ug.draw(s);
 
 	}

src/net/sourceforge/plantuml/activitydiagram3/ftile/Diamond.java

@@ -46,7 +46,7 @@ public class Diamond {
 
 	final static public double diamondHalfSize = 12;
 
-	public static UPolygon asPolygon(boolean shadowing) {
+	public static UPolygon asPolygon(double shadowing) {
 		final UPolygon diams = new UPolygon();
 
 		diams.addPoint(diamondHalfSize, 0);
@@ -55,14 +55,15 @@ public class Diamond {
 		diams.addPoint(0, diamondHalfSize);
 		diams.addPoint(diamondHalfSize, 0);
 
-		if (shadowing) {
+		// if (shadowing) {
-			diams.setDeltaShadow(3);
+		// diams.setDeltaShadow(3);
-		}
+		// }
+		diams.setDeltaShadow(shadowing);
 
 		return diams;
 	}
 
-	public static UPolygon asPolygon(boolean shadowing, double width, double height) {
+	public static UPolygon asPolygon(double shadowing, double width, double height) {
 		final UPolygon diams = new UPolygon();
 
 		diams.addPoint(diamondHalfSize, 0);
@@ -73,9 +74,10 @@ public class Diamond {
 		diams.addPoint(0, height / 2);
 		diams.addPoint(diamondHalfSize, 0);
 
-		if (shadowing) {
+		// if (shadowing) {
-			diams.setDeltaShadow(3);
+		// diams.setDeltaShadow(3);
-		}
+		// }
+		diams.setDeltaShadow(shadowing);
 
 		return diams;
 	}

src/net/sourceforge/plantuml/activitydiagram3/ftile/EntityImageLegend.java

@@ -38,18 +38,14 @@ package net.sourceforge.plantuml.activitydiagram3.ftile;
 import net.sourceforge.plantuml.ColorParam;
 import net.sourceforge.plantuml.FontParam;
 import net.sourceforge.plantuml.ISkinParam;
-import net.sourceforge.plantuml.ISkinSimple;
 import net.sourceforge.plantuml.LineParam;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.graphic.FontConfiguration;
 import net.sourceforge.plantuml.graphic.HorizontalAlignment;
 import net.sourceforge.plantuml.graphic.HtmlColor;
-import net.sourceforge.plantuml.graphic.IHtmlColorSet;
 import net.sourceforge.plantuml.graphic.TextBlock;
 import net.sourceforge.plantuml.graphic.TextBlockUtils;
 import net.sourceforge.plantuml.skin.rose.Rose;
-import net.sourceforge.plantuml.style.PName;
-import net.sourceforge.plantuml.style.Style;
 import net.sourceforge.plantuml.ugraphic.UStroke;
 
 public class EntityImageLegend {

src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactory.java

@@ -90,7 +90,7 @@ public interface FtileFactory {
 	public Ftile createSwitch(Swimlane swimlane, List<Branch> branches, LinkRendering afterEndwhile,
 			LinkRendering topInlinkRendering, Display labelTest);
 
-	public Ftile createParallel(Swimlane swimlane, List<Ftile> all, ForkStyle style, String label);
+	public Ftile createParallel(List<Ftile> all, ForkStyle style, String label);
 
 	public Ftile createGroup(Ftile list, Display name, HtmlColor backColor, HtmlColor titleColor, PositionedNote note,
 			HtmlColor borderColor, USymbol type, double roundCorner);

src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactoryDelegator.java

@@ -40,6 +40,7 @@ import java.util.List;
 
 import net.sourceforge.plantuml.FontParam;
 import net.sourceforge.plantuml.ISkinParam;
+import net.sourceforge.plantuml.SkinParam;
 import net.sourceforge.plantuml.Url;
 import net.sourceforge.plantuml.activitydiagram3.Branch;
 import net.sourceforge.plantuml.activitydiagram3.ForkStyle;
@@ -51,13 +52,15 @@ import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.graphic.FontConfiguration;
 import net.sourceforge.plantuml.graphic.HorizontalAlignment;
 import net.sourceforge.plantuml.graphic.HtmlColor;
-import net.sourceforge.plantuml.graphic.HtmlColorAndStyle;
 import net.sourceforge.plantuml.graphic.Rainbow;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.TextBlock;
 import net.sourceforge.plantuml.graphic.USymbol;
 import net.sourceforge.plantuml.graphic.color.Colors;
 import net.sourceforge.plantuml.skin.rose.Rose;
+import net.sourceforge.plantuml.style.SName;
+import net.sourceforge.plantuml.style.Style;
+import net.sourceforge.plantuml.style.StyleSignature;
 
 public class FtileFactoryDelegator implements FtileFactory {
 
@@ -65,16 +68,40 @@ public class FtileFactoryDelegator implements FtileFactory {
 
 	private final Rose rose = new Rose();
 
+	final public StyleSignature getDefaultStyleDefinitionActivity() {
+		return StyleSignature.of(SName.root, SName.element, SName.activityDiagram, SName.activity);
+	}
+
+	final public StyleSignature getDefaultStyleDefinitionDiamond() {
+		return StyleSignature.of(SName.root, SName.element, SName.activityDiagram, SName.activity, SName.diamond);
+	}
+
+	final public StyleSignature getDefaultStyleDefinitionArrow() {
+		return StyleSignature.of(SName.root, SName.element, SName.activityDiagram, SName.arrow);
+	}
+
 	protected final Rainbow getInLinkRenderingColor(Ftile tile) {
 		Rainbow color;
 		final LinkRendering linkRendering = tile.getInLinkRendering();
 		if (linkRendering == null) {
-			color = HtmlColorAndStyle.build(skinParam());
+			if (SkinParam.USE_STYLES()) {
+				final Style style = getDefaultStyleDefinitionArrow().getMergedStyle(
+						skinParam().getCurrentStyleBuilder());
+				return Rainbow.build(style, skinParam().getIHtmlColorSet());
+			} else {
+				color = Rainbow.build(skinParam());
+			}
 		} else {
 			color = linkRendering.getRainbow();
 		}
 		if (color.size() == 0) {
-			color = HtmlColorAndStyle.build(skinParam());
+			if (SkinParam.USE_STYLES()) {
+				final Style style = getDefaultStyleDefinitionArrow().getMergedStyle(
+						skinParam().getCurrentStyleBuilder());
+				return Rainbow.build(style, skinParam().getIHtmlColorSet());
+			} else {
+				color = Rainbow.build(skinParam());
+			}
 		}
 		return color;
 	}
@@ -84,7 +111,13 @@ public class FtileFactoryDelegator implements FtileFactory {
 		if (Display.isNull(display)) {
 			return null;
 		}
-		final FontConfiguration fontConfiguration = new FontConfiguration(skinParam(), FontParam.ARROW, null);
+		final FontConfiguration fontConfiguration;
+		if (SkinParam.USE_STYLES()) {
+			final Style style = getDefaultStyleDefinitionArrow().getMergedStyle(skinParam().getCurrentStyleBuilder());
+			fontConfiguration = style.getFontConfiguration(skinParam().getIHtmlColorSet());
+		} else {
+			fontConfiguration = new FontConfiguration(skinParam(), FontParam.ARROW, null);
+		}
 		return display.create(fontConfiguration, HorizontalAlignment.LEFT, skinParam(), CreoleMode.SIMPLE_LINE);
 	}
 
@@ -168,8 +201,8 @@ public class FtileFactoryDelegator implements FtileFactory {
 		return factory.createSwitch(swimlane, branches, afterEndwhile, topInlinkRendering, labelTest);
 	}
 
-	public Ftile createParallel(Swimlane swimlane, List<Ftile> all, ForkStyle style, String label) {
+	public Ftile createParallel(List<Ftile> all, ForkStyle style, String label) {
-		return factory.createParallel(swimlane, all, style, label);
+		return factory.createParallel(all, style, label);
 	}
 
 	public Ftile createGroup(Ftile list, Display name, HtmlColor backColor, HtmlColor titleColor, PositionedNote note,

src/net/sourceforge/plantuml/activitydiagram3/ftile/SwimlanesA.java

@@ -41,7 +41,6 @@ import java.util.List;
 
 import net.sourceforge.plantuml.ISkinParam;
 import net.sourceforge.plantuml.Pragma;
-import net.sourceforge.plantuml.SkinParam;
 import net.sourceforge.plantuml.activitydiagram3.Instruction;
 import net.sourceforge.plantuml.activitydiagram3.InstructionList;
 import net.sourceforge.plantuml.activitydiagram3.LinkRendering;
@@ -66,7 +65,7 @@ import net.sourceforge.plantuml.graphic.UGraphicDelegator;
 import net.sourceforge.plantuml.graphic.color.ColorType;
 import net.sourceforge.plantuml.style.SName;
 import net.sourceforge.plantuml.style.Style;
-import net.sourceforge.plantuml.style.StyleDefinition;
+import net.sourceforge.plantuml.style.StyleSignature;
 import net.sourceforge.plantuml.style.Styleable;
 import net.sourceforge.plantuml.svek.UGraphicForSnake;
 import net.sourceforge.plantuml.ugraphic.LimitFinder;
@@ -95,8 +94,8 @@ public class SwimlanesA extends AbstractTextBlock implements TextBlock, Styleabl
 	private LinkRendering nextLinkRenderer = LinkRendering.none();
 	private Style style;
 
-	public StyleDefinition getDefaultStyleDefinition() {
+	public StyleSignature getDefaultStyleDefinition() {
-		return StyleDefinition.of(SName.root, SName.element, SName.classDiagram, SName.swimlane);
+		return StyleSignature.of(SName.root, SName.element, SName.classDiagram, SName.swimlane);
 	}
 
 	public SwimlanesA(ISkinParam skinParam, Pragma pragma) {

src/net/sourceforge/plantuml/activitydiagram3/ftile/SwimlanesB.java

@@ -44,7 +44,6 @@ import net.sourceforge.plantuml.SkinParam;
 import net.sourceforge.plantuml.graphic.FontConfiguration;
 import net.sourceforge.plantuml.graphic.HorizontalAlignment;
 import net.sourceforge.plantuml.graphic.HtmlColor;
-import net.sourceforge.plantuml.graphic.HtmlColorUtils;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.TextBlock;
 import net.sourceforge.plantuml.style.PName;
@@ -75,6 +74,7 @@ public class SwimlanesB extends SwimlanesA {
 		if (color != null) {
 			final double titleHeight = getTitlesHeight(stringBounder);
 			final URectangle back = new URectangle(getTitlesWidth(stringBounder), titleHeight);
+			back.setIgnoreForCompression(true);
 			ug.apply(new UChangeBackColor(color)).apply(new UChangeColor(color)).draw(back);
 		}
 		for (Swimlane swimlane : swimlanes) {
@@ -95,14 +95,18 @@ public class SwimlanesB extends SwimlanesA {
 	}
 
 	private TextBlock getTitle(Swimlane swimlane) {
-		final FontConfiguration fontConfiguration = new FontConfiguration(skinParam, FontParam.SWIMLANE_TITLE, null);
+		final HorizontalAlignment horizontalAlignment = HorizontalAlignment.LEFT;
+		FontConfiguration fontConfiguration = new FontConfiguration(skinParam, FontParam.SWIMLANE_TITLE, null);
+		if (SkinParam.USE_STYLES()) {
+			fontConfiguration = getStyle().getFontConfiguration(skinParam.getIHtmlColorSet());
+		}
 
 		LineBreakStrategy wrap = getWrap();
 		if (wrap.isAuto()) {
 			wrap = new LineBreakStrategy("" + ((int) swimlane.getActualWidth()));
 		}
 
-		return swimlane.getDisplay().create(fontConfiguration, HorizontalAlignment.LEFT, skinParam, wrap);
+		return swimlane.getDisplay().create(fontConfiguration, horizontalAlignment, skinParam, wrap);
 	}
 
 	private LineBreakStrategy getWrap() {

src/net/sourceforge/plantuml/activitydiagram3/ftile/SwimlanesC.java

@@ -41,10 +41,12 @@ import net.sourceforge.plantuml.ColorParam;
 import net.sourceforge.plantuml.ISkinParam;
 import net.sourceforge.plantuml.LineParam;
 import net.sourceforge.plantuml.Pragma;
+import net.sourceforge.plantuml.SkinParam;
 import net.sourceforge.plantuml.graphic.HtmlColor;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.TextBlock;
 import net.sourceforge.plantuml.skin.rose.Rose;
+import net.sourceforge.plantuml.style.PName;
 import net.sourceforge.plantuml.ugraphic.UChangeColor;
 import net.sourceforge.plantuml.ugraphic.UGraphic;
 import net.sourceforge.plantuml.ugraphic.ULine;
@@ -82,7 +84,11 @@ public class SwimlanesC extends SwimlanesB {
 		if (color == null) {
 			color = ColorParam.swimlaneBorder.getDefaultValue();
 		}
-		final UStroke thickness = Rose.getStroke(skinParam, LineParam.swimlaneBorder, 2);
+		UStroke thickness = Rose.getStroke(skinParam, LineParam.swimlaneBorder, 2);
+		if (SkinParam.USE_STYLES()) {
+			color = getStyle().value(PName.LineColor).asColor(skinParam.getIHtmlColorSet());
+			thickness = getStyle().getStroke();
+		}
 		ug.apply(thickness).apply(new UChangeColor(color)).draw(new ULine(0, height));
 	}
 

src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/AbstractParallelFtilesBuilder.java

@@ -40,6 +40,7 @@ import java.util.List;
 
 import net.sourceforge.plantuml.FontParam;
 import net.sourceforge.plantuml.ISkinParam;
+import net.sourceforge.plantuml.SkinParam;
 import net.sourceforge.plantuml.activitydiagram3.LinkRendering;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile;
 import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry;
@@ -51,8 +52,11 @@ import net.sourceforge.plantuml.graphic.HorizontalAlignment;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.TextBlock;
 import net.sourceforge.plantuml.skin.rose.Rose;
+import net.sourceforge.plantuml.style.SName;
+import net.sourceforge.plantuml.style.Style;
+import net.sourceforge.plantuml.style.StyleSignature;
 
-public abstract class ParallelFtilesBuilder {
+public abstract class AbstractParallelFtilesBuilder {
 
 	protected final double barHeight = 6;
 
@@ -64,16 +68,22 @@ public abstract class ParallelFtilesBuilder {
 	private final List<Ftile> list;
 	private final Ftile middle;
 	private final FtileGeometry middleDimension;
-	private final Swimlane swimlane;
 
-	public ParallelFtilesBuilder(ISkinParam skinParam, StringBounder stringBounder, final List<Ftile> list,
+	public StyleSignature getDefaultStyleDefinition() {
-			Ftile middle, Swimlane swimlane) {
+		return StyleSignature.of(SName.root, SName.element, SName.activityDiagram, SName.activity);
+	}
+
+	final public StyleSignature getDefaultStyleDefinitionArrow() {
+		return StyleSignature.of(SName.root, SName.element, SName.activityDiagram, SName.arrow);
+	}
+
+	public AbstractParallelFtilesBuilder(ISkinParam skinParam, StringBounder stringBounder, final List<Ftile> list,
+			Ftile middle) {
 		this.skinParam = skinParam;
 		this.stringBounder = stringBounder;
 		this.list = list;
 		this.middle = middle;
 		this.middleDimension = middle.calculateDimension(getStringBounder());
-		this.swimlane = swimlane;
 	}
 
 	public final Ftile build() {
@@ -102,7 +112,13 @@ public abstract class ParallelFtilesBuilder {
 		if (Display.isNull(display)) {
 			return null;
 		}
-		final FontConfiguration fontConfiguration = new FontConfiguration(skinParam(), FontParam.ARROW, null);
+		final FontConfiguration fontConfiguration;
+		if (SkinParam.USE_STYLES()) {
+			final Style style = getDefaultStyleDefinitionArrow().getMergedStyle(skinParam().getCurrentStyleBuilder());
+			fontConfiguration = style.getFontConfiguration(skinParam().getIHtmlColorSet());
+		} else {
+			fontConfiguration = new FontConfiguration(skinParam(), FontParam.ARROW, null);
+		}
 		return display.create(fontConfiguration, HorizontalAlignment.LEFT, skinParam(), CreoleMode.SIMPLE_LINE);
 	}
 
@@ -124,8 +140,8 @@ public abstract class ParallelFtilesBuilder {
 		return middleDimension.getHeight();
 	}
 
-	protected final Swimlane swimlane() {
+	protected final Swimlane swimlaneOutForStep2() {
-		return swimlane;
+		return list.get(list.size() - 1).getSwimlaneOut();
 	}
 
 }

src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FloatingNote.java

@@ -76,7 +76,8 @@ public class FloatingNote extends AbstractTextBlock implements Stencil, TextBloc
 				skinParam, CreoleMode.FULL).createSheet(note);
 		final SheetBlock2 sheetBlock2 = new SheetBlock2(new SheetBlock1(sheet, LineBreakStrategy.NONE, skinParam.getPadding()), this,
 				new UStroke(1));
-		this.opale = new Opale(borderColor, noteBackgroundColor, sheetBlock2, skinParam.shadowing(null), false);
+		final double shadowing;shadowing = skinParam.shadowing(null)?4:0;
+		this.opale = new Opale(shadowing, borderColor, noteBackgroundColor, sheetBlock2, false);
 
 		// this.text = sheetBlock2;
 

src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorCreateParallel.java

@@ -61,25 +61,25 @@ public class FtileFactoryDelegatorCreateParallel extends FtileFactoryDelegator {
 	}
 
 	@Override
-	public Ftile createParallel(Swimlane swimlane, List<Ftile> all, ForkStyle style, String label) {
+	public Ftile createParallel(List<Ftile> all, ForkStyle style, String label) {
 
-		final Dimension2D dimSuper = super.createParallel(swimlane, all, style, label).calculateDimension(getStringBounder());
+		final Dimension2D dimSuper = super.createParallel(all, style, label).calculateDimension(getStringBounder());
 		final double height1 = dimSuper.getHeight() + 2 * spaceArroundBlackBar;
 
 		final List<Ftile> list = new ArrayList<Ftile>();
 		for (Ftile tmp : all) {
 			list.add(new FtileHeightFixed(FtileUtils.addHorizontalMargin(tmp, xMargin), height1));
 		}
-		final Ftile inner = super.createParallel(swimlane, list, style, label);
+		final Ftile inner = super.createParallel(list, style, label);
 
-		ParallelFtilesBuilder builder;
+		AbstractParallelFtilesBuilder builder;
 
 		if (style == ForkStyle.SPLIT) {
-			builder = new ParallelBuilderSplit2(skinParam(), getStringBounder(), list, inner, swimlane);
+			builder = new ParallelBuilderSplit(skinParam(), getStringBounder(), list, inner);
 		} else if (style == ForkStyle.MERGE) {
-			builder = new ParallelBuilderMerge(skinParam(), getStringBounder(), list, inner, swimlane);
+			builder = new ParallelBuilderMerge(skinParam(), getStringBounder(), list, inner);
 		} else if (style == ForkStyle.FORK) {
-			builder = new ParallelBuilderFork(skinParam(), getStringBounder(), list, inner, swimlane, label);
+			builder = new ParallelBuilderFork(skinParam(), getStringBounder(), list, inner, label);
 		} else {
 			throw new IllegalStateException();
 		}

src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorCreateParallel1.java

@@ -1,75 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * (C) Copyright 2009-2020, Arnaud Roques
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of PlantUML.
- *
- * PlantUML is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * PlantUML distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
- * License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
- * USA.
- *
- *
- * Original Author:  Arnaud Roques
- *
- *
- */
-package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact;
-
-import java.util.List;
-
-import net.sourceforge.plantuml.activitydiagram3.ForkStyle;
-import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile;
-import net.sourceforge.plantuml.activitydiagram3.ftile.FtileFactory;
-import net.sourceforge.plantuml.activitydiagram3.ftile.FtileFactoryDelegator;
-import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane;
-
-public class FtileFactoryDelegatorCreateParallel1 extends FtileFactoryDelegator {
-
-	public FtileFactoryDelegatorCreateParallel1(FtileFactory factory) {
-		super(factory);
-	}
-
-	private Ftile allOverlapped(Swimlane swimlane, List<Ftile> all, ForkStyle style, String label) {
-		return new FtileForkInnerOverlapped(all);
-	}
-
-	@Override
-	public Ftile createParallel(Swimlane swimlane, List<Ftile> list, ForkStyle style, String label) {
-
-		final Ftile inner = super.createParallel(swimlane, list, style, label);
-
-		ParallelFtilesBuilder builder;
-
-		if (style == ForkStyle.SPLIT) {
-			builder = new ParallelBuilderSplit(skinParam(), getStringBounder(), list, inner, swimlane);
-		} else if (style == ForkStyle.MERGE) {
-			builder = new ParallelBuilderMerge(skinParam(), getStringBounder(), list, inner, swimlane);
-		} else if (style == ForkStyle.FORK) {
-			builder = new ParallelBuilderFork(skinParam(), getStringBounder(), list, inner, swimlane, label);
-		} else {
-			throw new IllegalStateException();
-		}
-		return builder.build();
-	}
-
-}

src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorCreateParallelAddingMargin.java

@@ -45,7 +45,6 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.FtileFactory;
 import net.sourceforge.plantuml.activitydiagram3.ftile.FtileFactoryDelegator;
 import net.sourceforge.plantuml.activitydiagram3.ftile.FtileHeightFixed;
 import net.sourceforge.plantuml.activitydiagram3.ftile.FtileUtils;
-import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane;
 
 public class FtileFactoryDelegatorCreateParallelAddingMargin extends FtileFactoryDelegator {
 
@@ -57,17 +56,16 @@ public class FtileFactoryDelegatorCreateParallelAddingMargin extends FtileFactor
 	}
 
 	@Override
-	public Ftile createParallel(Swimlane swimlane, List<Ftile> all, ForkStyle style, String label) {
+	public Ftile createParallel(List<Ftile> all, ForkStyle style, String label) {
 
-		final Dimension2D dimSuper = super.createParallel(swimlane, all, style, label).calculateDimension(
+		final Dimension2D dimSuper = super.createParallel(all, style, label).calculateDimension(getStringBounder());
-				getStringBounder());
 		final double height1 = dimSuper.getHeight() + 2 * spaceArroundBlackBar;
 
 		final List<Ftile> list = new ArrayList<Ftile>();
 		for (Ftile tmp : all) {
 			list.add(new FtileHeightFixed(FtileUtils.addHorizontalMargin(tmp, xMargin), height1));
 		}
-		return super.createParallel(swimlane, list, style, label);
+		return super.createParallel(list, style, label);
 	}
 
 }

src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorIf.java

@@ -40,6 +40,7 @@ import java.util.List;
 import net.sourceforge.plantuml.ColorParam;
 import net.sourceforge.plantuml.FontParam;
 import net.sourceforge.plantuml.Pragma;
+import net.sourceforge.plantuml.SkinParam;
 import net.sourceforge.plantuml.Url;
 import net.sourceforge.plantuml.activitydiagram3.Branch;
 import net.sourceforge.plantuml.activitydiagram3.LinkRendering;
@@ -50,8 +51,9 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane;
 import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.cond.ConditionalBuilder;
 import net.sourceforge.plantuml.graphic.FontConfiguration;
 import net.sourceforge.plantuml.graphic.HtmlColor;
-import net.sourceforge.plantuml.graphic.HtmlColorAndStyle;
 import net.sourceforge.plantuml.graphic.Rainbow;
+import net.sourceforge.plantuml.style.PName;
+import net.sourceforge.plantuml.style.Style;
 import net.sourceforge.plantuml.svek.ConditionEndStyle;
 import net.sourceforge.plantuml.svek.ConditionStyle;
 
@@ -72,17 +74,33 @@ public class FtileFactoryDelegatorIf extends FtileFactoryDelegator {
 		final ConditionEndStyle conditionEndStyle = skinParam().getConditionEndStyle();
 		final Branch branch0 = thens.get(0);
 
-		final HtmlColor borderColor = getRose().getHtmlColor(skinParam(), ColorParam.activityDiamondBorder);
+		final HtmlColor borderColor;
-		final HtmlColor backColor = branch0.getColor() == null ? getRose().getHtmlColor(skinParam(),
+		final HtmlColor backColor;
-				ColorParam.activityDiamondBackground) : branch0.getColor();
+		final Rainbow arrowColor;
-		final Rainbow arrowColor = HtmlColorAndStyle.build(skinParam());
+		final FontConfiguration fcTest;
-
-		final FontConfiguration fcArrow = new FontConfiguration(skinParam(), FontParam.ARROW, null);
-
 		final FontParam testParam = conditionStyle == ConditionStyle.INSIDE ? FontParam.ACTIVITY_DIAMOND
 				: FontParam.ARROW;
-		final FontConfiguration fcTest = new FontConfiguration(skinParam(), testParam, null)
+		final FontConfiguration fcArrow;
+		if (SkinParam.USE_STYLES()) {
+			final Style styleArrow = getDefaultStyleDefinitionArrow().getMergedStyle(
+					skinParam().getCurrentStyleBuilder());
+			final Style styleDiamond = getDefaultStyleDefinitionDiamond().getMergedStyle(
+					skinParam().getCurrentStyleBuilder());
+			borderColor = styleDiamond.value(PName.LineColor).asColor(skinParam().getIHtmlColorSet());
+			backColor = branch0.getColor() == null ? styleDiamond.value(PName.BackGroundColor).asColor(
+					skinParam().getIHtmlColorSet()) : branch0.getColor();
+			arrowColor = Rainbow.build(styleArrow, skinParam().getIHtmlColorSet());
+			fcTest = styleDiamond.getFontConfiguration(skinParam().getIHtmlColorSet());
+			fcArrow = styleArrow.getFontConfiguration(skinParam().getIHtmlColorSet());
+		} else {
+			borderColor = getRose().getHtmlColor(skinParam(), ColorParam.activityDiamondBorder);
+			backColor = branch0.getColor() == null ? getRose().getHtmlColor(skinParam(),
+					ColorParam.activityDiamondBackground) : branch0.getColor();
+			arrowColor = Rainbow.build(skinParam());
+			fcTest = new FontConfiguration(skinParam(), testParam, null)
 					.changeColor(fontColor(FontParam.ACTIVITY_DIAMOND));
+			fcArrow = new FontConfiguration(skinParam(), FontParam.ARROW, null);
+		}
 
 		if (thens.size() > 1) {
 			if (pragma.useVerticalIf()/* OptionFlags.USE_IF_VERTICAL */)

src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorRepeat.java

@@ -40,6 +40,7 @@ import java.util.List;
 
 import net.sourceforge.plantuml.ColorParam;
 import net.sourceforge.plantuml.FontParam;
+import net.sourceforge.plantuml.SkinParam;
 import net.sourceforge.plantuml.activitydiagram3.LinkRendering;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Arrows;
 import net.sourceforge.plantuml.activitydiagram3.ftile.BoxStyle;
@@ -57,9 +58,10 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileDiamond;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.graphic.FontConfiguration;
 import net.sourceforge.plantuml.graphic.HtmlColor;
-import net.sourceforge.plantuml.graphic.HtmlColorAndStyle;
 import net.sourceforge.plantuml.graphic.Rainbow;
 import net.sourceforge.plantuml.graphic.color.Colors;
+import net.sourceforge.plantuml.style.PName;
+import net.sourceforge.plantuml.style.Style;
 import net.sourceforge.plantuml.svek.ConditionStyle;
 import net.sourceforge.plantuml.ugraphic.UGraphic;
 import net.sourceforge.plantuml.ugraphic.UTranslate;
@@ -77,17 +79,33 @@ public class FtileFactoryDelegatorRepeat extends FtileFactoryDelegator {
 
 		final ConditionStyle conditionStyle = skinParam().getConditionStyle();
 
-		final HtmlColor borderColor = getRose().getHtmlColor(skinParam(), ColorParam.activityDiamondBorder);
+		final HtmlColor borderColor;
-		final HtmlColor backColor = color == null ? getRose().getHtmlColor(skinParam(),
+		final HtmlColor backColor;
-				ColorParam.activityDiamondBackground) : color;
+		final Rainbow arrowColor;
-		final Rainbow arrowColor = HtmlColorAndStyle.build(skinParam());
+		final FontConfiguration fcDiamond;
+		final FontConfiguration fcArrow;
+		if (SkinParam.USE_STYLES()) {
+			final Style styleArrow = getDefaultStyleDefinitionArrow().getMergedStyle(
+					skinParam().getCurrentStyleBuilder());
+			final Style styleDiamond = getDefaultStyleDefinitionDiamond().getMergedStyle(
+					skinParam().getCurrentStyleBuilder());
+			borderColor = styleDiamond.value(PName.LineColor).asColor(skinParam().getIHtmlColorSet());
+			backColor = styleDiamond.value(PName.BackGroundColor).asColor(skinParam().getIHtmlColorSet());
+			arrowColor = Rainbow.build(styleArrow, skinParam().getIHtmlColorSet());
+			fcDiamond = styleDiamond.getFontConfiguration(skinParam().getIHtmlColorSet());
+			fcArrow = styleArrow.getFontConfiguration(skinParam().getIHtmlColorSet());
+		} else {
+			borderColor = getRose().getHtmlColor(skinParam(), ColorParam.activityDiamondBorder);
+			backColor = color == null ? getRose().getHtmlColor(skinParam(), ColorParam.activityDiamondBackground)
+					: color;
+			arrowColor = Rainbow.build(skinParam());
+			fcDiamond = new FontConfiguration(skinParam(), FontParam.ACTIVITY_DIAMOND, null);
+			fcArrow = new FontConfiguration(skinParam(), FontParam.ARROW, null);
+		}
 
 		final LinkRendering endRepeatLinkRendering = repeat.getOutLinkRendering();
 		final Rainbow endRepeatLinkColor = endRepeatLinkRendering == null ? null : endRepeatLinkRendering.getRainbow();
 
-		final FontConfiguration fcDiamond = new FontConfiguration(skinParam(), FontParam.ACTIVITY_DIAMOND, null);
-		final FontConfiguration fcArrow = new FontConfiguration(skinParam(), FontParam.ARROW, null);
-
 		final Ftile backStart = Display.isNull(startLabel) ? null : this.activity(startLabel, swimlane, BoxStyle.PLAIN,
 				Colors.empty());
 

src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorSwitch.java

@@ -49,14 +49,13 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.FtileMinWidth;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane;
 import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.cond.FtileSwitchNude;
 import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.cond.FtileSwitchWithDiamonds;
-import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.cond.FtileSwitchWithOneLink;
 import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.cond.FtileSwitchWithManyLinks;
+import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.cond.FtileSwitchWithOneLink;
 import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileDiamondInside;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.graphic.FontConfiguration;
 import net.sourceforge.plantuml.graphic.HorizontalAlignment;
 import net.sourceforge.plantuml.graphic.HtmlColor;
-import net.sourceforge.plantuml.graphic.HtmlColorAndStyle;
 import net.sourceforge.plantuml.graphic.Rainbow;
 import net.sourceforge.plantuml.graphic.TextBlock;
 import net.sourceforge.plantuml.graphic.TextBlockUtils;
@@ -101,7 +100,7 @@ public class FtileFactoryDelegatorSwitch extends FtileFactoryDelegator {
 		for (Branch branch : branches) {
 			ftiles.add(new FtileMinWidth(branch.getFtile(), 30));
 		}
-		final Rainbow arrowColor = HtmlColorAndStyle.build(skinParam());
+		final Rainbow arrowColor = Rainbow.build(skinParam());
 		if (ftiles.size() == 1) {
 			final FtileSwitchWithOneLink result = new FtileSwitchWithOneLink(ftiles, branches, swimlane, diamond1,
 					diamond2, getStringBounder(), arrowColor);

src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorWhile.java

@@ -39,6 +39,7 @@ import java.util.List;
 
 import net.sourceforge.plantuml.ColorParam;
 import net.sourceforge.plantuml.FontParam;
+import net.sourceforge.plantuml.SkinParam;
 import net.sourceforge.plantuml.activitydiagram3.Instruction;
 import net.sourceforge.plantuml.activitydiagram3.LinkRendering;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Arrows;
@@ -56,8 +57,9 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.WeldingPoint;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.graphic.FontConfiguration;
 import net.sourceforge.plantuml.graphic.HtmlColor;
-import net.sourceforge.plantuml.graphic.HtmlColorAndStyle;
 import net.sourceforge.plantuml.graphic.Rainbow;
+import net.sourceforge.plantuml.style.PName;
+import net.sourceforge.plantuml.style.Style;
 import net.sourceforge.plantuml.svek.ConditionStyle;
 import net.sourceforge.plantuml.ugraphic.UGraphic;
 import net.sourceforge.plantuml.ugraphic.UTranslate;
@@ -71,22 +73,38 @@ public class FtileFactoryDelegatorWhile extends FtileFactoryDelegator {
 	@Override
 	public Ftile createWhile(Swimlane swimlane, Ftile whileBlock, Display test, Display yes, Display out,
 			LinkRendering afterEndwhile, HtmlColor color, Instruction specialOut) {
-		final HtmlColor borderColor = getRose().getHtmlColor(skinParam(), ColorParam.activityDiamondBorder);
-		final HtmlColor backColor = color == null ? getRose().getHtmlColor(skinParam(),
-				ColorParam.activityDiamondBackground) : color;
-		final Rainbow arrowColor = HtmlColorAndStyle.build(skinParam());
 
+		final HtmlColor borderColor;
+		final HtmlColor backColor;
+		final Rainbow arrowColor;
+		final FontConfiguration fontArrow;
+		final FontConfiguration fcTest;
 		final ConditionStyle conditionStyle = skinParam().getConditionStyle();
 		final FontParam testParam = conditionStyle == ConditionStyle.INSIDE ? FontParam.ACTIVITY_DIAMOND
 				: FontParam.ARROW;
-		final FontConfiguration fcTest = new FontConfiguration(skinParam(), testParam, null);
+		if (SkinParam.USE_STYLES()) {
+			final Style styleArrow = getDefaultStyleDefinitionArrow().getMergedStyle(
+					skinParam().getCurrentStyleBuilder());
+			final Style styleDiamond = getDefaultStyleDefinitionDiamond().getMergedStyle(
+					skinParam().getCurrentStyleBuilder());
+			borderColor = styleDiamond.value(PName.LineColor).asColor(skinParam().getIHtmlColorSet());
+			backColor = styleDiamond.value(PName.BackGroundColor).asColor(skinParam().getIHtmlColorSet());
+			arrowColor = Rainbow.build(styleArrow, skinParam().getIHtmlColorSet());
+			fontArrow = styleArrow.getFontConfiguration(skinParam().getIHtmlColorSet());
+			fcTest = styleDiamond.getFontConfiguration(skinParam().getIHtmlColorSet());
+		} else {
+			borderColor = getRose().getHtmlColor(skinParam(), ColorParam.activityDiamondBorder);
+			backColor = color == null ? getRose().getHtmlColor(skinParam(), ColorParam.activityDiamondBackground)
+					: color;
+			arrowColor = Rainbow.build(skinParam());
+			fontArrow = new FontConfiguration(skinParam(), FontParam.ARROW, null);
+			fcTest = new FontConfiguration(skinParam(), testParam, null);
+		}
 
 		final LinkRendering endInlinkRendering = whileBlock.getOutLinkRendering();
 		final Rainbow endInlinkColor = endInlinkRendering == null || endInlinkRendering.getRainbow().size() == 0 ? arrowColor
 				: endInlinkRendering.getRainbow();
 
-		final FontConfiguration fontArrow = new FontConfiguration(skinParam(), FontParam.ARROW, null);
-
 		Ftile result = FtileWhile.create(swimlane, whileBlock, test, borderColor, backColor, arrowColor, yes, out,
 				endInlinkColor, afterEndwhile, fontArrow, getFactory(), conditionStyle, fcTest, specialOut);
 

src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileGroup.java

@@ -43,6 +43,7 @@ import net.sourceforge.plantuml.AlignmentParam;
 import net.sourceforge.plantuml.FontParam;
 import net.sourceforge.plantuml.ISkinParam;
 import net.sourceforge.plantuml.LineParam;
+import net.sourceforge.plantuml.SkinParam;
 import net.sourceforge.plantuml.activitydiagram3.LinkRendering;
 import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractFtile;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile;
@@ -60,6 +61,10 @@ import net.sourceforge.plantuml.graphic.TextBlock;
 import net.sourceforge.plantuml.graphic.TextBlockUtils;
 import net.sourceforge.plantuml.graphic.UGraphicInterceptorUDrawable;
 import net.sourceforge.plantuml.graphic.USymbol;
+import net.sourceforge.plantuml.style.PName;
+import net.sourceforge.plantuml.style.SName;
+import net.sourceforge.plantuml.style.Style;
+import net.sourceforge.plantuml.style.StyleSignature;
 import net.sourceforge.plantuml.svek.UGraphicForSnake;
 import net.sourceforge.plantuml.ugraphic.LimitFinder;
 import net.sourceforge.plantuml.ugraphic.MinMax;
@@ -77,10 +82,15 @@ public class FtileGroup extends AbstractFtile {
 	private final TextBlock headerNote;
 	private final HtmlColor borderColor;
 	private final HtmlColor backColor;
+	private final double shadowing;
 	private final UStroke stroke;
 	private final USymbol type;
 	private final double roundCorner;
 
+	final public StyleSignature getDefaultStyleDefinitionPartition() {
+		return StyleSignature.of(SName.root, SName.element, SName.activityDiagram, SName.partition);
+	}
+
 	public FtileGroup(Ftile inner, Display title, Display displayNote, HtmlColor arrowColor, HtmlColor backColor,
 			HtmlColor titleColor, ISkinParam skinParam, HtmlColor borderColor, USymbol type, double roundCorner) {
 		super(inner.skinParam());
@@ -89,11 +99,19 @@ public class FtileGroup extends AbstractFtile {
 		this.backColor = backColor == null ? HtmlColorUtils.WHITE : backColor;
 		this.inner = FtileUtils.addHorizontalMargin(inner, 10);
 		this.borderColor = borderColor == null ? HtmlColorUtils.BLACK : borderColor;
-		final UFont font = skinParam.getFont(null, false, FontParam.PARTITION);
 
+		final FontConfiguration fc;
+		if (SkinParam.USE_STYLES()) {
+			final Style style = getDefaultStyleDefinitionPartition().getMergedStyle(skinParam.getCurrentStyleBuilder());
+			fc = style.getFontConfiguration(getIHtmlColorSet());
+			this.shadowing = style.value(PName.Shadowing).asDouble();
+		} else {
+			final UFont font = skinParam.getFont(null, false, FontParam.PARTITION);
 			final HtmlColor fontColor = skinParam.getFontHtmlColor(null, FontParam.PARTITION);
-		final FontConfiguration fc = new FontConfiguration(font, fontColor, skinParam.getHyperlinkColor(),
+			fc = new FontConfiguration(font, fontColor, skinParam.getHyperlinkColor(),
 					skinParam.useUnderlineForHyperlink(), skinParam.getTabSize());
+			this.shadowing = skinParam().shadowing(null) ? 3 : 0;
+		}
 		if (title == null) {
 			this.name = TextBlockUtils.empty(0, 0);
 		} else {
@@ -205,11 +223,12 @@ public class FtileGroup extends AbstractFtile {
 		final Dimension2D dimTotal = calculateDimension(stringBounder);
 
 		// final double roundCorner = type.getSkinParameter().getRoundCorner(skinParam(), null);
-		final SymbolContext symbolContext = new SymbolContext(backColor, borderColor)
+		final SymbolContext symbolContext = new SymbolContext(backColor, borderColor).withShadow(shadowing)
-				.withShadow(skinParam().shadowing(null)).withStroke(stroke).withCorner(roundCorner, 0);
+				.withStroke(stroke).withCorner(roundCorner, 0);
 
 		type.asBig(name, inner.skinParam().getHorizontalAlignment(AlignmentParam.packageTitleAlignment, null, false),
-				TextBlockUtils.empty(0, 0), dimTotal.getWidth(), dimTotal.getHeight(), symbolContext, skinParam().getStereotypeAlignment()).drawU(ug);
+				TextBlockUtils.empty(0, 0), dimTotal.getWidth(), dimTotal.getHeight(), symbolContext,
+				skinParam().getStereotypeAlignment()).drawU(ug);
 
 		final Dimension2D dimHeaderNote = headerNote.calculateDimension(stringBounder);
 		headerNote.drawU(ug.apply(new UTranslate(dimTotal.getWidth() - dimHeaderNote.getWidth() - 10,

src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileNoteAlone.java

@@ -44,6 +44,7 @@ import net.sourceforge.plantuml.ColorParam;
 import net.sourceforge.plantuml.FontParam;
 import net.sourceforge.plantuml.ISkinParam;
 import net.sourceforge.plantuml.LineBreakStrategy;
+import net.sourceforge.plantuml.SkinParam;
 import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractFtile;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile;
 import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry;
@@ -61,16 +62,25 @@ import net.sourceforge.plantuml.graphic.HtmlColor;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.TextBlock;
 import net.sourceforge.plantuml.skin.rose.Rose;
+import net.sourceforge.plantuml.style.PName;
+import net.sourceforge.plantuml.style.SName;
+import net.sourceforge.plantuml.style.Style;
+import net.sourceforge.plantuml.style.StyleSignature;
+import net.sourceforge.plantuml.style.Styleable;
 import net.sourceforge.plantuml.svek.image.Opale;
 import net.sourceforge.plantuml.ugraphic.UGraphic;
 import net.sourceforge.plantuml.ugraphic.UStroke;
 
-public class FtileNoteAlone extends AbstractFtile implements Stencil {
+public class FtileNoteAlone extends AbstractFtile implements Stencil, Styleable {
 
 	private final Opale opale;
 	private final boolean withOutPoint;
 	private final Swimlane swimlane;
 
+	public StyleSignature getDefaultStyleDefinition() {
+		return StyleSignature.of(SName.root, SName.element, SName.activityDiagram, SName.note);
+	}
+
 	@Override
 	public Collection<Ftile> getMyChildren() {
 		return Collections.emptyList();
@@ -97,15 +107,27 @@ public class FtileNoteAlone extends AbstractFtile implements Stencil {
 		this.withOutPoint = withOutPoint;
 		final Rose rose = new Rose();
 
-		final HtmlColor noteBackgroundColor = rose.getHtmlColor(skinParam, ColorParam.noteBackground);
+		final HtmlColor noteBackgroundColor;
-		final HtmlColor borderColor = rose.getHtmlColor(skinParam, ColorParam.noteBorder);
+		final HtmlColor borderColor;
+		final double shadowing;
+		if (SkinParam.USE_STYLES()) {
+			final Style style = getDefaultStyleDefinition().getMergedStyle(skinParam.getCurrentStyleBuilder());
+			noteBackgroundColor = style.value(PName.BackGroundColor).asColor(getIHtmlColorSet());
+			borderColor = style.value(PName.LineColor).asColor(getIHtmlColorSet());
+			shadowing = style.value(PName.Shadowing).asDouble();
+		} else {
+			noteBackgroundColor = rose.getHtmlColor(skinParam, ColorParam.noteBackground);
+			borderColor = rose.getHtmlColor(skinParam, ColorParam.noteBorder);
+			shadowing = skinParam.shadowing(null) ? 4 : 0;
+		}
 
 		final FontConfiguration fc = new FontConfiguration(skinParam, FontParam.NOTE, null);
 
 		final Sheet sheet = new CreoleParser(fc, skinParam.getDefaultTextAlignment(HorizontalAlignment.LEFT),
 				skinParam, CreoleMode.FULL).createSheet(note);
-		final TextBlock text = new SheetBlock2(new SheetBlock1(sheet, LineBreakStrategy.NONE, skinParam.getPadding()), this, new UStroke(1));
+		final TextBlock text = new SheetBlock2(new SheetBlock1(sheet, LineBreakStrategy.NONE, skinParam.getPadding()),
-		opale = new Opale(borderColor, noteBackgroundColor, text, skinParam.shadowing(null), false);
+				this, new UStroke(1));
+		opale = new Opale(shadowing, borderColor, noteBackgroundColor, text, false);
 
 	}
 

src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNoteOpale.java

@@ -48,6 +48,7 @@ import net.sourceforge.plantuml.Dimension2DDouble;
 import net.sourceforge.plantuml.Direction;
 import net.sourceforge.plantuml.FontParam;
 import net.sourceforge.plantuml.ISkinParam;
+import net.sourceforge.plantuml.SkinParam;
 import net.sourceforge.plantuml.activitydiagram3.PositionedNote;
 import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractFtile;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile;
@@ -67,12 +68,17 @@ import net.sourceforge.plantuml.graphic.TextBlock;
 import net.sourceforge.plantuml.sequencediagram.NotePosition;
 import net.sourceforge.plantuml.sequencediagram.NoteType;
 import net.sourceforge.plantuml.skin.rose.Rose;
+import net.sourceforge.plantuml.style.PName;
+import net.sourceforge.plantuml.style.SName;
+import net.sourceforge.plantuml.style.Style;
+import net.sourceforge.plantuml.style.StyleSignature;
+import net.sourceforge.plantuml.style.Styleable;
 import net.sourceforge.plantuml.svek.image.Opale;
 import net.sourceforge.plantuml.ugraphic.UGraphic;
 import net.sourceforge.plantuml.ugraphic.UStroke;
 import net.sourceforge.plantuml.ugraphic.UTranslate;
 
-public class FtileWithNoteOpale extends AbstractFtile implements Stencil {
+public class FtileWithNoteOpale extends AbstractFtile implements Stencil, Styleable {
 
 	private final Ftile tile;
 	private final Opale opale;
@@ -82,6 +88,10 @@ public class FtileWithNoteOpale extends AbstractFtile implements Stencil {
 	private final double suppSpace = 20;
 	private final Swimlane swimlaneNote;
 
+	public StyleSignature getDefaultStyleDefinition() {
+		return StyleSignature.of(SName.root, SName.element, SName.activityDiagram, SName.note);
+	}
+
 	public Set<Swimlane> getSwimlanes() {
 		if (swimlaneNote != null) {
 			final Set<Swimlane> result = new HashSet<Swimlane>(tile.getSwimlanes());
@@ -128,16 +138,30 @@ public class FtileWithNoteOpale extends AbstractFtile implements Stencil {
 
 		final Rose rose = new Rose();
 
-		final HtmlColor noteBackgroundColor = rose.getHtmlColor(skinParam, ColorParam.noteBackground);
+		final HtmlColor noteBackgroundColor;
-		final HtmlColor borderColor = rose.getHtmlColor(skinParam, ColorParam.noteBorder);
+		final HtmlColor borderColor;
+		final FontConfiguration fc;
 
-		final FontConfiguration fc = new FontConfiguration(skinParam, FontParam.NOTE, null);
+		final double shadowing;
+		if (SkinParam.USE_STYLES()) {
+			final Style style = getDefaultStyleDefinition().getMergedStyle(skinParam.getCurrentStyleBuilder()).eventuallyOverride(note.getColors());
+			noteBackgroundColor = style.value(PName.BackGroundColor).asColor(getIHtmlColorSet());
+			borderColor = style.value(PName.LineColor).asColor(getIHtmlColorSet());
+			fc = style.getFontConfiguration(getIHtmlColorSet());
+			shadowing = style.value(PName.Shadowing).asDouble();
+		} else {
+			noteBackgroundColor = rose.getHtmlColor(skinParam, ColorParam.noteBackground);
+			borderColor = rose.getHtmlColor(skinParam, ColorParam.noteBorder);
+			fc = new FontConfiguration(skinParam, FontParam.NOTE, null);
+			shadowing = skinParam.shadowing(null) ? 4 : 0;
+		}
 
-		final HorizontalAlignment align = skinParam.getHorizontalAlignment(AlignmentParam.noteTextAlignment, null, false);
+		final HorizontalAlignment align = skinParam.getHorizontalAlignment(AlignmentParam.noteTextAlignment, null,
+				false);
 		final Sheet sheet = new CreoleParser(fc, align, skinParam, CreoleMode.FULL).createSheet(note.getDisplay());
 		final TextBlock text = new SheetBlock2(new SheetBlock1(sheet, skinParam.wrapWidth(), skinParam.getPadding()),
 				this, new UStroke(1));
-		opale = new Opale(borderColor, noteBackgroundColor, text, skinParam.shadowing(null), withLink);
+		opale = new Opale(shadowing, borderColor, noteBackgroundColor, text, withLink);
 
 	}
 

src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNotes.java

@@ -44,6 +44,7 @@ import net.sourceforge.plantuml.Dimension2DDouble;
 import net.sourceforge.plantuml.FontParam;
 import net.sourceforge.plantuml.ISkinParam;
 import net.sourceforge.plantuml.LineBreakStrategy;
+import net.sourceforge.plantuml.SkinParam;
 import net.sourceforge.plantuml.activitydiagram3.PositionedNote;
 import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractFtile;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile;
@@ -63,6 +64,10 @@ import net.sourceforge.plantuml.graphic.TextBlock;
 import net.sourceforge.plantuml.graphic.TextBlockUtils;
 import net.sourceforge.plantuml.sequencediagram.NotePosition;
 import net.sourceforge.plantuml.skin.rose.Rose;
+import net.sourceforge.plantuml.style.PName;
+import net.sourceforge.plantuml.style.SName;
+import net.sourceforge.plantuml.style.Style;
+import net.sourceforge.plantuml.style.StyleSignature;
 import net.sourceforge.plantuml.svek.image.Opale;
 import net.sourceforge.plantuml.ugraphic.UGraphic;
 import net.sourceforge.plantuml.ugraphic.UStroke;
@@ -78,6 +83,10 @@ public class FtileWithNotes extends AbstractFtile {
 
 	private final double suppSpace = 20;
 
+	public StyleSignature getDefaultStyleDefinition() {
+		return StyleSignature.of(SName.root, SName.element, SName.activityDiagram, SName.note);
+	}
+
 	public Set<Swimlane> getSwimlanes() {
 		return tile.getSwimlanes();
 	}
@@ -96,12 +105,30 @@ public class FtileWithNotes extends AbstractFtile {
 
 		final Rose rose = new Rose();
 
-		final HtmlColor noteBackgroundColor = rose.getHtmlColor(skinParam, ColorParam.noteBackground);
-		final HtmlColor borderColor = rose.getHtmlColor(skinParam, ColorParam.noteBorder);
-
-		final FontConfiguration fc = new FontConfiguration(skinParam, FontParam.NOTE, null);
-
 		for (PositionedNote note : notes) {
+			ISkinParam skinParam2 = skinParam;
+			if (note.getColors() != null) {
+				skinParam2 = note.getColors().mute(skinParam2);
+			}
+			final HtmlColor noteBackgroundColor;
+			final HtmlColor borderColor;
+			final FontConfiguration fc;
+			final double shadowing;
+
+			if (SkinParam.USE_STYLES()) {
+				final Style style = getDefaultStyleDefinition().getMergedStyle(skinParam.getCurrentStyleBuilder())
+						.eventuallyOverride(note.getColors());
+				noteBackgroundColor = style.value(PName.BackGroundColor).asColor(getIHtmlColorSet());
+				borderColor = style.value(PName.LineColor).asColor(getIHtmlColorSet());
+				fc = style.getFontConfiguration(getIHtmlColorSet());
+				shadowing = style.value(PName.Shadowing).asDouble();
+			} else {
+				noteBackgroundColor = rose.getHtmlColor(skinParam2, ColorParam.noteBackground);
+				borderColor = rose.getHtmlColor(skinParam2, ColorParam.noteBorder);
+				fc = new FontConfiguration(skinParam, FontParam.NOTE, null);
+				shadowing = skinParam.shadowing(null) ? 4 : 0;
+			}
+
 			final Sheet sheet = new CreoleParser(fc, skinParam.getDefaultTextAlignment(HorizontalAlignment.LEFT),
 					skinParam, CreoleMode.FULL).createSheet(note.getDisplay());
 			final SheetBlock1 sheet1 = new SheetBlock1(sheet, LineBreakStrategy.NONE, skinParam.getPadding());
@@ -116,7 +143,7 @@ public class FtileWithNotes extends AbstractFtile {
 				}
 			}, new UStroke());
 
-			final Opale opale = new Opale(borderColor, noteBackgroundColor, sheet2, skinParam.shadowing(null), false);
+			final Opale opale = new Opale(shadowing, borderColor, noteBackgroundColor, sheet2, false);
 			final TextBlock opaleMarged = TextBlockUtils.withMargin(opale, 10, 10);
 			if (note.getNotePosition() == NotePosition.LEFT) {
 				if (left == null) {

src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderFork.java

@@ -42,6 +42,7 @@ import java.util.List;
 
 import net.sourceforge.plantuml.ColorParam;
 import net.sourceforge.plantuml.ISkinParam;
+import net.sourceforge.plantuml.SkinParam;
 import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractConnection;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Arrows;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Connection;
@@ -54,19 +55,19 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Snake;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane;
 import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileBlackBlock;
 import net.sourceforge.plantuml.cucadiagram.Display;
-import net.sourceforge.plantuml.graphic.HtmlColorAndStyle;
 import net.sourceforge.plantuml.graphic.Rainbow;
 import net.sourceforge.plantuml.graphic.StringBounder;
+import net.sourceforge.plantuml.style.Style;
 import net.sourceforge.plantuml.ugraphic.UGraphic;
 import net.sourceforge.plantuml.ugraphic.UTranslate;
 
-public class ParallelBuilderFork extends ParallelFtilesBuilder {
+public class ParallelBuilderFork extends AbstractParallelFtilesBuilder {
 
 	private final String label;
 
-	public ParallelBuilderFork(ISkinParam skinParam, StringBounder stringBounder,
+	public ParallelBuilderFork(ISkinParam skinParam, StringBounder stringBounder, final List<Ftile> list, Ftile inner,
-			final List<Ftile> list, Ftile inner, Swimlane swimlane, String label) {
+			String label) {
-		super(skinParam, stringBounder, list, inner, swimlane);
+		super(skinParam, stringBounder, list, inner);
 		this.label = label;
 	}
 
@@ -79,13 +80,21 @@ public class ParallelBuilderFork extends ParallelFtilesBuilder {
 		double x = 0;
 		for (Ftile tmp : getList()) {
 			final Dimension2D dim = tmp.calculateDimension(getStringBounder());
-			conns.add(new ConnectionIn(black, tmp, x, tmp.getInLinkRendering().getRainbow(
+			final Rainbow def;
-					HtmlColorAndStyle.build(skinParam()))));
+			if (SkinParam.USE_STYLES()) {
+				Style style = getDefaultStyleDefinition().getMergedStyle(skinParam().getCurrentStyleBuilder());
+				def = Rainbow.build(style, skinParam().getIHtmlColorSet());
+			} else {
+				def = Rainbow.build(skinParam());
+			}
+			final Rainbow rainbow = tmp.getInLinkRendering().getRainbow(def);
+			conns.add(new ConnectionIn(black, tmp, x, rainbow));
 			x += dim.getWidth();
 		}
 
 		result = FtileUtils.addConnection(result, conns);
-		((FtileBlackBlock) black).setBlackBlockDimension(result.calculateDimension(getStringBounder()).getWidth(), barHeight);
+		((FtileBlackBlock) black).setBlackBlockDimension(result.calculateDimension(getStringBounder()).getWidth(),
+				barHeight);
 
 		return new FtileAssemblySimple(black, result);
 	}
@@ -94,7 +103,8 @@ public class ParallelBuilderFork extends ParallelFtilesBuilder {
 	protected Ftile doStep2(Ftile result) {
 		final Ftile out = new FtileBlackBlock(skinParam(), getRose().getHtmlColor(skinParam(), ColorParam.activityBar),
 				getList().get(0).getSwimlaneIn());
-		((FtileBlackBlock) out).setBlackBlockDimension(result.calculateDimension(getStringBounder()).getWidth(), barHeight);
+		((FtileBlackBlock) out).setBlackBlockDimension(result.calculateDimension(getStringBounder()).getWidth(),
+				barHeight);
 		if (label != null) {
 			((FtileBlackBlock) out).setLabel(getTextBlock(Display.getWithNewlines(label)));
 		}
@@ -104,8 +114,15 @@ public class ParallelBuilderFork extends ParallelFtilesBuilder {
 		for (Ftile tmp : getList()) {
 			final UTranslate translate0 = new UTranslate(0, barHeight);
 			final Dimension2D dim = tmp.calculateDimension(getStringBounder());
-			conns.add(new ConnectionOut(translate0, tmp, out, x, tmp.getOutLinkRendering().getRainbow(
+			final Rainbow def;
-					HtmlColorAndStyle.build(skinParam())), getHeightOfMiddle()));
+			if (SkinParam.USE_STYLES()) {
+				Style style = getDefaultStyleDefinitionArrow().getMergedStyle(skinParam().getCurrentStyleBuilder());
+				def = Rainbow.build(style, skinParam().getIHtmlColorSet());
+			} else {
+				def = Rainbow.build(skinParam());
+			}
+			final Rainbow rainbow = tmp.getOutLinkRendering().getRainbow(def);
+			conns.add(new ConnectionOut(translate0, tmp, out, x, rainbow, getHeightOfMiddle()));
 			x += dim.getWidth();
 		}
 		result = FtileUtils.addConnection(result, conns);

src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderMerge.java

@@ -42,6 +42,7 @@ import java.util.List;
 
 import net.sourceforge.plantuml.ColorParam;
 import net.sourceforge.plantuml.ISkinParam;
+import net.sourceforge.plantuml.SkinParam;
 import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractConnection;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Arrows;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Connection;
@@ -51,23 +52,21 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.FtileAssemblySimple;
 import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry;
 import net.sourceforge.plantuml.activitydiagram3.ftile.FtileUtils;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Snake;
-import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane;
 import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileBlackBlock;
 import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileDiamond;
 import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.graphic.HtmlColor;
-import net.sourceforge.plantuml.graphic.HtmlColorAndStyle;
 import net.sourceforge.plantuml.graphic.Rainbow;
 import net.sourceforge.plantuml.graphic.StringBounder;
+import net.sourceforge.plantuml.style.Style;
 import net.sourceforge.plantuml.ugraphic.UGraphic;
 import net.sourceforge.plantuml.ugraphic.UPolygon;
 import net.sourceforge.plantuml.ugraphic.UTranslate;
 
-public class ParallelBuilderMerge extends ParallelFtilesBuilder {
+public class ParallelBuilderMerge extends AbstractParallelFtilesBuilder {
 
-	public ParallelBuilderMerge(ISkinParam skinParam, StringBounder stringBounder,
+	public ParallelBuilderMerge(ISkinParam skinParam, StringBounder stringBounder, final List<Ftile> list, Ftile inner) {
-			final List<Ftile> list, Ftile inner, Swimlane swimlane) {
+		super(skinParam, stringBounder, list, inner);
-		super(skinParam, stringBounder, list, inner, swimlane);
 	}
 
 	@Override
@@ -80,13 +79,21 @@ public class ParallelBuilderMerge extends ParallelFtilesBuilder {
 		double x = 0;
 		for (Ftile tmp : getList()) {
 			final Dimension2D dim = tmp.calculateDimension(getStringBounder());
-			conns.add(new ConnectionIn(black, tmp, x, tmp.getInLinkRendering().getRainbow(
+			final Rainbow def;
-					HtmlColorAndStyle.build(skinParam()))));
+			if (SkinParam.USE_STYLES()) {
+				Style style = getDefaultStyleDefinition().getMergedStyle(skinParam().getCurrentStyleBuilder());
+				def = Rainbow.build(style, skinParam().getIHtmlColorSet());
+			} else {
+				def = Rainbow.build(skinParam());
+			}
+			final Rainbow rainbow = tmp.getInLinkRendering().getRainbow(def);
+			conns.add(new ConnectionIn(black, tmp, x, rainbow));
 			x += dim.getWidth();
 		}
 
 		result = FtileUtils.addConnection(result, conns);
-		((FtileBlackBlock) black).setBlackBlockDimension(result.calculateDimension(getStringBounder()).getWidth(), barHeight);
+		((FtileBlackBlock) black).setBlackBlockDimension(result.calculateDimension(getStringBounder()).getWidth(),
+				barHeight);
 
 		return new FtileAssemblySimple(black, result);
 	}
@@ -95,7 +102,7 @@ public class ParallelBuilderMerge extends ParallelFtilesBuilder {
 	protected Ftile doStep2(Ftile result) {
 		final HtmlColor borderColor = getRose().getHtmlColor(skinParam(), ColorParam.activityDiamondBorder);
 		final HtmlColor backColor = getRose().getHtmlColor(skinParam(), ColorParam.activityDiamondBackground);
-		final Ftile out = new FtileDiamond(skinParam(), backColor, borderColor, swimlane());
+		final Ftile out = new FtileDiamond(skinParam(), backColor, borderColor, swimlaneOutForStep2());
 		result = new FtileAssemblySimple(result, out);
 		final List<Connection> conns = new ArrayList<Connection>();
 		final UTranslate diamondTranslate = result.getTranslateFor(out, getStringBounder());
@@ -104,8 +111,15 @@ public class ParallelBuilderMerge extends ParallelFtilesBuilder {
 		for (Ftile tmp : getList()) {
 			final Dimension2D dim = tmp.calculateDimension(getStringBounder());
 			final UTranslate translate0 = new UTranslate(x, barHeight);
-			conns.add(new ConnectionHorizontalThenVertical(tmp, out, tmp.getOutLinkRendering().getRainbow(
+			final Rainbow def;
-					HtmlColorAndStyle.build(skinParam())), translate0, diamondTranslate, i));
+			if (SkinParam.USE_STYLES()) {
+				Style style = getDefaultStyleDefinition().getMergedStyle(skinParam().getCurrentStyleBuilder());
+				def = Rainbow.build(style, skinParam().getIHtmlColorSet());
+			} else {
+				def = Rainbow.build(skinParam());
+			}
+			final Rainbow rainbow = tmp.getOutLinkRendering().getRainbow(def);
+			conns.add(new ConnectionHorizontalThenVertical(tmp, out, rainbow, translate0, diamondTranslate, i));
 			x += dim.getWidth();
 			i++;
 		}

src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderSplit.java

@@ -35,243 +35,281 @@
  */
 package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact;
 
-import java.awt.geom.Dimension2D;
+import java.awt.geom.Point2D;
 import java.util.ArrayList;
 import java.util.List;
 
 import net.sourceforge.plantuml.ISkinParam;
+import net.sourceforge.plantuml.SkinParam;
+import net.sourceforge.plantuml.activitydiagram3.LinkRendering;
 import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractConnection;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Arrows;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Connection;
 import net.sourceforge.plantuml.activitydiagram3.ftile.ConnectionTranslatable;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile;
+import net.sourceforge.plantuml.activitydiagram3.ftile.FtileAssemblySimple;
 import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry;
 import net.sourceforge.plantuml.activitydiagram3.ftile.FtileKilled;
 import net.sourceforge.plantuml.activitydiagram3.ftile.FtileUtils;
-import net.sourceforge.plantuml.activitydiagram3.ftile.MergeStrategy;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Snake;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane;
-import net.sourceforge.plantuml.graphic.HtmlColorAndStyle;
+import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileThinSplit;
+import net.sourceforge.plantuml.cucadiagram.Display;
+import net.sourceforge.plantuml.graphic.HtmlColor;
 import net.sourceforge.plantuml.graphic.Rainbow;
 import net.sourceforge.plantuml.graphic.StringBounder;
-import net.sourceforge.plantuml.graphic.TextBlock;
+import net.sourceforge.plantuml.style.SName;
+import net.sourceforge.plantuml.style.Style;
+import net.sourceforge.plantuml.style.StyleSignature;
 import net.sourceforge.plantuml.ugraphic.UGraphic;
 import net.sourceforge.plantuml.ugraphic.UTranslate;
 
-public class ParallelBuilderSplit extends ParallelFtilesBuilder {
+public class ParallelBuilderSplit extends AbstractParallelFtilesBuilder {
 
-	public ParallelBuilderSplit(ISkinParam skinParam, StringBounder stringBounder,
+	public ParallelBuilderSplit(ISkinParam skinParam, StringBounder stringBounder, final List<Ftile> list, Ftile inner) {
-			final List<Ftile> list, Ftile inner, Swimlane swimlane) {
+		super(skinParam, stringBounder, list, inner);
-		super(skinParam, stringBounder, list, inner, swimlane);
+	}
+
+	@Override
+	public StyleSignature getDefaultStyleDefinition() {
+		return StyleSignature.of(SName.root, SName.element, SName.activityDiagram, SName.arrow);
 	}
 
 	@Override
 	protected Ftile doStep1() {
 		Ftile result = getMiddle();
 		final List<Connection> conns = new ArrayList<Connection>();
-
+		final Rainbow thinColor;
-		double x1 = 0;
+		if (SkinParam.USE_STYLES()) {
-		for (Ftile tmp : getList()) {
+			Style style = getDefaultStyleDefinition().getMergedStyle(skinParam().getCurrentStyleBuilder());
-			final Dimension2D dim = tmp.calculateDimension(getStringBounder());
+			thinColor = Rainbow.build(style, skinParam().getIHtmlColorSet());
-			conns.add(new ConnectionIn(tmp, x1, tmp.getInLinkRendering().getRainbow(
+		} else {
-					HtmlColorAndStyle.build(skinParam())), getTextBlock(tmp.getInLinkRendering())));
+			thinColor = result.getInLinkRendering().getRainbow(Rainbow.build(skinParam()));
-			x1 += dim.getWidth();
 		}
-		final double totalWidth1 = result.calculateDimension(getStringBounder()).getWidth();
+		final Ftile thin = new FtileThinSplit(skinParam(), getThin1Color(thinColor), getList().get(0).getSwimlaneIn());
-		conns.add(new ConnectionHline2(result, HtmlColorAndStyle.build(skinParam()), 0, getList(), totalWidth1));
+		double x = 0;
+		double first = 0;
+		double last = 0;
+		for (Ftile tmp : getList()) {
+			final FtileGeometry dim = tmp.calculateDimension(getStringBounder());
+			if (first == 0) {
+				first = x + dim.getLeft();
+			}
+			last = x + dim.getLeft();
+
+			final LinkRendering inLinkRendering = tmp.getInLinkRendering();
+			final Rainbow rainbow;
+			if (SkinParam.USE_STYLES()) {
+				Style style = getDefaultStyleDefinition().getMergedStyle(skinParam().getCurrentStyleBuilder());
+				rainbow = inLinkRendering.getRainbow(Rainbow.build(style, skinParam().getIHtmlColorSet()));
+			} else {
+				rainbow = inLinkRendering.getRainbow(Rainbow.build(skinParam()));
+			}
+
+			conns.add(new ConnectionIn(thin, tmp, x, rainbow));
+			x += dim.getWidth();
+		}
+
 		result = FtileUtils.addConnection(result, conns);
-		return result;
+		final FtileGeometry geom = result.calculateDimension(getStringBounder());
+		if (last < geom.getLeft()) {
+			last = geom.getLeft();
+		}
+		if (first > geom.getLeft()) {
+			first = geom.getLeft();
+		}
+		((FtileThinSplit) thin).setGeom(first, last, result.calculateDimension(getStringBounder()).getWidth());
+
+		return new FtileAssemblySimple(thin, result);
+	}
+
+	private HtmlColor getThin1Color(final Rainbow thinColor) {
+		for (Ftile tmp : getList()) {
+			final Rainbow rainbow;
+			final LinkRendering inLinkRendering = tmp.getInLinkRendering();
+			if (SkinParam.USE_STYLES()) {
+				Style style = getDefaultStyleDefinition().getMergedStyle(skinParam().getCurrentStyleBuilder());
+				rainbow = inLinkRendering.getRainbow(Rainbow.build(style, skinParam().getIHtmlColorSet()));
+			} else {
+				rainbow = inLinkRendering.getRainbow(Rainbow.build(skinParam()));
+			}
+			if (rainbow.isInvisible() == false) {
+				return thinColor.getColor();
+			}
+		}
+		return null;
+	}
+
+	private boolean hasOut() {
+		for (Ftile tmp : getList()) {
+			final boolean hasOutTmp = tmp.calculateDimension(getStringBounder()).hasPointOut();
+			if (hasOutTmp) {
+				return true;
+			}
+		}
+		return false;
 	}
 
 	@Override
 	protected Ftile doStep2(Ftile result) {
-		final List<Connection> conns2 = new ArrayList<Connection>();
+
-		double x2 = 0;
+		final FtileGeometry geom = result.calculateDimension(getStringBounder());
-		boolean hasOut = false;
+		if (hasOut() == false) {
-		for (Ftile tmp : getList()) {
+			return new FtileKilled(result);
-			final Dimension2D dim = tmp.calculateDimension(getStringBounder());
-			final boolean hasOutTmp = tmp.calculateDimension(getStringBounder()).hasPointOut();
-			if (hasOutTmp) {
-				conns2.add(new ConnectionOut(tmp, x2, tmp.getOutLinkRendering().getRainbow(
-						HtmlColorAndStyle.build(skinParam())), getHeightOfMiddle(), getTextBlock(tmp
-						.getOutLinkRendering())));
-				hasOut = true;
-			}
-			x2 += dim.getWidth();
 		}
 
-		if (hasOut) {
+		final Rainbow thinColor;
-			final double totalWidth2 = result.calculateDimension(getStringBounder()).getWidth();
+		final LinkRendering inLinkRendering = result.getInLinkRendering();
-			conns2.add(new ConnectionHline2(result, HtmlColorAndStyle.build(skinParam()), getHeightOfMiddle(),
+		if (SkinParam.USE_STYLES()) {
-					getList(), totalWidth2));
+			Style style = getDefaultStyleDefinition().getMergedStyle(skinParam().getCurrentStyleBuilder());
-			result = FtileUtils.addConnection(result, conns2);
+			thinColor = inLinkRendering.getRainbow(Rainbow.build(style, skinParam().getIHtmlColorSet()));
 		} else {
-			result = new FtileKilled(result);
+			thinColor = inLinkRendering.getRainbow(Rainbow.build(skinParam()));
 		}
+
+		final Ftile out = new FtileThinSplit(skinParam(), thinColor.getColor(), swimlaneOutForStep2());
+		result = new FtileAssemblySimple(result, out);
+		final List<Connection> conns = new ArrayList<Connection>();
+		double x = 0;
+		double first = 0;
+		double last = 0;
+		for (Ftile tmp : getList()) {
+			final UTranslate translate0 = new UTranslate(0, 1.5);
+			final FtileGeometry dim = tmp.calculateDimension(getStringBounder());
+			if (dim.hasPointOut()) {
+				if (first == 0) {
+					first = x + dim.getLeft();
+				}
+				last = x + dim.getLeft();
+			}
+
+			final Rainbow rainbow;
+			final LinkRendering outLinkRendering = tmp.getOutLinkRendering();
+			if (SkinParam.USE_STYLES()) {
+				Style style = getDefaultStyleDefinition().getMergedStyle(skinParam().getCurrentStyleBuilder());
+				rainbow = outLinkRendering.getRainbow(Rainbow.build(style, skinParam().getIHtmlColorSet()));
+			} else {
+				rainbow = outLinkRendering.getRainbow(Rainbow.build(skinParam()));
+			}
+
+			conns.add(new ConnectionOut(translate0, tmp, out, x, rainbow, getHeightOfMiddle()));
+			x += dim.getWidth();
+		}
+		if (last < geom.getLeft()) {
+			last = geom.getLeft();
+		}
+		if (first > geom.getLeft()) {
+			first = geom.getLeft();
+		}
+		((FtileThinSplit) out).setGeom(first, last, geom.getWidth());
+		result = FtileUtils.addConnection(result, conns);
 		return result;
 	}
 
-	static class ConnectionHline2 extends AbstractConnection {
+	class ConnectionIn extends AbstractConnection implements ConnectionTranslatable {
-
-		private final Ftile inner;
-		private final double y;
-		private final Rainbow arrowColor;
-		private final List<Ftile> list;
-		private final double totalWidth;
-
-		public ConnectionHline2(Ftile inner, Rainbow arrowColor, double y, List<Ftile> list, double totalWidth) {
-			super(null, null);
-			this.inner = inner;
-			this.y = y;
-			this.arrowColor = arrowColor;
-			this.list = list;
-			this.totalWidth = totalWidth;
-		}
-
-		public void drawU(UGraphic ug) {
-			double minX = Double.MAX_VALUE;
-			double maxX = 0;
-			if (y == 0 && ug instanceof UGraphicInterceptorOneSwimlane) {
-				final Swimlane intoSw = ((UGraphicInterceptorOneSwimlane) ug).getSwimlane();
-				boolean found = false;
-				for (Ftile tmp : list) {
-					if (tmp.getSwimlaneIn() == intoSw) {
-						found = true;
-					}
-				}
-				if (found == false) {
-					return;
-				}
-			}
-			final StringBounder stringBounder = ug.getStringBounder();
-			for (Ftile tmp : list) {
-				if (y > 0 && tmp.calculateDimension(stringBounder).hasPointOut() == false) {
-					continue;
-				}
-				final UTranslate ut = inner.getTranslateFor(tmp, stringBounder);
-				if (ut == null) {
-					continue;
-				}
-				final double middle = tmp.calculateDimension(stringBounder).translate(ut).getLeft();
-				minX = Math.min(minX, middle);
-				maxX = Math.max(maxX, middle);
-			}
-			if (minX > totalWidth / 2) {
-				minX = totalWidth / 2;
-			}
-			if (maxX < totalWidth / 2) {
-				maxX = totalWidth / 2;
-			}
-
-			final Snake s = new Snake(arrowHorizontalAlignment(), arrowColor);
-			s.goUnmergeable(MergeStrategy.NONE);
-			s.addPoint(minX, y);
-			s.addPoint(maxX, y);
-			ug.draw(s);
-		}
-	}
-
-	static class ConnectionHline3 extends AbstractConnection implements ConnectionTranslatable {
-
-		private final Ftile inner;
-		private final double y;
-		private final Rainbow arrowColor;
-		private final List<Ftile> list;
-		private final double totalWidth;
-
-		public ConnectionHline3(Ftile inner, Rainbow arrowColor, double y, List<Ftile> list, double totalWidth) {
-			super(null, null);
-			this.inner = inner;
-			this.y = y;
-			this.arrowColor = arrowColor;
-			this.list = list;
-			this.totalWidth = totalWidth;
-		}
-
-		public void drawU(UGraphic ug) {
-			throw new UnsupportedOperationException();
-		}
-
-		public void drawTranslate(UGraphic ug, UTranslate translate1, UTranslate translate2) {
-			final StringBounder stringBounder = ug.getStringBounder();
-			final UTranslate left = inner.getSwimlaneIn().getTranslate();
-			double minX = inner.calculateDimension(stringBounder).getLeft() + left.getDx();
-			double maxX = minX;
-
-			for (Ftile tmp : list) {
-				final FtileGeometry tmpGeom = tmp.calculateDimension(stringBounder);
-				final UTranslate tpos = inner.getTranslateFor(tmp, stringBounder);
-				for (Swimlane sw : tmp.getSwimlanes()) {
-					final double x = tmpGeom.translate(sw.getTranslate().compose(tpos)).getLeft();
-					minX = Math.min(minX, x);
-					maxX = Math.max(maxX, x);
-				}
-			}
-			final Dimension2D dimInner = inner.calculateDimension(stringBounder);
-
-			final Snake s = new Snake(arrowHorizontalAlignment(), arrowColor);
-			// final Snake s = new Snake(HtmlColorUtils.GREEN);
-			s.goUnmergeable(MergeStrategy.LIMITED);
-			s.addPoint(minX, y);
-			s.addPoint(maxX, y);
-			ug.draw(s);
-		}
-	}
-
-	static class ConnectionIn extends AbstractConnection {
 
 		private final double x;
 		private final Rainbow arrowColor;
-		private final TextBlock text;
+		private final Display label;
 
-		public ConnectionIn(Ftile tmp, double x, Rainbow arrowColor, TextBlock text) {
+		public ConnectionIn(Ftile ftile1, Ftile ftile2, double x, Rainbow arrowColor) {
-			super(null, tmp);
+			super(ftile1, ftile2);
+			label = ftile2.getInLinkRendering().getDisplay();
 			this.x = x;
 			this.arrowColor = arrowColor;
-			this.text = text;
 		}
 
 		public void drawU(UGraphic ug) {
 			ug = ug.apply(new UTranslate(x, 0));
-			final FtileGeometry geo = getFtile2().calculateDimension(ug.getStringBounder());
+			final FtileGeometry geo = getFtile2().calculateDimension(getStringBounder());
-			final double left = geo.getLeft();
+			final Snake snake = new Snake(arrowHorizontalAlignment(), arrowColor, Arrows.asToDown());
-			final Snake s = new Snake(arrowHorizontalAlignment(), arrowColor, Arrows.asToDown());
+			if (Display.isNull(label) == false) {
-			s.setLabel(text);
+				snake.setLabel(getTextBlock(label));
-			s.addPoint(left, 0);
+			}
-			s.addPoint(left, geo.getInY());
+			snake.addPoint(geo.getLeft(), 0);
-			ug.draw(s);
+			snake.addPoint(geo.getLeft(), geo.getInY());
+			ug.draw(snake);
+		}
+
+		public void drawTranslate(UGraphic ug, UTranslate translate1, UTranslate translate2) {
+			ug = ug.apply(new UTranslate(x, 0));
+			final FtileGeometry geo = getFtile2().calculateDimension(getStringBounder());
+			final Point2D p1 = new Point2D.Double(geo.getLeft(), 0);
+			final Point2D p2 = new Point2D.Double(geo.getLeft(), geo.getInY());
+
+			final Snake snake = new Snake(arrowHorizontalAlignment(), arrowColor, Arrows.asToDown());
+			if (Display.isNull(label) == false) {
+				snake.setLabel(getTextBlock(label));
+			}
+			final Point2D mp1a = translate1.getTranslated(p1);
+			final Point2D mp2b = translate2.getTranslated(p2);
+			final double middle = mp1a.getY() + 4;
+			snake.addPoint(mp1a);
+			snake.addPoint(mp1a.getX(), middle);
+			snake.addPoint(mp2b.getX(), middle);
+			snake.addPoint(mp2b);
+			ug.draw(snake);
 		}
 	}
 
-	static class ConnectionOut extends AbstractConnection {
+	class ConnectionOut extends AbstractConnection implements ConnectionTranslatable {
 
 		private final double x;
 		private final Rainbow arrowColor;
 		private final double height;
-		private final TextBlock text;
+		private final Display label;
+		private final UTranslate translate0;
 
-		public ConnectionOut(Ftile tmp, double x, Rainbow arrowColor, double height, TextBlock text) {
+		public ConnectionOut(UTranslate translate0, Ftile ftile1, Ftile ftile2, double x, Rainbow arrowColor,
-			super(tmp, null);
+				double height) {
+			super(ftile1, ftile2);
+			this.translate0 = translate0;
+			this.label = ftile1.getOutLinkRendering().getDisplay();
 			this.x = x;
 			this.arrowColor = arrowColor;
 			this.height = height;
-			this.text = text;
 		}
 
 		public void drawU(UGraphic ug) {
 			ug = ug.apply(new UTranslate(x, 0));
-			final FtileGeometry geo = getFtile1().calculateDimension(ug.getStringBounder());
+			final FtileGeometry geo = getFtile1().calculateDimension(getStringBounder());
 			if (geo.hasPointOut() == false) {
-				assert false;
 				return;
 			}
-			final Snake s = new Snake(arrowHorizontalAlignment(), arrowColor, Arrows.asToDown());
+			final Snake snake = new Snake(arrowHorizontalAlignment(), arrowColor, Arrows.asToDown());
-			s.setLabel(text);
+			if (Display.isNull(label) == false) {
-			s.goUnmergeable(MergeStrategy.NONE);
+				snake.setLabel(getTextBlock(label));
-			s.addPoint(geo.getLeft(), geo.getOutY());
-			s.addPoint(geo.getLeft(), height);
-			ug.draw(s);
 			}
+			final Point2D p1 = translate0.getTranslated(new Point2D.Double(geo.getLeft(), geo.getOutY()));
+			final Point2D p2 = translate0.getTranslated(new Point2D.Double(geo.getLeft(), height));
+			snake.addPoint(p1);
+			snake.addPoint(p2);
+			ug.draw(snake);
+		}
+
+		public void drawTranslate(UGraphic ug, UTranslate translate1, UTranslate translate2) {
+			ug = ug.apply(new UTranslate(x, 0));
+			final FtileGeometry geo = getFtile1().calculateDimension(getStringBounder());
+			if (geo.hasPointOut() == false) {
+				return;
+			}
+			final Point2D p1 = translate0.getTranslated(new Point2D.Double(geo.getLeft(), geo.getOutY()));
+			final Point2D p2 = translate0.getTranslated(new Point2D.Double(geo.getLeft(), height));
+
+			final Snake snake = new Snake(arrowHorizontalAlignment(), arrowColor, Arrows.asToDown());
+			if (Display.isNull(label) == false) {
+				snake.setLabel(getTextBlock(label));
+			}
+			final Point2D mp1a = translate1.getTranslated(p1);
+			final Point2D mp2b = translate2.getTranslated(p2);
+			final double middle = mp2b.getY() - 14;
+			snake.addPoint(mp1a);
+			snake.addPoint(mp1a.getX(), middle);
+			snake.addPoint(mp2b.getX(), middle);
+			snake.addPoint(mp2b);
+			ug.draw(snake);
+		}
+
 	}
 
 }

src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderSplit2.java

@@ -1,269 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * (C) Copyright 2009-2020, Arnaud Roques
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of PlantUML.
- *
- * PlantUML is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * PlantUML distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
- * License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
- * USA.
- *
- *
- * Original Author:  Arnaud Roques
- *
- *
- */
-package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact;
-
-import java.awt.geom.Point2D;
-import java.util.ArrayList;
-import java.util.List;
-
-import net.sourceforge.plantuml.ISkinParam;
-import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractConnection;
-import net.sourceforge.plantuml.activitydiagram3.ftile.Arrows;
-import net.sourceforge.plantuml.activitydiagram3.ftile.Connection;
-import net.sourceforge.plantuml.activitydiagram3.ftile.ConnectionTranslatable;
-import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile;
-import net.sourceforge.plantuml.activitydiagram3.ftile.FtileAssemblySimple;
-import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry;
-import net.sourceforge.plantuml.activitydiagram3.ftile.FtileKilled;
-import net.sourceforge.plantuml.activitydiagram3.ftile.FtileUtils;
-import net.sourceforge.plantuml.activitydiagram3.ftile.Snake;
-import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane;
-import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileThinSplit;
-import net.sourceforge.plantuml.cucadiagram.Display;
-import net.sourceforge.plantuml.graphic.HtmlColor;
-import net.sourceforge.plantuml.graphic.HtmlColorAndStyle;
-import net.sourceforge.plantuml.graphic.Rainbow;
-import net.sourceforge.plantuml.graphic.StringBounder;
-import net.sourceforge.plantuml.ugraphic.UGraphic;
-import net.sourceforge.plantuml.ugraphic.UTranslate;
-
-public class ParallelBuilderSplit2 extends ParallelFtilesBuilder {
-
-	public ParallelBuilderSplit2(ISkinParam skinParam, StringBounder stringBounder, final List<Ftile> list,
-			Ftile inner, Swimlane swimlane) {
-		super(skinParam, stringBounder, list, inner, swimlane);
-	}
-
-	@Override
-	protected Ftile doStep1() {
-		Ftile result = getMiddle();
-		final List<Connection> conns = new ArrayList<Connection>();
-		final Rainbow thinColor = result.getInLinkRendering().getRainbow(HtmlColorAndStyle.build(skinParam()));
-		final Ftile thin = new FtileThinSplit(skinParam(), getThin1Color(thinColor), getList().get(0).getSwimlaneIn());
-		double x = 0;
-		double first = 0;
-		double last = 0;
-		for (Ftile tmp : getList()) {
-			final FtileGeometry dim = tmp.calculateDimension(getStringBounder());
-			if (first == 0) {
-				first = x + dim.getLeft();
-			}
-			last = x + dim.getLeft();
-			final Rainbow rainbow = tmp.getInLinkRendering().getRainbow(HtmlColorAndStyle.build(skinParam()));
-			conns.add(new ConnectionIn(thin, tmp, x, rainbow));
-			x += dim.getWidth();
-		}
-
-		result = FtileUtils.addConnection(result, conns);
-		final FtileGeometry geom = result.calculateDimension(getStringBounder());
-		if (last < geom.getLeft()) {
-			last = geom.getLeft();
-		}
-		if (first > geom.getLeft()) {
-			first = geom.getLeft();
-		}
-		((FtileThinSplit) thin).setGeom(first, last, result.calculateDimension(getStringBounder()).getWidth());
-
-		return new FtileAssemblySimple(thin, result);
-	}
-
-	private HtmlColor getThin1Color(final Rainbow thinColor) {
-		for (Ftile tmp : getList()) {
-			final Rainbow rainbow = tmp.getInLinkRendering().getRainbow(HtmlColorAndStyle.build(skinParam()));
-			if (rainbow.isInvisible() == false) {
-				return thinColor.getColor();
-			}
-		}
-		return null;
-	}
-
-	private boolean hasOut() {
-		for (Ftile tmp : getList()) {
-			final boolean hasOutTmp = tmp.calculateDimension(getStringBounder()).hasPointOut();
-			if (hasOutTmp) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	protected Ftile doStep2(Ftile result) {
-
-		final FtileGeometry geom = result.calculateDimension(getStringBounder());
-		if (hasOut() == false) {
-			return new FtileKilled(result);
-		}
-
-		final Rainbow thinColor = result.getInLinkRendering().getRainbow(HtmlColorAndStyle.build(skinParam()));
-		// final Ftile out = new FtileThinSplit(skinParam(), thinColor.getColor(), getList().get(0).getSwimlaneIn());
-		final Ftile out = new FtileThinSplit(skinParam(), thinColor.getColor(), swimlane());
-		result = new FtileAssemblySimple(result, out);
-		final List<Connection> conns = new ArrayList<Connection>();
-		double x = 0;
-		double first = 0;
-		double last = 0;
-		for (Ftile tmp : getList()) {
-			final UTranslate translate0 = new UTranslate(0, 1.5);
-			final FtileGeometry dim = tmp.calculateDimension(getStringBounder());
-			if (dim.hasPointOut()) {
-				if (first == 0) {
-					first = x + dim.getLeft();
-				}
-				last = x + dim.getLeft();
-			}
-			conns.add(new ConnectionOut(translate0, tmp, out, x, tmp.getOutLinkRendering().getRainbow(
-					HtmlColorAndStyle.build(skinParam())), getHeightOfMiddle()));
-			x += dim.getWidth();
-		}
-		if (last < geom.getLeft()) {
-			last = geom.getLeft();
-		}
-		if (first > geom.getLeft()) {
-			first = geom.getLeft();
-		}
-		((FtileThinSplit) out).setGeom(first, last, geom.getWidth());
-		result = FtileUtils.addConnection(result, conns);
-		return result;
-	}
-
-	class ConnectionIn extends AbstractConnection implements ConnectionTranslatable {
-
-		private final double x;
-		private final Rainbow arrowColor;
-		private final Display label;
-
-		public ConnectionIn(Ftile ftile1, Ftile ftile2, double x, Rainbow arrowColor) {
-			super(ftile1, ftile2);
-			label = ftile2.getInLinkRendering().getDisplay();
-			this.x = x;
-			this.arrowColor = arrowColor;
-		}
-
-		public void drawU(UGraphic ug) {
-			ug = ug.apply(new UTranslate(x, 0));
-			final FtileGeometry geo = getFtile2().calculateDimension(getStringBounder());
-			final Snake snake = new Snake(arrowHorizontalAlignment(), arrowColor, Arrows.asToDown());
-			if (Display.isNull(label) == false) {
-				snake.setLabel(getTextBlock(label));
-			}
-			snake.addPoint(geo.getLeft(), 0);
-			snake.addPoint(geo.getLeft(), geo.getInY());
-			ug.draw(snake);
-		}
-
-		public void drawTranslate(UGraphic ug, UTranslate translate1, UTranslate translate2) {
-			ug = ug.apply(new UTranslate(x, 0));
-			final FtileGeometry geo = getFtile2().calculateDimension(getStringBounder());
-			final Point2D p1 = new Point2D.Double(geo.getLeft(), 0);
-			final Point2D p2 = new Point2D.Double(geo.getLeft(), geo.getInY());
-
-			final Snake snake = new Snake(arrowHorizontalAlignment(), arrowColor, Arrows.asToDown());
-			if (Display.isNull(label) == false) {
-				snake.setLabel(getTextBlock(label));
-			}
-			final Point2D mp1a = translate1.getTranslated(p1);
-			final Point2D mp2b = translate2.getTranslated(p2);
-			final double middle = mp1a.getY() + 4;
-			snake.addPoint(mp1a);
-			snake.addPoint(mp1a.getX(), middle);
-			snake.addPoint(mp2b.getX(), middle);
-			snake.addPoint(mp2b);
-			ug.draw(snake);
-		}
-	}
-
-	class ConnectionOut extends AbstractConnection implements ConnectionTranslatable {
-
-		private final double x;
-		private final Rainbow arrowColor;
-		private final double height;
-		private final Display label;
-		private final UTranslate translate0;
-
-		public ConnectionOut(UTranslate translate0, Ftile ftile1, Ftile ftile2, double x, Rainbow arrowColor,
-				double height) {
-			super(ftile1, ftile2);
-			this.translate0 = translate0;
-			this.label = ftile1.getOutLinkRendering().getDisplay();
-			this.x = x;
-			this.arrowColor = arrowColor;
-			this.height = height;
-		}
-
-		public void drawU(UGraphic ug) {
-			ug = ug.apply(new UTranslate(x, 0));
-			final FtileGeometry geo = getFtile1().calculateDimension(getStringBounder());
-			if (geo.hasPointOut() == false) {
-				return;
-			}
-			final Snake snake = new Snake(arrowHorizontalAlignment(), arrowColor, Arrows.asToDown());
-			if (Display.isNull(label) == false) {
-				snake.setLabel(getTextBlock(label));
-			}
-			final Point2D p1 = translate0.getTranslated(new Point2D.Double(geo.getLeft(), geo.getOutY()));
-			final Point2D p2 = translate0.getTranslated(new Point2D.Double(geo.getLeft(), height));
-			snake.addPoint(p1);
-			snake.addPoint(p2);
-			ug.draw(snake);
-		}
-
-		public void drawTranslate(UGraphic ug, UTranslate translate1, UTranslate translate2) {
-			ug = ug.apply(new UTranslate(x, 0));
-			final FtileGeometry geo = getFtile1().calculateDimension(getStringBounder());
-			if (geo.hasPointOut() == false) {
-				return;
-			}
-			final Point2D p1 = translate0.getTranslated(new Point2D.Double(geo.getLeft(), geo.getOutY()));
-			final Point2D p2 = translate0.getTranslated(new Point2D.Double(geo.getLeft(), height));
-
-			final Snake snake = new Snake(arrowHorizontalAlignment(), arrowColor, Arrows.asToDown());
-			if (Display.isNull(label) == false) {
-				snake.setLabel(getTextBlock(label));
-			}
-			final Point2D mp1a = translate1.getTranslated(p1);
-			final Point2D mp2b = translate2.getTranslated(p2);
-			final double middle = mp2b.getY() - 14;
-			snake.addPoint(mp1a);
-			snake.addPoint(mp1a.getX(), middle);
-			snake.addPoint(mp2b.getX(), middle);
-			snake.addPoint(mp2b);
-			ug.draw(snake);
-		}
-
-	}
-
-}

src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/VCompactFactory.java

@@ -42,6 +42,7 @@ import java.util.List;
 import net.sourceforge.plantuml.ColorParam;
 import net.sourceforge.plantuml.FontParam;
 import net.sourceforge.plantuml.ISkinParam;
+import net.sourceforge.plantuml.SkinParam;
 import net.sourceforge.plantuml.Url;
 import net.sourceforge.plantuml.activitydiagram3.Branch;
 import net.sourceforge.plantuml.activitydiagram3.ForkStyle;
@@ -66,6 +67,11 @@ import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.USymbol;
 import net.sourceforge.plantuml.graphic.color.Colors;
 import net.sourceforge.plantuml.skin.rose.Rose;
+import net.sourceforge.plantuml.style.PName;
+import net.sourceforge.plantuml.style.SName;
+import net.sourceforge.plantuml.style.Style;
+import net.sourceforge.plantuml.style.StyleBuilder;
+import net.sourceforge.plantuml.style.StyleSignature;
 import net.sourceforge.plantuml.ugraphic.UFont;
 
 public class VCompactFactory implements FtileFactory {
@@ -78,19 +84,41 @@ public class VCompactFactory implements FtileFactory {
 		return stringBounder;
 	}
 
+	public StyleBuilder getCurrentStyleBuilder() {
+		return skinParam.getCurrentStyleBuilder();
+	}
+
 	public VCompactFactory(ISkinParam skinParam, StringBounder stringBounder) {
 		this.skinParam = skinParam;
 		this.stringBounder = stringBounder;
 	}
 
+	final public StyleSignature getDefaultStyleDefinitionCircle() {
+		return StyleSignature.of(SName.root, SName.element, SName.activityDiagram, SName.circle);
+	}
+
 	public Ftile start(Swimlane swimlane) {
-		final HtmlColor color = rose.getHtmlColor(skinParam, ColorParam.activityStart);
+		final HtmlColor color;
-		return new FtileCircleStart(skinParam(), color, swimlane);
+		Style style = null;
+		if (SkinParam.USE_STYLES()) {
+			style = getDefaultStyleDefinitionCircle().getMergedStyle(skinParam.getCurrentStyleBuilder());
+			color = style.value(PName.LineColor).asColor(skinParam.getIHtmlColorSet());
+		} else {
+			color = rose.getHtmlColor(skinParam, ColorParam.activityStart);
+		}
+		return new FtileCircleStart(skinParam(), color, swimlane, style);
 	}
 
 	public Ftile stop(Swimlane swimlane) {
-		final HtmlColor color = rose.getHtmlColor(skinParam, ColorParam.activityEnd);
+		final HtmlColor color;
-		return new FtileCircleStop(skinParam(), color, swimlane);
+		Style style = null;
+		if (SkinParam.USE_STYLES()) {
+			style = getDefaultStyleDefinitionCircle().getMergedStyle(skinParam.getCurrentStyleBuilder());
+			color = style.value(PName.LineColor).asColor(skinParam.getIHtmlColorSet());
+		} else {
+			color = rose.getHtmlColor(skinParam, ColorParam.activityEnd);
+		}
+		return new FtileCircleStop(skinParam(), color, swimlane, style);
 	}
 
 	public Ftile spot(Swimlane swimlane, String spot) {
@@ -100,16 +128,23 @@ public class VCompactFactory implements FtileFactory {
 	}
 
 	public Ftile end(Swimlane swimlane) {
-		final HtmlColor color = rose.getHtmlColor(skinParam, ColorParam.activityEnd);
+		final HtmlColor color;
-		return new FtileCircleEnd(skinParam(), color, swimlane);
+		Style style = null;
+		if (SkinParam.USE_STYLES()) {
+			style = getDefaultStyleDefinitionCircle().getMergedStyle(skinParam.getCurrentStyleBuilder());
+			color = style.value(PName.LineColor).asColor(skinParam.getIHtmlColorSet());
+		} else {
+			color = rose.getHtmlColor(skinParam, ColorParam.activityEnd);
+		}
+		return new FtileCircleEnd(skinParam(), color, swimlane, style);
 	}
 
-	public Ftile activity(Display label, Swimlane swimlane, BoxStyle style, Colors colors) {
+	public Ftile activity(Display label, Swimlane swimlane, BoxStyle boxStyle, Colors colors) {
 		// final HtmlColor borderColor = rose.getHtmlColor(skinParam, ColorParam.activityBorder);
 		// final HtmlColor backColor = color == null ? rose.getHtmlColor(skinParam, ColorParam.activityBackground) :
 		// color;
 		final UFont font = skinParam.getFont(null, false, FontParam.ACTIVITY);
-		return new FtileBox(colors.mute(skinParam), label, font, swimlane, style);
+		return FtileBox.create(colors.mute(skinParam), label, swimlane, boxStyle);
 	}
 
 	public Ftile addNote(Ftile ftile, Swimlane swimlane, Collection<PositionedNote> notes) {
@@ -154,7 +189,7 @@ public class VCompactFactory implements FtileFactory {
 		return new FtileForkInner(ftiles);
 	}
 
-	public Ftile createParallel(Swimlane swimlane, List<Ftile> all, ForkStyle style, String label) {
+	public Ftile createParallel(List<Ftile> all, ForkStyle style, String label) {
 		return new FtileForkInner(all);
 	}
 

src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/ConditionalBuilder.java

@@ -39,6 +39,7 @@ import java.awt.geom.Dimension2D;
 
 import net.sourceforge.plantuml.ISkinParam;
 import net.sourceforge.plantuml.LineBreakStrategy;
+import net.sourceforge.plantuml.SkinParam;
 import net.sourceforge.plantuml.Url;
 import net.sourceforge.plantuml.activitydiagram3.Branch;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Diamond;
@@ -64,6 +65,10 @@ import net.sourceforge.plantuml.graphic.HtmlColor;
 import net.sourceforge.plantuml.graphic.Rainbow;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.TextBlock;
+import net.sourceforge.plantuml.style.PName;
+import net.sourceforge.plantuml.style.SName;
+import net.sourceforge.plantuml.style.Style;
+import net.sourceforge.plantuml.style.StyleSignature;
 import net.sourceforge.plantuml.svek.ConditionEndStyle;
 import net.sourceforge.plantuml.svek.ConditionStyle;
 
@@ -87,23 +92,44 @@ public class ConditionalBuilder {
 	private final Ftile tile2;
 	private final Url url;
 
+	public StyleSignature getDefaultStyleDefinitionDiamond() {
+		return StyleSignature.of(SName.root, SName.element, SName.activityDiagram, SName.activity, SName.diamond);
+	}
+
+	public StyleSignature getDefaultStyleDefinitionArrow() {
+		return StyleSignature.of(SName.root, SName.element, SName.activityDiagram, SName.arrow);
+	}
+
 	public ConditionalBuilder(Swimlane swimlane, HtmlColor borderColor, HtmlColor backColor, Rainbow arrowColor,
 			FtileFactory ftileFactory, ConditionStyle conditionStyle, ConditionEndStyle conditionEndStyle,
 			Branch branch1, Branch branch2, ISkinParam skinParam, StringBounder stringBounder,
 			FontConfiguration fontArrow, FontConfiguration fontTest, Url url) {
-		this.swimlane = swimlane;
+		if (SkinParam.USE_STYLES()) {
+			final Style styleArrow = getDefaultStyleDefinitionArrow()
+					.getMergedStyle(skinParam.getCurrentStyleBuilder());
+			final Style styleDiamond = getDefaultStyleDefinitionDiamond().getMergedStyle(
+					skinParam.getCurrentStyleBuilder());
+			this.borderColor = styleDiamond.value(PName.LineColor).asColor(skinParam.getIHtmlColorSet());
+			this.backColor = styleDiamond.value(PName.BackGroundColor).asColor(skinParam.getIHtmlColorSet());
+			this.arrowColor = Rainbow
+					.fromColor(styleArrow.value(PName.LineColor).asColor(skinParam.getIHtmlColorSet()));
+			this.fontTest = styleDiamond.getFontConfiguration(skinParam.getIHtmlColorSet());
+			this.fontArrow = styleArrow.getFontConfiguration(skinParam.getIHtmlColorSet());
+		} else {
 			this.borderColor = borderColor;
 			this.backColor = backColor;
 			this.arrowColor = arrowColor;
+			this.fontTest = fontTest;
+			this.fontArrow = fontArrow;
+		}
 		this.ftileFactory = ftileFactory;
+		this.swimlane = swimlane;
 		this.conditionStyle = conditionStyle;
 		this.conditionEndStyle = conditionEndStyle;
 		this.branch1 = branch1;
 		this.branch2 = branch2;
 		this.skinParam = skinParam;
 		this.stringBounder = stringBounder;
-		this.fontArrow = fontArrow;
-		this.fontTest = fontTest;
 		this.url = url;
 
 		this.tile1 = new FtileMinWidth(branch1.getFtile(), 30);

src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox.java

@@ -44,6 +44,9 @@ import net.sourceforge.plantuml.ColorParam;
 import net.sourceforge.plantuml.Dimension2DDouble;
 import net.sourceforge.plantuml.FontParam;
 import net.sourceforge.plantuml.ISkinParam;
+import net.sourceforge.plantuml.LineBreakStrategy;
+import net.sourceforge.plantuml.SkinParam;
+import net.sourceforge.plantuml.SkinParamColors;
 import net.sourceforge.plantuml.SkinParamUtils;
 import net.sourceforge.plantuml.activitydiagram3.LinkRendering;
 import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractFtile;
@@ -61,30 +64,54 @@ import net.sourceforge.plantuml.cucadiagram.Display;
 import net.sourceforge.plantuml.graphic.FontConfiguration;
 import net.sourceforge.plantuml.graphic.HorizontalAlignment;
 import net.sourceforge.plantuml.graphic.HtmlColor;
-import net.sourceforge.plantuml.graphic.HtmlColorAndStyle;
+import net.sourceforge.plantuml.graphic.Rainbow;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.TextBlock;
 import net.sourceforge.plantuml.graphic.UDrawable;
+import net.sourceforge.plantuml.graphic.color.ColorType;
+import net.sourceforge.plantuml.graphic.color.Colors;
+import net.sourceforge.plantuml.style.PName;
+import net.sourceforge.plantuml.style.SName;
+import net.sourceforge.plantuml.style.Style;
+import net.sourceforge.plantuml.style.StyleBuilder;
+import net.sourceforge.plantuml.style.StyleSignature;
 import net.sourceforge.plantuml.ugraphic.UChangeBackColor;
 import net.sourceforge.plantuml.ugraphic.UChangeColor;
-import net.sourceforge.plantuml.ugraphic.UFont;
 import net.sourceforge.plantuml.ugraphic.UGraphic;
 import net.sourceforge.plantuml.ugraphic.UStroke;
 import net.sourceforge.plantuml.ugraphic.UTranslate;
 
 public class FtileBox extends AbstractFtile {
 
-	private static final int MARGIN = 10;
+	private double padding() {
+		return padding;
+	}
 
+	private double padding = 10;
 	private final TextBlock tb;
+	private double roundCorner = 25;
+	private final double shadowing;
+	private final HorizontalAlignment horizontalAlignment;
+	private double minimumWidth = 0;
 
-	private final LinkRendering inRenreding;
+	private final LinkRendering inRendering;
 	private final Swimlane swimlane;
-	private final BoxStyle style;
+	private final BoxStyle boxStyle;
-	// private final ISkinParam skinParam;
+
+	private final HtmlColor borderColor;
+	private final HtmlColor backColor;
+	private final Style style;
+
+	static public StyleSignature getDefaultStyleDefinitionActivity() {
+		return StyleSignature.of(SName.root, SName.element, SName.activityDiagram, SName.activity);
+	}
+
+	static public StyleSignature getDefaultStyleDefinitionArrow() {
+		return StyleSignature.of(SName.root, SName.element, SName.activityDiagram, SName.arrow);
+	}
 
 	final public LinkRendering getInLinkRendering() {
-		return inRenreding;
+		return inRendering;
 	}
 
 	public Set<Swimlane> getSwimlanes() {
@@ -105,27 +132,96 @@ public class FtileBox extends AbstractFtile {
 	class MyStencil implements Stencil {
 
 		public double getStartingX(StringBounder stringBounder, double y) {
-			return -MARGIN;
+			return -padding();
 		}
 
 		public double getEndingX(StringBounder stringBounder, double y) {
 			final Dimension2D dim = calculateDimension(stringBounder);
-			return dim.getWidth() - MARGIN;
+			return dim.getWidth() - padding();
 		}
 
 	}
 
-	public FtileBox(ISkinParam skinParam, Display label, UFont font, Swimlane swimlane, BoxStyle style) {
+	public static FtileBox create(ISkinParam skinParam, Display label, Swimlane swimlane, BoxStyle boxStyle) {
+		Style style = null;
+		Style styleArrow = null;
+		if (SkinParam.USE_STYLES()) {
+			style = getDefaultStyleDefinitionActivity().getMergedStyle(skinParam.getCurrentStyleBuilder());
+			styleArrow = getDefaultStyleDefinitionArrow().getMergedStyle(skinParam.getCurrentStyleBuilder());
+		}
+		return new FtileBox(skinParam, label, swimlane, boxStyle, style, styleArrow);
+	}
+
+	public static FtileBox createWbs(StyleBuilder styleBuilder, ISkinParam skinParam, Display label,
+			StyleSignature styleDefinition) {
+		Style style = null;
+		Style styleArrow = null;
+		if (SkinParam.USE_STYLES()) {
+			style = styleDefinition.getMergedStyle(styleBuilder);
+			styleArrow = style;
+		}
+		return new FtileBox(skinParam, label, null, BoxStyle.PLAIN, style, styleArrow);
+	}
+
+	public static FtileBox createWbs(Style style, ISkinParam skinParam, Display label) {
+		Style styleArrow = null;
+		if (SkinParam.USE_STYLES()) {
+			styleArrow = style;
+		}
+		return new FtileBox(skinParam, label, null, BoxStyle.PLAIN, style, styleArrow);
+	}
+
+	public static FtileBox createMindMap(StyleBuilder styleBuilder, ISkinParam skinParam, Display label,
+			StyleSignature styleDefinition) {
+		Style style = null;
+		Style styleArrow = null;
+		if (SkinParam.USE_STYLES()) {
+			style = styleDefinition.getMergedStyle(styleBuilder);
+			styleArrow = style;
+		}
+		return new FtileBox(skinParam, label, null, BoxStyle.PLAIN, style, styleArrow);
+	}
+
+	private FtileBox(ISkinParam skinParam, Display label, Swimlane swimlane, BoxStyle boxStyle, Style style,
+			Style styleArrow) {
 		super(skinParam);
 		this.style = style;
-		// this.skinParam = skinParam;
+		this.boxStyle = boxStyle;
 		this.swimlane = swimlane;
-		this.inRenreding = new LinkRendering(HtmlColorAndStyle.build(skinParam));
+		final FontConfiguration fc;
-		final FontConfiguration fc = new FontConfiguration(skinParam, FontParam.ACTIVITY, null);
+		final LineBreakStrategy wrapWidth;
-		final Sheet sheet = new CreoleParser(fc, skinParam.getDefaultTextAlignment(HorizontalAlignment.LEFT),
+		if (SkinParam.USE_STYLES()) {
-				skinParam, CreoleMode.FULL).createSheet(label);
+			this.inRendering = new LinkRendering(Rainbow.build(styleArrow, getIHtmlColorSet()));
-		this.tb = new SheetBlock2(new SheetBlock1(sheet, skinParam.wrapWidth(), skinParam.getPadding()), new MyStencil(), new UStroke(1));
+			Colors specBack = null;
+			if (skinParam instanceof SkinParamColors) {
+				specBack = ((SkinParamColors) skinParam).getColors();
+			}
+			style = style.eventuallyOverride(specBack);
+			this.borderColor = style.value(PName.LineColor).asColor(getIHtmlColorSet());
+			this.backColor = style.value(PName.BackGroundColor).asColor(getIHtmlColorSet());
+			fc = style.getFontConfiguration(getIHtmlColorSet());
+			horizontalAlignment = style.getHorizontalAlignment();
+			this.padding = style.getPadding().asDouble();
+			this.roundCorner = style.value(PName.RoundCorner).asDouble();
+			this.shadowing = style.value(PName.Shadowing).asDouble();
+			wrapWidth = style.wrapWidth();
+			this.minimumWidth = style.value(PName.MinimumWidth).asDouble();
+		} else {
+			this.inRendering = new LinkRendering(Rainbow.build(skinParam));
+			this.borderColor = SkinParamUtils.getColor(skinParam(), null, ColorParam.activityBorder);
+			this.backColor = SkinParamUtils.getColor(skinParam(), null, ColorParam.activityBackground);
+			fc = new FontConfiguration(skinParam, FontParam.ACTIVITY, null);
+			horizontalAlignment = HorizontalAlignment.LEFT;
+			this.shadowing = skinParam().shadowing(null) ? 3.0 : 0.0;
+			wrapWidth = skinParam.wrapWidth();
+
+		}
+		final Sheet sheet = new CreoleParser(fc, skinParam.getDefaultTextAlignment(horizontalAlignment), skinParam,
+				CreoleMode.FULL).createSheet(label);
+		this.tb = new SheetBlock2(new SheetBlock1(sheet, wrapWidth, skinParam.getPadding()), new MyStencil(),
+				new UStroke(1));
 		this.print = label.toString();
+
 	}
 
 	final private String print;
@@ -139,22 +235,35 @@ public class FtileBox extends AbstractFtile {
 		final Dimension2D dimTotal = calculateDimension(ug.getStringBounder());
 		final double widthTotal = dimTotal.getWidth();
 		final double heightTotal = dimTotal.getHeight();
-		final UDrawable rect = style.getUDrawable(widthTotal, heightTotal, skinParam().shadowing(null));
+		final UDrawable rect = boxStyle.getUDrawable(widthTotal, heightTotal, shadowing, roundCorner);
 
-		final HtmlColor borderColor = SkinParamUtils.getColor(skinParam(), null, ColorParam.activityBorder);
+		final UStroke thickness;
-		final HtmlColor backColor = SkinParamUtils.getColor(skinParam(), null, ColorParam.activityBackground);
+		if (SkinParam.USE_STYLES()) {
+			thickness = style.getStroke();
+		} else {
+			thickness = getThickness();
+		}
 
-		ug = ug.apply(new UChangeColor(borderColor)).apply(new UChangeBackColor(backColor)).apply(getThickness());
+		ug = ug.apply(new UChangeColor(borderColor)).apply(new UChangeBackColor(backColor)).apply(thickness);
 		rect.drawU(ug);
 
-		tb.drawU(ug.apply(new UTranslate(MARGIN, MARGIN)));
+		if (horizontalAlignment == HorizontalAlignment.LEFT) {
+			tb.drawU(ug.apply(new UTranslate(padding(), padding())));
+		} else if (horizontalAlignment == HorizontalAlignment.RIGHT) {
+			final Dimension2D dimTb = tb.calculateDimension(ug.getStringBounder());
+			tb.drawU(ug.apply(new UTranslate(dimTotal.getWidth() - dimTb.getWidth() - padding(), padding())));
+		} else if (horizontalAlignment == HorizontalAlignment.CENTER) {
+			final Dimension2D dimTb = tb.calculateDimension(ug.getStringBounder());
+			tb.drawU(ug.apply(new UTranslate((dimTotal.getWidth() - dimTb.getWidth()) / 2, padding())));
+		}
 	}
 
 	@Override
 	protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
-		final Dimension2D dim = tb.calculateDimension(stringBounder);
+		Dimension2D dim = tb.calculateDimension(stringBounder);
-		return new FtileGeometry(Dimension2DDouble.delta(dim, 2 * MARGIN, 2 * MARGIN), dim.getWidth() / 2 + MARGIN, 0,
+		dim = Dimension2DDouble.delta(dim, 2 * padding(), 2 * padding());
-				dim.getHeight() + 2 * MARGIN);
+		dim = Dimension2DDouble.atLeast(dim, minimumWidth, 0);
+		return new FtileGeometry(dim, dim.getWidth() / 2, 0, dim.getHeight());
 	}
 
 	public Collection<Ftile> getMyChildren() {

src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleEnd.java

@@ -40,6 +40,7 @@ import java.util.Collections;
 import java.util.Set;
 
 import net.sourceforge.plantuml.ISkinParam;
+import net.sourceforge.plantuml.SkinParam;
 import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractFtile;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile;
 import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry;
@@ -47,6 +48,8 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane;
 import net.sourceforge.plantuml.graphic.HtmlColor;
 import net.sourceforge.plantuml.graphic.HtmlColorUtils;
 import net.sourceforge.plantuml.graphic.StringBounder;
+import net.sourceforge.plantuml.style.PName;
+import net.sourceforge.plantuml.style.Style;
 import net.sourceforge.plantuml.ugraphic.UChangeBackColor;
 import net.sourceforge.plantuml.ugraphic.UChangeColor;
 import net.sourceforge.plantuml.ugraphic.UEllipse;
@@ -61,16 +64,24 @@ public class FtileCircleEnd extends AbstractFtile {
 
 	private final HtmlColor backColor;
 	private final Swimlane swimlane;
+	private double shadowing;
 
 	@Override
 	public Collection<Ftile> getMyChildren() {
 		return Collections.emptyList();
 	}
 
-	public FtileCircleEnd(ISkinParam skinParam, HtmlColor backColor, Swimlane swimlane) {
+	public FtileCircleEnd(ISkinParam skinParam, HtmlColor backColor, Swimlane swimlane, Style style) {
 		super(skinParam);
 		this.backColor = backColor;
 		this.swimlane = swimlane;
+		if (SkinParam.USE_STYLES()) {
+			this.shadowing = style.value(PName.Shadowing).asDouble();
+		} else {
+			if (skinParam().shadowing(null)) {
+				this.shadowing = 3;
+			}
+		}
 	}
 
 	public Set<Swimlane> getSwimlanes() {
@@ -95,9 +106,7 @@ public class FtileCircleEnd extends AbstractFtile {
 		yTheoricalPosition = Math.round(yTheoricalPosition);
 
 		final UEllipse circle = new UEllipse(SIZE, SIZE);
-		if (skinParam().shadowing(null)) {
+		circle.setDeltaShadow(shadowing);
-			circle.setDeltaShadow(3);
-		}
 		ug = ug.apply(new UChangeColor(backColor));
 		final double thickness = 2.5;
 		ug.apply(new UChangeBackColor(HtmlColorUtils.WHITE)).apply(new UStroke(1.5))

src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStart.java

@@ -40,12 +40,15 @@ import java.util.Collections;
 import java.util.Set;
 
 import net.sourceforge.plantuml.ISkinParam;
+import net.sourceforge.plantuml.SkinParam;
 import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractFtile;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile;
 import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane;
 import net.sourceforge.plantuml.graphic.HtmlColor;
 import net.sourceforge.plantuml.graphic.StringBounder;
+import net.sourceforge.plantuml.style.PName;
+import net.sourceforge.plantuml.style.Style;
 import net.sourceforge.plantuml.ugraphic.UChangeBackColor;
 import net.sourceforge.plantuml.ugraphic.UChangeColor;
 import net.sourceforge.plantuml.ugraphic.UEllipse;
@@ -57,11 +60,20 @@ public class FtileCircleStart extends AbstractFtile {
 
 	private final HtmlColor backColor;
 	private final Swimlane swimlane;
+	private double shadowing;
 
-	public FtileCircleStart(ISkinParam skinParam, HtmlColor backColor, Swimlane swimlane) {
+	public FtileCircleStart(ISkinParam skinParam, HtmlColor backColor, Swimlane swimlane, Style style) {
 		super(skinParam);
 		this.backColor = backColor;
 		this.swimlane = swimlane;
+		if (SkinParam.USE_STYLES()) {
+			this.shadowing = style.value(PName.Shadowing).asDouble();
+		} else {
+			if (skinParam().shadowing(null)) {
+				this.shadowing = 3;
+			}
+		}
+
 	}
 
 	@Override
@@ -86,9 +98,7 @@ public class FtileCircleStart extends AbstractFtile {
 
 	public void drawU(UGraphic ug) {
 		final UEllipse circle = new UEllipse(SIZE, SIZE);
-		if (skinParam().shadowing(null)) {
+		circle.setDeltaShadow(shadowing);
-			circle.setDeltaShadow(3);
-		}
 		ug.apply(new UChangeColor(null)).apply(new UChangeBackColor(backColor)).draw(circle);
 	}
 

src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStop.java

@@ -40,6 +40,7 @@ import java.util.Collections;
 import java.util.Set;
 
 import net.sourceforge.plantuml.ISkinParam;
+import net.sourceforge.plantuml.SkinParam;
 import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractFtile;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile;
 import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry;
@@ -48,6 +49,8 @@ import net.sourceforge.plantuml.graphic.HtmlColor;
 import net.sourceforge.plantuml.graphic.HtmlColorMiddle;
 import net.sourceforge.plantuml.graphic.HtmlColorUtils;
 import net.sourceforge.plantuml.graphic.StringBounder;
+import net.sourceforge.plantuml.style.PName;
+import net.sourceforge.plantuml.style.Style;
 import net.sourceforge.plantuml.ugraphic.UChangeBackColor;
 import net.sourceforge.plantuml.ugraphic.UChangeColor;
 import net.sourceforge.plantuml.ugraphic.UEllipse;
@@ -60,16 +63,24 @@ public class FtileCircleStop extends AbstractFtile {
 
 	private final HtmlColor backColor;
 	private final Swimlane swimlane;
+	private double shadowing;
 
 	@Override
 	public Collection<Ftile> getMyChildren() {
 		return Collections.emptyList();
 	}
 
-	public FtileCircleStop(ISkinParam skinParam, HtmlColor backColor, Swimlane swimlane) {
+	public FtileCircleStop(ISkinParam skinParam, HtmlColor backColor, Swimlane swimlane, Style style) {
 		super(skinParam);
 		this.backColor = backColor;
 		this.swimlane = swimlane;
+		if (SkinParam.USE_STYLES()) {
+			this.shadowing = style.value(PName.Shadowing).asDouble();
+		} else {
+			if (skinParam().shadowing(null)) {
+				this.shadowing = 3;
+			}
+		}
 	}
 
 	public Set<Swimlane> getSwimlanes() {
@@ -89,9 +100,7 @@ public class FtileCircleStop extends AbstractFtile {
 
 	public void drawU(UGraphic ug) {
 		final UEllipse circle = new UEllipse(SIZE, SIZE);
-		if (skinParam().shadowing(null)) {
+		circle.setDeltaShadow(shadowing);
-			circle.setDeltaShadow(3);
-		}
 		ug.apply(new UChangeColor(backColor)).apply(new UChangeBackColor(HtmlColorUtils.WHITE)).draw(circle);
 
 		final double delta = 5;

src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamond.java

@@ -42,6 +42,7 @@ import java.util.Set;
 
 import net.sourceforge.plantuml.Dimension2DDouble;
 import net.sourceforge.plantuml.ISkinParam;
+import net.sourceforge.plantuml.SkinParam;
 import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractFtile;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Diamond;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile;
@@ -51,6 +52,10 @@ import net.sourceforge.plantuml.graphic.HtmlColor;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.TextBlock;
 import net.sourceforge.plantuml.graphic.TextBlockUtils;
+import net.sourceforge.plantuml.style.PName;
+import net.sourceforge.plantuml.style.SName;
+import net.sourceforge.plantuml.style.Style;
+import net.sourceforge.plantuml.style.StyleSignature;
 import net.sourceforge.plantuml.ugraphic.UChangeBackColor;
 import net.sourceforge.plantuml.ugraphic.UChangeColor;
 import net.sourceforge.plantuml.ugraphic.UGraphic;
@@ -65,12 +70,17 @@ public class FtileDiamond extends AbstractFtile {
 	private final TextBlock south;
 	private final TextBlock west1;
 	private final TextBlock east1;
+	private final double shadowing;
 
 	public FtileDiamond(ISkinParam skinParam, HtmlColor backColor, HtmlColor borderColor, Swimlane swimlane) {
 		this(skinParam, backColor, borderColor, swimlane, TextBlockUtils.empty(0, 0), TextBlockUtils.empty(0, 0),
 				TextBlockUtils.empty(0, 0), TextBlockUtils.empty(0, 0));
 	}
 
+	public StyleSignature getDefaultStyleDefinitionDiamond() {
+		return StyleSignature.of(SName.root, SName.element, SName.activityDiagram, SName.diamond);
+	}
+
 	@Override
 	public Collection<Ftile> getMyChildren() {
 		return Collections.emptyList();
@@ -101,6 +111,13 @@ public class FtileDiamond extends AbstractFtile {
 	private FtileDiamond(ISkinParam skinParam, HtmlColor backColor, HtmlColor borderColor, Swimlane swimlane,
 			TextBlock north, TextBlock south, TextBlock east1, TextBlock west1) {
 		super(skinParam);
+		if (SkinParam.USE_STYLES()) {
+			Style style = getDefaultStyleDefinitionDiamond().getMergedStyle(skinParam.getCurrentStyleBuilder());
+			shadowing = style.value(PName.Shadowing).asDouble();
+		} else {
+			shadowing = skinParam().shadowing(null) ? 3 : 0;
+		}
+
 		this.backColor = backColor;
 		this.swimlane = swimlane;
 		this.borderColor = borderColor;
@@ -130,7 +147,7 @@ public class FtileDiamond extends AbstractFtile {
 		final double suppY1 = north.calculateDimension(ug.getStringBounder()).getHeight();
 		ug = ug.apply(new UTranslate(0, suppY1));
 		ug.apply(new UChangeColor(borderColor)).apply(getThickness()).apply(new UChangeBackColor(backColor))
-				.draw(Diamond.asPolygon(skinParam().shadowing(null)));
+				.draw(Diamond.asPolygon(shadowing));
 		// final Dimension2D dimNorth = north.calculateDimension(ug.getStringBounder());
 		north.drawU(ug.apply(new UTranslate(Diamond.diamondHalfSize * 1.5, -suppY1)));
 
@@ -168,5 +185,4 @@ public class FtileDiamond extends AbstractFtile {
 		return dimSouth.getHeight();
 	}
 
-
 }

src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside.java

@@ -42,6 +42,7 @@ import java.util.Set;
 
 import net.sourceforge.plantuml.Dimension2DDouble;
 import net.sourceforge.plantuml.ISkinParam;
+import net.sourceforge.plantuml.SkinParam;
 import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractFtile;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Diamond;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile;
@@ -51,12 +52,17 @@ import net.sourceforge.plantuml.graphic.HtmlColor;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.TextBlock;
 import net.sourceforge.plantuml.graphic.TextBlockUtils;
+import net.sourceforge.plantuml.style.PName;
+import net.sourceforge.plantuml.style.SName;
+import net.sourceforge.plantuml.style.Style;
+import net.sourceforge.plantuml.style.StyleSignature;
+import net.sourceforge.plantuml.style.Styleable;
 import net.sourceforge.plantuml.ugraphic.UChangeBackColor;
 import net.sourceforge.plantuml.ugraphic.UChangeColor;
 import net.sourceforge.plantuml.ugraphic.UGraphic;
 import net.sourceforge.plantuml.ugraphic.UTranslate;
 
-public class FtileDiamondInside extends AbstractFtile {
+public class FtileDiamondInside extends AbstractFtile implements Styleable {
 
 	private final HtmlColor backColor;
 	private final HtmlColor borderColor;
@@ -66,12 +72,17 @@ public class FtileDiamondInside extends AbstractFtile {
 	private final TextBlock east;
 	private final TextBlock north;
 	private final TextBlock south;
+	private final double shadowing;
 
 	@Override
 	public Collection<Ftile> getMyChildren() {
 		return Collections.emptyList();
 	}
 
+	public StyleSignature getDefaultStyleDefinition() {
+		return StyleSignature.of(SName.root, SName.element, SName.activityDiagram, SName.activity, SName.diamond);
+	}
+
 	public FtileDiamondInside(ISkinParam skinParam, HtmlColor backColor, HtmlColor borderColor, Swimlane swimlane,
 			TextBlock label) {
 		this(skinParam, backColor, borderColor, swimlane, label, TextBlockUtils.empty(0, 0),
@@ -101,9 +112,17 @@ public class FtileDiamondInside extends AbstractFtile {
 	private FtileDiamondInside(ISkinParam skinParam, HtmlColor backColor, HtmlColor borderColor, Swimlane swimlane,
 			TextBlock label, TextBlock north, TextBlock south, TextBlock west, TextBlock east) {
 		super(skinParam);
+		if (SkinParam.USE_STYLES()) {
+			final Style style = getDefaultStyleDefinition().getMergedStyle(skinParam.getCurrentStyleBuilder());
+			this.borderColor = style.value(PName.LineColor).asColor(getIHtmlColorSet());
+			this.backColor = style.value(PName.BackGroundColor).asColor(getIHtmlColorSet());
+			this.shadowing = style.value(PName.Shadowing).asDouble();
+		} else {
 			this.backColor = backColor;
-		this.swimlane = swimlane;
 			this.borderColor = borderColor;
+			this.shadowing = skinParam().shadowing(null) ? 3 : 0;
+		}
+		this.swimlane = swimlane;
 		this.label = label;
 		this.west = west;
 		this.east = east;
@@ -131,7 +150,7 @@ public class FtileDiamondInside extends AbstractFtile {
 		final Dimension2D dimLabel = label.calculateDimension(stringBounder);
 		final Dimension2D dimTotal = calculateDimensionAlone(stringBounder);
 		ug = ug.apply(new UChangeColor(borderColor)).apply(getThickness()).apply(new UChangeBackColor(backColor));
-		ug.draw(Diamond.asPolygon(skinParam().shadowing(null), dimTotal.getWidth(), dimTotal.getHeight()));
+		ug.draw(Diamond.asPolygon(shadowing, dimTotal.getWidth(), dimTotal.getHeight()));
 
 		north.drawU(ug.apply(new UTranslate(4 + dimTotal.getWidth() / 2, dimTotal.getHeight())));
 		south.drawU(ug.apply(new UTranslate(4 + dimTotal.getWidth() / 2, dimTotal.getHeight())));

src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside2.java

@@ -41,6 +41,7 @@ import java.util.Set;
 
 import net.sourceforge.plantuml.Dimension2DDouble;
 import net.sourceforge.plantuml.ISkinParam;
+import net.sourceforge.plantuml.SkinParam;
 import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractFtile;
 import net.sourceforge.plantuml.activitydiagram3.ftile.Diamond;
 import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry;
@@ -49,6 +50,10 @@ import net.sourceforge.plantuml.graphic.HtmlColor;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.TextBlock;
 import net.sourceforge.plantuml.graphic.TextBlockUtils;
+import net.sourceforge.plantuml.style.PName;
+import net.sourceforge.plantuml.style.SName;
+import net.sourceforge.plantuml.style.Style;
+import net.sourceforge.plantuml.style.StyleSignature;
 import net.sourceforge.plantuml.ugraphic.UChangeBackColor;
 import net.sourceforge.plantuml.ugraphic.UChangeColor;
 import net.sourceforge.plantuml.ugraphic.UGraphic;
@@ -64,6 +69,7 @@ public class FtileDiamondInside2 extends AbstractFtile {
 	private final TextBlock east;
 	private final TextBlock north;
 	private final TextBlock south;
+	private final double shadowing;
 
 	public FtileDiamondInside2(ISkinParam skinParam, HtmlColor backColor, HtmlColor borderColor, Swimlane swimlane,
 			TextBlock label) {
@@ -87,9 +93,19 @@ public class FtileDiamondInside2 extends AbstractFtile {
 		return new FtileDiamondInside2(skinParam(), backColor, borderColor, swimlane, label, north, south, west, east);
 	}
 	
+	public StyleSignature getDefaultStyleDefinition() {
+		return StyleSignature.of(SName.root, SName.element, SName.activityDiagram, SName.activity, SName.diamond);
+	}
+
 	private FtileDiamondInside2(ISkinParam skinParam, HtmlColor backColor, HtmlColor borderColor, Swimlane swimlane,
 			TextBlock label, TextBlock north, TextBlock south, TextBlock west, TextBlock east) {
 		super(skinParam);
+		if (SkinParam.USE_STYLES()) {
+			final Style style = getDefaultStyleDefinition().getMergedStyle(skinParam.getCurrentStyleBuilder());
+			this.shadowing = style.value(PName.Shadowing).asDouble();
+		} else {
+			this.shadowing = skinParam().shadowing(null) ? 3 : 0;
+		}
 		this.backColor = backColor;
 		this.swimlane = swimlane;
 		this.borderColor = borderColor;
@@ -120,7 +136,7 @@ public class FtileDiamondInside2 extends AbstractFtile {
 		final Dimension2D dimLabel = label.calculateDimension(stringBounder);
 		final Dimension2D dimTotal = calculateDimensionAlone(stringBounder);
 		ug = ug.apply(new UChangeColor(borderColor)).apply(getThickness()).apply(new UChangeBackColor(backColor));
-		ug.draw(Diamond.asPolygon(skinParam().shadowing(null), dimTotal.getWidth(), dimTotal.getHeight()));
+		ug.draw(Diamond.asPolygon(shadowing, dimTotal.getWidth(), dimTotal.getHeight()));
 
 		north.drawU(ug.apply(new UTranslate(4 + dimTotal.getWidth() / 2, dimTotal.getHeight())));
 		south.drawU(ug.apply(new UTranslate(4 + dimTotal.getWidth() / 2, dimTotal.getHeight())));

src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside3.java

@@ -122,7 +122,8 @@ public class FtileDiamondInside3 extends AbstractFtile implements FtileOverpassi
 		final Dimension2D dimLabel = label.calculateDimension(stringBounder);
 		final Dimension2D dimTotal = calculateDimensionAlone(stringBounder);
 		ug = ug.apply(new UChangeColor(borderColor)).apply(getThickness()).apply(new UChangeBackColor(backColor));
-		ug.draw(Diamond.asPolygon(skinParam().shadowing(null), dimTotal.getWidth(), dimTotal.getHeight()));
+		final double shadowing = skinParam().shadowing(null) ? 3 : 0;
+		ug.draw(Diamond.asPolygon(shadowing, dimTotal.getWidth(), dimTotal.getHeight()));
 
 		north.drawU(ug.apply(new UTranslate(4 + dimTotal.getWidth() / 2, dimTotal.getHeight())));
 		south.drawU(ug.apply(new UTranslate(4 + dimTotal.getWidth() / 2, dimTotal.getHeight())));

src/net/sourceforge/plantuml/asciiart/AbstractComponentText.java

@@ -41,7 +41,7 @@ import net.sourceforge.plantuml.Dimension2DDouble;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.skin.Component;
 import net.sourceforge.plantuml.style.Style;
-import net.sourceforge.plantuml.style.StyleDefinition;
+import net.sourceforge.plantuml.style.StyleSignature;
 
 public abstract class AbstractComponentText implements Component {
 
@@ -55,7 +55,7 @@ public abstract class AbstractComponentText implements Component {
 		throw new UnsupportedOperationException();
 	}
 
-	public StyleDefinition getDefaultStyleDefinition() {
+	public StyleSignature getDefaultStyleDefinition() {
 		throw new UnsupportedOperationException();
 	}
 

src/net/sourceforge/plantuml/bpm/BpmElement.java

@@ -138,7 +138,7 @@ public class BpmElement extends AbstractConnectorPuzzle implements ConnectorPuzz
 
 	public TextBlock toTextBlockInternal(ISkinParam skinParam) {
 		if (type == BpmElementType.START) {
-			return new FtileCircleStart(skinParam, HtmlColorUtils.BLACK, null);
+			return new FtileCircleStart(skinParam, HtmlColorUtils.BLACK, null, null);
 		}
 		if (type == BpmElementType.MERGE) {
 			final HtmlColor borderColor = SkinParamUtils.getColor(skinParam, null, ColorParam.activityBorder);
@@ -147,7 +147,7 @@ public class BpmElement extends AbstractConnectorPuzzle implements ConnectorPuzz
 		}
 		if (type == BpmElementType.DOCKED_EVENT) {
 			final UFont font = UFont.serif(14);
-			return new FtileBox(skinParam, display, font, null, BoxStyle.PLAIN);
+			return FtileBox.create(skinParam, display, null, BoxStyle.PLAIN);
 		}
 		final UFont font = UFont.serif(14);
 		final FontConfiguration fc = new FontConfiguration(font, HtmlColorUtils.RED, HtmlColorUtils.RED, false);

src/net/sourceforge/plantuml/classdiagram/ClassDiagram.java

@@ -67,21 +67,6 @@ public class ClassDiagram extends AbstractClassOrObjectDiagram {
 		return getNamespace(fullyCode, fullyCode.getSeparator());
 	}
 
-	private final String getNamespace(Code fullyCode, String separator) {
-		String name = fullyCode.getFullName();
-		if (separator == null) {
-			throw new IllegalArgumentException(toString());
-		}
-		do {
-			final int x = name.lastIndexOf(separator);
-			if (x == -1) {
-				return null;
-			}
-			name = name.substring(0, x);
-		} while (entityFactory.getLeafsget(Code.of(name, separator)) != null);
-		return name;
-	}
-
 	public final Code getShortName(Code code) {
 		final String separator = code.getSeparator();
 		if (separator == null) {

src/net/sourceforge/plantuml/command/BlocLines.java

@@ -55,33 +55,6 @@ public class BlocLines implements Iterable<StringLocated> {
 
 	private List<StringLocated> lines;
 
-	private void check() {
-		// for (CharSequence s : lines) {
-		// // if (s == null) {
-		// // continue;
-		// // }
-		// if (s instanceof String) {
-		// continue;
-		// }
-		// // if (s instanceof Stereotype) {
-		// // continue;
-		// // }
-		// if (s instanceof CharSequence2) {
-		// continue;
-		// }
-		// // if (s instanceof MessageNumber) {
-		// // continue;
-		// // }
-		// // if (s instanceof EmbeddedDiagram) {
-		// // continue;
-		// // }
-		// System.err.println("PB2=" + s);
-		// System.err.println("PB=" + s.getClass());
-		// Thread.dumpStack();
-		// System.exit(0);
-		// }
-	}
-
 	@Override
 	public String toString() {
 		return lines.toString();
@@ -109,7 +82,6 @@ public class BlocLines implements Iterable<StringLocated> {
 
 	private BlocLines(List<StringLocated> lines) {
 		this.lines = Collections.unmodifiableList(lines);
-		this.check();
 	}
 
 	public Display toDisplay() {

src/net/sourceforge/plantuml/command/CommandFooter.java

@@ -37,7 +37,6 @@ package net.sourceforge.plantuml.command;
 
 import net.sourceforge.plantuml.FontParam;
 import net.sourceforge.plantuml.LineLocation;
-import net.sourceforge.plantuml.OptionFlags;
 import net.sourceforge.plantuml.SkinParam;
 import net.sourceforge.plantuml.TitledDiagram;
 import net.sourceforge.plantuml.UmlDiagram;
@@ -76,7 +75,7 @@ public class CommandFooter extends SingleLineCommand2<TitledDiagram> {
 		if (SkinParam.USE_STYLES()) {
 			defaultAlign = FontParam.FOOTER.getStyleDefinition()
 					.getMergedStyle(((UmlDiagram) diagram).getSkinParam().getCurrentStyleBuilder())
-					.value(PName.HorizontalAlignment).asHorizontalAlignment();
+					.getHorizontalAlignment();
 		}
 		diagram.getFooter().putDisplay(Display.getWithNewlines(arg.get("LABEL", 0)),
 				HorizontalAlignment.fromString(align, defaultAlign));

src/net/sourceforge/plantuml/command/CommandHeader.java

@@ -37,7 +37,6 @@ package net.sourceforge.plantuml.command;
 
 import net.sourceforge.plantuml.FontParam;
 import net.sourceforge.plantuml.LineLocation;
-import net.sourceforge.plantuml.OptionFlags;
 import net.sourceforge.plantuml.SkinParam;
 import net.sourceforge.plantuml.TitledDiagram;
 import net.sourceforge.plantuml.UmlDiagram;
@@ -78,7 +77,7 @@ public class CommandHeader extends SingleLineCommand2<TitledDiagram> {
 		if (SkinParam.USE_STYLES()) {
 			defaultAlign = FontParam.HEADER.getStyleDefinition()
 					.getMergedStyle(((UmlDiagram) diagram).getSkinParam().getCurrentStyleBuilder())
-					.value(PName.HorizontalAlignment).asHorizontalAlignment();
+					.getHorizontalAlignment();
 		}
 		diagram.getHeader().putDisplay(Display.getWithNewlines(arg.get("LABEL", 0)),
 				HorizontalAlignment.fromString(align, defaultAlign));

src/net/sourceforge/plantuml/command/CommandMultilinesFooter.java

@@ -36,7 +36,6 @@
 package net.sourceforge.plantuml.command;
 
 import net.sourceforge.plantuml.FontParam;
-import net.sourceforge.plantuml.OptionFlags;
 import net.sourceforge.plantuml.SkinParam;
 import net.sourceforge.plantuml.TitledDiagram;
 import net.sourceforge.plantuml.UmlDiagram;
@@ -70,7 +69,7 @@ public class CommandMultilinesFooter extends CommandMultilines<TitledDiagram> {
 			if (SkinParam.USE_STYLES()) {
 				defaultAlign = FontParam.FOOTER.getStyleDefinition()
 						.getMergedStyle(((UmlDiagram) diagram).getSkinParam().getCurrentStyleBuilder())
-						.value(PName.HorizontalAlignment).asHorizontalAlignment();
+						.getHorizontalAlignment();
 			}
 			diagram.getFooter().putDisplay(strings, HorizontalAlignment.fromString(align, defaultAlign));
 			return CommandExecutionResult.ok();

src/net/sourceforge/plantuml/command/CommandMultilinesHeader.java

@@ -36,7 +36,6 @@
 package net.sourceforge.plantuml.command;
 
 import net.sourceforge.plantuml.FontParam;
-import net.sourceforge.plantuml.OptionFlags;
 import net.sourceforge.plantuml.SkinParam;
 import net.sourceforge.plantuml.TitledDiagram;
 import net.sourceforge.plantuml.UmlDiagram;
@@ -70,7 +69,7 @@ public class CommandMultilinesHeader extends CommandMultilines<TitledDiagram> {
 			if (SkinParam.USE_STYLES()) {
 				defaultAlign = FontParam.HEADER.getStyleDefinition()
 						.getMergedStyle(((UmlDiagram) diagram).getSkinParam().getCurrentStyleBuilder())
-						.value(PName.HorizontalAlignment).asHorizontalAlignment();
+						.getHorizontalAlignment();
 			}
 			diagram.getHeader().putDisplay(strings, HorizontalAlignment.fromString(align, defaultAlign));
 			return CommandExecutionResult.ok();

src/net/sourceforge/plantuml/command/CommandSpriteFile.java

@@ -54,9 +54,9 @@ 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.preproc.FileWithSuffix;
-import net.sourceforge.plantuml.ugraphic.sprite.Sprite;
+import net.sourceforge.plantuml.sprite.Sprite;
-import net.sourceforge.plantuml.ugraphic.sprite.SpriteImage;
+import net.sourceforge.plantuml.sprite.SpriteImage;
-import net.sourceforge.plantuml.ugraphic.sprite.SpriteSvg;
+import net.sourceforge.plantuml.sprite.SpriteSvg;
 
 public class CommandSpriteFile extends SingleLineCommand2<UmlDiagram> {
 

src/net/sourceforge/plantuml/command/FactorySpriteCommand.java

@@ -48,9 +48,9 @@ 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.ugraphic.sprite.Sprite;
+import net.sourceforge.plantuml.sprite.Sprite;
-import net.sourceforge.plantuml.ugraphic.sprite.SpriteColorBuilder4096;
+import net.sourceforge.plantuml.sprite.SpriteColorBuilder4096;
-import net.sourceforge.plantuml.ugraphic.sprite.SpriteGrayLevel;
+import net.sourceforge.plantuml.sprite.SpriteGrayLevel;
 
 public final class FactorySpriteCommand implements SingleMultiFactoryCommand<WithSprite> {
 

src/net/sourceforge/plantuml/command/UmlDiagramFactory.java

@@ -44,7 +44,6 @@ import net.sourceforge.plantuml.AbstractPSystem;
 import net.sourceforge.plantuml.ErrorUml;
 import net.sourceforge.plantuml.ErrorUmlType;
 import net.sourceforge.plantuml.LineLocation;
-import net.sourceforge.plantuml.Log;
 import net.sourceforge.plantuml.StringLocated;
 import net.sourceforge.plantuml.classdiagram.command.CommandHideShowByGender;
 import net.sourceforge.plantuml.classdiagram.command.CommandHideShowByVisibility;
@@ -54,8 +53,9 @@ import net.sourceforge.plantuml.core.UmlSource;
 import net.sourceforge.plantuml.error.PSystemError;
 import net.sourceforge.plantuml.error.PSystemErrorUtils;
 import net.sourceforge.plantuml.sequencediagram.command.CommandSkin;
+import net.sourceforge.plantuml.sprite.CommandListSprite;
 import net.sourceforge.plantuml.statediagram.command.CommandHideEmptyDescription;
-import net.sourceforge.plantuml.style.CommandStyleMultilines;
+import net.sourceforge.plantuml.style.CommandStyleMultilinesCSS;
 import net.sourceforge.plantuml.utils.StartUtils;
 import net.sourceforge.plantuml.version.IteratorCounter2;
 
@@ -219,11 +219,12 @@ public abstract class UmlDiagramFactory extends PSystemAbstractFactory {
 		addTitleCommands(cmds);
 		addCommonCommands2(cmds);
 		addCommonHides(cmds);
-		cmds.add(new CommandStyleMultilines());
+		cmds.add(new CommandStyleMultilinesCSS());
 
 	}
 
 	final protected void addCommonCommands2(List<Command> cmds) {
+		cmds.add(new CommandListSprite());
 		cmds.add(new CommandNope());
 		cmds.add(new CommandPragma());
 

src/net/sourceforge/plantuml/creole/AtomSprite.java

@@ -43,8 +43,8 @@ import net.sourceforge.plantuml.Url;
 import net.sourceforge.plantuml.graphic.FontConfiguration;
 import net.sourceforge.plantuml.graphic.HtmlColor;
 import net.sourceforge.plantuml.graphic.StringBounder;
+import net.sourceforge.plantuml.sprite.Sprite;
 import net.sourceforge.plantuml.ugraphic.UGraphic;
-import net.sourceforge.plantuml.ugraphic.sprite.Sprite;
 
 public class AtomSprite extends AbstractAtom implements Atom {
 

src/net/sourceforge/plantuml/creole/AtomText.java

@@ -39,6 +39,7 @@ import java.awt.font.LineMetrics;
 import java.awt.geom.Dimension2D;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.StringTokenizer;
@@ -62,10 +63,10 @@ import net.sourceforge.plantuml.graphic.Splitter;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.TextBlockUtils;
 import net.sourceforge.plantuml.openiconic.OpenIcon;
+import net.sourceforge.plantuml.sprite.Sprite;
 import net.sourceforge.plantuml.ugraphic.UGraphic;
 import net.sourceforge.plantuml.ugraphic.UText;
 import net.sourceforge.plantuml.ugraphic.UTranslate;
-import net.sourceforge.plantuml.ugraphic.sprite.Sprite;
 import net.sourceforge.plantuml.utils.CharHidder;
 
 public class AtomText extends AbstractAtom implements Atom {
@@ -335,6 +336,53 @@ public class AtomText extends AbstractAtom implements Atom {
 
 	@Override
 	public List<Atom> splitInTwo(StringBounder stringBounder, double width) {
+		final StringBuilder tmp = new StringBuilder();
+		for (String token : splitted()) {
+			if (tmp.length() > 0 && getWidth(stringBounder, tmp.toString() + token) > width) {
+				final Atom part1 = new AtomText(tmp.toString(), fontConfiguration, url, marginLeft, marginRight);
+				String remain = text.substring(tmp.length());
+				while (remain.startsWith(" ")) {
+					remain = remain.substring(1);
+				}
+
+				final Atom part2 = new AtomText(remain, fontConfiguration, url, marginLeft, marginRight);
+				return Arrays.asList(part1, part2);
+			}
+			tmp.append(token);
+		}
+		return Collections.singletonList((Atom) this);
+	}
+
+	private Collection<String> splitted() {
+		final List<String> result = new ArrayList<String>();
+		for (int i = 0; i < text.length(); i++) {
+			final char ch = text.charAt(i);
+			if (Character.isLetter(ch)) {
+				final StringBuilder tmp = new StringBuilder();
+				tmp.append(ch);
+				while (i + 1 < text.length() && Character.isLetter(text.charAt(i + 1))) {
+					i++;
+					tmp.append(text.charAt(i));
+				}
+				result.add(tmp.toString());
+			} else {
+				result.add("" + text.charAt(i));
+			}
+		}
+		return result;
+	}
+
+	private Collection<String> splittedOld() {
+		final List<String> result = new ArrayList<String>();
+		final StringTokenizer st = new StringTokenizer(text, " ", true);
+		while (st.hasMoreTokens()) {
+			final String token = st.nextToken();
+			result.add(token);
+		}
+		return result;
+	}
+
+	private List<Atom> splitInTwoOld(StringBounder stringBounder, double width) {
 		final StringTokenizer st = new StringTokenizer(text, " ", true);
 		final StringBuilder tmp = new StringBuilder();
 		while (st.hasMoreTokens()) {
@@ -358,27 +406,6 @@ public class AtomText extends AbstractAtom implements Atom {
 		return Arrays.asList(add);
 	}
 
-	private List<String> splitLong2(StringBounder stringBounder, double maxWidth, String add) {
-		final List<String> result = new ArrayList<String>();
-		if (getWidth(stringBounder, add) <= maxWidth) {
-			result.add(add);
-			return result;
-		}
-		final StringBuilder current = new StringBuilder();
-		for (int i = 0; i < add.length(); i++) {
-			final char c = add.charAt(i);
-			if (getWidth(stringBounder, current.toString() + c) > maxWidth) {
-				result.add(current.toString());
-				current.setLength(0);
-			}
-			current.append(c);
-		}
-		if (current.length() > 0) {
-			result.add(current.toString());
-		}
-		return result;
-	}
-
 	public final String getText() {
 		return text;
 	}

src/net/sourceforge/plantuml/creole/StripeSimple.java

@@ -50,7 +50,7 @@ import net.sourceforge.plantuml.graphic.HtmlColor;
 import net.sourceforge.plantuml.graphic.ImgValign;
 import net.sourceforge.plantuml.math.ScientificEquationSafe;
 import net.sourceforge.plantuml.openiconic.OpenIcon;
-import net.sourceforge.plantuml.ugraphic.sprite.Sprite;
+import net.sourceforge.plantuml.sprite.Sprite;
 import net.sourceforge.plantuml.utils.CharHidder;
 
 public class StripeSimple implements Stripe {

src/net/sourceforge/plantuml/cucadiagram/Code.java

@@ -123,4 +123,9 @@ public class Code implements Comparable<Code> {
 		return separator;
 	}
 
+	public String getLastPart() {
+		final int x = this.fullName.lastIndexOf(separator);
+		return this.fullName.substring(x + separator.length());
+	}
+
 }

src/net/sourceforge/plantuml/cucadiagram/CucaDiagram.java

@@ -80,7 +80,6 @@ public abstract class CucaDiagram extends UmlDiagram implements GroupHierarchy,
 
 	public abstract IEntity getOrCreateLeaf(Code code, LeafType type, USymbol symbol);
 
-	
 	public CucaDiagram(ISkinSimple orig) {
 		super(orig);
 	}
@@ -172,7 +171,7 @@ public abstract class CucaDiagram extends UmlDiagram implements GroupHierarchy,
 			if (getNamespaceSeparator() != null) {
 				code = getFullyQualifiedCode(code.withSeparator(getNamespaceSeparator()));
 			}
-			gotoGroupInternal(code, display, code, type, parent);
+			gotoGroupInternalWithNamespace(code, display, code, type, parent);
 		} else if (strategy == NamespaceStrategy.SINGLE) {
 			gotoGroupInternal(code, display, null, type, parent);
 		} else {
@@ -180,6 +179,47 @@ public abstract class CucaDiagram extends UmlDiagram implements GroupHierarchy,
 		}
 	}
 
+	protected final String getNamespace(Code fullyCode, String separator) {
+		String name = fullyCode.getFullName();
+		if (separator == null) {
+			throw new IllegalArgumentException(toString());
+		}
+		do {
+			final int x = name.lastIndexOf(separator);
+			if (x == -1) {
+				return null;
+			}
+			name = name.substring(0, x);
+		} while (entityFactory.getLeafsget(Code.of(name, separator)) != null);
+		return name;
+	}
+
+	final protected void gotoGroupInternalWithNamespace(final Code code, Display display, final Code namespace2,
+			GroupType type, IGroup parent) {
+		if (getNamespaceSeparator() == null) {
+			gotoGroupInternal(code, display, namespace2, type, parent);
+			return;
+		}
+
+		final String namespace = getNamespace(code, getNamespaceSeparator());
+		if (namespace == null) {
+			gotoGroupInternal(code, display, namespace2, type, parent);
+			return;
+		}
+		final IGroup realParent = entityFactory.getGroupsget(Code.of(namespace));
+		if (realParent == null) {
+			gotoGroupInternal(code, display, namespace2, type, parent);
+			return;
+		}
+		display = Display.create(code.getLastPart());
+		IGroup result = entityFactory.createGroup(code, display, namespace2, type, realParent, getHides(),
+				getNamespaceSeparator());
+
+		entityFactory.addGroup(result);
+		currentGroup = result;
+
+	}
+
 	final protected void gotoGroupInternal(final Code code, Display display, final Code namespace2, GroupType type,
 			IGroup parent) {
 		IGroup result = entityFactory.getGroupsget(code);

src/net/sourceforge/plantuml/cucadiagram/Display.java

@@ -71,6 +71,7 @@ import net.sourceforge.plantuml.graphic.TextBlockUtils;
 import net.sourceforge.plantuml.graphic.VerticalAlignment;
 import net.sourceforge.plantuml.sequencediagram.MessageNumber;
 import net.sourceforge.plantuml.skin.VisibilityModifier;
+import net.sourceforge.plantuml.style.Style;
 import net.sourceforge.plantuml.ugraphic.UFont;
 import net.sourceforge.plantuml.ugraphic.UStroke;
 
@@ -83,12 +84,12 @@ public class Display implements Iterable<CharSequence> {
 
 	public final static Display NULL = new Display(null, null, true, CreoleMode.FULL);
 
-	public Display withoutStereotype() {
+	public Display withoutStereotype(Style usedStyle) {
 		final List<CharSequence> copy = new ArrayList<CharSequence>(displayData);
 		final Display result = new Display(naturalHorizontalAlignment, isNull, defaultCreoleMode);
 		for (Iterator<CharSequence> it = copy.iterator(); it.hasNext();) {
 			final CharSequence cs = it.next();
-			if (cs instanceof Stereotype) {
+			if (cs instanceof Stereotype && usedStyle.getSignature().match(((Stereotype) cs))) {
 				it.remove();
 			}
 		}

src/net/sourceforge/plantuml/cucadiagram/DisplaySection.java

@@ -39,7 +39,6 @@ import java.util.EnumMap;
 import java.util.Map;
 
 import net.sourceforge.plantuml.ISkinSimple;
-import net.sourceforge.plantuml.SkinParam;
 import net.sourceforge.plantuml.graphic.FontConfiguration;
 import net.sourceforge.plantuml.graphic.HorizontalAlignment;
 import net.sourceforge.plantuml.graphic.TextBlock;

src/net/sourceforge/plantuml/cucadiagram/Link.java

@@ -54,6 +54,7 @@ import net.sourceforge.plantuml.graphic.color.Colors;
 import net.sourceforge.plantuml.skin.VisibilityModifier;
 import net.sourceforge.plantuml.style.StyleBuilder;
 import net.sourceforge.plantuml.svek.Bibliotekon;
+import net.sourceforge.plantuml.ugraphic.UComment;
 import net.sourceforge.plantuml.ugraphic.UFont;
 import net.sourceforge.plantuml.utils.UniqueSequence;
 
@@ -99,6 +100,28 @@ public class Link extends WithLinkType implements Hideable, Removeable {
 
 	private Url url;
 
+	public String idCommentForSvg() {
+		if (type.looksLikeRevertedForSvg()) {
+			final String comment = getEntity1().getCode().getFullName() + "<-" + getEntity2().getCode().getFullName();
+			return comment;
+		}
+		if (type.looksLikeNoDecorAtAllSvg()) {
+			final String comment = getEntity1().getCode().getFullName() + "-" + getEntity2().getCode().getFullName();
+			return comment;
+		}
+		final String comment = getEntity1().getCode().getFullName() + "->" + getEntity2().getCode().getFullName();
+		return comment;
+	}
+
+	public UComment commentForSvg() {
+		if (type.looksLikeRevertedForSvg()) {
+			return new UComment("reverse link " + getEntity1().getCode().getFullName() + " to "
+					+ getEntity2().getCode().getFullName());
+		}
+		return new UComment("link " + getEntity1().getCode().getFullName() + " to "
+				+ getEntity2().getCode().getFullName());
+	}
+
 	public Link(IEntity cl1, IEntity cl2, LinkType type, Display label, int length, StyleBuilder styleBuilder) {
 		this(cl1, cl2, type, label, length, null, null, null, null, null, styleBuilder);
 	}

src/net/sourceforge/plantuml/cucadiagram/LinkType.java

@@ -50,6 +50,23 @@ public class LinkType {
 		return decor1 != LinkDecor.NONE && decor2 != LinkDecor.NONE;
 	}
 
+	public boolean looksLikeRevertedForSvg() {
+		if (this.decor1 == LinkDecor.NONE && this.decor2 != LinkDecor.NONE) {
+			return true;
+		}
+		return false;
+	}
+
+	public boolean looksLikeNoDecorAtAllSvg() {
+		if (this.decor1 == LinkDecor.NONE && this.decor2 == LinkDecor.NONE) {
+			return true;
+		}
+		if (this.decor1 != LinkDecor.NONE && this.decor2 != LinkDecor.NONE) {
+			return true;
+		}
+		return false;
+	}
+
 	public LinkType(LinkDecor decor1, LinkDecor decor2) {
 		this(LinkHat.NONE, decor1, decor2, LinkHat.NONE);
 	}
@@ -99,18 +116,6 @@ public class LinkType {
 		this.hat2 = hat2;
 	}
 
-	// private boolean isDashed() {
-	// return style == LinkStyle.DASHED;
-	// }
-	//
-	// private boolean isDotted() {
-	// return style == LinkStyle.DOTTED;
-	// }
-	//
-	// private boolean isBold() {
-	// return style == LinkStyle.BOLD;
-	// }
-
 	public boolean isInvisible() {
 		return style.isInvisible();
 	}
@@ -131,14 +136,6 @@ public class LinkType {
 		return new LinkType(hat1, decor1, LinkStyle.BOLD(), middleDecor, decor2, hat2);
 	}
 
-	// public LinkType getInterfaceProvider() {
-	// return new LinkType(hat1, decor1, LinkStyle.__toremove_INTERFACE_PROVIDER, middleDecor, decor2, hat2);
-	// }
-	//
-	// public LinkType getInterfaceUser() {
-	// return new LinkType(hat1, decor1, LinkStyle.__toremove_INTERFACE_USER, middleDecor, decor2, hat2);
-	// }
-
 	public LinkType getInversed() {
 		return new LinkType(hat2, decor2, style, middleDecor, decor1, hat1);
 	}

src/net/sourceforge/plantuml/cucadiagram/Stereotype.java

@@ -58,12 +58,12 @@ import net.sourceforge.plantuml.graphic.HtmlColor;
 import net.sourceforge.plantuml.graphic.HtmlColorUtils;
 import net.sourceforge.plantuml.graphic.IHtmlColorSet;
 import net.sourceforge.plantuml.graphic.TextBlock;
+import net.sourceforge.plantuml.sprite.Sprite;
+import net.sourceforge.plantuml.sprite.SpriteUtils;
 import net.sourceforge.plantuml.style.Style;
 import net.sourceforge.plantuml.style.StyleBuilder;
 import net.sourceforge.plantuml.svek.PackageStyle;
 import net.sourceforge.plantuml.ugraphic.UFont;
-import net.sourceforge.plantuml.ugraphic.sprite.Sprite;
-import net.sourceforge.plantuml.ugraphic.sprite.SpriteUtils;
 
 public class Stereotype implements CharSequence {
 	private final static RegexComposed circleChar = new RegexConcat( //

src/net/sourceforge/plantuml/donors/PSystemDonors.java

@@ -89,6 +89,12 @@ public class PSystemDonors extends AbstractPSystem {
 			+ "b3kGXTfnVAZuJog6mzInmVABPPAYso0dTRs8ErLGzlKlmaaEXSyxHPKTHLoNoZqn8fdO-L6S-TXdJu6R"
 			+ "c-1cwePB1FgU_cwOn45jpHSfDGm7GvwAIAETpri3";
 
+	/*
+	 * Special thanks to our sponsors and donors:
+	 * 
+	 *   - Noam Tamim
+	 */
+
 	@Override
 	final protected ImageData exportDiagramNow(OutputStream os, int num, FileFormatOption fileFormat, long seed)
 			throws IOException {

src/net/sourceforge/plantuml/eps/EpsGraphics.java

@@ -218,10 +218,6 @@ public class EpsGraphics {
 		return dashSpace != 0 && dashVisible != 0;
 	}
 
-	private boolean isDashed4() {
-		return dashSpace == 0 && dashVisible == 0;
-	}
-
 	public void closepathDot() {
 		final boolean dashed = isDashed();
 		append("stroke", true);
@@ -481,15 +477,10 @@ public class EpsGraphics {
 		if (isDashed3()) {
 			append("[" + dashSpace + " " + dashVisible + "] 0 setdash", true);
 		}
-		if (isDashed4() || fill) {
+		// if (isDashed3() || fill) {
 			append(format(width) + " " + format(height) + " " + format(x) + " " + format(y) + " simplerect", true);
 			simplerectUsed = true;
-			// } else {
+		// }
-			// epsVLine(y, x, x + width);
-			// epsVLine(y + height, x, x + width);
-			// epsHLine(x, y, y + height);
-			// epsHLine(x + width, y, y + height);
-		}
 	}
 
 	public void epsEllipse(double x, double y, double xRadius, double yRadius, double start, double extend) {

src/net/sourceforge/plantuml/fun/IconLoader.java

@@ -37,6 +37,9 @@ package net.sourceforge.plantuml.fun;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -44,19 +47,29 @@ import javax.imageio.ImageIO;
 
 public class IconLoader {
 
-	private static final int NUMBER_OF_ICONS = 29;
+	private static final int NUMBER_OF_ICONS = 30;
 
 	private final static Map<String, BufferedImage> all = new ConcurrentHashMap<String, BufferedImage>();
+	static private final List<String> tmp = new ArrayList<String>();
 
 	public static BufferedImage getRandom() {
-		// return addTransparent(getIcon("sprite028.png"));
+		// return addTransparent(getIcon("sprite029.png"));
 		return addTransparent(getIcon(getSomeQuote()));
 	}
 
 	private static String getSomeQuote() {
-		final int v = (int) (System.currentTimeMillis() / 1000L);
+		synchronized (tmp) {
-		final int n = v % NUMBER_OF_ICONS;
+			if (tmp.size() == 0) {
-		return "sprite" + String.format("%03d", n) + ".png";
+				for (int i = 0; i < NUMBER_OF_ICONS; i++) {
+					tmp.add("sprite" + String.format("%03d", i) + ".png");
+				}
+				Collections.shuffle(tmp);
+			}
+			final int size = tmp.size();
+			final String result = tmp.get(size - 1);
+			tmp.remove(size - 1);
+			return result;
+		}
 	}
 
 	private static BufferedImage getIcon(String name) {

src/net/sourceforge/plantuml/graphic/HorizontalAlignment.java

@@ -35,7 +35,11 @@
  */
 package net.sourceforge.plantuml.graphic;
 
+import java.awt.geom.Dimension2D;
+
 import net.sourceforge.plantuml.StringUtils;
+import net.sourceforge.plantuml.ugraphic.UGraphic;
+import net.sourceforge.plantuml.ugraphic.UTranslate;
 
 public enum HorizontalAlignment {
 
@@ -73,4 +77,17 @@ public enum HorizontalAlignment {
 		return toString().substring(0, 1).toLowerCase();
 	}
 
+	public void draw(UGraphic ug, TextBlock tb, double padding, Dimension2D dimTotal) {
+		if (this == HorizontalAlignment.LEFT) {
+			tb.drawU(ug.apply(new UTranslate(padding, padding)));
+		} else if (this == HorizontalAlignment.RIGHT) {
+			final Dimension2D dimTb = tb.calculateDimension(ug.getStringBounder());
+			tb.drawU(ug.apply(new UTranslate(dimTotal.getWidth() - dimTb.getWidth() - padding, padding)));
+		} else if (this == HorizontalAlignment.CENTER) {
+			final Dimension2D dimTb = tb.calculateDimension(ug.getStringBounder());
+			tb.drawU(ug.apply(new UTranslate((dimTotal.getWidth() - dimTb.getWidth()) / 2, padding)));
+		}
+
+	}
+
 }

src/net/sourceforge/plantuml/graphic/HtmlColorAndStyle.java

@@ -35,15 +35,16 @@
  */
 package net.sourceforge.plantuml.graphic;
 
-import net.sourceforge.plantuml.ColorParam;
 import net.sourceforge.plantuml.ISkinParam;
+import net.sourceforge.plantuml.SkinParam;
 import net.sourceforge.plantuml.cucadiagram.LinkStyle;
-import net.sourceforge.plantuml.skin.rose.Rose;
+import net.sourceforge.plantuml.style.PName;
+import net.sourceforge.plantuml.style.SName;
+import net.sourceforge.plantuml.style.Style;
+import net.sourceforge.plantuml.style.StyleSignature;
 
 public class HtmlColorAndStyle {
 
-	private final static Rose rose = new Rose();
-
 	private final HtmlColor color;
 	private final LinkStyle style;
 
@@ -52,18 +53,7 @@ public class HtmlColorAndStyle {
 		return color + " " + style;
 	}
 
-	public static Rainbow fromColor(HtmlColor color) {
+	public HtmlColorAndStyle(HtmlColor color) {
-		if (color == null) {
-			return Rainbow.none();
-		}
-		return Rainbow.build(new HtmlColorAndStyle(color));
-	}
-
-	public static Rainbow build(ISkinParam skinParam) {
-		return fromColor(rose.getHtmlColor(skinParam, ColorParam.arrow));
-	}
-
-	private HtmlColorAndStyle(HtmlColor color) {
 		this(color, LinkStyle.NORMAL());
 	}
 
@@ -83,8 +73,18 @@ public class HtmlColorAndStyle {
 		return style;
 	}
 
+	static final public StyleSignature getDefaultStyleDefinitionArrow() {
+		return StyleSignature.of(SName.root, SName.element, SName.activityDiagram, SName.arrow);
+	}
+
 	public static HtmlColorAndStyle build(ISkinParam skinParam, String definition) {
-		HtmlColor color = build(skinParam).getColors().get(0).color;
+		HtmlColor color;
+		if (SkinParam.USE_STYLES()) {
+			final Style style = getDefaultStyleDefinitionArrow().getMergedStyle(skinParam.getCurrentStyleBuilder());
+			color = style.value(PName.LineColor).asColor(skinParam.getIHtmlColorSet());
+		} else {
+			color = Rainbow.build(skinParam).getColors().get(0).color;
+		}
 		LinkStyle style = LinkStyle.NORMAL();
 		final IHtmlColorSet set = skinParam.getIHtmlColorSet();
 		for (String s : definition.split(",")) {