release: 1.3.69

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

diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc
index 261c7956d7584dc607bb2959277ddd3532f54e34..028037df76d5aa48afd3feb016b762a6e23c5909 100644 (file)
--- a/lily/vertical-align-engraver.cc
+++ b/lily/vertical-align-engraver.cc
@@ -14,7 +14,8 @@
 #include "engraver.hh"
 #include "spanner.hh"
 
-class Vertical_align_engraver : public Engraver {
+class Vertical_align_engraver : public Engraver
+{
   Spanner * valign_p_;
   bool qualifies_b (Score_element_info) const;  
 public:
@@ -28,7 +29,6 @@ protected:
   virtual void do_removal_processing();
 };
 
-
 Vertical_align_engraver::Vertical_align_engraver()
 {
   valign_p_ =0;
@@ -38,8 +38,8 @@ void
 Vertical_align_engraver::do_creation_processing()
 {
   valign_p_ =new Spanner (SCM_EOL); // todo -> basic props
-  Align_interface (valign_p_).set_interface ();
-  Align_interface (valign_p_).set_axis (Y_AXIS);
+  Align_interface::set_interface (valign_p_);
+  Align_interface::set_axis (valign_p_,Y_AXIS);
   valign_p_->set_elt_property ("stacking-dir",
                               gh_int2scm (DOWN));
   
@@ -54,13 +54,13 @@ Vertical_align_engraver::do_removal_processing()
   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);    
+    {
+      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_elt_property ("threshold",
+                                  gh_cons (min,max));
+    }
   valign_p_->set_bound(RIGHT,unsmob_element (get_property ("currentCommandColumn")));
   typeset_element (valign_p_);
   valign_p_ =0;
@@ -72,11 +72,8 @@ Vertical_align_engraver::qualifies_b (Score_element_info i) const
 {
   int sz = i.origin_trans_l_arr ((Translator*)this).size()  ;
 
-
-  Axis_group_interface agi(i.elem_l_);
-
-  return sz > 1 && agi.has_interface_b ()
-    && !i.elem_l_->parent_l (Y_AXIS) && agi.axis_b (Y_AXIS);
+  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);
 }
 
 void
@@ -84,10 +81,8 @@ Vertical_align_engraver::acknowledge_element (Score_element_info i)
 {
   if (qualifies_b (i))
     {
-      Align_interface(valign_p_).add_element (i.elem_l_);
+      Align_interface::add_element (valign_p_,i.elem_l_);
     }
 }
 
-
-
 ADD_THIS_TRANSLATOR(Vertical_align_engraver);