X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-column.cc;h=2256d03600c409837379bf3a11b7cb49c408f49e;hb=543ccb981aacaa5a596184feb38301ac74f1d9c9;hp=c313475f49cdf0760d317bce8ad73a6b3461641c;hpb=e79a1b386108bd84ef04a4a71b21b4049ca6b867;p=lilypond.git

diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index c313475f49..2256d03600 100644
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -22,6 +22,7 @@
 #include "system.hh"
 #include "spring.hh"
 #include "lookup.hh"
+#include "separation-item.hh"
 #include "string-convert.hh"
 
 Grob *
@@ -136,6 +137,31 @@ Paper_column::is_breakable (Grob *me)
   return scm_is_symbol (me->get_property ("line-break-permission"));
 }
 
+Real
+Paper_column::minimum_distance (Grob *left, Grob *right)
+{
+  Drul_array<Grob*> cols (left, right);
+  Drul_array<Skyline> skys = Drul_array<Skyline> (Skyline (RIGHT), Skyline (LEFT));
+
+  Direction d = LEFT;
+  do
+    {
+      skys[d].set_minimum_height (0.0);
+      extract_grob_set (cols[d], "elements", elts);
+
+      for (vsize i = 0; i < elts.size (); i++)
+	if (Separation_item::has_interface (elts[i]))
+	  {
+	    Skyline_pair *sp = Skyline_pair::unsmob (elts[i]->get_property ("horizontal-skylines"));
+	    if (sp)
+	      skys[d].merge ((*sp)[-d]);
+	  }
+    }
+  while (flip (&d) != LEFT);
+
+  return max (0.0, skys[LEFT].distance (skys[RIGHT]));
+}
+
 /*
   Print a vertical line and  the rank number, to aid debugging.
 */
@@ -160,7 +186,7 @@ Paper_column::print (SCM p)
 						   properties,
 						   ly_string2scm (when));
   Stencil t = *unsmob_stencil (scm_mol);
-  t.add_at_edge (Y_AXIS, DOWN, *unsmob_stencil (when_mol), 0.1, 0.1);
+  t.add_at_edge (Y_AXIS, DOWN, *unsmob_stencil (when_mol), 0.1);
   t.align_to (X_AXIS, CENTER);
   t.align_to (Y_AXIS, DOWN);
 
@@ -175,8 +201,9 @@ Paper_column::print (SCM p)
   for (SCM s = me->get_object ("ideal-distances");
        scm_is_pair (s); s = scm_cdr (s))
     {
-      Spring_smob *sp = unsmob_spring (scm_car (s));
-      if (!sp->other_->get_system ())
+      Spring *sp = unsmob_spring (scm_caar (s));
+      if (!unsmob_grob (scm_cdar (s))
+	  || !unsmob_grob (scm_cdar (s))->get_system ())
 	continue;
       
       j++;
@@ -184,7 +211,7 @@ Paper_column::print (SCM p)
       vector<Offset> pts;
       pts.push_back (Offset (0, y));
 
-      Offset p2 (sp->distance_, y);
+      Offset p2 (sp->distance (), y);
       pts.push_back (p2);
       
       Stencil id_stencil = Lookup::points_to_line_stencil (0.1, pts);
@@ -192,9 +219,9 @@ Paper_column::print (SCM p)
 
       SCM distance_stc = Text_interface::interpret_markup (me->layout ()->self_scm (),
 							   small_letters,
-							   ly_string2scm (String_convert::form_string ("%5.2lf", sp->distance_)));
+							   ly_string2scm (String_convert::form_string ("%5.2lf", sp->distance ())));
       
-      id_stencil.add_stencil (unsmob_stencil (distance_stc)->translated (Offset (sp->distance_/3, y+1)));
+      id_stencil.add_stencil (unsmob_stencil (distance_stc)->translated (Offset (sp->distance ()/3, y+1)));
       id_stencil.add_stencil (head.translated (p2));
       id_stencil = id_stencil.in_color (0,0,1);
       l.add_stencil (id_stencil);
@@ -289,7 +316,8 @@ ADD_INTERFACE (Paper_column,
 	       /* properties */
 	       "between-cols "
 	       "bounded-by-me "
-	       "grace-spacing " 
+	       "grace-spacing "
+	       "labels "
 	       "line-break-system-details "
 	       "line-break-penalty "
 	       "line-break-permission "