X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fdots.cc;h=2f8202a4653ec36d83d0943f145cc24cd7222734;hb=20091095d3ac112fa0d0c55c8e2b8092584be4b2;hp=ea37e88f115692b4c02e39fe9cd1f49220d72661;hpb=622b379cd71af8dde94f68135a489b2536309e6f;p=lilypond.git

diff --git a/lily/dots.cc b/lily/dots.cc
index ea37e88f11..2f8202a465 100644
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -3,52 +3,70 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2001 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 ()
-{
-  no_dots_i_ =0;
-  position_i_ =0;
-}
 
-void
-Dots::do_post_processing ()
+MAKE_SCHEME_CALLBACK (Dots,quantised_position_callback,2);
+SCM
+Dots::quantised_position_callback (SCM element_smob, SCM axis)
 {
-  if (!(position_i_ % 2))
-    position_i_ ++;
-  if (!no_dots_i_)
+  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))
     {
-      transparent_b_ = true;
-      set_empty (true);
+      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);
 }
 
-Molecule* 
-Dots::do_brew_molecule_p () const
-{
-  Molecule *out = new Molecule;
-  Molecule fill = lookup_l ()->fill (Box (Interval (0,0),
-					       Interval (0,0)));
-  out->add_molecule (fill);
 
-  Molecule d = lookup_l ()->dots ();
+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");
 
-  Real dw = d.dim_[X_AXIS].length ();
-  d.translate_axis (-dw, X_AXIS);
-  for (int i=no_dots_i_; i--; )
+  if (gh_number_p (c))
     {
-      d.translate_axis (2*dw,X_AXIS);
-      out->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.  */
+      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);
+	}
     }
-  Real inter_f = paper ()->internote_f ();
-  out->translate_axis (inter_f * position_i_, Y_AXIS);
-  return out;
+  return mol.smobbed_copy ();
 }
 
 
+