From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 2 Jan 2007 00:14:26 +0000 (+0100)
Subject: Only set commandColumn in NoteSpacing if no right-item was encountered.
X-Git-Tag: release/2.11.8-1~52
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f95de772ef7e0339d8162c5ed162827fd235f0c5;p=lilypond.git

Only set commandColumn in NoteSpacing if no right-item was encountered.
---

diff --git a/input/regression/spacing-mark-width.ly b/input/regression/spacing-mark-width.ly
new file mode 100644
index 0000000000..b0b461440b
--- /dev/null
+++ b/input/regression/spacing-mark-width.ly
@@ -0,0 +1,18 @@
+\header {
+
+  texidoc = "Width of marks does not affect spacing."
+
+}
+
+\version "2.10.7"
+
+\paper {
+  ragged-right = ##t
+}
+
+\relative c''
+{
+  \override Score.RehearsalMark #'break-visibility = #begin-of-line-invisible
+  c1
+  \mark "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx "
+}
diff --git a/lily/note-spacing-engraver.cc b/lily/note-spacing-engraver.cc
index 7b5f2ad7bd..8772ceec7b 100644
--- a/lily/note-spacing-engraver.cc
+++ b/lily/note-spacing-engraver.cc
@@ -9,6 +9,7 @@
 
 #include "engraver.hh"
 
+#include "grob-array.hh"
 #include "context.hh"
 #include "item.hh"
 #include "pointer-group-interface.hh"
@@ -86,7 +87,8 @@ Note_spacing_engraver::finalize ()
 {
   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")))
     {
       SCM ccol = get_property ("currentCommandColumn");
       Grob *column = unsmob_grob (ccol);