X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-spacing.cc;h=bd796a71354f5d2376164781befe70a7f852a5cd;hb=0aa76be34498475f09693cba89b17be8a1f13b8f;hp=88c459240f029ab8b953728e0b9e01c3818341bd;hpb=deabe8e6c21ae6080e13b269bab24901f74a2254;p=lilypond.git

diff --git a/lily/note-spacing.cc b/lily/note-spacing.cc
index 88c459240f..bd796a7135 100644
--- a/lily/note-spacing.cc
+++ b/lily/note-spacing.cc
@@ -3,11 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2007  Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2001--2009  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "note-spacing.hh"
 
+#include "bar-line.hh"
 #include "directional-element-interface.hh"
 #include "grob-array.hh"
 #include "paper-column.hh"
@@ -22,6 +23,12 @@
 #include "output-def.hh"
 #include "pointer-group-interface.hh"
 
+static bool
+non_empty_barline (Grob *me)
+{
+  return Bar_line::has_interface (me) && !me->extent (me, X_AXIS).is_empty ();
+}
+
 /*
   TODO: detect hshifts due to collisions, and account for them in
   spacing?
@@ -66,21 +73,38 @@ Note_spacing::get_spacing (Grob *me, Item *right_col,
     adjust things so there are no collisions.
   */
   Drul_array<Skyline> skys = Spacing_interface::skylines (me, right_col);
-  Real min_dist = max (0.0, skys[LEFT].distance (skys[RIGHT]));
-  Real min_desired_space = left_head_end + (min_dist - left_head_end) / 2;
-
-  /* if the right object sticks out a lot, include a bit of extra space.
-     But only for non-musical-columns; this shouldn't apply to accidentals */
-  if (!Paper_column::is_musical (right_col))
-    min_desired_space = max (min_desired_space,
-			     left_head_end + LEFT * skys[RIGHT].max_height ());
+  Real distance = skys[LEFT].distance (skys[RIGHT]);
+  Real min_dist = max (0.0, distance);
+  Real min_desired_space = left_head_end + (min_dist - left_head_end + base_space - increment) / 2;
+  Real ideal = base_space - increment + left_head_end;
+
+  /* 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 ()
+      && to_boolean (me->get_property ("space-to-barline")))
+    {
+      Grob *bar = Pointer_group_interface::find_grob (right_col,
+						      ly_symbol2scm ("elements"),
+						      non_empty_barline);
 
-  Real ideal = base_space - increment + min_desired_space;
+      if (bar)
+	{
+	  Real shift = bar->extent (right_col, X_AXIS)[LEFT];
+	  ideal -= shift;
+	  min_desired_space -= max (shift, 0.0);
+	}
+      else
+	ideal -= right_col->extent (right_col, X_AXIS)[RIGHT];
+    }
 
+  ideal = max (ideal, min_desired_space);
   stem_dir_correction (me, right_col, increment, &ideal, &min_desired_space);
 
-  Spring ret (ideal, min_dist);
-  ret.set_inverse_compress_strength (max (0.0, ideal - max (min_dist, min_desired_space)));
+  /* TODO: grace notes look bad when things are stretched. Should we increase
+     their stretch strength? */
+  Spring ret (max (0.0, ideal), min_dist);
+  ret.set_inverse_compress_strength (max (0.0, ideal - min_desired_space));
   ret.set_inverse_stretch_strength (max (0.1, base_space - increment));
   return ret;
 }
@@ -167,7 +191,7 @@ same_direction_correction (Grob *note_spacing, Drul_array<Interval> head_posns)
 }
 
 
-/**
+/*
    Correct for optical illusions. See [Wanske] p. 138. The combination
    up-stem + down-stem should get extra space, the combination
    down-stem + up-stem less.
@@ -195,6 +219,8 @@ Note_spacing::stem_dir_correction (Grob *me, Item *rcolumn,
 
   Direction d = LEFT;
 
+  bool acc_right = false;
+
   Grob *bar = Spacing_interface::extremal_break_aligned_grob (me, RIGHT,
 							      rcolumn->break_status_dir (),
 							      &bar_xextent);
@@ -207,12 +233,14 @@ Note_spacing::stem_dir_correction (Grob *me, Item *rcolumn,
       for (vsize i = 0; i < items.size (); i++)
 	{
 	  Item *it = dynamic_cast<Item *> (items[i]);
+	  if (!Note_column::has_interface (it))
+	    continue;
 
 	  /*
-	    don't correct if accidentals are sticking out of the right side.
+	    Find accidentals which are sticking out of the right side.
 	  */
-	  if (d == RIGHT && Note_column::accidentals (it))
-	    return;
+	 if (d == RIGHT)
+            acc_right = acc_right || Note_column::accidentals (it);
 
 	  Grob *stem = Note_column::get_stem (it);
 
@@ -280,7 +308,12 @@ Note_spacing::stem_dir_correction (Grob *me, Item *rcolumn,
 	    correction *= 0.5;
 	}
     }
-  else if (stem_dirs[LEFT] * stem_dirs[RIGHT] == 1)
+  /*
+    Only apply same direction correction if there are no
+    accidentals sticking out of the right hand side.
+  */
+  else if (stem_dirs[LEFT] * stem_dirs[RIGHT] == 1
+	   && !acc_right)
     correction = same_direction_correction (me, head_posns);
 
   *space += correction;
@@ -293,12 +326,12 @@ Note_spacing::stem_dir_correction (Grob *me, Item *rcolumn,
 ADD_INTERFACE (Note_spacing,
 	       "This object calculates spacing wishes for individual voices.",
 
-	       
+	       /* properties */
 	       "knee-spacing-correction "
 	       "left-items "
 	       "right-items "
 	       "same-direction-correction "
 	       "stem-spacing-correction "
-
+	       "space-to-barline "
 	       );