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

diff --git a/ly/script-init.ly b/ly/script-init.ly
index 89c1f5802b..1b84be5a37 100644
--- a/ly/script-init.ly
+++ b/ly/script-init.ly
@@ -4,7 +4,8 @@
 
 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")
@@ -17,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")
@@ -33,8 +39,17 @@ 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 = \finger \markup \scale #(cons (magstep 5) (magstep 5))