diff options
| author | Joe Neeman <joeneeman@gmail.com> | 2007-07-03 10:01:17 +1000 |
|---|---|---|
| committer | Joe Neeman <joeneeman@gmail.com> | 2007-07-03 10:01:17 +1000 |
| commit | 9afa2e6d68eb4faf6e93505c18c855c46f84e370 (patch) | |
| tree | 5f73dd217c588fcf690d7497097b79060b2a3720 | |
| parent | 1c621847dc60cd425b20864236c95aec2591a101 (diff) | |
Fix note-spacing corrections
| -rw-r--r-- | input/regression/dynamics-hairpin-length.ly | 2 | ||||
| -rw-r--r-- | input/regression/fill-line-test.ly | 2 | ||||
| -rw-r--r-- | input/regression/finger-chords.ly | 2 | ||||
| -rw-r--r-- | lily/note-spacing-engraver.cc | 3 |
4 files changed, 5 insertions, 4 deletions
diff --git a/input/regression/dynamics-hairpin-length.ly b/input/regression/dynamics-hairpin-length.ly index ef00c6418f..c7f280bfc6 100644 --- a/input/regression/dynamics-hairpin-length.ly +++ b/input/regression/dynamics-hairpin-length.ly @@ -1,7 +1,7 @@ \header { texidoc = "Hairpins extend to the extremes of the bound if there - is no adjacent hairpin of dynamic-text. If there is, the hairpin + is no adjacent hairpin or dynamic-text. If there is, the hairpin extends to the center of the column or the bound of the text respectively." diff --git a/input/regression/fill-line-test.ly b/input/regression/fill-line-test.ly index 888390e655..66b9512642 100644 --- a/input/regression/fill-line-test.ly +++ b/input/regression/fill-line-test.ly @@ -3,7 +3,7 @@ \header { texidoc = "The fill-line markup command should align texts in - columns. For examlpe, the characters in the center should form one + columns. For example, the characters in the center should form one column." } diff --git a/input/regression/finger-chords.ly b/input/regression/finger-chords.ly index bf000a7061..3b966ebd72 100644 --- a/input/regression/finger-chords.ly +++ b/input/regression/finger-chords.ly @@ -2,7 +2,7 @@ \version "2.10.0" \header { - texidoc = "With the new chord syntax, it is possible to associate + texidoc = "It is possible to associate fingerings uniquely with notes. This makes it possible to add horizontal fingerings to notes. diff --git a/lily/note-spacing-engraver.cc b/lily/note-spacing-engraver.cc index 4116226517..d253eb81d9 100644 --- a/lily/note-spacing-engraver.cc +++ b/lily/note-spacing-engraver.cc @@ -104,7 +104,8 @@ Note_spacing_engraver::stop_translation_timestep () { if (last_spacing_ && last_spacing_parent_context_ - && last_spacing_parent_context_ == context ()->get_parent_context ()) + && last_spacing_parent_context_ == context ()->get_parent_context () + && !unsmob_grob_array (last_spacing_->get_object ("right-items"))) { Grob *sep = unsmob_grob (get_property ("currentCommandColumn")); if (sep) |