*/
#include "dots.hh"
+#include "item.hh"
#include "molecule.hh"
#include "paper-def.hh"
#include "lookup.hh"
#include "staff-symbol-referencer.hh"
#include "directional-element-interface.hh"
-Dots::Dots (SCM s)
- : Item (s)
-{
-}
-GLUE_SCORE_ELEMENT(Dots,after_line_breaking);
-SCM
-Dots::member_after_line_breaking ()
+Real
+Dots::quantised_position_callback (Score_element * me, Axis a)
{
- SCM d= get_elt_property ("dot-count");
+ assert (a == Y_AXIS);
+
+ SCM d= me->get_elt_property ("dot-count");
if (gh_number_p (d) && gh_scm2int (d))
{
- if (!Directional_element_interface (this).get ())
- Directional_element_interface (this).set (UP);
+ if (!Directional_element_interface::get (me))
+ Directional_element_interface::set (me, UP);
- Staff_symbol_referencer_interface si (this);
- int p = int (si.position_f ());
- if (!(p % 2))
- si.set_position (p + Directional_element_interface (this).get ());
+ if (Staff_symbol_referencer::on_staffline (me))
+ return Staff_symbol_referencer::staff_space (me) / 2.0 * Directional_element_interface::get (me);
}
- return SCM_UNDEFINED;
-
+ return 0.0;
}
-MAKE_SCHEME_SCORE_ELEMENT_CALLBACK(Dots,brew_molecule);
+MAKE_SCHEME_CALLBACK(Dots,brew_molecule);
SCM
Dots::brew_molecule (SCM d)
{