X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-ps.scm;h=91c4dc55d67c396603649464843bde2c8cf1c203;hb=84ae5d736bb6022b27a6eba1d8b1e2f8978d0f4a;hp=dcfbfe0d1cb23d52c20363e13903cebd934c8c05;hpb=87d48c0b8a5c75a1476bbb88ca853de838f3c7ac;p=lilypond.git

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index dcfbfe0d1c..91c4dc55d6 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,15 +47,6 @@
 	     (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
 (define (escape-parentheses s)
   (regexp-substitute/global #f "(^|[^\\])([\\(\\)])" s 'pre 1 "\\" 2 'post))
@@ -88,11 +72,6 @@
 ;;; 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 
@@ -101,21 +80,18 @@
    (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))
-
 (define (char font i)
   (string-append 
    (ps-font-command font) " setfont " 
    "(\\" (ly:inexact->string i 8) ") show"))
 
+(define (circle radius thick fill)
+  (format
+   "~a ~a ~a draw_circle" radius thick
+   (if fill
+       "true "
+       "false ")))
+
 (define (dashed-line thick on off dx dy)
   (string-append 
    (ly:number->string dx) " "
@@ -156,73 +132,64 @@
 (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))
-  ))
+	 size cid?
+	 w-x-y-named-glyphs)
+
+  (format #f "gsave 
+  /~a ~a ~a output-scale div scalefont setfont\n~a grestore"
+	  postscript-font-name
+	  (if cid?
+	      " /CIDFont findresource "
+	      " findfont")
+	  size
+	  (apply
+	   string-append
+	   (map (lambda  (item)
+		  (let*
+		      ((w (car item))
+		       (x (cadr item))
+		       (y (caddr item))
+		       (g (cadddr item))
+		       (prefix (if  (string? g) "/" "")))
+
+		    (format #f " gsave ~a~a glyphshow grestore ~$ ~$ rmoveto \n" prefix g (+ w x) y)
+		    ))
+		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 "~$ ~$ ~$ ~$ (textedit://~a:~a:~a:~a) mark_URI\n"
+		      (ly:number->string (+ (car offset) (car x-ext)))
+		      (ly:number->string (+ (cdr offset) (car y-ext)))
+		      (ly:number->string (+ (car offset) (cdr x-ext)))
+		      (ly:number->string (+ (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"))
@@ -241,14 +208,22 @@
   "")
 
 (define (placebox x y s) 
-  (string-append 
-   (ly:number->string x) " " (ly:number->string y) " { " s " } place-box\n"))
+  (format
+   "gsave ~a ~a translate
+0 0 moveto
+~a
+grestore\n"
+
+   (ly:number->string x)
+   (ly:number->string y)
+   s))
 
-(define (polygon points blotdiameter)
+(define (polygon points blot-diameter filled?)
   (string-append
    (ly:numbers->string points) " "
    (ly:number->string (/ (length points) 2)) " "
-   (ly:number->string blotdiameter)
+   (ly:number->string blot-diameter)
+   (if filled? " true " " false ")
    " draw_polygon"))
 
 (define (repeat-slash wid slope thick)
@@ -272,7 +247,8 @@
   " setrgbcolor\n"))
 
 (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)
@@ -302,22 +278,10 @@
 	  (cdr y)
 	  url))
 
-(define (utf8-string pango-font-description string)
-  (ly:warn "utf8-string encountered in PS backend"))
+(define (utf-8-string pango-font-description string)
+  (ly:warning (_ "utf-8-string encountered in PS backend")))
+
 
-(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