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

diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc
index b4244c668e..33c0f1a98a 100644
--- a/lily/vertical-align-engraver.cc
+++ b/lily/vertical-align-engraver.cc
@@ -1,12 +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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
-#include "translator-group.hh"
-#include "axis-group-engraver.hh"
+#include "context.hh"
 #include "paper-column.hh"
 #include "align-interface.hh"
 #include "span-bar.hh"
@@ -14,88 +13,65 @@
 #include "engraver.hh"
 #include "spanner.hh"
 
-class Vertical_align_engraver : public Engraver {
-  Spanner * valign_p_;
-  bool qualifies_b (Score_element_info) const;  
+class Vertical_align_engraver : public Engraver
+{
+  Spanner *valign_;
+  bool qualifies (Grob_info) const;
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  
-  Vertical_align_engraver();
+  TRANSLATOR_DECLARATIONS (Vertical_align_engraver);
 protected:
-  
-  virtual void acknowledge_element (Score_element_info);
-  virtual void do_creation_processing();
-  virtual void do_removal_processing();
+  virtual void acknowledge_grob (Grob_info);
+  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::do_creation_processing()
+Vertical_align_engraver::process_music ()
 {
-  valign_p_ =new Spanner; //Axis_align_spanner
-  Align_interface (valign_p_).set_interface ();
-  Align_interface (valign_p_).set_axis (Y_AXIS);
-  valign_p_->set_elt_property ("stacking-dir",
-			       gh_int2scm (DOWN));
-  
-  valign_p_->set_bound(LEFT,get_staff_info().command_pcol_l ());
-  announce_element (Score_element_info (valign_p_ , 0));
+  if (!valign_)
+    {
+      valign_ = make_spanner ("VerticalAlignment", SCM_EOL);
+      valign_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
+    }
 }
 
 void
-Vertical_align_engraver::do_removal_processing()
+Vertical_align_engraver::finalize ()
 {
-  SCM min = get_property ("maxVerticalAlign");
-  SCM max = get_property ("minVerticalAlign");
-
-  if (gh_number_p (min) || gh_number_p (max))
-  {
-    min = gh_number_p (min) ? min : gh_double2scm (0.0);
-    max = gh_number_p (max) ? max : gh_double2scm (infinity_f);    
-    
-    valign_p_->set_elt_property ("threshold",
-				 gh_cons (min,max));
-  }
-  valign_p_->set_bound(RIGHT,get_staff_info().command_pcol_l ());
-  typeset_element (valign_p_);
-  valign_p_ =0;
+  if (valign_)
+    {
+      valign_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
+      valign_ = 0;
+    }
 }
 
-
 bool
-Vertical_align_engraver::qualifies_b (Score_element_info i) const
+Vertical_align_engraver::qualifies (Grob_info i) const
 {
-  int sz = i.origin_trans_l_arr ((Translator*)this).size()  ;
-
-
-  Axis_group_interface agi(i.elem_l_);
+  int sz = i.origin_contexts ((Translator *)this).size ();
 
-  return sz > 1 && agi.has_interface_b ()
-    && !i.elem_l_->parent_l (Y_AXIS) && agi.axis_b (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_element (Score_element_info i)
+Vertical_align_engraver::acknowledge_grob (Grob_info i)
 {
-  if (qualifies_b (i))
+  if (qualifies (i))
     {
-      Align_interface(valign_p_).add_element (i.elem_l_);
+      Align_interface::add_element (valign_, i.grob_, get_property ("verticalAlignmentChildCallback"));
     }
-  /*
-     Add make sure spanbars (whose size depends on vertical alignment)
-     depend on the vertical alignment element
-   */
-  else if (dynamic_cast<Span_bar*>(i.elem_l_) && i.origin_trans_l_arr (this).size ())
-    {
-      i.elem_l_->add_dependency (valign_p_);
-    }  
 }
 
-
-
-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 */ "");