X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdots.cc;h=b6343f17b4c9911b7e43123df29bc204758be74c;hb=de658c9789658317b265eb7f3fd34a87c7a8f953;hp=7846e2d36769d29204309e970d07b1d6c1054d48;hpb=fbb6d20e9f58d691ffe845284cbb4d8bacf9ca60;p=lilypond.git

diff --git a/lily/dots.cc b/lily/dots.cc
index 7846e2d367..b6343f17b4 100644
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -3,61 +3,82 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #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))
-    {
-      set_elt_property ("transparent", SCM_BOOL_T);
-      set_empty (X_AXIS);
-      set_empty (Y_AXIS);
-    }
-  else
+  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 (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 ();
+      
+
+      /*
+	we need to add a real blank box, to assure that
+	side-positioning doth not cancel the left-most padding.  */
 
-  return mol;
+      /*
+	TODO: this should  be handled by side-position 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, 0);
+	}
+    }
+  return mol.smobbed_copy ();
 }
 
 
 
+
+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");
+
+