X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fvertical-align-engraver.cc;h=7ad89b9b345be5986f1accdbdf8cd957e0be878a;hb=36a2ef8fd1db451ea9318743561856b4f0907ba2;hp=464e7e3df21defc27b8fb59409625949b857ad00;hpb=02ad2d3bb642d9228c4ae69efc71a74bd222575f;p=lilypond.git

diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc
index 464e7e3df2..7ad89b9b34 100644
--- a/lily/vertical-align-engraver.cc
+++ b/lily/vertical-align-engraver.cc
@@ -3,79 +3,76 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
-#include "translator-group.hh"
-#include "axis-group-engraver.hh"
+#include "context.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"
 
-Vertical_align_engraver::Vertical_align_engraver()
+class Vertical_align_engraver : public Engraver
 {
-  valign_p_ =0;
-}
+  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 ();
+};
 
-void
-Vertical_align_engraver::do_creation_processing()
+Vertical_align_engraver::Vertical_align_engraver ()
 {
-  valign_p_ =new Axis_align_spanner;
-  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 ());
-  announce_element (Score_element_info (valign_p_ , 0));
+  valign_ =0;
 }
 
 void
-Vertical_align_engraver::do_removal_processing()
+Vertical_align_engraver::process_music ()
 {
-  SCM dist (get_property ("maxVerticalAlign"));
-  if (gh_number_p(dist))
+  if (!valign_)
     {
-      valign_p_->threshold_interval_[BIGGER]  = gh_scm2double (dist);
+      valign_ = make_spanner ("VerticalAlignment", SCM_EOL);
+      valign_->set_bound (LEFT,unsmob_grob (get_property ("currentCommandColumn")));
     }
+}
 
-  dist = get_property ("minVerticalAlign");
-  if (gh_number_p(dist))
+void
+Vertical_align_engraver::finalize ()
+{
+  if (valign_)
     {
-      valign_p_->threshold_interval_[SMALLER]  = gh_scm2double (dist);
+      valign_->set_bound (RIGHT,unsmob_grob (get_property ("currentCommandColumn")));
+      valign_ = 0;
     }
-
-  valign_p_->set_bounds(RIGHT,get_staff_info().command_pcol_l ());
-  typeset_element (valign_p_);
-  valign_p_ =0;
 }
 
-
 bool
-Vertical_align_engraver::qualifies_b (Score_element_info i) const
+Vertical_align_engraver::qualifies (Grob_info i) const
 {
-  int sz = i.origin_trans_l_arr ((Translator*)this).size()  ;
-
-  Axis_group_element * elt = dynamic_cast<Axis_group_element *> (i.elem_l_);
+  int sz = i.origin_contexts ((Translator*)this).size ()  ;
 
-  return sz > 1 && elt && elt->axes_[0] == Y_AXIS && !elt->parent_l (Y_AXIS);
+  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 (qualifies_b (i))
+  if (qualifies (i))
     {
-      valign_p_->add_element (i.elem_l_);
+      Align_interface::add_element (valign_,i.grob_, get_property ("verticalAlignmentChildCallback"));
     }
-  /*
-    ? huh
-   */
-  else if (dynamic_cast<Span_bar*>(i.elem_l_) && i.origin_trans_l_arr (this).size ())
-    {
-      i.elem_l_->add_dependency (valign_p_);
-    }  
 }
 
 
-
-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 */       "");