2003 -> 2004

[lilypond.git] / lily / dots.cc

diff --git a/lily/dots.cc b/lily/dots.cc
index ccd29ae3b61a04843be48771f2eb31a665dac3d3..42c6b56922897448d7f70bf76a594f2bdb18c4fc 100644 (file)
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -3,65 +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 "item.hh"
 #include "molecule.hh"
 #include "paper-def.hh"
+#include "font-interface.hh"
 #include "lookup.hh"
 #include "staff-symbol-referencer.hh"
 #include "directional-element-interface.hh"
 
-MAKE_SCHEME_SCORE_ELEMENT_CALLBACK(Dots,after_line_breaking);
-
-SCM
-Dots::after_line_breaking (SCM smob)
-{
-  Item * p = dynamic_cast<Item*> (unsmob_element (smob));
-  
-  SCM d= p->get_elt_property ("dot-count");
-  if (gh_number_p (d) && gh_scm2int (d))
-    {
-      if (!Directional_element_interface (p).get ())
-       Directional_element_interface (p).set (UP);
-
-      Staff_symbol_referencer_interface si (p);
-      int pos = int (si.position_f ());
-      if (!(pos % 2))
-       si.set_position (pos  + Directional_element_interface (p).get ());
-    }
-
-  return SCM_UNDEFINED;
-}
-
-MAKE_SCHEME_SCORE_ELEMENT_CALLBACK(Dots,brew_molecule);
-
+MAKE_SCHEME_CALLBACK (Dots,brew_molecule,1);
 SCM  
 Dots::brew_molecule (SCM d)
 {
-  Score_element *sc = unsmob_element (d);
-  Molecule mol (sc->lookup_l ()->blank (Box (Interval (0,0),
-                                        Interval (0,0))));
+  Grob *sc = unsmob_grob (d);
+  Molecule mol;
+  
+  SCM c = sc->get_grob_property ("dot-count");
 
-  SCM c = sc->get_elt_property ("dot-count");
   if (gh_number_p (c))
     {
-      Molecule d = sc->lookup_l ()->afm_find (String ("dots-dot"));
-
+      Molecule d = Font_interface::get_default_font (sc)->find_by_name (String ("dots-dot"));
       Real dw = d.extent (X_AXIS).length ();
-      d.translate_axis (-dw, X_AXIS);
+      
 
+      /*
+       we need to add a real blank box, to assure that
+       side-positioning doth not cancel the left-most padding.  */
 
-      for (int i = gh_scm2int (c); i--; )
+      /*
+       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_molecule (d);
+         mol.add_at_edge (X_AXIS, RIGHT, d, dw, 0);
        }
     }
-  return mol.create_scheme ();
+  return mol.smobbed_copy ();
 }
 
 
 
+
+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");
+
+