I made some changes to the code-style here.Let me know
if you guys think anything is better or worse. I'll
probably combine these into one patch.
Thanks.
- Mark
From 44f978455fbc1c630879a115ce6d14900f85aa66 Mon Sep 17 00:00:00 2001
From: Mark Polesky <[email protected]>
Date: Wed, 19 Aug 2009 23:07:27 -0700
Subject: [PATCH 1/2] script-init.ly: Alphabetize articulation list.
---
ly/script-init.ly | 95 ++++++++++++++++++++++++++---------------------------
1 files changed, 47 insertions(+), 48 deletions(-)
diff --git a/ly/script-init.ly b/ly/script-init.ly
index f54994a..3ca0e74 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")
-espressivo = #(make-articulation "espressivo")
-marcato = #(make-articulation "marcato")
-staccatissimo = #(make-articulation "staccatissimo")
-portato = #(make-articulation "portato")
+accent = #(make-articulation "accent")
+coda = #(make-articulation "coda")
+downbow = #(make-articulation "downbow")
+downmordent = #(make-articulation "downmordent")
+downprall = #(make-articulation "downprall")
+espressivo = #(make-articulation "espressivo")
+fermata = #(make-articulation "fermata")
+flageolet = #(make-articulation "flageolet")
+lheel = #(make-articulation "lheel")
+lineprall = #(make-articulation "lineprall")
+longfermata = #(make-articulation "longfermata")
+ltoe = #(make-articulation "ltoe")
+marcato = #(make-articulation "marcato")
+mordent = #(make-articulation "mordent")
+open = #(make-articulation "open")
+portato = #(make-articulation "portato")
+prall = #(make-articulation "prall")
+pralldown = #(make-articulation "pralldown")
+prallmordent = #(make-articulation "prallmordent")
+prallprall = #(make-articulation "prallprall")
+prallup = #(make-articulation "prallup")
+reverseturn = #(make-articulation "reverseturn")
+rheel = #(make-articulation "rheel")
+rtoe = #(make-articulation "rtoe")
+segno = #(make-articulation "segno")
+shortfermata = #(make-articulation "shortfermata")
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")
-lheel = #(make-articulation "lheel")
-rheel = #(make-articulation "rheel")
-ltoe = #(make-articulation "ltoe")
-rtoe = #(make-articulation "rtoe")
-turn = #(make-articulation "turn")
-open = #(make-articulation "open")
-flageolet = #(make-articulation "flageolet")
-reverseturn = #(make-articulation "reverseturn")
-trill = #(make-articulation "trill")
-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")
-segno = #(make-articulation "segno")
-coda = #(make-articulation "coda")
-varcoda = #(make-articulation "varcoda")
-snappizzicato = #(make-articulation "snappizzicato")
-
+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")
--
1.6.4.msysgit.0
From d14336a385ba5cb7df696444e9e952f9d492b7ac Mon Sep 17 00:00:00 2001
From: Mark Polesky <[email protected]>
Date: Wed, 19 Aug 2009 23:27:18 -0700
Subject: [PATCH 2/2] script.scm: Alphabetize script list.
---
scm/script.scm | 436 +++++++++++++++++++++++++++++--------------------------
1 files changed, 230 insertions(+), 206 deletions(-)
diff --git a/scm/script.scm b/scm/script.scm
index 00298bc..0683e75 100644
--- a/scm/script.scm
+++ b/scm/script.scm
@@ -1,267 +1,291 @@
;;;; script.scm -- Script definitions
;;;;
;;;; source file of the GNU LilyPond music typesetter
-;;;;
+;;;;
;;;; (c) 2000--2009 Han-Wen Nienhuys <[email protected]>
(define-public default-script-alist
- '(("thumb" .
- ((script-stencil . (feta . ("thumb" . "thumb")))
- (avoid-slur . inside)
- (padding . 0.20)
- (direction . 1)))
- ("accent" .
+ '(("accent" .
((avoid-slur . around)
- (padding . 0.20)
+ (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)
+ (padding . 0.20)
(quantize-position . #t)
(script-stencil . (feta . ("espr" . "espr")))
- (side-relative-direction . -1)))
+ (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 . ())
+ ;(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)))
-
+ (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)))
- ("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)))
+
+ ("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)
+ (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)
+ (padding . 0.20)
(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)))
+ (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)
+ (padding . 0.20)
(avoid-slur . around)
- (direction . 1)))
- ("stopped" .
- ((script-stencil . (feta . ("stopped" . "stopped")))
- (avoid-slur . inside)
- (padding . 0.20)
- (direction . 1)))
+ (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)
+ (avoid-slur . inside)
(toward-stem-shift . 0.5)
- (padding . 0.20)
+ (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)
+ (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)
+ ("thumb" .
+ ((script-stencil . (feta . ("thumb" . "thumb")))
(avoid-slur . inside)
- (direction . 1)))
+ (padding . 0.20)
+ (direction . 1)))
("trill" .
((script-stencil . (feta . ("trill" . "trill")))
(direction . 1)
- (padding . 0.20)
+ (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)
+ ("turn" .
+ ((script-stencil . (feta . ("turn" . "turn")))
+ (avoid-slur . inside)
+ (padding . 0.20)
+ (direction . 1)))
+
+
+ ("upbow" .
+ ((script-stencil . (feta . ("upbow" . "upbow")))
(avoid-slur . around)
- (direction . 1)))
+ (padding . 0.20)
+ (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)
+ (padding . 0.20)
(avoid-slur . around)
- (direction . 1)))
- ("prallup" .
- ((script-stencil . (feta . ("prallup" . "prallup")))
- (padding . 0.20)
+ (direction . 1)))
+ ("upprall" .
+ ((script-stencil . (feta . ("upprall" . "upprall")))
+ (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)))
+ (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)))
+ (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)))
))
--
1.6.4.msysgit.0
_______________________________________________
lilypond-devel mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-devel
