* lily/rest.cc (y_offset_callback): merge function of 3 callbacks.

[lilypond.git] / scm / script.scm

diff --git a/scm/script.scm b/scm/script.scm
index 18959121db5da9ada95a1a7a214f40232206df2f..c6af502c763c7793bf1c2e022b434fa580ee2b74 100644 (file)
--- a/scm/script.scm
+++ b/scm/script.scm
@@ -11,17 +11,17 @@
           (direction . 1)))
          ("accent" .
          ((avoid-slur . around)
-          (follow-into-staff . #t)
+          (staff-padding . #f) (quantize-position . #t)
           (script-stencil . (feta . ("sforzato" .  "sforzato")))
           (side-relative-direction . -1)))      
          ("espressivo" .
          ((avoid-slur . around)
-          (follow-into-staff . #t)
+          (staff-padding . #f) (quantize-position . #t)
           (script-stencil . (feta . ("espr" .  "espr")))
           (side-relative-direction . -1)))      
         ("marcato" .
          ((script-stencil . (feta . ("dmarcato" . "umarcato")))
-          (follow-into-staff . #t)
+          (staff-padding . #f) (quantize-position . #t)
           (side-relative-direction .  -1)))
         ("staccatissimo" .
          ((avoid-slur . inside) 
@@ -85,16 +85,16 @@
           (script-priority . -100)))
         ("tenuto" .
          ((script-stencil . (feta . ("tenuto" . "tenuto")))
-          (follow-into-staff . #t)
+          (staff-padding . #f) (quantize-position . #t)
           (avoid-slur . inside)
           (side-relative-direction . -1)))
         ("comma" .
          ((script-stencil . (feta . ("lcomma" . "rcomma")))
-          (follow-into-staff . #t)
+          (staff-padding . #f) (quantize-position . #t)
           (direction . 1)))
         ("varcomma" .
          ((script-stencil . (feta . ("lvarcomma" . "rvarcomma")))
-          (follow-into-staff . #t)
+          (staff-padding . #f) (quantize-position . #t)
           (direction . 1)))
         ("upbow" .
          ((script-stencil . (feta . ("upbow" . "upbow")))