X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdots.cc;h=1b702e293207749c85219d95b329ccb046041931;hb=dda8fcdc6f378ad4b4e2e5135b9c266088feaf7c;hp=ebc5c366a0b508c5343eea6c8811c59545f08422;hpb=b0064942493df77833e6e41e05d362850f4874b0;p=lilypond.git

diff --git a/lily/dots.cc b/lily/dots.cc
index ebc5c366a0..1b702e2932 100644
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -7,45 +7,47 @@
 */
 
 #include "dots.hh"
+#include "item.hh"
 #include "molecule.hh"
 #include "paper-def.hh"
 #include "lookup.hh"
 #include "staff-symbol-referencer.hh"
 #include "directional-element-interface.hh"
 
-Dots::Dots (SCM s)
-  : Item (s)
-{
-  set_elt_property ("dot-count", gh_int2scm (0));
-}
 
-void
-Dots::after_line_breaking ()
+Real
+Dots::quantised_position_callback (Score_element * me, Axis a)
 {
-  SCM d= 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 (this).get ())
-	directional_element (this).set (UP);
+      if (!Directional_element_interface (me).get ())
+	Directional_element_interface (me).set (UP);
+
 
-      Staff_symbol_referencer_interface si (this);
-      int p = int (si.position_f ());
-      if (!(p % 2))
-	si.set_position (p  + directional_element (this).get ());
+      int pos = int (Staff_symbol_referencer::position_f (me));
+      if (!(pos % 2))
+	return Staff_symbol_referencer::staff_space (me) / 2.0 * Directional_element_interface (me).get ();
     }
+
+  return  0.0;
 }
 
-MAKE_SCHEME_SCORE_ELEMENT_CALLBACKS(Dots);
-Molecule  
-Dots::do_brew_molecule () const
+
+MAKE_SCHEME_CALLBACK(Dots,brew_molecule);
+SCM  
+Dots::brew_molecule (SCM d)
 {
-  Molecule mol (lookup_l ()->blank (Box (Interval (0,0),
+  Score_element *sc = unsmob_element (d);
+  Molecule mol (sc->lookup_l ()->blank (Box (Interval (0,0),
 					 Interval (0,0))));
 
-  SCM c = get_elt_property ("dot-count");
-  if (!gh_number_p (c))
+  SCM c = sc->get_elt_property ("dot-count");
+  if (gh_number_p (c))
     {
-      Molecule d = lookup_l ()->afm_find (String ("dots-dot"));
+      Molecule d = sc->lookup_l ()->afm_find (String ("dots-dot"));
 
       Real dw = d.extent (X_AXIS).length ();
       d.translate_axis (-dw, X_AXIS);
@@ -57,7 +59,7 @@ Dots::do_brew_molecule () const
 	  mol.add_molecule (d);
 	}
     }
-  return mol;
+  return mol.create_scheme ();
 }