* The grand 2005-2006 replace.

[lilypond.git] / lily / dots.cc

diff --git a/lily/dots.cc b/lily/dots.cc
index c125ffcd4299c0d9767b8155a3b7a6a17c18318c..51c5ef989348421d6162869f65155d9232fd3d40 100644 (file)
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -3,56 +3,57 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 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 "item.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;
-  position_i_ =0;
-  resolve_dir_ =CENTER;
-}
+  Grob *sc = unsmob_grob (d);
+  Stencil mol;
 
-void
-Dots::do_post_processing ()
-{
-  if (!resolve_dir_)
-    resolve_dir_ = UP;
-  
-  if (!(position_i_ % 2))
-    position_i_ += resolve_dir_;
+  SCM c = sc->get_property ("dot-count");
 
-  if (!dots_i_)
+  if (scm_is_number (c))
     {
-      set_elt_property (transparent_scm_sym, SCM_BOOL_T);
-      set_empty (true, X_AXIS, Y_AXIS);
+      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);
+       }
     }
+  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 ()->dots ();
-
-  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);
-    }
-  out->translate_axis (staff_line_leading_f () * position_i_ /2., Y_AXIS);
-  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.",
 
+              /* properties */
+              "direction "
+              "dot-count");