From 1b89a48f4692bd91b4a40bae5483a55cc4b4c424 Mon Sep 17 00:00:00 2001
From: Arnaud Roques <plantuml@gmail.com>
Date: Fri, 29 Jul 2022 14:43:01 +0200
Subject: [PATCH] wip

---
 .../sourceforge/plantuml/emoji/SvgNanoParser.java  |  4 +++-
 .../svek/image/EntityImageClassHeader.java         |  9 +++------
 src/net/sourceforge/plantuml/svek/image/Opale.java | 14 +++++++-------
 .../ugraphic/PlacementStrategyVisibility.java      | 10 ++++++----
 .../plantuml/ugraphic/ULayoutGroup.java            |  4 ++--
 src/net/sourceforge/plantuml/version/Version.java  |  2 +-
 6 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/net/sourceforge/plantuml/emoji/SvgNanoParser.java b/src/net/sourceforge/plantuml/emoji/SvgNanoParser.java
index aa1cfbd04..1d5ca3f7b 100644
--- a/src/net/sourceforge/plantuml/emoji/SvgNanoParser.java
+++ b/src/net/sourceforge/plantuml/emoji/SvgNanoParser.java
@@ -61,7 +61,9 @@ public class SvgNanoParser implements Sprite {
 				if (s.contains("<path") || s.contains("<g ") || s.contains("<g>") || s.contains("</g>")
 						|| s.contains("<circle ") || s.contains("<ellipse "))
 					data.add(s);
-				else
+				else if (s.startsWith("<svg") || s.startsWith("</svg")) {
+					// Ignore
+				} else
 					System.err.println("???=" + s);
 			}
 		}
diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageClassHeader.java b/src/net/sourceforge/plantuml/svek/image/EntityImageClassHeader.java
index 3ebf55ff0..61f5f6ae3 100644
--- a/src/net/sourceforge/plantuml/svek/image/EntityImageClassHeader.java
+++ b/src/net/sourceforge/plantuml/svek/image/EntityImageClassHeader.java
@@ -154,20 +154,17 @@ public class EntityImageClassHeader extends AbstractEntityImage {
 		final LeafType leafType = entity.getLeafType();
 
 		final Style style = spotStyleSignature(leafType).getMergedStyle(skinParam.getCurrentStyleBuilder());
-		HColor spotBorder = style.value(PName.LineColor).asColor(skinParam.getThemeStyle(),
+		final HColor spotBorder = style.value(PName.LineColor).asColor(skinParam.getThemeStyle(),
 				skinParam.getIHtmlColorSet());
 		final HColor spotBackColor = style.value(PName.BackGroundColor).asColor(skinParam.getThemeStyle(),
 				skinParam.getIHtmlColorSet());
-		final HColor classBorder = SkinParamUtils.getColor(getSkinParam(), stereotype, ColorParam.classBorder);
+
 		final HColor fontColor = style.value(PName.FontColor).asColor(skinParam.getThemeStyle(),
 				skinParam.getIHtmlColorSet());
 
 		if (stereotype != null && stereotype.getCharacter() != 0)
 			return new CircledCharacter(stereotype.getCharacter(), getSkinParam().getCircledCharacterRadius(), font,
-					stereotype.getHtmlColor(), classBorder, fontColor);
-
-		if (spotBorder == null)
-			spotBorder = classBorder;
+					stereotype.getHtmlColor(), spotBorder, fontColor);
 
 		char circledChar = 0;
 		if (stereotype != null)
diff --git a/src/net/sourceforge/plantuml/svek/image/Opale.java b/src/net/sourceforge/plantuml/svek/image/Opale.java
index a30858b03..a12692ba0 100644
--- a/src/net/sourceforge/plantuml/svek/image/Opale.java
+++ b/src/net/sourceforge/plantuml/svek/image/Opale.java
@@ -107,19 +107,19 @@ public class Opale extends AbstractTextBlock implements TextBlock {
 		final StringBounder stringBounder = ug.getStringBounder();
 		ug = ug.apply(noteBackgroundColor.bg()).apply(borderColor);
 		final UPath polygon;
-		if (withLink == false) {
+		if (withLink == false)
 			polygon = getPolygonNormal(stringBounder);
-		} else if (strategy == Direction.LEFT) {
+		else if (strategy == Direction.LEFT)
 			polygon = getPolygonLeft(stringBounder, pp1, pp2);
-		} else if (strategy == Direction.RIGHT) {
+		else if (strategy == Direction.RIGHT)
 			polygon = getPolygonRight(stringBounder, pp1, pp2);
-		} else if (strategy == Direction.UP) {
+		else if (strategy == Direction.UP)
 			polygon = getPolygonUp(stringBounder, pp1, pp2);
-		} else if (strategy == Direction.DOWN) {
+		else if (strategy == Direction.DOWN)
 			polygon = getPolygonDown(stringBounder, pp1, pp2);
-		} else {
+		else
 			throw new IllegalArgumentException();
-		}
+
 		polygon.setDeltaShadow(shadowing2);
 		if (stroke != null)
 			ug = ug.apply(stroke);
diff --git a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyVisibility.java b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyVisibility.java
index 76933853f..a45701838 100644
--- a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyVisibility.java
+++ b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyVisibility.java
@@ -35,12 +35,12 @@
  */
 package net.sourceforge.plantuml.ugraphic;
 
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import java.awt.geom.Point2D;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
 import net.sourceforge.plantuml.graphic.StringBounder;
 import net.sourceforge.plantuml.graphic.TextBlock;
 
@@ -56,14 +56,16 @@ public class PlacementStrategyVisibility extends AbstractPlacementStrategy {
 	public Map<TextBlock, Point2D> getPositions(double width, double height) {
 		final Map<TextBlock, Point2D> result = new LinkedHashMap<TextBlock, Point2D>();
 		double y = 0;
-		for (final Iterator<Map.Entry<TextBlock, Dimension2D>> it = getDimensions().entrySet().iterator(); it.hasNext();) {
+		for (final Iterator<Map.Entry<TextBlock, Dimension2D>> it = getDimensions().entrySet().iterator(); it
+				.hasNext();) {
 			final Map.Entry<TextBlock, Dimension2D> ent1 = it.next();
 			final Map.Entry<TextBlock, Dimension2D> ent2 = it.next();
+
 			final double height1 = ent1.getValue().getHeight();
 			final double height2 = ent2.getValue().getHeight();
 			final double maxHeight12 = Math.max(height1, height2);
-			// result.put(ent1.getKey(), new Point2D.Double(0, 2 + y + (maxHeight - height1) / 2));
-			result.put(ent1.getKey(), new Point2D.Double(0, 2 + y));
+
+			result.put(ent1.getKey(), new Point2D.Double(0, 2 + y + (maxHeight12 - height1) / 2));
 			result.put(ent2.getKey(), new Point2D.Double(col2, y + (maxHeight12 - height2) / 2));
 			y += maxHeight12;
 		}
diff --git a/src/net/sourceforge/plantuml/ugraphic/ULayoutGroup.java b/src/net/sourceforge/plantuml/ugraphic/ULayoutGroup.java
index a3775d05a..d3fca1dd3 100644
--- a/src/net/sourceforge/plantuml/ugraphic/ULayoutGroup.java
+++ b/src/net/sourceforge/plantuml/ugraphic/ULayoutGroup.java
@@ -69,9 +69,9 @@ public class ULayoutGroup {
 	public Rectangle2D getInnerPosition(String member, double width, double height, StringBounder stringBounder) {
 		final Set<Entry<TextBlock, Point2D>> all = placementStrategy.getPositions(width, height).entrySet();
 		Rectangle2D result = tryOne(all, member, stringBounder, InnerStrategy.STRICT);
-		if (result == null) {
+		if (result == null)
 			result = tryOne(all, member, stringBounder, InnerStrategy.LAZZY);
-		}
+
 		return result;
 	}
 
diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java
index a7cd8a984..c9bb2f706 100644
--- a/src/net/sourceforge/plantuml/version/Version.java
+++ b/src/net/sourceforge/plantuml/version/Version.java
@@ -80,7 +80,7 @@ public class Version {
 	}
 
 	public static int beta() {
-		final int beta = 8;
+		final int beta = 9;
 		return beta;
 	}