X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-hyphen.cc;h=a871fbb843a7aa0e0a07af4d21edc7159718c1f9;hb=e3aa8429523e1fecaf2d4d22ac63c601093572ff;hp=07a069f761cdb3a0010c74f0102372d9ae9747eb;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git diff --git a/lily/lyric-hyphen.cc b/lily/lyric-hyphen.cc index 07a069f761..a871fbb843 100644 --- a/lily/lyric-hyphen.cc +++ b/lily/lyric-hyphen.cc @@ -1,9 +1,9 @@ /* - hyphen-spanner.cc -- implement Hyphen_spanner + hyphen-spanner.cc -- implement Lyric_hyphen source file of the GNU LilyPond music typesetter - (c) 2003--2006 Han-Wen Nienhuys + (c) 2003--2007 Han-Wen Nienhuys */ #include "lyric-hyphen.hh" @@ -13,15 +13,16 @@ #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 bounds (me->get_bound (LEFT), @@ -47,7 +48,7 @@ Hyphen_spanner::print (SCM smob) } 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 (me->get_property ("font-size"), 0.0); Real h = robust_scm2double (me->get_property ("height"), 0.5) @@ -102,9 +103,9 @@ Hyphen_spanner::print (SCM smob) 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); @@ -117,7 +118,7 @@ Hyphen_spanner::set_spacing_rods (SCM 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); @@ -128,15 +129,17 @@ Hyphen_spanner::set_spacing_rods (SCM smob) 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 " + );