/*
- hyphen-spanner.cc -- implement Hyphen_spanner
+ hyphen-spanner.cc -- implement Lyric_hyphen
source file of the GNU LilyPond music typesetter
- (c) 2003--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 2003--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "lyric-hyphen.hh"
#include "output-def.hh"
#include "paper-column.hh"
#include "moment.hh"
+#include "spanner.hh"
/*
TODO: should extract hyphen dimensions or hyphen glyph from the
font.
*/
-MAKE_SCHEME_CALLBACK (Hyphen_spanner, print, 1);
+MAKE_SCHEME_CALLBACK (Lyric_hyphen, print, 1);
SCM
-Hyphen_spanner::print (SCM smob)
+Lyric_hyphen::print (SCM smob)
{
Spanner *me = unsmob_spanner (smob);
Drul_array<Item *> bounds (me->get_bound (LEFT),
}
while (flip (&d) != LEFT);
- Real lt = me->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+ Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
Real th = robust_scm2double (me->get_property ("thickness"), 1) * lt;
- Real font_size_step = robust_scm2double (ly_chain_assoc_get (ly_symbol2scm ("font-size"), chain, SCM_BOOL_F),
- 0.0);
+ Real font_size_step = robust_scm2double (me->get_property ("font-size"), 0.0);
Real h = robust_scm2double (me->get_property ("height"), 0.5)
* pow (2.0, font_size_step / 6.0);
return total.smobbed_copy ();
}
-MAKE_SCHEME_CALLBACK (Hyphen_spanner, set_spacing_rods, 1);
+MAKE_SCHEME_CALLBACK (Lyric_hyphen, set_spacing_rods, 1);
SCM
-Hyphen_spanner::set_spacing_rods (SCM smob)
+Lyric_hyphen::set_spacing_rods (SCM smob)
{
Grob *me = unsmob_grob (smob);
{
r.item_drul_[d] = sp->get_bound (d);
if (r.item_drul_[d])
- r.distance_ += r.item_drul_[d]->extent (r.item_drul_[d], X_AXIS)[-d];
+ r.distance_ += -d * r.item_drul_[d]->extent (r.item_drul_[d], X_AXIS)[-d];
}
while (flip (&d) != LEFT);
return SCM_UNSPECIFIED;
}
-ADD_INTERFACE (Hyphen_spanner, "lyric-hyphen-interface",
- "A centered hyphen is a simple line between lyrics used to divide syllables",
+ADD_INTERFACE (Lyric_hyphen,
+ "A centered hyphen is simply a line between lyrics used to"
+ " divide syllables.",
- /* props */
- "padding "
- "thickness "
- "height "
+ /* properties */
"dash-period "
- "minimum-length "
+ "height "
+ "length "
"minimum-distance "
- "length");
+ "minimum-length "
+ "padding "
+ "thickness "
+ );