patch::: 1.3.48.jcn1

[lilypond.git] / lily / vertical-align-engraver.cc

diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc
index 7f047f908eec98142898d4abe7575f7f96befe75..9718a8a53b51b7d4d3e825c90ad2310e7905e0e8 100644 (file)
--- a/lily/vertical-align-engraver.cc
+++ b/lily/vertical-align-engraver.cc
@@ -3,15 +3,31 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include "translator-group.hh"
 #include "axis-group-engraver.hh"
 #include "paper-column.hh"
-#include "vertical-align-engraver.hh"
-#include "axis-align-spanner.hh"
-#include "axis-group-spanner.hh"
+#include "align-interface.hh"
 #include "span-bar.hh"
+#include "axis-group-interface.hh"
+#include "engraver.hh"
+#include "spanner.hh"
+
+class Vertical_align_engraver : public Engraver {
+  Spanner * valign_p_;
+  bool qualifies_b (Score_element_info) const;  
+public:
+  VIRTUAL_COPY_CONS(Translator);
+  
+  Vertical_align_engraver();
+protected:
+  
+  virtual void acknowledge_element (Score_element_info);
+  virtual void do_creation_processing();
+  virtual void do_removal_processing();
+};
+
 
 Vertical_align_engraver::Vertical_align_engraver()
 {
@@ -21,35 +37,31 @@ Vertical_align_engraver::Vertical_align_engraver()
 void
 Vertical_align_engraver::do_creation_processing()
 {
-  valign_p_ =new Axis_align_spanner;
-  valign_p_->set_axis (Y_AXIS);
-  valign_p_->stacking_dir_ = DOWN;
+  valign_p_ =new Spanner; //Axis_align_spanner
+  Align_interface (valign_p_).set_interface ();
+  Align_interface (valign_p_).set_axis (Y_AXIS);
+  valign_p_->set_elt_property ("stacking-dir",
+                              gh_int2scm (DOWN));
   
-  valign_p_->set_bounds(LEFT,get_staff_info().command_pcol_l ());
+  valign_p_->set_bound(LEFT,get_staff_info().command_pcol_l ());
   announce_element (Score_element_info (valign_p_ , 0));
 }
 
 void
 Vertical_align_engraver::do_removal_processing()
 {
-  SCM dist (get_property ("maxVerticalAlign", 0));
-  if (gh_number_p(dist))
-    {
-      valign_p_->threshold_interval_[BIGGER]  = gh_scm2double (dist);
-    }
-
-  dist = get_property ("minVerticalAlign", 0);
-  if (gh_number_p(dist))
-    {
-      valign_p_->threshold_interval_[SMALLER]  = gh_scm2double (dist);
-    }
-
-  dist = get_property ("alignmentReference",0);
-  if (isdir_b (dist))
-    {
-      valign_p_->align_dir_ = to_dir (dist);
-    }
-  valign_p_->set_bounds(RIGHT,get_staff_info().command_pcol_l ());
+  SCM min = get_property ("maxVerticalAlign");
+  SCM max = get_property ("minVerticalAlign");
+
+  if (gh_number_p (min) || gh_number_p (max))
+  {
+    min = gh_number_p (min) ? min : gh_double2scm (0.0);
+    max = gh_number_p (max) ? max : gh_double2scm (infinity_f);    
+    
+    valign_p_->set_elt_property ("threshold",
+                                gh_cons (min,max));
+  }
+  valign_p_->set_bound(RIGHT,get_staff_info().command_pcol_l ());
   typeset_element (valign_p_);
   valign_p_ =0;
 }
@@ -58,12 +70,13 @@ Vertical_align_engraver::do_removal_processing()
 bool
 Vertical_align_engraver::qualifies_b (Score_element_info i) const
 {
-  int sz = i.origin_trans_l_arr_.size()  ;
+  int sz = i.origin_trans_l_arr ((Translator*)this).size()  ;
 
 
-  Axis_group_element * elt = dynamic_cast<Axis_group_element *> (i.elem_l_);
+  Axis_group_interface agi(i.elem_l_);
 
-  return sz > 1 && elt && elt->axes_[0] == Y_AXIS && !elt->parent_l (Y_AXIS);
+  return sz > 1 && agi.has_interface_b ()
+    && !i.elem_l_->parent_l (Y_AXIS) && agi.axis_b (Y_AXIS);
 }
 
 void
@@ -71,12 +84,8 @@ Vertical_align_engraver::acknowledge_element (Score_element_info i)
 {
   if (qualifies_b (i))
     {
-      valign_p_->add_element (i.elem_l_);
+      Align_interface(valign_p_).add_element (i.elem_l_);
     }
-  else if (dynamic_cast<Span_bar*>(i.elem_l_) && i.origin_trans_l_arr_.size ())
-    {
-      i.elem_l_->add_dependency (valign_p_);
-    }  
 }