X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdots.cc;h=ff777b926aae1ebc772786d9ac88d16d903a71aa;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=5fa59bdd50ea3f5384c90556d9e1639b70148cf3;hpb=28d97df78de5e56962730b42119c2d9b73401fa7;p=lilypond.git

diff --git a/lily/dots.cc b/lily/dots.cc
index 5fa59bdd50..ff777b926a 100644
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -3,61 +3,70 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 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"
+#include "international.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;
 
-void
-Dots::after_line_breaking ()
-{
-  SCM d= get_elt_property ("dot-count");
-  if (!gh_number_p (d) || !gh_scm2int (d))
-    {
-      set_elt_property ("transparent", SCM_BOOL_T);
-      set_extent_callback (0, X_AXIS);
-      set_extent_callback (0, Y_AXIS);
-    }
-  else
-    {
-      if (!directional_element (this).get ())
-	directional_element (this).set (UP);
+  SCM c = sc->get_property ("dot-count");
 
-      Staff_symbol_referencer_interface si (this);
-      int p = int (si.position_f ());
-      if (!(p % 2))
-	si.set_position (p  + directional_element (this).get ());
-    }
-}
-Molecule  
-Dots::do_brew_molecule () const
-{
-  Molecule mol (lookup_l ()->blank (Box (Interval (0,0),
-					  Interval (0,0))));
-  Molecule d = lookup_l ()->afm_find (String ("dots-dot"));
+  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 ();
 
-  Real dw = d.dim_[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 (get_elt_property ("dot-count")); i--; )
-    {
-      d.translate_axis (2*dw,X_AXIS);
-      mol.add_molecule (d);
+      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;
+  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.  @code{style} defaults to undefined, which is"
+	       " normal 19th/20th century traditional style.  Set"
+	       " @code{style} to @code{vaticana} for ancient type dots.",
 
-
+	       /* properties */
+	       "direction "
+	       "dot-count "
+	       "style "
+	       );