X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-ps.scm;h=9274279a2cf732f61d2db234c88b5d9c586e7bfe;hb=5c14a087ca6cbd665fd631452b7b1283ba0387c3;hp=6f8795915d6c74c91aefe9e001cef16c71ff79f6;hpb=459216bffe7aa64cd1e9f31f1fda28f90f6e9c1c;p=lilypond.git

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 6f8795915d..9274279a2c 100644
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -2,8 +2,8 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;;                 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;;                 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 ;;;; Note: currently misused as testbed for titles with markup, see
 ;;;;       input/test/title-markup.ly
@@ -18,30 +18,29 @@
 
   ;; JUNK this -- see lily.scm: ly:all-output-backend-commands
   #:export (unknown
-	    blank
+	    bezier-sandwich
+	    char
 	    circle
-	    dot
-	    white-dot
-	    beam
+	    comment
+	    dashed-line
 	    dashed-slur
-	    char
-	    setcolor
-	    resetcolor
+	    dot
+	    draw-line
+            ellipse
+	    embedded-ps
 	    named-glyph
-	    dashed-line
-	    zigzag-line
-	    comment
-	    repeat-slash
+	    no-origin
+            oval
 	    placebox
-	    bezier-sandwich
-	    embedded-ps
-	    filledbox
+	    polygon
+	    repeat-slash
+	    resetcolor
+	    resetrotation
 	    round-filled-box
+	    setcolor
+	    setrotation
 	    text
-	    white-text
-	    polygon
-	    draw-line
-	    no-origin))
+	    ))
 
 
 (use-modules (guile)
@@ -52,204 +51,211 @@
 	     (lily))
 
 ;;; helper functions, not part of output interface
-(define (escape-parentheses s)
-  (regexp-substitute/global #f "(^|[^\\])([\\(\\)])" s 'pre 1 "\\" 2 'post))
-
-(define (ps-encoding text)
-  (escape-parentheses text))
+;;;
 
-;; FIXME: lily-def
-(define-public (ps-string-def prefix key val)
-  (string-append "/" prefix (symbol->string key) " ("
-		 (escape-parentheses val)
-		 ") def\n"))
 
+;; ice-9 format uses a lot of memory
+;; using simple-format almost halves lilypond cell usage
 
-(define (ps-number-def prefix key val)
-  (let ((s (if (integer? val)
-	       (ly:number->string val)
-	       (ly:number->string (exact->inexact val)))))
-    (string-append "/" prefix (symbol->string key) " " s " def\n")))
+(define (str4 num)
+  (if (or (nan? num) (inf? num))
+      (begin
+	(ly:warning (_ "Found infinity or nan in output. Substituting 0.0"))
+	(if (ly:get-option 'strict-infinity-checking)
+	    (exit 1))
+	"0.0")
+      (ly:number->string num)))
 
+(define (number-pair->string4 numpair)
+  (ly:format "~4l" numpair)) 
 
 ;;;
 ;;; Lily output interface, PostScript implementation --- cleanup and docme
 ;;;
 
-;;; Output-interface functions
-(define (beam width slope thick blot)
-  (string-append
-   (ly:numbers->string (list slope width thick blot)) " draw_beam" ))
-
 ;; two beziers
 (define (bezier-sandwich lst thick)
-  (string-append 
-   (string-join (map ly:number-pair->string lst) " ")
-   " "
-   (ly:number->string thick)
-   " draw_bezier_sandwich"))
+  (ly:format "~l ~4f draw_bezier_sandwich" 
+	     (map number-pair->string4 lst)
+	  thick))
 
 (define (char font i)
-  (string-append 
-   (ps-font-command font) " setfont " 
-   "(\\" (ly:inexact->string i 8) ") show"))
+  (ly:format "~a (\\~a) show"
+   (ps-font-command font)
+   (ly:inexact->string i 8)))
 
 (define (circle radius thick fill)
-  (format
-   "~a ~a ~a draw_circle" radius thick
+  (ly:format
+   "~a ~4f ~4f draw_circle"
    (if fill
-       "true "
-       "false ")))
-
-(define (dashed-line thick on off dx dy)
-  (string-append 
-   (ly:number->string dx) " "
-   (ly:number->string dy) " "
-   (ly:number->string thick)
-   " [ "
-   (ly:number->string on) " "
-   (ly:number->string off)
-   " ] 0 draw_dashed_line"))
+     "true"
+     "false")
+   radius thick))
+
+(define (dashed-line thick on off dx dy phase)
+  (ly:format "~4f ~4f ~4f [ ~4f ~4f ] ~4f draw_dashed_line"
+   dx
+   dy
+   thick
+   on
+   off
+   phase))
 
 ;; what the heck is this interface ?
 (define (dashed-slur thick on off l)
-  (string-append 
-   (string-join (map ly:number-pair->string l) " ")
-   " "
-   (ly:number->string thick) 
-   " [ "
-   (ly:number->string on)
-   " "   
-   (ly:number->string off)
-   " ] 0 draw_dashed_slur"))
+  (ly:format "~l ~4f [ ~4f ~4f ] 0 draw_dashed_slur"
+	  (let ((control-points (append (cddr l) (list (car l) (cadr l)))))
+	    (map number-pair->string4 control-points))
+	  thick
+	  on
+	  off))
 
 (define (dot x y radius)
-  (string-append
-   " "
-   (ly:numbers->string
-    (list x y radius)) " draw_dot"))
+  (ly:format " ~4l draw_dot" (list radius x y)))
 
 (define (draw-line thick x1 y1 x2 y2)
-  (string-append 
-   "1 setlinecap 1 setlinejoin "
-   (ly:number->string thick) " setlinewidth "
-   (ly:number->string x1) " "
-   (ly:number->string y1) " moveto "
-   (ly:number->string x2) " "
-   (ly:number->string y2) " lineto stroke"))
+  (ly:format "~4f ~4f ~4f ~4f ~4f draw_line"
+	  (- x2 x1) (- y2 y1)
+	  x1 y1 thick))
+
+(define (ellipse x-radius y-radius thick fill)
+  (ly:format
+   "~a ~4f ~4f ~4f draw_ellipse"
+   (if fill
+     "true"
+     "false")
+   x-radius y-radius thick))
 
 (define (embedded-ps string)
   string)
 
-;; FIXME: use draw_round_box
-(define (filledbox breapth width depth height)
-  (string-append (ly:numbers->string (list breapth width depth height))
-		 " draw_box"))
-
-(define (glyph-string
-	 postscript-font-name
-	 size cid?
-	 x-y-named-glyphs)
+(define (glyph-string postscript-font-name
+		      size
+		      cid?
+		      w-x-y-named-glyphs)
 
-  (format #f "gsave 1 output-scale div 1 output-scale div scale
-  /~a ~a ~a scalefont setfont\n~a grestore"
+  (define (glyph-spec w x y g)
+    (let ((prefix (if (string? g) "/" "")))
+      (ly:format "~4f ~4f ~a~a"
+		 (+ w x)  y
+		 prefix g)))
+  
+  (ly:format 
+   (if cid?
+"/~a /CIDFont findresource ~a output-scale div scalefont setfont
+~a
+~a print_glyphs"
+
+"/~a ~a output-scale div selectfont
+~a
+~a print_glyphs")
 	  postscript-font-name
-	  (if cid?
-	      " /CIDFont findresource "
-	      " findfont") 
-	  
 	  size
-	  (apply
-	   string-append
-	   (map (lambda  (item)
-		  (let*
-		      ((x (car item))
-		       (y (cadr item))
-		       (g (caddr item))
-		       (prefix (if  (string? g) "/" "")))
-
-		    (if (and (= 0.0 x)
-			     (= 0.0 y))
-			(format #f " ~a~a glyphshow\n" prefix g)
-			(format #f " ~a ~a rmoveto ~a~a glyphshow\n"
-				x y
-				prefix
-				g))))
-		x-y-named-glyphs))))
+	  (string-join (map (lambda (x) (apply glyph-spec x))
+			    (reverse w-x-y-named-glyphs)) "\n")
+	  (length w-x-y-named-glyphs)))
+
 
 (define (grob-cause offset grob)
-  (let* ((cause (ly:grob-property grob 'cause))
-	 (music-origin (if (ly:music? cause)
-			   (ly:music-property cause 'origin))))
-    (if (not (ly:input-location? music-origin))
-	""
-	(let* ((location (ly:input-file-line-column music-origin))
-	       (raw-file (car location))
-	       (file (if (is-absolute? raw-file)
-			 raw-file
-			 (string-append (ly-getcwd) "/" raw-file)))
-	       (x-ext (ly:grob-extent grob grob X))
-	       (y-ext (ly:grob-extent grob grob Y)))
-
-	  (if (and (< 0 (interval-length x-ext))
-		   (< 0 (interval-length y-ext)))
-	      (format "~a ~a ~a ~a (textedit://~a:~a:~a) mark_URI\n"
-		      (+ (car offset) (car x-ext))
-		      (+ (cdr offset) (car y-ext))
-		      (+ (car offset) (cdr x-ext))
-		      (+ (cdr offset) (cdr y-ext))
-		      file
-		      (cadr location)
-		      (caddr location))
-	      "")))))
-
-(define (lily-def key val)
-  (let ((prefix "lilypondlayout"))
-    (if (string=?
-	 (substring key 0 (min (string-length prefix) (string-length key)))
-	 prefix)
-	(string-append "/" key " {" val "} bind def\n")
-	(string-append "/" key " (" val ") def\n"))))
+  (if (ly:get-option 'point-and-click)
+      (let* ((cause (ly:grob-property grob 'cause))
+	     (music-origin (if (ly:stream-event? cause)
+			       (ly:event-property cause 'origin))))
+	(if (ly:input-location? music-origin)
+	    (let* ((location (ly:input-file-line-char-column music-origin))
+		   (raw-file (car location))
+		   (file (if (is-absolute? raw-file)
+			     raw-file
+			     (string-append (ly-getcwd) "/" raw-file)))
+		   (x-ext (ly:grob-extent grob grob X))
+		   (y-ext (ly:grob-extent grob grob Y)))
+
+	      (if (and (< 0 (interval-length x-ext))
+		       (< 0 (interval-length y-ext)))
+		  (ly:format "~4f ~4f ~4f ~4f (textedit://~a:~a:~a:~a) mark_URI\n"
+			     (+ (car offset) (car x-ext))
+			     (+ (cdr offset) (car y-ext))
+			     (+ (car offset) (cdr x-ext))
+			     (+ (cdr offset) (cdr y-ext))
+
+			     ;; TODO
+			     ;;full escaping.
+
+			     ;; backslash is interpreted by GS.
+			     (ly:string-substitute "\\" "/" 
+						   (ly:string-substitute " " "%20" file))
+			     (cadr location)
+			     (caddr location)
+			     (cadddr location))
+		  ""))
+	    ""))
+      ""))
 
 (define (named-glyph font glyph)
-  (string-append 
-   (ps-font-command font) " setfont " 
-   "/" glyph " glyphshow "))
+  (ly:format "~a /~a glyphshow " ;;Why is there a space at the end?
+	     (ps-font-command font)
+	     glyph))
 
 (define (no-origin)
   "")
 
+(define (oval x-radius y-radius thick fill)
+  (ly:format
+   "~a ~4f ~4f ~4f draw_oval"
+   (if fill
+     "true"
+     "false")
+   x-radius y-radius thick))
+
 (define (placebox x y s) 
-  (string-append 
-   (ly:number->string x) " " (ly:number->string y) " { " s " } place-box\n"))
-
-(define (polygon points blotdiameter filled?)
-  (string-append
-   (ly:numbers->string points) " "
-   (ly:number->string (/ (length points) 2)) " "
-   (ly:number->string blotdiameter)
-   (if filled? " true " " false ")
-   " draw_polygon"))
-
-(define (repeat-slash wid slope thick)
-  (string-append
-   (ly:numbers->string (list wid slope thick))
-   " draw_repeat_slash"))
+  (ly:format
+"~4f ~4f moveto
+~a\n" x y s))
+
+(define (polygon points blot-diameter filled?)
+  (ly:format "~a ~4l ~a ~4f draw_polygon"
+	     (if filled? "true" "false")
+	     points
+	     (- (/ (length points) 2) 1)
+	     blot-diameter))
+
+(define (repeat-slash width slope beam-thickness)
+  (define (euclidean-length x y)
+    (sqrt (+ (* x x) (* y y))))
+
+  (let ((x-width (euclidean-length beam-thickness (/ beam-thickness slope)))
+	(height (* width slope)))
+    (ly:format "~4l draw_repeat_slash"
+	     (list x-width width height))))
+
+
+(define (round-filled-box left right bottom top blotdiam)
+  (let* ((halfblot (/ blotdiam 2))
+	 (x (- halfblot left))
+	 (width (- right (+ halfblot x)))
+	 (y (- halfblot bottom))
+	 (height (- top (+ halfblot y))))
+    (ly:format  "~4l draw_round_box"
+		(list width height x y blotdiam))))
+
+;; save current color on stack and set new color
+(define (setcolor r g b)
+  (ly:format "gsave ~4l setrgbcolor\n"
+	      (list r g b)))
 
 ;; restore color from stack
-(define (resetcolor)
-  (string-append "setrgbcolor\n"))
+(define (resetcolor) "grestore \n")
 
-(define (round-filled-box x y width height blotdiam)
-  (string-append
-   (ly:numbers->string
-    (list x y width height blotdiam)) " draw_round_box"))
+;; rotation around given point
+(define (setrotation ang x y)
+  (ly:format "gsave ~4l translate ~a rotate ~4l translate\n"
+	     (list x y)
+	     ang
+	     (list (* -1 x) (* -1 y))))
+
+(define (resetrotation ang x y)
+  "grestore  ")
 
-;; save current color on stack and set new color
-(define (setcolor r g b)
-  (string-append "currentrgbcolor "
-  (ly:numbers->string (list r g b))
-  " setrgbcolor\n"))
 
 (define (text font s)
   ;; (ly:warning (_ "TEXT backend-command encountered in Pango backend"))
@@ -257,11 +263,12 @@
   
   (let* ((space-length (cdar (ly:text-dimension font " ")))
 	 (space-move (string-append (number->string space-length)
+				    ;; how much precision do we need here?
 				    " 0.0 rmoveto "))
 	 (out-vec (decode-byte-string s)))
 
     (string-append
-     (ps-font-command font) " setfont "
+     (ps-font-command font) " "
      (string-join
       (vector->list
        (vector-for-each
@@ -276,40 +283,41 @@
   "\n unknown\n")
 
 (define (url-link url x y)
-  (format "~a ~a ~a ~a (~a) mark_URI"
-	  (car x)
-	  (car y)
-	  (cdr x)
-	  (cdr y)
-	  url))
-
-(define (utf8-string pango-font-description string)
-  (ly:warning (_ "utf8-string encountered in PS backend")))
-
-
-;; TODO: FIX THIS.
-;;
-(define (white-dot x y radius)
-  (string-append
-   " "
-   (ly:numbers->string
-    (list x y radius)) " draw_white_dot"))
-
-(define (white-text scale s)
-  (let ((mystring (string-append
-		   "(" s  ") " (number->string scale)
-		   " /Helvetica-Bold "
-		   " draw_white_text")))
-    mystring
-    ))
-
-(define (zigzag-line centre? zzw zzh thick dx dy)
-  (string-append
-   (if centre? "true" "false") " "
-   (ly:number->string zzw) " "
-   (ly:number->string zzh) " "
-   (ly:number->string thick) " "
-   "0 0 "
-   (ly:number->string dx) " "
-   (ly:number->string dy)
-   " draw_zigzag_line"))
+  (ly:format "~a ~a currentpoint vector_add  ~a ~a currentpoint vector_add (~a) mark_URI"
+	     (car x)
+	     (car y)
+	     (cdr x)
+	     (cdr y)
+	     url))
+
+(define (utf-8-string pango-font-description string)
+  (ly:warning (_ "utf-8-string encountered in PS backend")))
+
+(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 (ly:format
+			"~l ~a "
+			args 
+			head)
+		(convert-path-exps (drop rest arity))))
+	'()))
+    
+    
+  (ly:format
+   "1 setlinecap ~a setlinewidth\n~l stroke"
+   thickness
+   (convert-path-exps exps) ))
+