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

diff --git a/scm/script.scm b/scm/script.scm
index fbeeae8615..18f39cc7a5 100644
--- a/scm/script.scm
+++ b/scm/script.scm
@@ -1,41 +1,182 @@
-;; (name . '((downindexstring . upindexstring)
-;;           follow-into-staff :: bool
-;;           dir-relative-to-stem :: int
-;;           force-dir :: int
-;;           priority :: int
+;;;; script.scm -- Script definitions
+;;;;
+;;;; source file of the GNU LilyPond music typesetter
+;;;; 
+;;;; (c) 2000--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
-;;TODO?      extra padding :: Real (given in staff spaces)
-
-(set! script-alist
+(set! default-script-alist
       (append 
-      '(("thumb" . ((feta . ("thumb"  . "thumb")) #f 0 1 0))
-	("accent" . ((feta . ("sforzato" .  "sforzato")) #f -1 0 0))
-	("marcato" . ((feta . ("dmarcato" . "umarcato")) #f -1 0  0))
-	("staccatissimo" . ((feta . ("dstaccatissimo" . "ustaccatissimo")) #f  -1 0 0))
-	("portato" . ((feta . ("dportato" . "uportato")) #f -1 0 0))
-	("fermata" . ((feta . ("dfermata" . "ufermata")) #f 1 0 0))
-	("stopped" . ((feta . ("stopped" . "stopped")) #f 0 1 0))
-	("staccato" . ((feta . ("staccato" . "staccato")) #t -1 0 -100))
-	("tenuto" . ((feta . ("tenuto" . "tenuto")) #t -1 0 0))
-	("upbow" . ((feta . ("upbow" . "upbow")) #f 0 1 0))
-	("downbow" . ((feta . ("downbow" . "downbow")) #f 0 1 0))
-	("lheel" . ((feta . ("upedalheel" . "upedalheel")) #f 0 -1  0))
-	("rheel" . ((feta . ("dpedalheel" . "dpedalheel")) #f 0 1 0))
-	("ltoe" . ((feta . ("upedaltoe" . "upedaltoe")) #f 0 -1 0))
-	("rtoe" . ((feta . ("dpedaltoe" . "dpedaltoe")) #f 0 1 0))
-	("turn" . ((feta . ("turn" . "turn")) #f 0 1 0))
-	("open" . ((feta . ("open" . "open")) #f 0 1 0))
-	("flageolet" . ((feta . ("flageolet" . "flageolet")) #f 0 1 0))
-	("reverseturn" . ((feta . ("reverseturn" . "reverseturn")) #f 0 1 0))
-	("trill" . ((feta . ("trill" . "trill")) #f 0 1 2000))
-	("prall" . ((feta . ("prall" . "prall")) #f 0 1 0))
-	("mordent" . ((feta . ("mordent" . "mordent")) #f 0 1 0))
-	("prallprall" . ((feta . ("prallprall" . "prallprall")) #f 0 1 0))
-	("prallmordent" . ((feta . ("prallmordent" . "prallmordent")) #f 0 1 0))
-	("upprall" . ((feta . ("upprall" . "upprall")) #f 0 1 0))
-	("downprall" . ((feta . ("downprall" . "downprall")) #f 0 1 0))
-	("segno" . ((feta . ("segno" . "segno")) #f 0 1 0))
-	("wheel" . ((feta . ("wheel" . "wheel")) #f 0 1 0)))
-      script-alist)
-      )
+       '(("thumb" .
+	  ((script-stencil . (feta . ("thumb"  . "thumb")))
+	   (direction . 1)))
+         ("accent" .
+	  ((avoid-slur . around)
+	   (quantize-position . #t)
+	   (script-stencil . (feta . ("sforzato" .  "sforzato")))
+	   (side-relative-direction . -1)))
+         ("espressivo" .
+	  ((avoid-slur . around)
+	   (quantize-position . #t)
+	   (script-stencil . (feta . ("espr" .  "espr")))
+	   (side-relative-direction . -1)))	 
+	 ("marcato" .
+	  ((script-stencil . (feta . ("dmarcato" . "umarcato")))
+;	   (staff-padding . ())
+	   (quantize-position . #t)
+	   (side-relative-direction .  -1)))
+	 ("staccatissimo" .
+	  ((avoid-slur . inside) 
+	   (script-stencil . (feta . ("dstaccatissimo" . "ustaccatissimo")))
+	   (side-relative-direction .  -1)))
+	 
+	 ("portato" .
+	  ((script-stencil . (feta . ("uportato" . "dportato")))
+	   (side-relative-direction . -1)))
 
+	 ("accentus" .
+	  ((script-stencil . (feta . ("uaccentus" . "uaccentus")))
+	   (side-relative-direction .  -1)
+	   (quantize-position . #t)
+	   (script-priority . -100)
+	   (direction  . 1)))
+	 ("ictus" .
+	  ((script-stencil . (feta . ("ictus" . "ictus")))
+	   (side-relative-direction .  -1)
+	   (quantize-position . #t)
+	   (script-priority . -100)
+	   (direction  . -1)))
+	 ("semicirculus" .
+	  ((script-stencil . (feta . ("dsemicirculus" . "dsemicirculus")))
+	   (side-relative-direction .  -1)
+	   (quantize-position . #t)
+	   (script-priority . -100)
+	   (direction  . 1)))
+	 ("circulus" .
+	  ((script-stencil . (feta . ("circulus" . "circulus")))
+	   (side-relative-direction .  -1)
+	   (quantize-position . #t)
+	   (script-priority . -100)
+	   (direction  . 1)))
+
+	 ("signumcongruentiae" .
+	  ((script-stencil . (feta . ("dsignumcongruentiae" . "usignumcongruentiae")))
+	   (direction .  1)))
+	 ("fermata" .
+	  ((script-stencil . (feta . ("dfermata" . "ufermata")))
+	   (avoid-slur . around)
+	   (script-priority . 4000)
+	   (direction .  1)))
+	 ("shortfermata" .
+	  ((script-stencil . (feta . ("dshortfermata" . "ushortfermata")))
+	   (direction .  1)))
+	 ("longfermata" .
+	  ((script-stencil . (feta . ("dlongfermata" . "ulongfermata")))
+	   (direction .  1)))
+	 ("verylongfermata" .
+	  ((script-stencil . (feta . ("dverylongfermata" . "uverylongfermata")))
+	   (direction .  1)))
+	 ("stopped" .
+	  ((script-stencil . (feta . ("stopped" . "stopped")))
+	   (direction  . 1)))
+	 ("staccato" .
+	  ((script-stencil . (feta . ("staccato" . "staccato")))
+	   (side-relative-direction .  -1)
+	   (quantize-position . #t)
+	   (avoid-slur . inside) 
+	   (script-priority . -100)))
+	 ("tenuto" .
+	  ((script-stencil . (feta . ("tenuto" . "tenuto")))
+	   (quantize-position . #t)
+	   (avoid-slur . inside)
+	   (side-relative-direction . -1)))
+	 ("comma" .
+	  ((script-stencil . (feta . ("lcomma" . "rcomma")))
+	   (quantize-position . #t)
+	   (direction . 1)))
+	 ("varcomma" .
+	  ((script-stencil . (feta . ("lvarcomma" . "rvarcomma")))
+	   (quantize-position . #t)
+	   (direction . 1)))
+	 ("upbow" .
+	  ((script-stencil . (feta . ("upbow" . "upbow")))
+	   (avoid-slur . around)
+	   (direction  . 1)))
+	 ("downbow" .
+	  ((script-stencil . (feta . ("downbow" . "downbow")))
+	   (avoid-slur . around)
+	   (direction  . 1)))
+	 ("lheel" .
+	  ((script-stencil . (feta . ("upedalheel" . "upedalheel")))
+	   (direction .  -1))
+	  )
+	 ("rheel" .
+	  ((script-stencil . (feta . ("dpedalheel" . "dpedalheel")))
+	   (direction  . 1)))
+	 ("ltoe" .
+	  ((script-stencil . (feta . ("upedaltoe" . "upedaltoe")))
+	   (direction  . -1)))
+	 ("rtoe" .
+	  ((script-stencil . (feta . ("dpedaltoe" . "dpedaltoe")))
+	   (direction  . 1)))
+	 ("turn" .
+	  ((script-stencil . (feta . ("turn" . "turn")))
+	   (direction  . 1)))
+	 ("open" .
+	  ((avoid-slur . outside)
+		 (script-stencil . (feta . ("open" . "open")))
+	   (direction  . 1)))
+	 ("flageolet" .
+	  ((script-stencil . (feta . ("flageolet" . "flageolet")))
+	   (direction  . 1)))
+	 ("reverseturn" .
+	  ((script-stencil . (feta . ("reverseturn" . "reverseturn")))
+	   (direction  . 1)))
+	 ("trill" .
+	  ((script-stencil . (feta . ("trill" . "trill")))
+	   (direction . 1)
+	   (avoid-slur . outside)
+	   (script-priority . 2000)))
+	 ("prall" .
+	  ((script-stencil . (feta . ("prall" . "prall")))
+	   (direction  . 1)))
+	 ("mordent" .
+	  ((script-stencil . (feta . ("mordent" . "mordent")))
+	   (direction  . 1)))
+	 ("prallprall" .
+	  ((script-stencil . (feta . ("prallprall" . "prallprall")))
+	   (direction  . 1)))
+	 ("prallmordent" .
+	  ((script-stencil . (feta . ("prallmordent" . "prallmordent")))
+	   (direction  . 1)))
+	 ("upprall" .
+	  ((script-stencil . (feta . ("upprall" . "upprall")))
+	   (direction  . 1)))
+	 ("downprall" .
+	  ((script-stencil . (feta . ("downprall" . "downprall")))
+	   (direction  . 1)))
+	 ("upmordent" .
+	  ((script-stencil . (feta . ("upmordent" . "upmordent")))
+	   (direction  . 1)))
+	 ("downmordent" .
+	  ((script-stencil . (feta . ("downmordent" . "downmordent")))
+	   (direction  . 1)))
+	 ("lineprall" .
+	  ((script-stencil . (feta . ("lineprall" . "lineprall")))
+	   (direction  . 1)))
+	 ("pralldown" .
+	  ((script-stencil . (feta . ("pralldown" . "pralldown")))
+	   (direction  . 1)))
+	 ("prallup" .
+	  ((script-stencil . (feta . ("prallup" . "prallup")))
+	   (direction  . 1)))
+	 ("segno" .
+	  ((script-stencil . (feta . ("segno" . "segno")))
+	   (direction  . 1)))
+	 ("coda" .
+	  ((script-stencil . (feta . ("coda" . "coda")))
+	   (direction  . 1)))
+	 ("varcoda" .
+	  ((script-stencil . (feta . ("varcoda" . "varcoda")))
+	   (direction  . 1))))
+       default-script-alist)
+      )