X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-extender.cc;h=8afe2c5569200d48a8a4caec55c460e0af91ee8f;hb=da68c81eba74d8a968e0599e7de6c363f84ed3d8;hp=879fa63772e81f72b36b0f0d80cf21c6f2b0415b;hpb=910faf0de802844cdafde781ce42af71986297bc;p=lilypond.git diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc index 879fa63772..8afe2c5569 100644 --- a/lily/lyric-extender.cc +++ b/lily/lyric-extender.cc @@ -1,80 +1,114 @@ /* - lyric-extender.cc -- implement Lyric_extender - source file of the GNU LilyPond music typesetter + This file is part of LilyPond, the GNU music typesetter. - (c) 1998--2000 Jan Nieuwenhuizen + Copyright (C) 1998--2015 Jan Nieuwenhuizen + 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 . */ -/* - TODO: too complicated implementation. Why the dx_drul?. - */ +#include "lyric-extender.hh" -# -#include "dimension-cache.hh" -#include "box.hh" -#include "debug.hh" +#include "system.hh" +#include "item.hh" +#include "warn.hh" #include "lookup.hh" -#include "molecule.hh" -#include "paper-column.hh" -#include "paper-def.hh" -#include "extender-spanner.hh" - -Lyric_extender::Lyric_extender (SCM s) - : Spanner (s) +#include "output-def.hh" +#include "note-head.hh" +#include "pointer-group-interface.hh" +MAKE_SCHEME_CALLBACK (Lyric_extender, print, 1); +SCM +Lyric_extender::print (SCM smob) { - dx_f_drul_[LEFT] = dx_f_drul_[RIGHT] = 0.0; - set_extent_callback (Score_element::point_dimension_callback, Y_AXIS); -} + Spanner *me = unsmob (smob); + Item *left_edge = me->get_bound (LEFT); + Item *right_text = unsmob (me->get_object ("next")); + Grob *common = left_edge; + if (right_text) + common = common->common_refpoint (right_text, X_AXIS); + common = common->common_refpoint (me->get_bound (RIGHT), X_AXIS); + common = common->common_refpoint (me->get_system (), X_AXIS); -MAKE_SCHEME_SCORE_ELEMENT_CALLBACKS(Lyric_extender) -Molecule -Lyric_extender::do_brew_molecule () const -{ - Molecule mol; + Real sl = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness")); - Real w = spanner_length (); - - w += (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT]); - Real h = paper_l ()->get_var ("extender_height"); - Molecule a = lookup_l ()->filledbox ( Box (Interval (0,w), Interval (0,h))); - a.translate (Offset (dx_f_drul_[LEFT], 0)); + extract_grob_set (me, "heads", heads); - mol.add_molecule (a); + if (!heads.size ()) + return SCM_EOL; - return mol; -} + common = common_refpoint_of_array (heads, common, X_AXIS); + Real left_point = 0.0; + if (left_edge->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface"))) + left_point = left_edge->extent (common, X_AXIS)[RIGHT]; + else if (heads.size ()) + left_point = heads[0]->extent (common, X_AXIS)[LEFT]; + else + left_point = left_edge->extent (common, X_AXIS)[RIGHT]; + if (isinf (left_point)) + return SCM_EOL; -void -Lyric_extender::after_line_breaking () -{ - // UGH - Real gap = paper_l ()->get_var ("interline"); - - Direction d = LEFT; - do - { - Item* t = get_bound (d) - ? get_bound (d) : get_bound ((Direction)-d); - if (d == LEFT) - dx_f_drul_[d] += t->extent (X_AXIS).length (); - else - dx_f_drul_[d] -= d * gap / 2; - } - while (flip(&d) != LEFT); -} + /* It seems that short extenders are even lengthened to go past the + note head, but haven't found a pattern in it yet. --hwn 1/1/04 */ + SCM minlen = me->get_property ("minimum-length"); + Real right_point + = left_point + (robust_scm2double (minlen, 0)); - -void -Lyric_extender::set_textitem (Direction d, Item* textitem_l) -{ - set_bound (d, textitem_l); - add_dependency (textitem_l); -} + right_point = min (right_point, me->get_system ()->get_bound (RIGHT)->relative_coordinate (common, X_AXIS)); + + if (heads.size ()) + right_point = max (right_point, heads.back ()->extent (common, X_AXIS)[RIGHT]); + + Real h = sl * robust_scm2double (me->get_property ("thickness"), 0); + Drul_array paddings (robust_scm2double (me->get_property ("left-padding"), h), + robust_scm2double (me->get_property ("right-padding"), h)); + + if (right_text) + right_point = min (right_point, (robust_relative_extent (right_text, common, X_AXIS)[LEFT] - paddings[RIGHT])); + /* run to end of line. */ + if (me->get_bound (RIGHT)->break_status_dir ()) + right_point = max (right_point, (robust_relative_extent (me->get_bound (RIGHT), common, X_AXIS)[LEFT] - paddings[RIGHT])); + + left_point += paddings[LEFT]; + Real w = right_point - left_point; + + if (w < 1.5 * h) + return SCM_EOL; + + Stencil mol (Lookup::round_filled_box (Box (Interval (0, w), + Interval (0, h)), + 0.8 * h)); + mol.translate_axis (left_point - me->relative_coordinate (common, X_AXIS), + X_AXIS); + return mol.smobbed_copy (); +} +ADD_INTERFACE (Lyric_extender, + "The extender is a simple line at the baseline of the lyric" + " that helps show the length of a melisma (a tied or slurred" + " note).", + + /* properties */ + "heads " + "left-padding " + "next " + "right-padding " + "thickness " + );