X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-ps.scm;h=e06bca586302b5454ab92f94a21dcdd2b8149ec9;hb=54feef141b22b56abf5e4a47c05bf8bbf99d4930;hp=4f352a68c1bd159c2b79180328bc37be932d69a2;hpb=d448af4c1c7b7285b16e407f67ab67b0976a40be;p=lilypond.git

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 4f352a68c1..e06bca5863 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,37 +13,31 @@
 ;;;;   * 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
-	     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
-	     filledbox
-	     round-filled-box
-	     text
-	     tuplet
-	     polygon
-	     draw-line
-	     no-origin
-	     ))
+	    blank
+	    circle
+	    dot
+	    dashed-slur
+	    char
+	    setcolor
+	    resetcolor
+	    named-glyph
+	    dashed-line
+	    zigzag-line
+	    comment
+	    repeat-slash
+	    placebox
+	    bezier-sandwich
+	    embedded-ps
+	    round-filled-box
+	    text
+	    polygon
+	    draw-line
+	    no-origin))
 
 
 (use-modules (guile)
@@ -53,23 +47,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))
 
@@ -79,6 +60,7 @@
 		 (escape-parentheses val)
 		 ") def\n"))
 
+
 (define (ps-number-def prefix key val)
   (let ((s (if (integer? val)
 	       (ly:number->string val)
@@ -90,29 +72,25 @@
 ;;; 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 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)
-  (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" ))
+   (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 
@@ -125,34 +103,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 (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 "
@@ -162,39 +129,97 @@
    (ly:number->string x2) " "
    (ly:number->string y2) " lineto stroke"))
 
-(define (ez-ball ch letter-col ball-col)
-  (string-append
-   " (" ch ") "
-   (ly:numbers->string (list letter-col ball-col))
-   " /Helvetica-Bold " ;; ugh
-   " draw_ez_ball"))
-
-(define (filledbox breapth width depth height) ; FIXME : use draw_round_box
-  (string-append (ly:numbers->string (list breapth width depth height))
-		 " draw_box"))
-
-;; WTF is this in every backend?
-(define (horizontal-line x1 x2 th)
-  (draw-line th x1 0 x2 0))
+(define (embedded-ps string)
+  string)
+
+
+(define (glyph-string
+	 postscript-font-name
+	 size cid?
+	 x-y-named-glyphs)
+
+  (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))
+
+		      ;; TODO
+		      ;; full escaping.
+		      (string-regexp-substitute " " "%20" file)
+		      (cadr location)
+		      (caddr location)
+		      (cadddr location))
+	      "")))))
 
 (define (lily-def key val)
-  (let ((prefix "lilypondpaper"))
+  (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"))))
 
+(define (named-glyph font glyph)
+  (string-append 
+   (ps-font-command font) " setfont " 
+   "/" glyph " glyphshow "))
+
+(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)
+(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)
@@ -202,72 +227,65 @@
    (ly:numbers->string (list wid slope thick))
    " 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"))
-
+;; restore color from stack
+(define (resetcolor)
+  (string-append "setrgbcolor\n"))
 
-(define (stem breapth width depth height) ; FIXME: use draw_round_box.
+(define (round-filled-box x y width height blotdiam)
   (string-append
-   (ly:numbers->string (list breapth width depth height))
-   " draw_box" ))
+   (ly:numbers->string
+    (list x y width height blotdiam)) " draw_round_box"))
 
-(define (symmetric-x-triangle thick w h)
-  (string-append
-   (ly:numbers->string (list h w thick))
-   " draw_symmetric_x_triangle"))
+;; 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)
-  (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: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 "))
+	 (out-vec (decode-byte-string 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))))))
+
 (define (unknown) 
   "\n unknown\n")
 
-(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"))
+(define (url-link url x y)
+  (format "~a ~a ~a ~a (~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 (grob-cause grob)
-  "")
 
-(define (no-origin)
-  "")
\ No newline at end of file
+
+(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"))