X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fscript-init.ly;h=1b84be5a37299d17578d29f8c7cbdc530636c50c;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=b0fcedd3dc6c0cacd41839494cfbfd2371e31fde;hpb=4995fea559cd5399b4f462de546a15195d76f4c3;p=lilypond.git

diff --git a/ly/script-init.ly b/ly/script-init.ly
index b0fcedd3dc..1b84be5a37 100644
--- a/ly/script-init.ly
+++ b/ly/script-init.ly
@@ -1,47 +1,72 @@
-\version "1.3.146"
+% script-init.ly
 
+\version "2.17.25"
 
-dashHat= "marcato"
-dashPlus= "stopped"
-dashDash= "tenuto"
-dashBar= "staccatissimo"
-dashLarger= "accent"
-dashDot= "staccato"
+harmonic = #(make-music 'HarmonicEvent)
 
+accent = #(make-articulation "accent"
+           'midi-extra-velocity 20)
+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")
+halfopen = #(make-articulation "halfopen")
+lheel = #(make-articulation "lheel")
+lineprall = #(make-articulation "lineprall")
+longfermata = #(make-articulation "longfermata")
+ltoe = #(make-articulation "ltoe")
+marcato = #(make-articulation "marcato"
+            'midi-extra-velocity 40)
+mordent = #(make-articulation "mordent")
+open = #(make-articulation "open")
 
-thumb = \script "thumb"
-accent = \script "accent"
-marcato = \script "marcato"
-staccatissimo = \script "staccatissimo"
+portato = #(make-articulation "portato"
+            'midi-length
+            (lambda (len context)
+             (ly:moment-mul len (ly:make-moment 3/4))))
+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")
+snappizzicato = #(make-articulation "snappizzicato")
+staccatissimo = #(make-articulation "staccatissimo"
+                  'midi-length
+                  (lambda (len context)
+                    (seconds->moment 1/8 context))
+                  'midi-extra-velocity 6)
+staccato = #(make-articulation "staccato"
+             'midi-length
+             (lambda (len context)
+               (moment-min (ly:moment-mul len (ly:make-moment 1/2))
+                           (seconds->moment 1/2 context)))
+             'midi-extra-velocity 4)
+stopped = #(make-articulation "stopped")
+tenuto = #(make-articulation "tenuto")
+thumb = \finger \markup \scale #(cons (magstep 5) (magstep 5))
+                        \musicglyph #"scripts.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")
 
-% portato is indicated
-% either by
-%   *  slurred & dotted notes. 
-%or by
-%  * slur and dash notes.
-% Neither are  really supported, but c4-.-- should work.
-% portato = \script "portato"
-
-fermata = \script "fermata"
-stopped = \script "stopped"
-staccato = \script "staccato"
-tenuto = \script "tenuto"
-upbow = \script "upbow"
-downbow = \script "downbow"
-lheel = \script "lheel"
-rheel = \script "rheel"
-ltoe = \script "ltoe"
-rtoe = \script "rtoe"
-turn = \script "turn"
-open = \script "open"
-flageolet = \script "flageolet"
-reverseturn = \script "reverseturn"
-trill = \script "trill"
-prall = \script "prall"
-mordent = \script "mordent"
-prallprall = \script "prallprall"
-prallmordent = \script "prallmordent"
-upprall = \script "upprall"
-downprall = \script "downprall"
-segno = \script "segno"
-coda = \script "coda"
+% code char abbreviations
+dashHat = \marcato
+dashPlus = \stopped
+dashDash = \tenuto
+dashBang = \staccatissimo
+dashLarger = \accent
+dashDot = \staccato
+dashUnderscore = \portato