source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "dots.hh"
#include "staff-symbol-referencer.hh"
#include "directional-element-interface.hh"
-
-MAKE_SCHEME_CALLBACK(Dots,quantised_position_callback,2);
-SCM
-Dots::quantised_position_callback (SCM element_smob, SCM axis)
-{
- Score_element *me = unsmob_element (element_smob);
- Axis a = (Axis) gh_scm2int (axis);
- assert (a == Y_AXIS);
-
- SCM d= me->get_elt_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);
+MAKE_SCHEME_CALLBACK (Dots,brew_molecule,1);
SCM
Dots::brew_molecule (SCM d)
{
- Score_element *sc = unsmob_element (d);
+ Grob *sc = unsmob_grob (d);
Molecule mol;
- SCM c = sc->get_elt_property ("dot-count");
+ SCM c = sc->get_grob_property ("dot-count");
if (gh_number_p (c))
{
/*
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 = gh_scm2int (c); i--;)
{
d.translate_axis (2*dw,X_AXIS);
- mol.add_at_edge (X_AXIS, RIGHT, d, dw);
+ mol.add_at_edge (X_AXIS, RIGHT, d, dw, 0);
}
}
- return mol.create_scheme ();
+ 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");
+
+