Merge 1c0df87 into c688f0e

.lift.toml

@@ -0,0 +1,4 @@
+# PlantUML sources are not ours and shouldn't be inspected.
+ignoreFiles = """\
+  src/test\
+  src/plantuml-asl"""

pom.xml

@@ -123,6 +123,7 @@
                 <includes>
                     <include>stdlib/**/*.repx</include>
                     <include>skin/**/*.skin</include>
+                    <include>themes/**/*.puml</include>
                 </includes>
             </resource>
         </resources>

src/plantuml-asl/build.xml

@@ -20,7 +20,7 @@
 	<target name="compile">
 		<delete dir="build" />
 		<mkdir dir="build" />
-		<javac target="1.6" source="1.6" srcdir="src" destdir="build" debug="on" />
+		<javac target="1.7" source="1.7" srcdir="src" destdir="build" debug="on" />
 		<copy file="src/net/sourceforge/plantuml/version/logo.png"
 			todir="build/net/sourceforge/plantuml/version" />
 		<copy file="src/net/sourceforge/plantuml/version/favicon.png"
@@ -76,6 +76,11 @@
 				<include name="**/*.skin" />
 			</fileset>
 		</copy>
+		<copy todir="build/themes">
+			<fileset dir="themes">
+				<include name="**/*.puml" />
+			</fileset>
+		</copy>
 		<copy todir="build/svg">
 			<fileset dir="svg">
 				<include name="**/*.js" />
@@ -91,7 +96,7 @@
 			<manifest>
 				<attribute name="Automatic-Module-Name" value="net.sourceforge.plantuml" />
 				<attribute name="Main-Class" value="net.sourceforge.plantuml.Run" />
-				<attribute name="Class-Path" value="avalon-framework-4.2.0.jar batik-all-1.7.jar commons-io-1.3.1.jar commons-logging-1.0.4.jar fop.jar xml-apis-ext-1.3.04.jar xmlgraphics-commons-1.4.jar jlatexmath-minimal-1.0.3.jar jlm_cyrillic.jar jlm_greek.jar vizjs.jar j2v8_win32_x86_64-3.1.6.jar j2v8_linux_x86_64-3.1.6.jar j2v8_macosx_x86_64-3.1.6.jar ditaa0_9.jar" />
+				<attribute name="Class-Path" value="elk-full.jar avalon-framework-4.2.0.jar batik-all-1.7.jar commons-io-1.3.1.jar commons-logging-1.0.4.jar fop.jar xml-apis-ext-1.3.04.jar xmlgraphics-commons-1.4.jar jlatexmath-minimal-1.0.3.jar jlm_cyrillic.jar jlm_greek.jar vizjs.jar j2v8_win32_x86_64-3.1.6.jar j2v8_linux_x86_64-3.1.6.jar j2v8_macosx_x86_64-3.1.6.jar ditaa0_9.jar" />
 			</manifest>
 		</jar>
 		<delete dir="build" />

src/plantuml-asl/skin/plantuml.skin

@@ -273,10 +273,37 @@ milestone {
 }
 
 ganttDiagram {
+	arrow {
+	  LineThickness 1.5
+	}
 	note {
 	  FontSize 9
       Shadowing 0.0
 	}
+	separator {
+	  FontSize 11
+	  FontStyle plain
+	  BackGroundColor transparent
+	  Margin 5
+	  Padding 5
+	}
+	timeline {
+	    BackgroundColor transparent
+	    LineColor #C0C0C0
+	}
+	closed {
+        BackGroundColor #E0E8E8
+        FontColor #909898
+    }
+	task {
+		RoundCorner 0
+        Margin 2 2 2 2
+        Padding 0
+	}
+	milestone {
+        Margin 2
+        Padding 3
+	}
 }
 
 
@@ -296,6 +323,9 @@ yamlDiagram {
       LineThickness 1
       LineColor #A80036
   	}
+    highlight {
+	  BackGroundColor #ccff02
+    }
   }
 }
 

src/plantuml-asl/src/gen/annotation/Comment.java

@@ -1,3 +1,21 @@
+/* ========================================================================
+ * 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.
+ *
+ * Original Author:  Arnaud Roques
+ *
+ */
 package gen.annotation;
 
 import java.lang.annotation.ElementType;

src/plantuml-asl/src/gen/annotation/Difficult.java

@@ -1,3 +1,21 @@
+/* ========================================================================
+ * 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.
+ *
+ * Original Author:  Arnaud Roques
+ *
+ */
 package gen.annotation;
 
 import java.lang.annotation.ElementType;

src/plantuml-asl/src/gen/annotation/Doc.java

@@ -1,3 +1,21 @@
+/* ========================================================================
+ * 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.
+ *
+ * Original Author:  Arnaud Roques
+ *
+ */
 package gen.annotation;
 
 import java.lang.annotation.ElementType;

src/plantuml-asl/src/gen/annotation/HasND_Rank.java

@@ -1,3 +1,21 @@
+/* ========================================================================
+ * 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.
+ *
+ * Original Author:  Arnaud Roques
+ *
+ */
 package gen.annotation;
 
 import java.lang.annotation.ElementType;

src/plantuml-asl/src/gen/annotation/Original.java

@@ -1,3 +1,21 @@
+/* ========================================================================
+ * 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.
+ *
+ * Original Author:  Arnaud Roques
+ *
+ */
 package gen.annotation;
 
 import java.lang.annotation.ElementType;

src/plantuml-asl/src/gen/annotation/Reviewed.java

@@ -1,3 +1,21 @@
+/* ========================================================================
+ * 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.
+ *
+ * Original Author:  Arnaud Roques
+ *
+ */
 package gen.annotation;
 
 import java.lang.annotation.ElementType;

src/plantuml-asl/src/gen/annotation/Todo.java

@@ -1,3 +1,21 @@
+/* ========================================================================
+ * 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.
+ *
+ * Original Author:  Arnaud Roques
+ *
+ */
 package gen.annotation;
 
 import java.lang.annotation.ElementType;

src/plantuml-asl/src/gen/annotation/Untraced.java

@@ -1,3 +1,21 @@
+/* ========================================================================
+ * 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.
+ *
+ * Original Author:  Arnaud Roques
+ *
+ */
 package gen.annotation;
 
 import java.lang.annotation.ElementType;

src/plantuml-asl/src/gen/annotation/Unused.java

@@ -1,3 +1,21 @@
+/* ========================================================================
+ * 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.
+ *
+ * Original Author:  Arnaud Roques
+ *
+ */
 package gen.annotation;
 
 import java.lang.annotation.ElementType;

src/plantuml-asl/src/gen/lib/dotgen/mincross__c.java

@@ -1541,7 +1541,7 @@ public static void flat_reorder(ST_Agraph_s g) {
 
 
 
-@Reviewed(when = "16/11/2020²")
+@Reviewed(when = "16/11/2020")
 @Original(version="2.38.0", path="lib/dotgen/mincross.c", name="reorder", key="inv6wazjcnh4xkzzphsdcmg4", definition="static void reorder(graph_t * g, int r, int reverse, int hasfixed)")
 public static void reorder(ST_Agraph_s g, int r, boolean reverse, boolean hasfixed) {
 ENTERING("inv6wazjcnh4xkzzphsdcmg4","reorder");

src/plantuml-asl/src/net/sourceforge/plantuml/AbstractPSystem.java

@@ -30,8 +30,11 @@
  */
 package net.sourceforge.plantuml;
 
+import static net.sourceforge.plantuml.ugraphic.ImageBuilder.imageBuilder;
+
 import java.io.IOException;
 import java.io.OutputStream;
+import java.util.Objects;
 
 import net.sourceforge.plantuml.command.BlocLines;
 import net.sourceforge.plantuml.command.Command;
@@ -45,15 +48,21 @@
 import net.sourceforge.plantuml.graphic.HorizontalAlignment;
 import net.sourceforge.plantuml.graphic.VerticalAlignment;
 import net.sourceforge.plantuml.stats.StatsUtilsIncrement;
+import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft;
+import net.sourceforge.plantuml.ugraphic.ImageBuilder;
 import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException;
 import net.sourceforge.plantuml.version.License;
 import net.sourceforge.plantuml.version.Version;
 
 public abstract class AbstractPSystem implements Diagram {
 
-	private UmlSource source;
+	private final UmlSource source;
 	private Scale scale;
 
+	public AbstractPSystem(UmlSource source) {
+		this.source = Objects.requireNonNull(source);
+	}
+
 	private String getVersion() {
 		final StringBuilder toAppend = new StringBuilder();
 		toAppend.append("PlantUML version ");
@@ -90,10 +99,6 @@ final public long seed() {
 		return getSource().seed();
 	}
 
-	final public void setSource(UmlSource source) {
-		this.source = source;
-	}
-
 	public int getNbImages() {
 		return 1;
 	}
@@ -137,7 +142,14 @@ final public ImageData exportDiagram(OutputStream os, int index, FileFormatOptio
 			throws IOException {
 		final long now = System.currentTimeMillis();
 		try {
-			return exportDiagramNow(os, index, fileFormatOption, seed());
+//			if (this instanceof TitledDiagram) {
+//				final TitledDiagram titledDiagram = (TitledDiagram) this;
+//				final StyleBuilder styleBuilder = titledDiagram.getCurrentStyleBuilder();
+//				if (styleBuilder != null) {
+//					styleBuilder.printMe();
+//				}
+//			}
+			return exportDiagramNow(os, index, fileFormatOption);
 		} finally {
 			if (OptionFlags.getInstance().isEnableStats()) {
 				StatsUtilsIncrement.onceMoreGenerate(System.currentTimeMillis() - now, getClass(),
@@ -154,7 +166,16 @@ final public Scale getScale() {
 		return scale;
 	}
 
-	protected abstract ImageData exportDiagramNow(OutputStream os, int index, FileFormatOption fileFormatOption,
-			long seed) throws IOException;
+	public ImageBuilder createImageBuilder(FileFormatOption fileFormatOption) throws IOException {
+		return imageBuilder(fileFormatOption);
+	}
+
+	// TODO "index" isnt really being used
+	protected abstract ImageData exportDiagramNow(OutputStream os, int index, FileFormatOption fileFormatOption)
+			throws IOException;
+
+	public ClockwiseTopRightBottomLeft getDefaultMargins() {
+		return ClockwiseTopRightBottomLeft.same(0);
+	}
 
 }