X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fgrace-init.ly;h=a46111e4d91a2a62d36c6595b7a9e88da3047738;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=54211cb4d975fbc5d21f7f7174d34866471e65f0;hpb=4995fea559cd5399b4f462de546a15195d76f4c3;p=lilypond.git

diff --git a/ly/grace-init.ly b/ly/grace-init.ly
index 54211cb4d9..a46111e4d9 100644
--- a/ly/grace-init.ly
+++ b/ly/grace-init.ly
@@ -1,58 +1,38 @@
+\version "2.17.6"
 
+startGraceSlur = #(make-music 'SlurEvent 'span-direction START 'spanner-id 'grace)
+stopGraceSlur = #(make-music 'SlurEvent 'span-direction STOP 'spanner-id 'grace)
 
- #(define (grace-beam-space-function multiplicity)
-         (* (if (<= multiplicity 3) 0.816 0.844) 0.8))
 
+startGraceMusic =  {
+}
 
- #(define (make-text-checker text)
-  (lambda (elt) (equal? text (ly-get-grob-property elt 'text))))
-
-
-startGraceMusic = {
-
-%{
-from GraceContext
-	Stem \override  #'flag-style = #"grace"
-	Stem \override  #'stem-length = #6.0
-	Stem \override  #'direction = #1
+stopGraceMusic =  {
+}
 
-	NoteHead \override #'font-relative-size = #-1
-	Stem \override #'font-relative-size = #-1
-	Stem \override #'stem-shorten = #'(0)
-	Beam \override #'font-relative-size = #-1
-	TextScript \override #'font-relative-size = #-1
-	Slur \override #'font-relative-size = #-1
-	Accidentals \override #'font-relative-size = #-1
-	Beam \override #'thickness = #0.3
-	Beam \override #'space-function = #(lambda (x) 0.5)
+startAppoggiaturaMusic =
+{
+    <>\startGraceSlur
+}
 
-	Stem \override #'lengths = #(map (lambda (x) (* 0.8 x)) '(3.5 3.5 3.5 4.5 5.0))
-	Stem \override #'beamed-lengths =
-		#'(0.0 2.5 2.0 1.5)
-	Stem \override #'beamed-minimum-lengths
-		 = #(map (lambda (x) (* 0.8 x)) '(0.0 2.5 2.0 1.5))
-%}
+stopAppoggiaturaMusic =  {
+    <>\stopGraceSlur
+}
 
+startAcciaccaturaMusic =  {
+    <>\startGraceSlur
+    \temporary \override Flag.stroke-style = #"grace"
+}
 
-    \property Voice.NoteHead \override #'font-relative-size = #-1
-    \property Voice.Stem \override #'length = #6
-    \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.Beam \override #'space-function = #grace-beam-space-function
-    \property Voice.fontSize = #-2
-    \property Voice.Stem \override #'no-stem-extend = ##t
+stopAcciaccaturaMusic =  {
+    \revert Flag.stroke-style
+    <>\stopGraceSlur
+}
 
-%    \property Voice.Stem \override #'flag-style  = #"grace"
+startSlashedGraceMusic =  {
+  \temporary \override Flag.stroke-style = #"grace"
 }
 
-stopGraceMusic = {
-% \property Voice.Stem \revert #'flag-style
-    \property Voice.Stem \override #'no-stem-extend = ##f 
-    \property Voice.Stem \revert #'length
-    \property Voice.Stem \revert #'beamed-lengths
-    \property Voice.Stem \revert #'beamed-minimum-lengths
-    \property Voice.Beam \revert #'space-function
-    \property Voice.fontSize \unset
+stopSlashedGraceMusic =  {
+  \revert Flag.stroke-style
 }