X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fdots.cc;h=c93a6f8c67c0a9e6640d8f80e79fee6da7906781;hb=832c21ee509c9ad488e1490ad59a650e89c8f53a;hp=8eda51a6d2fbea9720a1a57cda547e9c78e92430;hpb=82731e802565546441c401a84a13b486e54eb760;p=lilypond.git

diff --git a/lily/dots.cc b/lily/dots.cc
index 8eda51a6d2..c93a6f8c67 100644
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -3,57 +3,59 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "dots.hh"
-#include "molecule.hh"
-#include "paper-def.hh"
+#include "item.hh"
+#include "stencil.hh"
+#include "output-def.hh"
+#include "font-interface.hh"
 #include "lookup.hh"
+#include "staff-symbol-referencer.hh"
+#include "directional-element-interface.hh"
 
-Dots::Dots ()
+MAKE_SCHEME_CALLBACK (Dots,print,1);
+SCM  
+Dots::print (SCM d)
 {
-  dots_i_ =0;
-}
+  Grob *sc = unsmob_grob (d);
+  Stencil mol;
+  
+  SCM c = sc->get_property ("dot-count");
 
-void
-Dots::do_post_processing ()
-{
-  if (!dots_i_)
+  if (ly_c_number_p (c))
     {
-      set_elt_property ("transparent", SCM_BOOL_T);
-      set_empty (true, X_AXIS, Y_AXIS);
-    }
-  else
-    {
-      if (!get_direction ())
-	set_direction (UP);
-
-      int p = int (position_f ());
-      if (!(p % 2))
-	set_position (p  + get_direction ());
+      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 = ly_scm2int (c); i--;)
+	{
+	  d.translate_axis (2*dw,X_AXIS);
+	  mol.add_at_edge (X_AXIS, RIGHT, d, dw, 0);
+	}
     }
+  return mol.smobbed_copy ();
 }
-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 ()->afm_find (String ("dots-dot"));
 
-  Real dw = d.dim_[X_AXIS].length ();
-  d.translate_axis (-dw, X_AXIS);
-  for (int i=dots_i_; i--; )
-    {
-      d.translate_axis (2*dw,X_AXIS);
-      out->add_molecule (d);
-    }
 
-  return out;
-}
 
+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.",
+	       "direction dot-count");