* scm/output-tex.scm (named-glyph): new function. This fixes TeX output.

[lilypond.git] / scm / output-ps.scm

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 4b2619a632d2913d43788a551894de5c4c9a5506..75251dcbfa0b081bb8d9bafdfda2e7514d20f868 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -18,35 +18,31 @@
 (define-module (scm output-ps)
   #:re-export (quote)
 
-  ;; FIXME
-  ;;; <unnamed port>: Wrong type argument in position 2 (expecting SYMBOLP): (append (ly:all-stencil-expressions) (ly:all-output-backend-commands))
-  ;;#:export ,(append (ly:all-stencil-expressions)
-  ;;  (ly:all-output-backend-commands)))
-
-;   ;; UGHXr 
+  ;; JUNK this -- see lily.scm: ly:all-output-backend-commands
   #:export (unknown
             blank
             dot
+            white-dot
             beam
             bracket
             dashed-slur
             char
+            named-glyph
             dashed-line
             zigzag-line
-            symmetric-x-triangle
             ez-ball
             comment
             repeat-slash
             placebox
             bezier-sandwich
             horizontal-line
+            embedded-ps
             filledbox
             round-filled-box
             text
-            tuplet
+            white-text
             polygon
             draw-line
-            define-origin
             no-origin
             ))
 
@@ -84,6 +80,7 @@
                 (escape-parentheses val)
                 ") def\n"))
 
+
 (define (ps-number-def prefix key val)
   (let ((s (if (integer? val)
               (ly:number->string val)
@@ -101,9 +98,9 @@
    (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"))
@@ -119,6 +116,11 @@
     (ps-font-command font) " setfont " 
    "(\\" (ly:inexact->string i 8) ") show" ))
 
+(define (named-glyph font glyph)
+  (string-append 
+    (ps-font-command font) " setfont " 
+   "/" glyph " glyphshow "))
+
 (define (dashed-line thick on off dx dy)
   (string-append 
    (ly:number->string dx) " "
@@ -144,9 +146,8 @@
 
 ; todo: merge with tex-font-command?
 
-
-
-(define (define-origin file line col) "")
+(define (embedded-ps string)
+  string)
 
 (define (dot x y radius)
   (string-append
@@ -154,6 +155,12 @@
    (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 "
@@ -179,16 +186,13 @@
   (draw-line th x1 0 x2 0))
 
 (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 (no-origin) "")
-
-
 
 (define (placebox x y s) 
   (string-append 
@@ -211,25 +215,13 @@
     (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"))
-
-(define (text font s)
+(define (old-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"))) 
+      ;; 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)))) )
 
@@ -241,20 +233,52 @@
           (add-command 
            (string-append "(" (ps-encoding word) ") show\n")))
 
-       (if (equal? #\space  chr)
+       (if (equal? #\space chr)
           (add-command  (string-append (number->string space-length) " 0.0 rmoveto ")) )
        
-       (if (equal? #\space  chr)
+       (if (equal? #\space chr)
           ""
           (string-append word (make-string 1 chr))))
      ""
-     (string-append  s " "))
+     (string-append s " "))
 
     (string-append
      (ps-font-command font) " setfont "
      (string-join (reverse commands)))
     ))
-  
+
+(define (new-text font s)
+  (let*
+      ((space-length (cdar (ly:text-dimension font "t")))
+       (space-move (string-append (number->string space-length) " 0.0 rmoveto "))
+       
+       (input-enc (assoc-get 'input-name
+                            (ly:font-encoding-alist font)
+                            'latin1))
+       (out-vec (decode-byte-string input-enc s)))
+
+
+    (string-append
+     (ps-font-command font) " setfont "
+     (string-join
+      (vector->list
+       (vector-for-each
+       
+       (lambda (sym)
+         (if (eq? sym 'space)
+             space-move
+             (string-append "/" (symbol->string sym) " glyphshow")))
+       out-vec)))
+     )))
+
+;(define text old-text)
+(define text new-text)
+
+(define (white-text scale s)
+   (let ((mystring (string-append "(" s  ") " (number->string scale)   " /Helvetica-bold "
+          " draw_white_text")))
+  mystring))
+
 (define (unknown) 
   "\n unknown\n")
 
@@ -268,3 +292,10 @@
     (ly:number->string dx) " "
     (ly:number->string dy)
     " draw_zigzag_line"))
+
+
+(define (grob-cause grob)
+  "")
+
+(define (no-origin)
+  "")