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

diff --git a/scm/script.scm b/scm/script.scm
index c1c209f572..417df4cbee 100644
--- a/scm/script.scm
+++ b/scm/script.scm
@@ -1,38 +1,360 @@
-;; (name . '((downindexstring . upindexstring)
-;;           follow-into-staff :: bool
-;;           dir-relative-to-stem :: int
-;;           force-dir :: int
-;;           priority :: int
-
-;;TODO?      extra padding :: Real (given in staff spaces)
-
-(set! 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)
-      )
+;;;; This file is part of LilyPond, the GNU music typesetter.
+;;;;
+;;;; Copyright (C) 2000--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;;
+;;;; LilyPond is free software: you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation, either version 3 of the License, or
+;;;; (at your option) any later version.
+;;;;
+;;;; LilyPond is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-public default-script-alist
+  `(
+    ("accent"
+     . (
+	(avoid-slur . around)
+	(padding . 0.20)
+	(script-stencil . (feta . ("sforzato" . "sforzato")))
+	(side-relative-direction . ,DOWN)))
+    ("accentus"
+     . (
+	(script-stencil . (feta . ("uaccentus" . "uaccentus")))
+	(side-relative-direction . ,DOWN)
+	(avoid-slur . ignore)
+	(padding . 0.20)
+	(quantize-position . #t)
+	(script-priority . -100)
+	(direction . ,UP)))
+
+
+    ("circulus"
+     . (
+	(script-stencil . (feta . ("circulus" . "circulus")))
+	(side-relative-direction . ,DOWN)
+	(avoid-slur . ignore)
+	(padding . 0.20)
+	(quantize-position . #t)
+	(script-priority . -100)
+	(direction . ,UP)))
+    ("coda"
+     . (
+	(script-stencil . (feta . ("coda" . "coda")))
+	(padding . 0.20)
+	(avoid-slur . outside)
+	(direction . ,UP)))
+    ("comma"
+     . (
+	(script-stencil . (feta . ("lcomma" . "rcomma")))
+	(quantize-position . #t)
+	(padding . 0.20)
+	(avoid-slur . ignore)
+	(direction . ,UP)))
+
+
+    ("downbow"
+     . (
+	(script-stencil . (feta . ("downbow" . "downbow")))
+	(padding . 0.20)
+	(avoid-slur . around)
+	(direction . ,UP)
+	(script-priority . 150)))
+    ("downmordent"
+     . (
+	(script-stencil . (feta . ("downmordent" . "downmordent")))
+	(padding . 0.20)
+	(avoid-slur . around)
+	(direction . ,UP)))
+    ("downprall"
+     . (
+	(script-stencil . (feta . ("downprall" . "downprall")))
+	(padding . 0.20)
+	(avoid-slur . around)
+	(direction . ,UP)))
+
+
+    ("espressivo"
+     . (
+	(avoid-slur . around)
+	(padding . 0.20)
+	(script-stencil . (feta . ("espr" .  "espr")))
+	(side-relative-direction . ,DOWN)))
+
+
+    ("fermata"
+     . (
+	(script-stencil . (feta . ("dfermata" . "ufermata")))
+	(padding . 0.20)
+	(avoid-slur . around)
+	(script-priority . 4000)
+	(direction . ,UP)))
+    ("flageolet"
+     . (
+	(script-stencil . (feta . ("flageolet" . "flageolet")))
+	(padding . 0.20)
+	(avoid-slur . around) ;guessing?
+	(direction . ,UP)))
+
+
+    ("halfopen"
+     . (
+	(avoid-slur . outside)
+	(padding . 0.20)
+	(script-stencil . (feta . ("halfopen" . "halfopen")))
+	(direction . ,UP)))
+
+
+    ("ictus"
+     . (
+	(script-stencil . (feta . ("ictus" . "ictus")))
+	(side-relative-direction . ,DOWN)
+	(quantize-position . #t)
+	(avoid-slur . ignore)
+	(padding . 0.20)
+	(script-priority . -100)
+	(direction . ,DOWN)))
+
+
+    ("lheel"
+     . (
+	(script-stencil . (feta . ("upedalheel" . "upedalheel")))
+	(padding . 0.20)
+	(avoid-slur . around) ;guessing?
+	(direction . ,DOWN)))
+    ("lineprall"
+     . (
+	(script-stencil . (feta . ("lineprall" . "lineprall")))
+	(padding . 0.20)
+	(avoid-slur . around)
+	(direction . ,UP)))
+    ("longfermata"
+     . (
+	(script-stencil . (feta . ("dlongfermata" . "ulongfermata")))
+	(padding . 0.20)
+	(avoid-slur . around)
+	(direction . ,UP)))
+    ("ltoe"
+     . (
+	(script-stencil . (feta . ("upedaltoe" . "upedaltoe")))
+	(padding . 0.20)
+	(avoid-slur . around) ;guessing?
+	(direction . ,DOWN)))
+
+
+    ("marcato"
+     . (
+	(script-stencil . (feta . ("dmarcato" . "umarcato")))
+	(padding . 0.20)
+	(avoid-slur . inside)
+        ;;(staff-padding . ())
+	(quantize-position . #t)
+	(side-relative-direction . ,DOWN)))
+    ("mordent"
+     . (
+	(script-stencil . (feta . ("mordent" . "mordent")))
+	(padding . 0.20)
+	(avoid-slur . around)
+	(direction . ,UP)))
+
+
+    ("open"
+     . (
+	(avoid-slur . outside)
+	(padding . 0.20)
+	(script-stencil . (feta . ("open" . "open")))
+	(direction . ,UP)))
+
+
+    ("portato"
+     . (
+	(script-stencil . (feta . ("uportato" . "dportato")))
+	(avoid-slur . around)
+	(slur-padding . 0.3)
+	(padding . 0.45)
+	(side-relative-direction . ,DOWN)))
+    ("prall"
+     . (
+	(script-stencil . (feta . ("prall" . "prall")))
+	(padding . 0.20)
+	(avoid-slur . around)
+	(direction . ,UP)))
+    ("pralldown"
+     . (
+	(script-stencil . (feta . ("pralldown" . "pralldown")))
+	(padding . 0.20)
+	(avoid-slur . around)
+	(direction . ,UP)))
+    ("prallmordent"
+     . (
+	(script-stencil . (feta . ("prallmordent" . "prallmordent")))
+	(padding . 0.20)
+	(avoid-slur . around)
+	(direction . ,UP)))
+    ("prallprall"
+     . (
+	(script-stencil . (feta . ("prallprall" . "prallprall")))
+	(padding . 0.20)
+	(avoid-slur . around)
+	(direction . ,UP)))
+    ("prallup"
+     . (
+	(script-stencil . (feta . ("prallup" . "prallup")))
+	(padding . 0.20)
+	(avoid-slur . around)
+	(direction . ,UP)))
+
+
+    ("reverseturn"
+     . (
+	(script-stencil . (feta . ("reverseturn" . "reverseturn")))
+	(padding . 0.20)
+	(avoid-slur . inside)
+	(direction . ,UP)))
+    ("rheel"
+     . (
+	(script-stencil . (feta . ("dpedalheel" . "dpedalheel")))
+	(padding . 0.20)
+	(avoid-slur . around) ;guessing?
+	(direction . ,UP)))
+    ("rtoe"
+     . (
+	(script-stencil . (feta . ("dpedaltoe" . "dpedaltoe")))
+	(padding . 0.20)
+	(avoid-slur . around) ;guessing?
+	(direction . ,UP)))
+
+
+    ("segno"
+     . (
+	(script-stencil . (feta . ("segno" . "segno")))
+	(padding . 0.20)
+	(avoid-slur . outside)
+	(direction . ,UP)))
+    ("semicirculus"
+     . (
+	(script-stencil . (feta . ("dsemicirculus" . "dsemicirculus")))
+	(side-relative-direction . ,DOWN)
+	(quantize-position . #t)
+	(avoid-slur . ignore)
+	(padding . 0.20)
+	(script-priority . -100)
+	(direction . ,UP)))
+    ("shortfermata"
+     . (
+	(script-stencil . (feta . ("dshortfermata" . "ushortfermata")))
+	(padding . 0.20)
+	(avoid-slur . around)
+	(direction . ,UP)))
+    ("signumcongruentiae"
+     . (
+	(script-stencil . (feta . ("dsignumcongruentiae" . "usignumcongruentiae")))
+	(padding . 0.20)
+	(avoid-slur . outside)
+	(direction . ,UP)))
+    ("snappizzicato"
+     . (
+	(script-stencil . (feta . ("snappizzicato" . "snappizzicato")))
+	(padding . 0.20)
+	(avoid-slur . outside)
+	(direction . ,UP)))
+    ("staccatissimo"
+     . (
+	(avoid-slur . inside)
+	(quantize-position . #t)
+	(script-stencil . (feta . ("dstaccatissimo" . "ustaccatissimo")))
+	(padding . 0.20)
+	(side-relative-direction . ,DOWN)))
+    ("staccato"
+     . (
+	(script-stencil . (feta . ("staccato" . "staccato")))
+	(side-relative-direction . ,DOWN)
+	(quantize-position . #t)
+	(avoid-slur . inside)
+	(toward-stem-shift . 0.5)
+	(padding . 0.20)
+	(script-priority . -100)))
+    ("stopped"
+     . (
+	(script-stencil . (feta . ("stopped" . "stopped")))
+	(avoid-slur . inside)
+	(padding . 0.20)
+	(direction . ,UP)))
+
+
+    ("tenuto"
+     . (
+	(script-stencil . (feta . ("tenuto" . "tenuto")))
+	(quantize-position . #t)
+	(avoid-slur . inside)
+	(padding . 0.20)
+	(side-relative-direction . ,DOWN)))
+    ("thumb"
+     . (
+	(script-stencil . (feta . ("thumb"  . "thumb")))
+	(avoid-slur . around)
+	(padding . 0.50)
+	(direction . ,UP)
+	(slur-padding . 0.2)
+	(staff-padding . 0.5)))
+    ("trill"
+     . (
+	(script-stencil . (feta . ("trill" . "trill")))
+	(direction . ,UP)
+	(padding . 0.20)
+	(avoid-slur . outside)
+	(script-priority . 2000)))
+    ("turn"
+     . (
+	(script-stencil . (feta . ("turn" . "turn")))
+	(avoid-slur . inside)
+	(padding . 0.20)
+	(direction . ,UP)))
+
+
+    ("upbow"
+     . (
+	(script-stencil . (feta . ("upbow" . "upbow")))
+	(avoid-slur . around)
+	(padding . 0.20)
+	(direction . ,UP)
+	(script-priority . 150)))
+    ("upmordent"
+     . (
+	(script-stencil . (feta . ("upmordent" . "upmordent")))
+	(padding . 0.20)
+	(avoid-slur . around)
+	(direction . ,UP)))
+    ("upprall"
+     . (
+	(script-stencil . (feta . ("upprall" . "upprall")))
+	(padding . 0.20)
+	(avoid-slur . around)
+	(direction . ,UP)))
+
+
+    ("varcoda"
+     . (
+	(script-stencil . (feta . ("varcoda" . "varcoda")))
+	(padding . 0.20)
+	(avoid-slur . outside)
+	(direction . ,UP)))
+    ("varcomma"
+     . (
+	(script-stencil . (feta . ("lvarcomma" . "rvarcomma")))
+	(quantize-position . #t)
+	(padding . 0.20)
+	(avoid-slur . ignore)
+	(direction . ,UP)))
+    ("verylongfermata"
+     . (
+	(script-stencil . (feta . ("dverylongfermata" . "uverylongfermata")))
+	(padding . 0.20)
+	(avoid-slur . around)
+	(direction . ,UP)))
+      ))