X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fvertical-align-engraver.cc;h=33c0f1a98a16f25bc7d27bab4f4dbf3fa18c9c81;hb=16daefb5104997473ab77fd00faf00f34c6baa7e;hp=cee4a103870efad21cece84331543eff7d5fb9f4;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git

diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc
index cee4a10387..33c0f1a98a 100644
--- a/lily/vertical-align-engraver.cc
+++ b/lily/vertical-align-engraver.cc
@@ -1,11 +1,11 @@
 /*
-  vertical-align-grav.cc -- implement Vertical_align_engraver
+  vertical-align-engraver.cc -- implement Vertical_align_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
-#include "translator-group.hh"
+#include "context.hh"
 #include "paper-column.hh"
 #include "align-interface.hh"
 #include "span-bar.hh"
@@ -15,55 +15,63 @@
 
 class Vertical_align_engraver : public Engraver
 {
-  Spanner * valign_p_;
-  bool qualifies_b (Grob_info) const;  
+  Spanner *valign_;
+  bool qualifies (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();
-  virtual void finalize();
+  virtual void process_music ();
+  virtual void finalize ();
 };
 
-Vertical_align_engraver::Vertical_align_engraver()
+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", SCM_EOL);
+      valign_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
+    }
 }
 
 void
-Vertical_align_engraver::finalize()
+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")));
+      valign_ = 0;
+    }
 }
 
-
 bool
-Vertical_align_engraver::qualifies_b (Grob_info i) const
+Vertical_align_engraver::qualifies (Grob_info i) const
 {
-  int sz = i.origin_trans_l_arr ((Translator*)this).size()  ;
+  int sz = i.origin_contexts ((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 > 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_grob (Grob_info i)
 {
-  if (qualifies_b (i))
+  if (qualifies (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);
+ADD_TRANSLATOR (Vertical_align_engraver,
+		/* descr */ "Catch Vertical axis groups and stack them.",
+		/* creats*/ "VerticalAlignment",
+		/* accepts */ "",
+		/* acks  */ "axis-group-interface",
+		/* reads */ "",
+		/* write */ "");