X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-ps.scm;h=7694e0a3862acd566e9b03aa02106651cf0ab047;hb=2a4d7df6e50f62cb03dc133fc9fb92b6806fa7c7;hp=5db157f282e82603b90fa11e4604bd80bcb63cab;hpb=34881554afeaf03a55a3a983caf9cfeaaf3ea060;p=lilypond.git

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 5db157f282..7694e0a386 100644
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -20,32 +20,32 @@
 
   ;; JUNK this -- see lily.scm: ly:all-output-backend-commands
   #:export (unknown
-	     blank
-	     dot
-	     white-dot
-	     beam
-	     bracket
-	     dashed-slur
-	     char
-	     dashed-line
-	     zigzag-line
-	     symmetric-x-triangle
-	     ez-ball
-	     comment
-	     repeat-slash
-	     placebox
-	     bezier-sandwich
-	     horizontal-line
-	     embedded-ps
-	     filledbox
-	     round-filled-box
-	     text
-	     white-text
-	     tuplet
-	     polygon
-	     draw-line
-	     no-origin
-	     ))
+	    blank
+	    dot
+	    white-dot
+	    beam
+	    bracket
+	    dashed-slur
+	    char
+	    setcolor
+	    resetcolor
+	    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))
 
 
 (use-modules (guile)
@@ -99,14 +99,14 @@
    (ly:numbers->string (list slope width thick blot)) " draw_beam" ))
 
 ;; two beziers
-(define (bezier-sandwich l thick)
+(define (bezier-sandwich lst thick)
   (string-append 
-   (string-join (map ly:number-pair->string l) " ")
+   (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)
+(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))
@@ -114,8 +114,18 @@
 
 (define (char font i)
   (string-append 
-    (ps-font-command font) " setfont " 
-   "(\\" (ly:inexact->string i 8) ") show" ))
+   (ps-font-command font) " setfont " 
+   "(\\" (ly:inexact->string i 8) ") show"))
+
+;; 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"))
+
+;; restore color from stack
+(define (resetcolor)
+  (string-append "setrgbcolor\n"))
 
 (define (dashed-line thick on off dx dy)
   (string-append 
@@ -128,35 +138,23 @@
    " ] 0 draw_dashed_line"))
 
 ;; what the heck is this interface ?
-(define (dashed-slur thick dash l)
+(define (dashed-slur thick on off l)
   (string-append 
    (string-join (map ly:number-pair->string l) " ")
    " "
    (ly:number->string thick) 
    " [ "
-   (ly:number->string dash)
-   " "
-   ;;UGH.  10 ?
-   (ly:number->string (* 10 thick))
+   (ly:number->string on)
+   " "   
+   (ly:number->string off)
    " ] 0 draw_dashed_slur"))
 
-; todo: merge with tex-font-command?
-
-(define (embedded-ps string)
-  string)
-
 (define (dot x y radius)
   (string-append
    " "
    (ly:numbers->string
     (list x y radius)) " draw_dot"))
 
-(define (white-dot x y radius)
-  (string-append
-   " "
-   (ly:numbers->string
-    (list x y radius)) " draw_white_dot"))
-
 (define (draw-line thick x1 y1 x2 y2)
   (string-append 
    "1 setlinecap 1 setlinejoin "
@@ -166,17 +164,72 @@
    (ly:number->string x2) " "
    (ly:number->string y2) " lineto stroke"))
 
+(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))
-   " /Helvetica-Bold " ;; ugh
+   ;; FIXME: barf
+   " /Helvetica-Bold "
    " draw_ez_ball"))
 
-(define (filledbox breapth width depth height) ; FIXME : use draw_round_box
+;; FIXME: use draw_round_box
+(define (filledbox breapth width depth height)
   (string-append (ly:numbers->string (list breapth width depth height))
 		 " draw_box"))
 
+
+(define (utf8-string pango-font-description string)
+  (ly:warn "utf8-string encountered in PS backend"))
+
+(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 (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
+		       ))
+	 (x-ext (ly:grob-extent grob grob X)) 
+	 (y-ext (ly:grob-extent grob grob Y)) 
+	 )
+
+    (if location
+	(format "~a ~a ~a ~a (lily-edit.sh ~a ~a ~a) mark_file_line\n"
+		(+ (car offset) (car x-ext))
+		(+ (cdr offset) (car y-ext))
+		(+ (car offset) (cdr x-ext))
+		(+ (cdr offset) (cdr y-ext))
+		(car location)
+		(cadr location)
+		(caddr location))
+	"")))
+
 ;; WTF is this in every backend?
 (define (horizontal-line x1 x2 th)
   (draw-line th x1 0 x2 0))
@@ -189,6 +242,13 @@
 	(string-append "/" key " {" val "} bind def\n")
 	(string-append "/" key " (" val ") def\n"))))
 
+(define (named-glyph font glyph)
+  (string-append 
+   (ps-font-command font) " setfont " 
+   "/" glyph " glyphshow "))
+
+(define (no-origin)
+  "")
 
 (define (placebox x y s) 
   (string-append 
@@ -207,76 +267,60 @@
    " draw_repeat_slash"))
 
 (define (round-filled-box x y width height blotdiam)
-   (string-append
-    (ly:numbers->string
-     (list x y width height blotdiam)) " draw_round_box"))
-
-
-(define (stem breapth width depth height) ; FIXME: use draw_round_box.
   (string-append
-   (ly:numbers->string (list breapth width depth height))
-   " draw_box" ))
-
-(define (symmetric-x-triangle thick w h)
-  (string-append
-   (ly:numbers->string (list h w thick))
-   " draw_symmetric_x_triangle"))
+   (ly:numbers->string
+    (list x y width height blotdiam)) " draw_round_box"))
 
 (define (text font s)
-  (let*
-      
-      ;; ugh, we should find a better way to
-      ;; extract the hsbw for /space from the font.
-      
-      ((space-length (cdar (ly:text-dimension font "t"))) 
-       (commands '())
-       (add-command (lambda (x) (set! commands (cons x commands)))) )
-
-    (string-fold
-     (lambda (chr word)
-       "Translate space as into moveto, group the rest in words."
-       (if (and (< 0 (string-length word))
-		(equal? #\space  chr))
-	   (add-command 
-	    (string-append "(" (ps-encoding word) ") show\n")))
-
-       (if (equal? #\space chr)
-	   (add-command  (string-append (number->string space-length) " 0.0 rmoveto ")) )
-       
-       (if (equal? #\space chr)
-	   ""
-	   (string-append word (make-string 1 chr))))
-     ""
-     (string-append s " "))
+;  (ly:warn "TEXT backend-command encountered in Pango backend\nargs: ~a ~a" font str)
+  
+  (let* ((space-length (cdar (ly:text-dimension font " ")))
+	 (space-move (string-append (number->string space-length)
+				    " 0.0 rmoveto "))
+	 (input-enc "latin1")
+	 (out-vec (decode-byte-string input-enc s)))
 
     (string-append
      (ps-font-command font) " setfont "
-     (string-join (reverse commands)))
-    ))
+     (string-join
+      (vector->list
+       (vector-for-each
+	
+	(lambda (sym)
+	  (if (eq? sym 'space)
+	      space-move
+	      (string-append "/" (symbol->string sym) " glyphshow")))
+	out-vec))))))
+
+;; FIXME: BARF helvetica?
+(define (white-text scale s)
+  (let ((mystring (string-append
+		   "(" s  ") " (number->string scale)
+		   " /Helvetica-Bold "
+		   " draw_white_text")))
+    mystring
 
 
-(define (white-text scale s)
-   (let ((mystring (string-append "(" s  ") " (number->string scale)   " /Helvetica-bold "
-          " draw_white_text")))
-  mystring))
+    ;; FIXME: broken with user install of GS 8.x
+    ""
+    ))
 
 (define (unknown) 
   "\n unknown\n")
 
-(define (zigzag-line centre? zzw zzh thick dx dy)
+(define (white-dot x y radius)
   (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"))
-
-
-(define (grob-cause grob)
-  "")
+   " "
+   (ly:numbers->string
+    (list x y radius)) " draw_white_dot"))
 
-(define (no-origin)
-  "")
+(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"))