X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fscript.scm;h=a9e576251016f80776a277037390109f8a80f93a;hb=fff6aa9785bd2f17b02cd0a2cb4520200e599aa3;hp=c1c209f57210e9562e5bf11fd1ad0b5bfea483c2;hpb=d36e8ced83cfeabcf4ec3840ffe93a717a17ac4d;p=lilypond.git

diff --git a/scm/script.scm b/scm/script.scm
index c1c209f572..a9e5762510 100644
--- a/scm/script.scm
+++ b/scm/script.scm
@@ -1,38 +1,178 @@
-;; (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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
-;;TODO?      extra padding :: Real (given in staff spaces)
-
-(set! script-alist
+(set! default-script-alist
       (append 
-      '(("thumb" . (("thumb"  . "thumb") #f 0 1 0))
-	("accent" . (("sforzato" .  "sforzato") #f -1 0 0))
-	("marcato" . (("dmarcato" . "umarcato") #f -1 0  0))
-	("staccatissimo" . (("dstaccatissimo" . "ustaccatissimo") #f  -1 0 0 0))
-	("portato" . (("dportato" . "uportato") #f -1 0 0))
-	("fermata" . (("dfermata" . "ufermata") #f 1 0 0))
-	("stopped" . (("stopped" . "stopped") #f 0 1 0))
-	("staccato" . (("staccato" . "staccato") #t -1 0 -100))
-	("tenuto" . (("tenuto" . "tenuto") 1 -1 0 0))
-	("upbow" . (("upbow" . "upbow") #f 0 1 0))
-	("downbow" . (("downbow" . "downbow") #f 0 1 0))
-	("lheel" . (("upedalheel" . "upedalheel") #f 0 -1  0))
-	("rheel" . (("dpedalheel" . "dpedalheel") #f 0 1 0))
-	("ltoe" . (("upedaltoe" . "upedaltoe") #f 0 -1 0))
-	("rtoe" . (("dpedaltoe" . "dpedaltoe") #f 0 1 0))
-	("turn" . (("turn" . "turn") #f 0 1 0))
-	("open" . (("open" . "open") #f 0 1 0))
-	("flageolet" . (("flageolet" . "flageolet")  0 0 1 0))
-	("reverseturn" . (("reverseturn" . "reverseturn")   0 0 1 0))
-	("trill" . (("trill" . "trill") #f 0 1 2000))
-	("prall" . (("prall" . "prall") #f 0 1 0))
-	("mordent" . (("mordent" . "mordent") #f 0 1 0))
-	("prallprall" . (("prallprall" . "prallprall") #f 0 1 0))
-	("prallmordent" . (("prallmordent" . "prallmordent") #f 0 1 0))
-	("upprall" . (("upprall" . "upprall") #f 0 1 0))
-	("downprall" . (("downprall" . "downprall") #f 0 1 0)))
-      script-alist)
+       '(("thumb" .
+	  ((script-stencil . (feta . ("thumb"  . "thumb")))
+	   (direction . 1)))
+         ("accent" .
+	  ((inside-slur . #f)
+	   (follow-into-staff . #t)
+	   (script-stencil . (feta . ("sforzato" .  "sforzato")))
+	   (side-relative-direction . -1)))	 
+         ("espressivo" .
+	  ((inside-slur . #f)
+	   (follow-into-staff . #t)
+	   (script-stencil . (feta . ("espr" .  "espr")))
+	   (side-relative-direction . -1)))	 
+	 ("marcato" .
+	  ((script-stencil . (feta . ("dmarcato" . "umarcato")))
+	   (follow-into-staff . #t)
+	   (side-relative-direction .  -1)))
+	 ("staccatissimo" .
+	  ((inside-slur . #t) 
+	   (script-stencil . (feta . ("dstaccatissimo" . "ustaccatissimo")))
+	   (side-relative-direction .  -1)))
+	 
+	 ("portato" .
+	  ((script-stencil . (feta . ("dportato" . "uportato")))
+	   (side-relative-direction . -1)))
+
+	 ("accentus" .
+	  ((script-stencil . (feta . ("uaccentus" . "uaccentus")))
+	   (side-relative-direction .  -1)
+	   (follow-into-staff  . #t)
+	   (priority . -100)
+	   (direction  . 1)))
+	 ("ictus" .
+	  ((script-stencil . (feta . ("ictus" . "ictus")))
+	   (side-relative-direction .  -1)
+	   (follow-into-staff  . #t)
+	   (priority . -100)
+	   (direction  . -1)))
+	 ("semicirculus" .
+	  ((script-stencil . (feta . ("dsemicirculus" . "dsemicirculus")))
+	   (side-relative-direction .  -1)
+	   (follow-into-staff  . #t)
+	   (priority . -100)
+	   (direction  . 1)))
+	 ("circulus" .
+	  ((script-stencil . (feta . ("circulus" . "circulus")))
+	   (side-relative-direction .  -1)
+	   (follow-into-staff  . #t)
+	   (priority . -100)
+	   (direction  . 1)))
+
+	 ("signumcongruentiae" .
+	  ((script-stencil . (feta . ("dsignumcongruentiae" . "usignumcongruentiae")))
+	   (direction .  1)))
+	 ("fermata" .
+	  ((script-stencil . (feta . ("dfermata" . "ufermata")))
+	   (inside-slur . #f)
+	   (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)
+	   (follow-into-staff  . #t)
+	   (inside-slur . #t) 
+	   (priority . -100)))
+	 ("tenuto" .
+	  ((script-stencil . (feta . ("tenuto" . "tenuto")))
+	   (follow-into-staff . #t)
+	   (inside-slur . #t)
+	   (side-relative-direction . -1)))
+	 ("comma" .
+	  ((script-stencil . (feta . ("lcomma" . "rcomma")))
+	   (follow-into-staff . #t)
+	   (direction . 1)))
+	 ("varcomma" .
+	  ((script-stencil . (feta . ("lvarcomma" . "rvarcomma")))
+	   (follow-into-staff . #t)
+	   (direction . 1)))
+	 ("upbow" .
+	  ((script-stencil . (feta . ("upbow" . "upbow")))
+	   (inside-slur . #f)
+	   (direction  . 1)))
+	 ("downbow" .
+	  ((script-stencil . (feta . ("downbow" . "downbow")))
+	   (inside-slur . #f)
+	   (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" .
+	  ((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)
+	   (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)
       )