X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-extender.cc;h=1ed47703f88eb3a3625081cd0a71171a923fbbed;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=047b04f0664c53e88e8333419bd135323ee5a555;hpb=a6bd229f7fe1dc4a03478e14ccc0c0c66b225061;p=lilypond.git diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc index 047b04f066..1ed47703f8 100644 --- a/lily/lyric-extender.cc +++ b/lily/lyric-extender.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1998--2010 Jan Nieuwenhuizen + Copyright (C) 1998--2014 Jan Nieuwenhuizen Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify @@ -43,7 +43,7 @@ Lyric_extender::print (SCM smob) common = common->common_refpoint (me->get_bound (RIGHT), X_AXIS); common = common->common_refpoint (me->get_system (), X_AXIS); - + Real sl = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness")); extract_grob_set (me, "heads", heads); @@ -71,13 +71,13 @@ Lyric_extender::print (SCM smob) = left_point + (robust_scm2double (minlen, 0)); 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)); + 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])); @@ -93,22 +93,22 @@ Lyric_extender::print (SCM smob) return SCM_EOL; Stencil mol (Lookup::round_filled_box (Box (Interval (0, w), - Interval (0, h)), - 0.8 * h)); + Interval (0, h)), + 0.8 * h)); mol.translate_axis (left_point - me->relative_coordinate (common, X_AXIS), - 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 " - ); + "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 " + );