X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdots.cc;h=97ac61128e8e0ffe20901b1ec5ccec4313c6dd25;hb=b08f781254b3e539a64302f56bb12191b54d47a4;hp=c93a6f8c67c0a9e6640d8f80e79fee6da7906781;hpb=664070d837cc4855091455892cb942cdcedeef0c;p=lilypond.git

diff --git a/lily/dots.cc b/lily/dots.cc
index c93a6f8c67..97ac61128e 100644
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -3,32 +3,41 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "dots.hh"
+
 #include "item.hh"
-#include "stencil.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"
 
-MAKE_SCHEME_CALLBACK (Dots,print,1);
-SCM  
+MAKE_SCHEME_CALLBACK (Dots, print, 1);
+SCM
 Dots::print (SCM d)
 {
   Grob *sc = unsmob_grob (d);
   Stencil mol;
-  
+
   SCM c = sc->get_property ("dot-count");
 
-  if (ly_c_number_p (c))
+  if (scm_is_number (c))
     {
-      Stencil d = Font_interface::get_default_font (sc)->find_by_name (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 ();
-      
 
       /*
 	we need to add a real blank box, to assure that
@@ -36,26 +45,26 @@ Dots::print (SCM d)
 
       /*
 	TODO: this should  be handled by side-position padding.
-       */
-      mol = Lookup::blank (Box (Interval (0,0),
-				Interval (0,0)));
-  
-      for (int i = ly_scm2int (c); i--;)
+      */
+      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, 0);
+	  d.translate_axis (2 * dw, X_AXIS);
+	  mol.add_at_edge (X_AXIS, RIGHT, d, dw);
 	}
     }
   return mol.smobbed_copy ();
 }
 
-
-
-
-ADD_INTERFACE (Dots, "dots-interface",
+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.",
-	       "direction dot-count");
-
 
+	       /* properties */
+	       "direction "
+	       "dot-count "
+	       "style "
+	       );