release: 0.1.61

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

diff --git a/lily/vertical-align-grav.cc b/lily/vertical-align-grav.cc
index 86665f3d506e6b26d4f8e892c4f867f5d048be7e..8024ab5a50bd75b076b119750170895310efdd24 100644 (file)
--- a/lily/vertical-align-grav.cc
+++ b/lily/vertical-align-grav.cc
@@ -3,46 +3,48 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
-
+#include "p-col.hh"
 #include "vertical-align-grav.hh"
 #include "vertical-align-spanner.hh"
+#include "vertical-group-elem.hh"
 
 Vertical_align_engraver::Vertical_align_engraver()
 {
-    valign_p_ =0;
+  valign_p_ =0;
 }
 
 void
 Vertical_align_engraver::do_creation_processing()
 {
-    valign_p_ =new Vertical_align_spanner;
-    valign_p_->left_col_l_ = get_staff_info().command_pcol_l() ;
-    announce_element( Score_elem_info( valign_p_ , 0 ));
+  valign_p_ =new Vertical_align_spanner;
+  valign_p_->set_bounds(LEFT,get_staff_info().command_pcol_l ());
+  announce_element (Score_elem_info (valign_p_ , 0));
 }
 
 void
 Vertical_align_engraver::do_removal_processing()
 {
-    valign_p_->right_col_l_ = get_staff_info().command_pcol_l();
-    typeset_element( valign_p_);
-    valign_p_ =0;
+  valign_p_->set_bounds(RIGHT,get_staff_info().command_pcol_l ());
+  typeset_element (valign_p_);
+  valign_p_ =0;
 }
 
 void
-Vertical_align_engraver::acknowledge_element(Score_elem_info i)
+Vertical_align_engraver::acknowledge_element (Score_elem_info i)
 {
-    if ( i.origin_grav_l_arr_.size() == 2 && 
-        i.elem_l_->is_type_b(Vertical_group::static_name()) &&
-        !i.elem_l_->y_group_element_i_  && 
-        !valign_p_->contains_b(  i.elem_l_) ) {
+  if (i.origin_grav_l_arr_.size() == 2 && 
+       i.elem_l_->is_type_b (Vertical_group_element::static_name()) &&
+       !i.elem_l_->axis_group_l_a_[Y_AXIS]) 
+    {
+      assert (!valign_p_->contains_b (i.elem_l_));
 
-       valign_p_->add ( i.elem_l_ );
+      valign_p_->add (i.elem_l_);
     }
 }
 
-IMPLEMENT_STATIC_NAME(Vertical_align_engraver);
+
 IMPLEMENT_IS_TYPE_B1(Vertical_align_engraver, Engraver);
-ADD_THIS_ENGRAVER(Vertical_align_engraver);
+ADD_THIS_TRANSLATOR(Vertical_align_engraver);