/*
- 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--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+ Copyright (C) 1998--2011 Jan Nieuwenhuizen <janneke@gnu.org>
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 <http://www.gnu.org/licenses/>.
*/
#include "lyric-extender.hh"
-
+#include "system.hh"
+#include "item.hh"
#include "warn.hh"
#include "lookup.hh"
-#include "paper-column.hh"
#include "output-def.hh"
#include "note-head.hh"
#include "pointer-group-interface.hh"
-MAKE_SCHEME_CALLBACK (Lyric_extender, print, 1)
- SCM
+MAKE_SCHEME_CALLBACK (Lyric_extender, print, 1);
+SCM
Lyric_extender::print (SCM smob)
{
Spanner *me = unsmob_spanner (smob);
common = common->common_refpoint (right_text, X_AXIS);
common = common->common_refpoint (me->get_bound (RIGHT), X_AXIS);
- Real sl = me->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+ 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);
Real right_point
= 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.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;
+ Drul_array<Real> 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] - pad));
+ 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] - pad));
+ right_point = max (right_point, (robust_relative_extent (me->get_bound (RIGHT), common, X_AXIS)[LEFT] - paddings[RIGHT]));
- left_point += pad;
+ left_point += paddings[LEFT];
Real w = right_point - left_point;
if (w < 1.5 * h)
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).",
- "next 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 "
+ );