source file of the GNU LilyPond music typesetter
- (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "self-alignment-interface.hh"
SCM
Self_alignment_interface::y_aligned_on_self (SCM element)
{
- return aligned_on_self (unsmob_grob (element), Y_AXIS);
+ return aligned_on_self (unsmob_grob (element), Y_AXIS, false, 0, 0);
}
MAKE_SCHEME_CALLBACK (Self_alignment_interface, x_aligned_on_self, 1);
SCM
Self_alignment_interface::x_aligned_on_self (SCM element)
{
- return aligned_on_self (unsmob_grob (element), X_AXIS);
+ return aligned_on_self (unsmob_grob (element), X_AXIS, false, 0, 0);
}
+MAKE_SCHEME_CALLBACK (Self_alignment_interface, pure_y_aligned_on_self, 3);
SCM
-Self_alignment_interface::aligned_on_self (Grob *me, Axis a)
+Self_alignment_interface::pure_y_aligned_on_self (SCM smob, SCM start, SCM end)
+{
+ return aligned_on_self (unsmob_grob (smob), Y_AXIS, true, robust_scm2int (start, 0), robust_scm2int (end, INT_MAX));
+}
+
+SCM
+Self_alignment_interface::aligned_on_self (Grob *me, Axis a, bool pure, int start, int end)
{
SCM sym = (a == X_AXIS) ? ly_symbol2scm ("self-alignment-X")
: ly_symbol2scm ("self-alignment-Y");
SCM align (me->internal_get_property (sym));
if (scm_is_number (align))
{
- Interval ext (me->extent (me, a));
+ Interval ext (me->maybe_pure_extent (me, a, pure, start, end));
if (ext.is_empty ())
programming_error ("cannot align on self: empty element");
else
}
ADD_INTERFACE (Self_alignment_interface,
- "Position this object on itself and/or on its parent. To this end, the following functions "
- " are provided: \n"
- "@table @code \n"
+ "Position this object on itself and/or on its parent. To this"
+ " end, the following functions are provided:\n"
+ "\n"
+ "@table @code\n"
"@item Self_alignment_interface::[xy]_aligned_on_self\n"
- " Align self on reference point, using @code{self-alignment-X} and "
- "@code{self-alignment-Y}."
+ "Align self on reference point, using"
+ " @code{self-alignment-X} and @code{self-alignment-Y}."
"@item Self_alignment_interface::aligned_on_[xy]_parent\n"
"@item Self_alignment_interface::centered_on_[xy]_parent\n"
- " Shift the object so its own reference point is centered on the "
- " extent of the parent \n"
+ "Shift the object so its own reference point is centered on"
+ " the extent of the parent\n"
"@end table\n",
-
/* properties */
"self-alignment-X "
- "self-alignment-Y ");
+ "self-alignment-Y "
+ );