patch::: 1.3.128.jcn4

[lilypond.git] / lily / dots.cc

diff --git a/lily/dots.cc b/lily/dots.cc
index 6a037d9f803d83504700db58d2871e042e0a14f8..4dc6ab4877a7e373f86486a25ba8830e9ee2290c 100644 (file)
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -10,56 +10,62 @@
 #include "item.hh"
 #include "molecule.hh"
 #include "paper-def.hh"
+#include "font-interface.hh"
 #include "lookup.hh"
 #include "staff-symbol-referencer.hh"
 #include "directional-element-interface.hh"
 
 
-Real
-Dots::quantised_position_callback (Score_element const* me, Axis a)
+MAKE_SCHEME_CALLBACK(Dots,quantised_position_callback,2);
+SCM
+Dots::quantised_position_callback (SCM element_smob, SCM axis)
 {
+  Grob *me = unsmob_grob (element_smob);
+  Axis a = (Axis) gh_scm2int (axis);
   assert (a == Y_AXIS);
     
-  SCM d= me->get_elt_property ("dot-count");
+  SCM d= me->get_grob_property ("dot-count");
   if (gh_number_p (d) && gh_scm2int (d))
     {
-      if (!Directional_element_interface (me).get ())
-       Directional_element_interface (me).set (UP);
+      if (!Directional_element_interface::get (me))
+       Directional_element_interface::set (me, UP);
 
-      Staff_symbol_referencer_interface si (me);
-      int pos = int (si.position_f ());
-      if (!(pos % 2))
-       return si.staff_space () / 2.0 * Directional_element_interface (me).get ();
+      if (Staff_symbol_referencer::on_staffline (me))
+       return gh_double2scm (Staff_symbol_referencer::staff_space (me) / 2.0 * Directional_element_interface::get (me));
     }
 
-  return  0.0;
+  return gh_double2scm  (0.0);
 }
 
 
-MAKE_SCHEME_SCORE_ELEMENT_CALLBACK(Dots,brew_molecule);
+MAKE_SCHEME_CALLBACK(Dots,brew_molecule,1);
 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))));
+  Grob *sc = unsmob_grob (d);
+  Molecule mol;
+  
+  SCM c = sc->get_grob_property ("dot-count");
 
-  SCM c = sc->get_elt_property ("dot-count");
   if (gh_number_p (c))
     {
-      Molecule d = sc->lookup_l ()->afm_find (String ("dots-dot"));
-
+      Molecule d = Font_interface::get_default_font (sc)->find_by_name (String ("dots-dot"));
       Real dw = d.extent (X_AXIS).length ();
-      d.translate_axis (-dw, X_AXIS);
-
-
+      
+
+      /*
+       we need to add a real blank box, to assure that
+       side-positioning doth not cancel the left-most padding.  */
+      mol = Lookup::blank (Box (Interval (0,0),
+                               Interval (0,0)));
+  
       for (int i = gh_scm2int (c); i--; )
        {
          d.translate_axis (2*dw,X_AXIS);
-         mol.add_molecule (d);
+         mol.add_at_edge (X_AXIS, RIGHT, d, dw);
        }
     }
-  return mol.create_scheme ();
+  return mol.smobbed_copy ();
 }