release: 1.3.54

[lilypond.git] / lily / axis-group-engraver.cc

diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index ad7e9784bb75aa90f5e17276cf6eb4b72392213c..4639b176a9de01c534c2460af82599cdb2b76e10 100644 (file)
--- a/lily/axis-group-engraver.cc
+++ b/lily/axis-group-engraver.cc
@@ -3,12 +3,15 @@
   
   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 "dimension-cache.hh"
+#include "engraver-group-engraver.hh"
 
 Axis_group_engraver::Axis_group_engraver ()
 {
@@ -19,20 +22,43 @@ void
 Axis_group_engraver::do_creation_processing ()
 {
   staffline_p_ = get_spanner_p ();
-  staffline_p_->set_axes (Y_AXIS, Y_AXIS);
-  staffline_p_->set_bounds(LEFT,get_staff_info().command_pcol_l ());
+  Axis_group_interface (staffline_p_).set_interface ();
+  Axis_group_interface (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_spanner*
+Spanner*
 Axis_group_engraver::get_spanner_p () const
 {
-  return new Axis_group_spanner;
+  return new Spanner;
 }
+
 void
 Axis_group_engraver::do_removal_processing ()
 {
-  staffline_p_->set_bounds(RIGHT,get_staff_info().command_pcol_l ());
+  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)))
+    {
+      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);
+
+  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);
+
+  
+  staffline_p_->set_bound(RIGHT,get_staff_info().command_pcol_l ());
   typeset_element (staffline_p_);
   staffline_p_ = 0;
 }
@@ -46,18 +72,14 @@ Axis_group_engraver::acknowledge_element (Score_element_info i)
 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]);
+      Score_element *par = elts_[i]->parent_l (Y_AXIS);
 
-      /* UGH UGH UGH */
-      else if (elts_[i]->get_elt_property (ly_symbol ("Axis_group_element::add_extra_element")) == SCM_BOOL_F
-              && ! dynamic_cast<Axis_group_element*> (elts_[i]->parent_l (Y_AXIS)))
-              
-       {
-         staffline_p_->add_extra_element (elts_[i]);
-       }
+      if ((!par || !Axis_group_interface (par).has_interface_b ())
+         && ! elts_[i]->empty_b (Y_AXIS))
+       Axis_group_interface (staffline_p_).add_element (elts_[i]);
     }
   elts_.clear ();
 }