release: 1.4.4

[lilypond.git] / scm / ps.scm

diff --git a/scm/ps.scm b/scm/ps.scm
index d17843731e1ae15371cef24c0f2658d18e842233..95280791262b3daee6651d936e1cd37c2a8ec9fc 100644 (file)
--- a/scm/ps.scm
+++ b/scm/ps.scm
@@ -67,11 +67,12 @@
   (define (char i)
     (invoke-char " show" i))
 
-  (define (crescendo thick w h cont )
-    (string-append 
-     (numbers->string (list w h (inexact->exact cont) thick))
-     " draw_crescendo"))
 
+  (define (hairpin thick width starth endh )
+    (string-append 
+     (numbers->string (list width starth endh thick))
+     " draw_hairpin"))
+  
   ;; what the heck is this interface ?
   (define (dashed-slur thick dash l)
     (string-append 
@@ -95,21 +96,19 @@
      " "
      (ly-number->string off)
      " ] 0 draw_dashed_line"))
-
-  (define (decrescendo thick w h cont)
-    (string-append 
-     (numbers->string (list w h (inexact->exact cont) thick))
-     " draw_decrescendo"))
-
-
+  
+  (define (repeat-slash wid slope thick)
+   (string-append (numbers->string (list wid slope thick))
+    " draw_repeat_slash"))
+  
   (define (end-output)
-    "\nshowpage\n")
+    "\nend-lilypond-output\n")
   
   (define (experimental-on) "")
   
   (define (filledbox breapth width depth height) 
     (string-append (numbers->string (list breapth width depth height))
-                  " draw_box" ))
+                  " draw-box" ))
 
   ;; obsolete?
   (define (font-def i s)
@@ -126,7 +125,7 @@
      ;; URG: now we can't use scm output without Lily
      (ly-gulp-file "lilyponddefs.ps")
      " {exch pop //systemdict /run get exec} "
-     (ly-gulp-file "lily.ps")
+     (ly-gulp-file "music-drawing-routines.ps")
      "{ exch pop //systemdict /run get exec } "
     ))
   
@@ -153,7 +152,7 @@
 
   (define (placebox x y s) 
     (string-append 
-     (ly-number->string x) " " (ly-number->string y) " {" s "} placebox\n"))
+     (ly-number->string x) " " (ly-number->string y) " {" s "} place-box\n"))
 
   (define (bezier-sandwich l thick)
     (string-append 
@@ -161,17 +160,21 @@
      (ly-number->string  thick)
      " draw_bezier_sandwich"))
 
+; TODO: use HEIGHT argument
   (define (start-line height)
-         "\nstart_line {
+    (string-append
+     "\n"
+     (ly-number->string height)
+     " start-line {
 lilypondpaperoutputscale lilypondpaperoutputscale scale
-")
+"))
   
   (define (stem breapth width depth height) 
     (string-append (numbers->string (list breapth width depth height))
-                  " draw_box" ))
+                  " draw-box" ))
 
   (define (stop-line)
-      "}\nstop_line\n")
+      "}\nstop-line\n")
 
   (define (text s)
     (string-append "(" s ") show  "))
@@ -208,12 +211,11 @@ lilypondpaperoutputscale lilypondpaperoutputscale scale
            (define tuplet ,tuplet)
            (define bracket ,bracket)
            (define char ,char)
-           (define crescendo ,crescendo)
+           (define hairpin ,hairpin)
            (define volta ,volta)
            (define bezier-sandwich ,bezier-sandwich)
            (define dashed-line ,dashed-line) 
            (define dashed-slur ,dashed-slur) 
-           (define decrescendo ,decrescendo) 
            (define end-output ,end-output)
            (define experimental-on ,experimental-on)
            (define filledbox ,filledbox)
@@ -231,20 +233,21 @@ lilypondpaperoutputscale lilypondpaperoutputscale scale
            (define stem ,stem)
            (define stop-line ,stop-line)
            (define stop-last-line ,stop-line)
+           (define repeat-slash ,repeat-slash)
            (define text ,text)
            (define no-origin ,no-origin)
            (define define-origin ,define-origin)
            (define ez-ball ,ez-ball)
            ))
+       ((eq? action-name 'repeat-slash) repeat-slash)
        ((eq? action-name 'tuplet) tuplet)
        ((eq? action-name 'beam) beam)
        ((eq? action-name 'bezier-sandwich) bezier-sandwich)
        ((eq? action-name 'bracket) bracket)
        ((eq? action-name 'char) char)
-       ((eq? action-name 'crescendo) crescendo)
        ((eq? action-name 'dashed-line) dashed-line) 
        ((eq? action-name 'dashed-slur) dashed-slur) 
-       ((eq? action-name 'decrescendo) decrescendo)
+       ((eq? action-name 'hairpin) hairpin)
        ((eq? action-name 'experimental-on) experimental-on)
        ((eq? action-name 'filledbox) filledbox)
        ((eq? action-name 'ez-ball) ez-ball)