wip

src/gen/lib/dotgen/dotsplines__c.java

@@ -1014,22 +1014,22 @@ try {
 	    points.get__(7).y = tp.y;
 	}
 	else {   /* up */
-UNSUPPORTED("7owdudualx55z2cnm9x3iio0w"); // 	    points[0] = tp;
+	    points.get__(0).___(tp);
-UNSUPPORTED("43w0zont6q3y1axlcy96rzm5x"); // 	    points[1].x = uminx;
+	    points.get__(1).x = uminx;
-UNSUPPORTED("285u4l65puy5nr3pgq6acl4i2"); // 	    points[1].y = tp.y;
+	    points.get__(1).y = tp.y;
-UNSUPPORTED("uctdrwzmec4w6vmirs9on197"); // 	    points[2].x = uminx;
+	    points.get__(2).x = uminx;
-UNSUPPORTED("d9b8e2upja8koam9memys7nj1"); // 	    points[2].y = maxy;
+	    points.get__(2).y = maxy;
-UNSUPPORTED("e8a8ucdpq7sgmbi3qyldleb1s"); // 	    points[3].x = umaxx;
+	    points.get__(3).x = umaxx;
-UNSUPPORTED("d7xd9vzbdbezltrxsp9a3byuc"); // 	    points[3].y = maxy;
+	    points.get__(3).y = maxy;
-UNSUPPORTED("59abeyxxk9ow1g6m45t4ahih7"); // 	    points[4].x = umaxx;
+	    points.get__(4).x = umaxx;
-UNSUPPORTED("2lzgl5468xguophz9d5wyer2x"); // 	    points[4].y = hp.y;
+	    points.get__(4).y = hp.y;
-UNSUPPORTED("41u0uroraw4xanvpgg6l74kyh"); // 	    points[5].x = hp.x;
+	    points.get__(5).x = hp.x;
-UNSUPPORTED("cwkk5bnko3e1udrx4cb720zss"); // 	    points[5].y = hp.y;
+	    points.get__(5).y = hp.y;
-UNSUPPORTED("eev7hf3617k74bnq18uiedyb0"); // 	    points[6].x = hp.x;
+	    points.get__(6).x = hp.x;
-UNSUPPORTED("aqxt1dvgfq5zcptjwgx1b3mmq"); // 	    points[6].y = maxy + 6;
+	    points.get__(6).y = maxy + 6;
-UNSUPPORTED("5s3o04yf5lzca6ruuygfxngj2"); // 	    points[7].x = tp.x;
+	    points.get__(7).x = tp.x;
-UNSUPPORTED("56zheeat0b8mo4uvlcbvgbu80"); // 	    points[7].y = maxy + 6;
+	    points.get__(7).y = maxy + 6;
-UNSUPPORTED("7un2qk34mmmhqi296vl50bacs"); // 	    maxy += + 6;
+	    maxy += + 6;
 	}
 	poly.pn = 8;
 	poly.ps = points;

src/gen/lib/dotgen/mincross__c.java

@@ -207,7 +207,8 @@ try {
     rv.nrows = i;
     rv.ncols = j;
     // Arnaud 15/09/2022: the j+1 is needed in some case to avoid ArrayIndexOutOfBoundsException
-    rv.data = new int[i][j+1]; // Or maybe new int[j][i] ?
+    // Arnaud 02/03/2023: the j+3 is needed in some case to avoid ArrayIndexOutOfBoundsException
+    rv.data = new int[i][j+3]; // Or maybe new int[j][i] ?
     return rv;
 } finally {
 LEAVING("756bre1tpxb1tq68p7xhkrxkc","new_matrix");

src/net/sourceforge/plantuml/StringUtils.java

@@ -53,6 +53,48 @@ import net.sourceforge.plantuml.utils.Log;
 // Do not move
 public class StringUtils {
 
+	public static String goUpperCase(String s) {
+		// ::comment when __HAXE__
+		return s.toUpperCase(Locale.ENGLISH);
+		// ::done
+		// ::uncomment when __HAXE__
+		// return s.toUpperCase();
+		// ::done
+	}
+
+	public static String eventuallyRemoveStartingAndEndingDoubleQuote(String s, String format) {
+		if (s == null)
+			return null;
+
+		if (format.contains("\"") && s.length() > 1 && isDoubleQuote(s.charAt(0))
+				&& isDoubleQuote(s.charAt(s.length() - 1)))
+			return s.substring(1, s.length() - 1);
+
+		if (format.contains("(") && s.startsWith("(") && s.endsWith(")"))
+			return s.substring(1, s.length() - 1);
+
+		if (format.contains("[") && s.startsWith("[") && s.endsWith("]"))
+			return s.substring(1, s.length() - 1);
+
+		if (format.contains(":") && s.startsWith(":") && s.endsWith(":"))
+			return s.substring(1, s.length() - 1);
+
+		return s;
+	}
+
+	public static String eventuallyRemoveStartingAndEndingDoubleQuote(String s) {
+		if (s == null)
+			return s;
+
+		return eventuallyRemoveStartingAndEndingDoubleQuote(s, "\"([:");
+	}
+
+	private static boolean isDoubleQuote(char c) {
+		return c == '\"' || c == '\u201c' || c == '\u201d' || c == '\u00ab' || c == '\u00bb';
+	}
+
+	// ::comment when __HAXE__
+
 	public static final char USER_NEWLINE = '\uEE00';
 	public static final char USER_TAB = '\uEE01';
 
@@ -108,7 +150,6 @@ public class StringUtils {
 
 	}
 
-	// ::comment when __HAXE__
 	final static public List<String> getSplit(Pattern2 pattern, String line) {
 		final Matcher2 m = pattern.matcher(line);
 		if (m.find() == false)
@@ -120,7 +161,6 @@ public class StringUtils {
 
 		return result;
 	}
-	// ::done
 
 	public static boolean isNotEmpty(CharSequence s) {
 		return !isEmpty(s);
@@ -175,7 +215,6 @@ public class StringUtils {
 		return result.toString();
 	}
 
-	// ::comment when __HAXE__
 	public static String unicodeForHtml(Display display) {
 		final StringBuilder result = new StringBuilder();
 		for (int i = 0; i < display.size(); i++) {
@@ -186,7 +225,6 @@ public class StringUtils {
 		}
 		return result.toString();
 	}
-	// ::done
 
 	public static String manageArrowForSequence(String s) {
 		s = s.replace('=', '-').toLowerCase();
@@ -197,10 +235,6 @@ public class StringUtils {
 		return s.substring(0, 1).toUpperCase() + s.substring(1).toLowerCase();
 	}
 
-	public static String goUpperCase(String s) {
-		return s.toUpperCase(Locale.ENGLISH);
-	}
-
 	public static char goUpperCase(char c) {
 		return goUpperCase("" + c).charAt(0);
 	}
@@ -291,44 +325,11 @@ public class StringUtils {
 	// return Code.of(eventuallyRemoveStartingAndEndingDoubleQuote(s.getCode()));
 	// }
 
-	public static String eventuallyRemoveStartingAndEndingDoubleQuote(String s, String format) {
-		if (s == null)
-			return null;
-
-		if (format.contains("\"") && s.length() > 1 && isDoubleQuote(s.charAt(0))
-				&& isDoubleQuote(s.charAt(s.length() - 1)))
-			return s.substring(1, s.length() - 1);
-
-		if (format.contains("(") && s.startsWith("(") && s.endsWith(")"))
-			return s.substring(1, s.length() - 1);
-
-		if (format.contains("[") && s.startsWith("[") && s.endsWith("]"))
-			return s.substring(1, s.length() - 1);
-
-		if (format.contains(":") && s.startsWith(":") && s.endsWith(":"))
-			return s.substring(1, s.length() - 1);
-
-		return s;
-	}
-
-	public static String eventuallyRemoveStartingAndEndingDoubleQuote(String s) {
-		if (s == null)
-			return s;
-
-		return eventuallyRemoveStartingAndEndingDoubleQuote(s, "\"([:");
-	}
-
-	private static boolean isDoubleQuote(char c) {
-		return c == '\"' || c == '\u201c' || c == '\u201d' || c == '\u00ab' || c == '\u00bb';
-	}
-
-	// ::comment when __HAXE__
 	public static boolean isCJK(char c) {
 		final Character.UnicodeBlock block = Character.UnicodeBlock.of(c);
 		Log.println("block=" + block);
 		return false;
 	}
-	// ::done
 
 	public static char hiddenLesserThan() {
 		return '\u0005';
@@ -359,31 +360,13 @@ public class StringUtils {
 //		return result;
 //	}
 
-	// ::comment when __CORE__ or __HAXE__
-	public static int getWcWidth(Display stringsToDisplay) {
-		int result = 1;
-		for (CharSequence s : stringsToDisplay) {
-			if (s == null)
-				continue;
-
-			final int length = Wcwidth.length(s);
-			if (result < length)
-				result = length;
-
-		}
-		return result;
-	}
-	// ::done
-
 	public static int getHeight(List<? extends CharSequence> stringsToDisplay) {
 		return stringsToDisplay.size();
 	}
 
-	// ::comment when __HAXE__
 	public static int getHeight(Display stringsToDisplay) {
 		return stringsToDisplay.size();
 	}
-	// ::done
 
 	public static boolean isDiagramCacheable(String uml) {
 		if (uml.length() < 35)
@@ -437,7 +420,6 @@ public class StringUtils {
 		return Integer.parseInt(uml.substring(x1, x2));
 	}
 
-	// ::comment when __HAXE__
 	public static List<String> splitComma(String s) {
 		s = trin(s);
 		final List<String> result = new ArrayList<>();
@@ -448,7 +430,6 @@ public class StringUtils {
 
 		return Collections.unmodifiableList(result);
 	}
-	// ::done
 
 	public static String getUid(String uid1, int uid2) {
 		return uid1 + String.format("%04d", uid2);
@@ -573,6 +554,23 @@ public class StringUtils {
 		s = s.substring(s.length() - 6);
 		return "#" + s;
 	}
+	// ::done
+
+	// ::comment when __CORE__ or __HAXE__
+	public static int getWcWidth(Display stringsToDisplay) {
+		int result = 1;
+		for (CharSequence s : stringsToDisplay) {
+			if (s == null)
+				continue;
+
+			final int length = Wcwidth.length(s);
+			if (result < length)
+				result = length;
+
+		}
+		return result;
+	}
+	// ::done
 
 	// http://docs.oracle.com/javase/tutorial/i18n/format/dateFormat.html
 }

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

@@ -66,7 +66,7 @@ public class CollisionDetector extends UGraphicNo {
 	private final Context context;
 
 	private static CollisionDetector create(StringBounder stringBounder) {
-		return new CollisionDetector(stringBounder, new UTranslate(), new Context());
+		return new CollisionDetector(stringBounder, UTranslate.none(), new Context());
 	}
 
 	private CollisionDetector(StringBounder stringBounder, UTranslate translate, Context context) {

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

@@ -97,6 +97,7 @@ public class FtileGeometry extends XDimension2D {
 	}
 
 	public FtileGeometry(double width, double height, double left, double inY, double outY) {
+		super(width, height);
 		this.left = left;
 		this.inY = inY;
 		this.outY = outY;

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

@@ -98,7 +98,7 @@ public class FtileMargedRight extends AbstractFtile {
 	@Override
 	public UTranslate getTranslateFor(Ftile child, StringBounder stringBounder) {
 		if (child == tile)
-			return new UTranslate();
+			return UTranslate.none();
 		return super.getTranslateFor(child, stringBounder);
 	}
 

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

@@ -76,7 +76,7 @@ public class Genealogy {
 
 	public UTranslate getTranslate(Ftile child, StringBounder stringBounder) {
 		Ftile current = child;
-		UTranslate result = new UTranslate();
+		UTranslate result = UTranslate.none();
 		while (current != root) {
 			final Ftile father = getMyFather(current);
 			final UTranslate tr = father.getTranslateFor(current, stringBounder);

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

@@ -239,7 +239,7 @@ public class Snake implements UShape {
 		for (Text text : texts)
 			if (text.hasText(ug.getStringBounder())) {
 				final XPoint2D position = getTextBlockPosition(ug.getStringBounder(), text);
-				text.textBlock.drawU(ug.apply(new UTranslate(position)));
+				text.textBlock.drawU(ug.apply(UTranslate.point(position)));
 			}
 	}
 
@@ -290,7 +290,7 @@ public class Snake implements UShape {
 			final XPoint2D pt1 = worm.get(i);
 			final XPoint2D pt2 = worm.get(i + 1);
 			if (pt1.getY() == pt2.getY()) {
-				final XLine2D line = new XLine2D(pt1, pt2);
+				final XLine2D line = XLine2D.line(pt1, pt2);
 				result.add(line);
 			}
 		}

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

@@ -51,7 +51,7 @@ public class Swimlane implements SpecificBackcolorable, Comparable<Swimlane> {
 	private final int order;
 	private Display display;
 
-	private UTranslate translate = new UTranslate();
+	private UTranslate translate = UTranslate.none();
 	private double actualWidth;
 
 	public Swimlane(String name, int order) {

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

@@ -99,7 +99,7 @@ public class UGraphicInterceptorUDrawable2 extends UGraphicDelegator {
 		final FtileGeometry geom = ftile.calculateDimension(getStringBounder());
 		final XPoint2D pt = geom.getPointIn();
 		UGraphic ugGoto = getUg().apply(gotoColor).apply(gotoColor.bg());
-		ugGoto = ugGoto.apply(new UTranslate(pt));
+		ugGoto = ugGoto.apply(UTranslate.point(pt));
 		final UTranslate posNow = getPosition();
 		final UTranslate dest = positions.get(ftile.getName());
 		if (dest == null)

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

@@ -106,7 +106,7 @@ public class Worm implements Iterable<XPoint2D> {
 		for (int i = 0; i < points.size() - 1; i++) {
 			final XPoint2D p1 = points.get(i);
 			final XPoint2D p2 = points.get(i + 1);
-			final XLine2D line = new XLine2D(p1, p2);
+			final XLine2D line = XLine2D.line(p1, p2);
 			if (drawn == false && emphasizeDirection != null && Direction.fromVector(p1, p2) == emphasizeDirection) {
 				drawLine(ug, line, emphasizeDirection);
 				drawn = true;
@@ -131,7 +131,7 @@ public class Worm implements Iterable<XPoint2D> {
 			if (ignoreForCompression)
 				startDecoration.setCompressionMode(CompressionMode.ON_X);
 
-			ug.apply(new UTranslate(start)).apply(UStroke.simple()).draw(startDecoration);
+			ug.apply(UTranslate.point(start)).apply(UStroke.simple()).draw(startDecoration);
 		}
 		if (endDecoration != null) {
 			ug = ug.apply(UStroke.withThickness(1.5));
@@ -139,7 +139,7 @@ public class Worm implements Iterable<XPoint2D> {
 			if (ignoreForCompression)
 				endDecoration.setCompressionMode(CompressionMode.ON_X);
 
-			ug.apply(new UTranslate(end)).apply(UStroke.simple()).draw(endDecoration);
+			ug.apply(UTranslate.point(end)).apply(UStroke.simple()).draw(endDecoration);
 		}
 	}
 

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

@@ -51,7 +51,7 @@ import net.sourceforge.plantuml.style.Style;
 import net.sourceforge.plantuml.utils.Direction;
 
 public class WormTexted implements Iterable<XPoint2D> {
-    // ::remove folder when __HAXE__
+	// ::remove folder when __HAXE__
 
 	private final Worm worm;
 	private TextBlock textBlock;
@@ -138,7 +138,7 @@ public class WormTexted implements Iterable<XPoint2D> {
 	void drawInternalLabel(UGraphic ug) {
 		if (textBlock != null) {
 			final XPoint2D position = getTextBlockPosition(ug.getStringBounder());
-			textBlock.drawU(ug.apply(new UTranslate(position)));
+			textBlock.drawU(ug.apply(UTranslate.point(position)));
 		}
 	}
 

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

@@ -63,7 +63,7 @@ public class ZadBuilder extends UGraphicNo {
 	}
 
 	public ZadBuilder(StringBounder stringBounder) {
-		super(stringBounder, new UTranslate());
+		super(stringBounder, UTranslate.none());
 		this.context = new Context();
 	}
 

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

@@ -169,7 +169,7 @@ public class FtileWithNoteOpale extends AbstractFtile implements Stencil, Stylea
 	@Override
 	public UTranslate getTranslateFor(Ftile child, StringBounder stringBounder) {
 		if (child == tile)
-			return new UTranslate();
+			return UTranslate.none();
 		return super.getTranslateFor(child, stringBounder);
 
 	}

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

@@ -130,7 +130,7 @@ public abstract class FtileDecorate extends AbstractTextBlock implements Ftile {
 	@Override
 	public UTranslate getTranslateFor(Ftile child, StringBounder stringBounder) {
 		if (child == ftile)
-			return new UTranslate();
+			return UTranslate.none();
 
 		return ftile.getTranslateFor(child, stringBounder);
 	}

src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileColumns.java

@@ -103,7 +103,7 @@ public class GtileColumns extends AbstractGtile {
 		for (int i = 0; i < gtiles.size(); i++) {
 			final XDimension2D dim = gtiles.get(i).calculateDimension(stringBounder);
 			final UTranslate pos = getPosition(i);
-			final XDimension2D corner = pos.getTranslated(dim);
+			final XDimension2D corner = dim.applyTranslate(pos);
 			result = MathUtils.max(result, corner);
 		}
 		return result;

src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileHexagonInsideLabelled.java

@@ -102,10 +102,10 @@ public class GtileHexagonInsideLabelled extends GtileWithMargin {
 	public XDimension2D calculateDimension(StringBounder stringBounder) {
 		final XDimension2D tmp = super.calculateDimension(stringBounder);
 		final UTranslate south = getCoord(GPoint.SOUTH_HOOK);
-		final XDimension2D southCorner = south.getTranslated(southLabel.calculateDimension(stringBounder));
+		final XDimension2D southCorner = southLabel.calculateDimension(stringBounder).applyTranslate(south);
 
 		final UTranslate east = getCoord(GPoint.EAST_HOOK);
-		final XDimension2D eastCorner = east.getTranslated(eastLabel.calculateDimension(stringBounder));
+		final XDimension2D eastCorner = eastLabel.calculateDimension(stringBounder).applyTranslate(east);
 
 		return MathUtils.max(tmp, southCorner, eastCorner);
 	}

src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileTopDown.java

@@ -79,7 +79,7 @@ public class GtileTopDown extends AbstractGtile {
 	}
 
 	protected UTranslate supplementaryMove() {
-		return new UTranslate();
+		return UTranslate.none();
 	}
 
 	@Override
@@ -116,8 +116,8 @@ public class GtileTopDown extends AbstractGtile {
 
 	@Override
 	public XDimension2D calculateDimension(StringBounder stringBounder) {
-		final XDimension2D corner1 = getPos1().getTranslated(dim1);
+		final XDimension2D corner1 = dim1.applyTranslate(getPos1());
-		final XDimension2D corner2 = getPos2().getTranslated(dim2);
+		final XDimension2D corner2 = dim2.applyTranslate(getPos2());
 		return MathUtils.max(corner1, corner2);
 	}
 

src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileTopDown3.java

@@ -118,9 +118,9 @@ public class GtileTopDown3 extends AbstractGtile {
 
 	@Override
 	public XDimension2D calculateDimension(StringBounder stringBounder) {
-		final XDimension2D corner1 = getPos1().getTranslated(dim1);
+		final XDimension2D corner1 = dim1.applyTranslate(getPos1());
-		final XDimension2D corner2 = getPos2().getTranslated(dim2);
+		final XDimension2D corner2 = dim2.applyTranslate(getPos2());
-		final XDimension2D corner3 = getPos3().getTranslated(dim3);
+		final XDimension2D corner3 = dim3.applyTranslate(getPos3());
 		return MathUtils.max(corner1, corner2, corner3);
 	}
 

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

@@ -170,7 +170,7 @@ public class GridArray implements UDrawable {
 	private void drawArrow(UGraphic ug, XPoint2D pt1, XPoint2D pt2) {
 		ug = ug.apply(HColors.BLUE);
 		final ULine line = new ULine(pt2.getX() - pt1.getX(), pt2.getY() - pt1.getY());
-		ug.apply(new UTranslate(pt1)).draw(line);
+		ug.apply(UTranslate.point(pt1)).draw(line);
 	}
 
 	private XPoint2D getCenterOf(StringBounder stringBounder, int c, int l) {

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

@@ -231,7 +231,9 @@ public class BodierLikeClassOrObject implements Bodier {
 
 		if (type == LeafType.OBJECT) {
 			if (showFields == false)
-				return new TextBlockLineBefore(style.value(PName.LineThickness).asDouble(), TextBlockUtils.empty(0, 0));
+				// return new TextBlockLineBefore(style.value(PName.LineThickness).asDouble(),
+				// TextBlockUtils.empty(0, 0));
+				return TextBlockUtils.empty(0, 0);
 
 			return BodyFactory.create1(skinParam.getDefaultTextAlignment(HorizontalAlignment.LEFT),
 					rawBodyWithoutHidden(), skinParam, stereotype, leaf, style);

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

@@ -133,17 +133,6 @@ public class BodyEnhanced1 extends BodyEnhancedAbstract implements TextBlock, Wi
 		Display display = null;
 		for (ListIterator<CharSequence> it = rawBody2.iterator(); it.hasNext();) {
 			final CharSequence cs = it.next();
-//			if (cs instanceof EmbeddedDiagram) {
-//				if (display == null)
-//					display = Display.empty();
-//				if (display.size() > 0 || separator != 0) {
-//					blocks.add(buildTextBlock(display, separator, title, stringBounder));
-//					separator = 0;
-//					title = null;
-//					display = null;
-//				}
-//				blocks.add(TextBlockUtils.withMargin(((EmbeddedDiagram) cs).asDraw(), 2, 2));
-//			} else {
 			final String s = cs.toString();
 			if (isBlockSeparator(s)) {
 				if (display == null)

src/net/sourceforge/plantuml/decoration/symbol/USymbolFolder.java

@@ -202,7 +202,7 @@ public class USymbolFolder extends USymbol {
 							return new UTranslate(0, htitle * how);
 						}
 
-						return new UTranslate();
+						return UTranslate.none();
 					}
 				};
 

src/net/sourceforge/plantuml/dot/Neighborhood.java

@@ -112,7 +112,7 @@ public class Neighborhood {
 		poly.addPoint(7, 20);
 		poly.addPoint(-7, 20);
 		poly.rotate(theta);
-		final UTranslate translate = new UTranslate(contact);
+		final UTranslate translate = UTranslate.point(contact);
 		ug.apply(translate).draw(poly);
 		final XPoint2D p1 = translate.getTranslated(poly.getPoints().get(1));
 		final XPoint2D p2 = translate.getTranslated(poly.getPoints().get(2));

src/net/sourceforge/plantuml/eggs/PSystemColors.java

@@ -147,7 +147,7 @@ public class PSystemColors extends PlainDiagram implements UDrawable {
 	private void drawOneHexa(UGraphic ug, String colorName, int i, int j, UPolygon hexa) {
 		final HColor color = colors.getColorOrWhite(colorName);
 		ug = applyColor(ug, color);
-		ug = ug.apply(new UTranslate(centerHexa(i, j)));
+		ug = ug.apply(UTranslate.point(centerHexa(i, j)));
 		ug.draw(hexa);
 
 		final UFont font = UFont.sansSerif(14).bold();

src/net/sourceforge/plantuml/elk/CucaDiagramFileMakerElk.java

@@ -277,7 +277,7 @@ public class CucaDiagramFileMakerElk implements CucaDiagramFileMaker {
 					zstereo, rectangleArea, stroke);
 
 			final HColor borderColor = HColors.BLACK;
-			decoration.drawU(ug.apply(new UTranslate(corner)), backColor, borderColor, shadowing, roundCorner,
+			decoration.drawU(ug.apply(UTranslate.point(corner)), backColor, borderColor, shadowing, roundCorner,
 					skinParam.getHorizontalAlignment(AlignmentParam.packageTitleAlignment, null, false, null),
 					skinParam.getStereotypeAlignment(), 0);
 
@@ -305,7 +305,7 @@ public class CucaDiagramFileMakerElk implements CucaDiagramFileMaker {
 			final XPoint2D corner = getPosition(elkNode);
 
 			// Print the node image at right coord
-			image.drawU(ug.apply(new UTranslate(corner)));
+			image.drawU(ug.apply(UTranslate.point(corner)));
 		}
 
 		private void drawSingleEdge(UGraphic ug, Link link, ElkEdge edge) {
@@ -322,7 +322,7 @@ public class CucaDiagramFileMakerElk implements CucaDiagramFileMaker {
 			}
 			final ElkPath elkPath = new ElkPath(diagram, SName.classDiagram, link, edge, getLabel(link),
 					getQuantifier(link, 1), getQuantifier(link, 2), magicY2);
-			elkPath.drawU(ug.apply(new UTranslate(translate)));
+			elkPath.drawU(ug.apply(UTranslate.point(translate)));
 		}
 
 		public XDimension2D calculateDimension(StringBounder stringBounder) {

src/net/sourceforge/plantuml/elk/ElkPath.java

@@ -173,13 +173,13 @@ public class ElkPath implements UDrawable {
 	private UDrawable getDecors(LinkDecor decors, double angle, HColor backColor) {
 		// For legacy reason, extends are treated differently
 		if (decors == LinkDecor.EXTENDS)
-			return new ExtremityFactoryExtends(backColor).createUDrawable(new XPoint2D(), angle, null);
+			return new ExtremityFactoryExtends(backColor).createUDrawable(new XPoint2D(0, 0), angle, null);
 
 		final ExtremityFactory extremityFactory = decors.getExtremityFactory(backColor);
 		if (extremityFactory == null)
 			return null;
 
-		return extremityFactory.createUDrawable(new XPoint2D(), angle, null);
+		return extremityFactory.createUDrawable(new XPoint2D(0, 0), angle, null);
 	}
 
 	private void drawLabels(UGraphic ug) {

src/net/sourceforge/plantuml/jsondiagram/JsonCurve.java

@@ -112,7 +112,7 @@ public class JsonCurve {
 
 	public void drawSpot(UGraphic ug) {
 		final double size = 3;
-		ug = ug.apply(new UTranslate(getVeryFirst()).compose(new UTranslate(-size, -size)));
+		ug = ug.apply(UTranslate.point(getVeryFirst()).compose(new UTranslate(-size, -size)));
 		ug.apply(UStroke.simple()).draw(new UEllipse(2 * size, 2 * size));
 	}
 

src/net/sourceforge/plantuml/klimt/AffineTransformType.java

@@ -40,6 +40,7 @@ import java.awt.image.AffineTransformOp;
 public enum AffineTransformType {
 	TYPE_NEAREST_NEIGHBOR, TYPE_BILINEAR;
 
+	// ::comment when __HAXE__
 	public int toLegacyInt() {
 		switch (this) {
 		case TYPE_BILINEAR:
@@ -49,5 +50,6 @@ public enum AffineTransformType {
 		}
 		throw new AssertionError();
 	}
+	// ::done
 
 }

src/net/sourceforge/plantuml/klimt/UMotif.java

@@ -57,7 +57,7 @@ public class UMotif {
 	}
 
 	public UMotif(String s) {
-		XPoint2D last = new XPoint2D();
+		XPoint2D last = new XPoint2D(0, 0);
 		for (int i = 0; i < s.length(); i++) {
 			final XPoint2D read = convertPoint(s.charAt(i));
 			last = last.move(read);

src/net/sourceforge/plantuml/klimt/UTranslate.java

@@ -40,8 +40,6 @@ import net.sourceforge.plantuml.klimt.geom.XPoint2D;
 import net.sourceforge.plantuml.klimt.geom.XRectangle2D;
 
 public class UTranslate implements UChange {
-	// ::remove file when __HAXE__
-
 	private final double dx;
 	private final double dy;
 
@@ -67,12 +65,8 @@ public class UTranslate implements UChange {
 		return new UTranslate(0, dy);
 	}
 
-	public UTranslate(XPoint2D p) {
+	public static UTranslate point(XPoint2D p) {
-		this(p.getX(), p.getY());
+		return new UTranslate(p.getX(), p.getY());
-	}
-
-	public UTranslate() {
-		this(0, 0);
 	}
 
 	public double getDx() {
@@ -94,10 +88,6 @@ public class UTranslate implements UChange {
 		return new XPoint2D(p.getX() + dx, p.getY() + dy);
 	}
 
-	public XDimension2D getTranslated(XDimension2D dim) {
-		return new XDimension2D(dim.getWidth() + dx, dim.getHeight() + dy);
-	}
-
 	public UTranslate scaled(double scale) {
 		return new UTranslate(dx * scale, dy * scale);
 	}

src/net/sourceforge/plantuml/klimt/compress/SlotFinder.java

@@ -71,7 +71,7 @@ public class SlotFinder extends UGraphicNo {
 	private final CompressionMode mode;
 
 	public static SlotFinder create(CompressionMode mode, StringBounder stringBounder) {
-		return new SlotFinder(stringBounder, new UTranslate(), new SlotSet(), mode);
+		return new SlotFinder(stringBounder, UTranslate.none(), new SlotSet(), mode);
 	}
 
 	private SlotFinder(StringBounder stringBounder, UTranslate translate, SlotSet slot, CompressionMode mode) {

src/net/sourceforge/plantuml/klimt/compress/UGraphicCompressOnXorY.java

@@ -71,7 +71,7 @@ public class UGraphicCompressOnXorY extends UGraphicDelegator {
 
 	public static UGraphicCompressOnXorY create(CompressionMode mode, UGraphic ug,
 			PiecewiseAffineTransform compressionTransform) {
-		return new UGraphicCompressOnXorY(mode, ug, compressionTransform, new UTranslate());
+		return new UGraphicCompressOnXorY(mode, ug, compressionTransform, UTranslate.none());
 	}
 
 	private UGraphicCompressOnXorY(CompressionMode mode, UGraphic ug, PiecewiseAffineTransform compressionTransform,

src/net/sourceforge/plantuml/klimt/drawing/AbstractCommonUGraphic.java

@@ -64,7 +64,7 @@ public abstract class AbstractCommonUGraphic implements UGraphic {
 	private boolean enlargeClip = false;
 
 	private final StringBounder stringBounder;
-	private UTranslate translate = new UTranslate();
+	private UTranslate translate = UTranslate.none();
 
 	private final ColorMapper colorMapper;
 	private UClip clip;

src/net/sourceforge/plantuml/klimt/drawing/AbstractUGraphicHorizontalLine.java

@@ -43,7 +43,7 @@ import net.sourceforge.plantuml.klimt.shape.UHorizontalLine;
 
 public abstract class AbstractUGraphicHorizontalLine extends UGraphicDelegator {
 
-	private UTranslate translate = new UTranslate();
+	private UTranslate translate = UTranslate.none();
 
 	public UGraphic apply(UChange change) {
 		final AbstractUGraphicHorizontalLine result;

src/net/sourceforge/plantuml/klimt/drawing/LimitFinder.java

@@ -87,7 +87,7 @@ public final class LimitFinder extends UGraphicNo {
 	private UClip clip;
 
 	public static LimitFinder create(StringBounder stringBounder, boolean initToZero) {
-		final LimitFinder result = new LimitFinder(stringBounder, new UTranslate(), MinMaxMutable.getEmpty(initToZero));
+		final LimitFinder result = new LimitFinder(stringBounder, UTranslate.none(), MinMaxMutable.getEmpty(initToZero));
 		result.clip = null;
 		return result;
 	}

src/net/sourceforge/plantuml/klimt/drawing/TextLimitFinder.java

@@ -62,7 +62,7 @@ public class TextLimitFinder extends UGraphicNo {
 	}
 
 	public static TextLimitFinder create(StringBounder stringBounder, boolean initToZero) {
-		return new TextLimitFinder(stringBounder, new UTranslate(), MinMaxMutable.getEmpty(initToZero));
+		return new TextLimitFinder(stringBounder, UTranslate.none(), MinMaxMutable.getEmpty(initToZero));
 	}
 
 	private TextLimitFinder(StringBounder stringBounder, UTranslate translate, MinMaxMutable minmax) {

src/net/sourceforge/plantuml/klimt/drawing/hand/UPathHand.java

@@ -51,7 +51,7 @@ public class UPathHand {
 
 		final UPath result = new UPath();
 
-		XPoint2D last = new XPoint2D();
+		XPoint2D last = new XPoint2D(0, 0);
 
 		for (USegment segment : source) {
 			final USegmentType type = segment.getSegmentType();

src/net/sourceforge/plantuml/klimt/font/FontConfiguration.java

@@ -52,6 +52,7 @@ import net.sourceforge.plantuml.style.PName;
 import net.sourceforge.plantuml.style.Style;
 
 public class FontConfiguration {
+	// ::remove file when __HAXE__
 
 	private final EnumSet<FontStyle> styles;
 	private final UFont currentFont;
@@ -237,7 +238,7 @@ public class FontConfiguration {
 
 	public FontConfiguration changeFamily(String family) {
 		return new FontConfiguration(styles, motherFont, motherColor,
-				new UFont(family, currentFont.getStyle(), currentFont.getSize()), currentColor, extendedColor,
+				UFont.build(family, currentFont.getStyle(), currentFont.getSize()), currentColor, extendedColor,
 				fontPosition, svgAttributes, hyperlinkColor, hyperlinkUnderlineStroke, tabSize);
 	}
 

src/net/sourceforge/plantuml/klimt/font/FontParam.java

@@ -42,6 +42,8 @@ import net.sourceforge.plantuml.style.ISkinParam;
 import net.sourceforge.plantuml.style.SName;
 import net.sourceforge.plantuml.style.StyleSignatureBasic;
 
+// ::remove file when __HAXE__
+
 interface FontParamConstant {
 	String FAMILY = "SansSerif";
 	String COLOR = "black";

src/net/sourceforge/plantuml/klimt/font/FontPosition.java

@@ -48,6 +48,8 @@ public enum FontPosition {
 		return 0;
 	}
 
+	// ::comment when __HAXE__
+
 	public UFont mute(UFont font) {
 		if (this == NORMAL)
 			return font;
@@ -68,5 +70,6 @@ public enum FontPosition {
 
 		throw new UnsupportedOperationException();
 	}
+	// ::done
 
 }

src/net/sourceforge/plantuml/klimt/font/FontStyle.java

@@ -44,6 +44,7 @@ import net.sourceforge.plantuml.regex.Matcher2;
 import net.sourceforge.plantuml.regex.MyPattern;
 
 public enum FontStyle {
+	// :: remove file when __HAXE__
 	PLAIN, ITALIC, BOLD, UNDERLINE, STRIKE, WAVE, BACKCOLOR;
 
 	public UFont mutateFont(UFont font) {

src/net/sourceforge/plantuml/klimt/font/StringBounder.java

@@ -38,11 +38,12 @@ package net.sourceforge.plantuml.klimt.font;
 import net.sourceforge.plantuml.klimt.geom.XDimension2D;
 
 public interface StringBounder {
-    // ::remove folder when __HAXE__
 
+	// ::comment when __HAXE__
 	public XDimension2D calculateDimension(UFont font, String text);
 
 	public double getDescent(UFont font, String text);
+	// ::done
 
 	public boolean matchesProperty(String propertyName);
 

src/net/sourceforge/plantuml/klimt/font/StringBounderRaw.java

@@ -43,6 +43,7 @@ import net.sourceforge.plantuml.text.RichText;
 import net.sourceforge.plantuml.text.StyledString;
 
 public abstract class StringBounderRaw implements StringBounder {
+	// ::remove file when __HAXE__
 
 	private final FontRenderContext frc;
 

src/net/sourceforge/plantuml/klimt/font/UFont.java

@@ -41,13 +41,13 @@ import java.util.HashSet;
 import java.util.Set;
 
 import net.sourceforge.plantuml.StringUtils;
-import net.sourceforge.plantuml.font.Roboto;
 
 public class UFont {
 
 	private final Font font;
 	private final String family;
 
+	// ::comment when __HAXE__
 	private static final Set<String> names = new HashSet<>();
 
 	static {
@@ -58,8 +58,8 @@ public class UFont {
 //		}
 		for (String name : GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames())
 			names.add(name.toLowerCase());
-
 	}
+	// ::done
 
 	public String toStringDebug() {
 		final StringBuilder sb = new StringBuilder();
@@ -69,8 +69,13 @@ public class UFont {
 		return sb.toString();
 	}
 
-	public UFont(String fontFamily, int fontStyle, int fontSize) {
+	public static UFont build(String fontFamily, int fontStyle, int fontSize) {
-		this(buildFont(fontFamily, fontStyle, fontSize), fontFamily);
+		return new UFont(buildFont(fontFamily, fontStyle, fontSize), fontFamily);
+	}
+
+	private UFont(Font font, String family) {
+		this.font = font;
+		this.family = family;
 	}
 
 	private static Font buildFont(String fontFamily, int fontStyle, int fontSize) {
@@ -86,19 +91,24 @@ public class UFont {
 	}
 
 	private static boolean doesFamilyExists(String name) {
+		// ::comment when __HAXE__
 		return names.contains(name.toLowerCase());
+		// ::done
+		// ::uncomment when __HAXE__
+		// return true;
+		// ::done
 	}
 
 	public static UFont serif(int size) {
-		return new UFont("Serif", Font.PLAIN, size);
+		return UFont.build("Serif", Font.PLAIN, size);
 	}
 
 	public static UFont sansSerif(int size) {
-		return new UFont("SansSerif", Font.PLAIN, size);
+		return UFont.build("SansSerif", Font.PLAIN, size);
 	}
 
 	public static UFont courier(int size) {
-		return new UFont("Courier", Font.PLAIN, size);
+		return UFont.build("Courier", Font.PLAIN, size);
 	}
 
 	public static UFont byDefault(int size) {
@@ -110,12 +120,7 @@ public class UFont {
 	}
 
 	public static UFont monospaced(int size) {
-		return new UFont("Monospaced", Font.PLAIN, size);
+		return UFont.build("Monospaced", Font.PLAIN, size);
-	}
-
-	private UFont(Font font, String family) {
-		this.font = font;
-		this.family = family;
 	}
 
 	public final Font getUnderlayingFont(UFontContext context) {
@@ -194,6 +199,8 @@ public class UFont {
 		return font.toString()/* + " " + font.getPSName() */;
 	}
 
+	// ::comment when __HAXE__
+
 	@Override
 	public int hashCode() {
 		return font.hashCode();
@@ -206,5 +213,6 @@ public class UFont {
 
 		return this.font.equals(((UFont) obj).font);
 	}
+	// ::done
 
 }

src/net/sourceforge/plantuml/klimt/font/UFontContext.java

@@ -41,8 +41,10 @@ import net.sourceforge.plantuml.FileFormat;
 import net.sourceforge.plantuml.klimt.shape.UText;
 
 public enum UFontContext {
+
 	EPS, SVG, G2D, TIKZ;
 
+	// ::comment when __HAXE__
 	public TextLayout createTextLayout(UText shape) {
 		return createTextLayout(shape.getFontConfiguration().getFont(), shape.getText());
 	}
@@ -50,5 +52,5 @@ public enum UFontContext {
 	public TextLayout createTextLayout(UFont font, String string) {
 		return new TextLayout(string, font.getUnderlayingFont(this), FileFormat.gg.getFontRenderContext());
 	}
-
+	// ::done
 }

src/net/sourceforge/plantuml/klimt/font/UnusedSpace.java

@@ -44,6 +44,7 @@ import java.util.List;
 import java.util.Map;
 
 public class UnusedSpace {
+	// ::remove file when __HAXE__
 
 	static class Point {
 		final private double x;

src/net/sourceforge/plantuml/klimt/geom/HorizontalAlignment.java

@@ -43,8 +43,6 @@ import net.sourceforge.plantuml.klimt.drawing.UGraphic;
 import net.sourceforge.plantuml.klimt.shape.TextBlock;
 
 public enum HorizontalAlignment {
-	// :: remove file when __HAXE__
-
 	LEFT, CENTER, RIGHT;
 
 	public static HorizontalAlignment fromString(String s) {
@@ -73,6 +71,7 @@ public enum HorizontalAlignment {
 		return result;
 	}
 
+	// ::comment when __HAXE__
 	public String getGraphVizValue() {
 		return toString().substring(0, 1).toLowerCase();
 	}
@@ -89,5 +88,6 @@ public enum HorizontalAlignment {
 		}
 
 	}
+	// ::done
 
 }

src/net/sourceforge/plantuml/klimt/geom/MagneticBorderNone.java

@@ -43,7 +43,7 @@ public class MagneticBorderNone implements MagneticBorder {
 
 	@Override
 	public UTranslate getForceAt(StringBounder stringBounder, XPoint2D position) {
-		return new UTranslate();
+		return UTranslate.none();
 	}
 
 }

src/net/sourceforge/plantuml/klimt/geom/ULayoutGroup.java

@@ -58,7 +58,7 @@ public class ULayoutGroup {
 		for (Map.Entry<TextBlock, XPoint2D> ent : placementStrategy.getPositions(width, height).entrySet()) {
 			final TextBlock block = ent.getKey();
 			final XPoint2D pos = ent.getValue();
-			block.drawU(ug.apply(new UTranslate(pos)));
+			block.drawU(ug.apply(UTranslate.point(pos)));
 		}
 	}
 
@@ -82,7 +82,7 @@ public class ULayoutGroup {
 			final TextBlock block = ent.getKey();
 			final XRectangle2D result = block.getInnerPosition(member, stringBounder, mode);
 			if (result != null) {
-				final UTranslate translate = new UTranslate(ent.getValue());
+				final UTranslate translate = UTranslate.point(ent.getValue());
 				return translate.apply(result);
 			}
 		}

src/net/sourceforge/plantuml/klimt/geom/USegment.java

@@ -35,10 +35,13 @@
  */
 package net.sourceforge.plantuml.klimt.geom;
 
+// ::comment when __HAXE__
 import java.awt.geom.AffineTransform;
+// ::done
 import java.util.Arrays;
 
 public class USegment {
+	// ::remove file when __HAXE__
 
 	private final double coord[];
 	private final USegmentType pathType;
@@ -75,6 +78,7 @@ public class USegment {
 		return new USegment(new double[] { p1.getX(), p1.getY() }, pathType);
 	}
 
+	// ::comment when __HAXE__
 	public USegment rotate(double theta) {
 		if (coord.length != 2)
 			throw new UnsupportedOperationException();
@@ -105,5 +109,6 @@ public class USegment {
 
 		return new USegment(new double[] { p1.getX(), p1.getY() }, pathType);
 	}
+	// ::done
 
 }

src/net/sourceforge/plantuml/klimt/geom/USegmentType.java

@@ -39,6 +39,7 @@ import java.awt.geom.PathIterator;
 import java.util.EnumSet;
 
 public enum USegmentType {
+	// ::remove file when __HAXE__
 
 	SEG_MOVETO(PathIterator.SEG_MOVETO), //
 	SEG_LINETO(PathIterator.SEG_LINETO), //

src/net/sourceforge/plantuml/klimt/geom/XDimension2D.java

@@ -35,8 +35,11 @@
  */
 package net.sourceforge.plantuml.klimt.geom;
 
+// ::comment when __HAXE__
 import java.awt.Dimension;
+// ::done
 
+import net.sourceforge.plantuml.klimt.UTranslate;
 import net.sourceforge.plantuml.utils.MathUtils;
 
 public class XDimension2D {
@@ -44,10 +47,6 @@ public class XDimension2D {
 	final private double width;
 	final private double height;
 
-	public XDimension2D() {
-		this(0, 0);
-	}
-
 	public XDimension2D(double width, double height) {
 		if (Double.isNaN(width) || Double.isNaN(height))
 			throw new IllegalArgumentException();
@@ -77,6 +76,10 @@ public class XDimension2D {
 		return new XDimension2D(newWidth, height);
 	}
 
+	public XDimension2D applyTranslate(UTranslate translate) {
+		return new XDimension2D(width + translate.getDx(), height + translate.getDy());
+	}
+
 	public XDimension2D delta(double deltaWidth, double deltaHeight) {
 		if (deltaHeight == 0 && deltaWidth == 0)
 			return this;
@@ -119,11 +122,11 @@ public class XDimension2D {
 		return new XDimension2D(w, h);
 	}
 
+	// ::comment when __HAXE__
 	public static XDimension2D fromDimension(Dimension dimension) {
 		return new XDimension2D(dimension.getWidth(), dimension.getHeight());
 	}
 
-	// ::comment when __HAXE__
 	public static XDimension2D mergeLayoutT12B3(XDimension2D top1, XDimension2D top2, XDimension2D bottom) {
 		final double width = MathUtils.max(top1.getWidth(), top2.getWidth(), bottom.getWidth());
 		final double height = top1.getHeight() + top2.getHeight() + bottom.getHeight();

src/net/sourceforge/plantuml/klimt/geom/XLine2D.java

@@ -6,17 +6,12 @@ import net.sourceforge.plantuml.klimt.shape.UDrawable;
 import net.sourceforge.plantuml.klimt.shape.ULine;
 
 public class XLine2D implements UDrawable {
-	// :: remove file when __HAXE__
 
 	final public double x1;
 	final public double y1;
 	final public double x2;
 	final public double y2;
 
-	public XLine2D() {
-		this(0, 0, 0, 0);
-	}
-
 	public XLine2D(double x1, double y1, double x2, double y2) {
 		this.x1 = x1;
 		this.y1 = y1;
@@ -24,8 +19,8 @@ public class XLine2D implements UDrawable {
 		this.y2 = y2;
 	}
 
-	public XLine2D(XPoint2D p1, XPoint2D p2) {
+	public static XLine2D line(XPoint2D p1, XPoint2D p2) {
-		this(p1.getX(), p1.getY(), p2.getX(), p2.getY());
+		return new XLine2D(p1.getX(), p1.getY(), p2.getX(), p2.getY());
 	}
 
 	public XPoint2D getMiddle() {
@@ -150,11 +145,13 @@ public class XLine2D implements UDrawable {
 		return null;
 	}
 
+	// ::comment when __HAXE__
 	public void drawU(UGraphic ug) {
 		ug = ug.apply(new UTranslate(x1, y1));
 		final ULine line = new ULine(x2 - x1, y2 - y1);
 		ug.draw(line);
 	}
+	// ::done
 
 	public double getAngle() {
 		return Math.atan2(y2 - y1, x2 - x1);

src/net/sourceforge/plantuml/klimt/geom/XPoint2D.java

@@ -1,17 +1,15 @@
 package net.sourceforge.plantuml.klimt.geom;
 
+// ::comment when __HAXE__
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
+// ::done
 
 public class XPoint2D {
 
 	final public double x;
 	final public double y;
 
-	public XPoint2D() {
-		this(0, 0);
-	}
-
 	@Override
 	public String toString() {
 		return "(" + x + "," + y + ")";
@@ -22,6 +20,7 @@ public class XPoint2D {
 		this.y = y;
 	}
 
+	// ::comment when __HAXE__
 	@Override
 	public boolean equals(Object obj) {
 		final XPoint2D other = (XPoint2D) obj;
@@ -33,6 +32,13 @@ public class XPoint2D {
 		return Double.valueOf(x).hashCode() + Double.valueOf(y).hashCode();
 	}
 
+	public XPoint2D transform(AffineTransform rotate) {
+		final Point2D.Double tmp = new Point2D.Double(x, y);
+		rotate.transform(tmp, tmp);
+		return new XPoint2D(tmp.x, tmp.y);
+	}
+	// ::done
+
 	public final double getX() {
 		return x;
 	}
@@ -69,14 +75,8 @@ public class XPoint2D {
 		return new XPoint2D(x + dx, y + dy);
 	}
 
-	public XPoint2D transform(AffineTransform rotate) {
-		final Point2D.Double tmp = new Point2D.Double(x, y);
-		rotate.transform(tmp, tmp);
-		return new XPoint2D(tmp.x, tmp.y);
-	}
-
 	public XPoint2D move(XPoint2D delta) {
-		return new XPoint2D(delta.x, delta.y);
+		return new XPoint2D(x + delta.x, y + delta.y);
 	}
 
 }

src/net/sourceforge/plantuml/klimt/geom/XRectangle2D.java

@@ -1,7 +1,6 @@
 package net.sourceforge.plantuml.klimt.geom;
 
 public class XRectangle2D {
-	// :: remove file when __HAXE__
 
 	public final double x;
 	public final double y;
@@ -80,10 +79,10 @@ public class XRectangle2D {
 		final XPoint2D b = new XPoint2D(x + width, y);
 		final XPoint2D c = new XPoint2D(x + width, y + height);
 		final XPoint2D d = new XPoint2D(x, y + height);
-		final XLine2D line1 = new XLine2D(a, b);
+		final XLine2D line1 = XLine2D.line(a, b);
-		final XLine2D line2 = new XLine2D(b, c);
+		final XLine2D line2 = XLine2D.line(b, c);
-		final XLine2D line3 = new XLine2D(c, d);
+		final XLine2D line3 = XLine2D.line(c, d);
-		final XLine2D line4 = new XLine2D(d, a);
+		final XLine2D line4 = XLine2D.line(d, a);
 
 		XPoint2D result = line.intersect(line1);
 		if (result != null)

src/net/sourceforge/plantuml/klimt/shape/AbstractTextBlock.java

@@ -44,6 +44,7 @@ import net.sourceforge.plantuml.klimt.geom.MinMax;
 import net.sourceforge.plantuml.klimt.geom.XRectangle2D;
 
 public abstract class AbstractTextBlock implements TextBlock {
+    // ::remove file when __HAXE__
 
 	@Override
 	public XRectangle2D getInnerPosition(String member, StringBounder stringBounder, InnerStrategy strategy) {

src/net/sourceforge/plantuml/klimt/shape/BigFrame.java

@@ -46,6 +46,8 @@ import net.sourceforge.plantuml.klimt.font.StringBounder;
 import net.sourceforge.plantuml.klimt.geom.XDimension2D;
 
 public class BigFrame extends AbstractTextBlock {
+    // ::remove file when __HAXE__
+	
 	private final TextBlock title;
 	private final double width;
 	private final double height;

src/net/sourceforge/plantuml/klimt/shape/CircledCharacter.java

@@ -43,6 +43,7 @@ import net.sourceforge.plantuml.klimt.font.UFont;
 import net.sourceforge.plantuml.klimt.geom.XDimension2D;
 
 public class CircledCharacter extends AbstractTextBlock implements TextBlock {
+    // ::remove file when __HAXE__
 
 	private final String c;
 	private final UFont font;

src/net/sourceforge/plantuml/klimt/shape/DotPath.java

@@ -62,6 +62,7 @@ import net.sourceforge.plantuml.klimt.geom.XCubicCurve2D;
 import net.sourceforge.plantuml.klimt.geom.XPoint2D;
 
 public class DotPath implements UShape, Moveable {
+    // ::remove file when __HAXE__
 
 	public static class TriPoints {
 		public TriPoints(XPoint2D p1, XPoint2D p2, XPoint2D p) {

src/net/sourceforge/plantuml/klimt/shape/GraphicStrings.java

@@ -59,6 +59,7 @@ import net.sourceforge.plantuml.svek.Margins;
 import net.sourceforge.plantuml.svek.ShapeType;
 
 public class GraphicStrings extends AbstractTextBlock implements IEntityImage {
+    // ::remove file when __HAXE__
 
 	private final double margin = 5;
 

src/net/sourceforge/plantuml/klimt/shape/SimpleTextBlockBordered.java

@@ -42,6 +42,7 @@ import net.sourceforge.plantuml.klimt.font.StringBounder;
 import net.sourceforge.plantuml.klimt.geom.XDimension2D;
 
 class SimpleTextBlockBordered extends AbstractTextBlock implements TextBlock {
+    // ::remove file when __HAXE__
 
 	private final TextBlock textBlock;
 	private final HColor color;

src/net/sourceforge/plantuml/klimt/shape/SingleLine.java

@@ -56,6 +56,7 @@ import net.sourceforge.plantuml.klimt.sprite.SpriteContainer;
 import net.sourceforge.plantuml.url.Url;
 
 public class SingleLine extends AbstractTextBlock implements Line {
+    // ::remove file when __HAXE__
 
 	private final List<TextBlock> blocs = new ArrayList<>();
 	private final HorizontalAlignment horizontalAlignment;

src/net/sourceforge/plantuml/klimt/shape/TextBlock.java

@@ -48,6 +48,7 @@ public interface TextBlock extends UDrawable, UShape {
 
 	public XDimension2D calculateDimension(StringBounder stringBounder);
 
+	// ::comment when __HAXE__
 	public MinMax getMinMax(StringBounder stringBounder);
 
 	public XRectangle2D getInnerPosition(String member, StringBounder stringBounder, InnerStrategy strategy);
@@ -55,5 +56,6 @@ public interface TextBlock extends UDrawable, UShape {
 	public MagneticBorder getMagneticBorder();
 
 	public HColor getBackcolor();
+	// ::done
 
 }

src/net/sourceforge/plantuml/klimt/shape/TextBlockArrow.java

@@ -46,6 +46,7 @@ import net.sourceforge.plantuml.klimt.geom.XDimension2D;
 import net.sourceforge.plantuml.utils.Direction;
 
 public class TextBlockArrow extends AbstractTextBlock implements TextBlock {
+    // ::remove file when __HAXE__
 
 	private final double size;
 	private final Direction arrow;

src/net/sourceforge/plantuml/klimt/shape/TextBlockArrow2.java

@@ -47,6 +47,7 @@ import net.sourceforge.plantuml.klimt.geom.XPoint2D;
 import net.sourceforge.plantuml.svek.GuideLine;
 
 public class TextBlockArrow2 extends AbstractTextBlock implements TextBlock {
+    // ::remove file when __HAXE__
 
 	private final double size;
 	private final GuideLine angle;

src/net/sourceforge/plantuml/klimt/shape/TextBlockBordered.java

@@ -47,6 +47,7 @@ import net.sourceforge.plantuml.klimt.geom.XDimension2D;
 import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft;
 
 public class TextBlockBordered extends AbstractTextBlock implements TextBlock {
+    // ::remove file when __HAXE__
 
 	private final double cornersize;
 	private final HColor backgroundColor;

src/net/sourceforge/plantuml/klimt/shape/TextBlockEmpty.java

@@ -40,6 +40,7 @@ import net.sourceforge.plantuml.klimt.font.StringBounder;
 import net.sourceforge.plantuml.klimt.geom.XDimension2D;
 
 public class TextBlockEmpty extends AbstractTextBlock {
+    // ::remove file when __HAXE__
 
 	private final double width;
 	private final double height;

src/net/sourceforge/plantuml/klimt/shape/TextBlockGeneric.java

@@ -42,6 +42,7 @@ import net.sourceforge.plantuml.klimt.font.StringBounder;
 import net.sourceforge.plantuml.klimt.geom.XDimension2D;
 
 public class TextBlockGeneric extends AbstractTextBlock implements TextBlock {
+    // ::remove file when __HAXE__
 
 	private final TextBlock textBlock;
 	private final HColor background;

src/net/sourceforge/plantuml/klimt/shape/TextBlockHorizontal.java

@@ -45,6 +45,7 @@ import net.sourceforge.plantuml.klimt.geom.VerticalAlignment;
 import net.sourceforge.plantuml.klimt.geom.XDimension2D;
 
 public class TextBlockHorizontal extends AbstractTextBlock implements TextBlock {
+    // ::remove file when __HAXE__
 
 	private final List<TextBlock> blocks = new ArrayList<>();
 	private final VerticalAlignment alignment;

src/net/sourceforge/plantuml/klimt/shape/TextBlockInEllipse.java

@@ -44,6 +44,7 @@ import net.sourceforge.plantuml.svek.image.ContainingEllipse;
 import net.sourceforge.plantuml.svek.image.Footprint;
 
 public class TextBlockInEllipse extends AbstractTextBlock implements TextBlock {
+    // ::remove file when __HAXE__
 
 	private final TextBlock text;
 	private final ContainingEllipse ellipse;

src/net/sourceforge/plantuml/klimt/shape/TextBlockLineBefore.java

@@ -46,6 +46,7 @@ import net.sourceforge.plantuml.svek.Ports;
 import net.sourceforge.plantuml.svek.WithPorts;
 
 public class TextBlockLineBefore extends AbstractTextBlock implements TextBlock, WithPorts {
+    // ::remove file when __HAXE__
 
 	private final TextBlock textBlock;
 	private final char separator;

src/net/sourceforge/plantuml/klimt/shape/TextBlockMarged.java

@@ -46,6 +46,7 @@ import net.sourceforge.plantuml.svek.Ports;
 import net.sourceforge.plantuml.svek.WithPorts;
 
 class TextBlockMarged extends AbstractTextBlock implements TextBlock, WithPorts {
+    // ::remove file when __HAXE__
 
 	private final TextBlock textBlock;
 	private final double top;

src/net/sourceforge/plantuml/klimt/shape/TextBlockMinWidth.java

@@ -42,6 +42,7 @@ import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment;
 import net.sourceforge.plantuml.klimt.geom.XDimension2D;
 
 class TextBlockMinWidth extends AbstractTextBlock implements TextBlock {
+    // ::remove file when __HAXE__
 
 	private final TextBlock textBlock;
 	private final double minWidth;

src/net/sourceforge/plantuml/klimt/shape/TextBlockRaw.java

@@ -45,6 +45,7 @@ import net.sourceforge.plantuml.klimt.font.StringBounder;
 import net.sourceforge.plantuml.klimt.geom.XDimension2D;
 
 public class TextBlockRaw extends AbstractTextBlock implements TextBlock {
+    // ::remove file when __HAXE__
 
 	private List<Line> lines2;
 

src/net/sourceforge/plantuml/klimt/shape/TextBlockRecentred.java

@@ -43,6 +43,7 @@ import net.sourceforge.plantuml.klimt.geom.MinMax;
 import net.sourceforge.plantuml.klimt.geom.XDimension2D;
 
 public class TextBlockRecentred extends AbstractTextBlock {
+    // ::remove file when __HAXE__
 
 	private final TextBlock textBlock;
 

src/net/sourceforge/plantuml/klimt/shape/TextBlockSimple.java

@@ -50,6 +50,7 @@ import net.sourceforge.plantuml.klimt.sprite.SpriteContainer;
 import net.sourceforge.plantuml.regex.MyPattern;
 
 public final class TextBlockSimple extends AbstractTextBlock implements TextBlock {
+    // ::remove file when __HAXE__
 
 	private List<Line> lines;
 

src/net/sourceforge/plantuml/klimt/shape/TextBlockSprited.java

@@ -41,6 +41,7 @@ import net.sourceforge.plantuml.klimt.font.StringBounder;
 import net.sourceforge.plantuml.klimt.geom.XDimension2D;
 
 public class TextBlockSprited extends AbstractTextBlock {
+    // ::remove file when __HAXE__
 
 	private final TextBlock parent;
 	private final TextBlock sprite;

src/net/sourceforge/plantuml/klimt/shape/TextBlockTitle.java

@@ -53,6 +53,7 @@ import net.sourceforge.plantuml.klimt.geom.XRectangle2D;
 import net.sourceforge.plantuml.style.ISkinSimple;
 
 public class TextBlockTitle implements TextBlock {
+    // ::remove file when __HAXE__
 
 	private final double outMargin = 2;
 

src/net/sourceforge/plantuml/klimt/shape/TextBlockUtils.java

@@ -53,6 +53,7 @@ import net.sourceforge.plantuml.klimt.geom.XRectangle2D;
 import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft;
 
 public class TextBlockUtils {
+    // ::remove file when __HAXE__
 
 	public static final TextBlock EMPTY_TEXT_BLOCK = TextBlockUtils.empty(0, 0);
 

src/net/sourceforge/plantuml/klimt/shape/TextBlockVertical2.java

@@ -50,6 +50,7 @@ import net.sourceforge.plantuml.svek.Ports;
 import net.sourceforge.plantuml.svek.WithPorts;
 
 public class TextBlockVertical2 extends AbstractTextBlock implements TextBlock, WithPorts {
+    // ::remove file when __HAXE__
 
 	private final List<TextBlock> blocks = new ArrayList<>();
 	private final HorizontalAlignment horizontalAlignment;

src/net/sourceforge/plantuml/klimt/shape/TextBlockWithUrl.java

@@ -46,6 +46,7 @@ import net.sourceforge.plantuml.klimt.geom.XRectangle2D;
 import net.sourceforge.plantuml.url.Url;
 
 public class TextBlockWithUrl implements TextBlock {
+    // ::remove file when __HAXE__
 
 	private final TextBlock block;
 	private final Url url;

src/net/sourceforge/plantuml/klimt/shape/TileImage.java

@@ -47,6 +47,7 @@ import net.sourceforge.plantuml.klimt.geom.ImgValign;
 import net.sourceforge.plantuml.klimt.geom.XDimension2D;
 
 public class TileImage extends AbstractTextBlock implements TextBlock {
+    // ::remove file when __HAXE__
 
 	private final BufferedImage image;
 	private final int vspace;

src/net/sourceforge/plantuml/klimt/shape/TileImageSvg.java

@@ -40,6 +40,7 @@ import net.sourceforge.plantuml.klimt.font.StringBounder;
 import net.sourceforge.plantuml.klimt.geom.XDimension2D;
 
 public class TileImageSvg extends AbstractTextBlock implements TextBlock {
+    // ::remove file when __HAXE__
 
 	private final UImageSvg svg;
 	private final double scale;

src/net/sourceforge/plantuml/klimt/shape/TileText.java

@@ -46,6 +46,7 @@ import net.sourceforge.plantuml.url.Url;
 import net.sourceforge.plantuml.utils.Log;
 
 public class TileText extends AbstractTextBlock implements TextBlock {
+    // ::remove file when __HAXE__
 
 	private final String text;
 	private final FontConfiguration fontConfiguration;

src/net/sourceforge/plantuml/klimt/shape/UCenteredCharacter.java

@@ -39,6 +39,7 @@ import net.sourceforge.plantuml.klimt.UShape;
 import net.sourceforge.plantuml.klimt.font.UFont;
 
 public class UCenteredCharacter implements UShape {
+	// ::remove file when __HAXE__
 
 	private final char c;
 	private final UFont font;

src/net/sourceforge/plantuml/klimt/shape/UDrawable.java

@@ -39,6 +39,8 @@ import net.sourceforge.plantuml.klimt.drawing.UGraphic;
 
 public interface UDrawable {
 
+	// ::comment when __HAXE__
 	public void drawU(UGraphic ug);
+	// ::done
 
 }

src/net/sourceforge/plantuml/klimt/shape/UEllipse.java

@@ -41,6 +41,7 @@ import net.sourceforge.plantuml.klimt.geom.XDimension2D;
 import net.sourceforge.plantuml.klimt.geom.XPoint2D;
 
 public class UEllipse extends AbstractShadowable implements UShapeSized {
+    // ::remove file when __HAXE__
 
 	private final double width;
 	private final double height;

src/net/sourceforge/plantuml/klimt/shape/UHorizontalLine.java

@@ -44,7 +44,7 @@ import net.sourceforge.plantuml.klimt.font.StringBounder;
 import net.sourceforge.plantuml.klimt.geom.XDimension2D;
 
 public class UHorizontalLine implements UShape {
-    // ::remove folder when __HAXE__
+    // ::remove file when __HAXE__
 
 	private final double skipAtStart;
 	private final double skipAtEnd;

src/net/sourceforge/plantuml/klimt/shape/UImage.java

@@ -42,6 +42,7 @@ import net.sourceforge.plantuml.klimt.MutableImage;
 import net.sourceforge.plantuml.klimt.UShape;
 
 public class UImage implements UShape {
+    // ::remove file when __HAXE__
 
 	private final MutableImage image;
 	private final String formula;

src/net/sourceforge/plantuml/klimt/shape/UImageSvg.java

@@ -43,6 +43,7 @@ import net.sourceforge.plantuml.klimt.UShape;
 import net.sourceforge.plantuml.utils.SignatureUtils;
 
 public class UImageSvg implements UShape {
+    // ::remove file when __HAXE__
 
 	private final String svg;
 	private final double scale;

src/net/sourceforge/plantuml/klimt/shape/ULine.java

@@ -35,7 +35,9 @@
  */
 package net.sourceforge.plantuml.klimt.shape;
 
+//::comment when __HAXE__
 import java.awt.geom.AffineTransform;
+//::done
 
 import net.sourceforge.plantuml.klimt.AbstractShadowable;
 import net.sourceforge.plantuml.klimt.UShapeSized;
@@ -55,6 +57,7 @@ public class ULine extends AbstractShadowable implements UShapeSized {
 		this.dy = dy;
 	}
 
+	// ::comment when __HAXE__
 	public ULine rotate(double theta) {
 		if (theta == 0)
 			return this;
@@ -62,6 +65,7 @@ public class ULine extends AbstractShadowable implements UShapeSized {
 		final XPoint2D tmp = new XPoint2D(dx, dy).transform(rot);
 		return new ULine(tmp.getX(), tmp.getY());
 	}
+	// ::done
 
 	public static ULine hline(double dx) {
 		return new ULine(dx, 0);

src/net/sourceforge/plantuml/klimt/shape/UPolygon.java

@@ -45,6 +45,7 @@ import net.sourceforge.plantuml.klimt.geom.MinMax;
 import net.sourceforge.plantuml.klimt.geom.XPoint2D;
 
 public class UPolygon extends AbstractShadowable {
+    // ::remove file when __HAXE__
 
 	private final List<XPoint2D> all = new ArrayList<XPoint2D>();
 	private final String name;

src/net/sourceforge/plantuml/klimt/shape/URectangle.java

@@ -48,6 +48,7 @@ import net.sourceforge.plantuml.klimt.geom.MinMax;
 import net.sourceforge.plantuml.klimt.geom.XDimension2D;
 
 public class URectangle extends AbstractShadowable implements UShapeSized, UShapeIgnorableForCompression {
+    // ::remove file when __HAXE__
 
 	private final double width;
 	private final double height;

src/net/sourceforge/plantuml/klimt/shape/UText.java

@@ -40,6 +40,7 @@ import net.sourceforge.plantuml.klimt.font.FontConfiguration;
 import net.sourceforge.plantuml.klimt.font.StringBounder;
 
 public class UText implements UShape {
+	// ::remove file when __HAXE__
 
 	private final String text;
 	private final FontConfiguration font;

src/net/sourceforge/plantuml/logo/TurtleGraphicsPane.java

@@ -195,7 +195,7 @@ class TurtleGraphicsPane {
 		}
 		drawTurtle(ug);
 		if (message != null) {
-			final FontConfiguration font = FontConfiguration.blackBlueTrue(new UFont("", Font.PLAIN, 14));
+			final FontConfiguration font = FontConfiguration.blackBlueTrue(UFont.build("", Font.PLAIN, 14));
 			final TextBlock text = Display.create(message).create(font, HorizontalAlignment.LEFT,
 					new SpriteContainerEmpty());
 			final XDimension2D dim = text.calculateDimension(ug.getStringBounder());

src/net/sourceforge/plantuml/mindmap/FingerImpl.java

@@ -127,7 +127,7 @@ public class FingerImpl implements Finger, UDrawable {
 			else
 				p2 = new XPoint2D(direction * (dimPhalanx.getWidth() + getX12()), stp.getY());
 
-			child.drawU(ug.apply(new UTranslate(p2)));
+			child.drawU(ug.apply(UTranslate.point(p2)));
 			final HColor linkColor = getLinkColor();
 			if (linkColor.isTransparent() == false)
 				drawLine(ug.apply(linkColor).apply(getUStroke()), p1, p2);

src/net/sourceforge/plantuml/posimo/LineRectIntersection.java

@@ -49,10 +49,10 @@ public class LineRectIntersection {
 		final XPoint2D p3 = new XPoint2D(rect.getMaxX(), rect.getMaxY());
 		final XPoint2D p4 = new XPoint2D(rect.getMinX(), rect.getMaxY());
 
-		final XPoint2D inter1 = new LineSegmentIntersection(new XLine2D(p1, p2), line).getIntersection();
+		final XPoint2D inter1 = new LineSegmentIntersection(XLine2D.line(p1, p2), line).getIntersection();
-		final XPoint2D inter2 = new LineSegmentIntersection(new XLine2D(p2, p3), line).getIntersection();
+		final XPoint2D inter2 = new LineSegmentIntersection(XLine2D.line(p2, p3), line).getIntersection();
-		final XPoint2D inter3 = new LineSegmentIntersection(new XLine2D(p3, p4), line).getIntersection();
+		final XPoint2D inter3 = new LineSegmentIntersection(XLine2D.line(p3, p4), line).getIntersection();
-		final XPoint2D inter4 = new LineSegmentIntersection(new XLine2D(p4, p1), line).getIntersection();
+		final XPoint2D inter4 = new LineSegmentIntersection(XLine2D.line(p4, p1), line).getIntersection();
 
 		final XPoint2D o = line.getP1();
 		inter = getCloser(o, inter1, inter2, inter3, inter4);

src/net/sourceforge/plantuml/posimo/RacorderFollowTangeanteOld.java

@@ -49,7 +49,7 @@ public class RacorderFollowTangeanteOld extends RacorderAbstract implements Raco
 		final DotPath result = new DotPath();
 
 		final XPoint2D center = new XPoint2D(rect.getCenterX(), rect.getCenterY());
-		final XLine2D line = new XLine2D(tangeante.getP1(), center);
+		final XLine2D line = XLine2D.line(tangeante.getP1(), center);
 		final XPoint2D inter = BezierUtils.intersect(line, rect);
 
 		final XCubicCurve2D curv = new XCubicCurve2D(tangeante.getX1(), tangeante.getY1(), tangeante.getX2(),

src/net/sourceforge/plantuml/posimo/RacorderInToCenter.java

@@ -49,7 +49,7 @@ public class RacorderInToCenter extends RacorderAbstract implements Racorder {
 		final DotPath result = new DotPath();
 
 		final XPoint2D center = new XPoint2D(rect.getCenterX(), rect.getCenterY());
-		final XLine2D line = new XLine2D(tangeante.getP1(), center);
+		final XLine2D line = XLine2D.line(tangeante.getP1(), center);
 		final XPoint2D inter = BezierUtils.intersect(line, rect);
 
 		final XCubicCurve2D curv = new XCubicCurve2D(line.getX1(), line.getY1(), line.getX1(), line.getY1(),