X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-engraver.cc;h=88c7be909c1e7916942158d9e02a61b46b0162d1;hb=131f941d10d6c6d587ec1f41f735fd7ba07e7ea3;hp=a3bf9111fd60ae623368bf889fb73463c407d813;hpb=ad4297de0246935caa4c51f4e152e20009a6f64e;p=lilypond.git

diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index a3bf9111fd..88c7be909c 100644
--- a/lily/axis-group-engraver.cc
+++ b/lily/axis-group-engraver.cc
@@ -1,60 +1,206 @@
-/*   
-  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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- */
 
-#include "axis-group-engraver.hh"
-#include "axis-group-spanner.hh"
+  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
+
+#include "spanner.hh"
 #include "paper-column.hh"
+#include "axis-group-interface.hh"
+#include "engraver-group-engraver.hh"
+#include "warn.hh"
+#include "context.hh"
+
+/**
+   Put stuff in a Spanner with an Axis_group_interface.
+   Use as last element of a context.
+*/
+class Axis_group_engraver : public Engraver
+{
+protected:
+  Spanner *staffline_;
+  Link_array<Grob> elts_;
+  virtual void process_music ();
+  virtual void finalize ();
+  virtual void acknowledge_grob (Grob_info);
+  virtual void process_acknowledged_grobs ();
+  virtual Spanner *get_spanner ();
+  virtual void add_element (Grob *);
+public:
+  TRANSLATOR_DECLARATIONS (Axis_group_engraver);
+};
 
 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_bounds(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 make_spanner ("VerticalAxisGroup", SCM_EOL);
+}
+
+/*
+  TODO: should we junk minimumVerticalExtent/extraVerticalExtent ?
+*/
+
+void
+Axis_group_engraver::finalize ()
 {
-  return new Axis_group_spanner;
+  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);
+
+  staffline_ = 0;
 }
+
 void
-Axis_group_engraver::do_removal_processing ()
+Axis_group_engraver::acknowledge_grob (Grob_info i)
 {
-  staffline_p_->set_bounds(RIGHT,get_staff_info().command_pcol_l ());
-  typeset_element (staffline_p_);
-  staffline_p_ = 0;
+  elts_.push (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::acknowledge_element (Score_element_info i)
+Axis_group_engraver::process_acknowledged_grobs ()
 {
-  if (!i.elem_l_->parent_l (Y_AXIS))
+  if (!staffline_)
+    return;
+
+  for (int i = 0; i < elts_.size (); i++)
     {
-      elts_.push (i.elem_l_);
+      if (!unsmob_grob (elts_[i]->get_property ("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;
+	    }
+	  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]);
+	}
     }
+  elts_.clear ();
 }
 
 void
-Axis_group_engraver::process_acknowledged ()
+Axis_group_engraver::add_element (Grob *e)
 {
-  for (int i=0; i < elts_.size (); i++)
+  Axis_group_interface::add_element (staffline_, e);
+}
+
+/****************************************************************/
+
+/*
+  maybenot such a good idea after all., to put class declarations in
+  .cc
+*/
+
+#include "hara-kiri-group-spanner.hh"
+#include "rhythmic-head.hh"
+
+class Hara_kiri_engraver : public Axis_group_engraver
+{
+protected:
+  virtual Spanner *get_spanner ();
+  virtual void acknowledge_grob (Grob_info);
+  virtual void add_element (Grob *e);
+public:
+  TRANSLATOR_DECLARATIONS (Hara_kiri_engraver);
+};
+
+void
+Hara_kiri_engraver::add_element (Grob *e)
+{
+  Hara_kiri_group_spanner::add_element (staffline_, e);
+}
+
+Spanner *
+Hara_kiri_engraver::get_spanner ()
+{
+  Spanner *sp = make_spanner ("RemoveEmptyVerticalGroup", SCM_EOL);
+
+  return sp;
+}
+
+void
+Hara_kiri_engraver::acknowledge_grob (Grob_info i)
+{
+  Axis_group_engraver::acknowledge_grob (i);
+  if (staffline_
+      && (i.grob_->internal_has_interface (ly_symbol2scm ("rhythmic-grob-interface"))
+	  || i.grob_->internal_has_interface (ly_symbol2scm ("lyric-interface"))))
     {
-      if (!elts_[i]->parent_l (Y_AXIS))
-	staffline_p_->add_element (elts_[i]);
+      Hara_kiri_group_spanner::add_interesting_item (staffline_, i.grob_);
     }
-  elts_.clear ();
 }
 
-ADD_THIS_TRANSLATOR(Axis_group_engraver);
+Hara_kiri_engraver::Hara_kiri_engraver ()
+{
+}
+
+ADD_TRANSLATOR (Hara_kiri_engraver,
+		/* descr */ "Like Axis_group_engraver, but make a hara-kiri spanner, and add "
+		"interesting items (ie. note heads, lyric syllables and normal rests) ",
+		/* creats*/ "RemoveEmptyVerticalGroup",
+		/* accepts */ "",
+		/* acks  */ "grob-interface",
+		/* reads */ "",
+		/* write */ "");
+
+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 */ "");