Fix 1062.

[lilypond.git] / lily / system.cc

diff --git a/lily/system.cc b/lily/system.cc
index 1be38ea570ab8520b531eb6ff02a9eee032fdbba..c801b2cc1d6bcac99e9897d5b09751ec90fa401c 100644 (file)
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -570,6 +570,59 @@ System::get_extremal_staff (Direction dir, Interval const &iv)
   return 0;
 }
 
+Interval
+System::part_of_line_pure_height (vsize start, vsize end, bool begin)
+{
+  Grob *alignment = get_vertical_alignment ();
+  if (!alignment)
+    {
+      programming_error("system does not have a vertical alignment");
+      return Interval();
+    }
+  extract_grob_set (alignment, "elements", staves);
+  vector<Real> offsets = Align_interface::get_minimum_translations (alignment, staves, Y_AXIS, true, start, end);
+
+  Interval ret;
+  for (vsize i = 0; i < staves.size (); ++i)
+    {
+      Interval iv = begin?
+        Axis_group_interface::begin_of_line_pure_height (staves[i], start) :
+        Axis_group_interface::rest_of_line_pure_height (staves[i], start, end);
+      if (i<offsets.size())
+        iv.translate (offsets[i]);
+      ret.unite (iv);
+    }
+
+  extract_grob_set (this, "elements", elts);
+  for (vsize i = 0; i < elts.size (); ++i)
+    {
+      Grob *g = elts[i];
+      if (!dynamic_cast<Paper_column *> (g) && !Axis_group_interface::has_interface (g))
+       {
+         Interval iv = g->pure_height (this, start, end);
+         Item *it = dynamic_cast<Item*> (g);
+         Grob *col = it ? it->get_column () : 0;
+         bool item_at_beginning = col && (Paper_column::get_rank (col) == (int) start);
+
+         if (g->is_live () && begin == item_at_beginning)
+           ret.unite (iv);
+       }
+    }
+  return ret;
+}
+
+Interval
+System::begin_of_line_pure_height (vsize start, vsize end)
+{
+  return part_of_line_pure_height (start, end, true);
+}
+
+Interval
+System::rest_of_line_pure_height (vsize start, vsize end)
+{
+  return part_of_line_pure_height (start, end, false);
+}
+
 ADD_INTERFACE (System,
               "This is the top-level object: Each object in a score"
               " ultimately has a @code{System} object as its X and"