octoleo/plantuml
1
0
Fork 0
mirror of https://github.com/octoleo/plantuml.git synced 2024-11-22 21:15:09 +00:00
Code Issues Releases Wiki Activity

fix: remove buggy margin

Browse Source 
https://github.com/plantuml/plantuml/issues/1334
This commit is contained in:
Arnaud Roques 2023-03-18 19:46:30 +01:00
parent e53a679331
commit e16b1d0b75
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gen/lib/common/shapes__c.java
View File

@ -1636,7 +1636,14 @@ UNSUPPORTED("2az12nq89f7txcsfmqdj8tly1"); // dimen.y += 2 * (ROUND((marginy)*
UNSUPPORTED("738mi6h8ef0itznt34ngxe25o"); // } else UNSUPPORTED("738mi6h8ef0itznt34ngxe25o"); // } else
UNSUPPORTED("b12tl2a8tebl71ewuz3jms9jv"); // {((dimen).x += 4*4); ((dimen).y += 2*4);}; UNSUPPORTED("b12tl2a8tebl71ewuz3jms9jv"); // {((dimen).x += 4*4); ((dimen).y += 2*4);};
} else } 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); d.___(dimen);
} else { } else {
@ -1797,7 +1804,7 @@ UNSUPPORTED("2wv3zfqhq53941rwk4vu9p9th"); // info = parse_reclbl(n, flip, NOT(0
} }
Memory.free(textbuf); Memory.free(textbuf);
size_reclbl(zz, n, info); size_reclbl(zz, n, info);
sz.x = POINTS(ND_width(n));; sz.x = POINTS(ND_width(n));
sz.y = POINTS(ND_height(n)); sz.y = POINTS(ND_height(n));
if (mapbool(late_string(n, zz.N_fixed, new CString("false")))) { if (mapbool(late_string(n, zz.N_fixed, new CString("false")))) {
UNSUPPORTED("8iu51xbtntpdf5sc00g91djym"); // if ((sz.x < info->size.x) || (sz.y < info->size.y)) { UNSUPPORTED("8iu51xbtntpdf5sc00g91djym"); // if ((sz.x < info->size.x) || (sz.y < info->size.y)) {

8
src/net/sourceforge/plantuml/jsondiagram/SmetanaForJson.java
View File

@ -269,7 +269,7 @@ public class SmetanaForJson {
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
sb.append("<P" + i + ">"); sb.append("<P" + i + ">");
sb.append("_dim_" + height + "_" + widthA + "_"); sb.append("_dim_" + lineHeights[i] + "_" + widthA + "_");
if (i < size - 1) if (i < size - 1)
sb.append("|"); sb.append("|");
} }
@ -279,13 +279,15 @@ public class SmetanaForJson {
private String getDotLabelMap(double widthA, double widthB, double[] lineHeights) { private String getDotLabelMap(double widthA, double widthB, double[] lineHeights) {
final int size = lineHeights.length; final int size = lineHeights.length;
final double height = 0; double height = 0;
for (double h : lineHeights)
height += h;
final StringBuilder sb = new StringBuilder(""); final StringBuilder sb = new StringBuilder("");
sb.append("{_dim_" + height + "_" + widthA + "_|{"); sb.append("{_dim_" + height + "_" + widthA + "_|{");
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
sb.append("<P" + i + ">"); sb.append("<P" + i + ">");
sb.append("_dim_" + height + "_" + widthB + "_"); sb.append("_dim_" + lineHeights[i] + "_" + widthB + "_");
if (i < size - 1) if (i < size - 1)
sb.append("|"); sb.append("|");
} }

2
src/net/sourceforge/plantuml/version/Version.java
View File

@ -82,7 +82,7 @@ public class Version {
} }
public static int beta() { public static int beta() {
final int beta = 2; final int beta = 3;
return beta; return beta;
} }