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 fbeeae8615c8a1c7aaf2b03723e90ff4971bff7b..8fde1da2800f4a4ceb060a20d3b418414919321f 100644 (file)
--- a/scm/script.scm
+++ b/scm/script.scm
@@ -2,21 +2,30 @@
 ;;           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
+;;           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 
       '(("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))
+       ("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,8 +43,66 @@
        ("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))
-       ("wheel" . ((feta . ("wheel" . "wheel")) #f 0 1 0)))
-      script-alist)
+       ("coda" . ((feta . ("coda" . "coda")) #f 0 1 0)))
+      default-script-alist)
       )
 
+
+
+
+(set! default-script-alist
+      (append 
+      '(("accDiscant" . ((accordion "Discant" "") #f 0 1 0))
+       ("accDiscantF" . ((accordion "Discant" "F") #f 0 1 0))
+       ("accDiscantE" . ((accordion "Discant" "E") #f 0 1 0))
+       ("accDiscantEh" . ((accordion "Discant" "Eh") #f 0 1 0))
+       ("accDiscantFE" . ((accordion "Discant" "FE") #f 0 1 0))
+       ("accDiscantFEh" . ((accordion "Discant" "FEh") #f 0 1 0))
+       ("accDiscantEE" . ((accordion "Discant" "EE") #f 0 1 0))
+       ("accDiscantFEE" . ((accordion "Discant" "FEE") #f 0 1 0))
+       ("accDiscantEEE" . ((accordion "Discant" "EEE") #f 0 1 0))
+       ("accDiscantFEEE" . ((accordion "Discant" "FEEE") #f 0 1 0))
+       ("accDiscantS" . ((accordion "Discant" "S") #f 0 1 0))
+       ("accDiscantFS" . ((accordion "Discant" "FS") #f 0 1 0))
+       ("accDiscantES" . ((accordion "Discant" "ES") #f 0 1 0))
+       ("accDiscantEhS" . ((accordion "Discant" "EhS") #f 0 1 0))
+       ("accDiscantFES" . ((accordion "Discant" "FES") #f 0 1 0))
+       ("accDiscantFEhS" . ((accordion "Discant" "FEhS") #f 0 1 0))
+       ("accDiscantEES" . ((accordion "Discant" "EES") #f 0 1 0))
+       ("accDiscantFEES" . ((accordion "Discant" "FEES") #f 0 1 0))
+       ("accDiscantEEES" . ((accordion "Discant" "EEES") #f 0 1 0))
+       ("accDiscantFEEES" . ((accordion "Discant" "FEEES") #f 0 1 0))
+       ("accDiscantSS" . ((accordion "Discant" "SS") #f 0 1 0))
+       ("accDiscantESS" . ((accordion "Discant" "ESS") #f 0 1 0))
+       ("accDiscantEESS" . ((accordion "Discant" "EESS") #f 0 1 0))
+       ("accDiscantEEESS" . ((accordion "Discant" "EEESS") #f 0 1 0))
+       ("accFreebase" . ((accordion "Freebase" "") #f 0 -1 0))
+       ("accFreebaseF" . ((accordion "Freebase" "F") #f 0 -1 0))
+       ("accFreebaseE" . ((accordion "Freebase" "E") #f 0 -1 0))
+       ("accFreebaseFE" . ((accordion "Freebase" "FE") #f 0 -1 0))
+       ("accBayanbase" . ((accordion "Bayanbase" "") #f 0 -1 0))
+       ("accBayanbaseT" . ((accordion "Bayanbase" "T") #f 0 -1 0))
+       ("accBayanbaseE" . ((accordion "Bayanbase" "E") #f 0 -1 0))
+       ("accBayanbaseTE" . ((accordion "Bayanbase" "TE") #f 0 -1 0))
+       ("accBayanbaseEE" . ((accordion "Bayanbase" "EE") #f 0 -1 0))
+       ("accBayanbaseTEE" . ((accordion "Bayanbase" "TEE") #f 0 -1 0))
+       ("accStdbase" . ((accordion "Stdbase" "") #f 0 -1 0))
+       ("accStdbaseFE" . ((accordion "Stdbase" "FE") #f 0 -1 0))
+       ("accStdbaseTFE" . ((accordion "Stdbase" "TFE") #f 0 -1 0))
+       ("accStdbaseMES" . ((accordion "Stdbase" "MES") #f 0 -1 0))
+       ("accStdbaseTFMES" . ((accordion "Stdbase" "TFMES") #f 0 -1 0))
+
+       ("accSB" . ((accordion "SB" "") #f 0 -1 0))
+       ("accBB" . ((accordion "BB" "") #f 0 -1 0))
+       ("accOldEE" . ((accordion "OldEE" "") #f 0 -1 0))
+       ("accOldEES" . ((accordion "OldEES" "") #f 0 -1 0)))
+      default-script-alist)
+      )
+
+