patch::: 1.3.128.jcn4

[lilypond.git] / lily / dots.cc

diff --git a/lily/dots.cc b/lily/dots.cc
index 5fa59bdd50ea3f5384c90556d9e1639b70148cf3..4dc6ab4877a7e373f86486a25ba8830e9ee2290c 100644 (file)
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -7,56 +7,65 @@
 */
 
 #include "dots.hh"
+#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"
 
-Dots::Dots ()
-{
-  set_elt_property ("dot-count", gh_int2scm (0));
-}
 
-void
-Dots::after_line_breaking ()
+MAKE_SCHEME_CALLBACK(Dots,quantised_position_callback,2);
+SCM
+Dots::quantised_position_callback (SCM element_smob, SCM axis)
 {
-  SCM d= get_elt_property ("dot-count");
-  if (!gh_number_p (d) || !gh_scm2int (d))
+  Grob *me = unsmob_grob (element_smob);
+  Axis a = (Axis) gh_scm2int (axis);
+  assert (a == Y_AXIS);
+    
+  SCM d= me->get_grob_property ("dot-count");
+  if (gh_number_p (d) && gh_scm2int (d))
     {
-      set_elt_property ("transparent", SCM_BOOL_T);
-      set_extent_callback (0, X_AXIS);
-      set_extent_callback (0, Y_AXIS);
-    }
-  else
-    {
-      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 gh_double2scm (Staff_symbol_referencer::staff_space (me) / 2.0 * Directional_element_interface::get (me));
     }
+
+  return gh_double2scm  (0.0);
 }
-Molecule  
-Dots::do_brew_molecule () const
-{
-  Molecule mol (lookup_l ()->blank (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,1);
+SCM  
+Dots::brew_molecule (SCM d)
+{
+  Grob *sc = unsmob_grob (d);
+  Molecule mol;
+  
+  SCM c = sc->get_grob_property ("dot-count");
 
-  for (int i = gh_scm2int (get_elt_property ("dot-count")); i--; )
+  if (gh_number_p (c))
     {
-      d.translate_axis (2*dw,X_AXIS);
-      mol.add_molecule (d);
-    }
+      Molecule d = Font_interface::get_default_font (sc)->find_by_name (String ("dots-dot"));
+      Real dw = d.extent (X_AXIS).length ();
+      
 
-  return mol;
+      /*
+       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_at_edge (X_AXIS, RIGHT, d, dw);
+       }
+    }
+  return mol.smobbed_copy ();
 }