X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fgrace-init.ly;h=a46111e4d91a2a62d36c6595b7a9e88da3047738;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=186d87ae4d63582a2ff0c3ffd215772f673bbc50;hpb=0556ce728ccceadbedcf15400685628f1973081e;p=lilypond.git

diff --git a/ly/grace-init.ly b/ly/grace-init.ly
index 186d87ae4d..a46111e4d9 100644
--- a/ly/grace-init.ly
+++ b/ly/grace-init.ly
@@ -1,58 +1,38 @@
-\version "1.5.68"
-
-startGraceMusic = {
-    \property Voice.Stem \override  #'direction = #1
-    \property Voice.Stem \override #'length = #5.5
-    \property Voice.Stem \override #'lengths = 
-        #(map (lambda (x) (* 0.8 x)) '(3.5 3.5 3.5 4.5 5.0))
-    \property Voice.Stem \override #'beamed-lengths =
-        #(map (lambda (x) (* 0.8 x)) '(3.26))
-    \property Voice.Stem \override #'beamed-minimum-free-lengths =
-        #(map (lambda (x) (* 0.8 x)) '(2.5 2.0 1.5))
-    \property Voice.Stem \override #'beamed-extreme-minimum-free-lengths =
-        #(map (lambda (x) (* 0.8 x)) '(1.83 1.5))
-
-    \property Voice.Stem \override #'no-stem-extend = ##t
-    \property Voice.Stem \override #'stroke-style  = #"grace"
-    \property Voice.Beam \override #'thickness = #0.384
-
-    %% Instead of calling Beam::space_function, we should invoke
-    %% the previously active beam function...
-    \property Voice.Beam \override #'space-function =
-      #(lambda (beam mult) (* 0.8 (Beam::space_function beam mult)))
-
-    \property Voice.Beam \override #'position-callbacks =
-      #`(,Beam::least_squares
-	 ,Beam::check_concave
-	 ,Beam::slope_damping)
-    
-    % Can't use Staff.fontSize, since time sigs, keys sigs, etc. will
-    % be smaller as well.
-
-    \property Voice.fontSize = #-2
-    \property Staff.Accidental \override #'font-relative-size = #-2
-    \property Voice.Slur \override #'direction = #-1
-}
-
-stopGraceMusic = {
-    \property Voice.Slur \revert #'direction
-    \property Staff.Accidental \revert #'font-relative-size
-    \property Voice.Beam \revert #'thickness
-
-    \property Voice.Stem \revert #'stroke-style
-    \property Voice.Stem \revert #'no-stem-extend
-    \property Voice.Stem \revert #'beamed-lengths
-    \property Voice.Stem \revert #'beamed-minimum-free-lengths
-    \property Voice.Stem \revert #'beamed-extreme-minimum-free-lengths
-    \property Voice.Stem \revert #'lengths    
-    \property Voice.Stem \revert #'length
-    \property Voice.Stem \revert #'direction    
-    \property Voice.Beam \revert #'space-function
-    
-    \property Voice.Beam \revert #'position-callbacks
-    
-    % Can't use Staff.fontSize, since time sigs, keys sigs, etc. will
-    % be smaller as well.
-
-    \property Voice.fontSize \unset
+\version "2.17.6"
+
+startGraceSlur = #(make-music 'SlurEvent 'span-direction START 'spanner-id 'grace)
+stopGraceSlur = #(make-music 'SlurEvent 'span-direction STOP 'spanner-id 'grace)
+
+
+startGraceMusic =  {
+}
+
+stopGraceMusic =  {
+}
+
+startAppoggiaturaMusic =
+{
+    <>\startGraceSlur
+}
+
+stopAppoggiaturaMusic =  {
+    <>\stopGraceSlur
+}
+
+startAcciaccaturaMusic =  {
+    <>\startGraceSlur
+    \temporary \override Flag.stroke-style = #"grace"
+}
+
+stopAcciaccaturaMusic =  {
+    \revert Flag.stroke-style
+    <>\stopGraceSlur
+}
+
+startSlashedGraceMusic =  {
+  \temporary \override Flag.stroke-style = #"grace"
+}
+
+stopSlashedGraceMusic =  {
+  \revert Flag.stroke-style
 }