octoleo/plantuml
1
0
Fork 0
mirror of https://github.com/octoleo/plantuml.git synced 2024-12-22 10:59:01 +00:00
Code Issues Releases Wiki Activity

Fix https://github.com/plantuml/plantuml/discussions/1264

Browse Source
This commit is contained in:
Arnaud Roques 2023-01-14 11:49:57 +01:00
parent eac7a29c67
commit 54afac2f27
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/net/sourceforge/plantuml/nwdiag/next/LinkedElement.java
View File

@ -134,7 +134,7 @@ public class LinkedElement {
new VerticalLine(ynet1, ynet1 + alpha, Collections.<Double>emptySet()) new VerticalLine(ynet1, ynet1 + alpha, Collections.<Double>emptySet())
.drawU(ug.apply(UTranslate.dx(xLinkPos + network.magicDelta()))); .drawU(ug.apply(UTranslate.dx(xLinkPos + network.magicDelta())));
drawCenter(ug, link1(), xMiddle + network.magicDelta(), ynet1 + posLink1); drawCenter(ug, getTextBlockLink1(), xMiddle + network.magicDelta(), ynet1 + posLink1);
final double seven = 9.0; final double seven = 9.0;
double x = xLinkPos - (conns.size() - 2) * seven / 2; double x = xLinkPos - (conns.size() - 2) * seven / 2;
@ -160,7 +160,7 @@ public class LinkedElement {
} }
private TextBlock link1() { private TextBlock getTextBlockLink1() {
return conns.get(network); return conns.get(network);
} }
@ -182,8 +182,8 @@ public class LinkedElement {
} }
public XDimension2D naturalDimension(StringBounder stringBounder) { public XDimension2D naturalDimension(StringBounder stringBounder) {
final XDimension2D dimLink1 = link1() == null ? new XDimension2D(0, 0) final XDimension2D dimLink1 = getTextBlockLink1() == null ? new XDimension2D(0, 0)
: link1().calculateDimension(stringBounder); : getTextBlockLink1().calculateDimension(stringBounder);
final XDimension2D dimBox = box.calculateDimension(stringBounder); final XDimension2D dimBox = box.calculateDimension(stringBounder);
final XDimension2D dimLink2 = link2() == null ? new XDimension2D(0, 0) final XDimension2D dimLink2 = link2() == null ? new XDimension2D(0, 0)
: link2().calculateDimension(stringBounder); : link2().calculateDimension(stringBounder);

4
src/net/sourceforge/plantuml/style/Style.java
View File

@ -42,6 +42,7 @@ import java.util.StringTokenizer;
import net.sourceforge.plantuml.ISkinSimple; import net.sourceforge.plantuml.ISkinSimple;
import net.sourceforge.plantuml.LineBreakStrategy; import net.sourceforge.plantuml.LineBreakStrategy;
import net.sourceforge.plantuml.StringUtils;
import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Display;
import net.sourceforge.plantuml.graphic.FontConfiguration; import net.sourceforge.plantuml.graphic.FontConfiguration;
import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.HorizontalAlignment;
@ -179,7 +180,8 @@ public class Style {
} }
public UFont getUFont() { public UFont getUFont() {
final String family = value(PName.FontName).asString(); final String family = StringUtils
.eventuallyRemoveStartingAndEndingDoubleQuote(value(PName.FontName).asString());
final int fontStyle = value(PName.FontStyle).asFontStyle(); final int fontStyle = value(PName.FontStyle).asFontStyle();
int size = value(PName.FontSize).asInt(true); int size = value(PName.FontSize).asInt(true);
if (size == -1) if (size == -1)