X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-hyphen.cc;h=2c3816d1d4f1ce69afa2e68ce240c36a2055408e;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=f98d5c446f84ead7e25d9ac8429a4bf7447f559c;hpb=5d1ddaf889233f8e5c32a118f9e843e1becca2d2;p=lilypond.git diff --git a/lily/lyric-hyphen.cc b/lily/lyric-hyphen.cc index f98d5c446f..2c3816d1d4 100644 --- a/lily/lyric-hyphen.cc +++ b/lily/lyric-hyphen.cc @@ -1,36 +1,43 @@ /* - 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 + (c) 2003--2008 Han-Wen Nienhuys */ #include "lyric-hyphen.hh" -#include #include "lookup.hh" #include "output-def.hh" #include "paper-column.hh" #include "moment.hh" +#include "spanner.hh" -MAKE_SCHEME_CALLBACK (Hyphen_spanner, print, 1) -SCM -Hyphen_spanner::print (SCM smob) +/* + TODO: should extract hyphen dimensions or hyphen glyph from the + font. + */ + +MAKE_SCHEME_CALLBACK (Lyric_hyphen, print, 1); +SCM +Lyric_hyphen::print (SCM smob) { - Spanner * me = unsmob_spanner (smob); - Drul_array bounds (me->get_bound (LEFT), - me->get_bound (RIGHT)); + Spanner *me = unsmob_spanner (smob); + Drul_array bounds (me->get_bound (LEFT), + me->get_bound (RIGHT)); if (bounds[LEFT]->break_status_dir () - && Paper_column::when_mom (bounds[LEFT]) == Paper_column::when_mom (bounds[RIGHT]->get_column ())) + && (Paper_column::when_mom (bounds[LEFT]) + == Paper_column::when_mom (bounds[RIGHT]->get_column ()))) return SCM_EOL; - - Grob * common = bounds[LEFT]->common_refpoint (bounds[RIGHT], X_AXIS); + + Grob *common = bounds[LEFT]->common_refpoint (bounds[RIGHT], X_AXIS); Interval span_points; Direction d = LEFT; + Drul_array broken; do { Interval iv = bounds[d]->extent (common, X_AXIS); @@ -40,81 +47,99 @@ Hyphen_spanner::print (SCM smob) : iv[-d]; } while (flip (&d) != LEFT); - - Real lt = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness")); - Real th = robust_scm2double (me->get_property ("thickness"), 1) * lt ; - Real h = robust_scm2double (me->get_property ("height"), 0.5); + + 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) + * pow (2.0, font_size_step / 6.0); // interval? - - Real dp = robust_scm2double (me->get_property ("dash-period"), 1.0); - Real dl = robust_scm2double (me->get_property ("length"), .5 ); - if (dp < dl) - dp = 1.5 * dl; + Real dash_period = robust_scm2double (me->get_property ("dash-period"), 1.0); + Real dash_length = robust_scm2double (me->get_property ("length"), .5); + Real padding = robust_scm2double (me->get_property ("padding"), 0.1); + + if (dash_period < dash_length) + dash_period = 1.5 * dash_length; Real l = span_points.length (); - int n = int (ceil (l/dp - 0.5)); + + int n = int (ceil (l / dash_period - 0.5)); if (n <= 0) n = 1; - Real space_left = l - dl - (n-1)* dp; + if (l < dash_length + 2 * padding + && !bounds[RIGHT]->break_status_dir ()) + { + Real minimum_length = robust_scm2double (me->get_property ("minimum-length"), .3); + dash_length = max ((l - 2 * padding), minimum_length); + } + + Real space_left = l - dash_length - (n - 1) * dash_period; /* If there is not enough space, the hyphen should disappear, but not at the end of the line. - */ + */ if (space_left < 0.0 && !bounds[RIGHT]->break_status_dir ()) return SCM_EOL; - space_left = space_left >? 0.0; - - Box b (Interval (0, dl), Interval (h, h+th)); + space_left = max (space_left, 0.0); + + Box b (Interval (0, dash_length), Interval (h, h + th)); Stencil dash_mol (Lookup::round_filled_box (b, 0.8 * lt)); Stencil total; for (int i = 0; i < n; i++) { Stencil m (dash_mol); - m.translate_axis (span_points[LEFT] + i * dp + space_left / 2, X_AXIS); + m.translate_axis (span_points[LEFT] + i * dash_period + space_left / 2, X_AXIS); total.add_stencil (m); } - total.translate_axis ( -me->relative_coordinate (common, X_AXIS), X_AXIS); + total.translate_axis (-me->relative_coordinate (common, X_AXIS), X_AXIS); 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); + Grob *me = unsmob_grob (smob); Rod r; - Spanner*sp = dynamic_cast (me); - r.distance_ = - robust_scm2double (me->get_property ("minimum-length"), 0); + Spanner *sp = dynamic_cast (me); + r.distance_ = robust_scm2double (me->get_property ("minimum-distance"), 0); Direction d = LEFT; do { - r.item_l_drul_[d] = sp->get_bound (d); - if (r.item_l_drul_[d]) - r.distance_ += r.item_l_drul_[d]->extent (r.item_l_drul_[d], X_AXIS)[-d]; + r.item_drul_[d] = sp->get_bound (d); + if (r.item_drul_[d]) + r.distance_ += -d * r.item_drul_[d]->extent (r.item_drul_[d], X_AXIS)[-d]; } while (flip (&d) != LEFT); - if (r.item_l_drul_[LEFT] - && r.item_l_drul_[RIGHT]) + if (r.item_drul_[LEFT] + && r.item_drul_[RIGHT]) r.add_to_cols (); - + return SCM_UNSPECIFIED; } -ADD_INTERFACE (Hyphen_spanner, "lyric-hyphen-interface", - "A centred hyphen is a simple line between lyrics used to divide syllables", - "thickness height dash-period minimum-length length"); - +ADD_INTERFACE (Lyric_hyphen, + "A centered hyphen is simply a line between lyrics used to" + " divide syllables.", + + /* properties */ + "dash-period " + "height " + "length " + "minimum-distance " + "minimum-length " + "padding " + "thickness " + );