X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fvertical-align-engraver.cc;h=48935c674cbe572705430ffdf44b1f781de114b4;hb=875cf3061b68867a109cdaf52c93be868a3e01be;hp=7a212641598d251101e132f39305f95384c710c8;hpb=34f168ae4ed3379964f4009e4a823a7114dcb71a;p=lilypond.git

diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc
index 7a21264159..48935c674c 100644
--- a/lily/vertical-align-engraver.cc
+++ b/lily/vertical-align-engraver.cc
@@ -7,7 +7,7 @@
 */
 #include "translator-group.hh"
 #include "axis-group-engraver.hh"
-#include "p-col.hh"
+#include "paper-column.hh"
 #include "vertical-align-engraver.hh"
 #include "axis-align-spanner.hh"
 #include "axis-group-spanner.hh"
@@ -32,22 +32,22 @@ Vertical_align_engraver::do_creation_processing()
 void
 Vertical_align_engraver::do_removal_processing()
 {
-  Scalar dist (get_property ("maxVerticalAlign", 0));
-  if (dist.length_i () && dist.isnum_b ())
+  SCM dist (get_property ("maxVerticalAlign", 0));
+  if (gh_number_p(dist))
     {
-      valign_p_->threshold_interval_[BIGGER]  = Real (dist);
+      valign_p_->threshold_interval_[BIGGER]  = gh_scm2double (dist);
     }
 
   dist = get_property ("minVerticalAlign", 0);
-  if (dist.length_i () && dist.isnum_b ())
+  if (gh_number_p(dist))
     {
-      valign_p_->threshold_interval_[SMALLER]  = Real (dist);
+      valign_p_->threshold_interval_[SMALLER]  = gh_scm2double (dist);
     }
 
   dist = get_property ("alignmentReference",0);
-  if (dist.length_i () && dist.isnum_b ())
+  if (isdir_b (dist))
     {
-      valign_p_->align_dir_ = int (dist);
+      valign_p_->align_dir_ = to_dir (dist);
     }
   valign_p_->set_bounds(RIGHT,get_staff_info().command_pcol_l ());
   typeset_element (valign_p_);
@@ -58,7 +58,9 @@ Vertical_align_engraver::do_removal_processing()
 bool
 Vertical_align_engraver::qualifies_b (Score_element_info i) const
 {
+#if 0
   Translator * t =   i.origin_trans_l_arr_[0];
+#endif
   int sz = i.origin_trans_l_arr_.size()  ;
 
 #if 0