source file of the GNU LilyPond music typesetter
- (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2008 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"
-MAKE_SCHEME_CALLBACK (Dots,quantised_position_callback,2);
+MAKE_SCHEME_CALLBACK (Dots, print, 1);
SCM
-Dots::quantised_position_callback (SCM element_smob, SCM axis)
-{
- Grob *me = unsmob_grob (element_smob);
- Axis a = (Axis) gh_scm2int (axis);
- assert (a == Y_AXIS);
-
- SCM d= me->get_grob_property ("dot-count");
- if (gh_number_p (d) && gh_scm2int (d))
- {
- if (!Directional_element_interface::get (me))
- Directional_element_interface::set (me, UP);
-
- if (Staff_symbol_referencer::on_staffline (me))
- return gh_double2scm (Staff_symbol_referencer::staff_space (me) / 2.0 * Directional_element_interface::get (me));
- }
-
- return gh_double2scm (0.0);
-}
-
-
-MAKE_SCHEME_CALLBACK (Dots,brew_molecule,1);
-SCM
-Dots::brew_molecule (SCM d)
+Dots::print (SCM d)
{
Grob *sc = unsmob_grob (d);
- Molecule mol;
-
- SCM c = sc->get_grob_property ("dot-count");
+ Stencil mol;
+
+ SCM c = sc->get_property ("dot-count");
- if (gh_number_p (c))
+ if (scm_is_number (c))
{
- Molecule 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
side-positioning doth not cancel the left-most padding. */
- mol = Lookup::blank (Box (Interval (0,0),
- Interval (0,0)));
-
- 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 = scm_to_int (c); i--;)
{
- d.translate_axis (2*dw,X_AXIS);
+ 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",
- "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");
-
-
+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 "
+ );