From e183b26297f3b839b4779c2294892d598ae6ebd4 Mon Sep 17 00:00:00 2001 From: Mark Polesky Date: Fri, 21 Aug 2009 19:50:45 -0700 Subject: [PATCH] script-init.ly, script.scm: Organize, cleanup. --- ly/script-init.ly | 75 +++--- scm/script.scm | 587 ++++++++++++++++++++++++++-------------------- 2 files changed, 366 insertions(+), 296 deletions(-) diff --git a/ly/script-init.ly b/ly/script-init.ly index f54994a307..ab40c14865 100644 --- a/ly/script-init.ly +++ b/ly/script-init.ly @@ -1,56 +1,55 @@ -\version "2.12.0" +% script-init.ly +\version "2.12.0" % code char abbreviations -% -dashHat= "marcato" -dashPlus= "stopped" -dashDash= "tenuto" -dashBar= "staccatissimo" -dashLarger= "accent" -dashDot= "staccato" +dashHat = "marcato" +dashPlus = "stopped" +dashDash = "tenuto" +dashBar = "staccatissimo" +dashLarger = "accent" +dashDot = "staccato" dashUnderscore = "portato" harmonic = #(make-music 'HarmonicEvent) -thumb = #(make-articulation "thumb") accent = #(make-articulation "accent") +coda = #(make-articulation "coda") +downbow = #(make-articulation "downbow") +downmordent = #(make-articulation "downmordent") +downprall = #(make-articulation "downprall") espressivo = #(make-articulation "espressivo") -marcato = #(make-articulation "marcato") -staccatissimo = #(make-articulation "staccatissimo") -portato = #(make-articulation "portato") -signumcongruentiae = #(make-articulation "signumcongruentiae") fermata = #(make-articulation "fermata") -shortfermata = #(make-articulation "shortfermata") -longfermata = #(make-articulation "longfermata") -verylongfermata = #(make-articulation "verylongfermata") -stopped = #(make-articulation "stopped") -staccato = #(make-articulation "staccato") -tenuto = #(make-articulation "tenuto") -upbow = #(make-articulation "upbow") -downbow = #(make-articulation "downbow") +flageolet = #(make-articulation "flageolet") lheel = #(make-articulation "lheel") -rheel = #(make-articulation "rheel") +lineprall = #(make-articulation "lineprall") +longfermata = #(make-articulation "longfermata") ltoe = #(make-articulation "ltoe") -rtoe = #(make-articulation "rtoe") -turn = #(make-articulation "turn") +marcato = #(make-articulation "marcato") +mordent = #(make-articulation "mordent") open = #(make-articulation "open") -flageolet = #(make-articulation "flageolet") -reverseturn = #(make-articulation "reverseturn") -trill = #(make-articulation "trill") +portato = #(make-articulation "portato") prall = #(make-articulation "prall") -mordent = #(make-articulation "mordent") -upmordent = #(make-articulation "upmordent") -downmordent = #(make-articulation "downmordent") -prallprall = #(make-articulation "prallprall") -prallup = #(make-articulation "prallup") pralldown = #(make-articulation "pralldown") -lineprall = #(make-articulation "lineprall") prallmordent = #(make-articulation "prallmordent") -upprall = #(make-articulation "upprall") -downprall = #(make-articulation "downprall") +prallprall = #(make-articulation "prallprall") +prallup = #(make-articulation "prallup") +reverseturn = #(make-articulation "reverseturn") +rheel = #(make-articulation "rheel") +rtoe = #(make-articulation "rtoe") segno = #(make-articulation "segno") -coda = #(make-articulation "coda") -varcoda = #(make-articulation "varcoda") +shortfermata = #(make-articulation "shortfermata") +signumcongruentiae = #(make-articulation "signumcongruentiae") snappizzicato = #(make-articulation "snappizzicato") - +staccatissimo = #(make-articulation "staccatissimo") +staccato = #(make-articulation "staccato") +stopped = #(make-articulation "stopped") +tenuto = #(make-articulation "tenuto") +thumb = #(make-articulation "thumb") +trill = #(make-articulation "trill") +turn = #(make-articulation "turn") +upbow = #(make-articulation "upbow") +upmordent = #(make-articulation "upmordent") +upprall = #(make-articulation "upprall") +varcoda = #(make-articulation "varcoda") +verylongfermata = #(make-articulation "verylongfermata") diff --git a/scm/script.scm b/scm/script.scm index 00298bcb5c..e2bbbbc489 100644 --- a/scm/script.scm +++ b/scm/script.scm @@ -1,267 +1,338 @@ ;;;; script.scm -- Script definitions ;;;; ;;;; source file of the GNU LilyPond music typesetter -;;;; +;;;; ;;;; (c) 2000--2009 Han-Wen Nienhuys (define-public default-script-alist - '(("thumb" . - ((script-stencil . (feta . ("thumb" . "thumb"))) - (avoid-slur . inside) - (padding . 0.20) - (direction . 1))) - ("accent" . - ((avoid-slur . around) - (padding . 0.20) - (quantize-position . #t) - (script-stencil . (feta . ("sforzato" . "sforzato"))) - (side-relative-direction . -1))) - ("espressivo" . - ((avoid-slur . around) - (padding . 0.20) - (quantize-position . #t) - (script-stencil . (feta . ("espr" . "espr"))) - (side-relative-direction . -1))) - ("marcato" . - ((script-stencil . (feta . ("dmarcato" . "umarcato"))) - (padding . 0.20) - (avoid-slur . inside) - ; (staff-padding . ()) - (quantize-position . #t) - (side-relative-direction . -1))) - ("staccatissimo" . - ((avoid-slur . inside) - (script-stencil . (feta . ("dstaccatissimo" . "ustaccatissimo"))) - (padding . 0.20) - (side-relative-direction . -1))) - - ("portato" . - ((script-stencil . (feta . ("uportato" . "dportato"))) - (avoid-slur . around) - (slur-padding . 0.3) - (padding . 0.45) - (side-relative-direction . -1))) + '( + ("accent" + . ( + (avoid-slur . around) + (padding . 0.20) + (quantize-position . #t) + (script-stencil . (feta . ("sforzato" . "sforzato"))) + (side-relative-direction . -1))) + ("accentus" + . ( + (script-stencil . (feta . ("uaccentus" . "uaccentus"))) + (side-relative-direction . -1) + (avoid-slur . ignore) + (padding . 0.20) + (quantize-position . #t) + (script-priority . -100) + (direction . 1))) + + + ("circulus" + . ( + (script-stencil . (feta . ("circulus" . "circulus"))) + (side-relative-direction . -1) + (avoid-slur . ignore) + (padding . 0.20) + (quantize-position . #t) + (script-priority . -100) + (direction . 1))) + ("coda" + . ( + (script-stencil . (feta . ("coda" . "coda"))) + (padding . 0.20) + (avoid-slur . outside) + (direction . 1))) + ("comma" + . ( + (script-stencil . (feta . ("lcomma" . "rcomma"))) + (quantize-position . #t) + (padding . 0.20) + (avoid-slur . ignore) + (direction . 1))) + + + ("downbow" + . ( + (script-stencil . (feta . ("downbow" . "downbow"))) + (padding . 0.20) + (avoid-slur . around) + (direction . 1))) + ("downmordent" + . ( + (script-stencil . (feta . ("downmordent" . "downmordent"))) + (padding . 0.20) + (avoid-slur . around) + (direction . 1))) + ("downprall" + . ( + (script-stencil . (feta . ("downprall" . "downprall"))) + (padding . 0.20) + (avoid-slur . around) + (direction . 1))) + + + ("espressivo" + . ( + (avoid-slur . around) + (padding . 0.20) + (quantize-position . #t) + (script-stencil . (feta . ("espr" . "espr"))) + (side-relative-direction . -1))) + + + ("fermata" + . ( + (script-stencil . (feta . ("dfermata" . "ufermata"))) + (padding . 0.20) + (avoid-slur . around) + (script-priority . 4000) + (direction . 1))) + ("flageolet" + . ( + (script-stencil . (feta . ("flageolet" . "flageolet"))) + (padding . 0.20) + (avoid-slur . around) ;guessing? + (direction . 1))) + + + ("ictus" + . ( + (script-stencil . (feta . ("ictus" . "ictus"))) + (side-relative-direction . -1) + (quantize-position . #t) + (avoid-slur . ignore) + (padding . 0.20) + (script-priority . -100) + (direction . -1))) + + + ("lheel" + . ( + (script-stencil . (feta . ("upedalheel" . "upedalheel"))) + (padding . 0.20) + (avoid-slur . around) ;guessing? + (direction . -1))) + ("lineprall" + . ( + (script-stencil . (feta . ("lineprall" . "lineprall"))) + (padding . 0.20) + (avoid-slur . around) + (direction . 1))) + ("longfermata" + . ( + (script-stencil . (feta . ("dlongfermata" . "ulongfermata"))) + (padding . 0.20) + (avoid-slur . around) + (direction . 1))) + ("ltoe" + . ( + (script-stencil . (feta . ("upedaltoe" . "upedaltoe"))) + (padding . 0.20) + (avoid-slur . around) ;guessing? + (direction . -1))) + + + ("marcato" + . ( + (script-stencil . (feta . ("dmarcato" . "umarcato"))) + (padding . 0.20) + (avoid-slur . inside) + ;(staff-padding . ()) + (quantize-position . #t) + (side-relative-direction . -1))) + ("mordent" + . ( + (script-stencil . (feta . ("mordent" . "mordent"))) + (padding . 0.20) + (avoid-slur . around) + (direction . 1))) + + + ("open" + . ( + (avoid-slur . outside) + (padding . 0.20) + (script-stencil . (feta . ("open" . "open"))) + (direction . 1))) + + + ("portato" + . ( + (script-stencil . (feta . ("uportato" . "dportato"))) + (avoid-slur . around) + (slur-padding . 0.3) + (padding . 0.45) + (side-relative-direction . -1))) + ("prall" + . ( + (script-stencil . (feta . ("prall" . "prall"))) + (padding . 0.20) + (avoid-slur . around) + (direction . 1))) + ("pralldown" + . ( + (script-stencil . (feta . ("pralldown" . "pralldown"))) + (padding . 0.20) + (avoid-slur . around) + (direction . 1))) + ("prallmordent" + . ( + (script-stencil . (feta . ("prallmordent" . "prallmordent"))) + (padding . 0.20) + (avoid-slur . around) + (direction . 1))) + ("prallprall" + . ( + (script-stencil . (feta . ("prallprall" . "prallprall"))) + (padding . 0.20) + (avoid-slur . around) + (direction . 1))) + ("prallup" + . ( + (script-stencil . (feta . ("prallup" . "prallup"))) + (padding . 0.20) + (avoid-slur . around) + (direction . 1))) + + + ("reverseturn" + . ( + (script-stencil . (feta . ("reverseturn" . "reverseturn"))) + (padding . 0.20) + (avoid-slur . inside) + (direction . 1))) + ("rheel" + . ( + (script-stencil . (feta . ("dpedalheel" . "dpedalheel"))) + (padding . 0.20) + (avoid-slur . around) ;guessing? + (direction . 1))) + ("rtoe" + . ( + (script-stencil . (feta . ("dpedaltoe" . "dpedaltoe"))) + (padding . 0.20) + (avoid-slur . around) ;guessing? + (direction . 1))) + + + ("segno" + . ( + (script-stencil . (feta . ("segno" . "segno"))) + (padding . 0.20) + (avoid-slur . outside) + (direction . 1))) + ("semicirculus" + . ( + (script-stencil . (feta . ("dsemicirculus" . "dsemicirculus"))) + (side-relative-direction . -1) + (quantize-position . #t) + (avoid-slur . ignore) + (padding . 0.20) + (script-priority . -100) + (direction . 1))) + ("shortfermata" + . ( + (script-stencil . (feta . ("dshortfermata" . "ushortfermata"))) + (padding . 0.20) + (avoid-slur . around) + (direction . 1))) + ("signumcongruentiae" + . ( + (script-stencil . (feta . ("dsignumcongruentiae" . "usignumcongruentiae"))) + (padding . 0.20) + (avoid-slur . outside) + (direction . 1))) + ("snappizzicato" + . ( + (script-stencil . (feta . ("snappizzicato" . "snappizzicato"))) + (padding . 0.20) + (avoid-slur . outside) + (direction . 1))) + ("staccatissimo" + . ( + (avoid-slur . inside) + (script-stencil . (feta . ("dstaccatissimo" . "ustaccatissimo"))) + (padding . 0.20) + (side-relative-direction . -1))) + ("staccato" + . ( + (script-stencil . (feta . ("staccato" . "staccato"))) + (side-relative-direction . -1) + (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 . 1))) + + + ("tenuto" + . ( + (script-stencil . (feta . ("tenuto" . "tenuto"))) + (quantize-position . #t) + (avoid-slur . inside) + (padding . 0.20) + (side-relative-direction . -1))) + ("thumb" + . ( + (script-stencil . (feta . ("thumb" . "thumb"))) + (avoid-slur . inside) + (padding . 0.20) + (direction . 1))) + ("trill" + . ( + (script-stencil . (feta . ("trill" . "trill"))) + (direction . 1) + (padding . 0.20) + (avoid-slur . outside) + (script-priority . 2000))) + ("turn" + . ( + (script-stencil . (feta . ("turn" . "turn"))) + (avoid-slur . inside) + (padding . 0.20) + (direction . 1))) + + + ("upbow" + . ( + (script-stencil . (feta . ("upbow" . "upbow"))) + (avoid-slur . around) + (padding . 0.20) + (direction . 1))) + ("upmordent" + . ( + (script-stencil . (feta . ("upmordent" . "upmordent"))) + (padding . 0.20) + (avoid-slur . around) + (direction . 1))) + ("upprall" + . ( + (script-stencil . (feta . ("upprall" . "upprall"))) + (padding . 0.20) + (avoid-slur . around) + (direction . 1))) - ("accentus" . - ((script-stencil . (feta . ("uaccentus" . "uaccentus"))) - (side-relative-direction . -1) - (avoid-slur . ignore) - (padding . 0.20) - (quantize-position . #t) - (script-priority . -100) - (direction . 1))) - ("ictus" . - ((script-stencil . (feta . ("ictus" . "ictus"))) - (side-relative-direction . -1) - (quantize-position . #t) - (avoid-slur . ignore) - (padding . 0.20) - (script-priority . -100) - (direction . -1))) - ("semicirculus" . - ((script-stencil . (feta . ("dsemicirculus" . "dsemicirculus"))) - (side-relative-direction . -1) - (quantize-position . #t) - (avoid-slur . ignore) - (padding . 0.20) - (script-priority . -100) - (direction . 1))) - ("circulus" . - ((script-stencil . (feta . ("circulus" . "circulus"))) - (side-relative-direction . -1) - (avoid-slur . ignore) - (padding . 0.20) - (quantize-position . #t) - (script-priority . -100) - (direction . 1))) - ("signumcongruentiae" . - ((script-stencil . (feta . ("dsignumcongruentiae" . "usignumcongruentiae"))) - (padding . 0.20) - (avoid-slur . outside) - (direction . 1))) - ("fermata" . - ((script-stencil . (feta . ("dfermata" . "ufermata"))) - (padding . 0.20) - (avoid-slur . around) - (script-priority . 4000) - (direction . 1))) - ("shortfermata" . - ((script-stencil . (feta . ("dshortfermata" . "ushortfermata"))) - (padding . 0.20) - (avoid-slur . around) - (direction . 1))) - ("longfermata" . - ((script-stencil . (feta . ("dlongfermata" . "ulongfermata"))) - (padding . 0.20) - (avoid-slur . around) - (direction . 1))) - ("verylongfermata" . - ((script-stencil . (feta . ("dverylongfermata" . "uverylongfermata"))) - (padding . 0.20) - (avoid-slur . around) - (direction . 1))) - ("stopped" . - ((script-stencil . (feta . ("stopped" . "stopped"))) - (avoid-slur . inside) - (padding . 0.20) - (direction . 1))) - ("staccato" . - ((script-stencil . (feta . ("staccato" . "staccato"))) - (side-relative-direction . -1) - (quantize-position . #t) - (avoid-slur . inside) - (toward-stem-shift . 0.5) - (padding . 0.20) - (script-priority . -100))) - ("tenuto" . - ((script-stencil . (feta . ("tenuto" . "tenuto"))) - (quantize-position . #t) - (avoid-slur . inside) - (padding . 0.20) - (side-relative-direction . -1))) - ("comma" . - ((script-stencil . (feta . ("lcomma" . "rcomma"))) - (quantize-position . #t) - (padding . 0.20) - (avoid-slur . ignore) - (direction . 1))) - ("varcomma" . - ((script-stencil . (feta . ("lvarcomma" . "rvarcomma"))) - (quantize-position . #t) - (padding . 0.20) - (avoid-slur . ignore) - (direction . 1))) - ("upbow" . - ((script-stencil . (feta . ("upbow" . "upbow"))) - (avoid-slur . around) - (padding . 0.20) - (direction . 1))) - ("downbow" . - ((script-stencil . (feta . ("downbow" . "downbow"))) - (padding . 0.20) - (avoid-slur . around) - (direction . 1))) - ("lheel" . - ((script-stencil . (feta . ("upedalheel" . "upedalheel"))) - (padding . 0.20) - (avoid-slur . around) ;guessing? - (direction . -1)) - ) - ("rheel" . - ((script-stencil . (feta . ("dpedalheel" . "dpedalheel"))) - (padding . 0.20) - (avoid-slur . around) ;guessing? - (direction . 1))) - ("ltoe" . - ((script-stencil . (feta . ("upedaltoe" . "upedaltoe"))) - (padding . 0.20) - (avoid-slur . around) ;guessing? - (direction . -1))) - ("rtoe" . - ((script-stencil . (feta . ("dpedaltoe" . "dpedaltoe"))) - (padding . 0.20) - (avoid-slur . around) ;guessing? - (direction . 1))) - ("turn" . - ((script-stencil . (feta . ("turn" . "turn"))) - (avoid-slur . inside) - (padding . 0.20) - (direction . 1))) - ("open" . - ((avoid-slur . outside) - (padding . 0.20) - (script-stencil . (feta . ("open" . "open"))) - (direction . 1))) - ("flageolet" . - ((script-stencil . (feta . ("flageolet" . "flageolet"))) - (padding . 0.20) - (avoid-slur . around) ;guessing? - (direction . 1))) - ("reverseturn" . - ((script-stencil . (feta . ("reverseturn" . "reverseturn"))) - (padding . 0.20) - (avoid-slur . inside) - (direction . 1))) - ("trill" . - ((script-stencil . (feta . ("trill" . "trill"))) - (direction . 1) - (padding . 0.20) - (avoid-slur . outside) - (script-priority . 2000))) - ("prall" . - ((script-stencil . (feta . ("prall" . "prall"))) - (padding . 0.20) - (avoid-slur . around) - (direction . 1))) - ("mordent" . - ((script-stencil . (feta . ("mordent" . "mordent"))) - (padding . 0.20) - (avoid-slur . around) - (direction . 1))) - ("prallprall" . - ((script-stencil . (feta . ("prallprall" . "prallprall"))) - (padding . 0.20) - (avoid-slur . around) - (direction . 1))) - ("prallmordent" . - ((script-stencil . (feta . ("prallmordent" . "prallmordent"))) - (padding . 0.20) - (avoid-slur . around) - (direction . 1))) - ("upprall" . - ((script-stencil . (feta . ("upprall" . "upprall"))) - (padding . 0.20) - (avoid-slur . around) - (direction . 1))) - ("downprall" . - ((script-stencil . (feta . ("downprall" . "downprall"))) - (padding . 0.20) - (avoid-slur . around) - (direction . 1))) - ("upmordent" . - ((script-stencil . (feta . ("upmordent" . "upmordent"))) - (padding . 0.20) - (avoid-slur . around) - (direction . 1))) - ("downmordent" . - ((script-stencil . (feta . ("downmordent" . "downmordent"))) - (padding . 0.20) - (avoid-slur . around) - (direction . 1))) - ("lineprall" . - ((script-stencil . (feta . ("lineprall" . "lineprall"))) - (padding . 0.20) - (avoid-slur . around) - (direction . 1))) - ("pralldown" . - ((script-stencil . (feta . ("pralldown" . "pralldown"))) - (padding . 0.20) - (avoid-slur . around) - (direction . 1))) - ("prallup" . - ((script-stencil . (feta . ("prallup" . "prallup"))) - (padding . 0.20) - (avoid-slur . around) - (direction . 1))) - ("segno" . - ((script-stencil . (feta . ("segno" . "segno"))) - (padding . 0.20) - (avoid-slur . outside) - (direction . 1))) - ("coda" . - ((script-stencil . (feta . ("coda" . "coda"))) - (padding . 0.20) - (avoid-slur . outside) - (direction . 1))) - ("varcoda" . - ((script-stencil . (feta . ("varcoda" . "varcoda"))) - (padding . 0.20) - (avoid-slur . outside) - (direction . 1))) - ("snappizzicato" . - ((script-stencil . (feta . ("snappizzicato" . "snappizzicato"))) - (padding . 0.20) - (avoid-slur . outside) - (direction . 1))) + ("varcoda" + . ( + (script-stencil . (feta . ("varcoda" . "varcoda"))) + (padding . 0.20) + (avoid-slur . outside) + (direction . 1))) + ("varcomma" + . ( + (script-stencil . (feta . ("lvarcomma" . "rvarcomma"))) + (quantize-position . #t) + (padding . 0.20) + (avoid-slur . ignore) + (direction . 1))) + ("verylongfermata" + . ( + (script-stencil . (feta . ("dverylongfermata" . "uverylongfermata"))) + (padding . 0.20) + (avoid-slur . around) + (direction . 1))) )) -- 2.39.5