X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-engraver.cc;h=73fa3b8adea9b897dad5887d798b1de398c0fd6a;hb=7181c77e5d46a271f5f76e99bee7f844611e23e4;hp=e4182d8f5a071e8a8fa5da28a445165782790b33;hpb=fa891b75e895f16fc3871531e244abe78f9d93ff;p=lilypond.git

diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index e4182d8f5a..73fa3b8ade 100644
--- a/lily/axis-group-engraver.cc
+++ b/lily/axis-group-engraver.cc
@@ -3,12 +3,36 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  */
 
-#include "axis-group-engraver.hh"
-#include "axis-group-spanner.hh"
+#include "spanner.hh"
 #include "paper-column.hh"
+#include "axis-group-interface.hh"
+#include "engraver.hh"
+#include "engraver-group-engraver.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_p_;
+  Link_array<Score_element> elts_;
+  virtual void do_creation_processing();
+  virtual void do_removal_processing();
+  virtual void acknowledge_element (Score_element_info);
+  virtual void process_acknowledged ();
+  virtual Spanner* get_spanner_p () const;
+  virtual void add_element (Score_element*) ;
+public:  
+  VIRTUAL_COPY_CONS(Translator);
+  Axis_group_engraver ();
+};
+
+ADD_THIS_TRANSLATOR(Axis_group_engraver);
 
 Axis_group_engraver::Axis_group_engraver ()
 {
@@ -19,20 +43,50 @@ void
 Axis_group_engraver::do_creation_processing ()
 {
   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));
+  Axis_group_interface::set_interface (staffline_p_);
+  Axis_group_interface::set_axes (staffline_p_, Y_AXIS, Y_AXIS);
+
+  Score_element *  it = unsmob_element (get_property ("currentCommandColumn"));
+
+  staffline_p_->set_bound(LEFT,it);
+
+  announce_element (staffline_p_, 0);
 }
 
-Axis_group_spanner*
+Spanner*
 Axis_group_engraver::get_spanner_p () const
 {
-  return new Axis_group_spanner;
+  return new Spanner (get_property ("basicVerticalAxisGroupProperties"));
 }
+
 void
 Axis_group_engraver::do_removal_processing ()
 {
-  staffline_p_->set_bound(RIGHT,get_staff_info().command_pcol_l ());
+  String type = daddy_grav_l ()->type_str_ ;
+  SCM dims = get_property ((type  + "VerticalExtent").ch_C());
+  
+  if (gh_pair_p (dims) && gh_number_p (gh_car (dims))
+      && gh_number_p (gh_cdr (dims)))
+    {
+      staffline_p_->set_extent_callback (&Score_element::preset_extent, Y_AXIS);
+      staffline_p_->set_elt_property ("extent-Y", dims);
+    }
+
+  dims = get_property ((type + "MinimumVerticalExtent").ch_C());
+  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);
+
+  dims = get_property ((type + "ExtraVerticalExtent").ch_C());
+  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);
+
+  Score_element *  it = unsmob_element (get_property ("currentCommandColumn"));
+
+
+  staffline_p_->set_bound(RIGHT,it);
+
   typeset_element (staffline_p_);
   staffline_p_ = 0;
 }
@@ -43,24 +97,70 @@ Axis_group_engraver::acknowledge_element (Score_element_info i)
   elts_.push (i.elem_l_);
 }
 
+/*
+  maybe should check if our parent_l 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 (!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)))
-	       
-	{
-	  staffline_p_->add_element (elts_[i]);
-	}
+      Score_element *par = elts_[i]->parent_l (Y_AXIS);
+
+      if ((!par || !Axis_group_interface::has_interface (par))
+	  && ! elts_[i]->empty_b (Y_AXIS))
+	add_element (elts_[i]);
     }
   elts_.clear ();
 }
 
-ADD_THIS_TRANSLATOR(Axis_group_engraver);
+void
+Axis_group_engraver::add_element (Score_element*e)
+{
+  Axis_group_interface::add_element (staffline_p_, e);
+}
+
+////////////////////////////////////////////////////////
+// maybenot such a good idea after all., to put classes 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_p ()const;
+  virtual void acknowledge_element (Score_element_info);
+  virtual void add_element (Score_element *e);
+public:
+  VIRTUAL_COPY_CONS(Translator);
+};
+
+void
+Hara_kiri_engraver::add_element (Score_element*e)
+{
+  Hara_kiri_group_spanner::add_element (staffline_p_, e);
+}
+
+
+Spanner*
+Hara_kiri_engraver::get_spanner_p () const
+{
+  Spanner * sp = new Spanner (get_property ("basicHaraKiriVerticalGroupspannerProperties"));
+  Hara_kiri_group_spanner::set_interface (sp);
+  return sp;
+}
+
+void
+Hara_kiri_engraver::acknowledge_element (Score_element_info i)
+{
+  Axis_group_engraver::acknowledge_element (i);
+  if (Rhythmic_head::has_interface (i.elem_l_)
+      || i.elem_l_->has_interface (ly_symbol2scm ("lyric-syllable-interface")))
+    {
+      Hara_kiri_group_spanner::add_interesting_item (staffline_p_, i.elem_l_);
+    }
+}
+ADD_THIS_TRANSLATOR(Hara_kiri_engraver);