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

diff --git a/ly/grace-init.ly b/ly/grace-init.ly
index b9a895cdc4..a46111e4d9 100644
--- a/ly/grace-init.ly
+++ b/ly/grace-init.ly
@@ -1,45 +1,38 @@
+\version "2.17.6"
 
-#(define (grace-beam-space-function multiplicity)
-  (* (if (<= multiplicity 3) 0.816 0.844) 0.8))
-
-
-startGraceMusic = {
-    \property Voice.Stem \override  #'direction = #1
-    \property Voice.Stem \override #'length = #6
-    \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) (* 1.25 x)) '(0.0 2.5 2.0 1.5))
-    \property Voice.Stem \override #'beamed-minimum-lengths =
-        #(map (lambda (x) (* 1.25 x)) '(0.0 1.5 1.25 1.0))
-    \property Voice.Stem \override #'no-stem-extend = ##t
-    \property Voice.Stem \override #'flag-style  = #"grace"
-
-    \property Voice.Beam \override #'space-function = #grace-beam-space-function
-    \property Voice.Beam \override #'thickness = #0.3
-    
-    % Can't use Staff.fontSize, since time sigs, keys sigs, etc. will
-    % be smaller as well.
-
-    \property Voice.fontSize = #-2
-    \property Staff.LocalKeyItem \override #'font-relative-size = #-2
-}
-
-stopGraceMusic = {
-    \property Voice.Beam \revert #'space-function
-    \property Voice.Beam \revert #'thickness
-
-    \property Voice.Stem \revert #'flag-style
-    \property Voice.Stem \revert #'no-stem-extend
-    \property Voice.Stem \revert #'beamed-lengths
-    \property Voice.Stem \revert #'beamed-minimum-lengths
-    \property Voice.Stem \revert #'lengths    
-    \property Voice.Stem \revert #'length
-    \property Voice.Stem \revert #'direction    
-    
-    % Can't use Staff.fontSize, since time sigs, keys sigs, etc. will
-    % be smaller as well.
-
-    \property Voice.fontSize \unset
-    \property Staff.LocalKeyItem \revert #'font-relative-size
+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
 }