X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fscript-init.ly;h=3b3e39ed31d11b1ca86e8d5f7a80e0f214070023;hb=e7aa6c445f463844dbaa52d38ea4aac2882b5601;hp=5d33decace0e926d0189d14d8d6a3b3c75960053;hpb=23108a9515e7f76b44fac0b323afb169d708bfa1;p=lilypond.git

diff --git a/ly/script-init.ly b/ly/script-init.ly
index 5d33decace..3b3e39ed31 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,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))
@@ -55,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