lyric-extender.cc -- implement Lyric_extender
source file of the GNU LilyPond music typesetter
- (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2007 Jan Nieuwenhuizen <janneke@gnu.org>
Han-Wen Nienhuys
*/
#include "lyric-extender.hh"
-#include <math.h>
-
+#include "spanner.hh"
+#include "item.hh"
#include "warn.hh"
#include "lookup.hh"
-#include "paper-column.hh"
#include "output-def.hh"
#include "note-head.hh"
-#include "group-interface.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);
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;
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<Grob> heads (extract_grob_array (me, ly_symbol2scm ("heads")));
+ Real sl = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
+
+ extract_grob_set (me, "heads", heads);
if (!heads.size ())
return SCM_EOL;
= 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;
+ 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 = 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 = 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",
+ADD_INTERFACE (Lyric_extender,
"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");
+
+ "heads "
+ "left-padding "
+ "next "
+ "right-padding "
+ "thickness "
+ );