X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-ps.scm;h=f5dcc38a59becef440da81678c497bd47d1abca7;hb=7dcae7597fae14ce5c4e2e7d50c2709d162b7332;hp=f71bc3dfcefbfdc9a652f0c9331a4d339885550d;hpb=af4acb9a3e67c63bc339fa22325c4b640b4441ac;p=lilypond.git

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index f71bc3dfce..f5dcc38a59 100644
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -33,10 +33,10 @@
 	    polygon
 	    repeat-slash
 	    resetcolor
-	    resetrotatino
+	    resetrotation
 	    round-filled-box
 	    setcolor
-		setrotation
+	    setrotation
 	    text
 	    zigzag-line))
 
@@ -112,13 +112,16 @@
      "false")
    (round4 radius) (round4 thick)))
 
-(define (dashed-line thick on off dx dy)
-  (format #f "~a ~a ~a [ ~a ~a ] 0 draw_dashed_line"
+(define (dashed-line thick on off dx dy phase)
+  (format #f "~a ~a ~a [ ~a ~a ] ~a draw_dashed_line"
    (str4 dx)
    (str4 dy)
    (str4 thick)
    (str4 on)
-   (str4 off)))
+   (str4 off)
+   (str4 phase)
+   
+   ))
 
 ;; what the heck is this interface ?
 (define (dashed-slur thick on off l)
@@ -174,8 +177,8 @@
 
 (define (grob-cause offset grob)
   (let* ((cause (ly:grob-property grob 'cause))
-	 (music-origin (if (ly:music? cause)
-			   (ly:music-property cause 'origin))))
+	 (music-origin (if (ly:stream-event? cause)
+			   (ly:event-property cause 'origin))))
     (if (not (ly:input-location? music-origin))
 	""
 	(let* ((location (ly:input-file-line-char-column music-origin))
@@ -245,9 +248,6 @@
     (format #f "~a draw_repeat_slash"
 	    (numbers->string4 (list x-width width height)))))
 
-;; restore color from stack
-(define (resetcolor) "setrgbcolor\n")
-
 
 (define (round-filled-box left right bottom top blotdiam)
   (let* ((halfblot (/ blotdiam 2))
@@ -261,9 +261,12 @@
 
 ;; save current color on stack and set new color
 (define (setcolor r g b)
-  (format #f "currentrgbcolor ~a setrgbcolor\n"
+  (format #f "gsave ~a setrgbcolor\n"
 	  (numbers->string4 (list r g b))))
 
+;; restore color from stack
+(define (resetcolor) "grestore \n")
+
 ;; rotation around given point
 (define (setrotation ang x y)
   (format "gsave ~a translate ~a rotate ~a translate\n"
@@ -321,10 +324,31 @@
    (str4 dx)
    (str4 dy)))
 
+
 (define (path thickness exps)
+  (define (convert-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)
+		(convert-path-exps (drop rest arity))))
+	'()))
+    
+    
   (format
    "1 setlinecap ~a setlinewidth\n~a stroke"
    thickness
-   (string-join (map (lambda (x) (format "~a" x)) exps)
-		" "))) 
+   (string-join (convert-path-exps exps) " ")))