Pfa vs. pfb fixes.

[lilypond.git] / lily / paper-column.cc

diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index 56b96469975d71cac75b73346ce54ceee3c108b9..ba5b36b13e114062f6d9fc79d80dc6e510c98e07 100644 (file)
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -8,6 +8,7 @@
 
 #include "paper-column.hh"
 
+#include "break-align-interface.hh"
 #include "moment.hh"
 #include "paper-score.hh"
 #include "warn.hh"
@@ -146,19 +147,34 @@ Paper_column::minimum_distance (Grob *left, Grob *right)
   Direction d = LEFT;
   do
     {
-      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]);
-         }
+      Skyline_pair *sp = Skyline_pair::unsmob (cols[d]->get_property ("horizontal-skylines"));
+      if (sp)
+       skys[d] = (*sp)[-d];
     }
   while (flip (&d) != LEFT);
 
-  return min (0.0, skys[LEFT].distance (skys[RIGHT]));
+  skys[RIGHT].merge (Separation_item::conditional_skyline (right, left));
+
+  return max (0.0, skys[LEFT].distance (skys[RIGHT]));
+}
+
+Interval
+Paper_column::break_align_width (Grob *me)
+{
+  Grob *p = me->get_parent (X_AXIS);
+
+  if (is_musical (me))
+    {
+      me->programming_error ("tried to get break-align-width of a non-musical column");
+      return Interval (0, 0) + me->relative_coordinate (p, X_AXIS);
+    }
+
+  Grob *align = Pointer_group_interface::find_grob (me, ly_symbol2scm ("elements"),
+                                                   Break_alignment_interface::has_interface);
+  if (!align)
+    return Interval (0, 0) + me->relative_coordinate (p, X_AXIS);
+
+  return align->extent (p, X_AXIS);
 }
 
 /*