X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fvertical-align-engraver.cc;h=b703745c4b5be2c852930d7ddf1e4fee1cf59936;hb=b1a521c92717244d4bff11bb0b2b1304e4355956;hp=6fa9794f883860a027dabfe598c446ebf6358a87;hpb=615a9212789c2cb2994748c023d0e19f3a83a0fd;p=lilypond.git

diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc
index 6fa9794f88..b703745c4b 100644
--- a/lily/vertical-align-engraver.cc
+++ b/lily/vertical-align-engraver.cc
@@ -3,60 +3,78 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
+#include "context.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_;
+  bool qualifies (Grob_info) const;  
+public:
+  TRANSLATOR_DECLARATIONS (Vertical_align_engraver);
+protected:
+  virtual void acknowledge_grob (Grob_info);
+  virtual void process_music ();
+  virtual void finalize ();
+};
 
-Vertical_align_engraver::Vertical_align_engraver()
+Vertical_align_engraver::Vertical_align_engraver ()
 {
-  valign_p_ =0;
+  valign_ =0;
 }
 
 void
-Vertical_align_engraver::do_creation_processing()
+Vertical_align_engraver::process_music ()
 {
-  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));
+  if (!valign_)
+    {
+      valign_ =make_spanner ("VerticalAlignment");
+      valign_->set_bound (LEFT,unsmob_grob (get_property ("currentCommandColumn")));
+      announce_grob (valign_ , SCM_EOL);
+    }
 }
 
 void
-Vertical_align_engraver::do_removal_processing()
+Vertical_align_engraver::finalize ()
 {
-  Scalar dist (get_property ("maxVerticalAlign"));
-  if (dist.length_i () && dist.isnum_b ())
+  if (valign_)
     {
-      valign_p_->threshold_interval_[BIGGER]  = Real (dist);
+      valign_->set_bound (RIGHT,unsmob_grob (get_property ("currentCommandColumn")));
+      typeset_grob (valign_);
+      valign_ =0;
     }
+}
 
-  dist = get_property ("minVerticalAlign");
-  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_ =0;
+bool
+Vertical_align_engraver::qualifies (Grob_info i) const
+{
+  int sz = i.origin_contexts ((Translator*)this).size ()  ;
+
+  return sz > 0 && Axis_group_interface::has_interface (i.grob_)
+    && !i.grob_->get_parent (Y_AXIS) && Axis_group_interface::has_axis (i.grob_, 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_->axis_group_l_a_[Y_AXIS]) 
+  if (qualifies (i))
     {
-      assert (!valign_p_->contains_b (i.elem_l_));
-
-      valign_p_->add_element (i.elem_l_);
+      Align_interface::add_element (valign_,i.grob_, get_property ("verticalAlignmentChildCallback"));
     }
 }
 
 
-
-ADD_THIS_TRANSLATOR(Vertical_align_engraver);
+ENTER_DESCRIPTION (Vertical_align_engraver,
+/* descr */       "Catch Vertical axis groups and stack them.",
+/* creats*/       "VerticalAlignment",
+/* accepts */     "",
+/* acks  */      "axis-group-interface",
+/* reads */       "",
+/* write */       "");