* 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/ChangeLog b/ChangeLog
index d38169da895dba3ddaa8a4778b52ed5b2e1e9181..0709a4f69b870e23406f11d94c2ab37fbc1008f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-02-17  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * 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 be03b6a39b9793344952022fac335fb7bd0ee659..b40051041ad6f44d058f43c9e73741a564209cf3 100644 (file)
--- 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 52d0425fb2d9d3a5f75c731941fb6dbf59a41c88..2352c116d08ae37c9adb54c953734f037e786e32 100644 (file)
--- 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;
            }