patch::: 1.3.133.jcn2

[lilypond.git] / scm / ps.scm

diff --git a/scm/ps.scm b/scm/ps.scm
index be85c4c3734bf6fdde892a8acf28d20112cdb7a1..d17843731e1ae15371cef24c0f2658d18e842233 100644 (file)
--- a/scm/ps.scm
+++ b/scm/ps.scm
@@ -2,7 +2,7 @@
 ;;;
 ;;;  source file of the GNU LilyPond music typesetter
 ;;; 
-;;; (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 
@@ -35,7 +35,7 @@
            (ly-warn (string-append
                      "Programming error: No such font known "
                      (car name-mag-pair) " "
-                     (number->string (cdr name-mag-pair))
+                     (ly-number->string (cdr name-mag-pair))
                      ))
            
            "") ; issue no command        
@@ -48,7 +48,7 @@
        " { /"
        (car name-mag)
        " findfont "
-       "12 " (number->string (cdr name-mag)) " mul "
+       "12 " (ly-number->string (cdr name-mag)) " mul "
        "lilypondpaperoutputscale div scalefont setfont } bind def "
        "\n"))
 
@@ -60,9 +60,9 @@
   (define (comment s)
     (string-append "% " s))
 
-  (define (bracket arch_angle arch_width arch_height width height arch_thick thick)
+  (define (bracket arch_angle arch_width arch_height  height arch_thick thick)
     (string-append
-     (numbers->string (list arch_angle arch_width arch_height width height arch_thick thick)) " draw_bracket" ))
+     (numbers->string (list arch_angle arch_width arch_height height arch_thick thick)) " draw_bracket" ))
 
   (define (char i)
     (invoke-char " show" i))
@@ -76,24 +76,24 @@
   (define (dashed-slur thick dash l)
     (string-append 
      (apply string-append (map control->string l)) 
-     (number->string thick) 
+     (ly-number->string thick) 
      " [ "
-     (number->string dash)
+     (ly-number->string dash)
      " "
-     (number->string (* 10 thick))     ;UGH.  10 ?
+     (ly-number->string (* 10 thick))  ;UGH.  10 ?
      " ] 0 draw_dashed_slur"))
 
   (define (dashed-line thick on off dx dy)
     (string-append 
-     (number->string dx)
+     (ly-number->string dx)
      " "
-     (number->string dy)
+     (ly-number->string dy)
      " "
-     (number->string thick) 
+     (ly-number->string thick) 
      " [ "
-     (number->string on)
+     (ly-number->string on)
      " "
-     (number->string off)
+     (ly-number->string off)
      " ] 0 draw_dashed_line"))
 
   (define (decrescendo thick w h cont)
@@ -149,16 +149,16 @@
   
   (define (invoke-dim1 s d) 
     (string-append
-     (number->string (* d  (/ 72.27 72))) " " s ))
+     (ly-number->string (* d  (/ 72.27 72))) " " s ))
 
   (define (placebox x y s) 
     (string-append 
-     (number->string x) " " (number->string y) " {" s "} placebox "))
+     (ly-number->string x) " " (ly-number->string y) " {" s "} placebox\n"))
 
   (define (bezier-sandwich l thick)
     (string-append 
      (apply string-append (map control->string l))
-     (number->string  thick)
+     (ly-number->string  thick)
      " draw_bezier_sandwich"))
 
   (define (start-line height)
@@ -191,6 +191,12 @@ lilypondpaperoutputscale lilypondpaperoutputscale scale
   (define (unknown) 
     "\n unknown\n")
 
+  (define (ez-ball ch letter-col ball-col)
+    (string-append
+     " (" ch ") "
+     (numbers->string (list letter-col ball-col))
+     " /Helvetica-Bold " ;; ugh
+     " draw_ez_ball"))
 
   (define (define-origin a b c ) "")
   (define (no-origin) "")
@@ -228,6 +234,7 @@ lilypondpaperoutputscale lilypondpaperoutputscale scale
            (define text ,text)
            (define no-origin ,no-origin)
            (define define-origin ,define-origin)
+           (define ez-ball ,ez-ball)
            ))
        ((eq? action-name 'tuplet) tuplet)
        ((eq? action-name 'beam) beam)
@@ -240,6 +247,7 @@ lilypondpaperoutputscale lilypondpaperoutputscale scale
        ((eq? action-name 'decrescendo) decrescendo)
        ((eq? action-name 'experimental-on) experimental-on)
        ((eq? action-name 'filledbox) filledbox)
+       ((eq? action-name 'ez-ball) ez-ball)    
        ((eq? action-name 'select-font) select-font)
        ((eq? action-name 'volta) volta)
        (else (error "unknown tag -- PS-SCM " action-name))