2003 -> 2004

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

diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc
index 65eb757387e33ab86b77b06503534e8c99cf5ad7..0007e6cb5e34e54171e0475fc89667c8ed4a37d1 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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include "translator-group.hh"
 #include "paper-column.hh"
@@ -15,45 +15,50 @@
 
 class Vertical_align_engraver : public Engraver
 {
-  Spanner * valign_p_;
+  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 process_music ();
   virtual void finalize ();
 };
 
 Vertical_align_engraver::Vertical_align_engraver ()
 {
-  valign_p_ =0;
+  valign_ =0;
 }
 
 void
-Vertical_align_engraver::initialize ()
+Vertical_align_engraver::process_music ()
 {
-  valign_p_ =new Spanner (get_property ("VerticalAlignment"));
-  valign_p_->set_bound (LEFT,unsmob_grob (get_property ("currentCommandColumn")));
-  announce_grob (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::finalize ()
 {
-  valign_p_->set_bound (RIGHT,unsmob_grob (get_property ("currentCommandColumn")));
-  typeset_grob (valign_p_);
-  valign_p_ =0;
+  if (valign_)
+    {
+      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.grob_l_)
-    && !i.grob_l_->parent_l (Y_AXIS) && Axis_group_interface::axis_b (i.grob_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
@@ -61,7 +66,7 @@ Vertical_align_engraver::acknowledge_grob (Grob_info i)
 {
   if (qualifies_b (i))
     {
-      Align_interface::add_element (valign_p_,i.grob_l_, get_property ("verticalAlignmentChildCallback"));
+      Align_interface::add_element (valign_,i.grob_, get_property ("verticalAlignmentChildCallback"));
     }
 }
 
@@ -69,6 +74,7 @@ Vertical_align_engraver::acknowledge_grob (Grob_info i)
 ENTER_DESCRIPTION(Vertical_align_engraver,
 /* descr */       "Catch Vertical axis groups and stack them.",
 /* creats*/       "VerticalAlignment",
-/* acks  */       "axis-group-interface",
+/* accepts */     "",
+/* acks  */      "axis-group-interface",
 /* reads */       "",
 /* write */       "");