Conditionally close a path when adding stroke

Fill/stroke operations are a "finalizing" instruction for paths in the PDF spec. As part of the stroke operation the path can be left open or closed. This was not accounted for in the Surface interface.

Additionally, CPDF was also always closing the path on a fillStroke operation. PDFLib does support both options, but only the open-path method was used.

This change updates the Surface interface with an optional argument for the stroke and fillStroke methods that indicates whether or not to close the path. The default is to leave the path open.

Author: bsweeney

src/Svg/Surface/CPdf.php

@@ -4174,19 +4174,19 @@ function rect($x1, $y1, $width, $height)
         $this->addContent(sprintf("\n%.3F %.3F %.3F %.3F re", $x1, $y1, $width, $height));
     }
 
-    function stroke()
+    function stroke(bool $close = false)
     {
-        $this->addContent("\nS");
+        $this->addContent("\n" . ($close ? "s" : "S"));
     }
 
     function fill()
     {
         $this->addContent("\nf" . ($this->fillRule === "evenodd" ? "*" : ""));
     }
 
-    function fillStroke()
+    function fillStroke(bool $close = false)
     {
-        $this->addContent("\nb" . ($this->fillRule === "evenodd" ? "*" : ""));
+        $this->addContent("\n" . ($close ? "b" : "B") . ($this->fillRule === "evenodd" ? "*" : ""));
     }
 
     /**

src/Svg/Surface/SurfaceCpdf.php

@@ -122,10 +122,10 @@ public function closePath()
         $this->canvas->closePath();
     }
 
-    public function fillStroke()
+    public function fillStroke(bool $close = false)
     {
         if (self::DEBUG) echo __FUNCTION__ . "\n";
-        $this->canvas->fillStroke();
+        $this->canvas->fillStroke($close);
     }
 
     public function clip()
@@ -342,10 +342,10 @@ public function strokeRect($x, $y, $w, $h)
         $this->stroke();
     }
 
-    public function stroke()
+    public function stroke(bool $close = false)
     {
         if (self::DEBUG) echo __FUNCTION__ . "\n";
-        $this->canvas->stroke();
+        $this->canvas->stroke($close);
     }
 
     public function endPath()

src/Svg/Surface/SurfaceInterface.php

@@ -37,11 +37,11 @@ public function closePath();
 
     public function fill();
 
-    public function stroke();
+    public function stroke(bool $close = false);
 
     public function endPath();
 
-    public function fillStroke();
+    public function fillStroke(bool $close = false);
 
     public function clip();
 

src/Svg/Surface/SurfacePDFLib.php

@@ -120,10 +120,14 @@ public function closePath()
         $this->canvas->closepath();
     }
 
-    public function fillStroke()
+    public function fillStroke(bool $close = false)
     {
         if (self::DEBUG) echo __FUNCTION__ . "\n";
-        $this->canvas->fill_stroke();
+        if ($close) {
+            $this->canvas->closepath_fill_stroke();
+        } else {
+            $this->canvas->fill_stroke();
+        }
     }
 
     public function clip()
@@ -281,10 +285,14 @@ public function strokeRect($x, $y, $w, $h)
         $this->stroke();
     }
 
-    public function stroke()
+    public function stroke(bool $close = false)
     {
         if (self::DEBUG) echo __FUNCTION__ . "\n";
-        $this->canvas->stroke();
+        if ($close) {
+            $this->canvas->closepath_stroke();
+        } else {
+            $this->canvas->stroke();
+        }
     }
 
     public function endPath()

src/Svg/Tag/Shape.php

@@ -38,7 +38,7 @@ protected function after()
 
             if ($fill) {
                 if ($stroke) {
-                    $surface->fillStroke();
+                    $surface->fillStroke(false);
                 } else {
 //                    if (is_string($style->fill)) {
 //                        /** @var LinearGradient|RadialGradient $gradient */
@@ -51,7 +51,7 @@ protected function after()
                 }
             }
             elseif ($stroke) {
-                $surface->stroke();
+                $surface->stroke(false);
             }
             else {
                 $surface->endPath();