X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fdots.cc;h=8fcd15e8ed6bf0eabbbff18a7b9685e10e052df5;hb=c53d0cabdf9361e448cdd02a338aa5d696f4f466;hp=1af6f64c4e567af574eb726ef387d29ef55b5b2d;hpb=f41e76b0ca29311570db6731f0836648212edfe2;p=lilypond.git

diff --git a/lily/dots.cc b/lily/dots.cc
index 1af6f64c4e..8fcd15e8ed 100644
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -3,53 +3,30 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "dots.hh"
 #include "item.hh"
-#include "molecule.hh"
+#include "stencil.hh"
 #include "paper-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);
-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);
+MAKE_SCHEME_CALLBACK (Dots,print,1);
 SCM  
-Dots::brew_molecule (SCM d)
+Dots::print (SCM d)
 {
   Grob *sc = unsmob_grob (d);
-  Molecule mol;
+  Stencil mol;
   
-  SCM c = sc->get_grob_property ("dot-count");
+  SCM c = sc->get_property ("dot-count");
 
   if (gh_number_p (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 ();
       
 
@@ -66,7 +43,7 @@ Dots::brew_molecule (SCM d)
       for (int i = gh_scm2int (c); i--;)
 	{
 	  d.translate_axis (2*dw,X_AXIS);
-	  mol.add_at_edge (X_AXIS, RIGHT, d, dw);
+	  mol.add_at_edge (X_AXIS, RIGHT, d, dw, 0);
 	}
     }
   return mol.smobbed_copy ();
@@ -76,9 +53,9 @@ Dots::brew_molecule (SCM d)
 
 
 ADD_INTERFACE (Dots, "dots-interface",
-  "The dots to go with a notehead/rest.  A separate interface, since they
-are a party in collision resolution.
-#'direction is the Direction to handle staff-line collisions in.",
-  "direction dot-count");
+	       "The dots to go with a notehead or rest."
+	       "@code{direction} sets the preferred direction to move in case of staff "
+	       "line collisions.",
+	       "direction dot-count");