source file of the GNU LilyPond music typesetter
- (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "dots.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 (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
/*
TODO: this should be handled by side-position padding.
- */
- mol = Lookup::blank (Box (Interval (0,0),
- Interval (0,0)));
-
+ */
+ 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,
+ "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.",
-
-
-ADD_INTERFACE (Dots, "dots-interface",
- "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 "
+ );