X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdots.cc;h=97ac61128e8e0ffe20901b1ec5ccec4313c6dd25;hb=53d5bd8ec65e2caa9febf487bd492b68365752b0;hp=6d9af00dd2fe8ae1dc2b8788f73db1b4682aa71c;hpb=74e65211d6cda3818a6d4891f1f1c31f457e94cd;p=lilypond.git

diff --git a/lily/dots.cc b/lily/dots.cc
index 6d9af00dd2..97ac61128e 100644
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -3,51 +3,68 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "dots.hh"
-#include "molecule.hh"
-#include "paper-def.hh"
+
+#include "item.hh"
+#include "output-def.hh"
+#include "font-interface.hh"
 #include "lookup.hh"
+#include "staff-symbol-referencer.hh"
+#include "international.hh"
 
-Dots::Dots ()
+MAKE_SCHEME_CALLBACK (Dots, print, 1);
+SCM
+Dots::print (SCM d)
 {
-  no_dots_i_ =0;
-  position_i_ =0;
-}
+  Grob *sc = unsmob_grob (d);
+  Stencil mol;
 
-void
-Dots::do_post_processing ()
-{
-  if (!(position_i_ % 2))
-    position_i_ ++;
-  if (!no_dots_i_)
+  SCM c = sc->get_property ("dot-count");
+
+  if (scm_is_number (c))
     {
-      set_elt_property (transparent_scm_sym, SCM_BOOL_T);
-      set_empty (true);
-    }
-}
+      SCM scm_style = sc->get_property ("style");
+      string style ="";
+      if (scm_is_symbol (scm_style))
+	style = ly_symbol2string (scm_style);
+      string idx =  "dots.dot" + style;
+      Stencil d = Font_interface::get_default_font (sc)->find_by_name (idx);
+      if (d.is_empty ())
+	{
+	  sc->warning (_f ("dot `%s' not found", idx.c_str ()));
+	  return SCM_EOL;
+	}
+      Real dw = d.extent (X_AXIS).length ();
 
-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);
+      /*
+	we need to add a real blank box, to assure that
+	side-positioning doth not cancel the left-most padding.  */
 
-  Molecule d = lookup_l ()->dots ();
+      /*
+	TODO: this should  be handled by side-position padding.
+      */
+      mol = Lookup::blank (Box (Interval (0, 0),
+				Interval (0, 0)));
 
-  Real dw = d.dim_[X_AXIS].length ();
-  d.translate_axis (-dw, X_AXIS);
-  for (int i=no_dots_i_; i--; )
-    {
-      d.translate_axis (2*dw,X_AXIS);
-      out->add_molecule (d);
+      for (int i = scm_to_int (c); i--;)
+	{
+	  d.translate_axis (2 * dw, X_AXIS);
+	  mol.add_at_edge (X_AXIS, RIGHT, d, dw);
+	}
     }
-  out->translate_axis (staff_line_leading_f () * position_i_ /2., Y_AXIS);
-  return out;
+  return mol.smobbed_copy ();
 }
 
+ADD_INTERFACE (Dots,
+	       "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 "
+	       "style "
+	       );