X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdots.cc;h=1b2c7be8799fc59eba0347cd9d362783cdeaf9f2;hb=2efb2a313d08dd7d6490450e1591ba7feff12581;hp=a601beeeb19d0e4da09a4d91b3cad31c710dc394;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git

diff --git a/lily/dots.cc b/lily/dots.cc
index a601beeeb1..1b2c7be879 100644
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -3,70 +3,57 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "dots.hh"
+
 #include "item.hh"
-#include "molecule.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "font-interface.hh"
 #include "lookup.hh"
 #include "staff-symbol-referencer.hh"
 #include "directional-element-interface.hh"
 
-
-MAKE_SCHEME_CALLBACK(Dots,quantised_position_callback,2);
+MAKE_SCHEME_CALLBACK (Dots, print, 1);
 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_grob_property ("dot-count");
-  if (gh_number_p (d) && gh_scm2int (d))
-    {
-      if (!Directional_element_interface::get (me))
-	Directional_element_interface::set (me, UP);
-
-      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);
-}
-
-
-MAKE_SCHEME_CALLBACK(Dots,brew_molecule,1);
-SCM  
-Dots::brew_molecule (SCM d)
+Dots::print (SCM d)
 {
   Grob *sc = unsmob_grob (d);
-  Molecule mol;
-  
-  SCM c = sc->get_grob_property ("dot-count");
+  Stencil mol;
+
+  SCM c = sc->get_property ("dot-count");
 
-  if (gh_number_p (c))
+  if (scm_is_number (c))
     {
-      Molecule d = Font_interface::get_default_font (sc)->find_by_name (String ("dots-dot"));
+      Stencil d = Font_interface::get_default_font (sc)->find_by_name (string ("dots.dot"));
       Real dw = d.extent (X_AXIS).length ();
-      
 
       /*
 	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--; )
+
+      /*
+	TODO: this should  be handled by side-position padding.
+      */
+      mol = Lookup::blank (Box (Interval (0, 0),
+				Interval (0, 0)));
+
+      for (int i = scm_to_int (c); i--;)
 	{
-	  d.translate_axis (2*dw,X_AXIS);
-	  mol.add_at_edge (X_AXIS, RIGHT, d, dw);
+	  d.translate_axis (2 * dw, X_AXIS);
+	  mol.add_at_edge (X_AXIS, RIGHT, d, dw, 0);
 	}
     }
   return mol.smobbed_copy ();
 }
 
+ADD_INTERFACE (Dots, "dots-interface",
+	       "The dots to go with a notehead or rest."
+	       "@code{direction} sets the preferred direction to move in case of staff "
+	       "line collisions.",
 
+	       /* properties */
+	       "direction "
+	       "dot-count");