X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fgrace-init.ly;h=4b1dc9b94b817e55986e01943759d24955ae1c12;hb=4c8187e65dd9708d7733692842acc696da121bf1;hp=691498d1bd00aaa847793c49a961d364684b4c80;hpb=8e300d9598c6f54cb18d8bc8cd0458fa1028d8b9;p=lilypond.git

diff --git a/ly/grace-init.ly b/ly/grace-init.ly
index 691498d1bd..4b1dc9b94b 100644
--- a/ly/grace-init.ly
+++ b/ly/grace-init.ly
@@ -1,45 +1,33 @@
+\version "1.9.8"
 
-#(define (grace-beam-space-function multiplicity)
-  (* (if (<= multiplicity 3) 0.816 0.844) 0.8))
 
+startGraceMusic = \notes {
+    \context Voice \applycontext #set-start-grace-properties
+}
 
-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) (* 0.8 x)) '(0.0 2.5 2.0 1.5))
-    \property Voice.Stem \override #'beamed-minimum-lengths =
-        #(map (lambda (x) (* 0.8 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.384
-    
-    % Can't use Staff.fontSize, since time sigs, keys sigs, etc. will
-    % be smaller as well.
+stopGraceMusic = \notes { 
+    \context Voice \applycontext #set-stop-grace-properties
+}
 
-    \property Voice.fontSize = #-2
-    \property Staff.Accidentals \override #'font-relative-size = #-2
+startAppoggiaturaMusic =
+\notes {
+    \context Voice \applycontext #set-start-grace-properties
+    s1*0(
 }
 
-stopGraceMusic = {
-    \property Voice.Beam \revert #'space-function
-    \property Voice.Beam \revert #'thickness
+stopAppoggiaturaMusic = \notes { 
+    \context Voice \applycontext #set-stop-grace-properties
+    s1*0)
+}
 
-    \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.
+startAcciaccaturaMusic = \notes {
+    \context Voice \applycontext #set-start-grace-properties
+    s1*0(
+    \property Voice.Stem \override #'stroke-style = #"grace"
+}
 
-    \property Voice.fontSize \unset
-    \property Staff.LocalKeyItem \revert #'font-relative-size
+stopAcciaccaturaMusic = \notes {
+    \property Voice.Stem \revert #'stroke-style
+    \context Voice \applycontext #set-stop-grace-properties
+    s1*0)
 }