From e16b1d0b75ad4273105f7acb7d442f9062add094 Mon Sep 17 00:00:00 2001
From: Arnaud Roques <plantuml@gmail.com>
Date: Sat, 18 Mar 2023 19:46:30 +0100
Subject: [PATCH] fix: remove buggy margin
 https://github.com/plantuml/plantuml/issues/1334

---
 src/gen/lib/common/shapes__c.java                     | 11 +++++++++--
 .../plantuml/jsondiagram/SmetanaForJson.java          |  8 +++++---
 src/net/sourceforge/plantuml/version/Version.java     |  2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/gen/lib/common/shapes__c.java b/src/gen/lib/common/shapes__c.java
index d8097f7f0..cad0b90e1 100644
--- a/src/gen/lib/common/shapes__c.java
+++ b/src/gen/lib/common/shapes__c.java
@@ -1636,7 +1636,14 @@ UNSUPPORTED("2az12nq89f7txcsfmqdj8tly1"); // 			dimen.y += 2 * (ROUND((marginy)*
 UNSUPPORTED("738mi6h8ef0itznt34ngxe25o"); // 		} else
 UNSUPPORTED("b12tl2a8tebl71ewuz3jms9jv"); // 		    {((dimen).x += 4*4); ((dimen).y += 2*4);};
 	    } else
-		{dimen.x += 4*4; dimen.y += 2*4;};
+		{
+	    	// Modification by Arnaud 18/03/2023
+	    	// The next line is now commented
+	    	//
+	    	// dimen.x += 4*4; dimen.y += 2*4;
+	    	//
+	    	// This is because we don't want to add any margin in Smetana
+    	};
 	}
 	d.___(dimen);
     } else {
@@ -1797,7 +1804,7 @@ UNSUPPORTED("2wv3zfqhq53941rwk4vu9p9th"); // 	info = parse_reclbl(n, flip, NOT(0
     }
     Memory.free(textbuf);
     size_reclbl(zz, n, info);
-    sz.x = POINTS(ND_width(n));;
+    sz.x = POINTS(ND_width(n));
     sz.y = POINTS(ND_height(n));
     if (mapbool(late_string(n, zz.N_fixed, new CString("false")))) {
 UNSUPPORTED("8iu51xbtntpdf5sc00g91djym"); // 	if ((sz.x < info->size.x) || (sz.y < info->size.y)) {
diff --git a/src/net/sourceforge/plantuml/jsondiagram/SmetanaForJson.java b/src/net/sourceforge/plantuml/jsondiagram/SmetanaForJson.java
index 9b7c6b409..ee9ccb2a4 100644
--- a/src/net/sourceforge/plantuml/jsondiagram/SmetanaForJson.java
+++ b/src/net/sourceforge/plantuml/jsondiagram/SmetanaForJson.java
@@ -269,7 +269,7 @@ public class SmetanaForJson {
 
 		for (int i = 0; i < size; i++) {
 			sb.append("<P" + i + ">");
-			sb.append("_dim_" + height + "_" + widthA + "_");
+			sb.append("_dim_" + lineHeights[i] + "_" + widthA + "_");
 			if (i < size - 1)
 				sb.append("|");
 		}
@@ -279,13 +279,15 @@ public class SmetanaForJson {
 
 	private String getDotLabelMap(double widthA, double widthB, double[] lineHeights) {
 		final int size = lineHeights.length;
-		final double height = 0;
+		double height = 0;
+		for (double h : lineHeights)
+			height += h;
 		final StringBuilder sb = new StringBuilder("");
 		sb.append("{_dim_" + height + "_" + widthA + "_|{");
 
 		for (int i = 0; i < size; i++) {
 			sb.append("<P" + i + ">");
-			sb.append("_dim_" + height + "_" + widthB + "_");
+			sb.append("_dim_" + lineHeights[i] + "_" + widthB + "_");
 			if (i < size - 1)
 				sb.append("|");
 		}
diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java
index b7e82c4ae..f9d74510e 100644
--- a/src/net/sourceforge/plantuml/version/Version.java
+++ b/src/net/sourceforge/plantuml/version/Version.java
@@ -82,7 +82,7 @@ public class Version {
 	}
 
 	public static int beta() {
-		final int beta = 2;
+		final int beta = 3;
 		return beta;
 	}