feat: work on chronology

gradle.properties

@@ -1,4 +1,4 @@
 # Warning, "version" should be the same in gradle.properties and Version.java
 # Any idea anyone how to magically synchronize those :-) ?
-version = 1.2023.13beta3
+version = 1.2023.13beta4
 org.gradle.workers.max = 3

src/com/plantuml/api/cheerpj/v1/DirectDraw.java

@@ -53,6 +53,7 @@
 import net.sourceforge.plantuml.BlockUmlBuilder;
 import net.sourceforge.plantuml.ErrorUml;
 import net.sourceforge.plantuml.FileFormat;
+import net.sourceforge.plantuml.FileFormatOption;
 import net.sourceforge.plantuml.core.Diagram;
 import net.sourceforge.plantuml.error.PSystemError;
 import net.sourceforge.plantuml.klimt.color.ColorMapper;
@@ -122,7 +123,7 @@ public static Object draw(String mode, String text) {
 			ug.apply(back).apply(back.bg()).draw(URectangle.build(frameWidth, frameHeight));
 			WasmLog.log("...drawing...");
 
-			system.exportDiagramGraphic(ug);
+			system.exportDiagramGraphic(ug, new FileFormatOption(FileFormat.PNG));
 
 			WasmLog.log("done!");
 

src/com/plantuml/api/cheerpj/v1/Raw.java

@@ -55,6 +55,7 @@
 import net.sourceforge.plantuml.EmptyImageBuilder;
 import net.sourceforge.plantuml.ErrorUml;
 import net.sourceforge.plantuml.FileFormat;
+import net.sourceforge.plantuml.FileFormatOption;
 import net.sourceforge.plantuml.api.ImageDataSimple;
 import net.sourceforge.plantuml.core.Diagram;
 import net.sourceforge.plantuml.core.ImageData;
@@ -124,7 +125,7 @@ public static Object convertToBlob(String mode, String text, String pathOut) {
 			ug.resetMax();
 			WasmLog.log("...drawing...");
 
-			system.exportDiagramGraphic(ug);
+			system.exportDiagramGraphic(ug, new FileFormatOption(FileFormat.PNG));
 
 			final int width = (int) (2 + ug.getMaxX());
 			final int height = (int) (2 + ug.getMaxY());
@@ -208,7 +209,7 @@ public static Object convert(String mode, String text) {
 			ug.resetMax();
 			WasmLog.log("...drawing...");
 
-			system.exportDiagramGraphic(ug);
+			system.exportDiagramGraphic(ug, new FileFormatOption(FileFormat.PNG));
 
 			final int width = (int) (2 + ug.getMaxX());
 			final int height = (int) (2 + ug.getMaxY());

src/net/atmp/CucaDiagram.java

@@ -376,13 +376,13 @@ private void createFilesTxt(OutputStream os, int index, FileFormat fileFormat) t
 	// ::done
 
 	@Override
-	final public void exportDiagramGraphic(UGraphic ug) {
+	final public void exportDiagramGraphic(UGraphic ug, FileFormatOption fileFormatOption) {
 		final CucaDiagramFileMaker maker = new CucaDiagramFileMakerSmetana(this, ug.getStringBounder());
 		maker.createOneGraphic(ug);
 	}
 
 	@Override
-	final protected TextBlock getTextBlock() {
+	final protected TextBlock getTextMainBlock(FileFormatOption fileFormatOption) {
 		throw new UnsupportedOperationException();
 	}
 

src/net/sourceforge/plantuml/AbstractPSystem.java

@@ -114,14 +114,14 @@ private String getVersion() {
 	}
 
 	final public String getMetadata() {
-		if (source == null) 
+		if (source == null)
 			return getVersion();
-		
+
 		final String rawString = source.getRawString("\n");
 		final String plainString = source.getPlainString("\n");
-		if (rawString != null && rawString.equals(plainString)) 
+		if (rawString != null && rawString.equals(plainString))
 			return rawString + BackSlash.NEWLINE + getVersion();
-		
+
 		return rawString + BackSlash.NEWLINE + plainString + BackSlash.NEWLINE + getVersion();
 	}
 
@@ -130,9 +130,9 @@ final public UmlSource getSource() {
 	}
 
 	final public long seed() {
-		if (source == null) 
+		if (source == null)
 			return 42;
-		
+
 		return getSource().seed();
 	}
 
@@ -159,9 +159,9 @@ public void setSplitPagesVertical(int splitPagesVertical) {
 	}
 
 	public DisplayPositionned getTitle() {
-		if (source == null) 
+		if (source == null)
 			return DisplayPositioned.single(Display.empty(), HorizontalAlignment.CENTER, VerticalAlignment.TOP);
-		
+
 		return DisplayPositioned.single(source.getTitle(), HorizontalAlignment.CENTER, VerticalAlignment.TOP);
 	}
 
@@ -247,7 +247,7 @@ public Display getTitleDisplay() {
 	}
 
 	@Override
-	public void exportDiagramGraphic(UGraphic ug) {
+	public void exportDiagramGraphic(UGraphic ug, FileFormatOption fileFormatOption) {
 		final UFont font = UFont.monospaced(14);
 		final FontConfiguration fc = FontConfiguration.blackBlueTrue(font);
 		final UText text = UText.build("Not implemented yet for " + getClass().getName(), fc);

src/net/sourceforge/plantuml/Option.java

@@ -440,9 +440,11 @@ else if (nb.matches("\\d+"))
 
 			} else if (s.equalsIgnoreCase("-preproc")) {
 				preprocessorOutput = OptionPreprocOutputMode.NORMAL;
+				setFileFormatOption(new FileFormatOption(FileFormat.PREPROC));
 
 			} else if (s.equalsIgnoreCase("-cypher")) {
 				preprocessorOutput = OptionPreprocOutputMode.CYPHER;
+				setFileFormatOption(new FileFormatOption(FileFormat.PREPROC));
 
 			} else if (s.equalsIgnoreCase("-checkmetadata")) {
 				checkMetadata = true;

src/net/sourceforge/plantuml/PSystemBuilder.java

@@ -48,6 +48,7 @@
 import net.sourceforge.plantuml.api.PSystemFactory;
 import net.sourceforge.plantuml.board.BoardDiagramFactory;
 import net.sourceforge.plantuml.bpm.BpmDiagramFactory;
+import net.sourceforge.plantuml.chronology.ChronologyDiagramFactory;
 import net.sourceforge.plantuml.classdiagram.ClassDiagramFactory;
 import net.sourceforge.plantuml.core.Diagram;
 import net.sourceforge.plantuml.core.DiagramType;
@@ -223,7 +224,8 @@ final public Diagram createPSystem(List<StringLocated> source, List<StringLocate
 		// factories.add(new PSystemSudokuFactory());
 		// ::done
 
-		// ::comment when __CORE__ or __MIT__ or __EPL__ or __BSD__ or __ASL__ or __LGPL__
+		// ::comment when __CORE__ or __MIT__ or __EPL__ or __BSD__ or __ASL__ or
+		// __LGPL__
 		factories.add(new PSystemJcckitFactory());
 		factories.add(new PSystemSudokuFactory());
 		// ::done
@@ -247,11 +249,13 @@ final public Diagram createPSystem(List<StringLocated> source, List<StringLocate
 		// ::done
 
 		factories.add(new PSystemCharlieFactory());
-		// ::comment when __CORE__ or __MIT__ or __EPL__ or __BSD__ or __ASL__ or __LGPL__
+		// ::comment when __CORE__ or __MIT__ or __EPL__ or __BSD__ or __ASL__ or
+		// __LGPL__
 		factories.add(new PSystemXearthFactory());
 		// ::done
 
 		factories.add(new GanttDiagramFactory());
+		factories.add(new ChronologyDiagramFactory());
 		factories.add(new FlowDiagramFactory());
 
 		// ::comment when __CORE__

src/net/sourceforge/plantuml/PlainDiagram.java

@@ -66,14 +66,13 @@ protected ImageData exportDiagramNow(OutputStream os, int index, FileFormatOptio
 	}
 
 	@Override
-	public void exportDiagramGraphic(UGraphic ug) {
-		final FileFormatOption option = new FileFormatOption(FileFormat.PNG);
+	public void exportDiagramGraphic(UGraphic ug, FileFormatOption fileFormatOption) {
 		try {
-			final UDrawable rootDrawable = getRootDrawable(option);
+			final UDrawable rootDrawable = getRootDrawable(fileFormatOption);
 			rootDrawable.drawU(ug);
 		} catch (IOException e) {
 			e.printStackTrace();
-			super.exportDiagramGraphic(ug);
+			super.exportDiagramGraphic(ug, fileFormatOption);
 		}
 	}
 

src/net/sourceforge/plantuml/SourceStringReader.java

@@ -54,6 +54,7 @@
 import net.sourceforge.plantuml.klimt.shape.TextBlock;
 import net.sourceforge.plantuml.preproc.Defines;
 import net.sourceforge.plantuml.security.SFile;
+import net.sourceforge.plantuml.text.StringLocated;
 import net.sourceforge.plantuml.utils.Log;
 
 public class SourceStringReader {
@@ -157,6 +158,14 @@ public DiagramDescription outputImage(OutputStream os, int numImage, FileFormatO
 			noValidStartFound(os, fileFormatOption);
 			return null;
 		}
+		if (fileFormatOption.getFileFormat() == FileFormat.PREPROC) {
+			final BlockUml first = blocks.get(0);
+			for (StringLocated s : first.getData()) {
+				os.write(s.getString().getBytes(UTF_8));
+				os.write("\n".getBytes(UTF_8));
+			}
+			return new DiagramDescription("PREPROC");
+		}
 		for (BlockUml b : blocks) {
 			final Diagram system = b.getDiagram();
 			final int nbInSystem = system.getNbImages();
@@ -231,7 +240,8 @@ public String getCMapData(int numImage, FileFormatOption fileFormatOption) throw
 	}
 
 	public ImageData noValidStartFound(OutputStream os, FileFormatOption fileFormatOption) throws IOException {
-		final TextBlock error = GraphicStrings.createForError(Arrays.asList("No valid @start/@end found, please check the version"),
+		final TextBlock error = GraphicStrings.createForError(
+				Arrays.asList("No valid @start/@end found, please check the version"),
 				fileFormatOption.isUseRedForError());
 
 		return plainImageBuilder(error, fileFormatOption).write(os);

src/net/sourceforge/plantuml/TitledDiagram.java

@@ -253,11 +253,11 @@ protected ColorMapper muteColorMapper(ColorMapper init) {
 
 	}
 
-	protected abstract TextBlock getTextBlock();
+	protected abstract TextBlock getTextMainBlock(FileFormatOption fileFormatOption);
 
 	@Override
-	public void exportDiagramGraphic(UGraphic ug) {
-		final TextBlock textBlock = getTextBlock();
+	public void exportDiagramGraphic(UGraphic ug, FileFormatOption fileFormatOption) {
+		final TextBlock textBlock = getTextMainBlock(fileFormatOption);
 		textBlock.drawU(ug);
 	}
 

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

@@ -61,6 +61,7 @@
 import net.sourceforge.plantuml.regex.RegexPartialMatch;
 import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.stereo.Stereotype;
+import net.sourceforge.plantuml.stereo.StereotypePattern;
 import net.sourceforge.plantuml.url.Url;
 import net.sourceforge.plantuml.url.UrlBuilder;
 import net.sourceforge.plantuml.url.UrlMode;
@@ -81,9 +82,7 @@ private static IRegex getRegexConcat() {
 								new RegexLeaf("CODE", "([%pLN][%pLN_.]*)"), //
 								new RegexLeaf("BAR", "(?:==+)[%s]*([%pLN_.]+)[%s]*(?:==+)"), //
 								new RegexLeaf("QUOTED", "[%g]([^%g]+)[%g](?:[%s]+as[%s]+([%pLN_.]+))?"))), //
-				RegexLeaf.spaceZeroOrMore(), //
-				new RegexLeaf("STEREOTYPE", "(\\<\\<.*\\>\\>)?"), //
-				RegexLeaf.spaceZeroOrMore(), //
+				StereotypePattern.optional("STEREOTYPE"), //
 				ColorParser.exp2(), //
 				RegexLeaf.spaceZeroOrMore(), //
 				UrlBuilder.OPTIONAL, //
@@ -105,9 +104,7 @@ private static IRegex getRegexConcat() {
 						new RegexLeaf("BAR2", "(?:==+)[%s]*([%pLN_.]+)[%s]*(?:==+)"), //
 						new RegexLeaf("QUOTED2", "[%g]([^%g]+)[%g](?:[%s]+as[%s]+([%pLN][%pLN_.]*))?"), //
 						new RegexLeaf("QUOTED_INVISIBLE2", "(\\w.*?)")), //
-				RegexLeaf.spaceZeroOrMore(), //
-				new RegexLeaf("STEREOTYPE2", "(\\<\\<.*\\>\\>)?"), //
-				RegexLeaf.spaceZeroOrMore(), //
+				StereotypePattern.optional("STEREOTYPE2"), //
 				new RegexOptional( //
 						new RegexConcat( //
 								new RegexLeaf("in"), //

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

@@ -64,6 +64,7 @@
 import net.sourceforge.plantuml.regex.RegexOr;
 import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.stereo.Stereotype;
+import net.sourceforge.plantuml.stereo.StereotypePattern;
 import net.sourceforge.plantuml.text.BackSlash;
 import net.sourceforge.plantuml.text.StringLocated;
 import net.sourceforge.plantuml.url.Url;
@@ -91,9 +92,7 @@ static IRegex getRegexConcat() {
 								new RegexLeaf("CODE", "([%pLN][%pLN_.]*)"), //
 								new RegexLeaf("BAR", "(?:==+)[%s]*([%pLN_.]+)[%s]*(?:==+)"), //
 								new RegexLeaf("QUOTED", "[%g]([^%g]+)[%g](?:[%s]+as[%s]+([%pLN_.]+))?"))), //
-				RegexLeaf.spaceZeroOrMore(), //
-				new RegexLeaf("STEREOTYPE", "(\\<\\<.*\\>\\>)?"), //
-				RegexLeaf.spaceZeroOrMore(), //
+				StereotypePattern.optional("STEREOTYPE"), //
 				new RegexLeaf("BACKCOLOR", "(#\\w+)?"), //
 				RegexLeaf.spaceZeroOrMore(), //
 				UrlBuilder.OPTIONAL, //

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

@@ -52,6 +52,7 @@
 import net.sourceforge.plantuml.regex.RegexOr;
 import net.sourceforge.plantuml.regex.RegexResult;
 import net.sourceforge.plantuml.stereo.Stereotype;
+import net.sourceforge.plantuml.stereo.StereotypePattern;
 import net.sourceforge.plantuml.utils.LineLocation;
 
 public class CommandPartition extends SingleLineCommand2<ActivityDiagram> {
@@ -69,9 +70,7 @@ private static IRegex getRegexConcat() {
 				new RegexOr(//
 						color().getRegex(), //
 						new RegexLeaf("LEGACYCOLORIGNORED", "(#[0-9a-fA-F]{6}|#?\\w+)?")), //
-				RegexLeaf.spaceZeroOrMore(), //
-				new RegexLeaf("STEREOTYPE", "(\\<\\<.*\\>\\>)?"), //
-				RegexLeaf.spaceZeroOrMore(), //
+				StereotypePattern.optional("STEREOTYPE"), //
 				new RegexLeaf("\\{?"), //
 				RegexLeaf.end());
 	}
@@ -89,12 +88,10 @@ protected CommandExecutionResult executeArg(ActivityDiagram diagram, LineLocatio
 		final Entity p = diagram.getCurrentGroup();
 
 		final Colors colors = color().getColor(arg, diagram.getSkinParam().getIHtmlColorSet());
-		if (colors.isEmpty() == false) {
+		if (colors.isEmpty() == false)
 			p.setColors(colors);
-		}
-		if (arg.get("STEREOTYPE", 0) != null) {
-			p.setStereotype(Stereotype.build(arg.get("STEREOTYPE", 0)));
-		}
+
+		p.setStereotype(Stereotype.build(arg.get("STEREOTYPE", 0)));
 
 		return CommandExecutionResult.ok();
 	}

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

@@ -40,7 +40,6 @@
 import java.util.Map;
 import java.util.Objects;
 
-import net.sourceforge.plantuml.FileFormat;
 import net.sourceforge.plantuml.FileFormatOption;
 import net.sourceforge.plantuml.UmlDiagram;
 import net.sourceforge.plantuml.activitydiagram3.ftile.BoxStyle;
@@ -208,8 +207,7 @@ protected ImageData exportDiagramInternal(OutputStream os, int index, FileFormat
 	}
 
 	@Override
-	protected TextBlock getTextBlock() {
-		final FileFormatOption fileFormatOption = new FileFormatOption(FileFormat.PNG);
+	protected TextBlock getTextMainBlock(FileFormatOption fileFormatOption) {
 		final StringBounder stringBounder = fileFormatOption.getDefaultStringBounder(getSkinParam());
 		return getTextBlock(stringBounder);
 	}
@@ -318,10 +316,10 @@ public CommandExecutionResult endSwitch() {
 		return CommandExecutionResult.error("Cannot find switch");
 	}
 
-	public void startIf(Display test, Display whenThen, HColor color, Url url) {
+	public void startIf(Display test, Display whenThen, HColor color, Url url, Stereotype stereotype) {
 		manageSwimlaneStrategy();
 		final InstructionIf instructionIf = new InstructionIf(swinlanes.getCurrentSwimlane(), current(), test,
-				LinkRendering.none().withDisplay(whenThen), nextLinkRenderer(), color, getSkinParam(), url);
+				LinkRendering.none().withDisplay(whenThen), nextLinkRenderer(), color, getSkinParam(), url, stereotype);
 		current().add(instructionIf);
 		setNextLinkRendererInternal(LinkRendering.none());
 		setCurrent(instructionIf);
@@ -392,7 +390,8 @@ public CommandExecutionResult backward(Display label, BoxStyle boxStyle, LinkRen
 		manageSwimlaneStrategy();
 		if (current() instanceof InstructionRepeat) {
 			final InstructionRepeat instructionRepeat = (InstructionRepeat) current();
-			instructionRepeat.setBackward(label, swinlanes.getCurrentSwimlane(), boxStyle, incoming1, incoming2, stereotype);
+			instructionRepeat.setBackward(label, swinlanes.getCurrentSwimlane(), boxStyle, incoming1, incoming2,
+					stereotype);
 			return CommandExecutionResult.ok();
 		}
 		if (current() instanceof InstructionWhile) {

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

@@ -57,6 +57,7 @@
 import net.sourceforge.plantuml.klimt.shape.TextBlockUtils;
 import net.sourceforge.plantuml.sequencediagram.NotePosition;
 import net.sourceforge.plantuml.sequencediagram.NoteType;
+import net.sourceforge.plantuml.stereo.Stereotype;
 import net.sourceforge.plantuml.style.ISkinParam;
 import net.sourceforge.plantuml.style.PName;
 import net.sourceforge.plantuml.style.SName;
@@ -95,12 +96,12 @@ public boolean containsBreak() {
 	}
 
 	public Branch(StyleBuilder styleBuilder, Swimlane swimlane, LinkRendering labelPositive, Display labelTest,
-			HColor color, LinkRendering inlabel) {
+			HColor color, LinkRendering inlabel, Stereotype stereotype) {
 		this.inlabel = Objects.requireNonNull(inlabel);
 		this.labelTest = Objects.requireNonNull(labelTest);
 		this.labelPositive = Objects.requireNonNull(labelPositive);
 
-		final Style style = getDefaultStyleDefinitionDiamond().getMergedStyle(styleBuilder);
+		final Style style = getDefaultStyleDefinitionDiamond().withTOBECHANGED(stereotype).getMergedStyle(styleBuilder);
 		this.color = color == null
 				? style.value(PName.BackGroundColor).asColor(styleBuilder.getSkinParam().getIHtmlColorSet())
 				: color;