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

diff --git a/lily/dots.cc b/lily/dots.cc
index 1b702e2932..97ac61128e 100644
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -3,64 +3,68 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "dots.hh"
+
 #include "item.hh"
-#include "molecule.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
+#include "font-interface.hh"
 #include "lookup.hh"
 #include "staff-symbol-referencer.hh"
-#include "directional-element-interface.hh"
-
+#include "international.hh"
 
-Real
-Dots::quantised_position_callback (Score_element * me, Axis a)
+MAKE_SCHEME_CALLBACK (Dots, print, 1);
+SCM
+Dots::print (SCM d)
 {
-  assert (a == Y_AXIS);
-    
-  SCM d= me->get_elt_property ("dot-count");
-  if (gh_number_p (d) && gh_scm2int (d))
-    {
-      if (!Directional_element_interface (me).get ())
-	Directional_element_interface (me).set (UP);
-
-
-      int pos = int (Staff_symbol_referencer::position_f (me));
-      if (!(pos % 2))
-	return Staff_symbol_referencer::staff_space (me) / 2.0 * Directional_element_interface (me).get ();
-    }
-
-  return  0.0;
-}
+  Grob *sc = unsmob_grob (d);
+  Stencil mol;
 
+  SCM c = sc->get_property ("dot-count");
 
-MAKE_SCHEME_CALLBACK(Dots,brew_molecule);
-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))));
-
-  SCM c = sc->get_elt_property ("dot-count");
-  if (gh_number_p (c))
+  if (scm_is_number (c))
     {
-      Molecule d = sc->lookup_l ()->afm_find (String ("dots-dot"));
-
+      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 ();
-      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.  */
+
+      /*
+	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--; )
+      for (int i = scm_to_int (c); i--;)
 	{
-	  d.translate_axis (2*dw,X_AXIS);
-	  mol.add_molecule (d);
+	  d.translate_axis (2 * dw, X_AXIS);
+	  mol.add_at_edge (X_AXIS, RIGHT, d, dw);
 	}
     }
-  return mol.create_scheme ();
+  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 "
+	       );