* lily/ambitus-engraver.cc (create_ambitus): change name to

[lilypond.git] / lily / dot-column.cc

diff --git a/lily/dot-column.cc b/lily/dot-column.cc
index 46448cd95ff0fb20b959a8d8212d9b5b11274568..1a7f3cc601222ed66839b0c69b58cc65c05a0cc4 100644 (file)
--- a/lily/dot-column.cc
+++ b/lily/dot-column.cc
@@ -7,6 +7,7 @@
 */
 
 #include <stdio.h>
+#include <math.h>
 #include <map>
 
 #include "dots.hh"
@@ -28,7 +29,7 @@ SCM
 Dot_column::force_shift_callback (SCM element_smob, SCM axis)
 {
   Grob *me = unsmob_grob (element_smob);
-  Axis a = (Axis) gh_scm2int (axis);
+  Axis a = (Axis) ly_scm2int (axis);
   assert (a == Y_AXIS);
   me = me->get_parent (X_AXIS);
 
@@ -38,7 +39,7 @@ Dot_column::force_shift_callback (SCM element_smob, SCM axis)
   
       do_shifts (me);
     }
-  return gh_double2scm (0.0);
+  return scm_make_real (0.0);
 }
 
 MAKE_SCHEME_CALLBACK (Dot_column,side_position, 2);
@@ -46,7 +47,7 @@ SCM
 Dot_column::side_position (SCM element_smob, SCM axis)
 {
   Grob *me = unsmob_grob (element_smob);
-  Axis a = (Axis) gh_scm2int (axis);
+  Axis a = (Axis) ly_scm2int (axis);
   assert (a == X_AXIS);
 
   Grob * stem = unsmob_grob (me->get_property ("stem"));
@@ -254,7 +255,7 @@ Dot_column::do_shifts (Grob*me)
   
   dots.sort (compare_position);
   for (int i = dots.size (); i--;)
-    if (!dots[i]->live ())
+    if (!dots[i]->is_live ())
       dots.del (i);
   
   Dot_configuration cfg;
@@ -271,7 +272,7 @@ Dot_column::do_shifts (Grob*me)
            dp.extremal_head_ = Stem::first_head (stem) == note;
        }
       
-      int p = int (Staff_symbol_referencer::get_position (dp.dot_));
+      int p = Staff_symbol_referencer::get_rounded_position (dp.dot_);
       dp.pos_= p;
 
       if (dp.extremal_head_)