($(outdir)/%.pdf): add DVIPS_FLAGS. This will

[lilypond.git] / lily / dots.cc

diff --git a/lily/dots.cc b/lily/dots.cc
index 36e0a348441704b42a84fe3e9e0e96b31503d81d..f87c719e3b0ea6ec440d7077d6e43a14e87b4bcb 100644 (file)
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -3,64 +3,59 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "dots.hh"
-#include "molecule.hh"
+#include "item.hh"
+#include "stencil.hh"
 #include "paper-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)
 {
-  set_elt_property ("dot-count", gh_int2scm (0));
-}
+  Grob *sc = unsmob_grob (d);
+  Stencil mol;
+  
+  SCM c = sc->get_grob_property ("dot-count");
 
-void
-Dots::do_post_processing ()
-{
-  SCM d= get_elt_property ("dot-count");
-  if (!gh_number_p (d) || !gh_scm2int (d))
-    {
-      set_elt_property ("transparent", SCM_BOOL_T);
-      set_empty (X_AXIS);
-      set_empty (Y_AXIS);
-    }
-  else
+  if (gh_number_p (c))
     {
-      if (!directional_element (this).get ())
-       directional_element (this).set (UP);
-
-      Staff_symbol_referencer_interface si (this);
-      int p = int (si.position_f ());
-      if (!(p % 2))
-       si.set_position (p  + directional_element (this).get ());
+      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 = gh_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 = gh_scm2int (get_elt_property ("dot-count")); 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/rest.  A separate interface, since they "
+" are a party in collision resolution. "
+" #'direction is the Direction to handle staff-line collisions in.",
+  "direction dot-count");