X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsystem.cc;h=0551b85cbccda5286e770fdc238722edda48aec7;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=91e3f0818163f4036eeba3c4f620ed059002d6d7;hpb=7c44f8bece4865eb0eb26b0490a4a9a04499a76b;p=lilypond.git

diff --git a/lily/system.cc b/lily/system.cc
index 91e3f08181..0551b85cbc 100644
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -106,16 +106,9 @@ System::typeset_grob (Grob *elem)
 void
 System::derived_mark () const
 {
-  if (!all_elements_->empty ())
-    {
-      Grob **ptr = &all_elements_->array_reference ()[0];
-      Grob **end = ptr + all_elements_->size ();
-      while (ptr < end)
-        {
-          scm_gc_mark ((*ptr)->self_scm ());
-          ptr++;
-        }
-    }
+  const vector <Grob *> &arr = all_elements_->array ();
+  for (vsize i = arr.size (); i--;)
+    scm_gc_mark (arr[i]->self_scm ());
 
   if (pscore_)
     scm_gc_mark (pscore_->self_scm ());
@@ -414,7 +407,7 @@ System::vertical_skyline_elements (SCM smob)
   vector<Grob *> vertical_skyline_grobs;
   extract_grob_set (me_grob, "elements", my_elts);
   for (vsize i = 0; i < my_elts.size (); i++)
-    if (System_start_delimiter::has_interface (my_elts[i]))
+    if (has_interface<System_start_delimiter> (my_elts[i]))
       vertical_skyline_grobs.push_back (my_elts[i]);
 
   System *me = dynamic_cast<System *> (me_grob);
@@ -429,7 +422,7 @@ System::vertical_skyline_elements (SCM smob)
   extract_grob_set (align, "elements", elts);
 
   for (vsize i = 0; i < elts.size (); i++)
-    if (Hara_kiri_group_spanner::has_interface (elts[i]))
+    if (has_interface<Hara_kiri_group_spanner> (elts[i]))
       vertical_skyline_grobs.push_back (elts[i]);
 
   SCM grobs_scm = Grob_array::make_array ();
@@ -450,7 +443,7 @@ System::break_into_pieces (vector<Column_x_positions> const &breaking)
 
       int st = Paper_column::get_rank (c[0]);
       int end = Paper_column::get_rank (c.back ());
-      Interval iv (pure_height (this, st, end));
+      Interval iv (pure_y_extent (this, st, end));
       system->set_property ("pure-Y-extent", ly_interval2scm (iv));
 
       system->set_bound (LEFT, c[0]);
@@ -763,7 +756,7 @@ System::get_vertical_alignment (SCM smob)
   extract_grob_set (me, "elements", elts);
   Grob *ret = 0;
   for (vsize i = 0; i < elts.size (); i++)
-    if (Align_interface::has_interface (elts[i]))
+    if (has_interface<Align_interface> (elts[i]))
       {
         if (ret)
           me->programming_error ("found multiple vertical alignments in this system");
@@ -792,7 +785,7 @@ System::get_extremal_staff (Direction dir, Interval const &iv)
   vsize end = (dir == UP) ? elts.size () : VPOS;
   for (vsize i = start; i != end; i += dir)
     {
-      if (Hara_kiri_group_spanner::has_interface (elts[i]))
+      if (has_interface<Hara_kiri_group_spanner> (elts[i]))
         Hara_kiri_group_spanner::consider_suicide (elts[i]);
 
       Interval intersection = elts[i]->extent (this, X_AXIS);
@@ -822,7 +815,7 @@ System::get_neighboring_staff (Direction dir, Grob *vertical_axis_group, Interva
       if (elts[i] == vertical_axis_group)
         return out;
 
-      if (Hara_kiri_group_spanner::has_interface (elts[i]))
+      if (has_interface<Hara_kiri_group_spanner> (elts[i]))
         Hara_kiri_group_spanner::consider_suicide (elts[i]);
 
       bounds.intersect (elts[i]->spanned_rank_interval ());
@@ -917,7 +910,7 @@ System::calc_pure_relevant_grobs (SCM smob)
 
   for (vsize i = 0; i < elts.size (); ++i)
     {
-      if (!Axis_group_interface::has_interface (elts[i]))
+      if (!has_interface<Axis_group_interface> (elts[i]))
         {
           relevant_grobs.push_back (elts[i]);