X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-engraver.cc;h=7efe7b4874c54e2c7d9426ca2191743fb1d02ac6;hb=90d3cd494153c10b1ae81ed4545c1b6ce4882294;hp=2796f05ca4272ac18134954e6fea6c42ec9ea4b3;hpb=31a6650e2b2a5c1cae3237ee47b80cd43d084d53;p=lilypond.git

diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index 2796f05ca4..7efe7b4874 100644
--- a/lily/axis-group-engraver.cc
+++ b/lily/axis-group-engraver.cc
@@ -3,15 +3,17 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "axis-group-engraver.hh"
 
-#include "spanner.hh"
 #include "axis-group-interface.hh"
-#include "warn.hh"
+#include "pointer-group-interface.hh"
 #include "context.hh"
+#include "international.hh"
+#include "spanner.hh"
+#include "warn.hh"
 
 #include "translator.icc"
 
@@ -49,13 +51,15 @@ Axis_group_engraver::finalize ()
     {
       Grob *it = unsmob_grob (get_property ("currentCommandColumn"));
       staffline_->set_bound (RIGHT, it);
+
+      Pointer_group_interface::set_ordered (staffline_, ly_symbol2scm ("elements"), false);
     }
 }
 
 void
 Axis_group_engraver::acknowledge_grob (Grob_info i)
 {
-  elts_.push (i.grob ());
+  elts_.push_back (i.grob ());
 }
 
 /*
@@ -68,7 +72,7 @@ Axis_group_engraver::process_acknowledged ()
   if (!staffline_)
     return;
 
-  for (int i = 0; i < elts_.size (); i++)
+  for (vsize i = 0; i < elts_.size (); i++)
     {
       if (!unsmob_grob (elts_[i]->get_object ("axis-group-parent-Y")))
 	{
@@ -82,19 +86,7 @@ Axis_group_engraver::process_acknowledged ()
 	      staffline_ = 0;
 	      break;
 	    }
-#if 0 
-	  else if (elts_[i]->is_empty (Y_AXIS))
-	    {
-	      /*
-		We have to do _something_, otherwise staff objects will
-		end up with System as parent.
-
-	      */
-	      elts_[i]->set_parent (staffline_, Y_AXIS);
-	    }
-	  else
-#endif
-	    add_element (elts_[i]);
+	  add_element (elts_[i]);
 	}
     }
   elts_.clear ();
@@ -112,5 +104,7 @@ ADD_TRANSLATOR (Axis_group_engraver,
 		/* doc */ "Group all objects created in this context in a VerticalAxisGroup spanner.",
 		/* create */ "VerticalAxisGroup",
 		/* accept */ "",
-		/* read */ "verticalExtent minimumVerticalExtent extraVerticalExtent",
+		/* read */
+		"currentCommandColumn ",
+
 		/* write */ "");