X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fself-alignment-interface.cc;h=27800679701299f0ec4f33eef5eee748a44ca3c9;hb=5bbfc22fce036b9b69df5e420de93e11da23c05e;hp=ff2b5bfd59ed3bea08a0d77335111f4427091d3f;hpb=32bbd3a473244d255f8b713516c008a5d3ec6cb4;p=lilypond.git diff --git a/lily/self-alignment-interface.cc b/lily/self-alignment-interface.cc index ff2b5bfd59..2780067970 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--2012 Han-Wen Nienhuys + Copyright (C) 2004--2014 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 @@ -19,10 +19,7 @@ #include "self-alignment-interface.hh" -#include "directional-element-interface.hh" #include "grob.hh" -#include "grob-array.hh" -#include "interval-minefield.hh" #include "note-column.hh" #include "paper-column.hh" #include "pointer-group-interface.hh" @@ -32,21 +29,21 @@ 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 @@ -59,8 +56,12 @@ Self_alignment_interface::aligned_on_self (Grob *me, Axis a, bool pure, int star if (scm_is_number (align)) { Interval ext (me->maybe_pure_extent (me, a, pure, start, end)); + // 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); } @@ -75,66 +76,51 @@ 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_note_columns, 1); -SCM -Self_alignment_interface::centered_on_note_columns (SCM smob) -{ - Item *it = unsmob_item (smob)->get_column (); - if (!it) - return scm_from_double (0.0); - - extract_grob_set (it, "elements", elts); - vector ncs; - Interval centers; - for (vsize i = 0; i < elts.size (); i++) - if (Note_column::has_interface (elts[i])) - centers.add_point (scm_to_double (centered_on_object (elts[i], X_AXIS))); - - if (centers.is_empty ()) - return scm_from_double (0.0); - - return scm_from_double (centers.center ()); + 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); - - Interval he = him->extent (him, a); + /* + 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 (ly_scm2bool(me->internal_get_property (ly_symbol2scm ("X-align-on-main-noteheads"))) + && Note_column::has_interface (him)) + he = Note_column::calc_main_heads_extent(him); + else + he = him->extent (him, a); + } SCM sym = (a == X_AXIS) ? ly_symbol2scm ("self-alignment-X") : ly_symbol2scm ("self-alignment-Y"); @@ -147,116 +133,28 @@ Self_alignment_interface::aligned_on_parent (Grob *me, Axis a) 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 + + // 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 (align); + else if (me->get_stencil ()) + warning (me->name () + " has empty extent and non-empty stencil."); + // See comment above. if (!he.is_empty ()) x += he.linear_combination (align); + else if (him->get_stencil ()) + warning (him->name () + " has empty extent and non-empty stencil."); return scm_from_double (x); } -MAKE_SCHEME_CALLBACK (Self_alignment_interface, avoid_x_colliding_grobs, 2); -SCM -Self_alignment_interface::avoid_x_colliding_grobs (SCM smob, SCM o) -{ - SCM avoided = avoid_colliding_grobs (unsmob_grob (smob), X_AXIS, robust_scm2double (o, 0.0)); - return scm_is_null (avoided) ? o : avoided; -} - -MAKE_SCHEME_CALLBACK (Self_alignment_interface, x_colliding_grobs, 1); -SCM -Self_alignment_interface::x_colliding_grobs (SCM smob) -{ - Grob *me = unsmob_grob (smob); - extract_grob_set (me, "potential-X-colliding-grobs", pot); - vector act; - Direction d = get_grob_direction (me->get_parent (Y_AXIS)); - for (vsize i = 0; i < pot.size (); i++) - if (d == get_grob_direction (pot[i]) - && to_boolean (pot[i]->get_property ("cross-staff"))) - act.push_back (pot[i]); - - SCM grobs_scm = Grob_array::make_array (); - unsmob_grob_array (grobs_scm)->set_array (act); - - return grobs_scm; -} - -SCM -Self_alignment_interface::avoid_colliding_grobs (Grob *me, Axis a, Real offset) -{ - extract_grob_set (me, a == X_AXIS ? "X-colliding-grobs" : "Y-colliding-grobs", colls); - if (!colls.size ()) - return SCM_EOL; - vector ivs; - - Item *refp = dynamic_cast (common_refpoint_of_array (colls, me, a)); - if (!refp) - return SCM_EOL; - - Interval iv = me->extent (me, a) + offset; - for (vsize i = 0; i < colls.size (); i++) - { - int my_vai = Grob::get_vertical_axis_group_index (colls[i]); - Direction dir = get_grob_direction (colls[i]); - // if coll is cross staff but extremal and pointing in the - // direction of the extrema, we don't take it into consideration - if (Grob *beam = unsmob_grob (colls[i]->get_object ("beam"))) - { - Interval_t vais; - extract_grob_set (beam, "normal-stems", stems); - for (vsize j = 0; j < stems.size (); j++) - vais.add_point (Grob::get_vertical_axis_group_index (stems[j])); - // ugh...up and down are different for VerticalAxisGroup order... - if ((my_vai == vais[DOWN] && dir == UP) - || (my_vai == vais[UP] && dir == DOWN)) - continue; - } - ivs.push_back (colls[i]->extent (refp, a)); - } - - Interval_minefield minefield (Interval (iv.center (), iv.center ()), iv.length ()); - for (vsize i = 0; i < ivs.size (); i++) - minefield.add_forbidden_interval (ivs[i]); - minefield.solve (); - Interval pos = minefield.feasible_placements (); - - if (pos[LEFT] == pos[RIGHT]) - return SCM_EOL; - - Direction col_dir = ((abs (pos[LEFT] - iv.center ()) - + robust_scm2double (me->get_property ("collision-bias"), 0.0)) - > abs (pos[RIGHT] - iv.center ())) - ? RIGHT - : LEFT; - - return scm_from_double ((pos[col_dir] - (iv.length () / 2) - + col_dir - * robust_scm2double (me->get_property ("collision-padding"), 0.0))); -} - -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::avoid_x_collisions (Grob *me) -{ - chain_offset_callback (me, avoid_x_colliding_grobs_proc, X_AXIS); -} - 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); } @@ -275,11 +173,7 @@ ADD_INTERFACE (Self_alignment_interface, "@end table\n", /* properties */ - "collision-bias " - "collision-padding " - "potential-X-colliding-grobs " "self-alignment-X " "self-alignment-Y " - "X-colliding-grobs " - "Y-colliding-grobs " + "X-align-on-main-noteheads " );