Allow "closepath" in 'path stencil expressions

Currently there is no way to properly close a subpath in the 'path
stencil expression.

This patch adds the appropriate operators for the PS and SVG backends;
both operators have arity 0, which made this feature trivial to add.

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 27a3d8f37803bf9707123e6e5d46d9730f9bb251..ee1da5308e3be0a49254d3f108288b8f6ba6cd79 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -273,6 +273,7 @@
              (cond
               ((memq head '(rmoveto rlineto lineto moveto)) 2)
               ((memq head '(rcurveto curveto)) 6)
              (cond
               ((memq head '(rmoveto rlineto lineto moveto)) 2)
               ((memq head '(rcurveto curveto)) 6)

+              ((eq? head 'closepath) 0)

               (else 1)))
             (args (take rest arity))
             )
               (else 1)))
             (args (take rest arity))
             )

diff --git a/scm/output-svg.scm b/scm/output-svg.scm
index 6076bdaa72ac0b981d986664c6671d4951295a40..1963728eba156bcba667f31dbccb1bdc0e9f5a96 100644 (file)
--- a/scm/output-svg.scm
+++ b/scm/output-svg.scm
@@ -414,6 +414,7 @@
           (arity
             (cond ((memq head '(rmoveto rlineto lineto moveto)) 2)
                   ((memq head '(rcurveto curveto)) 6)
           (arity
             (cond ((memq head '(rmoveto rlineto lineto moveto)) 2)
                   ((memq head '(rcurveto curveto)) 6)

+                  ((eq? head 'closepath) 0)

                   (else 1)))
           (args (take rest arity))
           (svg-head (assoc-get head
                   (else 1)))
           (args (take rest arity))
           (svg-head (assoc-get head


@@ -422,7 +423,8 @@
                                  (curveto . C)
                                  (moveto . M)
                                  (lineto . L)
                                  (curveto . C)
                                  (moveto . M)
                                  (lineto . L)

-                                 (rlineto . l))
+                                 (rlineto . l)
+                                 (closepath . z))

                                "")))
 
          (cons (format "~a~a"
                                "")))
 
          (cons (format "~a~a"