Fix 1062.

[lilypond.git] / lily / system.cc

diff --git a/lily/system.cc b/lily/system.cc
index a43c1b4aacdbe265f81779af44b1cb1a3c08229a..c801b2cc1d6bcac99e9897d5b09751ec90fa401c 100644 (file)
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -1,9 +1,20 @@
 /*
-  system.cc -- implement System
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1996--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "system.hh"
@@ -237,7 +248,7 @@ System::break_into_pieces (vector<Column_x_positions> const &breaking)
       for (vsize j = 0; j < c.size (); j++)
        {
          c[j]->translate_axis (breaking[i].config_[j], X_AXIS);
-         dynamic_cast<Paper_column *> (c[j])->system_ = system;
+         dynamic_cast<Paper_column *> (c[j])->set_system (system);
          /* collect the column labels */
          SCM col_labels = c[j]->get_property ("labels");
          if (scm_is_pair (col_labels))
@@ -262,7 +273,7 @@ System::add_column (Paper_column *p)
       ga = unsmob_grob_array (scm_ga);
     }
 
-  p->rank_ = ga->size ();
+  p->set_rank (ga->size ());
 
   ga->add (p);
   Axis_group_interface::add_element (this, p);
@@ -449,7 +460,7 @@ System::broken_col_range (Item const *left, Item const *right) const
         && Paper_column::get_rank (cols[i]) < end_rank)
     {
       Paper_column *c = dynamic_cast<Paper_column *> (cols[i]);
-      if (Paper_column::is_breakable (c) && !c->system_)
+      if (Paper_column::is_breakable (c) && !c->get_system ())
        ret.push_back (c);
       i++;
     }
@@ -559,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"