Correct doc string of repeat tie engraver.

[lilypond.git] / lily / note-spacing.cc

diff --git a/lily/note-spacing.cc b/lily/note-spacing.cc
index d19f63e632827d5fd50c2bc4af12c6713440bd09..96f7b8f8e35078da3b53b6be2f5daa18c38d619b 100644 (file)
--- a/lily/note-spacing.cc
+++ b/lily/note-spacing.cc
@@ -74,7 +74,9 @@ Note_spacing::get_spacing (Grob *me, Item *right_col,
 
   /* If we have a NonMusical column on the right, we measure the ideal distance
      to the bar-line (if present), not the start of the column. */
-  if (!Paper_column::is_musical (right_col) && !skys[RIGHT].is_empty ())
+  if (!Paper_column::is_musical (right_col)
+      && !skys[RIGHT].is_empty ()
+      && to_boolean (me->get_property ("space-to-barline")))
     {
       Grob *bar = Pointer_group_interface::find_grob (right_col,
                                                      ly_symbol2scm ("elements"),
@@ -84,8 +86,10 @@ Note_spacing::get_spacing (Grob *me, Item *right_col,
        {
          Real shift = bar->extent (right_col, X_AXIS)[LEFT];
          ideal -= shift;
-         min_desired_space -= shift;
+         min_desired_space -= max (shift, 0.0);
        }
+      else
+       ideal -= right_col->extent (right_col, X_AXIS)[RIGHT];
     }
 
   ideal = max (ideal, min_desired_space);
@@ -313,6 +317,7 @@ ADD_INTERFACE (Note_spacing,
               "right-items "
               "same-direction-correction "
               "stem-spacing-correction "
+              "space-to-barline "
 
               );