X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fscript.scm;h=18f39cc7a54f89bf51d8ce26c3acd83ba641b0c0;hb=bcaa3cce66632e4b428e11cef6cbbad3a8edaad2;hp=1c9f1a6bd29bf8e6f98254a1b8fc19b4787b6334;hpb=eb544f70b8dc19a053705a02722bb4eaf24a4a98;p=lilypond.git

diff --git a/scm/script.scm b/scm/script.scm
index 1c9f1a6bd2..18f39cc7a5 100644
--- 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)
-	   (follow-into-staff . #t)
+	   (quantize-position . #t)
 	   (script-stencil . (feta . ("sforzato" .  "sforzato")))
-	   (side-relative-direction . -1)))	 
+	   (side-relative-direction . -1)))
          ("espressivo" .
 	  ((avoid-slur . around)
-	   (follow-into-staff . #t)
+	   (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" .
 	  ((avoid-slur . inside) 
@@ -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" .
@@ -63,6 +64,7 @@
 	 ("fermata" .
 	  ((script-stencil . (feta . ("dfermata" . "ufermata")))
 	   (avoid-slur . around)
+	   (script-priority . 4000)
 	   (direction .  1)))
 	 ("shortfermata" .
 	  ((script-stencil . (feta . ("dshortfermata" . "ushortfermata")))
@@ -79,21 +81,21 @@
 	 ("staccato" .
 	  ((script-stencil . (feta . ("staccato" . "staccato")))
 	   (side-relative-direction .  -1)
-	   (follow-into-staff  . #t)
+	   (quantize-position . #t)
 	   (avoid-slur . inside) 
-	   (priority . -100)))
+	   (script-priority . -100)))
 	 ("tenuto" .
 	  ((script-stencil . (feta . ("tenuto" . "tenuto")))
-	   (follow-into-staff . #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")))
@@ -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)))