Version 7988

src/com/ctreber/acearth/plugins/markers/Marker.java

@@ -3,10 +3,6 @@ package com.ctreber.acearth.plugins.markers;
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.Graphics2D;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.LineNumberReader;
-import java.util.ArrayList;
 import java.util.List;
 
 import com.ctreber.acearth.gui.PixelCanvas;

src/com/ctreber/acearth/plugins/markers/PluginMarkers.java

@@ -1,10 +1,8 @@
 package com.ctreber.acearth.plugins.markers;
 
-import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
 
-import com.ctreber.acearth.ACearth;
 import com.ctreber.acearth.plugins.Plugin;
 
 /**

src/com/ctreber/acearth/projection/Projection.java

@@ -1,6 +1,9 @@
 package com.ctreber.acearth.projection;
 
-import com.ctreber.acearth.util.*;
+import com.ctreber.acearth.util.Coordinate;
+import com.ctreber.acearth.util.Point2D;
+import com.ctreber.acearth.util.Point3D;
+import com.ctreber.acearth.util.Toolkit;
 
 /**
  * <p>A projection for a globe on a flat surface (must be subclassed).

src/com/ctreber/acearth/renderer/Renderer.java

@@ -1,7 +1,8 @@
 package com.ctreber.acearth.renderer;
 
-import java.awt.*;
-import java.util.*;
+import java.awt.Color;
+import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 import com.ctreber.acearth.shader.Shader;

src/com/ctreber/acearth/renderer/RowTypeRendererScanBit.java

@@ -1,7 +1,7 @@
 package com.ctreber.acearth.renderer;
 
-import com.ctreber.acearth.scanbit.ScanBit;
 import com.ctreber.acearth.scanbit.BitGeneratorMap;
+import com.ctreber.acearth.scanbit.ScanBit;
 
 /**
  * <p>Renders a row of ScanBits to pixel types.</p>

src/com/ctreber/acearth/scanbit/BitGeneratorMap.java

@@ -1,9 +1,14 @@
 package com.ctreber.acearth.scanbit;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
 
 import com.ctreber.acearth.projection.Projection;
-import com.ctreber.acearth.util.*;
+import com.ctreber.acearth.util.EdgeCrossing;
+import com.ctreber.acearth.util.Point2D;
+import com.ctreber.acearth.util.Point3D;
+import com.ctreber.acearth.util.Polygon;
 import com.ctreber.aclib.sort.CTSort;
 import com.ctreber.aclib.sort.QuickSort;
 

src/com/ctreber/acearth/scanbit/BitGeneratorMapDefault.java

@@ -3,7 +3,9 @@ package com.ctreber.acearth.scanbit;
 import java.util.Comparator;
 
 import com.ctreber.acearth.projection.Projection;
-import com.ctreber.acearth.util.*;
+import com.ctreber.acearth.util.EdgeCrossing;
+import com.ctreber.acearth.util.Point2D;
+import com.ctreber.acearth.util.Point3D;
 
 /**
  * <p>Map scanner for mercator and cylindrical projections.

src/com/ctreber/acearth/scanbit/BitGeneratorMapOrtho.java

@@ -3,7 +3,9 @@ package com.ctreber.acearth.scanbit;
 import java.util.Comparator;
 
 import com.ctreber.acearth.projection.Projection;
-import com.ctreber.acearth.util.*;
+import com.ctreber.acearth.util.EdgeCrossing;
+import com.ctreber.acearth.util.Point2D;
+import com.ctreber.acearth.util.Point3D;
 
 /**
  * <p>Map scanner for orthographic projection.

src/com/ctreber/acearth/scandot/DotGeneratorLines.java

@@ -1,7 +1,9 @@
 package com.ctreber.acearth.scandot;
 
 import com.ctreber.acearth.projection.Projection;
-import com.ctreber.acearth.util.*;
+import com.ctreber.acearth.util.Coordinate;
+import com.ctreber.acearth.util.Point2D;
+import com.ctreber.acearth.util.Point3D;
 
 /**
  * <p>Generate latitude and longitude grid as dots.

src/com/ctreber/acearth/shader/Shader.java

@@ -1,6 +1,6 @@
 package com.ctreber.acearth.shader;
 
-import java.awt.*;
+import java.awt.Color;
 
 import com.ctreber.acearth.projection.Projection;
 import com.ctreber.acearth.scanbit.BitGeneratorMap;

src/com/ctreber/acearth/shader/ShaderDefault.java

@@ -1,6 +1,6 @@
 package com.ctreber.acearth.shader;
 
-import java.awt.*;
+import java.awt.Color;
 
 /**
  * <p>Shader for projections which display the whole surface.</p>

src/com/ctreber/acearth/shader/ShaderFlat.java

@@ -1,6 +1,6 @@
 package com.ctreber.acearth.shader;
 
-import java.awt.*;
+import java.awt.Color;
 
 /**
  * <p>Flat shader (does not care for Projection).</p>

src/com/ctreber/acearth/shader/ShaderOrtho.java

@@ -1,6 +1,6 @@
 package com.ctreber.acearth.shader;
 
-import java.awt.*;
+import java.awt.Color;
 
 /**
  * <p>Shader for the orthographic projection.</p>

src/com/ctreber/acearth/util/SunPositionCalculator.java

@@ -1,6 +1,8 @@
 package com.ctreber.acearth.util;
 
-import java.util.*;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.TimeZone;
 
 /**
  * <p>Calculates the position of the point on Earth which is directly

src/doc-files/umls.html

@@ -0,0 +1,40 @@
+<!--
+========================================================================
+PlantUML : a free UML diagram generator
+========================================================================
+
+(C) Copyright 2009-2013, Arnaud Roques
+
+Project Info:  http://plantuml.sourceforge.net
+
+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.
+
+[Java is a trademark or registered trademark of Sun Microsystems, Inc.
+in the United States and other countries.]
+
+Original Author:  Arnaud Roques
+
+-->
+
+@startuml img1.png
+title foo2
+component PlantUML
+@enduml
+
+
+</body>

src/jcckit/data/DataContainer.java

@@ -18,8 +18,8 @@
  */
 package jcckit.data;
 
-import java.text.*;
-import java.util.*;
+import java.text.MessageFormat;
+import java.util.Vector;
 
 /**
  * Abstract superclass of all data containers. A data container holds an

src/jcckit/data/DataPlot.java

@@ -18,10 +18,10 @@
  */
 package jcckit.data;
 
-import jcckit.util.ConfigParameters;
-
 import java.util.StringTokenizer;
 
+import jcckit.util.ConfigParameters;
+
 /**
  *  A plot is a {@link DataContainer} of {@link DataCurve DataCurves}.
  *

src/jcckit/graphic/BasicGraphicAttributes.java

@@ -18,10 +18,10 @@
  */
 package jcckit.graphic;
 
-import jcckit.util.ConfigParameters;
-
 import java.awt.Color;
 
+import jcckit.util.ConfigParameters;
+
 /**
  * The basic attributes of any {@link BasicGraphicalElement}. This is an
  * extension of {@link ShapeAttributes} implementing {@link TextAttributes}.

src/jcckit/graphic/FontStyle.java

@@ -18,11 +18,11 @@
  */
 package jcckit.graphic;
 
+import java.util.Hashtable;
+
 import jcckit.util.ConfigParameters;
 import jcckit.util.FactoryException;
 
-import java.util.Hashtable;
-
 /**
  *  Font style constants.
  *  This class is based on the typesafe enumeration pattern.

src/jcckit/graphic/ShapeAttributes.java

@@ -18,10 +18,10 @@
  */
 package jcckit.graphic;
 
-import jcckit.util.ConfigParameters;
-
 import java.awt.Color;
 
+import jcckit.util.ConfigParameters;
+
 /**
  *  Basic attributes for shapes.
  *

src/jcckit/plot/BarFactory.java

@@ -18,6 +18,7 @@
  */
 package jcckit.plot;
 
+import jcckit.graphic.ClippingShape;
 import jcckit.graphic.GraphPoint;
 import jcckit.graphic.GraphicAttributes;
 import jcckit.graphic.GraphicalElement;

src/jcckit/plot/CartesianCoordinateSystem.java

@@ -21,10 +21,10 @@ package jcckit.plot;
 import jcckit.data.DataPoint;
 import jcckit.graphic.ClippingRectangle;
 import jcckit.graphic.ClippingShape;
+import jcckit.graphic.GraphPoint;
+import jcckit.graphic.GraphicAttributes;
 import jcckit.graphic.GraphicalComposite;
 import jcckit.graphic.GraphicalElement;
-import jcckit.graphic.GraphicAttributes;
-import jcckit.graphic.GraphPoint;
 import jcckit.graphic.LineAttributes;
 import jcckit.graphic.Polygon;
 import jcckit.graphic.Text;

src/jcckit/plot/CircleSymbolFactory.java

@@ -18,9 +18,9 @@
  */
 package jcckit.plot;
 
+import jcckit.graphic.GraphPoint;
 import jcckit.graphic.GraphicAttributes;
 import jcckit.graphic.GraphicalElement;
-import jcckit.graphic.GraphPoint;
 import jcckit.graphic.Oval;
 import jcckit.util.ConfigParameters;
 

src/jcckit/plot/CoordinateSystem.java

@@ -18,8 +18,8 @@
  */
 package jcckit.plot;
 
-import jcckit.graphic.GraphicalElement;
 import jcckit.graphic.ClippingShape;
+import jcckit.graphic.GraphicalElement;
 import jcckit.transformation.Transformation;
 
 /**

src/jcckit/plot/Curve.java

@@ -18,8 +18,8 @@
  */
 package jcckit.plot;
 
-import jcckit.graphic.GraphicalElement;
 import jcckit.graphic.GraphPoint;
+import jcckit.graphic.GraphicalElement;
 
 /**
  * A curve is defined by a sequence of points in device-independent

src/jcckit/plot/Legend.java

@@ -18,11 +18,13 @@
  */
 package jcckit.plot;
 
+import java.util.Properties;
+
 import jcckit.graphic.BasicGraphicAttributes;
-import jcckit.graphic.GraphicalElement;
-import jcckit.graphic.GraphicalComposite;
-import jcckit.graphic.GraphicAttributes;
 import jcckit.graphic.GraphPoint;
+import jcckit.graphic.GraphicAttributes;
+import jcckit.graphic.GraphicalComposite;
+import jcckit.graphic.GraphicalElement;
 import jcckit.graphic.Polygon;
 import jcckit.graphic.Rectangle;
 import jcckit.graphic.ShapeAttributes;
@@ -34,8 +36,6 @@ import jcckit.util.ConfigParametersBasedConfigData;
 import jcckit.util.Factory;
 import jcckit.util.PropertiesBasedConfigData;
 
-import java.util.Properties;
-
 
 /**
  * Helper class for creating the legend of a {@link Plot}.

src/jcckit/plot/SquareSymbolFactory.java

@@ -18,9 +18,9 @@
  */
 package jcckit.plot;
 
+import jcckit.graphic.GraphPoint;
 import jcckit.graphic.GraphicAttributes;
 import jcckit.graphic.GraphicalElement;
-import jcckit.graphic.GraphPoint;
 import jcckit.graphic.Rectangle;
 import jcckit.util.ConfigParameters;
 

src/jcckit/plot/SymbolFactory.java

@@ -18,8 +18,8 @@
  */
 package jcckit.plot;
 
-import jcckit.graphic.GraphicalElement;
 import jcckit.graphic.GraphPoint;
+import jcckit.graphic.GraphicalElement;
 
 /**
  * Interface of a symbol factory. A symbol is a {@link GraphicalElement}

src/jcckit/renderer/Transformation.java

@@ -21,8 +21,8 @@ package jcckit.renderer;
 import java.awt.Graphics2D;
 
 import jcckit.graphic.Anchor;
-import jcckit.graphic.GraphPoint;
 import jcckit.graphic.ClippingRectangle;
+import jcckit.graphic.GraphPoint;
 
 /**
  *  Transformation between device-independent coordinates

src/jcckit/util/ConfigParameters.java

@@ -22,6 +22,7 @@ import java.awt.Color;
 import java.util.StringTokenizer;
 
 import net.sourceforge.plantuml.graphic.HtmlColor;
+import net.sourceforge.plantuml.graphic.HtmlColorUtils;
 import net.sourceforge.plantuml.ugraphic.ColorMapperIdentity;
 
 /**
@@ -300,8 +301,8 @@ public class ConfigParameters {
   }
 
 private Color decodeInternal(String value) {
-	if (HtmlColor.isValid(value)) {
-		  return new ColorMapperIdentity().getMappedColor(HtmlColor.getColorIfValid(value));
+	if (HtmlColorUtils.getColorIfValid(value)!=null) {
+		  return new ColorMapperIdentity().getMappedColor(HtmlColorUtils.getColorIfValid(value));
 	}
 	return Color.decode(value);
 }

src/jcckit/util/Factory.java

@@ -18,7 +18,7 @@
  */
 package jcckit.util;
 
-import java.lang.reflect.*;
+import java.lang.reflect.Constructor;
 
 /**
  *  General purpose factory method based on {@link ConfigParameters}

src/jcckit/util/FactoryException.java

@@ -18,7 +18,7 @@
  */
 package jcckit.util;
 
-import java.lang.reflect.*;
+import java.lang.reflect.InvocationTargetException;
 
 /**
  *  Exception thrown in the case of an error during creation of a new

src/jcckit/util/PropertiesBasedConfigData.java

@@ -18,7 +18,8 @@
  */
 package jcckit.util;
 
-import java.io.*;
+import java.io.FileInputStream;
+import java.io.IOException;
 import java.util.Properties;
 
 /**

src/net/sourceforge/plantuml/AbstractPSystem.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -28,33 +28,34 @@
  *
  * Original Author:  Arnaud Roques
  * 
- * Revision $Revision: 6922 $
+ * Revision $Revision: 11351 $
  *
  */
 package net.sourceforge.plantuml;
 
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Properties;
 
+import net.sourceforge.plantuml.command.Command;
+import net.sourceforge.plantuml.command.CommandExecutionResult;
+import net.sourceforge.plantuml.command.ProtectedCommand;
+import net.sourceforge.plantuml.core.Diagram;
+import net.sourceforge.plantuml.core.UmlSource;
+import net.sourceforge.plantuml.cucadiagram.Display;
+import net.sourceforge.plantuml.version.License;
 import net.sourceforge.plantuml.version.Version;
 
-public abstract class AbstractPSystem implements PSystem {
+public abstract class AbstractPSystem implements Diagram {
 
 	private UmlSource source;
 
 	private String getVersion() {
 		final StringBuilder toAppend = new StringBuilder();
 		toAppend.append("PlantUML version ");
-		toAppend.append(Version.version());
+		toAppend.append(Version.versionString());
 		toAppend.append("(" + new Date(Version.compileTime()) + ")\n");
+		toAppend.append("(" + License.getCurrent() + " source distribution)\n");
 		final Properties p = System.getProperties();
 		toAppend.append(p.getProperty("java.runtime.name"));
 		toAppend.append('\n');
@@ -86,28 +87,31 @@ public abstract class AbstractPSystem implements PSystem {
 		return 1;
 	}
 
-	public List<File> exportDiagrams(File suggestedFile, FileFormatOption fileFormat) throws IOException,
-			InterruptedException {
-		if (suggestedFile.exists() && suggestedFile.isDirectory()) {
-			throw new IllegalArgumentException("File is a directory " + suggestedFile);
-		}
-		OutputStream os = null;
-		try {
-			os = new BufferedOutputStream(new FileOutputStream(suggestedFile));
-			this.exportDiagram(os, null, 0, fileFormat);
-		} finally {
-			if (os != null) {
-				os.close();
-			}
-		}
-		return Arrays.asList(suggestedFile);
-	}
-
-	public List<? extends CharSequence> getTitle() {
+	public Display getTitle() {
 		if (source == null) {
-			return Collections.emptyList();
+			return Display.emptyList();
 		}
 		return source.getTitle();
 	}
 
+	public String getWarningOrError() {
+		return null;
+	}
+
+	public void makeDiagramReady() {
+	}
+
+	public boolean isOk() {
+		return true;
+	}
+
+	public CommandExecutionResult executeCommand(Command cmd, List<String> lines) {
+		cmd = new ProtectedCommand(cmd);
+		return cmd.execute(this, lines);
+	}
+	
+	public boolean hasUrl() {
+		return false;
+	}
+
 }

src/net/sourceforge/plantuml/AlignParam.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -33,21 +33,22 @@
  */
 package net.sourceforge.plantuml;
 
-import net.sourceforge.plantuml.graphic.HorizontalAlignement;
+import net.sourceforge.plantuml.graphic.HorizontalAlignment;
 
 
 public enum AlignParam {
 	
-	SEQUENCE_MESSAGE_ALIGN(HorizontalAlignement.LEFT),
-	SEQUENCE_REFERENCE_ALIGN(HorizontalAlignement.CENTER);
+	SEQUENCE_MESSAGE_ALIGN(HorizontalAlignment.LEFT),
+	SEQUENCE_MESSAGETEXT_ALIGN(HorizontalAlignment.LEFT),
+	SEQUENCE_REFERENCE_ALIGN(HorizontalAlignment.CENTER);
 	
-	private final HorizontalAlignement defaultValue;
+	private final HorizontalAlignment defaultValue;
 	
-	private AlignParam(HorizontalAlignement defaultValue) {
+	private AlignParam(HorizontalAlignment defaultValue) {
 		this.defaultValue = defaultValue;
 	}
 
-	public final HorizontalAlignement getDefaultValue() {
+	public final HorizontalAlignment getDefaultValue() {
 		return defaultValue;
 	}
 }

src/net/sourceforge/plantuml/BasicEnsureVisible.java

@@ -0,0 +1,76 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2013, Arnaud Roques
+ *
+ * Project Info:  http://plantuml.sourceforge.net
+ * 
+ * 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.
+ *
+ * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
+ * in the United States and other countries.]
+ *
+ * Original Author:  Arnaud Roques
+ * 
+ * Revision $Revision: 7903 $
+ *
+ */
+package net.sourceforge.plantuml;
+
+public class BasicEnsureVisible implements EnsureVisible {
+
+	private double minX = Double.MAX_VALUE;
+	private double maxX = -Double.MAX_VALUE;
+	private double minY = Double.MAX_VALUE;
+	private double maxY = -Double.MAX_VALUE;
+
+	public void ensureVisible(double x, double y) {
+		if (x > maxX) {
+			maxX = x;
+		}
+		if (x < minX) {
+			minX = x;
+		}
+		if (y > maxY) {
+			maxY = y;
+		}
+		if (y < minY) {
+			minY = y;
+		}
+	}
+
+	public String getCoords(double scale) {
+		if (minX == Double.MAX_VALUE) {
+			return "0,0,0,0";
+		}
+		final int x1 = (int) (minX * scale);
+		final int y1 = (int) (minY * scale);
+		final int x2 = (int) (maxX * scale);
+		final int y2 = (int) (maxY * scale);
+		return "" + x1 + "," + y1 + "," + x2 + "," + y2;
+	}
+
+	public double getSurface() {
+		if (minX == Double.MAX_VALUE) {
+			return 0;
+		}
+		return (maxX - minX) * (maxY - minY);
+	}
+
+}

src/net/sourceforge/plantuml/BlockUml.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -33,37 +33,41 @@
  */
 package net.sourceforge.plantuml;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import net.sourceforge.plantuml.core.Diagram;
+
 public class BlockUml {
 
-	private final List<String> data;
-	private PSystem system;
+	private final List<? extends CharSequence> data;
+	private Diagram system;
 
-	private static final Pattern patternFilename = Pattern.compile("^@start\\S+\\s+\"?(.*?)\"?$");
+	// private static final Pattern patternFilename =
+	// Pattern.compile("^@start\\S+\\s+\"?(.*?)\"?$");
+	private static final Pattern patternFilename = Pattern
+			.compile("^@start[^\\s{}\"]+[\\s{][\\s\"]*([^\"]*?)[\\s}\"]*$");
 
 	BlockUml(String... strings) {
 		this(Arrays.asList(strings));
 	}
 
-	public BlockUml(List<String> strings) {
-		final String s0 = strings.get(0).trim();
+	public BlockUml(List<? extends CharSequence> strings) {
+		final String s0 = strings.get(0).toString().trim();
 		if (s0.startsWith("@start") == false) {
 			throw new IllegalArgumentException();
 		}
-		this.data = new ArrayList<String>(strings);
+		this.data = new ArrayList<CharSequence>(strings);
 	}
 
 	public String getFilename() {
 		if (OptionFlags.getInstance().isWord()) {
 			return null;
 		}
-		final Matcher m = patternFilename.matcher(data.get(0).trim());
+		final Matcher m = patternFilename.matcher(data.get(0).toString().trim());
 		final boolean ok = m.find();
 		if (ok == false) {
 			return null;
@@ -78,16 +82,19 @@ public class BlockUml {
 		return result;
 	}
 
-	public PSystem getSystem() throws IOException, InterruptedException {
+	private Diagram getSystem() {
 		if (system == null) {
 			createSystem();
 		}
 		return system;
 	}
 
-	private void createSystem() throws IOException, InterruptedException {
-		system = new PSystemBuilder().createPSystem(data);
+	public Diagram getDiagram() {
+		return getSystem();
+	}
 
+	private void createSystem() {
+		system = new PSystemBuilder().createPSystem(data);
 	}
 
 }

src/net/sourceforge/plantuml/BlockUmlBuilder.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -52,10 +52,10 @@ final public class BlockUmlBuilder {
 	private final List<BlockUml> blocks = new ArrayList<BlockUml>();
 	private final Set<File> usedFiles = new HashSet<File>();
 
-	public BlockUmlBuilder(List<String> config, Defines defines, Reader reader, File newCurrentDir) throws IOException {
+	public BlockUmlBuilder(List<String> config, String charset, Defines defines, Reader reader, File newCurrentDir) throws IOException {
 		Preprocessor includer = null;
 		try {
-			includer = new Preprocessor(new UncommentReadLine(new ReadLineReader(reader)), defines, usedFiles, newCurrentDir);
+			includer = new Preprocessor(new UncommentReadLine(new ReadLineReader(reader)), charset, defines, usedFiles, newCurrentDir);
 			init(includer, config);
 		} finally {
 			if (includer != null) {

src/net/sourceforge/plantuml/CMapData.java

@@ -0,0 +1,92 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2013, Arnaud Roques
+ *
+ * Project Info:  http://plantuml.sourceforge.net
+ * 
+ * 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.
+ *
+ * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
+ * in the United States and other countries.]
+ *
+ * Original Author:  Arnaud Roques
+ *
+ * Revision $Revision: 8368 $
+ *
+ */
+package net.sourceforge.plantuml;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+public class CMapData {
+
+	private final StringBuilder stringBuilder = new StringBuilder();
+
+	public String asString(String nameId) {
+		return "<map id=\"" + nameId + "_map\" name=\"" + nameId + "_map\">\n" + stringBuilder.toString() + "</map>\n";
+	}
+
+	public boolean containsData() {
+		return stringBuilder.length() > 0;
+	}
+
+	public void appendString(String s) {
+		stringBuilder.append(s);
+	}
+
+	public void appendLong(long s) {
+		stringBuilder.append(s);
+	}
+
+	public void appendUrl(int seq, Url url, double scale) {
+		appendString("<area shape=\"rect\" id=\"id");
+		appendLong(seq);
+		appendString("\" href=\"");
+		appendString(url.getUrl());
+		appendString("\" title=\"");
+		appendString(url.getTooltip());
+		appendString("\" alt=\"\" coords=\"");
+		appendString(url.getCoords(scale));
+		appendString("\"/>");
+
+		appendString("\n");
+	}
+
+	// private CMapData() {
+	// }
+
+	public static CMapData cmapString(Set<Url> allUrlEncountered, double scale) {
+		final CMapData cmapdata = new CMapData();
+
+		final List<Url> all = new ArrayList<Url>(allUrlEncountered);
+		Collections.sort(all, Url.SURFACE_COMPARATOR);
+
+		int seq = 1;
+		for (Url u : all) {
+			cmapdata.appendUrl(seq, u, scale);
+			seq++;
+		}
+		return cmapdata;
+	}
+
+}

src/net/sourceforge/plantuml/ColorParam.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -28,7 +28,7 @@
  *
  * Original Author:  Arnaud Roques
  *
- * Revision $Revision: 6549 $
+ * Revision $Revision: 11149 $
  * 
  */
 package net.sourceforge.plantuml;
@@ -65,11 +65,14 @@ public enum ColorParam {
 	packageBackground,
 	packageBorder,
 
+	partitionBackground,
+	partitionBorder,
+
 	componentBackground,
 	componentBorder,
 	componentInterfaceBackground,
 	componentInterfaceBorder,
-	componentArrow,
+	// componentArrow,
 
 	stateBackground,
 	stateBorder,
@@ -80,6 +83,9 @@ public enum ColorParam {
 	noteBackground(true),
 	noteBorder,
 	
+	legendBackground(true),
+	legendBorder,
+	
 	sequenceActorBackground(true),
 	sequenceActorBorder,
 	sequenceGroupBorder,
@@ -118,6 +124,4 @@ public enum ColorParam {
 	protected boolean isBackground() {
 		return isBackground;
 	}
-	
-	
 }

src/net/sourceforge/plantuml/Dimension2DDouble.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -28,7 +28,7 @@
  *
  * Original Author:  Arnaud Roques
  *
- * Revision $Revision: 7157 $
+ * Revision $Revision: 11564 $
  *
  */
 package net.sourceforge.plantuml;
@@ -79,17 +79,27 @@ public class Dimension2DDouble extends Dimension2D {
 		return new Dimension2DDouble(width, height);
 	}
 
+	public static Dimension2D mergeTB(Dimension2D a, Dimension2D b, Dimension2D c) {
+		final double width = MathUtils.max(a.getWidth(), b.getWidth(), c.getWidth());
+		final double height = a.getHeight() + b.getHeight() + c.getHeight();
+		return new Dimension2DDouble(width, height);
+	}
+
 	public static Dimension2D mergeLR(Dimension2D left, Dimension2D right) {
 		final double height = Math.max(left.getHeight(), right.getHeight());
 		final double width = left.getWidth() + right.getWidth();
 		return new Dimension2DDouble(width, height);
 	}
 
-	public static Dimension2D mergeTB(Dimension2D top1, Dimension2D top2, Dimension2D bottom) {
+	public static Dimension2D mergeLayoutT12B3(Dimension2D top1, Dimension2D top2, Dimension2D bottom) {
 		final double width = MathUtils.max(top1.getWidth(), top2.getWidth(), bottom.getWidth());
 		final double height = top1.getHeight() + top2.getHeight() + bottom.getHeight();
 		return new Dimension2DDouble(width, height);
 	}
+	
+	public static Dimension2D max(Dimension2D dim1, Dimension2D dim2) {
+		return atLeast(dim1, dim2.getWidth(), dim2.getHeight());
+	}
 
 	public static Dimension2D atLeast(Dimension2D dim, double minWidth, double minHeight) {
 		double h = dim.getHeight();

src/net/sourceforge/plantuml/DirWatcher.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -28,7 +28,7 @@
  *
  * Original Author:  Arnaud Roques
  *
- * Revision $Revision: 6616 $
+ * Revision $Revision: 9786 $
  * 
  */
 package net.sourceforge.plantuml;
@@ -45,6 +45,7 @@ import java.util.Set;
 
 import net.sourceforge.plantuml.preproc.Defines;
 
+@Deprecated
 public class DirWatcher {
 
 	final private File dir;

src/net/sourceforge/plantuml/DirWatcher2.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -69,34 +69,39 @@ public class DirWatcher2 {
 
 	public Map<File, Future<List<GeneratedImage>>> buildCreatedFiles() throws IOException, InterruptedException {
 		final Map<File, Future<List<GeneratedImage>>> result = new TreeMap<File, Future<List<GeneratedImage>>>();
-		for (final File f : dir.listFiles()) {
-			if (f.isFile() == false) {
-				continue;
-			}
-			if (fileToProcess(f.getName()) == false) {
-				continue;
-			}
-			final FileWatcher watcher = modifieds.get(f);
+		if (dir.listFiles() != null) {
+			for (final File f : dir.listFiles()) {
+				if (f.isFile() == false) {
+					continue;
+				}
+				if (fileToProcess(f.getName()) == false) {
+					continue;
+				}
+				final FileWatcher watcher = modifieds.get(f);
 
-			if (watcher == null || watcher.hasChanged()) {
-				final SourceFileReader sourceFileReader = new SourceFileReader(new Defines(), f, option.getOutputDir(),
-						option.getConfig(), option.getCharset(), option.getFileFormatOption());
-				modifieds.put(f, new FileWatcher(Collections.singleton(f)));
-				final Future<List<GeneratedImage>> value = executorService.submit(new Callable<List<GeneratedImage>>() {
-					public List<GeneratedImage> call() throws Exception {
-						try {
-							final List<GeneratedImage> generatedImages = sourceFileReader.getGeneratedImages();
-							final Set<File> files = new HashSet<File>(sourceFileReader.getIncludedFiles());
-							files.add(f);
-							modifieds.put(f, new FileWatcher(files));
-							return Collections.unmodifiableList(generatedImages);
-						} catch (Exception e) {
-							e.printStackTrace();
-							return Collections.emptyList();
-						}
-					}
-				});
-				result.put(f, value);
+				if (watcher == null || watcher.hasChanged()) {
+					final SourceFileReader sourceFileReader = new SourceFileReader(new Defines(), f,
+							option.getOutputDir(), option.getConfig(), option.getCharset(),
+							option.getFileFormatOption());
+					modifieds.put(f, new FileWatcher(Collections.singleton(f)));
+					final Future<List<GeneratedImage>> value = executorService
+							.submit(new Callable<List<GeneratedImage>>() {
+								public List<GeneratedImage> call() throws Exception {
+									try {
+										final List<GeneratedImage> generatedImages = sourceFileReader
+												.getGeneratedImages();
+										final Set<File> files = new HashSet<File>(sourceFileReader.getIncludedFiles());
+										files.add(f);
+										modifieds.put(f, new FileWatcher(files));
+										return Collections.unmodifiableList(generatedImages);
+									} catch (Exception e) {
+										e.printStackTrace();
+										return Collections.emptyList();
+									}
+								}
+							});
+					result.put(f, value);
+				}
 			}
 		}
 		return Collections.unmodifiableMap(result);

src/net/sourceforge/plantuml/Direction.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -33,6 +33,8 @@
  */
 package net.sourceforge.plantuml;
 
+import java.awt.geom.Point2D;
+
 public enum Direction {
 	RIGHT, LEFT, DOWN, UP;
 
@@ -64,4 +66,30 @@ public enum Direction {
 		}
 		return Direction.DOWN;
 	}
+
+	public Direction clockwise() {
+		if (this == RIGHT) {
+			return DOWN;
+		}
+		if (this == LEFT) {
+			return UP;
+		}
+		if (this == DOWN) {
+			return LEFT;
+		}
+		if (this == UP) {
+			return RIGHT;
+		}
+		throw new IllegalStateException();
+	}
+
+	public static Direction leftOrRight(Point2D p1, Point2D p2) {
+		if (p1.getX() < p2.getX()) {
+			return Direction.LEFT;
+		}
+		if (p1.getX() > p2.getX()) {
+			return Direction.RIGHT;
+		}
+		throw new IllegalArgumentException();
+	}
 }

src/net/sourceforge/plantuml/EmbededDiagram.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -33,16 +33,14 @@
  */
 package net.sourceforge.plantuml;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import net.sourceforge.plantuml.cucadiagram.Display;
 
 public class EmbededDiagram implements CharSequence {
 
-	private final List<String> system;
+	private final Display system;
 
-	public EmbededDiagram(List<String> system) {
-		this.system = new ArrayList<String>(system);
+	public EmbededDiagram(Display system) {
+		this.system = system;
 	}
 
 	public int length() {
@@ -57,7 +55,7 @@ public class EmbededDiagram implements CharSequence {
 		return toString().subSequence(start, end);
 	}
 
-	public final List<String> getLines() {
-		return Collections.unmodifiableList(system);
+	public final Display getLines() {
+		return system;
 	}
 }

src/net/sourceforge/plantuml/EmptyImageBuilder.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -28,17 +28,20 @@
  *
  * Original Author:  Arnaud Roques
  *
- * Revision $Revision: 5810 $
+ * Revision $Revision: 10103 $
  *
  */
 package net.sourceforge.plantuml;
 
 import java.awt.Color;
 import java.awt.Graphics2D;
-import java.awt.RenderingHints;
 import java.awt.geom.AffineTransform;
 import java.awt.image.BufferedImage;
 
+import net.sourceforge.plantuml.ugraphic.ColorMapperIdentity;
+import net.sourceforge.plantuml.ugraphic.UAntiAliasing;
+import net.sourceforge.plantuml.ugraphic.g2d.UGraphicG2d;
+
 public class EmptyImageBuilder {
 
 	private final BufferedImage im;
@@ -50,11 +53,14 @@ public class EmptyImageBuilder {
 
 	public EmptyImageBuilder(int width, int height, Color background) {
 		Log.info("Creating image " + width + "x" + height);
-		im = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+		im = new BufferedImage(width, height, background == null ? BufferedImage.TYPE_INT_ARGB
+				: BufferedImage.TYPE_INT_RGB);
 		g2d = im.createGraphics();
-		g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-		g2d.setColor(background);
-		g2d.fillRect(0, 0, width, height);
+		UAntiAliasing.ANTI_ALIASING_ON.apply(g2d);
+		if (background != null) {
+			g2d.setColor(background);
+			g2d.fillRect(0, 0, width, height);
+		}
 	}
 
 	public EmptyImageBuilder(int width, int height, Color background, double dpiFactor) {
@@ -72,4 +78,10 @@ public class EmptyImageBuilder {
 		return g2d;
 	}
 
+	public UGraphicG2d getUGraphicG2d() {
+		final UGraphicG2d result = new UGraphicG2d(new ColorMapperIdentity(), g2d, 1.0);
+		result.setBufferedImage(im);
+		return result;
+	}
+
 }

src/net/sourceforge/plantuml/EnsureVisible.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -27,12 +27,14 @@
  * in the United States and other countries.]
  *
  * Original Author:  Arnaud Roques
+ * 
+ * Revision $Revision: 7903 $
  *
- * Revision $Revision: 3824 $
  */
 package net.sourceforge.plantuml;
 
-public interface PSystemBasicFactory extends PSystemFactory {
+public interface EnsureVisible {
+
+	public void ensureVisible(double x, double y);
 
-	boolean executeLine(String line);
 }

src/net/sourceforge/plantuml/ErrorUml.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -36,14 +36,14 @@ package net.sourceforge.plantuml;
 import net.sourceforge.plantuml.suggest.SuggestEngineResult;
 import net.sourceforge.plantuml.suggest.SuggestEngineStatus;
 
-class ErrorUml {
+public class ErrorUml {
 
 	private final String error;
 	private final int position;
 	private final ErrorUmlType type;
 	private SuggestEngineResult suggest;
 
-	ErrorUml(ErrorUmlType type, String error, int position) {
+	public ErrorUml(ErrorUmlType type, String error, int position) {
 		if (error == null || type == null || StringUtils.isEmpty(error)) {
 			throw new IllegalArgumentException();
 		}

src/net/sourceforge/plantuml/ErrorUmlType.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -33,7 +33,7 @@
  */
 package net.sourceforge.plantuml;
 
-enum ErrorUmlType {
+public enum ErrorUmlType {
 	SYNTAX_ERROR, EXECUTION_ERROR
 
 }

src/net/sourceforge/plantuml/FileFormat.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -28,17 +28,30 @@
  *
  * Original Author:  Arnaud Roques
  *
- * Revision $Revision: 6671 $
+ * Revision $Revision: 9786 $
  *
  */
 package net.sourceforge.plantuml;
 
-public enum FileFormat {
-	PNG, SVG, EPS, EPS_TEXT, ATXT, UTXT, DOT, XMI_STANDARD, XMI_STAR, XMI_ARGO, PDF;
+import java.io.File;
 
+/**
+ * Format for output files generated by PlantUML.
+ * 
+ * @author Arnaud Roques
+ * 
+ */
+public enum FileFormat {
+	PNG, SVG, EPS, EPS_TEXT, ATXT, UTXT, XMI_STANDARD, XMI_STAR, XMI_ARGO, PDF, MJPEG, HTML, HTML5, VDX;
+
+	/**
+	 * Returns the file format to be used for that format.
+	 * 
+	 * @return a string starting by a point.
+	 */
 	public String getFileSuffix() {
 		if (name().startsWith("XMI")) {
-			return ".XMI";
+			return ".xmi";
 		}
 		if (this == EPS_TEXT) {
 			return EPS.getFileSuffix();
@@ -46,6 +59,11 @@ public enum FileFormat {
 		return "." + name().toLowerCase();
 	}
 
+	/**
+	 * Check if this file format is Encapsulated PostScript.
+	 * 
+	 * @return <code>true</code> for EPS.
+	 */
 	public boolean isEps() {
 		if (this == EPS) {
 			return true;
@@ -58,9 +76,36 @@ public enum FileFormat {
 
 	public String changeName(String fileName, int cpt) {
 		if (cpt == 0) {
-			return fileName.replaceAll("\\.\\w+$", getFileSuffix());
+			return changeName(fileName, getFileSuffix());
 		}
-		return fileName.replaceAll("\\.\\w+$", "_" + String.format("%03d", cpt) + getFileSuffix());
+		return changeName(fileName, "_" + String.format("%03d", cpt) + getFileSuffix());
+	}
+
+	private String changeName(String fileName, String replacement) {
+		String result = fileName.replaceAll("\\.\\w+$", replacement);
+		if (result.equals(fileName)) {
+			result = fileName + replacement;
+		}
+		return result;
+	}
+
+	public File computeFilename(File pngFile, int i) {
+		if (i == 0) {
+			return pngFile;
+		}
+		final File dir = pngFile.getParentFile();
+		return new File(dir, computeFilename(pngFile.getName(), i));
+		// String name = pngFile.getName();
+		// name = name.replaceAll("\\" + getFileSuffix() + "$", "_" + String.format("%03d", i) + getFileSuffix());
+		// return new File(dir, name);
+
+	}
+
+	public String computeFilename(String name, int i) {
+		if (i == 0) {
+			return name;
+		}
+		return name.replaceAll("\\" + getFileSuffix() + "$", "_" + String.format("%03d", i) + getFileSuffix());
 	}
 
 }

src/net/sourceforge/plantuml/FileFormatOption.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -33,32 +33,160 @@
  */
 package net.sourceforge.plantuml;
 
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Dimension2D;
+import java.awt.image.BufferedImage;
+
+import net.sourceforge.plantuml.eps.EpsStrategy;
+import net.sourceforge.plantuml.graphic.HtmlColor;
+import net.sourceforge.plantuml.graphic.HtmlColorGradient;
+import net.sourceforge.plantuml.graphic.HtmlColorSimple;
+import net.sourceforge.plantuml.graphic.HtmlColorTransparent;
+import net.sourceforge.plantuml.ugraphic.ColorMapper;
+import net.sourceforge.plantuml.ugraphic.ColorMapperIdentity;
+import net.sourceforge.plantuml.ugraphic.UChangeBackColor;
+import net.sourceforge.plantuml.ugraphic.UGraphic;
+import net.sourceforge.plantuml.ugraphic.URectangle;
+import net.sourceforge.plantuml.ugraphic.eps.UGraphicEps;
+import net.sourceforge.plantuml.ugraphic.g2d.UGraphicG2d;
+import net.sourceforge.plantuml.ugraphic.html5.UGraphicHtml5;
+import net.sourceforge.plantuml.ugraphic.svg.UGraphicSvg;
+import net.sourceforge.plantuml.ugraphic.visio.UGraphicVdx;
+
+/**
+ * A FileFormat with some parameters.
+ * 
+ * 
+ * @author Arnaud Roques
+ * 
+ */
 public class FileFormatOption {
 
 	private final FileFormat fileFormat;
-	private final int dpi;
-
-	public FileFormatOption(FileFormat fileFormat, int dpi) {
-		this.fileFormat = fileFormat;
-		this.dpi = dpi;
-	}
+	private final AffineTransform affineTransform;
+	private final boolean withMetadata;
 
 	public FileFormatOption(FileFormat fileFormat) {
-		this(fileFormat, 96);
+		this(fileFormat, null, true);
+	}
+
+	public final boolean isWithMetadata() {
+		return withMetadata;
+	}
+
+	public FileFormatOption(FileFormat fileFormat, boolean withMetadata) {
+		this(fileFormat, null, false);
+	}
+
+	public FileFormatOption(FileFormat fileFormat, AffineTransform at) {
+		this(fileFormat, at, true);
+	}
+
+	public FileFormatOption(FileFormat fileFormat, AffineTransform at, boolean withMetadata) {
+		this.fileFormat = fileFormat;
+		this.affineTransform = at;
+		this.withMetadata = withMetadata;
+	}
+
+	@Override
+	public String toString() {
+		return fileFormat.toString() + " " + affineTransform;
 	}
 
 	public final FileFormat getFileFormat() {
 		return fileFormat;
 	}
 
-//	public final int getDpi() {
-//		return dpi;
-//	}
-//
-//	public double getDpiFactor() {
-//		if (dpi == 96) {
-//			return 1.0;
-//		}
-//		return dpi / 96.0;
-//	}
+	public AffineTransform getAffineTransform() {
+		return affineTransform;
+	}
+
+	/**
+	 * Create a UGraphic corresponding to this FileFormatOption
+	 * 
+	 * @param colorMapper
+	 * @param dpiFactor
+	 *            1.0 for a standard dot per inch
+	 * @param dim
+	 * @param mybackcolor
+	 * @param rotation
+	 * @return
+	 */
+	public UGraphic createUGraphic(ColorMapper colorMapper, double dpiFactor, final Dimension2D dim,
+			HtmlColor mybackcolor, boolean rotation) {
+		switch (fileFormat) {
+		case PNG:
+			return createUGraphicPNG(colorMapper, dpiFactor, dim, mybackcolor, rotation);
+		case SVG:
+			return createUGraphicSVG(colorMapper, dpiFactor, dim, mybackcolor, rotation);
+		case EPS:
+			return new UGraphicEps(colorMapper, EpsStrategy.getDefault2());
+		case EPS_TEXT:
+			return new UGraphicEps(colorMapper, EpsStrategy.WITH_MACRO_AND_TEXT);
+		case HTML5:
+			return new UGraphicHtml5(colorMapper);
+		case VDX:
+			return new UGraphicVdx(colorMapper);
+		default:
+			throw new UnsupportedOperationException(fileFormat.toString());
+		}
+	}
+
+	public UGraphic createUGraphic(final Dimension2D dim) {
+		return createUGraphic(new ColorMapperIdentity(), 1.0, dim, null, false);
+	}
+
+	private UGraphic createUGraphicSVG(ColorMapper colorMapper, double scale, Dimension2D dim, HtmlColor mybackcolor,
+			boolean rotation) {
+		Color backColor = Color.WHITE;
+		if (mybackcolor instanceof HtmlColorSimple) {
+			backColor = colorMapper.getMappedColor(mybackcolor);
+		}
+		final UGraphicSvg ug;
+		if (mybackcolor instanceof HtmlColorGradient) {
+			ug = new UGraphicSvg(colorMapper, (HtmlColorGradient) mybackcolor, false, scale);
+		} else if (backColor == null || backColor.equals(Color.WHITE)) {
+			ug = new UGraphicSvg(colorMapper, false, scale);
+		} else {
+			ug = new UGraphicSvg(colorMapper, StringUtils.getAsHtml(backColor), false, scale);
+		}
+		return ug;
+
+	}
+
+	private UGraphic createUGraphicPNG(ColorMapper colorMapper, double dpiFactor, final Dimension2D dim,
+			HtmlColor mybackcolor, boolean rotation) {
+		Color backColor = Color.WHITE;
+		if (mybackcolor instanceof HtmlColorSimple) {
+			backColor = colorMapper.getMappedColor(mybackcolor);
+		} else if (mybackcolor instanceof HtmlColorTransparent) {
+			backColor = null;
+		}
+
+		final EmptyImageBuilder builder;
+		final Graphics2D graphics2D;
+		if (rotation) {
+			builder = new EmptyImageBuilder((int) (dim.getHeight() * dpiFactor), (int) (dim.getWidth() * dpiFactor),
+					backColor);
+			graphics2D = builder.getGraphics2D();
+			graphics2D.rotate(-Math.PI / 2);
+			graphics2D.translate(-builder.getBufferedImage().getHeight(), 0);
+		} else {
+			builder = new EmptyImageBuilder((int) (dim.getWidth() * dpiFactor), (int) (dim.getHeight() * dpiFactor),
+					backColor);
+			graphics2D = builder.getGraphics2D();
+
+		}
+		final UGraphicG2d ug = new UGraphicG2d(colorMapper, graphics2D, dpiFactor);
+		ug.setBufferedImage(builder.getBufferedImage());
+		final BufferedImage im = ((UGraphicG2d) ug).getBufferedImage();
+		if (mybackcolor instanceof HtmlColorGradient) {
+			ug.apply(new UChangeBackColor(mybackcolor)).draw(new URectangle(im.getWidth(), im.getHeight()));
+		}
+
+		return ug;
+	}
+
 }

src/net/sourceforge/plantuml/FileGroup.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -28,7 +28,7 @@
  *
  * Original Author:  Arnaud Roques
  *
- * Revision $Revision: 3824 $
+ * Revision $Revision: 9786 $
  *
  */
 package net.sourceforge.plantuml;

src/net/sourceforge/plantuml/FileSystem.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -28,13 +28,16 @@
  *
  * Original Author:  Arnaud Roques
  *
- * Revision $Revision: 6908 $
+ * Revision $Revision: 9786 $
  *
  */
 package net.sourceforge.plantuml;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
 
 public class FileSystem {
 
@@ -64,10 +67,47 @@ public class FileSystem {
 
 	public File getFile(String nameOrPath) throws IOException {
 		final File dir = currentDir.get();
-		if (dir == null) {
+		if (dir == null || isAbsolute(nameOrPath)) {
 			return new File(nameOrPath).getCanonicalFile();
 		}
-		return new File(dir.getAbsoluteFile(), nameOrPath).getCanonicalFile();
+		final File filecurrent = new File(dir.getAbsoluteFile(), nameOrPath);
+		if (filecurrent.exists()) {
+			return filecurrent.getCanonicalFile();
+		}
+		for (File d : getPath("plantuml.include.path")) {
+			final File file = new File(d, nameOrPath);
+			if (file.exists()) {
+				return file.getCanonicalFile();
+			}
+		}
+		for (File d : getPath("java.class.path")) {
+			final File file = new File(d, nameOrPath);
+			if (file.exists()) {
+				return file.getCanonicalFile();
+			}
+		}
+		return filecurrent;
+	}
+
+	private List<File> getPath(String prop) {
+		final List<File> result = new ArrayList<File>();
+		final String paths = System.getProperty(prop);
+		if (paths == null) {
+			return result;
+		}
+		final StringTokenizer st = new StringTokenizer(paths, System.getProperty("path.separator"));
+		while (st.hasMoreTokens()) {
+			final File f = new File(st.nextToken());
+			if (f.exists() && f.isDirectory()) {
+				result.add(f);
+			}
+		}
+		return result;
+	}
+
+	private boolean isAbsolute(String nameOrPath) {
+		final File f = new File(nameOrPath);
+		return f.isAbsolute();
 	}
 
 	public void reset() {

src/net/sourceforge/plantuml/FileUtils.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -51,26 +51,6 @@ public class FileUtils {
 		counter = new AtomicInteger(0);
 	}
 
-	public static File getTmpDir() {
-		final File tmpDir = new File(System.getProperty("java.io.tmpdir"));
-		if (tmpDir.exists() == false || tmpDir.isDirectory() == false) {
-			throw new IllegalStateException();
-		}
-		return tmpDir;
-	}
-
-	public static void delete(File f) {
-		if (f == null) {
-			return;
-		}
-		Thread.yield();
-		Log.info("Deleting temporary file " + f);
-		final boolean ok = f.delete();
-		if (ok == false) {
-			Log.error("Cannot delete: " + f);
-		}
-	}
-
 	static public File createTempFile(String prefix, String suffix) throws IOException {
 		if (suffix.startsWith(".") == false) {
 			throw new IllegalArgumentException();
@@ -92,40 +72,41 @@ public class FileUtils {
 		return f;
 	}
 
+	private static void copyInternal(final InputStream fis, final OutputStream fos) throws IOException {
+		final byte[] buf = new byte[10240];
+		int len;
+		while ((len = fis.read(buf)) > 0) {
+			fos.write(buf, 0, len);
+		}
+		fos.close();
+		fis.close();
+	}
+
 	static public void copyToFile(File src, File dest) throws IOException {
 		if (dest.isDirectory()) {
 			dest = new File(dest, src.getName());
 		}
 		final InputStream fis = new BufferedInputStream(new FileInputStream(src));
 		final OutputStream fos = new BufferedOutputStream(new FileOutputStream(dest));
-		int lu;
-		while ((lu = fis.read()) != -1) {
-			fos.write(lu);
-		}
-		fos.close();
-		fis.close();
+		copyInternal(fis, fos);
 	}
 
 	static public void copyToStream(File src, OutputStream os) throws IOException {
 		final InputStream fis = new BufferedInputStream(new FileInputStream(src));
 		final OutputStream fos = new BufferedOutputStream(os);
-		int lu;
-		while ((lu = fis.read()) != -1) {
-			fos.write(lu);
-		}
-		fos.close();
-		fis.close();
+		copyInternal(fis, fos);
 	}
 
 	static public void copyToStream(InputStream is, OutputStream os) throws IOException {
 		final InputStream fis = new BufferedInputStream(is);
 		final OutputStream fos = new BufferedOutputStream(os);
-		int lu;
-		while ((lu = fis.read()) != -1) {
-			fos.write(lu);
-		}
+		copyInternal(fis, fos);
+	}
+
+	static public void copyToFile(byte[] src, File dest) throws IOException {
+		final OutputStream fos = new BufferedOutputStream(new FileOutputStream(dest));
+		fos.write(src);
 		fos.close();
-		fis.close();
 	}
 
 }

src/net/sourceforge/plantuml/FileWatcher.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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

src/net/sourceforge/plantuml/FontParam.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -28,53 +28,61 @@
  *
  * Original Author:  Arnaud Roques
  *
- * Revision $Revision: 7130 $
+ * Revision $Revision: 11985 $
  *
  */
 package net.sourceforge.plantuml;
 
 import java.awt.Font;
 
-public enum FontParam {
+interface FontParamConstant {
+	String FAMILY = "SansSerif";
+	String COLOR = "black";
+}
+
+public enum FontParam {
+	ACTIVITY(14, Font.PLAIN), //
+	// ACTIVITY_ARROW(13, Font.PLAIN), //
+	GENERIC_ARROW(13, Font.PLAIN), //
+	ACTIVITY2(12, Font.PLAIN), //
+	ACTIVITY_ARROW2(11, Font.PLAIN), //
+	CIRCLED_CHARACTER(17, Font.BOLD, FontParamConstant.COLOR, "Monospaced"), //
+	// OBJECT_ARROW(10, Font.PLAIN), //
+	OBJECT_ATTRIBUTE(10, Font.PLAIN), //
+	OBJECT(12, Font.PLAIN), //
+	OBJECT_STEREOTYPE(12, Font.ITALIC), //
+	// CLASS_ARROW(10, Font.PLAIN), //
+	CLASS_ATTRIBUTE(10, Font.PLAIN), //
+	CLASS(12, Font.PLAIN), //
+	CLASS_STEREOTYPE(12, Font.ITALIC), //
+	COMPONENT(14, Font.PLAIN), //
+	COMPONENT_STEREOTYPE(14, Font.ITALIC), //
+	// COMPONENT_ARROW(13, Font.PLAIN), //
+	NOTE(13, Font.PLAIN), //
+	PACKAGE(14, Font.PLAIN), //
+	SEQUENCE_ACTOR(13, Font.PLAIN), //
+	SEQUENCE_ARROW(13, Font.PLAIN), //
+	SEQUENCE_BOX(13, Font.BOLD), //
+	SEQUENCE_DIVIDER(13, Font.BOLD), //
+	SEQUENCE_REFERENCE(13, Font.PLAIN), //
+	SEQUENCE_DELAY(11, Font.PLAIN), //
+	SEQUENCE_GROUP(11, Font.BOLD), //
+	SEQUENCE_GROUP_HEADER(13, Font.BOLD), //
+	SEQUENCE_PARTICIPANT(13, Font.PLAIN), //
+	SEQUENCE_TITLE(13, Font.BOLD), //
+	STATE(14, Font.PLAIN), //
+	// STATE_ARROW(13, Font.PLAIN), //
+	STATE_ATTRIBUTE(12, Font.PLAIN), //
+	LEGEND(14, Font.PLAIN), //
+	TITLE(18, Font.PLAIN), //
+	FOOTER(10, Font.PLAIN, "#888888", FontParamConstant.FAMILY), //
+	HEADER(10, Font.PLAIN, "#888888", FontParamConstant.FAMILY), //
+	USECASE(14, Font.PLAIN), //
+	USECASE_STEREOTYPE(14, Font.ITALIC), //
+	USECASE_ACTOR(14, Font.PLAIN), //
+	USECASE_ACTOR_STEREOTYPE(14, Font.ITALIC); //
+	// USECASE_ARROW(13, Font.PLAIN, FontParamConstant.COLOR, FontParamConstant.FAMILY);
 
-	ACTIVITY(14, Font.PLAIN, "black", null),
-	ACTIVITY_ARROW(13, Font.PLAIN, "black", null),
-	CIRCLED_CHARACTER(17, Font.BOLD, "black", "Courier"),
-	OBJECT_ARROW(10, Font.PLAIN, "black", null),
-	OBJECT_ATTRIBUTE(10, Font.PLAIN, "black", null),
-	OBJECT(12, Font.PLAIN, "black", null),
-	OBJECT_STEREOTYPE(12, Font.ITALIC, "black", null),
-	CLASS_ARROW(10, Font.PLAIN, "black", null),
-	CLASS_ATTRIBUTE(10, Font.PLAIN, "black", null),
-	CLASS(12, Font.PLAIN, "black", null),
-	CLASS_STEREOTYPE(12, Font.ITALIC, "black", null),
-	COMPONENT(14, Font.PLAIN, "black", null),
-	COMPONENT_STEREOTYPE(14, Font.ITALIC, "black", null),
-	COMPONENT_ARROW(13, Font.PLAIN, "black", null),
-	NOTE(13, Font.PLAIN, "black", null),
-	PACKAGE(14, Font.PLAIN, "black", null),
-	SEQUENCE_ACTOR(13, Font.PLAIN, "black", null),
-	SEQUENCE_ARROW(13, Font.PLAIN, "black", null),
-	SEQUENCE_BOX(13, Font.BOLD, "black", null),
-	SEQUENCE_DIVIDER(13, Font.BOLD, "black", null),
-	SEQUENCE_REFERENCE(13, Font.PLAIN, "black", null),
-	SEQUENCE_DELAY(11, Font.PLAIN, "black", null),
-	SEQUENCE_GROUP(11, Font.BOLD, "black", null),
-	SEQUENCE_GROUP_HEADER(13, Font.BOLD, "black", null),
-	SEQUENCE_PARTICIPANT(13, Font.PLAIN, "black", null),
-	SEQUENCE_TITLE(13, Font.BOLD, "black", null),
-	STATE(14, Font.PLAIN, "black", null),
-	STATE_ARROW(13, Font.PLAIN, "black", null),
-	STATE_ATTRIBUTE(12, Font.PLAIN, "black", null),
-	TITLE(18, Font.PLAIN, "black", null),
-	FOOTER(10, Font.PLAIN, "#888888", null),
-	HEADER(10, Font.PLAIN, "#888888", null),
-	USECASE(14, Font.PLAIN, "black", null),
-	USECASE_STEREOTYPE(14, Font.ITALIC, "black", null),
-	USECASE_ACTOR(14, Font.PLAIN, "black", null),
-	USECASE_ACTOR_STEREOTYPE(14, Font.ITALIC, "black", null),
-	USECASE_ARROW(13, Font.PLAIN, "black", null);
-	
 	private final int defaultSize;
 	private final int fontStyle;
 	private final String defaultColor;
@@ -87,15 +95,19 @@ public enum FontParam {
 		this.defaultFamily = defaultFamily;
 	}
 
+	private FontParam(int defaultSize, int fontStyle) {
+		this(defaultSize, fontStyle, FontParamConstant.COLOR, FontParamConstant.FAMILY);
+	}
+
 	public final int getDefaultSize(ISkinParam skinParam) {
-		if (skinParam.isSvek() && this==CLASS_ATTRIBUTE) {
+		if (this == CLASS_ATTRIBUTE) {
 			return 11;
 		}
 		return defaultSize;
 	}
 
 	public final int getDefaultFontStyle(ISkinParam skinParam) {
-		if (skinParam.isSvek() && this==PACKAGE) {
+		if (this == PACKAGE) {
 			return Font.BOLD;
 		}
 		return fontStyle;
@@ -108,6 +120,5 @@ public enum FontParam {
 	public String getDefaultFamily() {
 		return defaultFamily;
 	}
-	
-	
+
 }

src/net/sourceforge/plantuml/GeneratedImage.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -28,20 +28,22 @@
  *
  * Original Author:  Arnaud Roques
  *
- * Revision $Revision: 6615 $
+ * Revision $Revision: 10298 $
  *
  */
 package net.sourceforge.plantuml;
 
 import java.io.File;
 
+import net.sourceforge.plantuml.core.Diagram;
+
 public class GeneratedImage implements Comparable<GeneratedImage> {
 
 	private final File pngFile;
 	private final String description;
-	private final PSystem system;
+	private final Diagram system;
 
-	public GeneratedImage(File pngFile, String description, PSystem system) {
+	public GeneratedImage(File pngFile, String description, Diagram system) {
 		this.system = system;
 		this.pngFile = pngFile;
 		this.description = description;

src/net/sourceforge/plantuml/Hideable.java

@@ -0,0 +1,40 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2013, Arnaud Roques
+ *
+ * Project Info:  http://plantuml.sourceforge.net
+ * 
+ * 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.
+ *
+ * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
+ * in the United States and other countries.]
+ *
+ * Original Author:  Arnaud Roques
+ * 
+ * Revision $Revision: 3835 $
+ *
+ */
+package net.sourceforge.plantuml;
+
+public interface Hideable {
+
+	public boolean isHidden();
+
+}

src/net/sourceforge/plantuml/ISkinParam.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -35,43 +35,68 @@ package net.sourceforge.plantuml;
 
 import net.sourceforge.plantuml.cucadiagram.dot.DotSplines;
 import net.sourceforge.plantuml.cucadiagram.dot.GraphvizLayoutStrategy;
-import net.sourceforge.plantuml.graphic.HorizontalAlignement;
+import net.sourceforge.plantuml.graphic.HorizontalAlignment;
 import net.sourceforge.plantuml.graphic.HtmlColor;
+import net.sourceforge.plantuml.svek.ConditionStyle;
+import net.sourceforge.plantuml.svek.PackageStyle;
 import net.sourceforge.plantuml.ugraphic.ColorMapper;
 import net.sourceforge.plantuml.ugraphic.UFont;
+import net.sourceforge.plantuml.ugraphic.UStroke;
 
-public interface ISkinParam {
+public interface ISkinParam extends SpriteContainer {
 
 	public HtmlColor getBackgroundColor();
 
 	public String getValue(String key);
 
-	public HtmlColor getHtmlColor(ColorParam param, String stereotype);
+	public HtmlColor getHtmlColor(ColorParam param, String stereotype, boolean clickable);
 
 	public HtmlColor getFontHtmlColor(FontParam param, String stereotype);
 
+	public UStroke getThickness(LineParam param);
+
 	public UFont getFont(FontParam fontParam, String stereotype);
-	
-	public HorizontalAlignement getHorizontalAlignement(AlignParam param);
+
+	public HorizontalAlignment getHorizontalAlignment(AlignParam param);
 
 	public int getCircledCharacterRadius();
 
-	public boolean isClassCollapse();
-	
 	public int classAttributeIconSize();
-	
+
 	public ColorMapper getColorMapper();
-	
+
 	public int getDpi();
-	
-	public boolean useOctagonForActivity();
-	
+
 	public DotSplines getDotSplines();
-	
+
 	public GraphvizLayoutStrategy getStrategy();
-	
-	public boolean isSvek();
-	
+
 	public boolean shadowing();
 
+	public PackageStyle getPackageStyle();
+
+	public boolean useUml2ForComponent();
+
+	public boolean stereotypePositionTop();
+
+	public boolean useSwimlanes();
+
+	public double getNodesep();
+
+	public double getRanksep();
+
+	public double getRoundCorner();
+
+	public double maxMessageSize();
+
+	public boolean strictUmlStyle();
+
+	public boolean forceSequenceParticipantUnderlined();
+
+	public ConditionStyle getConditionStyle();
+	
+	public double minClassWidth();
+	
+	public boolean sameClassWidth();
+
 }

src/net/sourceforge/plantuml/ISourceFileReader.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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

src/net/sourceforge/plantuml/LineConfigurable.java

@@ -0,0 +1,49 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2013, Arnaud Roques
+ *
+ * Project Info:  http://plantuml.sourceforge.net
+ * 
+ * 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.
+ *
+ * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
+ * in the United States and other countries.]
+ *
+ * Original Author:  Arnaud Roques
+ * 
+ * Revision $Revision: 3835 $
+ *
+ */
+package net.sourceforge.plantuml;
+
+import net.sourceforge.plantuml.graphic.HtmlColor;
+import net.sourceforge.plantuml.ugraphic.UStroke;
+
+public interface LineConfigurable {
+
+	public HtmlColor getSpecificLineColor();
+
+	public void setSpecificLineColor(HtmlColor specificLinecolor);
+
+	public UStroke getSpecificLineStroke();
+
+	public void setSpecificLineStroke(UStroke specificLineStoke);
+
+}

src/net/sourceforge/plantuml/LineParam.java

@@ -0,0 +1,47 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2013, Arnaud Roques
+ *
+ * Project Info:  http://plantuml.sourceforge.net
+ * 
+ * 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.
+ *
+ * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
+ * in the United States and other countries.]
+ *
+ * Original Author:  Arnaud Roques
+ *
+ * Revision $Revision: 7715 $
+ * 
+ */
+package net.sourceforge.plantuml;
+
+
+public enum LineParam {
+//	sequenceBoundaryBorder,
+	sequenceActorBorder,
+	sequenceDividerBorder,
+//	sequenceGroupBorder(0.1),
+//	sequenceReferenceBorder(0.1),
+	sequenceLifeLineBorder,
+	sequenceParticipantBorder, noteBorder, sequenceGroupBorder, sequenceReferenceBorder;
+//	sequenceBoxBorder(0.1);
+	
+}

src/net/sourceforge/plantuml/Log.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -28,7 +28,7 @@
  *
  * Original Author:  Arnaud Roques
  *
- * Revision $Revision: 6528 $
+ * Revision $Revision: 9786 $
  *
  */
 package net.sourceforge.plantuml;
@@ -68,4 +68,18 @@ public abstract class Log {
 		return sb.toString();
 
 	}
+
+	public static void println(Object s) {
+		if (header == null) {
+			System.err.println("L = " + s);
+		} else {
+			System.err.println(header + " " + s);
+		}
+	}
+
+	private static String header;
+
+	public static void header(String s) {
+		header = s;
+	}
 }

src/net/sourceforge/plantuml/MathUtils.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -45,7 +45,9 @@ public class MathUtils {
 
 	public static double limitation(double v, double min, double max) {
 		if (min >= max) {
-			throw new IllegalArgumentException();
+			assert false : "min="+min+" max="+max+" v="+v;
+			return v;
+			// throw new IllegalArgumentException("min="+min+" max="+max+" v="+v);
 		}
 		if (v < min) {
 			return min;

src/net/sourceforge/plantuml/NewpagedDiagram.java

@@ -0,0 +1,111 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2013, Arnaud Roques
+ *
+ * Project Info:  http://plantuml.sourceforge.net
+ * 
+ * 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.
+ *
+ * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
+ * in the United States and other countries.]
+ *
+ * Original Author:  Arnaud Roques
+ *
+ * Revision $Revision: 10459 $
+ *
+ */
+package net.sourceforge.plantuml;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import net.sourceforge.plantuml.command.Command;
+import net.sourceforge.plantuml.command.CommandExecutionResult;
+import net.sourceforge.plantuml.core.Diagram;
+import net.sourceforge.plantuml.core.DiagramDescription;
+import net.sourceforge.plantuml.core.DiagramDescriptionImpl;
+import net.sourceforge.plantuml.core.ImageData;
+
+public class NewpagedDiagram extends AbstractPSystem {
+
+	private final List<Diagram> diagrams = new ArrayList<Diagram>();
+
+	private NewpagedDiagram(Diagram diag1, Diagram diag2) {
+		if (diag1 instanceof NewpagedDiagram) {
+			throw new IllegalArgumentException();
+		}
+		if (diag2 instanceof NewpagedDiagram) {
+			throw new IllegalArgumentException();
+		}
+		this.diagrams.add(diag1);
+		this.diagrams.add(diag2);
+	}
+
+	public static NewpagedDiagram newpage(AbstractPSystem diagram, AbstractPSystem empty) {
+		if (diagram instanceof NewpagedDiagram) {
+			final NewpagedDiagram other = (NewpagedDiagram) diagram;
+			other.diagrams.add(empty);
+			return other;
+		}
+		return new NewpagedDiagram(diagram, empty);
+	}
+
+	public CommandExecutionResult executeCommand(Command cmd, List<String> lines) {
+		final int nb = diagrams.size();
+		return cmd.execute(diagrams.get(nb - 1), lines);
+	}
+
+	public ImageData exportDiagram(OutputStream os, int num, FileFormatOption fileFormat) throws IOException {
+		return diagrams.get(num).exportDiagram(os, 0, fileFormat);
+	}
+
+	public int getNbImages() {
+		int nb = 0;
+		for (Diagram d : diagrams) {
+			nb += d.getNbImages();
+		}
+		return nb;
+	}
+
+	public DiagramDescription getDescription() {
+		final StringBuilder sb = new StringBuilder();
+		for (Diagram d : diagrams) {
+			if (sb.length() > 0) {
+				sb.append(" ");
+			}
+			sb.append(d.getDescription());
+		}
+		return new DiagramDescriptionImpl(sb.toString(), getClass());
+	}
+
+	public String getWarningOrError() {
+		final StringBuilder sb = new StringBuilder();
+		for (Diagram d : diagrams) {
+			if (sb.length() > 0) {
+				sb.append(" ");
+			}
+			sb.append(d.getWarningOrError());
+		}
+		return sb.toString();
+	}
+
+}

src/net/sourceforge/plantuml/NullOutputStream.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -28,31 +28,39 @@
  *
  * Original Author:  Arnaud Roques
  *
- * Revision $Revision: 5890 $
+ * Revision $Revision: 4780 $
  *
  */
 package net.sourceforge.plantuml;
 
-import net.sourceforge.plantuml.command.AbstractUmlSystemCommandFactory;
-import net.sourceforge.plantuml.command.CommandComment;
-import net.sourceforge.plantuml.command.CommandMultilinesComment;
-import net.sourceforge.plantuml.command.CommandNope;
+import java.io.IOException;
+import java.io.OutputStream;
 
-public class EmptyDiagramFactory extends AbstractUmlSystemCommandFactory {
+// Modified by Maxime Sinclair
+public class NullOutputStream extends OutputStream {
 
-	private PSystemError system;
+    /**
+     * Writes to nowhere
+     */
+    @Override
+    public void write(int b) throws IOException {
+        // Do nothing silently
+    }
 
-	public PSystemError getSystem() {
-		return system;
-	}
+    /**
+     * Overridden for performance reason
+     */
+    @Override
+    public void write(byte b[]) throws IOException {
+        // Do nothing silently
+    }
 
-	@Override
-	protected void initCommands() {
-		// system = new PSystemError();
-
-		addCommand(new CommandNope(null));
-		addCommand(new CommandComment(null));
-		addCommand(new CommandMultilinesComment(null));
-	}
+    /**
+     * Overridden for performance reason
+     */
+    @Override
+    public void write(byte b[], int off, int len) throws IOException {
+        // Do nothing silently
+    }
 
 }

src/net/sourceforge/plantuml/Option.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -28,7 +28,7 @@
  *
  * Original Author:  Arnaud Roques
  *
- * Revision $Revision: 6702 $
+ * Revision $Revision: 12022 $
  *
  */
 package net.sourceforge.plantuml;
@@ -65,7 +65,7 @@ public class Option {
 
 	private File outputDir = null;
 	private File outputFile = null;
-	
+
 	private final List<String> result = new ArrayList<String>();
 
 	public Option() {
@@ -89,6 +89,8 @@ public class Option {
 			String s = arg[i];
 			if (s.equalsIgnoreCase("-tsvg") || s.equalsIgnoreCase("-svg")) {
 				setFileFormat(FileFormat.SVG);
+			} else if (s.equalsIgnoreCase("-thtml") || s.equalsIgnoreCase("-html")) {
+				setFileFormat(FileFormat.HTML);
 			} else if (s.equalsIgnoreCase("-txmi") || s.equalsIgnoreCase("-xmi")) {
 				setFileFormat(FileFormat.XMI_STANDARD);
 			} else if (s.equalsIgnoreCase("-txmi:argo") || s.equalsIgnoreCase("-xmi:argo")) {
@@ -99,15 +101,18 @@ public class Option {
 				setFileFormat(FileFormat.EPS);
 			} else if (s.equalsIgnoreCase("-teps:text") || s.equalsIgnoreCase("-eps:text")) {
 				setFileFormat(FileFormat.EPS_TEXT);
-			} else if (s.equalsIgnoreCase("-tdot") || s.equalsIgnoreCase("-dot")) {
-				setFileFormat(FileFormat.DOT);
-				OptionFlags.getInstance().setKeepTmpFiles(true);
 			} else if (s.equalsIgnoreCase("-ttxt") || s.equalsIgnoreCase("-txt")) {
 				setFileFormat(FileFormat.ATXT);
 			} else if (s.equalsIgnoreCase("-tutxt") || s.equalsIgnoreCase("-utxt")) {
 				setFileFormat(FileFormat.UTXT);
+			} else if (s.equalsIgnoreCase("-png") || s.equalsIgnoreCase("-tpng")) {
+				setFileFormat(FileFormat.PNG);
+			} else if (s.equalsIgnoreCase("-vdx") || s.equalsIgnoreCase("-tvdx")) {
+				setFileFormat(FileFormat.VDX);
 			} else if (s.equalsIgnoreCase("-pdf") || s.equalsIgnoreCase("-tpdf")) {
 				setFileFormat(FileFormat.PDF);
+			} else if (s.equalsIgnoreCase("-overwrite")) {
+				OptionFlags.getInstance().setOverwrite(true);
 			} else if (s.equalsIgnoreCase("-output") || s.equalsIgnoreCase("-o")) {
 				i++;
 				if (i == arg.length) {
@@ -166,14 +171,9 @@ public class Option {
 				initConfig(StringUtils.eventuallyRemoveStartingAndEndingDoubleQuote(arg[i]));
 			} else if (s.equalsIgnoreCase("-computeurl") || s.equalsIgnoreCase("-encodeurl")) {
 				this.computeurl = true;
-			} else if (s.startsWith("-c")) {
-				s = s.substring(2);
-				config.add(StringUtils.eventuallyRemoveStartingAndEndingDoubleQuote(s));
 			} else if (s.startsWith("-x")) {
 				s = s.substring(2);
 				excludes.add(StringUtils.eventuallyRemoveStartingAndEndingDoubleQuote(s));
-			} else if (s.equalsIgnoreCase("-debugdot")) {
-				OptionFlags.getInstance().setDebugDot(true);
 			} else if (s.equalsIgnoreCase("-verbose") || s.equalsIgnoreCase("-v")) {
 				OptionFlags.getInstance().setVerbose(true);
 			} else if (s.equalsIgnoreCase("-pipe") || s.equalsIgnoreCase("-p")) {
@@ -199,16 +199,16 @@ public class Option {
 			} else if (s.equalsIgnoreCase("-word")) {
 				OptionFlags.getInstance().setWord(true);
 				OptionFlags.getInstance().setQuiet(true);
-			} else if (s.equalsIgnoreCase("-forcegd")) {
-				OptionFlags.getInstance().setForceGd(true);
-			} else if (s.equalsIgnoreCase("-forcecairo")) {
-				OptionFlags.getInstance().setForceCairo(true);
 			} else if (s.equalsIgnoreCase("-quiet")) {
 				OptionFlags.getInstance().setQuiet(true);
 			} else if (s.equalsIgnoreCase("-decodeurl")) {
 				this.decodeurl = true;
 			} else if (s.equalsIgnoreCase("-version")) {
 				OptionPrint.printVersion();
+			} else if (s.matches("(?i)^-li[sc][ea]n[sc]e\\s*$")) {
+				OptionPrint.printLicense();
+			} else if (s.equalsIgnoreCase("-checkversion")) {
+				OptionPrint.checkVersion();
 			} else if (s.startsWith("-D")) {
 				manageDefine(s.substring(2));
 			} else if (s.startsWith("-S")) {
@@ -223,6 +223,8 @@ public class Option {
 				OptionPrint.printLanguage();
 			} else if (s.equalsIgnoreCase("-gui")) {
 				OptionFlags.getInstance().setGui(true);
+			} else if (s.equalsIgnoreCase("-encodesprite")) {
+				OptionFlags.getInstance().setEncodesprite(true);
 			} else if (s.equalsIgnoreCase("-nosuggestengine")) {
 				OptionFlags.getInstance().setUseSuggestEngine(false);
 			} else if (s.equalsIgnoreCase("-failonerror")) {
@@ -236,6 +238,9 @@ public class Option {
 				} else {
 					this.ftpPort = Integer.parseInt(s.substring(x + 1));
 				}
+			} else if (s.startsWith("-c")) {
+				s = s.substring(2);
+				config.add(StringUtils.eventuallyRemoveStartingAndEndingDoubleQuote(s));
 			} else {
 				result.add(s);
 			}
@@ -289,7 +294,7 @@ public class Option {
 	}
 
 	public final static String getPattern() {
-		return "(?i)^.*\\.(txt|tex|java|htm|html|c|h|cpp|apt)$";
+		return "(?i)^.*\\.(txt|tex|java|htm|html|c|h|cpp|apt|pu)$";
 	}
 
 	public void setOutputDir(File f) {

src/net/sourceforge/plantuml/OptionFlags.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -28,7 +28,7 @@
  *
  * Original Author:  Arnaud Roques
  *
- * Revision $Revision: 7231 $
+ * Revision $Revision: 11833 $
  *
  */
 package net.sourceforge.plantuml;
@@ -39,13 +39,20 @@ import java.io.FileOutputStream;
 import java.io.PrintStream;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import net.sourceforge.plantuml.core.Diagram;
 import net.sourceforge.plantuml.cucadiagram.dot.GraphvizUtils;
 
 public class OptionFlags {
 
-	static public final boolean PBBACK = false;
-	static public final boolean GRAPHVIZCACHE = false;
-	static public final boolean SVEK = false;
+	// static public final boolean PBBACK = false;
+	static public boolean GRAPHVIZCACHE = false;
+	static public final boolean TRACE_DOT = false;
+
+	static public final boolean HORIZONTAL_LINE_BETWEEN_DIFFERENT_PACKAGE_ALLOWED = false;
+	static public boolean ALLOW_INCLUDE = true;
+
+	static public final boolean USE_HECTOR = false;
+	static public final boolean USE_CREOLE = true;
 
 	void reset() {
 		reset(false);
@@ -57,9 +64,6 @@ public class OptionFlags {
 		metadata = false;
 		word = false;
 		systemExit = exit;
-		debugDot = false;
-		forceGd = false;
-		forceCairo = false;
 		dotExecutable = null;
 		gui = false;
 		quiet = false;
@@ -67,6 +71,8 @@ public class OptionFlags {
 		printFonts = false;
 		useSuggestEngine = true;
 		failOnError = false;
+		encodesprite = false;
+		// PIC_LINE = false;
 	}
 
 	public boolean useJavaInsteadOfDot() {
@@ -80,9 +86,6 @@ public class OptionFlags {
 	private boolean metadata;
 	private boolean word;
 	private boolean systemExit;
-	private boolean debugDot;
-	private boolean forceGd;
-	private boolean forceCairo;
 	private String dotExecutable;
 	private boolean gui;
 	private boolean quiet;
@@ -90,6 +93,8 @@ public class OptionFlags {
 	private boolean printFonts;
 	private boolean useSuggestEngine;
 	private boolean failOnError;
+	private boolean encodesprite;
+	private boolean overwrite;
 	private File logData;
 
 	private OptionFlags() {
@@ -140,14 +145,6 @@ public class OptionFlags {
 		this.systemExit = systemExit;
 	}
 
-	public final boolean isDebugDot() {
-		return debugDot;
-	}
-
-	public final void setDebugDot(boolean debugDot) {
-		this.debugDot = debugDot;
-	}
-
 	public final String getDotExecutable() {
 		return dotExecutable;
 	}
@@ -164,22 +161,6 @@ public class OptionFlags {
 		this.gui = gui;
 	}
 
-	public final boolean isForceGd() {
-		return forceGd;
-	}
-
-	public final void setForceGd(boolean forceGd) {
-		this.forceGd = forceGd;
-	}
-
-	public final boolean isForceCairo() {
-		return forceCairo;
-	}
-
-	public final void setForceCairo(boolean forceCairo) {
-		this.forceCairo = forceCairo;
-	}
-
 	public final boolean isQuiet() {
 		return quiet;
 	}
@@ -198,8 +179,9 @@ public class OptionFlags {
 
 	private final AtomicBoolean logDataInitized = new AtomicBoolean(false);
 
-	public void logData(File file, PSystem system) {
-		if (system instanceof PSystemError == false) {
+	public void logData(File file, Diagram system) {
+		final String warnOrError = system.getWarningOrError();
+		if (warnOrError == null) {
 			return;
 		}
 		synchronized (logDataInitized) {
@@ -214,19 +196,12 @@ public class OptionFlags {
 			if (logData == null) {
 				return;
 			}
-			final PSystemError systemError = (PSystemError) system;
+			// final PSystemError systemError = (PSystemError) system;
 			PrintStream ps = null;
 			try {
 				ps = new PrintStream(new FileOutputStream(logData, true));
 				ps.println("Start of " + file.getName());
-				ps.println(systemError.getDescription());
-				for (CharSequence t : systemError.getTitle()) {
-					ps.println(t);
-				}
-				systemError.print(ps);
-				for (String s : systemError.getSuggest()) {
-					ps.println(s);
-				}
+				ps.println(warnOrError);
 				ps.println("End of " + file.getName());
 				ps.println();
 			} catch (FileNotFoundException e) {
@@ -240,6 +215,17 @@ public class OptionFlags {
 		}
 	}
 
+	// public static void logErrorFile(final PSystemError systemError, PrintStream ps) {
+	// ps.println(systemError.getDescription());
+	// for (CharSequence t : systemError.getTitle()) {
+	// ps.println(t);
+	// }
+	// systemError.print(ps);
+	// for (String s : systemError.getSuggest()) {
+	// ps.println(s);
+	// }
+	// }
+
 	public final void setLogData(File logData) {
 		this.logData = logData;
 		logData.delete();
@@ -281,4 +267,20 @@ public class OptionFlags {
 		this.failOnError = failOnError;
 	}
 
+	public final boolean isEncodesprite() {
+		return encodesprite;
+	}
+
+	public final void setEncodesprite(boolean encodesprite) {
+		this.encodesprite = encodesprite;
+	}
+
+	public final boolean isOverwrite() {
+		return overwrite;
+	}
+
+	public final void setOverwrite(boolean overwrite) {
+		this.overwrite = overwrite;
+	}
+	
 }

src/net/sourceforge/plantuml/OptionPrint.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -28,7 +28,7 @@
  *
  * Original Author:  Arnaud Roques
  *
- * Revision $Revision: 6626 $
+ * Revision $Revision: 11786 $
  *
  */
 package net.sourceforge.plantuml;
@@ -39,13 +39,16 @@ import java.util.Date;
 import java.util.Properties;
 
 import net.sourceforge.plantuml.cucadiagram.dot.GraphvizUtils;
+import net.sourceforge.plantuml.syntax.LanguageDescriptor;
+import net.sourceforge.plantuml.version.License;
+import net.sourceforge.plantuml.version.PSystemVersion;
 import net.sourceforge.plantuml.version.Version;
 
 public class OptionPrint {
 
 	static public void printTestDot() throws InterruptedException {
 		for (String s : GraphvizUtils.getTestDotStrings(false)) {
-			System.err.println(s);
+			System.out.println(s);
 		}
 		exit();
 	}
@@ -54,54 +57,58 @@ public class OptionPrint {
 
 		final String charset = Charset.defaultCharset().displayName();
 
-		System.err.println("Usage: java -jar plantuml.jar [options] -gui");
-		System.err.println("\t(to execute the GUI)");
-		System.err.println("    or java -jar plantuml.jar [options] [file/dir] [file/dir] [file/dir]");
-		System.err.println("\t(to process files or directories)");
-		System.err.println();
-		System.err.println("You can use the following wildcards in files/dirs:");
-		System.err.println("\t*\tmeans any characters but '" + File.separator + "'");
-		System.err.println("\t?\tone and only one character but '" + File.separator + "'");
-		System.err.println("\t**\tmeans any characters (used to recurse through directories)");
-		System.err.println();
-		System.err.println("where options include:");
-		System.err.println("    -gui\t\tTo run the graphical user interface");
-		System.err.println("    -tsvg\t\tTo generate images using SVG format");
-		System.err.println("    -teps\t\tTo generate images using EPS format");
-		System.err.println("    -txmi\t\tTo generate XMI file for classes diagrams");
-		System.err.println("    -tdot\t\tTo generate DOT intermediate file");
-		System.err.println("    -ttxt\t\tTo generate images with ASCII art");
-		System.err.println("    -tutxt\t\tTo generate images with ASCII art using Unicode characters");
-		System.err.println("    -o[utput] \"dir\"\tTo generate images in the specified directory");
-		System.err.println("    -DVAR1=value\tTo set a preprocessing variable as if '!define VAR1 value' were used");
-		System.err.println("    -Sparam1=value\tTo set a skin parameter as if 'skinparam param1 value' were used");
-		System.err.println("    -config \"file\"\tTo read the provided config file before each diagram");
-		System.err.println("    -charset xxx\tTo use a specific charset (default is " + charset + ")");
-		System.err.println("    -e[x]clude pattern\tTo exclude files that match the provided pattern");
-		System.err.println("    -metadata\t\tTo retrieve PlantUML sources from PNG images");
-		System.err.println("    -version\t\tTo display information about PlantUML and Java versions");
-		System.err.println("    -v[erbose]\t\tTo have log information");
-		System.err.println("    -quiet\t\tTo NOT print error message into the console");
-		System.err.println("    -forcegd\t\tTo force dot to use GD PNG library");
-		System.err.println("    -forcecairo\t\tTo force dot to use Cairo PNG library");
-		System.err.println("    -keepfiles\t\tTo NOT delete temporary files after process");
-		System.err.println("    -h[elp]\t\tTo display this help message");
-		System.err.println("    -testdot\t\tTo test the installation of graphviz");
-		System.err.println("    -graphvizdot \"exe\"\tTo specify dot executable");
-		System.err.println("    -p[ipe]\t\tTo use stdin for PlantUML source and stdout for PNG/SVG/EPS generation");
-		System.err.println("    -computeurl\t\tTo compute the encoded URL of a PlantUML source file");
-		System.err.println("    -decodeurl\t\tTo retrieve the PlantUML source from an encoded URL");
-		System.err.println("    -syntax\t\tTo report any syntax error from standard input without generating images");
-		System.err.println("    -language\t\tTo print the list of PlantUML keywords");
-		System.err.println("    -nosuggestengine\tTo disable the suggest engine when errors in diagrams");
-		System.err.println("    -checkonly\t\tTo check the syntax of files without generating images");
-		System.err.println("    -failonerror\tTo stop processing if syntax error in diagram occurs");
-		System.err.println("    -pattern\t\tTo print the list of Regular Expression used by PlantUML");
-		System.err.println("    -duration\t\tTo print the duration of complete diagrams processing");
-		System.err.println("    -nbthread N\tTo use (N) threads for processing");
-		System.err.println("    -nbthread auto\tTo use " + Option.defaultNbThreads() + " threads for processing");
-		System.err.println();
-		System.err.println("If needed, you can setup the environment variable GRAPHVIZ_DOT.");
+		System.out.println("Usage: java -jar plantuml.jar [options] -gui");
+		System.out.println("\t(to execute the GUI)");
+		System.out.println("    or java -jar plantuml.jar [options] [file/dir] [file/dir] [file/dir]");
+		System.out.println("\t(to process files or directories)");
+		System.out.println();
+		System.out.println("You can use the following wildcards in files/dirs:");
+		System.out.println("\t*\tmeans any characters but '" + File.separator + "'");
+		System.out.println("\t?\tone and only one character but '" + File.separator + "'");
+		System.out.println("\t**\tmeans any characters (used to recurse through directories)");
+		System.out.println();
+		System.out.println("where options include:");
+		System.out.println("    -gui\t\tTo run the graphical user interface");
+		System.out.println("    -tpng\t\tTo generate images using PNG format (default)");
+		System.out.println("    -tsvg\t\tTo generate images using SVG format");
+		System.out.println("    -teps\t\tTo generate images using EPS format");
+		System.out.println("    -txmi\t\tTo generate XMI file for class diagram");
+		System.out.println("    -thtml\t\tTo generate HTML files for class diagram");
+		System.out.println("    -ttxt\t\tTo generate images with ASCII art");
+		System.out.println("    -tutxt\t\tTo generate images with ASCII art using Unicode characters");
+		System.out.println("    -o[utput] \"dir\"\tTo generate images in the specified directory");
+		System.out.println("    -DVAR1=value\tTo set a preprocessing variable as if '!define VAR1 value' were used");
+		System.out.println("    -Sparam1=value\tTo set a skin parameter as if 'skinparam param1 value' were used");
+		System.out.println("    -config \"file\"\tTo read the provided config file before each diagram");
+		System.out.println("    -charset xxx\tTo use a specific charset (default is " + charset + ")");
+		System.out.println("    -e[x]clude pattern\tTo exclude files that match the provided pattern");
+		System.out.println("    -metadata\t\tTo retrieve PlantUML sources from PNG images");
+		System.out.println("    -version\t\tTo display information about PlantUML and Java versions");
+		System.out.println("    -checkversion\tTo check if a newer version is available for download");
+		System.out.println("    -v[erbose]\t\tTo have log information");
+		System.out.println("    -quiet\t\tTo NOT print error message into the console");
+		// Log.println("    -forcegd\t\tTo force dot to use GD PNG library");
+		// Log.println("    -forcecairo\t\tTo force dot to use Cairo PNG library");
+		System.out.println("    -keepfiles\t\tTo NOT delete temporary files after process");
+		System.out.println("    -h[elp]\t\tTo display this help message");
+		System.out.println("    -testdot\t\tTo test the installation of graphviz");
+		System.out.println("    -graphvizdot \"exe\"\tTo specify dot executable");
+		System.out.println("    -p[ipe]\t\tTo use stdin for PlantUML source and stdout for PNG/SVG/EPS generation");
+		System.out.println("    -computeurl\t\tTo compute the encoded URL of a PlantUML source file");
+		System.out.println("    -decodeurl\t\tTo retrieve the PlantUML source from an encoded URL");
+		System.out.println("    -syntax\t\tTo report any syntax error from standard input without generating images");
+		System.out.println("    -language\t\tTo print the list of PlantUML keywords");
+		System.out.println("    -nosuggestengine\tTo disable the suggest engine when errors in diagrams");
+		System.out.println("    -checkonly\t\tTo check the syntax of files without generating images");
+		System.out.println("    -failonerror\tTo stop processing if syntax error in diagram occurs");
+		System.out.println("    -pattern\t\tTo print the list of Regular Expression used by PlantUML");
+		System.out.println("    -duration\t\tTo print the duration of complete diagrams processing");
+		System.out.println("    -nbthread N\t\tTo use (N) threads for processing");
+		System.out.println("    -nbthread auto\tTo use " + Option.defaultNbThreads() + " threads for processing");
+		System.out.println("    -author[s]\t\tTo print information about PlantUML authors");
+		System.out.println("    -overwrite\t\tTo all to overwrite read only files");
+		System.out.println();
+		System.out.println("If needed, you can setup the environment variable GRAPHVIZ_DOT.");
 		exit();
 	}
 
@@ -112,25 +119,66 @@ public class OptionPrint {
 		throw new InterruptedException("exit");
 	}
 
+	public static void printLicense() throws InterruptedException {
+		for (String s : License.getCurrent().getText()) {
+			System.out.println(s);
+		}
+		exit();
+	}
+
 	public static void printVersion() throws InterruptedException {
-		System.err.println("PlantUML version " + Version.version() + " (" + new Date(Version.compileTime()) + ")");
+		System.out
+				.println("PlantUML version " + Version.versionString() + " (" + new Date(Version.compileTime()) + ")");
+		System.out.println("(" + License.getCurrent() + " source distribution)");
 		final Properties p = System.getProperties();
-		System.err.println(p.getProperty("java.runtime.name"));
-		System.err.println(p.getProperty("java.vm.name"));
-		System.err.println(p.getProperty("java.runtime.version"));
-		System.err.println(p.getProperty("os.name"));
+		System.out.println(p.getProperty("java.runtime.name"));
+		System.out.println(p.getProperty("java.vm.name"));
+		System.out.println(p.getProperty("java.runtime.version"));
+		System.out.println(p.getProperty("os.name"));
+		System.out.println();
+		for (String s : GraphvizUtils.getTestDotStrings(false)) {
+			System.out.println(s);
+		}
+		exit();
+	}
+
+	public static void checkVersion() throws InterruptedException {
+		System.out
+				.println("PlantUML version " + Version.versionString() + " (" + new Date(Version.compileTime()) + ")");
+		System.out.println();
+		final int lastversion = PSystemVersion.extractDownloadableVersion(null, null);
+		if (lastversion == -1) {
+			System.out.println("Error");
+			System.out.println("Cannot connect to http://plantuml.sourceforge.net/");
+			System.out.println("Maybe you should set your proxy ?");
+		} else if (lastversion == 0) {
+			System.out.println("Error");
+			System.out.println("Cannot retrieve last version from http://plantuml.sourceforge.net/");
+		} else {
+			System.out.println("Last available version for download : " + lastversion);
+			System.out.println();
+			if (Version.version() >= lastversion) {
+				System.out.println("Your version is up to date.");
+			} else {
+				System.out.println("A newer version is available for download.");
+			}
+		}
+
 		exit();
 	}
 
 	public static void printAbout() throws InterruptedException {
-		System.err.println("PlantUML version " + Version.version() + " (" + new Date(Version.compileTime()) + ")");
-		System.err.println();
-		System.err.println("Original idea: Arnaud Roques");
-		System.err.println("Word Macro: Alain Bertucat & Matthieu Sabatier");
-		System.err.println("Eclipse Plugin: Claude Durif & Anne Pecoil");
-		System.err.println("Site design: Raphael Cotisson");
-		System.err.println();
-		System.err.println("http://plantuml.sourceforge.net");
+		// Duplicate in PSystemVersion
+		System.out
+				.println("PlantUML version " + Version.versionString() + " (" + new Date(Version.compileTime()) + ")");
+		System.out.println();
+		System.out.println("Original idea: Arnaud Roques");
+		System.out.println("Word Macro: Alain Bertucat & Matthieu Sabatier");
+		System.out.println("Eclipse Plugin: Claude Durif & Anne Pecoil");
+		System.out.println("Servlet & XWiki: Maxime Sinclair");
+		System.out.println("Site design: Raphael Cotisson");
+		System.out.println();
+		System.out.println("http://plantuml.sourceforge.net");
 		exit();
 	}
 

src/net/sourceforge/plantuml/PSystemBuilder.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -33,50 +33,63 @@
  */
 package net.sourceforge.plantuml;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
 import net.sourceforge.plantuml.acearth.PSystemXearthFactory;
 import net.sourceforge.plantuml.activitydiagram.ActivityDiagramFactory;
-import net.sourceforge.plantuml.activitydiagram2.ActivityDiagramFactory2;
+import net.sourceforge.plantuml.activitydiagram3.ActivityDiagramFactory3;
+import net.sourceforge.plantuml.api.PSystemFactory;
 import net.sourceforge.plantuml.classdiagram.ClassDiagramFactory;
-import net.sourceforge.plantuml.componentdiagram.ComponentDiagramFactory;
 import net.sourceforge.plantuml.compositediagram.CompositeDiagramFactory;
+import net.sourceforge.plantuml.core.Diagram;
+import net.sourceforge.plantuml.core.DiagramType;
+import net.sourceforge.plantuml.core.UmlSource;
+import net.sourceforge.plantuml.creole.PSystemCreoleFactory;
+import net.sourceforge.plantuml.descdiagram.DescriptionDiagramFactory;
 import net.sourceforge.plantuml.directdot.PSystemDotFactory;
 import net.sourceforge.plantuml.ditaa.PSystemDitaaFactory;
+import net.sourceforge.plantuml.donors.PSystemDonorsFactory;
+import net.sourceforge.plantuml.eggs.PSystemAppleTwoFactory;
 import net.sourceforge.plantuml.eggs.PSystemEggFactory;
 import net.sourceforge.plantuml.eggs.PSystemLostFactory;
 import net.sourceforge.plantuml.eggs.PSystemPathFactory;
 import net.sourceforge.plantuml.eggs.PSystemRIPFactory;
+import net.sourceforge.plantuml.flowdiagram.FlowDiagramFactory;
+import net.sourceforge.plantuml.font.PSystemListFontsFactory;
 import net.sourceforge.plantuml.jcckit.PSystemJcckitFactory;
+import net.sourceforge.plantuml.logo.PSystemLogoFactory;
 import net.sourceforge.plantuml.objectdiagram.ObjectDiagramFactory;
 import net.sourceforge.plantuml.oregon.PSystemOregonFactory;
 import net.sourceforge.plantuml.postit.PostIdDiagramFactory;
 import net.sourceforge.plantuml.printskin.PrintSkinFactory;
-import net.sourceforge.plantuml.project.PSystemProjectFactory;
+import net.sourceforge.plantuml.project2.PSystemProjectFactory2;
 import net.sourceforge.plantuml.salt.PSystemSaltFactory;
 import net.sourceforge.plantuml.sequencediagram.SequenceDiagramFactory;
 import net.sourceforge.plantuml.statediagram.StateDiagramFactory;
 import net.sourceforge.plantuml.sudoku.PSystemSudokuFactory;
-import net.sourceforge.plantuml.usecasediagram.UsecaseDiagramFactory;
+import net.sourceforge.plantuml.turing.PSystemTuringFactory;
+import net.sourceforge.plantuml.version.License;
+import net.sourceforge.plantuml.version.PSystemLicenseFactory;
 import net.sourceforge.plantuml.version.PSystemVersionFactory;
 
 public class PSystemBuilder {
 
-	final public PSystem createPSystem(final List<String> strings) throws IOException, InterruptedException {
+	final public Diagram createPSystem(final List<? extends CharSequence> strings) {
 
 		final List<PSystemFactory> factories = getAllFactories();
 
-		final UmlSource umlSource = new UmlSource(strings);
+		final DiagramType type = DiagramType.getTypeFromArobaseStart(strings.get(0).toString());
+
+		final UmlSource umlSource = new UmlSource(strings, type == DiagramType.UML);
 		final DiagramType diagramType = umlSource.getDiagramType();
 		final List<PSystemError> errors = new ArrayList<PSystemError>();
 		for (PSystemFactory systemFactory : factories) {
 			if (diagramType != systemFactory.getDiagramType()) {
 				continue;
 			}
-			final PSystem sys = new PSystemSingleBuilder(umlSource, systemFactory).getPSystem();
+			final Diagram sys = systemFactory.createSystem(umlSource);
 			if (isOk(sys)) {
 				return sys;
 			}
@@ -84,9 +97,9 @@ public class PSystemBuilder {
 		}
 
 		final PSystemError err = merge(errors);
-		if (OptionFlags.getInstance().isQuiet() == false) {
-			err.print(System.err);
-		}
+//		if (OptionFlags.getInstance().isQuiet() == false) {
+//			err.print(System.err);
+//		}
 		return err;
 
 	}
@@ -96,32 +109,42 @@ public class PSystemBuilder {
 		factories.add(new SequenceDiagramFactory());
 		factories.add(new ClassDiagramFactory());
 		factories.add(new ActivityDiagramFactory());
-		factories.add(new ActivityDiagramFactory2());
-		factories.add(new UsecaseDiagramFactory());
-		factories.add(new ComponentDiagramFactory());
+		factories.add(new DescriptionDiagramFactory());
 		factories.add(new StateDiagramFactory());
-		factories.add(new ActivityDiagramFactory2());
+		factories.add(new ActivityDiagramFactory3());
 		factories.add(new CompositeDiagramFactory());
 		factories.add(new ObjectDiagramFactory());
 		factories.add(new PostIdDiagramFactory());
 		factories.add(new PrintSkinFactory());
+		factories.add(new PSystemLicenseFactory());
 		factories.add(new PSystemVersionFactory());
+		factories.add(new PSystemDonorsFactory());
+		factories.add(new PSystemListFontsFactory());
 		factories.add(new PSystemSaltFactory(DiagramType.SALT));
 		factories.add(new PSystemSaltFactory(DiagramType.UML));
 		factories.add(new PSystemDotFactory(DiagramType.DOT));
 		factories.add(new PSystemDotFactory(DiagramType.UML));
-		factories.add(new PSystemDitaaFactory(DiagramType.DITAA));
-		factories.add(new PSystemDitaaFactory(DiagramType.UML));
-		factories.add(new PSystemJcckitFactory(DiagramType.JCCKIT));
-		factories.add(new PSystemJcckitFactory(DiagramType.UML));
-		factories.add(new PSystemSudokuFactory());
+		if (License.getCurrent() == License.GPL) {
+			factories.add(new PSystemDitaaFactory(DiagramType.DITAA));
+			factories.add(new PSystemDitaaFactory(DiagramType.UML));
+			factories.add(new PSystemJcckitFactory(DiagramType.JCCKIT));
+			factories.add(new PSystemJcckitFactory(DiagramType.UML));
+			factories.add(new PSystemLogoFactory());
+			factories.add(new PSystemSudokuFactory());
+			factories.add(new PSystemTuringFactory());
+		}
+		factories.add(new PSystemCreoleFactory());
 		factories.add(new PSystemEggFactory());
+		factories.add(new PSystemAppleTwoFactory());
 		factories.add(new PSystemRIPFactory());
 		factories.add(new PSystemLostFactory());
 		factories.add(new PSystemPathFactory());
 		factories.add(new PSystemOregonFactory());
-		factories.add(new PSystemXearthFactory());
-		factories.add(new PSystemProjectFactory());
+		if (License.getCurrent() == License.GPL) {
+			factories.add(new PSystemXearthFactory());
+		}
+		factories.add(new PSystemProjectFactory2());
+		factories.add(new FlowDiagramFactory());
 		return factories;
 	}
 
@@ -140,7 +163,7 @@ public class PSystemBuilder {
 		return new PSystemError(source, errors);
 	}
 
-	private boolean isOk(PSystem ps) {
+	private boolean isOk(Diagram ps) {
 		if (ps == null || ps instanceof PSystemError) {
 			return false;
 		}

src/net/sourceforge/plantuml/PSystemError.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -28,7 +28,7 @@
  *
  * Original Author:  Arnaud Roques
  *
- * Revision $Revision: 6622 $
+ * Revision $Revision: 12053 $
  */
 package net.sourceforge.plantuml;
 
@@ -41,6 +41,10 @@ import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
 
+import net.sourceforge.plantuml.core.DiagramDescription;
+import net.sourceforge.plantuml.core.DiagramDescriptionImpl;
+import net.sourceforge.plantuml.core.ImageData;
+import net.sourceforge.plantuml.core.UmlSource;
 import net.sourceforge.plantuml.graphic.GraphicStrings;
 
 public class PSystemError extends AbstractPSystem {
@@ -76,13 +80,9 @@ public class PSystemError extends AbstractPSystem {
 		this(source, Collections.singletonList(singleError));
 	}
 
-	public void exportDiagram(OutputStream os, StringBuilder cmap, int index, FileFormatOption fileFormat)
-			throws IOException {
-		getPngError().writeImage(os, getMetadata(), fileFormat);
-	}
-
-	public GraphicStrings getPngError() throws IOException {
-		return new GraphicStrings(htmlStrings);
+	public ImageData exportDiagram(OutputStream os, int num, FileFormatOption fileFormat) throws IOException {
+		final GraphicStrings result = new GraphicStrings(htmlStrings);
+		return result.exportDiagram(os, getMetadata(), fileFormat);
 	}
 
 	private void appendSource(int position) {
@@ -186,11 +186,11 @@ public class PSystemError extends AbstractPSystem {
 		return result;
 	}
 
-	public String getDescription() {
-		return "(Error)";
+	public DiagramDescription getDescription() {
+		return new DiagramDescriptionImpl("(Error)", getClass());
 	}
 
-	public void print(PrintStream ps) {
+	private void print(PrintStream ps) {
 		synchronized (ps) {
 			for (String s : plainStrings) {
 				ps.println(StringUtils.showComparatorCharacters(s));
@@ -205,4 +205,21 @@ public class PSystemError extends AbstractPSystem {
 	public final Collection<ErrorUml> getErrorsUml() {
 		return Collections.unmodifiableCollection(printedErrors);
 	}
+
+	@Override
+	public String getWarningOrError() {
+		final StringBuilder sb = new StringBuilder();
+		sb.append(getDescription());
+		sb.append('\n');
+		for (CharSequence t : getTitle()) {
+			sb.append(t);
+			sb.append('\n');
+		}
+		sb.append('\n');
+		for (String s : getSuggest()) {
+			sb.append(s);
+			sb.append('\n');
+		}
+		return sb.toString();
+	}
 }

src/net/sourceforge/plantuml/PSystemSingleBuilder.java

@@ -1,225 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * (C) Copyright 2009, Arnaud Roques
- *
- * Project Info:  http://plantuml.sourceforge.net
- * 
- * 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 Lesser 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.
- *
- * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
- * in the United States and other countries.]
- *
- * Original Author:  Arnaud Roques
- *
- * Revision $Revision: 4975 $
- *
- */
-package net.sourceforge.plantuml;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import net.sourceforge.plantuml.command.AbstractUmlSystemCommandFactory;
-import net.sourceforge.plantuml.command.Command;
-import net.sourceforge.plantuml.command.CommandControl;
-import net.sourceforge.plantuml.command.CommandExecutionResult;
-import net.sourceforge.plantuml.command.PSystemCommandFactory;
-import net.sourceforge.plantuml.command.ProtectedCommand;
-import net.sourceforge.plantuml.suggest.SuggestEngine;
-import net.sourceforge.plantuml.suggest.SuggestEngineResult;
-import net.sourceforge.plantuml.suggest.SuggestEngineStatus;
-
-final public class PSystemSingleBuilder {
-
-	private final Iterator<String> it;
-	private final UmlSource source;
-	private final String startLine;
-
-	private int nb = 0;
-	private AbstractPSystem sys;
-
-	private boolean hasNext() {
-		return it.hasNext();
-	}
-
-	private String next() {
-		nb++;
-		return it.next();
-	}
-
-	public PSystem getPSystem() {
-		return sys;
-	}
-
-	public PSystemSingleBuilder(UmlSource s, PSystemFactory systemFactory) throws IOException {
-		this.source = s;
-		it = s.iterator();
-		startLine = next();
-		if (StartUtils.isArobaseStartDiagram(startLine) == false) {
-			throw new UnsupportedOperationException();
-		}
-
-		if (s.isEmpty()) {
-			sys = buildEmptyError();
-		} else if (systemFactory instanceof PSystemCommandFactory) {
-			executeUmlCommand((PSystemCommandFactory) systemFactory);
-		} else if (systemFactory instanceof PSystemBasicFactory) {
-			executeUmlBasic((PSystemBasicFactory) systemFactory);
-		}
-	}
-
-	private void executeUmlBasic(PSystemBasicFactory systemFactory) throws IOException {
-		systemFactory.init(startLine);
-		while (hasNext()) {
-			final String s = next();
-			if (StartUtils.isArobaseEndDiagram(s)) {
-				if (source.getSize() == 2) {
-					assert false;
-					sys = buildEmptyError();
-				} else {
-					sys = (AbstractPSystem) systemFactory.getSystem();
-				}
-				if (sys == null) {
-					return;
-				}
-				sys.setSource(source);
-				return;
-			}
-			final boolean ok = systemFactory.executeLine(s);
-			if (ok == false) {
-				sys = new PSystemError(source, new ErrorUml(ErrorUmlType.SYNTAX_ERROR, "Syntax Error?", nb - 1));
-				return;
-			}
-		}
-		sys = (AbstractPSystem) systemFactory.getSystem();
-		sys.setSource(source);
-	}
-
-	private PSystemError buildEmptyError() {
-		final PSystemError result = new PSystemError(source, new ErrorUml(ErrorUmlType.SYNTAX_ERROR,
-				"Empty description", 1));
-		result.setSource(source);
-		return result;
-	}
-
-	private PSystemError buildEmptyError(String err) {
-		final PSystemError result = new PSystemError(source, new ErrorUml(ErrorUmlType.EXECUTION_ERROR, err, 1));
-		result.setSource(source);
-		return result;
-	}
-
-	private void executeUmlCommand(PSystemCommandFactory systemFactory) throws IOException {
-		systemFactory.init(startLine);
-		while (hasNext()) {
-			final String s = next();
-			if (StartUtils.isArobaseEndDiagram(s)) {
-				final String err = ((AbstractUmlSystemCommandFactory) systemFactory).checkFinalError();
-				if (err != null) {
-					sys = buildEmptyError(err);
-				}
-				if (source.getSize() == 2) {
-					assert false;
-					sys = buildEmptyError();
-				} else {
-					sys = (AbstractPSystem) systemFactory.getSystem();
-				}
-				if (sys == null) {
-					return;
-				}
-				sys.setSource(source);
-				return;
-			}
-			final CommandControl commandControl = systemFactory.isValid(Arrays.asList(s));
-			if (commandControl == CommandControl.NOT_OK) {
-				final ErrorUml err = new ErrorUml(ErrorUmlType.SYNTAX_ERROR, "Syntax Error?", nb - 1);
-				if (OptionFlags.getInstance().isUseSuggestEngine()) {
-					final SuggestEngine engine = new SuggestEngine(source, systemFactory);
-					final SuggestEngineResult result = engine.tryToSuggest();
-					if (result.getStatus() == SuggestEngineStatus.ONE_SUGGESTION) {
-						err.setSuggest(result);
-					}
-				}
-				sys = new PSystemError(source, err);
-				return;
-			} else if (commandControl == CommandControl.OK_PARTIAL) {
-				final boolean ok = manageMultiline(systemFactory, s);
-				if (ok == false) {
-					sys = new PSystemError(source, new ErrorUml(ErrorUmlType.EXECUTION_ERROR, "Syntax Error?", nb - 1));
-					return;
-				}
-			} else if (commandControl == CommandControl.OK) {
-				final Command cmd = new ProtectedCommand(systemFactory.createCommand(Arrays.asList(s)));
-				final CommandExecutionResult result = cmd.execute(Arrays.asList(s));
-				if (result.isOk() == false) {
-					sys = new PSystemError(source,
-							new ErrorUml(ErrorUmlType.EXECUTION_ERROR, result.getError(), nb - 1));
-					return;
-				}
-				testDeprecated(Arrays.asList(s), cmd);
-			} else {
-				assert false;
-			}
-		}
-		sys = (AbstractPSystem) systemFactory.getSystem();
-		sys.setSource(source);
-	}
-
-	private void testDeprecated(final List<String> lines, final Command cmd) {
-		if (cmd.isDeprecated(lines)) {
-			Log.error("The following syntax is deprecated :");
-			for (String s : lines) {
-				Log.error(s);
-			}
-			final String msg = cmd.getHelpMessageForDeprecated(lines);
-			if (msg != null) {
-				Log.error("Use instead :");
-				Log.error(msg);
-			}
-		}
-	}
-
-	private boolean manageMultiline(PSystemCommandFactory systemFactory, final String init) throws IOException {
-		final List<String> lines = new ArrayList<String>();
-		lines.add(init);
-		while (hasNext()) {
-			final String s = next();
-			if (StartUtils.isArobaseEndDiagram(s)) {
-				return false;
-			}
-			lines.add(s);
-			final CommandControl commandControl = systemFactory.isValid(lines);
-			if (commandControl == CommandControl.NOT_OK) {
-				// throw new IllegalStateException();
-				return false;
-			}
-			if (commandControl == CommandControl.OK) {
-				final Command cmd = systemFactory.createCommand(lines);
-				testDeprecated(lines, cmd);
-				return cmd.execute(lines).isOk();
-			}
-		}
-		return false;
-
-	}
-
-}

src/net/sourceforge/plantuml/PSystemUtils.java

@@ -0,0 +1,230 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2013, Arnaud Roques
+ *
+ * Project Info:  http://plantuml.sourceforge.net
+ * 
+ * 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.
+ *
+ * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
+ * in the United States and other countries.]
+ *
+ * Original Author:  Arnaud Roques
+ *
+ * Revision $Revision: 9997 $
+ *
+ */
+package net.sourceforge.plantuml;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3;
+import net.sourceforge.plantuml.core.Diagram;
+import net.sourceforge.plantuml.core.ImageData;
+import net.sourceforge.plantuml.cucadiagram.CucaDiagram;
+import net.sourceforge.plantuml.html.CucaDiagramHtmlMaker;
+import net.sourceforge.plantuml.png.PngSplitter;
+import net.sourceforge.plantuml.sequencediagram.SequenceDiagram;
+
+public class PSystemUtils {
+
+	public static List<File> exportDiagrams(Diagram system, File suggestedFile, FileFormatOption fileFormatOption)
+			throws IOException {
+		if (system instanceof NewpagedDiagram) {
+			return exportDiagramsNewpaged((NewpagedDiagram) system, suggestedFile, fileFormatOption);
+		}
+		if (system instanceof SequenceDiagram) {
+			return exportDiagramsSequence((SequenceDiagram) system, suggestedFile, fileFormatOption);
+		}
+		if (system instanceof CucaDiagram) {
+			return exportDiagramsCuca((CucaDiagram) system, suggestedFile, fileFormatOption);
+		}
+		if (system instanceof ActivityDiagram3) {
+			return exportDiagramsActivityDiagram3((ActivityDiagram3) system, suggestedFile, fileFormatOption);
+		}
+		return exportDiagramsDefault(system, suggestedFile, fileFormatOption);
+	}
+
+	private static List<File> exportDiagramsNewpaged(NewpagedDiagram system, File suggestedFile,
+			FileFormatOption fileFormat) throws IOException {
+		final List<File> result = new ArrayList<File>();
+		final int nbImages = system.getNbImages();
+		for (int i = 0; i < nbImages; i++) {
+
+			final File f = fileFormat.getFileFormat().computeFilename(suggestedFile, i);
+			if (canFileBeWritten(f) == false) {
+				return result;
+			}
+			final OutputStream fos = new BufferedOutputStream(new FileOutputStream(f));
+			// ImageData cmap = null;
+			try {
+				/* cmap = */system.exportDiagram(fos, i, fileFormat);
+			} finally {
+				fos.close();
+			}
+			// if (system.hasUrl() && cmap != null && cmap.containsCMapData()) {
+			// system.exportCmap(suggestedFile, cmap);
+			// }
+			Log.info("File size : " + f.length());
+			result.add(f);
+		}
+		return result;
+	}
+
+	public static boolean canFileBeWritten(final File f) {
+		Log.info("Creating file: " + f);
+		if (f.exists() && f.canWrite() == false) {
+			if (OptionFlags.getInstance().isOverwrite()) {
+				Log.info("Overwrite " + f);
+				f.setWritable(true);
+				f.delete();
+				return true;
+			}
+			Log.error("Cannot write to file " + f);
+			return false;
+		}
+		return true;
+	}
+
+	static private List<File> exportDiagramsDefault(Diagram system, File suggestedFile, FileFormatOption fileFormat)
+			throws IOException {
+		if (suggestedFile.exists() && suggestedFile.isDirectory()) {
+			throw new IllegalArgumentException("File is a directory " + suggestedFile);
+		}
+		OutputStream os = null;
+		try {
+			if (canFileBeWritten(suggestedFile) == false) {
+				return Collections.emptyList();
+			}
+			os = new BufferedOutputStream(new FileOutputStream(suggestedFile));
+			// system.exportDiagram(os, null, 0, fileFormat);
+			system.exportDiagram(os, 0, fileFormat);
+		} finally {
+			if (os != null) {
+				os.close();
+			}
+		}
+		return Arrays.asList(suggestedFile);
+	}
+
+	static private List<File> exportDiagramsActivityDiagram3(ActivityDiagram3 system, File suggestedFile,
+			FileFormatOption fileFormat) throws IOException {
+		if (suggestedFile.exists() && suggestedFile.isDirectory()) {
+			throw new IllegalArgumentException("File is a directory " + suggestedFile);
+		}
+		OutputStream os = null;
+		ImageData cmap = null;
+		try {
+			if (canFileBeWritten(suggestedFile) == false) {
+				return Collections.emptyList();
+			}
+			os = new BufferedOutputStream(new FileOutputStream(suggestedFile));
+			cmap = system.exportDiagram(os, 0, fileFormat);
+		} finally {
+			if (os != null) {
+				os.close();
+			}
+		}
+		if (system.hasUrl() && cmap != null && cmap.containsCMapData()) {
+			system.exportCmap(suggestedFile, cmap);
+		}
+		return Arrays.asList(suggestedFile);
+	}
+
+	private static List<File> exportDiagramsSequence(SequenceDiagram system, File suggestedFile,
+			FileFormatOption fileFormat) throws IOException {
+		final List<File> result = new ArrayList<File>();
+		final int nbImages = system.getNbImages();
+		for (int i = 0; i < nbImages; i++) {
+
+			final File f = fileFormat.getFileFormat().computeFilename(suggestedFile, i);
+			if (canFileBeWritten(suggestedFile) == false) {
+				return result;
+			}
+			final OutputStream fos = new BufferedOutputStream(new FileOutputStream(f));
+			ImageData cmap = null;
+			try {
+				cmap = system.exportDiagram(fos, i, fileFormat);
+			} finally {
+				fos.close();
+			}
+			if (system.hasUrl() && cmap != null && cmap.containsCMapData()) {
+				system.exportCmap(suggestedFile, cmap);
+			}
+			Log.info("File size : " + f.length());
+			result.add(f);
+		}
+		return result;
+	}
+
+	static public List<File> exportDiagramsCuca(CucaDiagram system, File suggestedFile, FileFormatOption fileFormat)
+			throws IOException {
+		if (suggestedFile.exists() && suggestedFile.isDirectory()) {
+			throw new IllegalArgumentException("File is a directory " + suggestedFile);
+		}
+
+		if (fileFormat.getFileFormat() == FileFormat.HTML) {
+			return createFilesHtml(system, suggestedFile);
+		}
+
+		ImageData cmap = null;
+		OutputStream os = null;
+		try {
+			if (canFileBeWritten(suggestedFile) == false) {
+				return Collections.emptyList();
+			}
+			os = new BufferedOutputStream(new FileOutputStream(suggestedFile));
+			cmap = system.exportDiagram(os, 0, fileFormat);
+		} finally {
+			if (os != null) {
+				os.close();
+			}
+		}
+		List<File> result = Arrays.asList(suggestedFile);
+
+		if (system.hasUrl() && cmap != null && cmap.containsCMapData()) {
+			system.exportCmap(suggestedFile, cmap);
+		}
+
+		if (fileFormat.getFileFormat() == FileFormat.PNG) {
+			result = new PngSplitter(suggestedFile, system.getHorizontalPages(), system.getVerticalPages(),
+					system.getMetadata(), system.getDpi(fileFormat), fileFormat.isWithMetadata()).getFiles();
+		}
+		return result;
+
+	}
+
+	private static List<File> createFilesHtml(CucaDiagram system, File suggestedFile) throws IOException {
+		final String name = suggestedFile.getName();
+		final int idx = name.lastIndexOf('.');
+		final File dir = new File(suggestedFile.getParentFile(), name.substring(0, idx));
+		final CucaDiagramHtmlMaker maker = new CucaDiagramHtmlMaker(system, dir);
+		return maker.create();
+	}
+
+}

src/net/sourceforge/plantuml/Pragma.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -45,7 +45,7 @@ public class Pragma {
 	public void define(String name, String value) {
 		values.put(name, value);
 		if (name.equalsIgnoreCase("graphviz_dot")) {
-			OptionFlags.getInstance().setDotExecutable(value);
+			OptionFlags.getInstance().setDotExecutable(StringUtils.eventuallyRemoveStartingAndEndingDoubleQuote(value));
 		}
 	}
 
@@ -58,11 +58,7 @@ public class Pragma {
 	}
 
 	public String getValue(String name) {
-		final String result = values.get(name);
-		if (result == null) {
-			throw new IllegalArgumentException();
-		}
-		return result;
+		return values.get(name);
 	}
 
 	protected Set<Map.Entry<String, String>> entrySet() {

src/net/sourceforge/plantuml/Removeable.java

@@ -0,0 +1,40 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2013, Arnaud Roques
+ *
+ * Project Info:  http://plantuml.sourceforge.net
+ * 
+ * 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.
+ *
+ * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
+ * in the United States and other countries.]
+ *
+ * Original Author:  Arnaud Roques
+ * 
+ * Revision $Revision: 3835 $
+ *
+ */
+package net.sourceforge.plantuml;
+
+public interface Removeable {
+
+	public boolean isRemoved();
+
+}

src/net/sourceforge/plantuml/Run.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -28,13 +28,14 @@
  *
  * Original Author:  Arnaud Roques
  *
- * Revision $Revision: 6750 $
+ * Revision $Revision: 12023 $
  *
  */
 package net.sourceforge.plantuml;
 
 import java.awt.Font;
 import java.awt.GraphicsEnvironment;
+import java.awt.image.BufferedImage;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
@@ -43,18 +44,19 @@ import java.io.PrintStream;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import javax.imageio.ImageIO;
 import javax.swing.UIManager;
 
 import net.sourceforge.plantuml.activitydiagram.ActivityDiagramFactory;
 import net.sourceforge.plantuml.classdiagram.ClassDiagramFactory;
 import net.sourceforge.plantuml.code.Transcoder;
 import net.sourceforge.plantuml.code.TranscoderUtil;
-import net.sourceforge.plantuml.command.AbstractUmlSystemCommandFactory;
-import net.sourceforge.plantuml.componentdiagram.ComponentDiagramFactory;
+import net.sourceforge.plantuml.command.UmlDiagramFactory;
+import net.sourceforge.plantuml.core.Diagram;
+import net.sourceforge.plantuml.descdiagram.DescriptionDiagramFactory;
 import net.sourceforge.plantuml.ftp.FtpServer;
 import net.sourceforge.plantuml.objectdiagram.ObjectDiagramFactory;
 import net.sourceforge.plantuml.png.MetadataTag;
@@ -62,16 +64,29 @@ import net.sourceforge.plantuml.preproc.Defines;
 import net.sourceforge.plantuml.sequencediagram.SequenceDiagramFactory;
 import net.sourceforge.plantuml.statediagram.StateDiagramFactory;
 import net.sourceforge.plantuml.swing.MainWindow2;
-import net.sourceforge.plantuml.usecasediagram.UsecaseDiagramFactory;
+import net.sourceforge.plantuml.ugraphic.SpriteGrayLevel;
+import net.sourceforge.plantuml.ugraphic.SpriteUtils;
+import net.sourceforge.plantuml.version.Version;
 
 public class Run {
 
 	public static void main(String[] argsArray) throws IOException, InterruptedException {
 		final long start = System.currentTimeMillis();
 		final Option option = new Option(argsArray);
+		if (OptionFlags.getInstance().isEncodesprite()) {
+			encodeSprite(option.getResult());
+			return;
+		}
 		if (OptionFlags.getInstance().isVerbose()) {
+			Log.info("PlantUML Version " + Version.versionString());
 			Log.info("GraphicsEnvironment.isHeadless() " + GraphicsEnvironment.isHeadless());
 		}
+		if (GraphicsEnvironment.isHeadless()) {
+			Log.info("Forcing -Djava.awt.headless=true");
+			System.setProperty("java.awt.headless", "true");
+			Log.info("java.awt.headless set as true");
+			
+		}
 		if (OptionFlags.getInstance().isPrintFonts()) {
 			printFonts();
 			return;
@@ -83,6 +98,7 @@ public class Run {
 		}
 
 		boolean error = false;
+		boolean forceQuit = false;
 		if (option.isPattern()) {
 			managePattern();
 		} else if (OptionFlags.getInstance().isGui()) {
@@ -93,8 +109,10 @@ public class Run {
 			new MainWindow2(option);
 		} else if (option.isPipe() || option.isSyntax()) {
 			managePipe(option);
+			forceQuit = true;
 		} else {
 			error = manageAllFiles(option);
+			forceQuit = true;
 		}
 
 		if (option.isDuration()) {
@@ -106,6 +124,53 @@ public class Run {
 			Log.error("Some diagram description contains errors");
 			System.exit(1);
 		}
+
+		if (forceQuit && OptionFlags.getInstance().isSystemExit()) {
+			System.exit(0);
+		}
+	}
+
+	private static void encodeSprite(List<String> result) throws IOException {
+		SpriteGrayLevel level = SpriteGrayLevel.GRAY_16;
+		boolean compressed = false;
+		final File f;
+		if (result.size() > 1 && result.get(0).matches("(4|8|16)z?")) {
+			if (result.get(0).startsWith("8")) {
+				level = SpriteGrayLevel.GRAY_8;
+			}
+			if (result.get(0).startsWith("4")) {
+				level = SpriteGrayLevel.GRAY_4;
+			}
+			compressed = result.get(0).toLowerCase().endsWith("z");
+			f = new File(result.get(1));
+		} else {
+			f = new File(result.get(0));
+		}
+		final BufferedImage im = ImageIO.read(f);
+		final String name = getSpriteName(f);
+		final String s = compressed ? SpriteUtils.encodeCompressed(im, name, level) : SpriteUtils.encode(im, name,
+				level);
+		System.out.println(s);
+	}
+
+	private static String getSpriteName(File f) {
+		final String s = getSpriteNameInternal(f);
+		if (s.length() == 0) {
+			return "test";
+		}
+		return s;
+	}
+
+	private static String getSpriteNameInternal(File f) {
+		final StringBuilder sb = new StringBuilder();
+		for (char c : f.getName().toCharArray()) {
+			if (("" + c).matches("[\\p{L}0-9_]")) {
+				sb.append(c);
+			} else {
+				return sb.toString();
+			}
+		}
+		return sb.toString();
 	}
 
 	private static void goFtp(Option option) throws IOException {
@@ -132,17 +197,17 @@ public class Run {
 		printPattern(new SequenceDiagramFactory());
 		printPattern(new ClassDiagramFactory());
 		printPattern(new ActivityDiagramFactory());
-		printPattern(new UsecaseDiagramFactory());
-		printPattern(new ComponentDiagramFactory());
+		printPattern(new DescriptionDiagramFactory());
+		// printPattern(new ComponentDiagramFactory());
 		printPattern(new StateDiagramFactory());
 		printPattern(new ObjectDiagramFactory());
 	}
 
-	private static void printPattern(AbstractUmlSystemCommandFactory factory) {
-		factory.init(null);
+	private static void printPattern(UmlDiagramFactory factory) {
 		System.out.println();
 		System.out.println(factory.getClass().getSimpleName().replaceAll("Factory", ""));
-		for (String s : factory.getDescription()) {
+		final List<String> descriptions = factory.getDescription();
+		for (String s : descriptions) {
 			System.out.println(s);
 		}
 	}
@@ -172,27 +237,23 @@ public class Run {
 		final SourceStringReader sourceStringReader = new SourceStringReader(new Defines(), source, option.getConfig());
 
 		if (option.isSyntax()) {
-			try {
-				final PSystem system = sourceStringReader.getBlocks().get(0).getSystem();
-				if (system instanceof UmlDiagram) {
-					ps.println(((UmlDiagram) system).getUmlDiagramType().name());
-					ps.println(system.getDescription());
-				} else if (system instanceof PSystemError) {
-					ps.println("ERROR");
-					final PSystemError sys = (PSystemError) system;
-					ps.println(sys.getHigherErrorPosition());
-					for (ErrorUml er : sys.getErrorsUml()) {
-						ps.println(er.getError());
-					}
-				} else {
-					ps.println("OTHER");
-					ps.println(system.getDescription());
+			final Diagram system = sourceStringReader.getBlocks().get(0).getDiagram();
+			if (system instanceof UmlDiagram) {
+				ps.println(((UmlDiagram) system).getUmlDiagramType().name());
+				ps.println(system.getDescription());
+			} else if (system instanceof PSystemError) {
+				ps.println("ERROR");
+				final PSystemError sys = (PSystemError) system;
+				ps.println(sys.getHigherErrorPosition());
+				for (ErrorUml er : sys.getErrorsUml()) {
+					ps.println(er.getError());
 				}
-			} catch (InterruptedException e) {
-				Log.error("InterruptedException " + e);
+			} else {
+				ps.println("OTHER");
+				ps.println(system.getDescription());
 			}
 		} else if (option.isPipe()) {
-			final String result = sourceStringReader.generateImage(ps, 0, option.getFileFormatOption());
+			sourceStringReader.generateImage(ps, 0, option.getFileFormatOption());
 		}
 	}
 
@@ -250,7 +311,7 @@ public class Run {
 		for (String s : option.getResult()) {
 			final FileGroup group = new FileGroup(s, option.getExcludes(), option);
 			for (final File f : group.getFiles()) {
-				final Future<?> future = executor.submit(new Runnable() {
+				executor.submit(new Runnable() {
 					public void run() {
 						if (errors.get()) {
 							return;
@@ -286,11 +347,11 @@ public class Run {
 		}
 		final ISourceFileReader sourceFileReader;
 		if (option.getOutputFile() == null) {
-			sourceFileReader = new SourceFileReader(option.getDefaultDefines(), f, option.getOutputDir(), option
-					.getConfig(), option.getCharset(), option.getFileFormatOption());
+			sourceFileReader = new SourceFileReader(option.getDefaultDefines(), f, option.getOutputDir(),
+					option.getConfig(), option.getCharset(), option.getFileFormatOption());
 		} else {
-			sourceFileReader = new SourceFileReader2(option.getDefaultDefines(), f, option.getOutputFile(), option
-					.getConfig(), option.getCharset(), option.getFileFormatOption());
+			sourceFileReader = new SourceFileReader2(option.getDefaultDefines(), f, option.getOutputFile(),
+					option.getConfig(), option.getCharset(), option.getFileFormatOption());
 		}
 		if (option.isComputeurl()) {
 			final List<String> urls = sourceFileReader.getEncodedUrl();

src/net/sourceforge/plantuml/Scale.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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

src/net/sourceforge/plantuml/ScaleHeight.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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

src/net/sourceforge/plantuml/ScaleSimple.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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

src/net/sourceforge/plantuml/ScaleWidth.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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

src/net/sourceforge/plantuml/ScaleWidthAndHeight.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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

src/net/sourceforge/plantuml/SignatureUtils.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -28,7 +28,7 @@
  *
  * Original Author:  Arnaud Roques
  *
- * Revision $Revision: 5877 $
+ * Revision $Revision: 9786 $
  *
  */
 package net.sourceforge.plantuml;
@@ -53,10 +53,10 @@ public class SignatureUtils {
 			return coder.encode(digest);
 		} catch (NoSuchAlgorithmException e) {
 			e.printStackTrace();
-			throw new IllegalStateException();
+			throw new UnsupportedOperationException(e);
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
-			throw new IllegalStateException();
+			throw new UnsupportedOperationException(e);
 		}
 	}
 
@@ -87,10 +87,10 @@ public class SignatureUtils {
 			return coder.encode(digest);
 		} catch (NoSuchAlgorithmException e) {
 			e.printStackTrace();
-			throw new IllegalStateException();
+			throw new UnsupportedOperationException(e);
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
-			throw new IllegalStateException();
+			throw new UnsupportedOperationException(e);
 		}
 	}
 }

src/net/sourceforge/plantuml/SingleLine.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -28,12 +28,14 @@
  *
  * Original Author:  Arnaud Roques
  *
- * Revision $Revision: 3824 $
+ * Revision $Revision: 10298 $
  *
  */
 package net.sourceforge.plantuml;
 
+import net.sourceforge.plantuml.core.Diagram;
+
 public interface SingleLine {
 
-	PSystem getSystemFromSingleLine(String singleLine);
+	Diagram getSystemFromSingleLine(String singleLine);
 }

src/net/sourceforge/plantuml/SkinParam.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -28,7 +28,7 @@
  *
  * Original Author:  Arnaud Roques
  *
- * Revision $Revision: 7230 $
+ * Revision $Revision: 11707 $
  *
  */
 package net.sourceforge.plantuml;
@@ -46,12 +46,17 @@ import java.util.regex.Pattern;
 
 import net.sourceforge.plantuml.cucadiagram.dot.DotSplines;
 import net.sourceforge.plantuml.cucadiagram.dot.GraphvizLayoutStrategy;
-import net.sourceforge.plantuml.graphic.HorizontalAlignement;
+import net.sourceforge.plantuml.graphic.HorizontalAlignment;
 import net.sourceforge.plantuml.graphic.HtmlColor;
+import net.sourceforge.plantuml.graphic.HtmlColorUtils;
+import net.sourceforge.plantuml.svek.ConditionStyle;
+import net.sourceforge.plantuml.svek.PackageStyle;
 import net.sourceforge.plantuml.ugraphic.ColorMapper;
 import net.sourceforge.plantuml.ugraphic.ColorMapperIdentity;
 import net.sourceforge.plantuml.ugraphic.ColorMapperMonochrome;
+import net.sourceforge.plantuml.ugraphic.Sprite;
 import net.sourceforge.plantuml.ugraphic.UFont;
+import net.sourceforge.plantuml.ugraphic.UStroke;
 
 public class SkinParam implements ISkinParam {
 
@@ -68,11 +73,21 @@ public class SkinParam implements ISkinParam {
 
 	public SkinParam(UmlDiagramType type) {
 		this.type = type;
+		if (type == null) {
+			setParam("shadowing", "false");
+		}
 	}
 
 	static String cleanForKey(String key) {
 		key = key.toLowerCase().trim();
 		key = key.replaceAll("_|\\.|\\s", "");
+		key = key.replaceAll("partition", "package");
+		key = key.replaceAll("activityarrow", "genericarrow");
+		key = key.replaceAll("objectarrow", "genericarrow");
+		key = key.replaceAll("classarrow", "genericarrow");
+		key = key.replaceAll("componentarrow", "genericarrow");
+		key = key.replaceAll("statearrow", "genericarrow");
+		key = key.replaceAll("usecasearrow", "genericarrow");
 		final Matcher m = stereoPattern.matcher(key);
 		if (m.find()) {
 			final String s = m.group(1);
@@ -83,9 +98,9 @@ public class SkinParam implements ISkinParam {
 	}
 
 	public HtmlColor getBackgroundColor() {
-		final HtmlColor result = getHtmlColor(ColorParam.background, null);
+		final HtmlColor result = getHtmlColor(ColorParam.background, null, false);
 		if (result == null) {
-			return HtmlColor.WHITE;
+			return HtmlColorUtils.WHITE;
 		}
 		return result;
 	}
@@ -109,19 +124,30 @@ public class SkinParam implements ISkinParam {
 		return sb.toString();
 	}
 
-	public HtmlColor getHtmlColor(ColorParam param, String stereotype) {
+	public HtmlColor getHtmlColor(ColorParam param, String stereotype, boolean clickable) {
 		if (stereotype != null) {
 			checkStereotype(stereotype);
 			final String value2 = getValue(param.name() + "color" + stereotype);
-			if (value2 != null && HtmlColor.isValid(value2)) {
-				return HtmlColor.getColorIfValid(value2);
+			if (value2 != null && HtmlColorUtils.getColorIfValid(value2) != null) {
+				return HtmlColorUtils.getColorIfValid(value2);
 			}
 		}
-		final String value = getValue(param.name() + "color");
-		if (value == null || HtmlColor.isValid(value) == false) {
+		final String value = getValue(getParamName(param, clickable));
+		final boolean acceptTransparent = param == ColorParam.background;
+		if (value == null) {
 			return null;
 		}
-		return HtmlColor.getColorIfValid(value);
+		return HtmlColorUtils.getColorIfValid(value, acceptTransparent);
+	}
+
+	private String getParamName(ColorParam param, boolean clickable) {
+		String n = param.name();
+		if (clickable && n.endsWith("Background")) {
+			n = n.replaceAll("Background", "ClickableBackground");
+		} else if (clickable && n.endsWith("Border")) {
+			n = n.replaceAll("Border", "ClickableBorder");
+		}
+		return n + "color";
 	}
 
 	private void checkStereotype(String stereotype) {
@@ -176,16 +202,16 @@ public class SkinParam implements ISkinParam {
 			checkStereotype(stereotype);
 			value = getValue(param.name() + "fontcolor" + stereotype);
 		}
-		if (value == null || HtmlColor.isValid(value) == false) {
+		if (value == null || HtmlColorUtils.getColorIfValid(value) == null) {
 			value = getValue(param.name() + "fontcolor");
 		}
-		if (value == null || HtmlColor.isValid(value) == false) {
+		if (value == null || HtmlColorUtils.getColorIfValid(value) == null) {
 			value = getValue("defaultfontcolor");
 		}
-		if (value == null || HtmlColor.isValid(value) == false) {
+		if (value == null || HtmlColorUtils.getColorIfValid(value) == null) {
 			value = param.getDefaultColor();
 		}
-		return HtmlColor.getColorIfValid(value);
+		return HtmlColorUtils.getColorIfValid(value);
 	}
 
 	private int getFontStyle(FontParam param, String stereotype) {
@@ -217,8 +243,9 @@ public class SkinParam implements ISkinParam {
 		if (stereotype != null) {
 			checkStereotype(stereotype);
 		}
-		return new UFont(getFontFamily(fontParam, stereotype), getFontStyle(fontParam, stereotype), getFontSize(
-				fontParam, stereotype));
+		final String fontFamily = getFontFamily(fontParam, stereotype);
+		final int fontStyle = getFontStyle(fontParam, stereotype);
+		return new UFont(fontFamily, fontStyle, getFontSize(fontParam, stereotype));
 	}
 
 	public int getCircledCharacterRadius() {
@@ -227,15 +254,11 @@ public class SkinParam implements ISkinParam {
 			return Integer.parseInt(value);
 		}
 		// return 11;
-		// System.err.println("SIZE1="+getFontSize(FontParam.CIRCLED_CHARACTER));
-		// System.err.println("SIZE1="+getFontSize(FontParam.CIRCLED_CHARACTER)/3);
+		// Log.println("SIZE1="+getFontSize(FontParam.CIRCLED_CHARACTER));
+		// Log.println("SIZE1="+getFontSize(FontParam.CIRCLED_CHARACTER)/3);
 		return getFontSize(FontParam.CIRCLED_CHARACTER, null) / 3 + 6;
 	}
 
-	public boolean isClassCollapse() {
-		return true;
-	}
-
 	public int classAttributeIconSize() {
 		final String value = getValue("classAttributeIconSize");
 		if (value != null && value.matches("\\d+")) {
@@ -284,17 +307,6 @@ public class SkinParam implements ISkinParam {
 		return 96;
 	}
 
-	public boolean useOctagonForActivity() {
-		final String value = getValue("activityshape");
-		if ("roundedbox".equalsIgnoreCase(value)) {
-			return false;
-		}
-		if ("octagon".equalsIgnoreCase(value)) {
-			return true;
-		}
-		return false;
-	}
-
 	public DotSplines getDotSplines() {
 		final String value = getValue("linetype");
 		if ("polyline".equalsIgnoreCase(value)) {
@@ -323,15 +335,36 @@ public class SkinParam implements ISkinParam {
 		return GraphvizLayoutStrategy.DOT;
 	}
 
-	public HorizontalAlignement getHorizontalAlignement(AlignParam param) {
-		final String value = getValue(param.name());
-		final HorizontalAlignement result = HorizontalAlignement.fromString(value);
+	public HorizontalAlignment getHorizontalAlignment(AlignParam param) {
+		final String value;
+		switch (param) {
+		case SEQUENCE_MESSAGE_ALIGN:
+			value = getArg(getValue(AlignParam.SEQUENCE_MESSAGE_ALIGN.name()), 0);
+			break;
+		case SEQUENCE_MESSAGETEXT_ALIGN:
+			value = getArg(getValue(AlignParam.SEQUENCE_MESSAGE_ALIGN.name()), 1);
+			break;
+		default:
+			value = getValue(param.name());
+		}
+		final HorizontalAlignment result = HorizontalAlignment.fromString(value);
 		if (result == null) {
 			return param.getDefaultValue();
 		}
 		return result;
 	}
 
+	private String getArg(String value, int i) {
+		if (value == null) {
+			return null;
+		}
+		final String[] split = value.split(":");
+		if (i >= split.length) {
+			return split[0];
+		}
+		return split[i];
+	}
+
 	public ColorMapper getColorMapper() {
 		if (isMonochrome()) {
 			return new ColorMapperMonochrome();
@@ -339,19 +372,10 @@ public class SkinParam implements ISkinParam {
 		return new ColorMapperIdentity();
 	}
 
-	public boolean isSvek() {
-		boolean defaultValue = false;
-		if (OptionFlags.SVEK && type == UmlDiagramType.CLASS) {
-			defaultValue = true;
-		}
-		final String value = getValue("svek");
-		if (value == null) {
-			return defaultValue;
-		}
-		return "true".equalsIgnoreCase(value);
-	}
-
 	public boolean shadowing() {
+		if (strictUmlStyle()) {
+			return false;
+		}
 		final String value = getValue("shadowing");
 		if ("false".equalsIgnoreCase(value)) {
 			return false;
@@ -359,4 +383,129 @@ public class SkinParam implements ISkinParam {
 		return true;
 	}
 
+	public PackageStyle getPackageStyle() {
+		final String value = getValue("packageStyle");
+		final PackageStyle p = PackageStyle.fromString(value);
+		if (p == null) {
+			return PackageStyle.FOLDER;
+		}
+		return p;
+	}
+
+	private final Map<String, Sprite> sprites = new HashMap<String, Sprite>();
+
+	public void addSprite(String name, Sprite sprite) {
+		sprites.put(name, sprite);
+	}
+
+	public Sprite getSprite(String name) {
+		return sprites.get(name);
+	}
+
+	public boolean useUml2ForComponent() {
+		if (strictUmlStyle()) {
+			return true;
+		}
+		final String value = getValue("componentstyle");
+		return "uml2".equalsIgnoreCase(value);
+	}
+
+	public boolean stereotypePositionTop() {
+		final String value = getValue("stereotypePosition");
+		if ("bottom".equalsIgnoreCase(value)) {
+			return false;
+		}
+		return true;
+	}
+
+	public boolean useSwimlanes() {
+		if (type != UmlDiagramType.ACTIVITY) {
+			return false;
+		}
+		if ("true".equalsIgnoreCase(getValue("swimlane"))) {
+			return true;
+		}
+		if ("true".equalsIgnoreCase(getValue("swimlanes"))) {
+			return true;
+		}
+		return false;
+	}
+
+	public double getNodesep() {
+		final String value = getValue("nodesep");
+		if (value != null && value.matches("\\d+")) {
+			return Double.parseDouble(value);
+		}
+		return 0;
+	}
+
+	public double getRanksep() {
+		final String value = getValue("ranksep");
+		if (value != null && value.matches("\\d+")) {
+			return Double.parseDouble(value);
+		}
+		return 0;
+	}
+
+	public double getRoundCorner() {
+		final String value = getValue("roundcorner");
+		if (value != null && value.matches("\\d+")) {
+			return Double.parseDouble(value);
+		}
+		return 0;
+	}
+
+	public UStroke getThickness(LineParam param) {
+		final String value = getValue(param.name() + "thickness");
+		if (value != null && value.matches("[\\d.]+")) {
+			return new UStroke(Double.parseDouble(value));
+		}
+		return null;
+	}
+
+	public double maxMessageSize() {
+		final String value = getValue("maxmessagesize");
+		if (value != null && value.matches("-?\\d+")) {
+			return Double.parseDouble(value);
+		}
+		return 0;
+	}
+
+	public boolean strictUmlStyle() {
+		final String value = getValue("style");
+		if ("strictuml".equalsIgnoreCase(value)) {
+			return true;
+		}
+		return false;
+	}
+
+	public boolean forceSequenceParticipantUnderlined() {
+		final String value = getValue("sequenceParticipant");
+		if ("underline".equalsIgnoreCase(value)) {
+			return true;
+		}
+		return false;
+	}
+
+	public ConditionStyle getConditionStyle() {
+		final String value = getValue("conditionStyle");
+		final ConditionStyle p = ConditionStyle.fromString(value);
+		if (p == null) {
+			return ConditionStyle.INSIDE;
+		}
+		return p;
+	}
+
+	public double minClassWidth() {
+		final String value = getValue("minclasswidth");
+		if (value != null && value.matches("\\d+")) {
+			return Integer.parseInt(value);
+		}
+		return 0;
+	}
+
+	public boolean sameClassWidth() {
+		return "true".equals(getValue("sameclasswidth"));
+	}
+
 }

src/net/sourceforge/plantuml/SkinParamBackcolored.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -33,26 +33,30 @@
  */
 package net.sourceforge.plantuml;
 
-import net.sourceforge.plantuml.cucadiagram.dot.DotSplines;
-import net.sourceforge.plantuml.cucadiagram.dot.GraphvizLayoutStrategy;
-import net.sourceforge.plantuml.graphic.HorizontalAlignement;
 import net.sourceforge.plantuml.graphic.HtmlColor;
-import net.sourceforge.plantuml.ugraphic.ColorMapper;
-import net.sourceforge.plantuml.ugraphic.UFont;
 
-public class SkinParamBackcolored implements ISkinParam {
+public class SkinParamBackcolored extends SkinParamDelegator {
 
-	final private ISkinParam skinParam;
 	final private HtmlColor backColorElement;
 	final private HtmlColor backColorGeneral;
+	final private boolean forceClickage;
 
 	public SkinParamBackcolored(ISkinParam skinParam, HtmlColor backColorElement) {
-		this(skinParam, backColorElement, null);
+		this(skinParam, backColorElement, null, false);
 	}
 
-	public SkinParamBackcolored(ISkinParam skinParam,
-			HtmlColor backColorElement, HtmlColor backColorGeneral) {
-		this.skinParam = skinParam;
+	public SkinParamBackcolored(ISkinParam skinParam, HtmlColor backColorElement, boolean forceClickage) {
+		this(skinParam, backColorElement, null, forceClickage);
+	}
+
+	public SkinParamBackcolored(ISkinParam skinParam, HtmlColor backColorElement, HtmlColor backColorGeneral) {
+		this(skinParam, backColorElement, backColorGeneral, false);
+	}
+
+	public SkinParamBackcolored(ISkinParam skinParam, HtmlColor backColorElement, HtmlColor backColorGeneral,
+			boolean forceClickage) {
+		super(skinParam);
+		this.forceClickage = forceClickage;
 		this.backColorElement = backColorElement;
 		this.backColorGeneral = backColorGeneral;
 	}
@@ -61,70 +65,17 @@ public class SkinParamBackcolored implements ISkinParam {
 		if (backColorGeneral != null) {
 			return backColorGeneral;
 		}
-		return skinParam.getBackgroundColor();
+		return super.getBackgroundColor();
 	}
 
-	public int getCircledCharacterRadius() {
-		return skinParam.getCircledCharacterRadius();
-	}
-
-	public UFont getFont(FontParam fontParam, String stereotype) {
-		return skinParam.getFont(fontParam, stereotype);
-	}
-
-	public HtmlColor getFontHtmlColor(FontParam param, String stereotype) {
-		return skinParam.getFontHtmlColor(param, stereotype);
-	}
-
-	public HtmlColor getHtmlColor(ColorParam param, String stereotype) {
+	public HtmlColor getHtmlColor(ColorParam param, String stereotype, boolean clickable) {
 		if (param.isBackground() && backColorElement != null) {
 			return backColorElement;
 		}
-		return skinParam.getHtmlColor(param, stereotype);
-	}
-
-	public String getValue(String key) {
-		return skinParam.getValue(key);
-	}
-
-	public boolean isClassCollapse() {
-		return skinParam.isClassCollapse();
-	}
-
-	public int classAttributeIconSize() {
-		return skinParam.classAttributeIconSize();
-	}
-
-	public int getDpi() {
-		return skinParam.getDpi();
-	}
-
-	public boolean useOctagonForActivity() {
-		return skinParam.useOctagonForActivity();
-	}
-
-	public DotSplines getDotSplines() {
-		return skinParam.getDotSplines();
-	}
-
-	public GraphvizLayoutStrategy getStrategy() {
-		return skinParam.getStrategy();
-	}
-
-	public HorizontalAlignement getHorizontalAlignement(AlignParam param) {
-		return skinParam.getHorizontalAlignement(param);
-	}
-
-	public ColorMapper getColorMapper() {
-		return skinParam.getColorMapper();
-	}
-
-	public boolean isSvek() {
-		return skinParam.isSvek();
-	}
-
-	public boolean shadowing() {
-		return skinParam.shadowing();
+		if (forceClickage) {
+			clickable = true;
+		}
+		return super.getHtmlColor(param, stereotype, clickable);
 	}
 
 }

src/net/sourceforge/plantuml/SkinParamBackcoloredReference.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -33,94 +33,28 @@
  */
 package net.sourceforge.plantuml;
 
-import net.sourceforge.plantuml.cucadiagram.dot.DotSplines;
-import net.sourceforge.plantuml.cucadiagram.dot.GraphvizLayoutStrategy;
-import net.sourceforge.plantuml.graphic.HorizontalAlignement;
 import net.sourceforge.plantuml.graphic.HtmlColor;
-import net.sourceforge.plantuml.ugraphic.ColorMapper;
-import net.sourceforge.plantuml.ugraphic.UFont;
 
-public class SkinParamBackcoloredReference implements ISkinParam {
+public class SkinParamBackcoloredReference extends SkinParamDelegator {
 
-	final private ISkinParam skinParam;
 	final private HtmlColor sequenceReferenceHeaderBackground;
 	final private HtmlColor sequenceReferenceBackground;
 
 	public SkinParamBackcoloredReference(ISkinParam skinParam, HtmlColor sequenceReferenceHeaderBackground,
 			HtmlColor sequenceReferenceBackground) {
-		this.skinParam = skinParam;
+		super(skinParam);
 		this.sequenceReferenceBackground = sequenceReferenceBackground;
 		this.sequenceReferenceHeaderBackground = sequenceReferenceHeaderBackground;
 	}
 
-	public HtmlColor getBackgroundColor() {
-		return skinParam.getBackgroundColor();
-	}
-
-	public int getCircledCharacterRadius() {
-		return skinParam.getCircledCharacterRadius();
-	}
-
-	public UFont getFont(FontParam fontParam, String stereotype) {
-		return skinParam.getFont(fontParam, stereotype);
-	}
-
-	public HtmlColor getFontHtmlColor(FontParam param, String stereotype) {
-		return skinParam.getFontHtmlColor(param, stereotype);
-	}
-
-	public HtmlColor getHtmlColor(ColorParam param, String stereotype) {
+	public HtmlColor getHtmlColor(ColorParam param, String stereotype, boolean clickable) {
 		if (param == ColorParam.sequenceReferenceHeaderBackground && sequenceReferenceHeaderBackground != null) {
 			return sequenceReferenceHeaderBackground;
 		}
 		if (param == ColorParam.sequenceReferenceBackground && sequenceReferenceBackground != null) {
 			return sequenceReferenceBackground;
 		}
-		return skinParam.getHtmlColor(param, stereotype);
-	}
-
-	public String getValue(String key) {
-		return skinParam.getValue(key);
-	}
-
-	public boolean isClassCollapse() {
-		return skinParam.isClassCollapse();
-	}
-
-	public int classAttributeIconSize() {
-		return skinParam.classAttributeIconSize();
-	}
-
-	public int getDpi() {
-		return skinParam.getDpi();
-	}
-
-	public boolean useOctagonForActivity() {
-		return skinParam.useOctagonForActivity();
-	}
-
-	public DotSplines getDotSplines() {
-		return skinParam.getDotSplines();
-	}
-
-	public GraphvizLayoutStrategy getStrategy() {
-		return skinParam.getStrategy();
-	}
-
-	public HorizontalAlignement getHorizontalAlignement(AlignParam param) {
-		return skinParam.getHorizontalAlignement(param);
-	}
-
-	public ColorMapper getColorMapper() {
-		return skinParam.getColorMapper();
-	}
-
-	public boolean isSvek() {
-		return skinParam.isSvek();
-	}
-
-	public boolean shadowing() {
-		return skinParam.shadowing();
+		return super.getHtmlColor(param, stereotype, clickable);
 	}
 
 }

src/net/sourceforge/plantuml/SkinParamDelegator.java

@@ -0,0 +1,167 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2013, Arnaud Roques
+ *
+ * Project Info:  http://plantuml.sourceforge.net
+ * 
+ * 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.
+ *
+ * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
+ * in the United States and other countries.]
+ *
+ * Original Author:  Arnaud Roques
+ *
+ * Revision $Revision: 4246 $
+ *
+ */
+package net.sourceforge.plantuml;
+
+import net.sourceforge.plantuml.cucadiagram.dot.DotSplines;
+import net.sourceforge.plantuml.cucadiagram.dot.GraphvizLayoutStrategy;
+import net.sourceforge.plantuml.graphic.HorizontalAlignment;
+import net.sourceforge.plantuml.graphic.HtmlColor;
+import net.sourceforge.plantuml.svek.ConditionStyle;
+import net.sourceforge.plantuml.svek.PackageStyle;
+import net.sourceforge.plantuml.ugraphic.ColorMapper;
+import net.sourceforge.plantuml.ugraphic.Sprite;
+import net.sourceforge.plantuml.ugraphic.UFont;
+import net.sourceforge.plantuml.ugraphic.UStroke;
+
+public class SkinParamDelegator implements ISkinParam {
+
+	final private ISkinParam skinParam;
+
+	public SkinParamDelegator(ISkinParam skinParam) {
+		this.skinParam = skinParam;
+	}
+
+	public HtmlColor getBackgroundColor() {
+		return skinParam.getBackgroundColor();
+	}
+
+	public int getCircledCharacterRadius() {
+		return skinParam.getCircledCharacterRadius();
+	}
+
+	public UFont getFont(FontParam fontParam, String stereotype) {
+		return skinParam.getFont(fontParam, stereotype);
+	}
+
+	public HtmlColor getFontHtmlColor(FontParam param, String stereotype) {
+		return skinParam.getFontHtmlColor(param, stereotype);
+	}
+
+	public HtmlColor getHtmlColor(ColorParam param, String stereotype, boolean clickable) {
+		return skinParam.getHtmlColor(param, stereotype, clickable);
+	}
+
+	public String getValue(String key) {
+		return skinParam.getValue(key);
+	}
+
+	public int classAttributeIconSize() {
+		return skinParam.classAttributeIconSize();
+	}
+
+	public int getDpi() {
+		return skinParam.getDpi();
+	}
+
+	public DotSplines getDotSplines() {
+		return skinParam.getDotSplines();
+	}
+
+	public GraphvizLayoutStrategy getStrategy() {
+		return skinParam.getStrategy();
+	}
+
+	public HorizontalAlignment getHorizontalAlignment(AlignParam param) {
+		return skinParam.getHorizontalAlignment(param);
+	}
+
+	public ColorMapper getColorMapper() {
+		return skinParam.getColorMapper();
+	}
+
+	public boolean shadowing() {
+		return skinParam.shadowing();
+	}
+
+	public PackageStyle getPackageStyle() {
+		return skinParam.getPackageStyle();
+	}
+
+	public Sprite getSprite(String name) {
+		return skinParam.getSprite(name);
+	}
+
+	public boolean useUml2ForComponent() {
+		return skinParam.useUml2ForComponent();
+	}
+
+	public boolean stereotypePositionTop() {
+		return skinParam.stereotypePositionTop();
+	}
+
+	public boolean useSwimlanes() {
+		return skinParam.useSwimlanes();
+	}
+
+	public double getNodesep() {
+		return skinParam.getNodesep();
+	}
+
+	public double getRanksep() {
+		return skinParam.getRanksep();
+	}
+
+	public double getRoundCorner() {
+		return skinParam.getRoundCorner();
+	}
+
+	public UStroke getThickness(LineParam param) {
+		return skinParam.getThickness(param);
+	}
+
+	public double maxMessageSize() {
+		return skinParam.maxMessageSize();
+	}
+
+	public boolean strictUmlStyle() {
+		return skinParam.strictUmlStyle();
+	}
+
+	public boolean forceSequenceParticipantUnderlined() {
+		return skinParam.forceSequenceParticipantUnderlined();
+	}
+
+	public ConditionStyle getConditionStyle() {
+		return skinParam.getConditionStyle();
+	}
+
+	public double minClassWidth() {
+		return skinParam.minClassWidth();
+	}
+
+	public boolean sameClassWidth() {
+		return skinParam.sameClassWidth();
+	}
+
+}

src/net/sourceforge/plantuml/SkinParamForecolored.java

@@ -0,0 +1,51 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2013, Arnaud Roques
+ *
+ * Project Info:  http://plantuml.sourceforge.net
+ * 
+ * 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.
+ *
+ * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
+ * in the United States and other countries.]
+ *
+ * Original Author:  Arnaud Roques
+ *
+ * Revision $Revision: 4246 $
+ *
+ */
+package net.sourceforge.plantuml;
+
+import net.sourceforge.plantuml.graphic.HtmlColor;
+
+public class SkinParamForecolored extends SkinParamDelegator {
+
+	final private HtmlColor forecolor;
+
+	public SkinParamForecolored(ISkinParam skinParam, HtmlColor forecolor) {
+		super(skinParam);
+		this.forecolor = forecolor;
+	}
+
+	public HtmlColor getHtmlColor(ColorParam param, String stereotype, boolean clickable) {
+		return forecolor;
+	}
+
+}

src/net/sourceforge/plantuml/SkinParamSameClassWidth.java

@@ -0,0 +1,49 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2013, Arnaud Roques
+ *
+ * Project Info:  http://plantuml.sourceforge.net
+ * 
+ * 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.
+ *
+ * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
+ * in the United States and other countries.]
+ *
+ * Original Author:  Arnaud Roques
+ *
+ * Revision $Revision: 4246 $
+ *
+ */
+package net.sourceforge.plantuml;
+
+public class SkinParamSameClassWidth extends SkinParamDelegator {
+
+	final private double width;
+
+	public SkinParamSameClassWidth(ISkinParam skinParam, double width) {
+		super(skinParam);
+		this.width = width;
+	}
+
+	public double minClassWidth() {
+		return width;
+	}
+
+}

src/net/sourceforge/plantuml/SkinParamUtils.java

@@ -0,0 +1,60 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2013, Arnaud Roques
+ *
+ * Project Info:  http://plantuml.sourceforge.net
+ * 
+ * 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.
+ *
+ * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
+ * in the United States and other countries.]
+ *
+ * Original Author:  Arnaud Roques
+ *
+ * Revision $Revision: 9423 $
+ *
+ */
+package net.sourceforge.plantuml;
+
+import net.sourceforge.plantuml.cucadiagram.Stereotype;
+import net.sourceforge.plantuml.graphic.HtmlColor;
+import net.sourceforge.plantuml.skin.rose.Rose;
+import net.sourceforge.plantuml.ugraphic.UFont;
+
+public class SkinParamUtils {
+	
+	private static final Rose rose = new Rose();
+
+	public static UFont getFont(ISkinParam skinParam, FontParam fontParam, Stereotype stereo) {
+		final String s = stereo == null ? null : stereo.getLabel();
+		return skinParam.getFont(fontParam, s);
+	}
+
+	public static HtmlColor getFontColor(ISkinParam skinParam, FontParam fontParam, Stereotype stereo) {
+		final String s = stereo == null ? null : stereo.getLabel();
+		return skinParam.getFontHtmlColor(fontParam, s);
+	}
+
+	public static HtmlColor getColor(ISkinParam skinParam, ColorParam colorParam, Stereotype stereo) {
+		final String s = stereo == null ? null : stereo.getLabel();
+		return rose.getHtmlColor(skinParam, colorParam, s);
+	}
+
+}

src/net/sourceforge/plantuml/SourceFileReader.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -36,8 +36,10 @@ package net.sourceforge.plantuml;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.PrintStream;
 import java.io.Reader;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
@@ -47,6 +49,7 @@ import java.util.Set;
 
 import net.sourceforge.plantuml.code.Transcoder;
 import net.sourceforge.plantuml.code.TranscoderUtil;
+import net.sourceforge.plantuml.core.Diagram;
 import net.sourceforge.plantuml.preproc.Defines;
 
 public class SourceFileReader implements ISourceFileReader {
@@ -61,6 +64,11 @@ public class SourceFileReader implements ISourceFileReader {
 		this(file, file.getAbsoluteFile().getParentFile());
 	}
 
+	public SourceFileReader(File file, File outputDirectory, String charset) throws IOException {
+		this(new Defines(), file, outputDirectory, Collections.<String> emptyList(), charset, new FileFormatOption(
+				FileFormat.PNG));
+	}
+
 	public SourceFileReader(final File file, File outputDirectory) throws IOException {
 		this(new Defines(), file, outputDirectory, Collections.<String> emptyList(), null, new FileFormatOption(
 				FileFormat.PNG));
@@ -82,26 +90,27 @@ public class SourceFileReader implements ISourceFileReader {
 		if (outputDirectory == null) {
 			outputDirectory = file.getAbsoluteFile().getParentFile();
 		} else if (outputDirectory.isAbsolute() == false) {
-			outputDirectory = FileSystem.getInstance().getFile(outputDirectory.getName());
+			outputDirectory = FileSystem.getInstance().getFile(outputDirectory.getPath());
 		}
 		if (outputDirectory.exists() == false) {
 			outputDirectory.mkdirs();
 		}
 		this.outputDirectory = outputDirectory;
 
-		builder = new BlockUmlBuilder(config, defines, getReader(charset), file.getAbsoluteFile().getParentFile());
+		builder = new BlockUmlBuilder(config, charset, defines, getReader(charset), file.getAbsoluteFile()
+				.getParentFile());
 	}
 
 	public boolean hasError() throws IOException, InterruptedException {
 		for (final BlockUml b : builder.getBlockUmls()) {
-			if (b.getSystem() instanceof PSystemError) {
+			if (b.getDiagram() instanceof PSystemError) {
 				return true;
 			}
 		}
 		return false;
 	}
 
-	public List<GeneratedImage> getGeneratedImages() throws IOException, InterruptedException {
+	public List<GeneratedImage> getGeneratedImages() throws IOException {
 		Log.info("Reading file: " + file);
 
 		int cpt = 0;
@@ -117,11 +126,22 @@ public class SourceFileReader implements ISourceFileReader {
 			final File suggested = new File(outputDirectory, newName);
 			suggested.getParentFile().mkdirs();
 
-			final PSystem system = blockUml.getSystem();
+			final Diagram system = blockUml.getDiagram();
+			final List<File> exportDiagrams = PSystemUtils.exportDiagrams(system, suggested, fileFormatOption);
 			OptionFlags.getInstance().logData(file, system);
 
-			for (File f : system.exportDiagrams(suggested, fileFormatOption)) {
+			for (File f : exportDiagrams) {
 				final String desc = "[" + file.getName() + "] " + system.getDescription();
+				if (OptionFlags.getInstance().isWord()) {
+					final String warnOrError = system.getWarningOrError();
+					if (warnOrError != null) {
+						final String name = f.getName().substring(0, f.getName().length() - 4) + ".err";
+						final File errorFile = new File(f.getParentFile(), name);
+						final PrintStream ps = new PrintStream(new FileOutputStream(errorFile));
+						ps.print(warnOrError);
+						ps.close();
+					}
+				}
 				final GeneratedImage generatedImage = new GeneratedImage(f, desc, system);
 				result.add(generatedImage);
 			}
@@ -137,7 +157,7 @@ public class SourceFileReader implements ISourceFileReader {
 		final List<String> result = new ArrayList<String>();
 		final Transcoder transcoder = TranscoderUtil.getDefaultTranscoder();
 		for (BlockUml blockUml : builder.getBlockUmls()) {
-			final String source = blockUml.getSystem().getSource().getPlainString();
+			final String source = blockUml.getDiagram().getSource().getPlainString();
 			final String encoded = transcoder.encode(source);
 			result.add(encoded);
 		}

src/net/sourceforge/plantuml/SourceFileReader2.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -47,6 +47,7 @@ import java.util.Set;
 
 import net.sourceforge.plantuml.code.Transcoder;
 import net.sourceforge.plantuml.code.TranscoderUtil;
+import net.sourceforge.plantuml.core.Diagram;
 import net.sourceforge.plantuml.preproc.Defines;
 
 public class SourceFileReader2 implements ISourceFileReader {
@@ -67,12 +68,12 @@ public class SourceFileReader2 implements ISourceFileReader {
 		}
 		FileSystem.getInstance().setCurrentDir(file.getAbsoluteFile().getParentFile());
 
-		builder = new BlockUmlBuilder(config, defines, getReader(charset), file.getAbsoluteFile().getParentFile());
+		builder = new BlockUmlBuilder(config, charset, defines, getReader(charset), file.getAbsoluteFile().getParentFile());
 	}
 
 	public boolean hasError() throws IOException, InterruptedException {
 		for (final BlockUml b : builder.getBlockUmls()) {
-			if (b.getSystem() instanceof PSystemError) {
+			if (b.getDiagram() instanceof PSystemError) {
 				return true;
 			}
 		}
@@ -87,10 +88,10 @@ public class SourceFileReader2 implements ISourceFileReader {
 		for (BlockUml blockUml : builder.getBlockUmls()) {
 			final File suggested = outputFile;
 
-			final PSystem system = blockUml.getSystem();
+			final Diagram system = blockUml.getDiagram();
 			OptionFlags.getInstance().logData(file, system);
 
-			for (File f : system.exportDiagrams(suggested, fileFormatOption)) {
+			for (File f : PSystemUtils.exportDiagrams(system, suggested, fileFormatOption)) {
 				final String desc = "[" + file.getName() + "] " + system.getDescription();
 				final GeneratedImage generatedImage = new GeneratedImage(f, desc, system);
 				result.add(generatedImage);
@@ -107,7 +108,7 @@ public class SourceFileReader2 implements ISourceFileReader {
 		final List<String> result = new ArrayList<String>();
 		final Transcoder transcoder = TranscoderUtil.getDefaultTranscoder();
 		for (BlockUml blockUml : builder.getBlockUmls()) {
-			final String source = blockUml.getSystem().getSource().getPlainString();
+			final String source = blockUml.getDiagram().getSource().getPlainString();
 			final String encoded = transcoder.encode(source);
 			result.add(encoded);
 		}

src/net/sourceforge/plantuml/SourceStringReader.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -43,6 +43,10 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import net.sourceforge.plantuml.core.Diagram;
+import net.sourceforge.plantuml.core.DiagramDescription;
+import net.sourceforge.plantuml.core.DiagramDescriptionImpl;
+import net.sourceforge.plantuml.core.ImageData;
 import net.sourceforge.plantuml.graphic.GraphicStrings;
 import net.sourceforge.plantuml.preproc.Defines;
 
@@ -54,15 +58,25 @@ public class SourceStringReader {
 		this(new Defines(), source, Collections.<String> emptyList());
 	}
 
-	public SourceStringReader(Defines defines, String source, List<String> config) {
-		try {
-			final BlockUmlBuilder builder = new BlockUmlBuilder(config, defines, new StringReader(source), null);
-			this.blocks = builder.getBlockUmls();
-		} catch (IOException e) {
-			throw new IllegalStateException();
-		}
+	public SourceStringReader(String source, String charset) {
+		this(new Defines(), source, "UTF-8", Collections.<String> emptyList());
 	}
 
+	public SourceStringReader(Defines defines, String source, List<String> config) {
+		this(defines, source, "UTF-8", config);
+	}
+
+	public SourceStringReader(Defines defines, String source, String charset, List<String> config) {
+		try {
+			final BlockUmlBuilder builder = new BlockUmlBuilder(config, charset, defines, new StringReader(source),
+					null);
+			this.blocks = builder.getBlockUmls();
+		} catch (IOException e) {
+			Log.error("error " + e);
+			throw new IllegalStateException(e);
+		}
+	}
+	
 	public String generateImage(OutputStream os) throws IOException {
 		return generateImage(os, 0);
 	}
@@ -85,22 +99,68 @@ public class SourceStringReader {
 	public String generateImage(OutputStream os, int numImage, FileFormatOption fileFormatOption) throws IOException {
 		if (blocks.size() == 0) {
 			final GraphicStrings error = new GraphicStrings(Arrays.asList("No @startuml found"));
-			error.writeImage(os, fileFormatOption);
+			error.writeImage(os, fileFormatOption, null);
 			return null;
 		}
-		try {
-			for (BlockUml b : blocks) {
-				final PSystem system = b.getSystem();
-				final int nbInSystem = system.getNbImages();
-				if (numImage < nbInSystem) {
-					system.exportDiagram(os, null, numImage, fileFormatOption);
-					return system.getDescription();
+		for (BlockUml b : blocks) {
+			final Diagram system = b.getDiagram();
+			final int nbInSystem = system.getNbImages();
+			if (numImage < nbInSystem) {
+				//final CMapData cmap = new CMapData();
+				final ImageData imageData = system.exportDiagram(os, numImage, fileFormatOption);
+				if (imageData.containsCMapData()) {
+					return system.getDescription().getDescription() + "\n" + imageData.getCMapData("plantuml");
 				}
-				numImage -= nbInSystem;
+				return system.getDescription().getDescription();
 			}
-		} catch (InterruptedException e) {
+			numImage -= nbInSystem;
+		}
+		Log.error("numImage is too big = " + numImage);
+		return null;
+
+	}
+
+
+	public DiagramDescription generateDiagramDescription(OutputStream os) throws IOException {
+		return generateDiagramDescription(os, 0);
+	}
+
+	public DiagramDescription generateDiagramDescription(File f) throws IOException {
+		final OutputStream os = new BufferedOutputStream(new FileOutputStream(f));
+		final DiagramDescription result = generateDiagramDescription(os, 0);
+		os.close();
+		return result;
+	}
+
+	public DiagramDescription generateDiagramDescription(OutputStream os, FileFormatOption fileFormatOption) throws IOException {
+		return generateDiagramDescription(os, 0, fileFormatOption);
+	}
+
+	public DiagramDescription generateDiagramDescription(OutputStream os, int numImage) throws IOException {
+		return generateDiagramDescription(os, numImage, new FileFormatOption(FileFormat.PNG));
+	}
+
+	public DiagramDescription generateDiagramDescription(OutputStream os, int numImage, FileFormatOption fileFormatOption)
+			throws IOException {
+		if (blocks.size() == 0) {
+			final GraphicStrings error = new GraphicStrings(Arrays.asList("No @startuml found"));
+			error.writeImage(os, fileFormatOption, null);
 			return null;
 		}
+		for (BlockUml b : blocks) {
+			final Diagram system = b.getDiagram();
+			final int nbInSystem = system.getNbImages();
+			if (numImage < nbInSystem) {
+				// final CMapData cmap = new CMapData();
+				final ImageData imageData = system.exportDiagram(os, numImage, fileFormatOption);
+				if (imageData.containsCMapData()) {
+					return ((DiagramDescriptionImpl) system.getDescription()).withCMapData(imageData
+							.getCMapData("plantuml"));
+				}
+				return system.getDescription();
+			}
+			numImage -= nbInSystem;
+		}
 		Log.error("numImage is too big = " + numImage);
 		return null;
 

src/net/sourceforge/plantuml/SpecificBackcolorable.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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

src/net/sourceforge/plantuml/SpriteContainer.java

@@ -0,0 +1,42 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2013, Arnaud Roques
+ *
+ * Project Info:  http://plantuml.sourceforge.net
+ * 
+ * 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.
+ *
+ * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
+ * in the United States and other countries.]
+ *
+ * Original Author:  Arnaud Roques
+ *
+ * Revision $Revision: 4236 $
+ *
+ */
+package net.sourceforge.plantuml;
+
+import net.sourceforge.plantuml.ugraphic.Sprite;
+
+public interface SpriteContainer {
+
+	public Sprite getSprite(String name);
+
+}

src/net/sourceforge/plantuml/SpriteContainerEmpty.java

@@ -0,0 +1,44 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2013, Arnaud Roques
+ *
+ * Project Info:  http://plantuml.sourceforge.net
+ * 
+ * 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.
+ *
+ * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
+ * in the United States and other countries.]
+ *
+ * Original Author:  Arnaud Roques
+ *
+ * Revision $Revision: 4236 $
+ *
+ */
+package net.sourceforge.plantuml;
+
+import net.sourceforge.plantuml.ugraphic.Sprite;
+
+public class SpriteContainerEmpty implements SpriteContainer {
+
+	public Sprite getSprite(String name) {
+		return null;
+	}
+
+}

src/net/sourceforge/plantuml/StartUtils.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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

src/net/sourceforge/plantuml/StringUtils.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -28,7 +28,7 @@
  *
  * Original Author:  Arnaud Roques
  *
- * Revision $Revision: 7064 $
+ * Revision $Revision: 11949 $
  *
  */
 package net.sourceforge.plantuml;
@@ -44,8 +44,13 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import net.sourceforge.plantuml.cucadiagram.Code;
+import net.sourceforge.plantuml.cucadiagram.Display;
+import net.sourceforge.plantuml.graphic.HtmlColor;
+import net.sourceforge.plantuml.graphic.HtmlColorTransparent;
 import net.sourceforge.plantuml.preproc.ReadLineReader;
 import net.sourceforge.plantuml.preproc.UncommentReadLine;
+import net.sourceforge.plantuml.ugraphic.ColorMapper;
 
 public class StringUtils {
 
@@ -53,15 +58,19 @@ public class StringUtils {
 		return file.getAbsolutePath();
 	}
 
-	public static List<String> getWithNewlines(String s) {
+	public static List<String> getWithNewlines2(Code s) {
+		return getWithNewlines2(s.getCode());
+	}
+
+	public static List<String> getWithNewlines2(String s) {
 		if (s == null) {
-			throw new IllegalArgumentException();
+			return null;
 		}
 		final List<String> result = new ArrayList<String>();
 		final StringBuilder current = new StringBuilder();
 		for (int i = 0; i < s.length(); i++) {
 			final char c = s.charAt(i);
-			if (c == '\\' && i < s.length() + 1) {
+			if (c == '\\' && i < s.length() - 1) {
 				final char c2 = s.charAt(i + 1);
 				i++;
 				if (c2 == 'n') {
@@ -122,11 +131,52 @@ public class StringUtils {
 		return s;
 	}
 
+	public static String unicode(String s) {
+		final StringBuilder result = new StringBuilder();
+		for (char c : s.toCharArray()) {
+			if (c > 127 || c == '&' || c == '|') {
+				final int i = c;
+				result.append("&#" + i + ";");
+			} else {
+				result.append(c);
+			}
+		}
+		return result.toString();
+	}
+
+	public static String unicodeForHtml(String s) {
+		final StringBuilder result = new StringBuilder();
+		for (char c : s.toCharArray()) {
+			if (c > 127 || c == '&' || c == '|' || c == '<' || c == '>') {
+				final int i = c;
+				result.append("&#" + i + ";");
+			} else {
+				result.append(c);
+			}
+		}
+		return result.toString();
+	}
+
+	public static String unicodeForHtml(Display display) {
+		final StringBuilder result = new StringBuilder();
+		for (int i = 0; i < display.size(); i++) {
+			result.append(unicodeForHtml(display.get(i).toString()));
+			if (i < display.size() - 1) {
+				result.append("<br>");
+			}
+		}
+		return result.toString();
+	}
+
 	public static String manageArrowForSequence(String s) {
-		s = s.replace('=', '-');
+		s = s.replace('=', '-').toLowerCase();
 		return s;
 	}
 
+	public static String capitalize(String s) {
+		return s.substring(0, 1).toUpperCase() + s.substring(1).toLowerCase();
+	}
+
 	public static String manageArrowForCuca(String s) {
 		final Direction dir = getArrowDirection(s);
 		s = s.replace('=', '-');
@@ -201,6 +251,10 @@ public class StringUtils {
 		return Direction.DOWN;
 	}
 
+	// public static Code eventuallyRemoveStartingAndEndingDoubleQuote(Code s) {
+	// return Code.of(eventuallyRemoveStartingAndEndingDoubleQuote(s.getCode()));
+	// }
+
 	public static String eventuallyRemoveStartingAndEndingDoubleQuote(String s) {
 		if (s.startsWith("\"") && s.endsWith("\"")) {
 			return s.substring(1, s.length() - 1);
@@ -219,7 +273,7 @@ public class StringUtils {
 
 	public static boolean isCJK(char c) {
 		final Character.UnicodeBlock block = Character.UnicodeBlock.of(c);
-		System.err.println(block);
+		Log.println("block=" + block);
 		return false;
 	}
 
@@ -230,7 +284,7 @@ public class StringUtils {
 	public static char hiddenBiggerThan() {
 		return '\u0006';
 	}
-	
+
 	public static String hideComparatorCharacters(String s) {
 		s = s.replace('<', hiddenLesserThan());
 		s = s.replace('>', hiddenBiggerThan());
@@ -253,10 +307,33 @@ public class StringUtils {
 		return result;
 	}
 
+	public static int getWidth(Display stringsToDisplay) {
+		int result = 1;
+		for (CharSequence s : stringsToDisplay) {
+			if (result < s.length()) {
+				result = s.length();
+			}
+		}
+		return result;
+	}
+
 	public static int getHeight(List<? extends CharSequence> stringsToDisplay) {
 		return stringsToDisplay.size();
 	}
 
+	public static int getHeight(Display stringsToDisplay) {
+		return stringsToDisplay.size();
+	}
+
+	private static void removeFirstColumn(List<String> data) {
+		for (int i = 0; i < data.size(); i++) {
+			final String s = data.get(i);
+			if (s.length() > 0) {
+				data.set(i, s.substring(1));
+			}
+		}
+	}
+
 	private static boolean firstColumnRemovable(List<String> data) {
 		boolean allEmpty = true;
 		for (String s : data) {
@@ -272,15 +349,6 @@ public class StringUtils {
 		return allEmpty == false;
 	}
 
-	private static void removeFirstColumn(List<String> data) {
-		for (int i = 0; i < data.size(); i++) {
-			final String s = data.get(i);
-			if (s.length() > 0) {
-				data.set(i, s.substring(1));
-			}
-		}
-	}
-
 	public static List<String> removeEmptyColumns(List<String> data) {
 		if (firstColumnRemovable(data) == false) {
 			return data;
@@ -289,7 +357,7 @@ public class StringUtils {
 		do {
 			removeFirstColumn(result);
 		} while (firstColumnRemovable(result));
-		return Collections.unmodifiableList(result);
+		return result;
 	}
 
 	public static void trim(List<String> data, boolean removeEmptyLines) {
@@ -330,6 +398,9 @@ public class StringUtils {
 		if (uml.startsWith("@startuml\nversion\n")) {
 			return false;
 		}
+		if (uml.startsWith("@startuml\ncheckversion")) {
+			return false;
+		}
 		if (uml.startsWith("@startuml\ntestdot\n")) {
 			return false;
 		}
@@ -352,27 +423,59 @@ public class StringUtils {
 		}
 		return Collections.unmodifiableList(result);
 	}
-	
+
 	public static String getAsHtml(Color color) {
 		if (color == null) {
 			throw new IllegalArgumentException();
 		}
 		return getAsHtml(color.getRGB());
 	}
-	
+
+	public static String getAsSvg(ColorMapper mapper, HtmlColor color) {
+		if (color == null) {
+			return "none";
+		}
+		if (color instanceof HtmlColorTransparent) {
+			return "#FFFFFF";
+		}
+		return getAsHtml(mapper.getMappedColor(color));
+	}
+
 	public static String getAsHtml(int color) {
 		final int v = 0xFFFFFF & color;
 		String s = "000000" + Integer.toHexString(v).toUpperCase();
 		s = s.substring(s.length() - 6);
 		return "#" + s;
 	}
-	
+
 	public static String getUid(String uid1, int uid2) {
 		return uid1 + String.format("%04d", uid2);
 	}
-	
-	
-	public static List<CharSequence> manageEmbededDiagrams(final List<String> strings) {
+
+	public static Display manageEmbededDiagrams(final Display strings) {
+		Display result = new Display();
+		final Iterator<CharSequence> it = strings.iterator();
+		while (it.hasNext()) {
+			CharSequence s = it.next();
+			if (s.equals("{{")) {
+				Display other = new Display();
+				other = other.add("@startuml");
+				while (it.hasNext()) {
+					final CharSequence s2 = it.next();
+					if (s2.equals("}}")) {
+						break;
+					}
+					other = other.add(s2);
+				}
+				other = other.add("@enduml");
+				s = new EmbededDiagram(other);
+			}
+			result = result.add(s);
+		}
+		return result;
+	}
+
+	public static List<CharSequence> manageEmbededDiagrams2(final List<String> strings) {
 		final List<CharSequence> result = new ArrayList<CharSequence>();
 		final Iterator<String> it = strings.iterator();
 		while (it.hasNext()) {
@@ -381,20 +484,28 @@ public class StringUtils {
 				final List<String> other = new ArrayList<String>();
 				other.add("@startuml");
 				while (it.hasNext()) {
-					String s2 = it.next();
+					final String s2 = it.next();
 					if (s2.equals("}}")) {
 						break;
 					}
 					other.add(s2);
 				}
 				other.add("@enduml");
-				s = new EmbededDiagram(other);
+				s = new EmbededDiagram(new Display(other));
 			}
 			result.add(s);
 		}
 		return result;
 	}
 
+	public static boolean isMethod(String s) {
+		return s.contains("(") || s.contains(")");
+	}
 
+	public static <O> List<O> merge(List<O> l1, List<O> l2) {
+		final List<O> result = new ArrayList<O>(l1);
+		result.addAll(l2);
+		return Collections.unmodifiableList(result);
+	}
 
 }

src/net/sourceforge/plantuml/UmlDiagram.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -28,13 +28,18 @@
  *
  * Original Author:  Arnaud Roques
  *
- * Revision $Revision: 7173 $
+ * Revision $Revision: 11873 $
  *
  */
 package net.sourceforge.plantuml;
 
+import java.awt.Font;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Dimension2D;
 import java.awt.image.BufferedImage;
 import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -42,46 +47,54 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Hashtable;
 import java.util.List;
 
-import net.sourceforge.plantuml.code.Compression;
-import net.sourceforge.plantuml.code.CompressionZlib;
-import net.sourceforge.plantuml.graphic.HorizontalAlignement;
+import javax.imageio.ImageIO;
+
+import net.sourceforge.plantuml.api.ImageDataSimple;
+import net.sourceforge.plantuml.core.Diagram;
+import net.sourceforge.plantuml.core.ImageData;
+import net.sourceforge.plantuml.cucadiagram.Display;
+import net.sourceforge.plantuml.cucadiagram.UnparsableGraphvizException;
+import net.sourceforge.plantuml.flashcode.FlashCodeFactory;
+import net.sourceforge.plantuml.flashcode.FlashCodeUtils;
+import net.sourceforge.plantuml.graphic.GraphicStrings;
+import net.sourceforge.plantuml.graphic.HorizontalAlignment;
+import net.sourceforge.plantuml.graphic.HtmlColorUtils;
+import net.sourceforge.plantuml.graphic.QuoteUtils;
+import net.sourceforge.plantuml.mjpeg.MJPEGGenerator;
 import net.sourceforge.plantuml.pdf.PdfConverter;
+import net.sourceforge.plantuml.svek.EmptySvgException;
+import net.sourceforge.plantuml.ugraphic.Sprite;
+import net.sourceforge.plantuml.ugraphic.UAntiAliasing;
+import net.sourceforge.plantuml.ugraphic.UFont;
+import net.sourceforge.plantuml.version.Version;
 
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.EncodeHintType;
-import com.google.zxing.WriterException;
-import com.google.zxing.client.j2se.MatrixToImageWriter;
-import com.google.zxing.common.BitMatrix;
-import com.google.zxing.qrcode.QRCodeWriter;
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
-
-public abstract class UmlDiagram extends AbstractPSystem implements PSystem {
+public abstract class UmlDiagram extends AbstractPSystem implements Diagram {
 
 	private boolean rotation;
 	private boolean hideUnlinkedData;
 
 	private int minwidth = Integer.MAX_VALUE;
 
-	private List<? extends CharSequence> title;
-	private List<String> header;
-	private List<String> footer;
-	private HorizontalAlignement headerAlignement = HorizontalAlignement.RIGHT;
-	private HorizontalAlignement footerAlignement = HorizontalAlignement.CENTER;
+	private Display title;
+	private Display header;
+	private Display footer;
+	private Display legend = null;
+	private HorizontalAlignment legendAlignment = HorizontalAlignment.CENTER;
+
+	private HorizontalAlignment headerAlignment = HorizontalAlignment.RIGHT;
+	private HorizontalAlignment footerAlignment = HorizontalAlignment.CENTER;
 	private final Pragma pragma = new Pragma();
 	private Scale scale;
 
 	private final SkinParam skinParam = new SkinParam(getUmlDiagramType());
 
-	final public void setTitle(List<? extends CharSequence> strings) {
+	final public void setTitle(Display strings) {
 		this.title = strings;
 	}
 
-	final public List<? extends CharSequence> getTitle() {
+	final public Display getTitle() {
 		return title;
 	}
 
@@ -109,36 +122,36 @@ public abstract class UmlDiagram extends AbstractPSystem implements PSystem {
 		skinParam.setParam(key.toLowerCase(), value);
 	}
 
-	public final List<String> getHeader() {
+	public final Display getHeader() {
 		return header;
 	}
 
-	public final void setHeader(List<String> header) {
+	public final void setHeader(Display header) {
 		this.header = header;
 	}
 
-	public final List<String> getFooter() {
+	public final Display getFooter() {
 		return footer;
 	}
 
-	public final void setFooter(List<String> footer) {
+	public final void setFooter(Display footer) {
 		this.footer = footer;
 	}
 
-	public final HorizontalAlignement getHeaderAlignement() {
-		return headerAlignement;
+	public final HorizontalAlignment getHeaderAlignment() {
+		return headerAlignment;
 	}
 
-	public final void setHeaderAlignement(HorizontalAlignement headerAlignement) {
-		this.headerAlignement = headerAlignement;
+	public final void setHeaderAlignment(HorizontalAlignment headerAlignment) {
+		this.headerAlignment = headerAlignment;
 	}
 
-	public final HorizontalAlignement getFooterAlignement() {
-		return footerAlignement;
+	public final HorizontalAlignment getFooterAlignment() {
+		return footerAlignment;
 	}
 
-	public final void setFooterAlignement(HorizontalAlignement footerAlignement) {
-		this.footerAlignement = footerAlignement;
+	public final void setFooterAlignment(HorizontalAlignment footerAlignment) {
+		this.footerAlignment = footerAlignment;
 	}
 
 	abstract public UmlDiagramType getUmlDiagramType();
@@ -174,55 +187,137 @@ public abstract class UmlDiagram extends AbstractPSystem implements PSystem {
 		this.hideUnlinkedData = hideUnlinkedData;
 	}
 
-	final public void exportDiagram(OutputStream os, StringBuilder cmap, int index, FileFormatOption fileFormatOption)
+	final public ImageData exportDiagram(OutputStream os, int index, FileFormatOption fileFormatOption)
 			throws IOException {
+
 		List<BufferedImage> flashcodes = null;
 		try {
 			if ("split".equalsIgnoreCase(getSkinParam().getValue("flashcode"))
 					&& fileFormatOption.getFileFormat() == FileFormat.PNG) {
 				final String s = getSource().getPlainString();
-				flashcodes = exportSplitCompress(s);
+				flashcodes = getFlashCodeUtils().exportSplitCompress(s);
 			} else if ("compress".equalsIgnoreCase(getSkinParam().getValue("flashcode"))
 					&& fileFormatOption.getFileFormat() == FileFormat.PNG) {
 				final String s = getSource().getPlainString();
-				flashcodes = exportFlashcodeCompress(s);
+				flashcodes = getFlashCodeUtils().exportFlashcodeCompress(s);
 			} else if (getSkinParam().getValue("flashcode") != null
 					&& fileFormatOption.getFileFormat() == FileFormat.PNG) {
 				final String s = getSource().getPlainString();
-				flashcodes = exportFlashcodeSimple(s);
+				flashcodes = getFlashCodeUtils().exportFlashcodeSimple(s);
 			}
-		} catch (WriterException e) {
+		} catch (IOException e) {
 			Log.error("Cannot generate flashcode");
 			e.printStackTrace();
 			flashcodes = null;
 		}
 		if (fileFormatOption.getFileFormat() == FileFormat.PDF) {
-			exportDiagramInternalPdf(os, cmap, index, flashcodes);
-			return;
+			return exportDiagramInternalPdf(os, index, flashcodes);
 		}
-		exportDiagramInternal(os, cmap, index, fileFormatOption, flashcodes);
+		if (fileFormatOption.getFileFormat() == FileFormat.MJPEG) {
+			// exportDiagramInternalMjpeg(os);
+			// return;*
+			throw new UnsupportedOperationException();
+		}
+		try {
+			final ImageData imageData = exportDiagramInternal(os, index, fileFormatOption, flashcodes);
+			this.lastInfo = new Dimension2DDouble(imageData.getWidth(), imageData.getHeight());
+			return imageData;
+		} catch (UnparsableGraphvizException e) {
+			e.printStackTrace();
+			exportDiagramError(os, e.getCause(), fileFormatOption, e.getGraphvizVersion(), e.getDebugData());
+		} catch (Exception e) {
+			e.printStackTrace();
+			exportDiagramError(os, e, fileFormatOption, null, null);
+		}
+		return new ImageDataSimple();
+
 	}
 
-	private void exportDiagramInternalPdf(OutputStream os, StringBuilder cmap, int index, List<BufferedImage> flashcodes)
+	private void exportDiagramError(OutputStream os, Throwable exception, FileFormatOption fileFormat,
+			String graphvizVersion, String svg) throws IOException {
+		final UFont font = new UFont("SansSerif", Font.PLAIN, 12);
+		final List<String> strings = new ArrayList<String>();
+		strings.add("An error has occured : " + exception);
+		final String quote = QuoteUtils.getSomeQuote();
+		strings.add("<i>" + quote);
+		strings.add(" ");
+		strings.add("PlantUML (" + Version.versionString() + ") cannot parse result from dot/GraphViz.");
+		if (exception instanceof EmptySvgException) {
+			strings.add("Because dot/GraphViz returns an empty string.");
+		}
+		if (graphvizVersion != null) {
+			strings.add(" ");
+			strings.add("GraphViz version used : " + graphvizVersion);
+		}
+		strings.add(" ");
+		strings.add("This may be caused by :");
+		strings.add(" - a bug in PlantUML");
+		strings.add(" - a problem in GraphViz");
+		strings.add(" ");
+		strings.add("You should send this diagram and this image to <b>plantuml@gmail.com</b> to solve this issue.");
+		strings.add("You can try to turn arround this issue by simplifing your diagram.");
+		strings.add(" ");
+		strings.add(exception.toString());
+		for (StackTraceElement ste : exception.getStackTrace()) {
+			strings.add("  " + ste.toString());
+
+		}
+		final GraphicStrings graphicStrings = new GraphicStrings(strings, font, HtmlColorUtils.BLACK,
+				HtmlColorUtils.WHITE, UAntiAliasing.ANTI_ALIASING_ON);
+		graphicStrings.writeImage(os, fileFormat, svg);
+	}
+
+	private FlashCodeUtils getFlashCodeUtils() {
+		return FlashCodeFactory.getFlashCodeUtils();
+	}
+
+	private void exportDiagramInternalMjpeg(OutputStream os) throws IOException {
+		final File f = new File("c:/test.avi");
+		final int nb = 150;
+		final double framerate = 30;
+		final MJPEGGenerator m = new MJPEGGenerator(f, 640, 480, framerate, nb);
+
+		for (int i = 0; i < nb; i++) {
+			final AffineTransform at = new AffineTransform();
+			final double coef = (nb - 1 - i) * 1.0 / nb;
+			at.setToShear(coef, coef);
+			final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+			// exportDiagramTOxxBEREMOVED(baos, null, 0, new FileFormatOption(FileFormat.PNG, at));
+			baos.close();
+			final BufferedImage im = ImageIO.read(new ByteArrayInputStream(baos.toByteArray()));
+			m.addImage(im);
+		}
+		m.finishAVI();
+
+	}
+
+	private Dimension2D lastInfo;
+
+	private ImageData exportDiagramInternalPdf(OutputStream os, int index, List<BufferedImage> flashcodes)
 			throws IOException {
 		final File svg = FileUtils.createTempFile("pdf", ".svf");
 		final File pdfFile = FileUtils.createTempFile("pdf", ".pdf");
 		final OutputStream fos = new BufferedOutputStream(new FileOutputStream(svg));
-		exportDiagram(fos, cmap, index, new FileFormatOption(FileFormat.SVG));
+		final ImageData result = exportDiagram(fos, index, new FileFormatOption(FileFormat.SVG));
 		fos.close();
 		PdfConverter.convert(svg, pdfFile);
 		FileUtils.copyToStream(pdfFile, os);
+		return result;
 	}
 
-	protected abstract void exportDiagramInternal(OutputStream os, StringBuilder cmap, int index,
-			FileFormatOption fileFormatOption, List<BufferedImage> flashcodes) throws IOException;
+	protected abstract ImageData exportDiagramInternal(OutputStream os, int index, FileFormatOption fileFormatOption,
+			List<BufferedImage> flashcodes) throws IOException;
 
-	final protected void exportCmap(File suggestedFile, final StringBuilder cmap) throws FileNotFoundException {
-		final File cmapFile = new File(changeName(suggestedFile.getAbsolutePath()));
+	final protected void exportCmap(File suggestedFile, final ImageData cmapdata) throws FileNotFoundException {
+		final String name = changeName(suggestedFile.getAbsolutePath());
+		final File cmapFile = new File(name);
 		PrintWriter pw = null;
 		try {
+			if (PSystemUtils.canFileBeWritten(cmapFile) == false) {
+				return;
+			}
 			pw = new PrintWriter(cmapFile);
-			pw.print(cmap.toString());
+			pw.print(cmapdata.getCMapData(cmapFile.getName().substring(0, cmapFile.getName().length() - 6)));
 			pw.close();
 		} finally {
 			if (pw != null) {
@@ -235,83 +330,43 @@ public abstract class UmlDiagram extends AbstractPSystem implements PSystem {
 		return name.replaceAll("(?i)\\.\\w{3}$", ".cmapx");
 	}
 
-	private List<BufferedImage> exportFlashcodeSimple(String s) throws IOException, WriterException {
-		final QRCodeWriter writer = new QRCodeWriter();
-		final int multiple = 1;
-		final Hashtable hints = new Hashtable();
-		hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H);
-		final BitMatrix bit = writer.encode(s, BarcodeFormat.QR_CODE, multiple);
-		final BufferedImage im = MatrixToImageWriter.toBufferedImage(bit);
-		return Arrays.asList(im);
-	}
-
-	private List<BufferedImage> exportFlashcodeCompress(String s) throws IOException, WriterException {
-		final QRCodeWriter writer = new QRCodeWriter();
-		final int multiple = 1;
-		final Hashtable hints = new Hashtable();
-		hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H);
-
-		final Compression comp = new CompressionZlib();
-		final byte data[] = comp.compress(s.getBytes("UTF-8"));
-
-		// Encoder.DEFAULT_BYTE_MODE_ENCODING
-		final BitMatrix bit = writer.encode(new String(data, "ISO-8859-1"), BarcodeFormat.QR_CODE, multiple);
-		final BufferedImage im = MatrixToImageWriter.toBufferedImage(bit);
-		return Arrays.asList(im);
-	}
-
-	private List<BufferedImage> exportSplitCompress(String s) throws IOException, WriterException {
-		final QRCodeWriter writer = new QRCodeWriter();
-		final int multiple = 1;
-		final Hashtable hints = new Hashtable();
-		hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H);
-
-		final Compression comp = new CompressionZlib();
-		final byte data[] = comp.compress(s.getBytes("UTF-8"));
-
-		final List<BufferedImage> result = new ArrayList<BufferedImage>();
-
-		final List<byte[]> blocs = new ArrayList<byte[]>();
-		for (int i = 0; i < 4; i++) {
-			blocs.add(getSplited(data, i, 4));
+	@Override
+	public String getWarningOrError() {
+		if (lastInfo == null) {
+			return null;
 		}
-
-		blocs.add(xor(blocs));
-
-		for (byte d[] : blocs) {
-			// Encoder.DEFAULT_BYTE_MODE_ENCODING
-			final BitMatrix bit = writer.encode(new String(d, "ISO-8859-1"), BarcodeFormat.QR_CODE, multiple);
-			result.add(MatrixToImageWriter.toBufferedImage(bit));
+		final double actualWidth = lastInfo.getWidth();
+		if (actualWidth == 0) {
+			return null;
 		}
-
-		return Collections.unmodifiableList(result);
+		final String value = getSkinParam().getValue("widthwarning");
+		if (value == null) {
+			return null;
+		}
+		if (value.matches("\\d+") == false) {
+			return null;
+		}
+		final int widthwarning = Integer.parseInt(value);
+		if (actualWidth > widthwarning) {
+			return "The image is " + ((int) actualWidth) + " pixel width. (Warning limit is " + widthwarning + ")";
+		}
+		return null;
 	}
 
-	static byte[] xor(List<byte[]> blocs) {
-		final byte result[] = new byte[blocs.get(0).length];
-		for (int i = 0; i < result.length; i++) {
-			result[i] = xor(blocs, i);
-		}
-		return result;
+	public void addSprite(String name, Sprite sprite) {
+		skinParam.addSprite(name, sprite);
 	}
 
-	static byte xor(List<byte[]> blocs, int nb) {
-		byte result = 0;
-		for (byte[] bloc : blocs) {
-			result = (byte) (result ^ bloc[nb]);
-		}
-		return result;
+	public final Display getLegend() {
+		return legend;
 	}
 
-	static byte[] getSplited(byte[] data, int n, int total) {
-		final int size = (data.length + total - 1) / total;
-		assert size * total >= data.length;
-		final byte result[] = new byte[size + 1];
-		result[0] = (byte) (1 << n);
-		for (int i = 0; (i < size) && (n * total + i < data.length); i++) {
-			result[i + 1] = data[n * total + i];
-		}
-		return result;
+	public final HorizontalAlignment getLegendAlignment() {
+		return legendAlignment;
 	}
 
+	public final void setLegend(Display legend, HorizontalAlignment horizontalAlignment) {
+		this.legend = legend;
+		this.legendAlignment = horizontalAlignment;
+	}
 }

src/net/sourceforge/plantuml/UmlDiagramType.java

@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009, Arnaud Roques
+ * (C) Copyright 2009-2013, Arnaud Roques
  *
  * Project Info:  http://plantuml.sourceforge.net
  * 
@@ -15,7 +15,7 @@
  *
  * 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 Lesser General Public
+ * 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
@@ -28,11 +28,11 @@
  *
  * Original Author:  Arnaud Roques
  * 
- * Revision $Revision: 4539 $
+ * Revision $Revision: 9786 $
  *
  */
 package net.sourceforge.plantuml;
 
 public enum UmlDiagramType {
-	SEQUENCE, STATE, CLASS, OBJECT, ACTIVITY, USECASE, COMPONENT, COMPOSITE
+	SEQUENCE, STATE, CLASS, OBJECT, ACTIVITY, DESCRIPTION, COMPOSITE, FLOW
 }