resolve merge

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

diff --git a/ly/script-init.ly b/ly/script-init.ly
index d1d28a54afc588b6e46f15ad2a3c68ccc90b8cba..15a85d1584b24c2b345ac7831b9691032b083a90 100644 (file)
--- a/ly/script-init.ly
+++ b/ly/script-init.ly
@@ -1,55 +1,56 @@
-\version "2.12.0"
+% script-init.ly
 
+\version "2.14.0"
 
 % code char abbreviations
-%
-dashHat= "marcato"
-dashPlus= "stopped"
-dashDash= "tenuto"
-dashBar= "staccatissimo"
-dashLarger= "accent"
-dashDot= "staccato"
+dashHat = "marcato"
+dashPlus = "stopped"
+dashDash = "tenuto"
+dashBar = "staccatissimo"
+dashLarger = "accent"
+dashDot = "staccato"
 dashUnderscore = "portato"
 
 harmonic = #(make-music 'HarmonicEvent)
 
-thumb = #(make-articulation "thumb")
 accent = #(make-articulation "accent")
+coda = #(make-articulation "coda")
+downbow = #(make-articulation "downbow")
+downmordent = #(make-articulation "downmordent")
+downprall = #(make-articulation "downprall")
 espressivo = #(make-articulation "espressivo")
-marcato = #(make-articulation "marcato")
-staccatissimo = #(make-articulation "staccatissimo")
-portato = #(make-articulation "portato")
-signumcongruentiae = #(make-articulation "signumcongruentiae")
 fermata = #(make-articulation "fermata")
-shortfermata = #(make-articulation "shortfermata")
-longfermata = #(make-articulation "longfermata")
-verylongfermata = #(make-articulation "verylongfermata")
-stopped = #(make-articulation "stopped")
-staccato = #(make-articulation "staccato")
-tenuto = #(make-articulation "tenuto")
-upbow = #(make-articulation "upbow")
-downbow = #(make-articulation "downbow")
+flageolet = #(make-articulation "flageolet")
+halfopen = #(make-articulation "halfopen")
 lheel = #(make-articulation "lheel")
-rheel = #(make-articulation "rheel")
+lineprall = #(make-articulation "lineprall")
+longfermata = #(make-articulation "longfermata")
 ltoe = #(make-articulation "ltoe")
-rtoe = #(make-articulation "rtoe")
-turn = #(make-articulation "turn")
+marcato = #(make-articulation "marcato")
+mordent = #(make-articulation "mordent")
 open = #(make-articulation "open")
-flageolet = #(make-articulation "flageolet")
-reverseturn = #(make-articulation "reverseturn")
-trill = #(make-articulation "trill")
+portato = #(make-articulation "portato")
 prall = #(make-articulation "prall")
-mordent = #(make-articulation "mordent")
-upmordent = #(make-articulation "upmordent")
-downmordent = #(make-articulation "downmordent")
-prallprall = #(make-articulation "prallprall")
-prallup = #(make-articulation "prallup")
 pralldown = #(make-articulation "pralldown")
-lineprall = #(make-articulation "lineprall")
 prallmordent = #(make-articulation "prallmordent")
-upprall = #(make-articulation "upprall")
-downprall = #(make-articulation "downprall")
+prallprall = #(make-articulation "prallprall")
+prallup = #(make-articulation "prallup")
+reverseturn = #(make-articulation "reverseturn")
+rheel = #(make-articulation "rheel")
+rtoe = #(make-articulation "rtoe")
 segno = #(make-articulation "segno")
-coda = #(make-articulation "coda")
+shortfermata = #(make-articulation "shortfermata")
+signumcongruentiae = #(make-articulation "signumcongruentiae")
+snappizzicato = #(make-articulation "snappizzicato")
+staccatissimo = #(make-articulation "staccatissimo")
+staccato = #(make-articulation "staccato")
+stopped = #(make-articulation "stopped")
+tenuto = #(make-articulation "tenuto")
+thumb = #(make-articulation "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")