Add implementation for Path operators v and h. RND-1108

Author: michaeldemey

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

@@ -50,13 +50,13 @@ This file is part of the iText (R) project.
 import com.itextpdf.svg.exceptions.SvgProcessingException;
 import com.itextpdf.svg.renderers.ISvgNodeRenderer;
 import com.itextpdf.svg.renderers.SvgDrawContext;
-import com.itextpdf.svg.renderers.path.SvgPathShapeFactory;
 import com.itextpdf.svg.renderers.path.IPathShape;
+import com.itextpdf.svg.renderers.path.SvgPathShapeFactory;
 import com.itextpdf.svg.renderers.path.impl.ClosePath;
-import com.itextpdf.svg.renderers.path.impl.MoveTo;
 import com.itextpdf.svg.renderers.path.impl.CurveTo;
-import com.itextpdf.svg.renderers.path.impl.SmoothSCurveTo;
 import com.itextpdf.svg.renderers.path.impl.HorizontalLineTo;
+import com.itextpdf.svg.renderers.path.impl.MoveTo;
+import com.itextpdf.svg.renderers.path.impl.SmoothSCurveTo;
 import com.itextpdf.svg.renderers.path.impl.VerticalLineTo;
 import com.itextpdf.svg.utils.SvgCssUtils;
 
@@ -107,6 +107,7 @@ public class PathSvgNodeRenderer extends AbstractSvgNodeRenderer {
     public void doDraw(SvgDrawContext context) {
         PdfCanvas canvas = context.getCurrentCanvas();
         canvas.writeLiteral("% path\n");
+        currentPoint = new Point(0,0);
         for (IPathShape item : getShapes()) {
             item.draw(canvas);
         }
@@ -139,7 +140,7 @@ private String[] getShapeCoordinates(IPathShape shape, IPathShape previousShape,
                 Map<String, String> coordinates = previousShape.getCoordinates();
 
                 //if the previous command was a C or S use its last control point
-                if (((previousShape instanceof CurveTo) || (previousShape instanceof SmoothSCurveTo))) {
+                if (((previousShape instanceof CurveTo))) {
                     float reflectedX = (float) (2 * CssUtils.parseFloat(coordinates.get(SvgConstants.Attributes.X)) - CssUtils.parseFloat(coordinates.get(SvgConstants.Attributes.X2)));
                     float reflectedy = (float) (2 * CssUtils.parseFloat(coordinates.get(SvgConstants.Attributes.Y)) - CssUtils.parseFloat(coordinates.get(SvgConstants.Attributes.Y2)));
 
@@ -158,13 +159,13 @@ private String[] getShapeCoordinates(IPathShape shape, IPathShape previousShape,
         } else if (shape instanceof VerticalLineTo) {
             String currentX = String.valueOf(currentPoint.x);
             String currentY = String.valueOf(currentPoint.y);
-            String[] yValues = concatenate(new String[]{currentY}, operatorArgs);
+            String[] yValues = concatenate(new String[] { currentY }, shape.isRelative() ? makeRelativeOperatorsAbsolute(operatorArgs, currentPoint.y) : operatorArgs);
             shapeCoordinates = concatenate(new String[]{currentX}, yValues);
 
         } else if (shape instanceof HorizontalLineTo) {
             String currentX = String.valueOf(currentPoint.x);
             String currentY = String.valueOf(currentPoint.y);
-            String[] xValues = concatenate(new String[]{currentX}, operatorArgs);
+            String[] xValues = concatenate(new String[]{currentX}, shape.isRelative() ? makeRelativeOperatorsAbsolute(operatorArgs, currentPoint.x) : operatorArgs);
             shapeCoordinates = concatenate(new String[]{currentY}, xValues);
         }
         if (shapeCoordinates == null) {
@@ -173,6 +174,19 @@ private String[] getShapeCoordinates(IPathShape shape, IPathShape previousShape,
         return shapeCoordinates;
     }
 
+    private String[] makeRelativeOperatorsAbsolute(String[] relativeOperators, double currentCoordinate) {
+        String[] absoluteOperators = new String[relativeOperators.length];
+
+        for (int i = 0; i < relativeOperators.length; i++) {
+            double relativeDouble = Double.parseDouble(relativeOperators[i]);
+            relativeDouble += currentCoordinate;
+            absoluteOperators[i] = String.valueOf(relativeDouble);
+        }
+
+        return absoluteOperators;
+    }
+
+
 
     /**
      * Processes an individual pathing operator and all of its arguments, converting into one or more
@@ -202,15 +216,13 @@ private List<IPathShape> processPathOperator(String[] pathProperties, IPathShape
             zOperator.setCoordinates(shapeCoordinates);
         }
 
-        Point endingPoint = null;
         if (pathShape != null) {
             if (shapeCoordinates != null) {
                 pathShape.setCoordinates(shapeCoordinates);
             }
-            endingPoint = pathShape.getEndingPoint();
+            currentPoint = pathShape.getEndingPoint(); // unsupported operators are ignored.
             shapes.add(pathShape);
         }
-        currentPoint = endingPoint;
         return shapes;
     }
 

svg/src/main/java/com/itextpdf/svg/renderers/path/IPathShape.java

@@ -44,7 +44,6 @@ This file is part of the iText (R) project.
 
 import com.itextpdf.kernel.geom.Point;
 import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
-import com.itextpdf.svg.renderers.SvgDrawContext;
 
 import java.util.Map;
 
@@ -72,6 +71,11 @@ public interface IPathShape {
      */
     void setCoordinates(String[] coordinates);
 
+    /**
+     * Returns the coordinates associated with this Shape.
+     *
+     * @return the coordinates associated with this Shape
+     */
     Map<String, String> getCoordinates();
 
     /**
@@ -82,4 +86,12 @@ public interface IPathShape {
      *         If the point does not exist or does not change {@code null} may be returned.
      */
     Point getEndingPoint();
+
+    /**
+     * Returns true when this shape is a relative operator. False if it is an absolute operator.
+     *
+     * @return true if relative, false if absolute
+     */
+    boolean isRelative();
+
 }

svg/src/main/java/com/itextpdf/svg/renderers/path/impl/AbstractPathShape.java

@@ -59,6 +59,10 @@ public abstract class AbstractPathShape implements IPathShape {
      */
     protected Map<String, String> properties;
 
+    /**
+     * Whether this is a relative operator or not.
+     */
+    protected boolean relative;
 
     /**
      * Get a coordinate based on a key value.
@@ -106,4 +110,8 @@ public Map<String, String> getCoordinates() {
         return properties;
     }
 
+    @Override
+    public boolean isRelative() {
+        return this.relative;
+    }
 }

svg/src/main/java/com/itextpdf/svg/renderers/path/impl/HorizontalLineTo.java

@@ -49,6 +49,24 @@ This file is part of the iText (R) project.
  * Implements lineTo(H) attribute of SVG's path element
  * */
 public class HorizontalLineTo extends OneDimensionalLineTo {
+
+    /**
+     * Creates an absolute Horizontal LineTo.
+     */
+    public HorizontalLineTo() {
+        this(false);
+    }
+
+    /**
+     * Creates a Horizontal LineTo. Set argument to true to create a relative HorizontalLineTo.
+     *
+     * @param relative whether this is a relative HorizontalLineTo or not
+     */
+    public HorizontalLineTo(boolean relative) {
+        super.relative = relative;
+    }
+
+
     @Override
     public void draw(PdfCanvas canvas) {
         float minX = getCoordinate(properties, MINIMUM_CHANGING_DIMENSION_VALUE);

svg/src/main/java/com/itextpdf/svg/renderers/path/impl/LineTo.java

@@ -54,6 +54,15 @@ This file is part of the iText (R) project.
  * */
 public class LineTo extends AbstractPathShape {
 
+    public LineTo() {
+        this(false);
+    }
+
+    public LineTo(boolean relative) {
+        super.relative = relative;
+    }
+
+
     @Override
     public void draw(PdfCanvas canvas) {
         canvas.lineTo(getCoordinate(properties, SvgConstants.Attributes.X), getCoordinate(properties, SvgConstants.Attributes.Y));
@@ -62,8 +71,8 @@ public void draw(PdfCanvas canvas) {
     @Override
     public void setCoordinates(String[] coordinates) {
         Map<String, String> map = new HashMap<String, String>();
-        map.put(SvgConstants.Attributes.X, coordinates.length > 0 && !coordinates[0].isEmpty() ? coordinates[0] : "0");
-        map.put(SvgConstants.Attributes.Y, coordinates.length > 1 && !coordinates[1].isEmpty() ? coordinates[1] : "0");
+        map.put(SvgConstants.Attributes.X, coordinates.length > 0 && ! coordinates[0].isEmpty() ? coordinates[0] : "0");
+        map.put(SvgConstants.Attributes.Y, coordinates.length > 1 && ! coordinates[1].isEmpty() ? coordinates[1] : "0");
         setProperties(map);
     }
 

svg/src/main/java/com/itextpdf/svg/renderers/path/impl/OneDimensionalLineTo.java

@@ -58,29 +58,29 @@ public abstract class OneDimensionalLineTo extends AbstractPathShape {
      * For vertical lines the x value will not change,
      * for horizontal lines y value will not change.
      */
-    protected final String CURRENT_NONCHANGING_DIMENSION_VALUE = "CURRENT_NONCHANGING_DIMENSION_VALUE";
+    protected static final String CURRENT_NONCHANGING_DIMENSION_VALUE = "CURRENT_NONCHANGING_DIMENSION_VALUE";
 
     /**
      * The minimum x or y value in the dimension that will change.
      * For vertical lines this will be the y value of the bottom-most point.
      * For horizontal lines this will be the x value of the left-most point.
      */
-    protected final String MINIMUM_CHANGING_DIMENSION_VALUE = "MINIMUM_CHANGING_DIMENSION_VALUE";
+    protected static final String MINIMUM_CHANGING_DIMENSION_VALUE = "MINIMUM_CHANGING_DIMENSION_VALUE";
 
     /**
      * The maximum x or y value in the dimension that will change.
      * For vertical lines this will be the y value of the top-most point.
      * For horizontal lines this will be the x value of the righ-most point.
      */
 
-    protected final String MAXIMUM_CHANGING_DIMENSION_VALUE = "MAXIMUM_CHANGING_DIMENSION_VALUE";
+    protected static final String MAXIMUM_CHANGING_DIMENSION_VALUE = "MAXIMUM_CHANGING_DIMENSION_VALUE";
 
     /**
      * The final x or y value in the dimension that will change.
      * For vertical lines this will be the y value of the last point.
      * For horizontal lines this will be the x value of the last point.
      */
-    protected final String ENDING_CHANGING_DIMENSION_VALUE = "ENDING_CHANGING_DIMENSION_VALUE";
+    protected static final String ENDING_CHANGING_DIMENSION_VALUE = "ENDING_CHANGING_DIMENSION_VALUE";
 
 
     /**

svg/src/main/java/com/itextpdf/svg/renderers/path/impl/PathShapeMapper.java

@@ -61,7 +61,9 @@ public Map<String, IPathShape> getMapping() {
         Map<String, IPathShape> result = new HashMap<>();
         result.put(SvgConstants.Attributes.PATH_DATA_LINE_TO, new LineTo());
         result.put(SvgConstants.Attributes.PATH_DATA_LINE_TO_V, new VerticalLineTo());
+        result.put(SvgConstants.Attributes.PATH_DATA_REL_LINE_TO_V, new VerticalLineTo(true));
         result.put(SvgConstants.Attributes.PATH_DATA_LINE_TO_H, new HorizontalLineTo());
+        result.put(SvgConstants.Attributes.PATH_DATA_REL_LINE_TO_H, new HorizontalLineTo(true));
         result.put(SvgConstants.Attributes.PATH_DATA_CLOSE_PATH, new ClosePath());
         result.put(SvgConstants.Attributes.PATH_DATA_CLOSE_PATH.toLowerCase(), new ClosePath());
         result.put(SvgConstants.Attributes.PATH_DATA_MOVE_TO, new MoveTo());

svg/src/main/java/com/itextpdf/svg/renderers/path/impl/VerticalLineTo.java

@@ -49,6 +49,24 @@ This file is part of the iText (R) project.
  * Implements lineTo(V) attribute of SVG's path element
  * */
 public class VerticalLineTo extends OneDimensionalLineTo {
+
+    /**
+     * Creates an absolute Vertical LineTo.
+     */
+    public VerticalLineTo() {
+        this(false);
+    }
+
+    /**
+     * Creates a Vertical LineTo. Set argument to true to create a relative VerticalLineTo.
+     *
+     * @param relative whether this is a relative VerticalLineTo or not
+     */
+    public VerticalLineTo(boolean relative) {
+        super.relative = relative;
+    }
+
+
     @Override
     public void draw(PdfCanvas canvas) {
         float minY = getCoordinate(properties, MINIMUM_CHANGING_DIMENSION_VALUE);

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

@@ -48,8 +48,8 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.utils.CompareTool;
 import com.itextpdf.styledxmlparser.node.IElementNode;
 import com.itextpdf.styledxmlparser.node.impl.jsoup.JsoupXmlParser;
-import com.itextpdf.svg.exceptions.SvgProcessingException;
 import com.itextpdf.svg.SvgConstants;
+import com.itextpdf.svg.exceptions.SvgProcessingException;
 import com.itextpdf.svg.processors.impl.DefaultSvgProcessor;
 import com.itextpdf.svg.renderers.IBranchSvgNodeRenderer;
 import com.itextpdf.svg.renderers.ISvgNodeRenderer;
@@ -71,7 +71,7 @@ This file is part of the iText (R) project.
 import org.junit.experimental.categories.Category;
 import org.junit.rules.ExpectedException;
 
-@Category(IntegrationTest.class)
+@Category( IntegrationTest.class )
 public class PathSvgNodeRendererTest extends SvgIntegrationTest {
 
     public static final String sourceFolder = "./src/test/resources/com/itextpdf/svg/renderers/impl/PathSvgNodeRendererTest/";
@@ -106,7 +106,7 @@ public void pathNodeRendererMoveToTest() throws IOException, InterruptedExceptio
 
         String result = new CompareTool().compareByContent(destinationFolder + filename, sourceFolder + "cmp_" + filename, destinationFolder, "diff_");
 
-        if (result != null && !result.contains("No visual differences")) {
+        if (result != null && ! result.contains("No visual differences")) {
             Assert.fail(result);
         }
     }
@@ -132,7 +132,7 @@ public void pathNodeRendererMoveToTest1() throws IOException, InterruptedExcepti
 
         String result = new CompareTool().compareByContent(destinationFolder + filename, sourceFolder + "cmp_" + filename, destinationFolder, "diff_");
 
-        if (result != null && !result.contains("No visual differences")) {
+        if (result != null && ! result.contains("No visual differences")) {
             Assert.fail(result);
         }
     }
@@ -157,7 +157,7 @@ public void pathNodeRendererCurveToTest() throws IOException, InterruptedExcepti
         doc.close();
         String result = new CompareTool().compareByContent(destinationFolder + filename, sourceFolder + "cmp_" + filename, destinationFolder, "diff_");
 
-        if (result != null && !result.contains("No visual differences")) {
+        if (result != null && ! result.contains("No visual differences")) {
             Assert.fail(result);
         }
     }
@@ -182,7 +182,7 @@ public void pathNodeRendererCurveToTest1() throws IOException, InterruptedExcept
 
         String result = new CompareTool().compareByContent(destinationFolder + filename, sourceFolder + "cmp_" + filename, destinationFolder, "diff_");
 
-        if (result != null && !result.contains("No visual differences")) {
+        if (result != null && ! result.contains("No visual differences")) {
             Assert.fail(result);
         }
     }
@@ -206,7 +206,7 @@ public void pathNodeRendererQCurveToCurveToTest() throws IOException, Interrupte
         doc.close();
         String result = new CompareTool().compareByContent(destinationFolder + filename, sourceFolder + "cmp_" + filename, destinationFolder, "diff_");
 
-        if (result != null && !result.contains("No visual differences")) {
+        if (result != null && ! result.contains("No visual differences")) {
             Assert.fail(result);
         }
     }
@@ -230,7 +230,7 @@ public void pathNodeRendererQCurveToCurveToTest1() throws IOException, Interrupt
         doc.close();
         String result = new CompareTool().compareByContent(destinationFolder + filename, sourceFolder + "cmp_" + filename, destinationFolder, "diff_");
 
-        if (result != null && !result.contains("No visual differences")) {
+        if (result != null && ! result.contains("No visual differences")) {
             Assert.fail(result);
         }
     }
@@ -304,11 +304,11 @@ public void pathNodeRendererCurveComplexTest() throws IOException, InterruptedEx
     }
 
     @Test
-    public void deepCopyTest(){
+    public void deepCopyTest() {
         PathSvgNodeRenderer expected = new PathSvgNodeRenderer();
-        expected.setAttribute(SvgConstants.Attributes.FILL,"blue");
-        ISvgNodeRenderer actual =expected.createDeepCopy();
-        Assert.assertEquals(expected,actual);
+        expected.setAttribute(SvgConstants.Attributes.FILL, "blue");
+        ISvgNodeRenderer actual = expected.createDeepCopy();
+        Assert.assertEquals(expected, actual);
     }
 
     @Test
@@ -377,9 +377,40 @@ public void pathHOperatorSimpleTest01() throws IOException, InterruptedException
     public void pathHandVOperatorTest01() throws IOException, InterruptedException {
         convertAndCompareVisually(sourceFolder, destinationFolder, "pathHandVOperatorTest01");
     }
+
     @Test
     public void curveToContinuePathingTest() throws IOException, InterruptedException {
         convertAndCompareVisually(sourceFolder, destinationFolder, "curveToContinuePathingTest");
     }
 
+    @Test
+    public void relativeHorizontalLineToTest() throws IOException, InterruptedException {
+        convertAndCompareVisually(sourceFolder, destinationFolder, "relativeHorizontalLineTo");
+    }
+
+    @Test
+    public void relativeVerticalLineToTest() throws IOException, InterruptedException {
+        convertAndCompareVisually(sourceFolder, destinationFolder, "relativeVerticalLineTo");
+    }
+
+    @Test
+    public void combinedRelativeVerticalLineToAndRelativeHorizontalLineToTest() throws IOException, InterruptedException {
+        convertAndCompareVisually(sourceFolder, destinationFolder, "combinedRelativeVerticalLineToAndRelativeHorizontalLineTo");
+    }
+
+    @Test
+    public void multipleRelativeHorizontalLineToTest() throws IOException, InterruptedException {
+        convertAndCompareVisually(sourceFolder, destinationFolder, "multipleRelativeHorizontalLineTo");
+    }
+
+    @Test
+    public void multipleRelativeVerticalLineToTest() throws IOException, InterruptedException {
+        convertAndCompareVisually(sourceFolder, destinationFolder, "multipleRelativeVerticalLineTo");
+    }
+
+    @Test
+    public void eofillUnsuportedPathTest() throws IOException, InterruptedException {
+        convertAndCompareVisually(sourceFolder, destinationFolder, "eofillUnsuportedPathTest");
+    }
+
 }