From da89182f74da7854cdddf82691c507105203bf6e Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 17 Feb 2006 00:41:59 +0000 Subject: [PATCH] * lily/side-position-interface.cc (aligned_side): oops. Don't mutiply with direction. This fixes quantized (staccato, tenuto) scripts below notes. * lily/lyric-hyphen.cc (set_spacing_rods): oops. Multiply with direction. Fixes c-lyrics-center-align.ly --- ChangeLog | 4 ++++ lily/lyric-hyphen.cc | 19 ++++++++++++------- lily/side-position-interface.cc | 2 +- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index d38169da89..0709a4f69b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2006-02-17 Han-Wen Nienhuys + * lily/side-position-interface.cc (aligned_side): oops. Don't + mutiply with direction. This fixes quantized (staccato, tenuto) + scripts below notes. + * lily/lyric-hyphen.cc (set_spacing_rods): oops. Multiply with direction. Fixes c-lyrics-center-align.ly diff --git a/lily/lyric-hyphen.cc b/lily/lyric-hyphen.cc index be03b6a39b..b40051041a 100644 --- a/lily/lyric-hyphen.cc +++ b/lily/lyric-hyphen.cc @@ -128,15 +128,20 @@ 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 (Hyphen_spanner, + + "lyric-hyphen-interface", + + "A centered hyphen is a simple line between " + "lyrics used to divide syllables", /* props */ - "padding " - "thickness " - "height " "dash-period " - "minimum-length " + "height " + "length" "minimum-distance " - "length"); + "minimum-length " + "padding " + "thickness " + ); diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index 52d0425fb2..2352c116d0 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -184,7 +184,7 @@ Side_position_interface::aligned_side (Grob *me, Axis a) || (Note_head::has_interface (head) && sign (Staff_symbol_referencer::get_position (head)) == - dir)) { - o += dir *(rounded - position) * 0.5 * ss; + o += (rounded - position) * 0.5 * ss; if (Staff_symbol_referencer::on_line (me, int (rounded))) o += dir * 0.5 * ss; } -- 2.39.2