From 62082063199a687f9943ac1e058296816463b175 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 20 Apr 2004 22:29:47 +0000 Subject: [PATCH] *** empty log message *** --- lily/self-aligment-interface.cc | 75 ++++++++++++++------------------- 1 file changed, 31 insertions(+), 44 deletions(-) diff --git a/lily/self-aligment-interface.cc b/lily/self-aligment-interface.cc index 870d077d6d..2701772381 100644 --- a/lily/self-aligment-interface.cc +++ b/lily/self-aligment-interface.cc @@ -1,104 +1,92 @@ +/* + self-alignment-interface.cc + + source file of the GNU LilyPond music typesetter + + (c) 2004 Han-Wen Nienhuys +*/ + #include "self-alignment-interface.hh" #include "warn.hh" -/* - Position centered on parent. - */ -MAKE_SCHEME_CALLBACK (Self_alignment_interface,centered_on_parent,2); +/* Position centered on parent. */ +MAKE_SCHEME_CALLBACK (Self_alignment_interface, centered_on_parent, 2); SCM Self_alignment_interface::centered_on_parent (SCM element_smob, SCM axis) { Grob *me = unsmob_grob (element_smob); Axis a = (Axis) ly_scm2int (axis); Grob *him = me->get_parent (a); - Interval he = him->extent (him,a); + Interval he = him->extent (him, a); return scm_make_real (he.is_empty () ? 0.0 : he.center ()); } -MAKE_SCHEME_CALLBACK (Self_alignment_interface,aligned_on_parent,2); +MAKE_SCHEME_CALLBACK (Self_alignment_interface, aligned_on_parent, 2); SCM Self_alignment_interface::aligned_on_parent (SCM element_smob, SCM axis) { Grob *me = unsmob_grob (element_smob); Axis a = (Axis) ly_scm2int (axis); Grob *him = me->get_parent (a); - Interval he = him->extent (him,a); + Interval he = him->extent (him, a); - SCM sym= (a == X_AXIS) ? ly_symbol2scm ("self-alignment-X"): ly_symbol2scm ("self-alignment-Y"); + SCM sym= (a == X_AXIS) ? ly_symbol2scm ("self-alignment-X") + : ly_symbol2scm ("self-alignment-Y"); SCM align_prop (me->internal_get_property (sym)); if (!ly_c_number_p (align_prop)) return scm_int2num (0); Real x = 0.0; - Real align = ly_scm2double (align_prop); - Interval ext (me->extent (me,a)); + Interval ext (me->extent (me, a)); if (ext.is_empty ()) - { - programming_error ("I'm empty. Can't align on self"); - - } + programming_error ("I'm empty. Can't align on self"); else x -= ext.linear_combination (align) ; if (!he.is_empty ()) - { - x += he.linear_combination (align); - } + x += he.linear_combination (align); return scm_make_real (x); } -/* - Position centered on parent. - */ -MAKE_SCHEME_CALLBACK (Self_alignment_interface,centered_on_other_axis_parent,2); +/* Position centered on parent. */ +MAKE_SCHEME_CALLBACK (Self_alignment_interface, centered_on_other_axis_parent, 2); SCM -Self_alignment_interface::centered_on_other_axis_parent (SCM element_smob, +Self_alignment_interface::centered_on_other_axis_parent (SCM element_smob, SCM axis) { Grob *me = unsmob_grob (element_smob); Axis a = (Axis) ly_scm2int (axis); Grob *him = me->get_parent (other_axis (a)); - Interval he = him->extent (him,a); + Interval he = him->extent (him, a); return scm_make_real (he.is_empty () ? 0.0 : he.center ()); } - - - -/** - callback that centers the element on itself - - Requires that self-alignment-{X,Y} be set. - */ -MAKE_SCHEME_CALLBACK (Self_alignment_interface,aligned_on_self,2); +/** callback that centers the element on itself + Requires that self-alignment-{X, Y} be set. */ +MAKE_SCHEME_CALLBACK (Self_alignment_interface, aligned_on_self, 2); SCM Self_alignment_interface::aligned_on_self (SCM element_smob, SCM axis) { Grob *me = unsmob_grob (element_smob); Axis a = (Axis) ly_scm2int (axis); - SCM sym= (a == X_AXIS) ? ly_symbol2scm ("self-alignment-X"): ly_symbol2scm ("self-alignment-Y"); + SCM sym= (a == X_AXIS) ? ly_symbol2scm ("self-alignment-X") + : ly_symbol2scm ("self-alignment-Y"); SCM align (me->internal_get_property (sym)); if (ly_c_number_p (align)) { - Interval ext (me->extent (me,a)); - + Interval ext (me->extent (me, a)); if (ext.is_empty ()) - { - programming_error ("I'm empty. Can't align on self"); - return scm_make_real (0.0); - } + programming_error ("I'm empty. Can't align on self"); else - { - return scm_make_real (- ext.linear_combination (ly_scm2double (align))); - } + return scm_make_real (- ext.linear_combination (ly_scm2double (align))); } return scm_make_real (0.0); } @@ -117,7 +105,6 @@ ADD_INTERFACE (Self_alignment_interface, "self-alignment-interface", " extent of the parent \n" "@item Self_alignment_interface::centered_on_other_axis_parent\n" " For X-axis, center on the Y-parent, and vice versa.\n " - "@end table\n" - , + "@end table\n", "self-alignment-X self-alignment-Y"); -- 2.39.2