*** empty log message ***

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

diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc
index 9248973f0bf8c7d4aa356bbe088005be25ec3571..7ad89b9b345be5986f1accdbdf8cd957e0be878a 100644 (file)
--- a/lily/vertical-align-engraver.cc
+++ b/lily/vertical-align-engraver.cc
@@ -3,9 +3,9 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 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"
@@ -16,9 +16,9 @@
 class Vertical_align_engraver : public Engraver
 {
   Spanner * valign_;
-  bool qualifies_b (Grob_info) const;  
+  bool qualifies (Grob_info) const;  
 public:
-  TRANSLATOR_DECLARATIONS(Vertical_align_engraver);
+  TRANSLATOR_DECLARATIONS (Vertical_align_engraver);
 protected:
   virtual void acknowledge_grob (Grob_info);
   virtual void process_music ();
@@ -35,41 +35,41 @@ Vertical_align_engraver::process_music ()
 {
   if (!valign_)
     {
-      valign_ =new Spanner (get_property ("VerticalAlignment"));
+      valign_ = make_spanner ("VerticalAlignment", SCM_EOL);
       valign_->set_bound (LEFT,unsmob_grob (get_property ("currentCommandColumn")));
-      announce_grob(valign_ , SCM_EOL);
     }
 }
 
 void
 Vertical_align_engraver::finalize ()
 {
-  valign_->set_bound (RIGHT,unsmob_grob (get_property ("currentCommandColumn")));
-  typeset_grob (valign_);
-  valign_ =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_transes ((Translator*)this).size ()  ;
+  int sz = i.origin_contexts ((Translator*)this).size ()  ;
 
-  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);
+  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_,i.grob_, get_property ("verticalAlignmentChildCallback"));
     }
 }
 
 
-ENTER_DESCRIPTION(Vertical_align_engraver,
+ENTER_DESCRIPTION (Vertical_align_engraver,
 /* descr */       "Catch Vertical axis groups and stack them.",
 /* creats*/       "VerticalAlignment",
 /* accepts */     "",