* input/regression/spacing-to-grace.ly: new file.

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

diff --git a/ly/grace-init.ly b/ly/grace-init.ly
index 346502645556fd8f0c06b3fbbad603015f1f6694..ac54002b0510a7f885f6655aa1d215d68c006b42 100644 (file)
--- a/ly/grace-init.ly
+++ b/ly/grace-init.ly
@@ -1,17 +1,21 @@
+\version "1.5.68"
 
 startGraceMusic = {
     \property Voice.Stem \override  #'direction = #1
-    \property Voice.Stem \override #'length = #6
+    \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)) '(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))
+        #(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 #'flag-style  = #"grace"
+    \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 =
@@ -35,10 +39,11 @@ stopGraceMusic = {
     \property Staff.Accidental \revert #'font-relative-size
     \property Voice.Beam \revert #'thickness
 
-    \property Voice.Stem \revert #'flag-style
+    \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-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    
@@ -51,3 +56,23 @@ stopGraceMusic = {
 
     \property Voice.fontSize \unset
 }
+
+#(define (add-to-grace-init context object prop val)
+   " Override context.object #'property before entering grace context,
+and restore afterwards. Use this to add settings to default grace notes.
+"
+   (set! stopGraceMusic
+    (make-sequential-music
+     (cons
+      (context-spec-music  (make-grob-property-revert object prop) context)
+      (ly-get-mus-property stopGraceMusic 'elements)
+     )))
+   (set! startGraceMusic
+    (make-sequential-music
+     (append
+      (ly-get-mus-property startGraceMusic 'elements)
+      (list (context-spec-music  (make-grob-property-set object prop val) context))
+      )
+     )))
+   
+