source file of the GNU LilyPond music typesetter
- (c) 2004--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "self-alignment-interface.hh"
+SCM
+Self_alignment_interface::centered_on_object (Grob *him, Axis a)
+{
+ return scm_from_double (robust_relative_extent (him, him, a).center ());
+}
+
MAKE_SCHEME_CALLBACK (Self_alignment_interface, centered_on_x_parent, 1);
SCM
Self_alignment_interface::centered_on_x_parent (SCM smob)
{
- return centered_on_parent (unsmob_grob (smob), X_AXIS);
+ return centered_on_object (unsmob_grob (smob)->get_parent (X_AXIS), X_AXIS);
}
SCM
Self_alignment_interface::centered_on_y_parent (SCM smob)
{
- return centered_on_parent (unsmob_grob (smob), Y_AXIS);
+ return centered_on_object (unsmob_grob (smob)->get_parent (Y_AXIS), Y_AXIS);
}
+
+MAKE_SCHEME_CALLBACK (Self_alignment_interface, x_centered_on_y_parent, 1);
SCM
-Self_alignment_interface::centered_on_parent (Grob *me, Axis a)
+Self_alignment_interface::x_centered_on_y_parent (SCM smob)
{
- Grob *him = me->get_parent (a);
- Interval he = him->extent (him, a);
-
- return scm_from_double (he.is_empty () ? 0.0 : he.center ());
+ return centered_on_object (unsmob_grob (smob)->get_parent (Y_AXIS), X_AXIS);
}
MAKE_SCHEME_CALLBACK (Self_alignment_interface, aligned_on_x_parent,1);
/* porperties */
"self-alignment-X "
- "self-X-offset "
- "self-Y-offset "
"self-alignment-Y ");