X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fscript.scm;h=969759a69e9f3b13019447f616bedc4c7a643dd9;hb=0347dc0ae52d7c7c81c96ea8828b01e7601a1408;hp=29f93cba30469766b6a403b19da2a3cb2d405f23;hpb=12186b6828aee7aa298076d684835d629b757f2a;p=lilypond.git

diff --git a/scm/script.scm b/scm/script.scm
index 29f93cba30..969759a69e 100644
--- a/scm/script.scm
+++ b/scm/script.scm
@@ -2,30 +2,34 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c)  2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 (set! default-script-alist
       (append 
        '(("thumb" .
-	  (
-	   (script-stencil . (feta . ("thumb"  . "thumb")))
+	  ((script-stencil . (feta . ("thumb"  . "thumb")))
 	   (direction . 1)))
-	 ("accent" .
-	  (
+         ("accent" .
+	  ((inside-slur . #f)
+	   (follow-into-staff . #t)
 	   (script-stencil . (feta . ("sforzato" .  "sforzato")))
-	   (side-relative-direction . -1))
-	  )	 
+	   (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")))
+	  ((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")))
+	  ((script-stencil . (feta . ("uportato" . "dportato")))
 	   (side-relative-direction . -1)))
 
 	 ("accentus" .
@@ -58,6 +62,7 @@
 	   (direction .  1)))
 	 ("fermata" .
 	  ((script-stencil . (feta . ("dfermata" . "ufermata")))
+	   (inside-slur . #f)
 	   (direction .  1)))
 	 ("shortfermata" .
 	  ((script-stencil . (feta . ("dshortfermata" . "ushortfermata")))
@@ -70,15 +75,17 @@
 	   (direction .  1)))
 	 ("stopped" .
 	  ((script-stencil . (feta . ("stopped" . "stopped")))
-	   (direction  . 1) ))
+	   (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")))
@@ -90,80 +97,82 @@
 	   (direction . 1)))
 	 ("upbow" .
 	  ((script-stencil . (feta . ("upbow" . "upbow")))
-	   (direction  . 1) ))
+	   (inside-slur . #f)
+	   (direction  . 1)))
 	 ("downbow" .
 	  ((script-stencil . (feta . ("downbow" . "downbow")))
-	   (direction  . 1) ))
+	   (inside-slur . #f)
+	   (direction  . 1)))
 	 ("lheel" .
 	  ((script-stencil . (feta . ("upedalheel" . "upedalheel")))
 	   (direction .  -1))
 	  )
 	 ("rheel" .
 	  ((script-stencil . (feta . ("dpedalheel" . "dpedalheel")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("ltoe" .
 	  ((script-stencil . (feta . ("upedaltoe" . "upedaltoe")))
-	   (direction  . -1) ))
+	   (direction  . -1)))
 	 ("rtoe" .
 	  ((script-stencil . (feta . ("dpedaltoe" . "dpedaltoe")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("turn" .
 	  ((script-stencil . (feta . ("turn" . "turn")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("open" .
 	  ((script-stencil . (feta . ("open" . "open")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("flageolet" .
 	  ((script-stencil . (feta . ("flageolet" . "flageolet")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("reverseturn" .
 	  ((script-stencil . (feta . ("reverseturn" . "reverseturn")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("trill" .
 	  ((script-stencil . (feta . ("trill" . "trill")))
 	   (direction . 1)
 	   (priority . 2000)))
 	 ("prall" .
 	  ((script-stencil . (feta . ("prall" . "prall")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("mordent" .
 	  ((script-stencil . (feta . ("mordent" . "mordent")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("prallprall" .
 	  ((script-stencil . (feta . ("prallprall" . "prallprall")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("prallmordent" .
 	  ((script-stencil . (feta . ("prallmordent" . "prallmordent")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("upprall" .
 	  ((script-stencil . (feta . ("upprall" . "upprall")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("downprall" .
 	  ((script-stencil . (feta . ("downprall" . "downprall")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("upmordent" .
 	  ((script-stencil . (feta . ("upmordent" . "upmordent")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("downmordent" .
 	  ((script-stencil . (feta . ("downmordent" . "downmordent")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("lineprall" .
 	  ((script-stencil . (feta . ("lineprall" . "lineprall")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("pralldown" .
 	  ((script-stencil . (feta . ("pralldown" . "pralldown")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("prallup" .
 	  ((script-stencil . (feta . ("prallup" . "prallup")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("segno" .
 	  ((script-stencil . (feta . ("segno" . "segno")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("coda" .
 	  ((script-stencil . (feta . ("coda" . "coda")))
-	   (direction  . 1) ))
+	   (direction  . 1)))
 	 ("varcoda" .
 	  ((script-stencil . (feta . ("varcoda" . "varcoda")))
-	   (direction  . 1) )))
+	   (direction  . 1))))
        default-script-alist)
       )