Fix note-spacing corrections

diff --git a/input/regression/dynamics-hairpin-length.ly b/input/regression/dynamics-hairpin-length.ly
index ef00c6418f2e59d41cb1bf21fac067cc359e9401..c7f280bfc6d79f56876ca88b2870b3196f280a52 100644 (file)
--- 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 888390e655830d7c9592b0af78fb967c487705e1..66b9512642470e863168834650fd8cd13719933a 100644 (file)
--- 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 bf000a70618166cab12c8f168b8a509848ed8d01..3b966ebd72703247ce18a11e5867f598c9fa7dc6 100644 (file)
--- 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 41162265174e3a87a2f4b368da25cf9a6e3aebe7..d253eb81d960d568f2843f1695a0469607e272f7 100644 (file)
--- 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)