2002-07-13 Han-Wen <hanwen@cs.uu.nl>

[lilypond.git] / scm / script.scm

diff --git a/scm/script.scm b/scm/script.scm
index 47d61ab91ca2c894d772994b58afdf9d9f7d4216..8fde1da2800f4a4ceb060a20d3b418414919321f 100644 (file)
--- a/scm/script.scm
+++ b/scm/script.scm
@@ -2,9 +2,17 @@
 ;;           follow-into-staff :: bool
 ;;           dir-relative-to-stem :: int
 ;;           force-dir :: int
-;;           priority :: int
 
-;;TODO?      extra padding :: Real (given in staff spaces)
+
+;;           priority :: int -- lower number means closer to the  note head. 
+
+;; TODO: generate Grob types for this, by prepending appropriate props
+;; on top of Script (?)  
+
+
+;; TODO: don't use 2 level indiriection, simply set
+;; thumb = \script #'((feta . ( . .. ) (follow-staff .  #f))
+
 
 (set! default-script-alist
       (append 
@@ -13,10 +21,11 @@
        ("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))
+       ("fermata" . ((feta . ("dfermata" . "ufermata")) #f 0 1 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))
+       ("comma" . ((feta . ("lcomma" . "rcomma")) #t 0 1 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))
@@ -34,6 +43,11 @@
        ("prallmordent" . ((feta . ("prallmordent" . "prallmordent")) #f 0 1 0))
        ("upprall" . ((feta . ("upprall" . "upprall")) #f 0 1 0))
        ("downprall" . ((feta . ("downprall" . "downprall")) #f 0 1 0))
+       ("upmordent" . ((feta . ("upmordent" . "upmordent")) #f 0 1 0))
+       ("downmordent" . ((feta . ("downmordent" . "downmordent")) #f 0 1 0))
+       ("lineprall" . ((feta . ("lineprall" . "lineprall")) #f 0 1 0))
+       ("pralldown" . ((feta . ("pralldown" . "pralldown")) #f 0 1 0))
+       ("prallup" . ((feta . ("prallup" . "prallup")) #f 0 1 0))
        ("segno" . ((feta . ("segno" . "segno")) #f 0 1 0))
        ("coda" . ((feta . ("coda" . "coda")) #f 0 1 0)))
       default-script-alist)
@@ -91,3 +105,4 @@
       default-script-alist)
       )
 
+