X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fvertical-align-engraver.cc;h=65eb757387e33ab86b77b06503534e8c99cf5ad7;hb=94375d04f45b415ad705fd444fdb344416f116d9;hp=f94bfe5efd941fefbbd658b1d19068a95cba8eac;hpb=afa5829cd270e1b0c616b7ba5c5e6cdc0e920e5f;p=lilypond.git

diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc
index f94bfe5efd..65eb757387 100644
--- a/lily/vertical-align-engraver.cc
+++ b/lily/vertical-align-engraver.cc
@@ -3,60 +3,72 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 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 "vertical-align-spanner.hh"
-#include "vertical-group-spanner.hh"
+class Vertical_align_engraver : public Engraver
+{
+  Spanner * valign_p_;
+  bool qualifies_b (Grob_info) const;  
+public:
+  TRANSLATOR_DECLARATIONS(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 Vertical_align_spanner;
-  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);
-    }
-
-  dist = get_property ("minVerticalAlign", 0);
-  if (dist.length_i () && dist.isnum_b ())
-    {
-      valign_p_->threshold_interval_[SMALLER]  = Real (dist);
-    }
-  
-  valign_p_->set_bounds(RIGHT,get_staff_info().command_pcol_l ());
-  typeset_element (valign_p_);
+  valign_p_->set_bound (RIGHT,unsmob_grob (get_property ("currentCommandColumn")));
+  typeset_grob (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.grob_l_)
+    && !i.grob_l_->parent_l (Y_AXIS) && Axis_group_interface::axis_b (i.grob_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<Vertical_group_spanner *> (i.elem_l_)
-      && !i.elem_l_->parent_l (Y_AXIS))
+  if (qualifies_b (i))
     {
-      assert (!valign_p_->contains_b (i.elem_l_));
-
-      valign_p_->add_element (i.elem_l_);
+      Align_interface::add_element (valign_p_,i.grob_l_, get_property ("verticalAlignmentChildCallback"));
     }
 }
 
 
-
-ADD_THIS_TRANSLATOR(Vertical_align_engraver);
+ENTER_DESCRIPTION(Vertical_align_engraver,
+/* descr */       "Catch Vertical axis groups and stack them.",
+/* creats*/       "VerticalAlignment",
+/* acks  */       "axis-group-interface",
+/* reads */       "",
+/* write */       "");