X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=scm%2Foutput-ps.scm;h=2303bf2d02d6d4fb0b78232050f0886605bbc8e5;hb=c96b509db0ae672e8dfa143c7e94f0b37f76a8c5;hp=dcfbfe0d1cb23d52c20363e13903cebd934c8c05;hpb=87d48c0b8a5c75a1476bbb88ca853de838f3c7ac;p=lilypond.git

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index dcfbfe0d1c..2303bf2d02 100644
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;                 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 ;;;; Note: currently misused as testbed for titles with markup, see
@@ -21,9 +21,6 @@
 	    blank
 	    circle
 	    dot
-	    white-dot
-	    beam
-	    bracket
 	    dashed-slur
 	    char
 	    setcolor
@@ -31,17 +28,13 @@
 	    named-glyph
 	    dashed-line
 	    zigzag-line
-	    ez-ball
 	    comment
 	    repeat-slash
 	    placebox
 	    bezier-sandwich
-	    horizontal-line
 	    embedded-ps
-	    filledbox
 	    round-filled-box
 	    text
-	    white-text
 	    polygon
 	    draw-line
 	    no-origin))
@@ -54,233 +47,233 @@
 	     (scm framework-ps)
 	     (lily))
 
-
-;;(map export
-;;   (append (ly:all-stencil-expressions) (ly:all-output-backend-commands)))
-
-;; huh?
-;;(write (ly:all-output-backend-commands))
-;;(write (ly:all-stencil-expressions))
+;;; helper functions, not part of output interface
+;;;
 
 
-;;; 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))
 
+(define (round2 num)
+  (/ (round (* 100 num)) 100))
+
+(define (round4 num)
+  (/ (round (* 10000 num)) 10000))
+
+(define (str4 num)
+  (format #f "~f" (round4 num)))
+
+(define (number-pair->string4 numpair)
+  (format #f "~f ~f" (round4 (car numpair)) (round4 (cdr numpair))))
+
+(define (numbers->string4 numlist)
+  (string-join (map str4 numlist) " "))
+
 ;; FIXME: lily-def
 (define-public (ps-string-def prefix key val)
-  (string-append "/" prefix (symbol->string key) " ("
-		 (escape-parentheses val)
-		 ") def\n"))
-
+  (format #f "/ ~a~a (~a) def\n"
+	  prefix
+	  (symbol->string key)
+	  (escape-parentheses val)))
 
 (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")))
+    (format #f "/~a~a ~a def\n"
+	    prefix
+	    (symbol->string key) s)))
 
 
 ;;;
 ;;; 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"))
-
-(define (bracket arch_angle arch_width arch_height height arch_thick thick)
-  (string-append
-   (ly:numbers->string
-    (list arch_angle arch_width arch_height height arch_thick thick))
-   " draw_bracket"))
-
-(define (circle radius thick)
-  (format
-   "~a ~a draw_circle" radius thick))
+  (format #f "~a ~a draw_bezier_sandwich" 
+	  (string-join (map number-pair->string4 lst) " ")
+	  (str4 thick)))
 
 (define (char font i)
-  (string-append 
-   (ps-font-command font) " setfont " 
-   "(\\" (ly:inexact->string i 8) ") show"))
+  (format #f "~a (\\~a) show"
+   (ps-font-command font)
+   (ly:inexact->string i 8)))
+
+(define (circle radius thick fill)
+  (format #f
+   "~a ~f ~f draw_circle"
+   (if fill
+     "true"
+     "false")
+   (round4 radius) (round4 thick)))
 
 (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"))
+  (format #f "~a ~a ~a [ ~a ~a ] 0 draw_dashed_line"
+   (str4 dx)
+   (str4 dy)
+   (str4 thick)
+   (str4 on)
+   (str4 off)))
 
 ;; 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"))
+  (format #f "~a ~a [ ~a ~a ] 0 draw_dashed_slur"
+	  (let ((control-points (append (cddr l) (list (car l) (cadr l)))))
+	    (string-join (map number-pair->string4 control-points) " "))
+	  (str4 thick)
+	  (str4 on)
+	  (str4 off)))
 
 (define (dot x y radius)
-  (string-append
-   " "
-   (ly:numbers->string
-    (list x y radius)) " draw_dot"))
+  (format #f " ~a draw_dot"
+   (numbers->string4 (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"))
+  (format #f "~a ~a ~a ~a ~a draw_line"
+	  (str4 (- x2 x1))
+	  (str4 (- y2 y1))
+	  (str4 x1)
+	  (str4 y1)
+	  (str4 thick)))
 
 (define (embedded-ps string)
   string)
 
-;; FIXME. 
-(define (ez-ball ch letter-col ball-col)
-  (string-append
-   " (" ch ") "
-   (ly:numbers->string (list letter-col ball-col))
-   ;; FIXME: barf
-   " /Helvetica-Bold "
-   " draw_ez_ball"))
-
-;; 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
-	 x-y-named-glyphs)
-  (format #f "gsave 1 output-scale div 1 output-scale div scale
-  /~a findfont ~a scalefont setfont\n~a grestore" postscript-font-name size
-  (apply
-   string-append
-   (map (lambda  (item)
-	  (let
-	      ((x (car item))
-		(y (cadr item))
-		(g (caddr item)))
-
-	    (if (and (= 0.0 x)
-		     (= 0.0 y))
-		(format #f " /~a glyphshow " g)
-		(format #f " ~a ~a rmoveto /~a glyphshow "
-			x y g))))
-	x-y-named-glyphs))
-  ))
+(define (glyph-string postscript-font-name
+		      size
+		      cid?
+		      w-x-y-named-glyphs)
+
+  (define (glyph-spec w x y g)
+    (let ((prefix (if (string? g) "/" "")))
+      (format #f "~f ~f ~a~a"
+	      (round2 (+ w x))
+	      (round2 y)
+	      prefix g)))
+  
+  (format #f
+	  (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
+	  size
+	  (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)))
-	 (location (if (ly:input-location? music-origin)
-		       (ly:input-file-line-column music-origin)
-		       #f
-		       ))
-	 (file (if location (string-append (getcwd) "/" (car location))
-		   #f))
-	 (x-ext (ly:grob-extent grob grob X)) 
-	 (y-ext (ly:grob-extent grob grob Y)) 
-	 )
-
-    (if (and location
-	     (< 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))
-	"")))
-
-;; WTF is this in every backend?
-(define (horizontal-line x1 x2 th)
-  (draw-line th x1 0 x2 0))
+			   (ly:music-property cause 'origin))))
+    (if (not (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)))
+	      (format #f "~$ ~$ ~$ ~$ (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.
+		      (string-regexp-substitute "\\\\" "/" 
+				      (string-regexp-substitute " " "%20" file))
+		      (cadr location)
+		      (caddr location)
+		      (cadddr 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"))))
+	  (substring key 0 (min (string-length prefix) (string-length key)))
+	  prefix)
+      (format "/~a { ~a } bind def\n" key val)
+      (format "/~a (~a) def\n" key val))))
 
 (define (named-glyph font glyph)
-  (string-append 
-   (ps-font-command font) " setfont " 
-   "/" glyph " glyphshow "))
+  (format #f "~a /~a glyphshow " ;;Why is there a space at the end?
+	  (ps-font-command font)
+	  glyph))
 
 (define (no-origin)
   "")
 
 (define (placebox x y s) 
-  (string-append 
-   (ly:number->string x) " " (ly:number->string y) " { " s " } place-box\n"))
-
-(define (polygon points blotdiameter)
-  (string-append
-   (ly:numbers->string points) " "
-   (ly:number->string (/ (length points) 2)) " "
-   (ly:number->string blotdiameter)
-   " draw_polygon"))
-
-(define (repeat-slash wid slope thick)
-  (string-append
-   (ly:numbers->string (list wid slope thick))
-   " draw_repeat_slash"))
+  (format #f
+"~a ~a moveto
+~a\n"
+  (str4 x)
+  (str4 y)
+  s))
+
+(define (polygon points blot-diameter filled?)
+  (format #f "~a ~a ~a ~a draw_polygon"
+	  (if filled? "true" "false")
+	  (numbers->string4 points)
+	  (number->string (- (/ (length points) 2) 1))
+	  (str4 blot-diameter)))
+
+(define (repeat-slash width slope beam-thickness)
+  (define (euclidean-length x y)
+    (sqrt (+ (* x x) (* y y))))
+
+  (let ((x-width (euclidean-length slope (/ beam-thickness slope)))
+	(height (* width slope)))
+    (format #f "~a draw_repeat_slash"
+	    (numbers->string4 (list x-width width height)))))
 
 ;; restore color from stack
-(define (resetcolor)
-  (string-append "setrgbcolor\n"))
-
-(define (round-filled-box x y width height blotdiam)
-  (string-append
-   (ly:numbers->string
-    (list x y width height blotdiam)) " draw_round_box"))
+(define (resetcolor) "setrgbcolor\n")
+
+(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))))
+    (format #f "~a draw_round_box"
+	    (numbers->string4
+	      (list width height x y blotdiam)))))
 
 ;; 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"))
+  (format #f "currentrgbcolor ~a setrgbcolor\n"
+	  (numbers->string4 (list r g b))))
 
 (define (text font s)
-;  (ly:warn "TEXT backend-command encountered in Pango backend\nargs: ~a ~a" font str)
+  ;; (ly:warning (_ "TEXT backend-command encountered in Pango backend"))
+  ;; (ly:warning (_ "Arguments: ~a ~a"" font str))
   
   (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
@@ -295,37 +288,22 @@
   "\n unknown\n")
 
 (define (url-link url x y)
-  (format "~a ~a ~a ~a (~a) mark_URI"
+  (format #f "~$ ~$ ~$ ~$ (~a) mark_URI"
 	  (car x)
 	  (car y)
 	  (cdr x)
 	  (cdr y)
 	  url))
 
-(define (utf8-string pango-font-description string)
-  (ly:warn "utf8-string encountered in PS backend"))
-
-(define (white-dot x y radius)
-  (string-append
-   " "
-   (ly:numbers->string
-    (list x y radius)) " draw_white_dot"))
+(define (utf-8-string pango-font-description string)
+  (ly:warning (_ "utf-8-string encountered in PS backend")))
 
-(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"))
+  (format #f "~a ~a ~a ~a 0 0 ~a ~a draw_zigzag_line"
+   (if centre? "true" "false")
+   (str4 zzw)
+   (str4 zzh)
+   (str4 thick)
+   (str4 dx)
+   (str4 dy)))