X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-spacing.cc;h=801fb96948e66fdc78c66750519d3f986928781f;hb=2ff13e6574980c37bb7cd4dd9bf5731805ba6524;hp=b9fd874b9e9aba08e11cd6223ef701961e6fd19a;hpb=8a1a5b054688384ead32745e7f48f7f072fabeb6;p=lilypond.git

diff --git a/lily/staff-spacing.cc b/lily/staff-spacing.cc
index b9fd874b9e..801fb96948 100644
--- a/lily/staff-spacing.cc
+++ b/lily/staff-spacing.cc
@@ -24,6 +24,13 @@ using namespace std;
 #include "pointer-group-interface.hh"
 #include "directional-element-interface.hh"
 
+/* A stem following a bar-line creates an optical illusion similar to the
+   one mentioned in note-spacing.cc. We correct for it here.
+
+   TODO: should we still correct if there are accidentals/arpeggios before
+   the stem?
+*/
+
 Real
 Staff_spacing::optical_correction (Grob *me, Grob *g, Interval bar_height)
 {
@@ -100,36 +107,22 @@ Staff_spacing::next_notes_correction (Grob *me,
   return max_optical;
 }
 
-/* This routine does not impose any minimum distances between columns; it only
-   affects springs. As such, the FIXED variable does not refer to a minimum
-   distance between columns, but instead to a minimum desired distance between
-   columns -- this ends up affecting the stiffness of a spring. In fact, FIXED
-   will be the distance between columns if there is a compression force of 1.0
-   applied to the line. */
+/* We calculate three things here: the ideal distance, the minimum distance
+   (which is the distance at which collisions will occur) and the "fixed"
+   distance, which is the distance at which things start to look really bad.
+   We arrange things so that the fixed distance will be attained when the
+   line is compressed with a force of 1.0 */
 Spring
-Staff_spacing::get_spacing (Grob *me)
+Staff_spacing::get_spacing (Grob *me, Grob *right_col)
 {
-  Grob *separation_item = 0;
   Item *me_item = dynamic_cast<Item *> (me);
-
-  extract_grob_set (me, "left-items", items);
-  for (vsize i = items.size (); i--;)
-    {
-      Grob *cand = items[i];
-      if (cand && Separation_item::has_interface (cand))
-	separation_item = cand;
-    }
-
-  //  printf ("doing col %d\n" , Paper_column::get_rank (left_col));
-  if (!separation_item)
-    {
-      programming_error ("no sep item");
-      return Spring ();
-    }
+  Grob *left_col = me_item->get_column ();
 
   Interval last_ext;
-  Grob *last_grob = Separation_item::extremal_break_aligned_grob (separation_item, RIGHT,
-								  &last_ext);
+  Direction break_dir = me_item->break_status_dir ();
+  Grob *last_grob = Spacing_interface::extremal_break_aligned_grob (me, LEFT,
+								    break_dir,
+								    &last_ext);
   if (!last_grob)
     {
       /*
@@ -191,8 +184,11 @@ Staff_spacing::get_spacing (Grob *me)
       ideal = fixed;
     }
 
+
   Real optical_correction = next_notes_correction (me, last_grob);
-  Real min_dist = Spacing_interface::minimum_distance (me);
+  Real min_dist = Paper_column::minimum_distance (left_col, right_col);
+
+  /* ensure that the "fixed" distance will leave a gap of at least 0.3 ss. */
   Real min_dist_correction = max (0.0, 0.3 + min_dist - fixed);
   Real correction = max (optical_correction, min_dist_correction);
 
@@ -200,14 +196,14 @@ Staff_spacing::get_spacing (Grob *me)
   ideal += correction;
 
   Spring ret (ideal, min_dist);
-  ret.set_inverse_stretch_strength (ideal - fixed);
+  ret.set_inverse_stretch_strength (max (0.0, ideal - fixed));
   return ret;
 }
 
 ADD_INTERFACE (Staff_spacing,
-	       "This object calculates spacing details from a "
-	       " breakable symbol (left) to another object. For example, it takes care "
-	       " of  optical spacing from  a bar lines to a note.",
+	       "This object calculates spacing details from a breakable"
+	       " symbol (left) to another object.  For example, it takes care"
+	       " of optical spacing from a bar line to a note.",
 
 	       /* properties */
 	       "stem-spacing-correction "