X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-engraver.cc;h=7efe7b4874c54e2c7d9426ca2191743fb1d02ac6;hb=8a06a168bb9f6f1c4af92c1c146fce401440e6c9;hp=f9d813035ad3211b6fec84172869d397ca7a97ec;hpb=ad7defd5f5a3d0151a711555c2d680c56ef559c7;p=lilypond.git

diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index f9d813035a..7efe7b4874 100644
--- a/lily/axis-group-engraver.cc
+++ b/lily/axis-group-engraver.cc
@@ -1,66 +1,110 @@
-/*   
-  axis-group-engraver.cc --  implement Axis_group_engraver
-  
+/*
+  axis-group-engraver.cc -- implement Axis_group_engraver
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- */
+
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #include "axis-group-engraver.hh"
-#include "axis-group-spanner.hh"
-#include "paper-column.hh"
+
+#include "axis-group-interface.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 ()
 {
-  staffline_p_ = 0;
+  must_be_last_ = true;
+  staffline_ = 0;
 }
 
 void
-Axis_group_engraver::do_creation_processing ()
+Axis_group_engraver::process_music ()
 {
-  staffline_p_ = get_spanner_p ();
-  staffline_p_->set_axes (Y_AXIS, Y_AXIS);
-  staffline_p_->set_bound(LEFT,get_staff_info().command_pcol_l ());
-  announce_element (Score_element_info (staffline_p_, 0));
+  if (!staffline_)
+    {
+      staffline_ = get_spanner ();
+      Grob *it = unsmob_grob (get_property ("currentCommandColumn"));
+      staffline_->set_bound (LEFT, it);
+    }
 }
 
-Axis_group_spanner*
-Axis_group_engraver::get_spanner_p () const
+Spanner *
+Axis_group_engraver::get_spanner ()
 {
-  return new Axis_group_spanner;
+  return make_spanner ("VerticalAxisGroup", SCM_EOL);
 }
+
+/*
+  TODO: should we junk minimumVerticalExtent/extraVerticalExtent ?
+*/
+
 void
-Axis_group_engraver::do_removal_processing ()
+Axis_group_engraver::finalize ()
 {
-  staffline_p_->set_bound(RIGHT,get_staff_info().command_pcol_l ());
-  typeset_element (staffline_p_);
-  staffline_p_ = 0;
+  if (staffline_)
+    {
+      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_element (Score_element_info i)
+Axis_group_engraver::acknowledge_grob (Grob_info i)
 {
-  elts_.push (i.elem_l_);
+  elts_.push_back (i.grob ());
 }
 
+/*
+  maybe should check if our parent is set, because we now get a
+  cyclic parent relationship if we have two Axis_group_engravers in
+  the context.  */
 void
 Axis_group_engraver::process_acknowledged ()
 {
-  /* UGH UGH UGH */
-  for (int i=0; i < elts_.size (); i++)
+  if (!staffline_)
+    return;
+
+  for (vsize i = 0; i < elts_.size (); i++)
     {
-      if (!elts_[i]->parent_l (Y_AXIS))
-	staffline_p_->add_element (elts_[i]);
-      else
-	if (
-	    // elts_[i]->get_elt_property ("Axis_group_element::add_extra_element") == SCM_UNDEFINED &&
-	    ! dynamic_cast<Axis_group_element*> (elts_[i]->parent_l (Y_AXIS)))
-	       
+      if (!unsmob_grob (elts_[i]->get_object ("axis-group-parent-Y")))
 	{
-	  staffline_p_->add_element (elts_[i]);
+	  if (staffline_->get_parent (Y_AXIS)
+	      && staffline_->get_parent (Y_AXIS) == elts_[i])
+	    {
+	      staffline_->warning (_ ("Axis_group_engraver: vertical group already has a parent"));
+	      staffline_->warning (_ ("are there two Axis_group_engravers?"));
+	      staffline_->warning (_ ("removing this vertical group"));
+	      staffline_->suicide ();
+	      staffline_ = 0;
+	      break;
+	    }
+	  add_element (elts_[i]);
 	}
     }
   elts_.clear ();
 }
 
-ADD_THIS_TRANSLATOR(Axis_group_engraver);
+void
+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,
+		/* doc */ "Group all objects created in this context in a VerticalAxisGroup spanner.",
+		/* create */ "VerticalAxisGroup",
+		/* accept */ "",
+		/* read */
+		"currentCommandColumn ",
+
+		/* write */ "");