Merge with master

[lilypond.git] / lily / dots.cc

diff --git a/lily/dots.cc b/lily/dots.cc
index 946b74b19576e06a456235c28b6ec36965a0daab..97ac61128e8e0ffe20901b1ec5ccec4313c6dd25 100644 (file)
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -3,35 +3,68 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.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_ ++;
-}
+  SCM c = sc->get_property ("dot-count");
 
-Molecule* 
-Dots::brew_molecule_p () const
-{
-  Atom d = paper ()->lookup_l ()->dots (no_dots_i_);
-  Molecule *out = new Molecule (Atom (d));
-  Real inter_f = paper ()->internote_f ();
-  out->translate (inter_f * position_i_, Y_AXIS);
-  return out;
+  if (scm_is_number (c))
+    {
+      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 ();
+
+      /*
+       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);
+       }
+    }
+  return mol.smobbed_copy ();
 }
 
-IMPLEMENT_IS_TYPE_B1(Dots, Item);
+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 "
+              );