SVG: specify correct inheritance for attributes (including markers) and support percent stroke/fill-opacity

DEVSIX-8757

Author: introfog

svg/src/main/java/com/itextpdf/svg/SvgConstants.java

@@ -829,6 +829,10 @@ public static final class Attributes extends CommonAttributeConstants {
          * Attribute defining the stroke linecap.
          */
         public static final String STROKE_LINECAP = "stroke-linecap";
+        /**
+         * Attribute defining the stroke linejoin.
+         */
+        public static final String STROKE_LINEJOIN = "stroke-linejoin";
 
         /**
          * Attribute defining the stroke miterlimit.

svg/src/main/java/com/itextpdf/svg/css/impl/SvgAttributeInheritance.java

@@ -23,7 +23,7 @@ This file is part of the iText (R) project.
 package com.itextpdf.svg.css.impl;
 
 import com.itextpdf.styledxmlparser.css.resolve.IStyleInheritance;
-import com.itextpdf.svg.SvgConstants;
+import com.itextpdf.svg.SvgConstants.Attributes;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -36,30 +36,35 @@ This file is part of the iText (R) project.
 public class SvgAttributeInheritance implements IStyleInheritance {
 
     /**
-     * Set of inheritable SVG style attributes
-     * in accordance with "http://www.w3schools.com/cssref/"
-     * and "https://developer.mozilla.org/en-US/docs/Web/CSS/Reference"
+     * Set of inheritable SVG style attributes in accordance with "https://www.w3.org/TR/SVG2/propidx.html".
      */
     private static final Set<String> inheritableProperties = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
-
-            // clip-rule
-            SvgConstants.Attributes.CLIP_RULE,
-
-            // fill
-            SvgConstants.Attributes.FILL,
-
-            // fill-rule
-            SvgConstants.Attributes.FILL_RULE,
-
-            // stroke
-            SvgConstants.Attributes.STROKE,
-
-            // stroke-width
-            SvgConstants.Attributes.STROKE_WIDTH,
-
-            // text-anchor
-            SvgConstants.Attributes.TEXT_ANCHOR
-
+            // The following attributes haven't been supported in iText yet:
+            // color-interpolation, color-rendering, glyph-orientation-vertical, image-rendering,
+            // paint-order, pointer-events, shape-rendering, text-rendering.
+
+            // All the rest are either here or in com.itextpdf.styledxmlparser.css.resolve.CssInheritance
+            Attributes.DIRECTION,
+            // TODO DEVSIX-5890 Add Support to SVG dominant-baseline attribute
+            Attributes.FILL,
+            Attributes.FILL_OPACITY,
+            Attributes.FILL_RULE,
+            Attributes.MARKER,
+            Attributes.MARKER_MID,
+            Attributes.MARKER_END,
+            Attributes.MARKER_START,
+            Attributes.STROKE,
+            Attributes.STROKE_DASHARRAY,
+            Attributes.STROKE_DASHOFFSET,
+            Attributes.STROKE_LINECAP,
+            Attributes.STROKE_LINEJOIN,
+            Attributes.STROKE_MITERLIMIT,
+            Attributes.STROKE_OPACITY,
+            Attributes.STROKE_WIDTH,
+            Attributes.TEXT_ANCHOR,
+
+            // CLIP_RULE isn't from the spec above, but seems it's required according to some tests
+            Attributes.CLIP_RULE
     )));
 
     @Override

svg/src/main/java/com/itextpdf/svg/renderers/impl/AbstractSvgNodeRenderer.java

@@ -532,9 +532,15 @@ private TransparentColor getColorFromAttributeValue(SvgDrawContext context, Stri
     private float getOpacityByAttributeName(String attributeName, float generalOpacity) {
         float opacity = generalOpacity;
 
-        String opacityValue = getAttribute(attributeName);
-        if (opacityValue != null && !SvgConstants.Values.NONE.equalsIgnoreCase(opacityValue)) {
-            opacity *= Float.valueOf(opacityValue);
+        String opacityStr = getAttribute(attributeName);
+        if (opacityStr != null && !SvgConstants.Values.NONE.equalsIgnoreCase(opacityStr)) {
+            float opacityValue;
+            if (CssTypesValidationUtils.isPercentageValue(opacityStr)) {
+                opacityValue = CssDimensionParsingUtils.parseRelativeValue(opacityStr, 1f);
+            } else {
+                opacityValue = Float.valueOf(opacityStr);
+            }
+            opacity *= opacityValue;
         }
         return opacity;
     }

svg/src/test/java/com/itextpdf/svg/renderers/OpacityTest.java

@@ -24,11 +24,11 @@ This file is part of the iText (R) project.
 
 import com.itextpdf.test.ITextTest;
 
+import java.io.IOException;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Tag;
-import java.io.IOException;
+import org.junit.jupiter.api.Test;
 
 @Tag("IntegrationTest")
 public class OpacityTest extends SvgIntegrationTest {
@@ -63,19 +63,16 @@ public void testRGBA() throws IOException, InterruptedException {
   }
 
   @Test
-  //TODO DEVSIX-2678
-  public void testFillOpacityWithComma() throws IOException, InterruptedException {
+  //TODO DEVSIX-2678 SVG: Displaying invalid value of fill-opacity incorrectly
+  public void testFillOpacityWithComma() {
     Assertions.assertThrows(NumberFormatException.class,
             () -> convertAndCompare(SOURCE_FOLDER, DESTINATION_FOLDER, "testFillOpacityWithComma")
     );
   }
 
   @Test
-  //TODO DEVSIX-2678
   public void testFillOpacityWithPercents() throws IOException, InterruptedException {
-    Assertions.assertThrows(NumberFormatException.class,
-            () -> convertAndCompare(SOURCE_FOLDER, DESTINATION_FOLDER, "testFillOpacityWithPercents")
-    );
+      convertAndCompare(SOURCE_FOLDER, DESTINATION_FOLDER, "testFillOpacityWithPercents");
   }
 
   @Test
@@ -93,11 +90,8 @@ public void testStrokeOpacityWithComma() throws IOException, InterruptedExceptio
   }
 
   @Test
-  //TODO DEVSIX-2679
   public void testStrokeOpacityWithPercents() throws IOException, InterruptedException {
-    Assertions.assertThrows(NumberFormatException.class,
-            () -> convertAndCompare(SOURCE_FOLDER, DESTINATION_FOLDER, "testStrokeOpacityWithPercents")
-    );
+      convertAndCompare(SOURCE_FOLDER, DESTINATION_FOLDER, "testStrokeOpacityWithPercents");
   }
 
   @Test

svg/src/test/java/com/itextpdf/svg/renderers/StrokeTest.java

@@ -133,19 +133,19 @@ public void strokeObjectsOverlap1Test() throws IOException, InterruptedException
     }
 
     @Test
-    //TODO DEVSIX-7338: Update cmp file
+    //TODO DEVSIX-7338: SVG stroke on group applied incorrectly
     public void strokeObjectsOverlap2Test() throws IOException, InterruptedException {
         convertAndCompare(SOURCE_FOLDER, DESTINATION_FOLDER, "strokeOnGroup2");
     }
 
     @Test
-    //TODO DEVSIX-7338: Update cmp file
+    //TODO DEVSIX-7338: SVG stroke on group applied incorrectly
     public void strokeObjectsOverlap3Test() throws IOException, InterruptedException {
         convertAndCompare(SOURCE_FOLDER, DESTINATION_FOLDER, "strokeOnGroupNoInsideStroke");
     }
 
     @Test
-    //TODO DEVSIX-7338: Update cmp file
+    //TODO DEVSIX-7338: SVG stroke on group applied incorrectly
     public void strokeObjectsOverlap4Test() throws IOException, InterruptedException {
         convertAndCompare(SOURCE_FOLDER, DESTINATION_FOLDER, "strokeOnGroupNoInsideStroke2");
     }

svg/src/test/java/com/itextpdf/svg/renderers/impl/MarkerSvgNodeRendererIntegrationTest.java

@@ -32,8 +32,8 @@ This file is part of the iText (R) project.
 import java.io.IOException;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 
 @Tag("IntegrationTest")
 public class MarkerSvgNodeRendererIntegrationTest extends SvgIntegrationTest {
@@ -317,4 +317,24 @@ public void deformationWhenRotationAndPreserveAspectRationNoneTest() throws IOEx
     public void markerParentElementTest() throws IOException, InterruptedException {
         convertAndCompareSinglePage(SOURCE_FOLDER, DESTINATION_FOLDER, "markerParentElement");
     }
+
+    @Test
+    public void markerDefinedInStyleTest() throws IOException, InterruptedException {
+        convertAndCompareSinglePage(SOURCE_FOLDER, DESTINATION_FOLDER, "markerDefinedInStyle");
+    }
+
+    @Test
+    public void markerOnGroupTest() throws IOException, InterruptedException {
+        convertAndCompare(SOURCE_FOLDER, DESTINATION_FOLDER, "markerOnGroup");
+    }
+
+    @Test
+    public void markerOnSvgTest() throws IOException, InterruptedException {
+        convertAndCompare(SOURCE_FOLDER, DESTINATION_FOLDER, "markerOnSvg");
+    }
+
+    @Test
+    public void markerOnSymbolTest() throws IOException, InterruptedException {
+        convertAndCompare(SOURCE_FOLDER, DESTINATION_FOLDER, "markerOnSymbol");
+    }
 }

svg/src/test/java/com/itextpdf/svg/renderers/impl/SymbolTest.java

@@ -127,7 +127,6 @@ public void bothStyleAttributeTest() throws IOException, InterruptedException {
     }
 
     @Test
-    // TODO DEVSIX-2258 Processing of stroke attribute is not currently correct supported
     public void opacityAttributeTest() throws IOException, InterruptedException {
         convertAndCompare(SOURCE_FOLDER, DESTINATION_FOLDER, "opacityAttrTest");
     }