Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / scm / output-ps.scm

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 6fe28dc446c7bbfa8db3f004c5394ab21288007b..2e8c78e2d5f9ba4b161c040c8de8085ed31d7cf5 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -248,6 +248,12 @@
 ;; restore color from stack
 (define (resetcolor) "setrgbcolor\n")
 
+;; reset rotation
+(define (resetrotation ang x y)
+  (format "~a translate ~a rotate ~a translate\n"
+    (numbers->string4 (list x y))
+    (number->string (* -1 ang))
+    (numbers->string4 (list (* -1 x) (* -1 y)))))
 
 (define (round-filled-box left right bottom top blotdiam)
   (let* ((halfblot (/ blotdiam 2))
@@ -266,15 +272,11 @@
 
 ;; rotation around given point
 (define (setrotation ang x y)
-  (format "gsave ~a translate ~a rotate ~a translate\n"
+  (format "~a translate ~a rotate ~a translate\n"
     (numbers->string4 (list x y))
     (number->string ang)
     (numbers->string4 (list (* -1 x) (* -1 y)))))
 
-(define (resetrotation ang x y)
-  "grestore  ")
-
-
 (define (text font s)
   ;; (ly:warning (_ "TEXT backend-command encountered in Pango backend"))
   ;; (ly:warning (_ "Arguments: ~a ~a"" font str))
@@ -320,32 +322,3 @@
    (str4 thick)
    (str4 dx)
    (str4 dy)))
-
-
-(define (path thickness exps)
-  (define  (path-exps->ps-path-exps exps)
-    (if (pair? exps)
-       (let*
-           ((head (car exps))
-            (rest (cdr exps))
-            (arity 
-             (cond
-              ((memq head '(rmoveto rlineto lineto moveto)) 2)
-              ((memq head '(rcurveto curveto)) 6)
-              (else 1)))
-            (args (take rest arity))
-            )
-
-         ;; WARNING: this is a vulnerability: a user can output arbitrary PS code here.
-         (cons (format "~a ~a "
-                       (string-join (map (lambda (x) (format "~a " x)) args) " ")
-                       head)
-               (path-exps->ps-path-exps (drop rest arity))))
-       '()))
-    
-    
-  (format
-   "1 setlinecap ~a setlinewidth\n~a stroke"
-   thickness
-   (string-join (path-exps->ps-path-exps exps) " ")))
-