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

diff --git a/lily/dots.cc b/lily/dots.cc
index 1a40a51570..1b2c7be879 100644
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -3,52 +3,57 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "dots.hh"
-#include "molecule.hh"
-#include "paper-def.hh"
-#include "lookup.hh"
 
-Dots::Dots ()
-{
-  no_dots_i_ =0;
-  position_i_ =0;
-}
-
-void
-Dots::do_post_processing ()
-{
-  if (!(position_i_ % 2))
-    position_i_ ++;
-  if (!no_dots_i_)
-    {
-      transparent_b_ = true;
-      set_empty (true);
-    }
-}
+#include "item.hh"
+#include "output-def.hh"
+#include "font-interface.hh"
+#include "lookup.hh"
+#include "staff-symbol-referencer.hh"
+#include "directional-element-interface.hh"
 
-Molecule* 
-Dots::do_brew_molecule_p () const
+MAKE_SCHEME_CALLBACK (Dots, print, 1);
+SCM
+Dots::print (SCM d)
 {
-  Molecule *out = new Molecule;
-  Atom fill = lookup_l ()->fill (Box (Interval (0,0),
-					       Interval (0,0)));
-  out->add_atom (fill);
+  Grob *sc = unsmob_grob (d);
+  Stencil mol;
 
-  Atom d = lookup_l ()->dots ();
+  SCM c = sc->get_property ("dot-count");
 
-  Real dw = d.dim_[X_AXIS].length ();
-  d.translate_axis (-dw, X_AXIS);
-  for (int i=no_dots_i_; i--; )
+  if (scm_is_number (c))
     {
-      d.translate_axis (2*dw,X_AXIS);
-      out->add_atom (d);
+      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.  */
+
+      /*
+	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, 0);
+	}
     }
-  Real inter_f = paper ()->internote_f ();
-  out->translate_axis (inter_f * position_i_, Y_AXIS);
-  return out;
+  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");