Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / axis-group-interface.cc

diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc
index bc386b628e862ff7b42174c106a35b4f8115724c..d590813abf5cedab94f4b9dd1df4582341ad3ca0 100644 (file)
--- a/lily/axis-group-interface.cc
+++ b/lily/axis-group-interface.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "axis-group-interface.hh"
@@ -33,6 +33,8 @@ Axis_group_interface::add_element (Grob *me, Grob *e)
                              me->self_scm ());
     }
 
+  /* must be ordered, because Align_interface also uses
+     Axis_group_interface  */
   Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), e);
 }
 
@@ -45,11 +47,11 @@ Axis_group_interface::has_axis (Grob *me, Axis a)
 }
 
 Interval
-Axis_group_interface::relative_group_extent (Link_array<Grob> const &elts,
+Axis_group_interface::relative_group_extent (vector<Grob*> const &elts,
                                             Grob *common, Axis a)
 {
   Interval r;
-  for (int i = 0; i < elts.size (); i++)
+  for (vsize i = 0; i < elts.size (); i++)
     {
       Grob *se = elts[i];
       Interval dims = se->extent (common, a);
@@ -88,15 +90,15 @@ Axis_group_interface::generic_group_extent (Grob *me, Axis a)
 }
 
 void
-Axis_group_interface::get_children (Grob *me, Link_array<Grob> *found)
+Axis_group_interface::get_children (Grob *me, vector<Grob*> *found)
 {
-  found->push (me);
+  found->push_back (me);
 
   if (!has_interface (me))
     return;
 
   extract_grob_set (me, "elements", elements);
-  for (int i = 0; i < elements.size (); i++)
+  for (vsize i = 0; i < elements.size (); i++)
     {
       Grob *e = elements[i];
       Axis_group_interface::get_children (e, found);