Merge commit 'origin' into includes

[lilypond.git] / ly / script-init.ly

diff --git a/ly/script-init.ly b/ly/script-init.ly
index d274fcc569f551e34ff343f847f422a873cf51b4..d1d28a54afc588b6e46f15ad2a3c68ccc90b8cba 100644 (file)
--- a/ly/script-init.ly
+++ b/ly/script-init.ly
@@ -1,6 +1,8 @@
-\version "1.7.2"
+\version "2.12.0"
 
 
+% code char abbreviations
+%
 dashHat= "marcato"
 dashPlus= "stopped"
 dashDash= "tenuto"
@@ -9,15 +11,14 @@ 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")
-accentus = #(make-articulation "accentus")
-ictus = #(make-articulation "ictus")
-semicirculus = #(make-articulation "semicirculus")
-circulus = #(make-articulation "circulus")
 signumcongruentiae = #(make-articulation "signumcongruentiae")
 fermata = #(make-articulation "fermata")
 shortfermata = #(make-articulation "shortfermata")
@@ -51,3 +52,4 @@ downprall = #(make-articulation "downprall")
 segno = #(make-articulation "segno")
 coda = #(make-articulation "coda")
 varcoda = #(make-articulation "varcoda")
+