Fix 577.

Fix a silly mistake with grace spacing.
Change the regression test to better show this sort of error.

diff --git a/input/regression/spacing-strict-spacing-grace.ly b/input/regression/spacing-strict-spacing-grace.ly
index 923fe4572287e5d3b1b1663b21647da849a46aa2..918b5b224821e72c8b4b2c0e5596dfd229b675f0 100644 (file)
--- a/input/regression/spacing-strict-spacing-grace.ly
+++ b/input/regression/spacing-strict-spacing-grace.ly
@@ -7,15 +7,18 @@
 
 \version "2.10.0"
 
-\paper {
-  ragged-right = ##t
-  indent = 0
-}
-
-\relative c''
-{
-  \override Score.SpacingSpanner #'strict-note-spacing = ##t 
-  \set Score.proportionalNotationDuration = #(ly:make-moment 1 12)
-  c8[ \grace { c16[ c] } c8 c8 c8] 
-  c2 
-}  
+<<
+ \override Score.SpacingSpanner #'strict-grace-spacing = ##t
+ \new Staff {
+    c'4
+    \afterGrace
+    c'4
+    { c'16[ c' c' c'] c'[ c' c' c'] }
+    c'4
+ }
+ \new Staff {
+    c'16[ c'16 c'16 c'16]
+    c'16[ c'16 c'16 c'16]
+    c'4
+ }
+>>

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index 512bfe4166a71565a5464b42d1a42630ebf05d5b..8ebf100a530ad8d2085142647e9e414883fb8953 100644 (file)
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -339,7 +339,8 @@ Spacing_spanner::musical_column_spacing (Grob *me,
          if (Note_spacing::has_interface (wish))
            {
              Real inc = options->increment_;
-             if (Grob *gsp = unsmob_grob (left_col->get_object ("grace-spacing")))
+             Grob *gsp = unsmob_grob (left_col->get_object ("grace-spacing"));
+             if (gsp && Paper_column::when_mom (left_col).grace_part_)
                {
                  Spacing_options grace_opts;
                  grace_opts.init_from_grob (gsp);