X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-engraver.cc;h=3d83349526d399449ec06cf26ff6e5024fab8730;hb=147adca77eb528935da9595722b136b9b01fc026;hp=6ffe752dda66415ca5c614e4d244c53309fa13ca;hpb=0349917b7d91f01c8e5a3461185c850820e51710;p=lilypond.git

diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index 6ffe752dda..3d83349526 100644
--- a/lily/axis-group-engraver.cc
+++ b/lily/axis-group-engraver.cc
@@ -1,94 +1,105 @@
-/*   
-  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--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #include "axis-group-engraver.hh"
-#include "spanner.hh"
-#include "paper-column.hh"
+
 #include "axis-group-interface.hh"
-#include "dimension-cache.hh"
-#include "engraver-group-engraver.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 ();
-  Axis_group_interface (staffline_p_).set_interface ();
-  Axis_group_interface (staffline_p_).set_axes (Y_AXIS, Y_AXIS);
-
-  Item *  it = get_staff_info().command_pcol_l ();
-  Pointer_group_interface (it, "bounded-by-me").add_element (staffline_p_);  
-  staffline_p_->set_bound(LEFT,it);
-
-  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);
+    }
 }
 
-Spanner*
-Axis_group_engraver::get_spanner_p () const
+Spanner *
+Axis_group_engraver::get_spanner ()
 {
-  return new Spanner (get_property ("basicVerticalAxisGroupProperties"));
+  return make_spanner ("VerticalAxisGroup", SCM_EOL);
 }
 
 void
-Axis_group_engraver::do_removal_processing ()
+Axis_group_engraver::finalize ()
 {
-  String type = daddy_grav_l ()->type_str_ ;
-  SCM dims = get_property (type  + "VerticalExtent");
-  
-  if (gh_pair_p (dims) && gh_number_p (gh_car (dims))
-      && gh_number_p (gh_cdr (dims)))
+  if (staffline_)
     {
-      staffline_p_->set_extent_callback (&Score_element::preset_extent, Y_AXIS);
-      staffline_p_->set_elt_property ("extent-Y", dims);
-    }
-
-  dims = get_property (type + "MinimumVerticalExtent");
-  if (gh_pair_p (dims) && gh_number_p (gh_car (dims))
-      && gh_number_p (gh_cdr (dims)))
-    staffline_p_->set_elt_property ("minimum-extent-Y", dims);
+      Grob *it = unsmob_grob (get_property ("currentCommandColumn"));
+      staffline_->set_bound (RIGHT, it);
 
-  dims = get_property (type + "ExtraVerticalExtent");
-  if (gh_pair_p (dims) && gh_number_p (gh_car (dims))
-      && gh_number_p (gh_cdr (dims)))
-    staffline_p_->set_elt_property ("extra-extent-Y", dims);
-
-  Item *  it = get_staff_info().command_pcol_l ();
-
-  Pointer_group_interface (it, "bounded-by-me").add_element (staffline_p_);  
-  staffline_p_->set_bound(RIGHT,it);
-
-  typeset_element (staffline_p_);
-  staffline_p_ = 0;
+      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++)
-    {
-      Score_element *par = elts_[i]->parent_l (Y_AXIS);
+  if (!staffline_)
+    return;
 
-      if ((!par || !Axis_group_interface (par).has_interface_b ())
-	  && ! elts_[i]->empty_b (Y_AXIS))
-	Axis_group_interface (staffline_p_).add_element (elts_[i]);
+  for (vsize i = 0; i < elts_.size (); i++)
+    {
+      if (!unsmob_grob (elts_[i]->get_object ("axis-group-parent-Y")))
+	{
+	  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",
+		/* read */
+		"currentCommandColumn ",
+
+		/* write */ "");