release: 1.3.93

[lilypond.git] / lily / dots.cc

diff --git a/lily/dots.cc b/lily/dots.cc
index ccd29ae3b61a04843be48771f2eb31a665dac3d3..25e4cec7dd18b0233ad477d6e37c782fe97ce5fe 100644 (file)
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -14,30 +14,27 @@
 #include "staff-symbol-referencer.hh"
 #include "directional-element-interface.hh"
 
-MAKE_SCHEME_SCORE_ELEMENT_CALLBACK(Dots,after_line_breaking);
 
-SCM
-Dots::after_line_breaking (SCM smob)
+Real
+Dots::quantised_position_callback (Score_element * me, Axis a)
 {
-  Item * p = dynamic_cast<Item*> (unsmob_element (smob));
-  
-  SCM d= p->get_elt_property ("dot-count");
+  assert (a == Y_AXIS);
+    
+  SCM d= me->get_elt_property ("dot-count");
   if (gh_number_p (d) && gh_scm2int (d))
     {
-      if (!Directional_element_interface (p).get ())
-       Directional_element_interface (p).set (UP);
+      if (!Directional_element_interface::get (me))
+       Directional_element_interface::set (me, UP);
 
-      Staff_symbol_referencer_interface si (p);
-      int pos = int (si.position_f ());
-      if (!(pos % 2))
-       si.set_position (pos  + Directional_element_interface (p).get ());
+      if (Staff_symbol_referencer::on_staffline (me))
+       return Staff_symbol_referencer::staff_space (me) / 2.0 * Directional_element_interface::get (me);
     }
 
-  return SCM_UNDEFINED;
+  return  0.0;
 }
 
-MAKE_SCHEME_SCORE_ELEMENT_CALLBACK(Dots,brew_molecule);
 
+MAKE_SCHEME_CALLBACK(Dots,brew_molecule);
 SCM  
 Dots::brew_molecule (SCM d)
 {