X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-ps.scm;h=fe168a103ffca1302e729a9f21d02881d7ed09ae;hb=57244befefb4bb8aad0f43e85da56ea378d64974;hp=65ecc55deb1040c05c03329e03506217f1d01c4b;hpb=46b41fe6cef4d1a9746e21f809c0ee62662aa145;p=lilypond.git

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 65ecc55deb..fe168a103f 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--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;                 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 ;;;; Note: currently misused as testbed for titles with markup, see
@@ -13,34 +13,30 @@
 ;;;;   * text setting, kerning.
 ;;;;   * document output-interface
 
-(debug-enable 'backtrace)
-
 (define-module (scm output-ps)
   #:re-export (quote)
 
   ;; JUNK this -- see lily.scm: ly:all-output-backend-commands
   #:export (unknown
 	    blank
+	    circle
 	    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))
@@ -53,23 +49,10 @@
 	     (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))
 
-(define (offset-add a b)
-  (cons (+ (car a) (car b))
-	(+ (cdr a) (cdr b))))
-
 (define (ps-encoding text)
   (escape-parentheses text))
 
@@ -104,17 +87,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 (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) " "
@@ -126,16 +110,15 @@
    " ] 0 draw_dashed_line"))
 
 ;; what the heck is this interface ?
-(define (dashed-slur thick dash lst)
+(define (dashed-slur thick on off l)
   (string-append 
-   (string-join (map ly:number-pair->string lst) " ")
+   (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"))
 
 (define (dot x y radius)
@@ -156,48 +139,84 @@
 (define (embedded-ps string)
   string)
 
-(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
+	 size cid?
 	 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 grob)
-  "")
 
-;; WTF is this in every backend?
-(define (horizontal-line x1 x2 th)
-  (draw-line th x1 0 x2 0))
+  (define (encoding-vector-hack glyphs)
+    
+    ;; GS fucks up with glyphs that are not in the
+    ;; encoding vector.
+    (define (inner j glyphs)
+      (if (or (null? glyphs) (> j 256))
+	  '()
+	  (cons (format "dup ~a /~a put\n"
+			j (car glyphs))
+		(inner (1+ j) (cdr glyphs)))))
+	  
+    (format "256 array 0 1 255 { 1 index exch /.notdef put} for\n ~a
+/EncHack reencode-font /EncHack findfont"
+	    (apply string-append (inner 32 glyphs))))
+    ;; END HACK.
+  
+  (format #f "gsave 1 output-scale div 1 output-scale div scale
+  /~a ~a ~a scalefont setfont\n~a grestore"
+	  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))))
+
+(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-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 "~a ~a ~a ~a (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))
+		      file
+		      (cadr location)
+		      (caddr location)
+		      (cadddr location))
+	      "")))))
 
 (define (lily-def key val)
   (let ((prefix "lilypondlayout"))
@@ -219,11 +238,12 @@
   (string-append 
    (ly:number->string x) " " (ly:number->string y) " { " s " } place-box\n"))
 
-(define (polygon points blotdiameter)
+(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)
@@ -231,46 +251,29 @@
    (ly:numbers->string (list wid slope thick))
    " draw_repeat_slash"))
 
+;; 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 (old-text font s)
-  ;; ugh, we should find a better way to
-  ;; extract the hsbw for /space from the font.
-  (let* ((space-length (cdar (ly:text-dimension font " "))) 
-	 (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 " "))
-
-    (string-append
-     (ps-font-command font) " setfont "
-     (string-join (reverse commands)))))
+;; 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 (new-text font s)
+(define (text font s)
+  ;; (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)
 				    " 0.0 rmoveto "))
-	 (input-enc 'latin1)
-	 (out-vec (decode-byte-string input-enc s)))
+	 (out-vec (decode-byte-string s)))
 
     (string-append
      (ps-font-command font) " setfont "
@@ -284,27 +287,21 @@
 	      (string-append "/" (symbol->string sym) " glyphshow")))
 	out-vec))))))
 
-;;(define text old-text)
-(define (text font str)
-  (ly:warn "TEXT backend-command encountered in Pango backend\nargs: ~a ~a" font str)
-  (new-text font str))
-
-;; FIXME: BARF helvetica?
-(define (white-text scale s)
-  (let ((mystring (string-append
-		   "(" s  ") " (number->string scale)
-		   " /Helvetica-Bold "
-		   " draw_white_text")))
-    mystring))
-
 (define (unknown) 
   "\n unknown\n")
 
-(define (white-dot x y radius)
-  (string-append
-   " "
-   (ly:numbers->string
-    (list x y radius)) " draw_white_dot"))
+(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")))
+
+
 
 (define (zigzag-line centre? zzw zzh thick dx dy)
   (string-append