source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "dots.hh"
#include "item.hh"
#include "molecule.hh"
#include "paper-def.hh"
+#include "font-interface.hh"
#include "lookup.hh"
#include "staff-symbol-referencer.hh"
#include "directional-element-interface.hh"
-MAKE_SCHEME_CALLBACK(Dots,quantised_position_callback,2);
+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);
+ Grob *me = unsmob_grob (element_smob);
Axis a = (Axis) gh_scm2int (axis);
assert (a == Y_AXIS);
- SCM d= me->get_elt_property ("dot-count");
+ SCM d= me->get_grob_property ("dot-count");
if (gh_number_p (d) && gh_scm2int (d))
{
if (!Directional_element_interface::get (me))
return gh_double2scm (Staff_symbol_referencer::staff_space (me) / 2.0 * Directional_element_interface::get (me));
}
- return gh_double2scm (0.0);
+ 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);
- Molecule mol (sc->lookup_l ()->blank (Box (Interval (0,0),
- Interval (0,0))));
+ Grob *sc = unsmob_grob (d);
+ Molecule mol;
+
+ SCM c = sc->get_grob_property ("dot-count");
- SCM c = sc->get_elt_property ("dot-count");
if (gh_number_p (c))
{
- Molecule d = sc->lookup_l ()->afm_find (String ("dots-dot"));
-
+ Molecule d = Font_interface::get_default_font (sc)->find_by_name (String ("dots-dot"));
Real dw = d.extent (X_AXIS).length ();
- d.translate_axis (-dw, X_AXIS);
-
-
- for (int i = gh_scm2int (c); i--; )
+
+
+ /*
+ 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--;)
{
d.translate_axis (2*dw,X_AXIS);
- mol.add_molecule (d);
+ mol.add_at_edge (X_AXIS, RIGHT, d, dw);
}
}
- return mol.create_scheme ();
+ return mol.smobbed_copy ();
}