X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-extender.cc;h=281296c506157dc570f3cb93d95fc5d9cb649f2a;hb=b98d183aed598bcfe1d79827a724e60025f62ee2;hp=51fc9d4b1aac934858e1d7e54d7a276d2a4773f6;hpb=34881554afeaf03a55a3a983caf9cfeaaf3ea060;p=lilypond.git diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc index 51fc9d4b1a..281296c506 100644 --- a/lily/lyric-extender.cc +++ b/lily/lyric-extender.cc @@ -2,47 +2,43 @@ lyric-extender.cc -- implement Lyric_extender source file of the GNU LilyPond music typesetter - (c) 1998--2004 Jan Nieuwenhuizen + (c) 1998--2006 Jan Nieuwenhuizen Han-Wen Nienhuys */ -#include +#include "lyric-extender.hh" + -#include "box.hh" #include "warn.hh" #include "lookup.hh" -#include "stencil.hh" #include "paper-column.hh" #include "output-def.hh" -#include "lyric-extender.hh" #include "note-head.hh" -#include "group-interface.hh" - - +#include "pointer-group-interface.hh" MAKE_SCHEME_CALLBACK (Lyric_extender, print, 1) -SCM -Lyric_extender::print (SCM smob) + SCM +Lyric_extender::print (SCM smob) { Spanner *me = unsmob_spanner (smob); Item *left_edge = me->get_bound (LEFT); - Item *right_text = unsmob_item (me->get_property ("next")); - + Item *right_text = unsmob_item (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); - Real sl = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness")); - Link_array heads (Pointer_group_interface__extract_grobs (me, (Grob*)0, - "heads")); + Real sl = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness")); + + extract_grob_set (me, "heads", heads); if (!heads.size ()) return SCM_EOL; 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]; @@ -58,37 +54,36 @@ Lyric_extender::print (SCM smob) 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)); + = left_point + (robust_scm2double (minlen, 0)); if (heads.size ()) - right_point = right_point >? heads.top ()->extent (common, X_AXIS)[RIGHT]; + right_point = max (right_point, heads.back ()->extent (common, X_AXIS)[RIGHT]); Real h = sl * robust_scm2double (me->get_property ("thickness"), 0); Real pad = 2* h; if (right_text) - right_point = right_point ? (robust_relative_extent (me->get_bound (RIGHT), common, X_AXIS)[LEFT] - pad); - - left_point += pad; + if (me->get_bound (RIGHT)->break_status_dir ()) + right_point = max (right_point, (robust_relative_extent (me->get_bound (RIGHT), common, X_AXIS)[LEFT] - pad)); + left_point += pad; 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)); + + 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,"lyric-extender-interface", +ADD_INTERFACE (Lyric_extender, "lyric-extender-interface", "The extender is a simple line at the baseline of the lyric " "that helps show the length of a melissima (tied/slurred note).", "next thickness heads");