X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fvertical-align-engraver.cc;h=e38d46686b255d0c9f794b6cdb4ec9bfde0f562d;hb=c5cda88f8464c8d94f18ead05131b53278af4f57;hp=891c1b98d128f495c456b491850be54209b04a9f;hpb=42ab6ff971c06253b34f96ed122836ab88d09cc0;p=lilypond.git

diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc
index 891c1b98d1..e38d46686b 100644
--- a/lily/vertical-align-engraver.cc
+++ b/lily/vertical-align-engraver.cc
@@ -3,87 +3,73 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include "translator-group.hh"
-#include "axis-group-engraver.hh"
-#include "p-col.hh"
-#include "vertical-align-engraver.hh"
-#include "axis-align-spanner.hh"
-#include "axis-group-spanner.hh"
+#include "paper-column.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_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 ()
+{
+  valign_ =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_ =new Spanner (get_property ("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", 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);
-    }
-
-  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;
+  valign_->set_bound (RIGHT,unsmob_grob (get_property ("currentCommandColumn")));
+  typeset_grob (valign_);
+  valign_ =0;
 }
 
 
 bool
-Vertical_align_engraver::qualifies_b (Score_element_info i) const
+Vertical_align_engraver::qualifies_b (Grob_info i) const
 {
-  Translator * t =   i.origin_grav_l_arr_[0];
-  int sz = i.origin_grav_l_arr_.size()  ;
-
-#if 0 
-  return (sz == 1 && dynamic_cast<Translator_group*> (t))
-    || (sz == 2 && dynamic_cast<Axis_group_engraver*> (t));
-#endif
+  int sz = i.origin_transes ((Translator*)this).size ()  ;
 
-  Axis_group_element * elt = dynamic_cast<Axis_group_element *> (i.elem_l_);
-
-  return sz > 1 && elt && elt->axes_[0] == Y_AXIS && !elt->parent_l (Y_AXIS);
+  return sz > 1 && Axis_group_interface::has_interface (i.grob_)
+    && !i.grob_->get_parent (Y_AXIS) && Axis_group_interface::axis_b (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))
     {
-      valign_p_->add_element (i.elem_l_);
+      Align_interface::add_element (valign_,i.grob_, get_property ("verticalAlignmentChildCallback"));
     }
-  else if (dynamic_cast<Span_bar*>(i.elem_l_) && i.origin_grav_l_arr_.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 */       "");