From: Neil Puttock Date: Sun, 4 Jul 2010 14:19:34 +0000 (+0100) Subject: Fix typo in file name. X-Git-Tag: release/2.13.27-1~11 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=53c35031e3fbc8307ffbe1783c6b2975f16b27a0;p=lilypond.git Fix typo in file name. --- diff --git a/lily/self-aligment-interface.cc b/lily/self-aligment-interface.cc deleted file mode 100644 index 47607b096f..0000000000 --- a/lily/self-aligment-interface.cc +++ /dev/null @@ -1,176 +0,0 @@ -/* - This file is part of LilyPond, the GNU music typesetter. - - Copyright (C) 2004--2010 Han-Wen Nienhuys - - LilyPond is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - LilyPond is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with LilyPond. If not, see . -*/ - -#include "self-alignment-interface.hh" - -#include "warn.hh" -#include "paper-column.hh" -#include "grob.hh" - -MAKE_SCHEME_CALLBACK (Self_alignment_interface, y_aligned_on_self, 1); -SCM -Self_alignment_interface::y_aligned_on_self (SCM element) -{ - 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, false, 0, 0); -} - -MAKE_SCHEME_CALLBACK (Self_alignment_interface, pure_y_aligned_on_self, 3); -SCM -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->maybe_pure_extent (me, a, pure, start, end)); - if (ext.is_empty ()) - programming_error ("cannot align on self: empty element"); - else - return scm_from_double (- ext.linear_combination (scm_to_double (align))); - } - return scm_from_double (0.0); -} - - - -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_object (unsmob_grob (smob)->get_parent (X_AXIS), X_AXIS); -} - - -MAKE_SCHEME_CALLBACK (Self_alignment_interface, centered_on_y_parent, 1); -SCM -Self_alignment_interface::centered_on_y_parent (SCM smob) -{ - 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::x_centered_on_y_parent (SCM smob) -{ - return centered_on_object (unsmob_grob (smob)->get_parent (Y_AXIS), X_AXIS); -} - -MAKE_SCHEME_CALLBACK (Self_alignment_interface, aligned_on_x_parent,1); -SCM -Self_alignment_interface::aligned_on_x_parent (SCM smob) -{ - return aligned_on_parent (unsmob_grob (smob), X_AXIS); -} - -MAKE_SCHEME_CALLBACK (Self_alignment_interface, aligned_on_y_parent,1); -SCM -Self_alignment_interface::aligned_on_y_parent (SCM smob) -{ - return aligned_on_parent (unsmob_grob (smob), Y_AXIS); -} - -SCM -Self_alignment_interface::aligned_on_parent (Grob *me, Axis a) -{ - Grob *him = me->get_parent (a); - if (Paper_column::has_interface (him)) - return scm_from_double (0.0); - - Interval he = him->extent (him, a); - - SCM sym = (a == X_AXIS) ? ly_symbol2scm ("self-alignment-X") - : ly_symbol2scm ("self-alignment-Y"); - SCM align_prop (me->internal_get_property (sym)); - - if (!scm_is_number (align_prop)) - return scm_from_int (0); - - Real x = 0.0; - Real align = scm_to_double (align_prop); - - Interval ext (me->extent (me, a)); - if (ext.is_empty ()) - programming_error ("cannot align on self: empty element"); - else - x -= ext.linear_combination (align); - - if (!he.is_empty ()) - x += he.linear_combination (align); - - return scm_from_double (x); -} - -void -Self_alignment_interface::set_center_parent (Grob *me, Axis a) -{ - add_offset_callback (me, - (a==X_AXIS) ? centered_on_x_parent_proc : centered_on_y_parent_proc, - a); -} - -void -Self_alignment_interface::set_align_self (Grob *me, Axis a) -{ - add_offset_callback (me, - (a==X_AXIS) ? x_aligned_on_self_proc : y_aligned_on_self_proc, - a); -} - -ADD_INTERFACE (Self_alignment_interface, - "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}." - "@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" - "@end table\n", - - /* properties */ - "self-alignment-X " - "self-alignment-Y " - ); - diff --git a/lily/self-alignment-interface.cc b/lily/self-alignment-interface.cc new file mode 100644 index 0000000000..e339e8026d --- /dev/null +++ b/lily/self-alignment-interface.cc @@ -0,0 +1,171 @@ +/* + This file is part of LilyPond, the GNU music typesetter. + + Copyright (C) 2004--2010 Han-Wen Nienhuys + + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ + +#include "self-alignment-interface.hh" + +#include "grob.hh" +#include "paper-column.hh" +#include "warn.hh" + +MAKE_SCHEME_CALLBACK (Self_alignment_interface, y_aligned_on_self, 1); +SCM +Self_alignment_interface::y_aligned_on_self (SCM element) +{ + 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, false, 0, 0); +} + +MAKE_SCHEME_CALLBACK (Self_alignment_interface, pure_y_aligned_on_self, 3); +SCM +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->maybe_pure_extent (me, a, pure, start, end)); + if (ext.is_empty ()) + programming_error ("cannot align on self: empty element"); + else + return scm_from_double (- ext.linear_combination (scm_to_double (align))); + } + return scm_from_double (0.0); +} + + +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_object (unsmob_grob (smob)->get_parent (X_AXIS), X_AXIS); +} + +MAKE_SCHEME_CALLBACK (Self_alignment_interface, centered_on_y_parent, 1); +SCM +Self_alignment_interface::centered_on_y_parent (SCM smob) +{ + 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::x_centered_on_y_parent (SCM smob) +{ + return centered_on_object (unsmob_grob (smob)->get_parent (Y_AXIS), X_AXIS); +} + +MAKE_SCHEME_CALLBACK (Self_alignment_interface, aligned_on_x_parent,1); +SCM +Self_alignment_interface::aligned_on_x_parent (SCM smob) +{ + return aligned_on_parent (unsmob_grob (smob), X_AXIS); +} + +MAKE_SCHEME_CALLBACK (Self_alignment_interface, aligned_on_y_parent,1); +SCM +Self_alignment_interface::aligned_on_y_parent (SCM smob) +{ + return aligned_on_parent (unsmob_grob (smob), Y_AXIS); +} + +SCM +Self_alignment_interface::aligned_on_parent (Grob *me, Axis a) +{ + Grob *him = me->get_parent (a); + if (Paper_column::has_interface (him)) + return scm_from_double (0.0); + + Interval he = him->extent (him, a); + + SCM sym = (a == X_AXIS) ? ly_symbol2scm ("self-alignment-X") + : ly_symbol2scm ("self-alignment-Y"); + SCM align_prop (me->internal_get_property (sym)); + + if (!scm_is_number (align_prop)) + return scm_from_int (0); + + Real x = 0.0; + Real align = scm_to_double (align_prop); + + Interval ext (me->extent (me, a)); + if (ext.is_empty ()) + programming_error ("cannot align on self: empty element"); + else + x -= ext.linear_combination (align); + + if (!he.is_empty ()) + x += he.linear_combination (align); + + return scm_from_double (x); +} + +void +Self_alignment_interface::set_center_parent (Grob *me, Axis a) +{ + add_offset_callback (me, + (a == X_AXIS) ? centered_on_x_parent_proc : centered_on_y_parent_proc, + a); +} + +void +Self_alignment_interface::set_align_self (Grob *me, Axis a) +{ + add_offset_callback (me, + (a == X_AXIS) ? x_aligned_on_self_proc : y_aligned_on_self_proc, + a); +} + +ADD_INTERFACE (Self_alignment_interface, + "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}." + "@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" + "@end table\n", + + /* properties */ + "self-alignment-X " + "self-alignment-Y " + );