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

diff --git a/ly/script-init.ly b/ly/script-init.ly
index 0baf24258b..1b84be5a37 100644
--- a/ly/script-init.ly
+++ b/ly/script-init.ly
@@ -1,19 +1,11 @@
 % script-init.ly
 
-\version "2.16.0"
-
-% code char abbreviations
-dashHat = "marcato"
-dashPlus = "stopped"
-dashDash = "tenuto"
-dashBar = "staccatissimo"
-dashLarger = "accent"
-dashDot = "staccato"
-dashUnderscore = "portato"
+\version "2.17.25"
 
 harmonic = #(make-music 'HarmonicEvent)
 
-accent = #(make-articulation "accent")
+accent = #(make-articulation "accent"
+           'midi-extra-velocity 20)
 coda = #(make-articulation "coda")
 downbow = #(make-articulation "downbow")
 downmordent = #(make-articulation "downmordent")
@@ -26,10 +18,15 @@ lheel = #(make-articulation "lheel")
 lineprall = #(make-articulation "lineprall")
 longfermata = #(make-articulation "longfermata")
 ltoe = #(make-articulation "ltoe")
-marcato = #(make-articulation "marcato")
+marcato = #(make-articulation "marcato"
+            'midi-extra-velocity 40)
 mordent = #(make-articulation "mordent")
 open = #(make-articulation "open")
-portato = #(make-articulation "portato")
+
+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")
@@ -42,13 +39,21 @@ segno = #(make-articulation "segno")
 shortfermata = #(make-articulation "shortfermata")
 signumcongruentiae = #(make-articulation "signumcongruentiae")
 snappizzicato = #(make-articulation "snappizzicato")
-staccatissimo = #(make-articulation "staccatissimo")
-staccato = #(make-articulation "staccato")
+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 = \tweak text \markup \scale #(cons (magstep 5) (magstep 5))
-                            \musicglyph #"scripts.thumb"
-        #(make-music 'FingeringEvent)
+thumb = \finger \markup \scale #(cons (magstep 5) (magstep 5))
+                        \musicglyph #"scripts.thumb"
 trill = #(make-articulation "trill")
 turn = #(make-articulation "turn")
 upbow = #(make-articulation "upbow")
@@ -56,3 +61,12 @@ upmordent = #(make-articulation "upmordent")
 upprall = #(make-articulation "upprall")
 varcoda = #(make-articulation "varcoda")
 verylongfermata = #(make-articulation "verylongfermata")
+
+% code char abbreviations
+dashHat = \marcato
+dashPlus = \stopped
+dashDash = \tenuto
+dashBang = \staccatissimo
+dashLarger = \accent
+dashDot = \staccato
+dashUnderscore = \portato