diff options
| author | Joe Neeman <joeneeman@gmail.com> | 2008-02-25 21:09:34 +0200 |
|---|---|---|
| committer | Joe Neeman <joeneeman@gmail.com> | 2008-02-25 21:09:34 +0200 |
| commit | bf0c1c47ad9bd411b4527d1dd5f5dfab9d98d404 (patch) | |
| tree | 2ec2ec5ffb4a4470c1444b466a495c00d5f1d80f | |
| parent | 07ea6396c855b6140d1e5b111a4aa7ee2aa7e5cf (diff) | |
Fix 577.
Fix a silly mistake with grace spacing.
Change the regression test to better show this sort of error.
| -rw-r--r-- | input/regression/spacing-strict-spacing-grace.ly | 27 | ||||
| -rw-r--r-- | lily/spacing-spanner.cc | 3 |
2 files changed, 17 insertions, 13 deletions
diff --git a/input/regression/spacing-strict-spacing-grace.ly b/input/regression/spacing-strict-spacing-grace.ly index 923fe45722..918b5b2248 100644 --- 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 512bfe4166..8ebf100a53 100644 --- 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); |