release: 1.1.18

[lilypond.git] / lily / single-malt-grouping-item.cc

diff --git a/lily/single-malt-grouping-item.cc b/lily/single-malt-grouping-item.cc
index 56541540f127874be31888dd2898af73092de6a7..bd5101039ab8cf7ce375876678b4f98f8f07228a 100644 (file)
--- a/lily/single-malt-grouping-item.cc
+++ b/lily/single-malt-grouping-item.cc
@@ -34,21 +34,22 @@ Single_malt_grouping_item::my_width () const
     {
       Item *il = item_l_arr_[i];
       assert (pc == il->column_l ());
-      w.unite  (il->width () + il->relative_coordinate (pc, X_AXIS));
+      w.unite  (il->extent (X_AXIS) + il->relative_coordinate (&pc->dim_cache_[X_AXIS], X_AXIS));
     }
 
   return w;
  // add this->offset_ ? this-> relative_coordinate ()? 
 }
 
-IMPLEMENT_IS_TYPE_B1(Single_malt_grouping_item, Item);
+
 
 void
 Single_malt_grouping_item::do_substitute_dependency (Score_element*o, Score_element*n)
 {
   if (dynamic_cast <Item *> (o))
     {
-      item_l_arr_.unordered_substitute (dynamic_cast <Item *> (o),  n ? dynamic_cast <Item *> (n) : 0);
+      item_l_arr_.unordered_substitute (dynamic_cast <Item *> (o),
+                                       dynamic_cast <Item *> (n));
     }
 }
 
@@ -58,7 +59,7 @@ Single_malt_grouping_item::do_print () const
 #ifndef NDEBUG
   for (int i=0; i < item_l_arr_.size (); i++)
     {
-      DOUT << item_l_arr_[i]->name () << ", ";
+      DOUT << classname (item_l_arr_[i]) << ", ";
     }
 #endif
 }