X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-extender.cc;h=5e254b45ee3a89f9d56f70c4338e97c909662d84;hb=8cab78caa0db1ba14f2e52e4c1ddbb541ea0e5cb;hp=97a0acfebc4bda860d498006eb677e2ea4fc50d1;hpb=81f1a254d08cbde22d0bac2b366e199a3efebd30;p=lilypond.git diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc index 97a0acfebc..5e254b45ee 100644 --- a/lily/lyric-extender.cc +++ b/lily/lyric-extender.cc @@ -2,58 +2,52 @@ lyric-extender.cc -- implement Lyric_extender source file of the GNU LilyPond music typesetter - (c) 1998--2004 Jan Nieuwenhuizen + (c) 1998--2009 Jan Nieuwenhuizen Han-Wen Nienhuys */ -#include +#include "lyric-extender.hh" -#include "box.hh" +#include "system.hh" +#include "item.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" -bool -Lyric_extender::is_visible (Grob *gr) +MAKE_SCHEME_CALLBACK (Lyric_extender, print, 1); +SCM +Lyric_extender::print (SCM smob) { - Spanner *me = dynamic_cast (gr); + Spanner *me = unsmob_spanner (smob); + Item *left_edge = me->get_bound (LEFT); + Item *right_text = unsmob_item (me->get_object ("next")); - SCM heads = me->get_property ("heads"); - int il = scm_ilength (heads); - return il != 0; -} + Grob *common = left_edge; -MAKE_SCHEME_CALLBACK (Lyric_extender, print, 1) -SCM -Lyric_extender::print (SCM smob) -{ - Spanner *me = unsmob_spanner (smob); - Item *le = me->get_bound (LEFT); - Item *ri = me->get_bound (RIGHT); - Grob *common = le->common_refpoint (ri, X_AXIS); + if (right_text) + common = common->common_refpoint (right_text, X_AXIS); - Real sl = me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness")); + 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")); - Link_array heads (Pointer_group_interface__extract_grobs (me, (Grob*)0, - "heads")); + extract_grob_set (me, "heads", heads); - if (!heads.size () && ri->break_status_dir () == CENTER) + if (!heads.size ()) return SCM_EOL; common = common_refpoint_of_array (heads, common, X_AXIS); - + Real left_point = 0.0; - if (le->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface"))) - left_point = le->extent (common, X_AXIS)[RIGHT]; + 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 = le->extent (common, X_AXIS)[RIGHT]; + left_point = left_edge->extent (common, X_AXIS)[RIGHT]; if (isinf (left_point)) return SCM_EOL; @@ -62,50 +56,47 @@ 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)); - Spanner *orig = dynamic_cast (me->original_); - bool last_line = orig - && (me->get_break_index () == orig->broken_intos_.size () - 2) - && !Lyric_extender::is_visible (orig->broken_intos_.top ()); + right_point = min (right_point, me->get_system ()->get_bound (RIGHT)->relative_coordinate (common, X_AXIS)); 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 (ri->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface"))) - right_point = right_point extent (common, X_AXIS)[LEFT] - pad); - else if (Note_head::has_interface (ri)) - ; - else if (!last_line) - /* run to end of line. */ - right_point = right_point >? (ri->extent (common, X_AXIS)[LEFT] - pad); - - if (isinf (right_point)) - { - programming_error ("Right point of extender not defined?"); - right_point = ri->relative_coordinate (common, X_AXIS); - } + 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])); - left_point += pad; + /* 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)); + + 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", - "The extender is a simple line at the baseline of the lyric " - " that helps show the length of a melissima (tied/slurred note).", - "thickness heads"); +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 " + );