Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / scm / script.scm

diff --git a/scm/script.scm b/scm/script.scm
index c6af502c763c7793bf1c2e022b434fa580ee2b74..18f39cc7a54f89bf51d8ce26c3acd83ba641b0c0 100644 (file)
--- a/scm/script.scm
+++ b/scm/script.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2000--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 (set! default-script-alist
       (append 
@@ -11,17 +11,18 @@
           (direction . 1)))
          ("accent" .
          ((avoid-slur . around)
-          (staff-padding . #f) (quantize-position . #t)
+          (quantize-position . #t)
           (script-stencil . (feta . ("sforzato" .  "sforzato")))
-          (side-relative-direction . -1)))      
+          (side-relative-direction . -1)))
          ("espressivo" .
          ((avoid-slur . around)
-          (staff-padding . #f) (quantize-position . #t)
+          (quantize-position . #t)
           (script-stencil . (feta . ("espr" .  "espr")))
           (side-relative-direction . -1)))      
         ("marcato" .
          ((script-stencil . (feta . ("dmarcato" . "umarcato")))
-          (staff-padding . #f) (quantize-position . #t)
+;         (staff-padding . ())
+          (quantize-position . #t)
           (side-relative-direction .  -1)))
         ("staccatissimo" .
          ((avoid-slur . inside) 
@@ -35,25 +36,25 @@
         ("accentus" .
          ((script-stencil . (feta . ("uaccentus" . "uaccentus")))
           (side-relative-direction .  -1)
-          (follow-into-staff  . #t)
+          (quantize-position . #t)
           (script-priority . -100)
           (direction  . 1)))
         ("ictus" .
          ((script-stencil . (feta . ("ictus" . "ictus")))
           (side-relative-direction .  -1)
-          (follow-into-staff  . #t)
+          (quantize-position . #t)
           (script-priority . -100)
           (direction  . -1)))
         ("semicirculus" .
          ((script-stencil . (feta . ("dsemicirculus" . "dsemicirculus")))
           (side-relative-direction .  -1)
-          (follow-into-staff  . #t)
+          (quantize-position . #t)
           (script-priority . -100)
           (direction  . 1)))
         ("circulus" .
          ((script-stencil . (feta . ("circulus" . "circulus")))
           (side-relative-direction .  -1)
-          (follow-into-staff  . #t)
+          (quantize-position . #t)
           (script-priority . -100)
           (direction  . 1)))
 
@@ -80,21 +81,21 @@
         ("staccato" .
          ((script-stencil . (feta . ("staccato" . "staccato")))
           (side-relative-direction .  -1)
-          (follow-into-staff  . #t)
+          (quantize-position . #t)
           (avoid-slur . inside) 
           (script-priority . -100)))
         ("tenuto" .
          ((script-stencil . (feta . ("tenuto" . "tenuto")))
-          (staff-padding . #f) (quantize-position . #t)
+          (quantize-position . #t)
           (avoid-slur . inside)
           (side-relative-direction . -1)))
         ("comma" .
          ((script-stencil . (feta . ("lcomma" . "rcomma")))
-          (staff-padding . #f) (quantize-position . #t)
+          (quantize-position . #t)
           (direction . 1)))
         ("varcomma" .
          ((script-stencil . (feta . ("lvarcomma" . "rvarcomma")))
-          (staff-padding . #f) (quantize-position . #t)
+          (quantize-position . #t)
           (direction . 1)))
         ("upbow" .
          ((script-stencil . (feta . ("upbow" . "upbow")))
@@ -121,7 +122,8 @@
          ((script-stencil . (feta . ("turn" . "turn")))
           (direction  . 1)))
         ("open" .
-         ((script-stencil . (feta . ("open" . "open")))
+         ((avoid-slur . outside)
+                (script-stencil . (feta . ("open" . "open")))
           (direction  . 1)))
         ("flageolet" .
          ((script-stencil . (feta . ("flageolet" . "flageolet")))
@@ -132,6 +134,7 @@
         ("trill" .
          ((script-stencil . (feta . ("trill" . "trill")))
           (direction . 1)
+          (avoid-slur . outside)
           (script-priority . 2000)))
         ("prall" .
          ((script-stencil . (feta . ("prall" . "prall")))