release: 1.3.93

[lilypond.git] / lily / dots.cc

diff --git a/lily/dots.cc b/lily/dots.cc
index f63f77ddae1e57d08191c2cf3840591aede312a6..25e4cec7dd18b0233ad477d6e37c782fe97ce5fe 100644 (file)
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -7,56 +7,57 @@
 */
 
 #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 ()
-{
-  set_elt_property ("dot-count", gh_int2scm (0));
-}
 
-void
-Dots::do_post_processing ()
+Real
+Dots::quantised_position_callback (Score_element * me, Axis a)
 {
-  SCM d= get_elt_property ("dot-count");
-  if (!gh_number_p (d) || !gh_scm2int (d))
-    {
-      set_elt_property ("transparent", SCM_BOOL_T);
-      set_empty (X_AXIS);
-      set_empty (Y_AXIS);
-    }
-  else
+  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::get (me))
+       Directional_element_interface::set (me, UP);
 
-      Staff_symbol_referencer_interface si (this);
-      int p = int (si.position_f ());
-      if (!(p % 2))
-       si.set_position (p  + directional_element (this).get ());
+      if (Staff_symbol_referencer::on_staffline (me))
+       return Staff_symbol_referencer::staff_space (me) / 2.0 * Directional_element_interface::get (me);
     }
+
+  return  0.0;
 }
-Molecule  
-Dots::do_brew_molecule () const
-{
-  Molecule mol (lookup_l ()->fill (Box (Interval (0,0),
-                                         Interval (0,0))));
-  Molecule d = lookup_l ()->afm_find (String ("dots-dot"));
 
-  Real dw = d.dim_[X_AXIS].length ();
-  d.translate_axis (-dw, X_AXIS);
 
+MAKE_SCHEME_CALLBACK(Dots,brew_molecule);
+SCM  
+Dots::brew_molecule (SCM d)
+{
+  Score_element *sc = unsmob_element (d);
+  Molecule mol (sc->lookup_l ()->blank (Box (Interval (0,0),
+                                        Interval (0,0))));
 
-  for (int i = gh_scm2int (get_elt_property ("dot-count")); i--; )
+  SCM c = sc->get_elt_property ("dot-count");
+  if (gh_number_p (c))
     {
-      d.translate_axis (2*dw,X_AXIS);
-      mol.add_molecule (d);
-    }
+      Molecule d = sc->lookup_l ()->afm_find (String ("dots-dot"));
+
+      Real dw = d.extent (X_AXIS).length ();
+      d.translate_axis (-dw, X_AXIS);
 
-  return mol;
+
+      for (int i = gh_scm2int (c); i--; )
+       {
+         d.translate_axis (2*dw,X_AXIS);
+         mol.add_molecule (d);
+       }
+    }
+  return mol.create_scheme ();
 }