Merge commit 'origin' into beamlets2

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

diff --git a/ly/grace-init.ly b/ly/grace-init.ly
index 92e9c30c2f3374235815a9229eef25a2ddce0f9d..ea89bb2e4ede3adb688a9e6021ada135c3d51cc6 100644 (file)
--- a/ly/grace-init.ly
+++ b/ly/grace-init.ly
@@ -1,38 +1,27 @@
+\version "2.12.0"
 
-#(define (grace-beam-space-function multiplicity)
-  (* (if (<= multiplicity 3) 0.816 0.844) 0.8))
 
+startGraceMusic =  {
+}
 
-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"
+stopGraceMusic =  { 
+}
 
-    \property Voice.Beam \override #'space-function = #grace-beam-space-function
-    \property Voice.Beam \override #'thickness = #0.3
-    
-    % must use staff. Accidentals should also be smaller. 
-    \property Staff.fontSize = #-2
+startAppoggiaturaMusic =
+ {
+    s1*0(
 }
 
-stopGraceMusic = {
-    \property Voice.Beam \revert #'space-function
-    \property Voice.Beam \revert #'thickness
+stopAppoggiaturaMusic =  { 
+    s1*0)
+}
+
+startAcciaccaturaMusic =  {
+    s1*0(
+    \override Stem  #'stroke-style = #"grace"
+}
 
-    \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    
-    
-    \property Staff.fontSize \unset
+stopAcciaccaturaMusic =  {
+    \revert Stem #'stroke-style
+    s1*0)
 }