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 969759a69e9f3b13019447f616bedc4c7a643dd9..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 
@@ -10,21 +10,22 @@
          ((script-stencil . (feta . ("thumb"  . "thumb")))
           (direction . 1)))
          ("accent" .
-         ((inside-slur . #f)
-          (follow-into-staff . #t)
+         ((avoid-slur . around)
+          (quantize-position . #t)
           (script-stencil . (feta . ("sforzato" .  "sforzato")))
-          (side-relative-direction . -1)))      
+          (side-relative-direction . -1)))
          ("espressivo" .
-         ((inside-slur . #f)
-          (follow-into-staff . #t)
+         ((avoid-slur . around)
+          (quantize-position . #t)
           (script-stencil . (feta . ("espr" .  "espr")))
           (side-relative-direction . -1)))      
         ("marcato" .
          ((script-stencil . (feta . ("dmarcato" . "umarcato")))
-          (follow-into-staff . #t)
+;         (staff-padding . ())
+          (quantize-position . #t)
           (side-relative-direction .  -1)))
         ("staccatissimo" .
-         ((inside-slur . #t) 
+         ((avoid-slur . inside) 
           (script-stencil . (feta . ("dstaccatissimo" . "ustaccatissimo")))
           (side-relative-direction .  -1)))
         
@@ -35,26 +36,26 @@
         ("accentus" .
          ((script-stencil . (feta . ("uaccentus" . "uaccentus")))
           (side-relative-direction .  -1)
-          (follow-into-staff  . #t)
-          (priority . -100)
+          (quantize-position . #t)
+          (script-priority . -100)
           (direction  . 1)))
         ("ictus" .
          ((script-stencil . (feta . ("ictus" . "ictus")))
           (side-relative-direction .  -1)
-          (follow-into-staff  . #t)
-          (priority . -100)
+          (quantize-position . #t)
+          (script-priority . -100)
           (direction  . -1)))
         ("semicirculus" .
          ((script-stencil . (feta . ("dsemicirculus" . "dsemicirculus")))
           (side-relative-direction .  -1)
-          (follow-into-staff  . #t)
-          (priority . -100)
+          (quantize-position . #t)
+          (script-priority . -100)
           (direction  . 1)))
         ("circulus" .
          ((script-stencil . (feta . ("circulus" . "circulus")))
           (side-relative-direction .  -1)
-          (follow-into-staff  . #t)
-          (priority . -100)
+          (quantize-position . #t)
+          (script-priority . -100)
           (direction  . 1)))
 
         ("signumcongruentiae" .
@@ -62,7 +63,8 @@
           (direction .  1)))
         ("fermata" .
          ((script-stencil . (feta . ("dfermata" . "ufermata")))
-          (inside-slur . #f)
+          (avoid-slur . around)
+          (script-priority . 4000)
           (direction .  1)))
         ("shortfermata" .
          ((script-stencil . (feta . ("dshortfermata" . "ushortfermata")))
@@ -79,29 +81,29 @@
         ("staccato" .
          ((script-stencil . (feta . ("staccato" . "staccato")))
           (side-relative-direction .  -1)
-          (follow-into-staff  . #t)
-          (inside-slur . #t) 
-          (priority . -100)))
+          (quantize-position . #t)
+          (avoid-slur . inside) 
+          (script-priority . -100)))
         ("tenuto" .
          ((script-stencil . (feta . ("tenuto" . "tenuto")))
-          (follow-into-staff . #t)
-          (inside-slur . #t)
+          (quantize-position . #t)
+          (avoid-slur . inside)
           (side-relative-direction . -1)))
         ("comma" .
          ((script-stencil . (feta . ("lcomma" . "rcomma")))
-          (follow-into-staff . #t)
+          (quantize-position . #t)
           (direction . 1)))
         ("varcomma" .
          ((script-stencil . (feta . ("lvarcomma" . "rvarcomma")))
-          (follow-into-staff . #t)
+          (quantize-position . #t)
           (direction . 1)))
         ("upbow" .
          ((script-stencil . (feta . ("upbow" . "upbow")))
-          (inside-slur . #f)
+          (avoid-slur . around)
           (direction  . 1)))
         ("downbow" .
          ((script-stencil . (feta . ("downbow" . "downbow")))
-          (inside-slur . #f)
+          (avoid-slur . around)
           (direction  . 1)))
         ("lheel" .
          ((script-stencil . (feta . ("upedalheel" . "upedalheel")))
@@ -120,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")))
@@ -131,7 +134,8 @@
         ("trill" .
          ((script-stencil . (feta . ("trill" . "trill")))
           (direction . 1)
-          (priority . 2000)))
+          (avoid-slur . outside)
+          (script-priority . 2000)))
         ("prall" .
          ((script-stencil . (feta . ("prall" . "prall")))
           (direction  . 1)))