updates

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

diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc
index c91890775fdb3e4195ec640eb13f8f9356b07d7e..e38d46686b255d0c9f794b6cdb4ec9bfde0f562d 100644 (file)
--- a/lily/vertical-align-engraver.cc
+++ b/lily/vertical-align-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include "translator-group.hh"
 #include "paper-column.hh"
@@ -15,11 +15,10 @@
 
 class Vertical_align_engraver : public Engraver
 {
-  Spanner * valign_p_;
+  Spanner * valign_;
   bool qualifies_b (Grob_info) const;  
 public:
-  VIRTUAL_COPY_CONS (Translator);
-  Vertical_align_engraver ();
+  TRANSLATOR_DECLARATIONS(Vertical_align_engraver);
 protected:
   virtual void acknowledge_grob (Grob_info);
   virtual void initialize ();
@@ -28,33 +27,33 @@ protected:
 
 Vertical_align_engraver::Vertical_align_engraver ()
 {
-  valign_p_ =0;
+  valign_ =0;
 }
 
 void
 Vertical_align_engraver::initialize ()
 {
-  valign_p_ =new Spanner (get_property ("VerticalAlignment"));
-  valign_p_->set_bound (LEFT,unsmob_grob (get_property ("currentCommandColumn")));
-  announce_grob (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::finalize ()
 {
-  valign_p_->set_bound (RIGHT,unsmob_grob (get_property ("currentCommandColumn")));
-  typeset_grob (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 (Grob_info i) const
 {
-  int sz = i.origin_trans_l_arr ((Translator*)this).size ()  ;
+  int sz = i.origin_transes ((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);
+  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
@@ -62,8 +61,15 @@ Vertical_align_engraver::acknowledge_grob (Grob_info i)
 {
   if (qualifies_b (i))
     {
-      Align_interface::add_element (valign_p_,i.elem_l_, get_property ("verticalAlignmentChildCallback"));
+      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 */       "");