release: 1.5.4

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

diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc
index 036cb8d5d82ccebb21cd67a618979002209eb141..c91890775fdb3e4195ec640eb13f8f9356b07d7e 100644 (file)
--- a/lily/vertical-align-engraver.cc
+++ b/lily/vertical-align-engraver.cc
@@ -3,66 +3,67 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
+#include "translator-group.hh"
+#include "paper-column.hh"
+#include "align-interface.hh"
+#include "span-bar.hh"
+#include "axis-group-interface.hh"
+#include "engraver.hh"
+#include "spanner.hh"
 
-#include "p-col.hh"
-#include "vertical-align-engraver.hh"
-#include "axis-align-spanner.hh"
-#include "axis-group-spanner.hh"
+class Vertical_align_engraver : public Engraver
+{
+  Spanner * valign_p_;
+  bool qualifies_b (Grob_info) const;  
+public:
+  VIRTUAL_COPY_CONS (Translator);
+  Vertical_align_engraver ();
+protected:
+  virtual void acknowledge_grob (Grob_info);
+  virtual void initialize ();
+  virtual void finalize ();
+};
 
-Vertical_align_engraver::Vertical_align_engraver()
+Vertical_align_engraver::Vertical_align_engraver ()
 {
   valign_p_ =0;
 }
 
 void
-Vertical_align_engraver::do_creation_processing()
+Vertical_align_engraver::initialize ()
 {
-  valign_p_ =new Axis_align_spanner;
-  valign_p_->set_axis (Y_AXIS);
-  valign_p_->stacking_dir_ = DOWN;
-  
-  valign_p_->set_bounds(LEFT,get_staff_info().command_pcol_l ());
-  announce_element (Score_element_info (valign_p_ , 0));
+  valign_p_ =new Spanner (get_property ("VerticalAlignment"));
+  valign_p_->set_bound (LEFT,unsmob_grob (get_property ("currentCommandColumn")));
+  announce_grob (valign_p_ , 0);
 }
 
 void
-Vertical_align_engraver::do_removal_processing()
+Vertical_align_engraver::finalize ()
 {
-  Scalar dist (get_property ("maxVerticalAlign", 0));
-  if (dist.length_i () && dist.isnum_b ())
-    {
-      valign_p_->threshold_interval_[BIGGER]  = Real (dist);
-    }
+  valign_p_->set_bound (RIGHT,unsmob_grob (get_property ("currentCommandColumn")));
+  typeset_grob (valign_p_);
+  valign_p_ =0;
+}
 
-  dist = get_property ("minVerticalAlign", 0);
-  if (dist.length_i () && dist.isnum_b ())
-    {
-      valign_p_->threshold_interval_[SMALLER]  = Real (dist);
-    }
 
-  dist = get_property ("alignmentReference",0);
-  if (dist.length_i () && dist.isnum_b ())
-    {
-      valign_p_->align_dir_ = int (dist);
-    }
-  valign_p_->set_bounds(RIGHT,get_staff_info().command_pcol_l ());
-  typeset_element (valign_p_);
-  valign_p_ =0;
+bool
+Vertical_align_engraver::qualifies_b (Grob_info i) const
+{
+  int sz = i.origin_trans_l_arr ((Translator*)this).size ()  ;
+
+  return sz > 1 && Axis_group_interface::has_interface (i.elem_l_)
+    && !i.elem_l_->parent_l (Y_AXIS) && Axis_group_interface::axis_b (i.elem_l_, Y_AXIS);
 }
 
 void
-Vertical_align_engraver::acknowledge_element (Score_element_info i)
+Vertical_align_engraver::acknowledge_grob (Grob_info i)
 {
-  if (i.origin_grav_l_arr_.size() == 1 &&
-      dynamic_cast<Axis_group_spanner *> (i.elem_l_)
-      && !i.elem_l_->parent_l (Y_AXIS))
+  if (qualifies_b (i))
     {
-      valign_p_->add_element (i.elem_l_);
+      Align_interface::add_element (valign_p_,i.elem_l_, get_property ("verticalAlignmentChildCallback"));
     }
 }
 
-
-
-ADD_THIS_TRANSLATOR(Vertical_align_engraver);
+ADD_THIS_TRANSLATOR (Vertical_align_engraver);