draft svg parser (WIP)

Author: nicolaasuni

examples/index.php

@@ -120,6 +120,7 @@
 // test SVG
 //$svgid01 = $pdf->addSVG('./images/tcpdf_box.svg');
 //$svgid01_out = $pdf->getSetSVG($svgid01, 0, 60, 100, 50, $page01['height']);
+//echo($svgid01_out); exit; //DEBUG
 //$pdf->page->addContent($svgid01_out);
 
 // ----------

src/SVG.php

@@ -967,7 +967,7 @@ protected function getSVGPath(
                 $params[$prk] = $this->getUnitValuePoints($prv, self::REFUNITVAL, self::SVGUNIT);
                 if (abs($params[$prk]) < $this->svgminunitlen) {
                     // approximate little values to zero
-                    $params[$prk] = 0;
+                    $params[$prk] = 0.0;
                 }
             }
 
@@ -992,7 +992,9 @@ protected function getSVGPath(
             $coord['firstcmd'] = false;
         }
 
-        return $out . ' ' . $pop . "\n";
+        $out .= ' ' . $pop . "\n";
+
+        return $out;
     }
 
     /**
@@ -1726,7 +1728,10 @@ protected function parseSVGStyleStroke(
 
         $out .= $this->graph->getStyleCmd($strokestyle);
 
-        $svgstyle['objstyle'] .= 'D'; // @phpstan-ignore-line
+        $objstyle = 'D';
+        if (strpos($svgstyle['objstyle'], $objstyle) === false) {
+            $svgstyle['objstyle'] .= $objstyle; // @phpstan-ignore-line
+        }
 
         return $out;
     }
@@ -2087,7 +2092,10 @@ protected function parseSVGStyleFill(
             }
         }
 
-        $svgstyle['objstyle'] .= ($svgstyle['fill-rule'] == 'evenodd') ? 'F*' : 'F';
+        $objstyle = ($svgstyle['fill-rule'] == 'evenodd') ? 'F*' : 'F';
+        if (strpos($svgstyle['objstyle'], $objstyle) === false) {
+            $svgstyle['objstyle'] .= $objstyle; // @phpstan-ignore-line
+        }
 
         $out .= $col->getPdfColor();
 
@@ -2130,7 +2138,7 @@ protected function parseSVGStyleClipPath(
      * @param string $clip_fnc Optional clipping function name.
      * @param array<mixed> $clip_par Optional clipping function parameters.
      *
-     * @return string the Raw PDF command.
+     * @return string the object style.
      */
     protected function parseSVGStyle(
         \XMLParser $parser,
@@ -2178,7 +2186,10 @@ protected function parseSVGStyle(
             $this->svgobjs[$soid]['styles'][$psid]
         );
 
-        return $out;
+        // @phpstan-ignore assign.propertyType
+        $this->svgobjs[$soid]['out'] .= $out;
+
+        return $svgstyle['objstyle'];
     }
 
     /**
@@ -3010,13 +3021,15 @@ protected function parseSVGTagSTARTpath(\XMLParser $parser, int $soid, array $at
             [$width, 0.0, 0.0, $height, $posx, $posy]
         );
 
+
         if ($this->svgobjs[$soid]['clipmode']) {
             // @phpstan-ignore assign.propertyType
             $this->svgobjs[$soid]['out'] .= $this->getOutSVGTransformation($tmx);
             // @phpstan-ignore assign.propertyType
             $this->svgobjs[$soid]['out'] .= $this->getSVGPath($ptd, 'CNZ');
             return;
         }
+
         // @phpstan-ignore assign.propertyType
         $this->svgobjs[$soid]['out'] .= $this->graph->getStartTransform();
         // @phpstan-ignore assign.propertyType
@@ -3031,6 +3044,7 @@ protected function parseSVGTagSTARTpath(\XMLParser $parser, int $soid, array $at
             'getSVGPath',
             [$ptd, 'CNZ'],
         );
+
         if (!empty($obstyle)) {
             // @phpstan-ignore assign.propertyType
             $this->svgobjs[$soid]['out'] .= $this->getSVGPath($ptd, $obstyle);