Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

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

diff --git a/ly/grace-init.ly b/ly/grace-init.ly
index b9729f3e9360735d3f4a29aa772801a45acb4240..6fe32f49fbaf513055c94b2fa103d6cf368a23e5 100644 (file)
--- a/ly/grace-init.ly
+++ b/ly/grace-init.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.17.6"
 
 startGraceSlur = #(make-music 'SlurEvent 'span-direction START 'spanner-id "grace")
 stopGraceSlur = #(make-music 'SlurEvent 'span-direction STOP 'spanner-id "grace")
@@ -7,24 +7,32 @@ stopGraceSlur = #(make-music 'SlurEvent 'span-direction STOP 'spanner-id "grace"
 startGraceMusic =  {
 }
 
-stopGraceMusic =  { 
+stopGraceMusic =  {
 }
 
 startAppoggiaturaMusic =
- {
-    s1*0\startGraceSlur
+{
+    <>\startGraceSlur
 }
 
-stopAppoggiaturaMusic =  { 
-    s1*0\stopGraceSlur
+stopAppoggiaturaMusic =  {
+    <>\stopGraceSlur
 }
 
 startAcciaccaturaMusic =  {
-    s1*0\startGraceSlur
-    \override Stem  #'stroke-style = #"grace"
+    <>\startGraceSlur
+    \temporary \override Flag.stroke-style = #"grace"
 }
 
 stopAcciaccaturaMusic =  {
-    \revert Stem #'stroke-style
-    s1*0\stopGraceSlur
+    \revert Flag.stroke-style
+    <>\stopGraceSlur
+}
+
+startSlashedGraceMusic =  {
+  \temporary \override Flag.stroke-style = #"grace"
+}
+
+stopSlashedGraceMusic =  {
+  \revert Flag.stroke-style
 }