* lily/staff-symbol-engraver.cc (acknowledge_grob): remove item ->

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

diff --git a/lily/dot-column.cc b/lily/dot-column.cc
index 4cb993c719295870709b475e224c6411c299b120..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,32 +29,32 @@ 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);
 
-  if (!to_boolean (me->get_grob_property ("positioning-done")))
+  if (!to_boolean (me->get_property ("positioning-done")))
     {
-      me->set_grob_property ("positioning-done", SCM_BOOL_T);
+      me->set_property ("positioning-done", SCM_BOOL_T);
   
       do_shifts (me);
     }
-  return gh_double2scm (0.0);
+  return scm_make_real (0.0);
 }
 
-MAKE_SCHEME_CALLBACK(Dot_column,side_position, 2);
+MAKE_SCHEME_CALLBACK (Dot_column,side_position, 2);
 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_grob_property ("stem"));
+  Grob * stem = unsmob_grob (me->get_property ("stem"));
   if (stem
       && !Stem::get_beam (stem)
       && Stem::duration_log (stem) > 2
-      && !Stem::invisible_b (stem)
+      && !Stem::is_invisible (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;
@@ -266,16 +267,16 @@ Dot_column::do_shifts (Grob*me)
       Grob * note = dots[i]->get_parent (Y_AXIS);
       if (note)
        {
-         Grob *stem = unsmob_grob (note->get_grob_property ("stem"));
+         Grob *stem = unsmob_grob (note->get_property ("stem"));
          if (stem)
            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_)
-       dp.dir_ = to_dir (dp.dot_->get_grob_property  ("direction"));
+       dp.dir_ = to_dir (dp.dot_->get_property  ("direction"));
 
       remove_collision (cfg, p);
       cfg[p] = dp;
@@ -295,7 +296,7 @@ Dot_column::do_shifts (Grob*me)
 void
 Dot_column::add_head (Grob * me, Grob *rh)
 {
-  Grob * d = unsmob_grob (rh->get_grob_property ("dot"));
+  Grob * d = unsmob_grob (rh->get_property ("dot"));
   if (d)
     {
       Side_position_interface::add_support (me,rh);
@@ -310,6 +311,8 @@ Dot_column::add_head (Grob * me, Grob *rh)
 
 
 ADD_INTERFACE (Dot_column, "dot-column-interface",
-  "Interface that groups dots so they form a column",
-  "positioning-done direction stem");
+              "Groups dot objects so they form a column, and position dots so they do not "
+              "clash with staff lines "
+              ,
+              "positioning-done direction stem");