X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Faxis-group-engraver.cc;h=4f19938ef8c3e90c3b45cc9bc7e53682fbe9be79;hb=1b67b706db8d1098bd2724e99f99a22132c99c68;hp=21e3abc7f774ad44bd48bf8f0ccc9c83855b1784;hpb=cf226d3dcf74938e004cfa89d85917cbdd7e3e36;p=lilypond.git

diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index 21e3abc7f7..4f19938ef8 100644
--- a/lily/axis-group-engraver.cc
+++ b/lily/axis-group-engraver.cc
@@ -3,17 +3,19 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "axis-group-engraver.hh"
 
-#include "spanner.hh"
-#include "paper-column.hh"
 #include "axis-group-interface.hh"
-#include "engraver-group-engraver.hh"
-#include "warn.hh"
+#include "pointer-group-interface.hh"
 #include "context.hh"
+#include "international.hh"
+#include "spanner.hh"
+#include "warn.hh"
+
+#include "translator.icc"
 
 Axis_group_engraver::Axis_group_engraver ()
 {
@@ -38,41 +40,22 @@ Axis_group_engraver::get_spanner ()
   return make_spanner ("VerticalAxisGroup", SCM_EOL);
 }
 
-/*
-  TODO: should we junk minimumVerticalExtent/extraVerticalExtent ?
-*/
-
 void
 Axis_group_engraver::finalize ()
 {
-  if (!staffline_)
-    return;
-
-  String type = context ()->context_name ();
-  SCM dims = get_property ("verticalExtent");
-
-  if (is_number_pair (dims))
-    staffline_->set_extent (dims, Y_AXIS);
-
-  dims = get_property ("minimumVerticalExtent");
-  if (is_number_pair (dims))
-    staffline_->set_property ("minimum-Y-extent", dims);
-
-  dims = get_property ("extraVerticalExtent");
-  if (is_number_pair (dims))
-    staffline_->set_property ("extra-Y-extent", dims);
-
-  Grob *it = unsmob_grob (get_property ("currentCommandColumn"));
-
-  staffline_->set_bound (RIGHT, it);
+  if (staffline_)
+    {
+      Grob *it = unsmob_grob (get_property ("currentCommandColumn"));
+      staffline_->set_bound (RIGHT, it);
 
-  staffline_ = 0;
+      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 ());
 }
 
 /*
@@ -80,14 +63,14 @@ Axis_group_engraver::acknowledge_grob (Grob_info i)
   cyclic parent relationship if we have two Axis_group_engravers in
   the context.  */
 void
-Axis_group_engraver::process_acknowledged_grobs ()
+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_property ("axis-group-parent-Y")))
+      if (!unsmob_grob (elts_[i]->get_object ("axis-group-parent-Y")))
 	{
 	  if (staffline_->get_parent (Y_AXIS)
 	      && staffline_->get_parent (Y_AXIS) == elts_[i])
@@ -99,17 +82,7 @@ Axis_group_engraver::process_acknowledged_grobs ()
 	      staffline_ = 0;
 	      break;
 	    }
-	  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
-	    add_element (elts_[i]);
+	  add_element (elts_[i]);
 	}
     }
   elts_.clear ();
@@ -121,10 +94,19 @@ Axis_group_engraver::add_element (Grob *e)
   Axis_group_interface::add_element (staffline_, e);
 }
 
+ADD_ACKNOWLEDGER (Axis_group_engraver, grob);
+
 ADD_TRANSLATOR (Axis_group_engraver,
-		/* descr */ "Group all objects created in this context in a VerticalAxisGroup spanner.",
-		/* creats*/ "VerticalAxisGroup",
-		/* accepts */ "",
-		/* acks  */ "grob-interface",
-		/* reads */ "verticalExtent minimumVerticalExtent extraVerticalExtent",
-		/* write */ "");
+		/* doc */
+		"Group all objects created in this context in a"
+		" @code{VerticalAxisGroup} spanner.",
+
+		/* create */
+		"VerticalAxisGroup ",
+
+		/* read */
+		"currentCommandColumn ",
+
+		/* write */
+		""
+		);