source file of the GNU LilyPond music typesetter
- (c) 1998--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "side-position-interface.hh"
#include "note-head.hh"
#include "warn.hh"
-#include "warn.hh"
-#include "dimensions.hh"
+#include "main.hh"
#include "staff-symbol-referencer.hh"
#include "pointer-group-interface.hh"
#include "directional-element-interface.hh"
dim.unite (staff_extents);
}
- for (int i = 0; i < support.size (); i++)
+ for (vsize i = 0; i < support.size (); i++)
{
Grob *e = support[i];
if (e)
/* FIXME: 1000 should relate to paper size. */
if (fabs (total_off) > 1000)
{
- String msg
- = String_convert::form_string ("Improbable offset for grob %s: %f%s",
- me->name ().to_str0 (), total_off,
- INTERNAL_UNIT);
+ string msg
+ = String_convert::form_string ("Improbable offset for grob %s: %f",
+ me->name ().c_str (), total_off);
programming_error (msg);
+ if (strict_infinity_checking)
+ scm_misc_error (__FUNCTION__, "Improbable offset.", SCM_EOL);
}
return scm_from_double (total_off);
}
}
SCM
-Side_position_interface::aligned_side (Grob*me, Axis a)
+Side_position_interface::aligned_side (Grob *me, Axis a)
{
Direction dir = get_grob_direction (me);
|| (Note_head::has_interface (head)
&& sign (Staff_symbol_referencer::get_position (head)) == - dir))
{
- o += dir *(rounded - position) * 0.5 * ss;
- if (Staff_symbol_referencer::on_staffline (me, int (rounded)))
+ o += (rounded - position) * 0.5 * ss;
+ if (Staff_symbol_referencer::on_line (me, int (rounded)))
o += dir * 0.5 * ss;
}
}
if (scm_is_number (me->get_property ("side-axis")))
return Axis (scm_to_int (me->get_property ("side-axis")));
- programming_error ("side-axis not set.");
+ me->programming_error ("side-axis not set.");
return NO_AXES;
}
"direction-source "
"minimum-space "
"padding "
+ "quantize-position "
"side-axis "
"side-relative-direction "
"side-support-elements "
"slur-padding "
"staff-padding "
- "quantize-position "
);