(beam): add function.

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

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index aa36662364385390ad42526b479669e805842742..ae0d93e306754708f7d717fe8069643ad3d4b560 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -17,6 +17,8 @@
 
 (define-module (scm output-ps)
   #:re-export (quote)
+
+  ;; JUNK this -- see lily.scm: ly:all-output-backend-commands
   #:export (unknown
             blank
             dot
@@ -27,20 +29,19 @@
             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
-            tuplet
+            white-text
             polygon
             draw-line
-            define-origin
             no-origin
             ))
 
@@ -78,6 +79,7 @@
                 (escape-parentheses val)
                 ") def\n"))
 
+
 (define (ps-number-def prefix key val)
   (let ((s (if (integer? val)
               (ly:number->string val)
@@ -95,9 +97,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"))
@@ -138,7 +140,8 @@
 
 ; todo: merge with tex-font-command?
 
-
+(define (embedded-ps string)
+  string)
 
 (define (dot x y radius)
   (string-append
@@ -177,7 +180,7 @@
   (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)
@@ -212,19 +215,14 @@
    (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)
   (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)))) )
 
@@ -236,20 +234,26 @@
           (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 (white-text scale s)
+   (let ((mystring (string-append "(" s  ") " (number->string scale)   " /Helvetica-bold "
+          " draw_white_text")))
+  mystring))
+
 (define (unknown) 
   "\n unknown\n")
 
@@ -267,3 +271,6 @@
 
 (define (grob-cause grob)
   "")
+
+(define (no-origin)
+  "")