lily/stem-tremolo.cc (print): fix whole note tremolo placement

input/regression/stem-tremolo.ly: add 2 more whole note examples

diff --git a/ChangeLog b/ChangeLog
index d05689f3d54f5ca8009cef05a9a4ec4fc4f3115d..aa457b332c2175f8636d8ef5c57ae23ea6283385 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-25  Joe Neeman  <joeneeman@gmail.com>
+
+       * lily/stem-tremolo.cc (print): fix whole note tremolo placement
+       * input/regression/stem-tremolo.ly: add 2 more whole note examples
+
 2006-05-24  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
        * configure.in (LINK_GXX_STATICALLY): use "" to allow $

diff --git a/input/regression/stem-tremolo.ly b/input/regression/stem-tremolo.ly
index 6cc2729daf5bb064f4a68458962dc82aedd2bafd..ab8283adffc2868cb160ce9c2c26b4c5fb7dda01 100644 (file)
--- a/input/regression/stem-tremolo.ly
+++ b/input/regression/stem-tremolo.ly
@@ -21,7 +21,8 @@ a fixed distance from the note head.
   \textSpannerUp
   \override TextScript  #'padding = #5
   a1:4^":4" a:8^":8" c:16^":16" a:32^":32" a^"x" a:^":"
-  a4:4 c:8 a:16 c:32 a a: a2:
+  a':32 a,,:32
+  a'4:4 c:8 a:16 c:32 a a: a2:
   \break
   \stemUp
   a4:32 a'4:64 

diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc
index b3ea13d30d1f0fac3992b4ae9391e10b76e9f99f..8cd012024aa72d5f497aa0a10bbd739c7d41d140 100644 (file)
--- a/lily/stem-tremolo.cc
+++ b/lily/stem-tremolo.cc
@@ -216,8 +216,8 @@ Stem_tremolo::print (SCM grob)
       /* we shouldn't position relative to the end of the stem since the stem
          is invisible */
       vector<int> nhp = Stem::note_head_positions (stem);
-      Real note_head = (stemdir == UP ? nhp.back () : nhp[0]);
-      end_y = note_head + stemdir * 2.0;
+      Real note_head = (stemdir == UP ? nhp.back () : nhp[0]) * ss / 2;
+      end_y = note_head + stemdir * 1.5;
     }
   mol.translate_axis (end_y, Y_AXIS);