X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fself-alignment-interface.cc;h=bdb2854fd45daf711679571b85d69f5b606324b0;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=0c7215233338ebb32c277e2af1a2c88ec154c216;hpb=4bb29573149a0ffa1f881c5e38a0fe68e9e76b67;p=lilypond.git diff --git a/lily/self-alignment-interface.cc b/lily/self-alignment-interface.cc index 0c72152333..bdb2854fd4 100644 --- a/lily/self-alignment-interface.cc +++ b/lily/self-alignment-interface.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2004--2011 Han-Wen Nienhuys + Copyright (C) 2004--2015 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 @@ -20,44 +20,47 @@ #include "self-alignment-interface.hh" #include "grob.hh" +#include "note-column.hh" #include "paper-column.hh" +#include "pointer-group-interface.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); + return aligned_on_self (Grob::unsmob (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); + return aligned_on_self (Grob::unsmob (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)); + return aligned_on_self (Grob::unsmob (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)); + SCM align = (a == X_AXIS) + ? me->get_property ("self-alignment-X") + : me->get_property ("self-alignment-Y"); 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 + // Empty extent doesn't mean an error - we simply don't align such grobs. + // However, empty extent and non-empty stencil would be suspicious. + if (!ext.is_empty ()) return scm_from_double (- ext.linear_combination (scm_to_double (align))); + else if (me->get_stencil ()) + warning (me->name () + " has empty extent and non-empty stencil."); } return scm_from_double (0.0); } @@ -72,81 +75,93 @@ 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); + return centered_on_object (Grob::unsmob (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); + return centered_on_object (Grob::unsmob (smob)->get_parent (Y_AXIS), Y_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); + return aligned_on_parent (Grob::unsmob (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); + return aligned_on_parent (Grob::unsmob (smob), Y_AXIS); } SCM Self_alignment_interface::aligned_on_parent (Grob *me, Axis a) { Grob *him = me->get_parent (a); + Interval he; if (Paper_column::has_interface (him)) - return scm_from_double (0.0); + /* + PaperColumn extents aren't reliable (they depend on size and alignment + of PaperColumn's children), so we align on NoteColumn instead. + This happens e.g. for lyrics without associatedVoice. + */ + he = Paper_column::get_interface_extent + (him, ly_symbol2scm ("note-column-interface"), a); + else + { + if (to_boolean (me->get_property ("X-align-on-main-noteheads")) + && Note_column::has_interface (him)) + he = Note_column::calc_main_extent(him); + else + he = him->extent (him, a); + } - Interval he = him->extent (him, a); + SCM self_align = (a == X_AXIS) + ? me->get_property ("self-alignment-X") + : me->get_property ("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)); + SCM par_align = (a == X_AXIS) + ? me->get_property ("parent-alignment-X") + : me->get_property ("parent-alignment-Y"); - if (!scm_is_number (align_prop)) - return scm_from_int (0); + if (par_align == SCM_EOL) + par_align = self_align; 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); + if (scm_is_number (self_align)) + { + // Empty extent doesn't mean an error - we simply don't align such grobs. + // However, empty extent and non-empty stencil would be suspicious. + if (!ext.is_empty ()) + x -= ext.linear_combination (scm_to_double (self_align)); + else if (me->get_stencil ()) + warning (me->name () + " has empty extent and non-empty stencil."); + } - return scm_from_double (x); -} + if (scm_is_number (par_align)) + { + // See comment above. + if (!he.is_empty ()) + x += he.linear_combination (scm_to_double (par_align)); + else if (him->get_stencil ()) + warning (him->name () + " has empty extent and non-empty stencil."); + } -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); + return scm_from_double (x); } void -Self_alignment_interface::set_align_self (Grob *me, Axis a) +Self_alignment_interface::set_aligned_on_parent (Grob *me, Axis a) { add_offset_callback (me, - (a == X_AXIS) ? x_aligned_on_self_proc : y_aligned_on_self_proc, + (a == X_AXIS) ? aligned_on_x_parent_proc : aligned_on_y_parent_proc, a); } @@ -165,6 +180,9 @@ ADD_INTERFACE (Self_alignment_interface, "@end table\n", /* properties */ + "parent-alignment-X " + "parent-alignment-Y " "self-alignment-X " "self-alignment-Y " + "X-align-on-main-noteheads " );