lily/stem.cc (Stem::extremal_heads, Stem::note_head_positions),

lily/dot-column.cc (Dot_column::do_shifts), lily/note-column.cc
(Note_column::head_position_interval): Do proper rounding for
calls to Staff_symbol_referencer::get_position.

diff --git a/ChangeLog b/ChangeLog
index a0c3cc5f385902f94542ff070f9abe3782069b6b..21c210112fc6e471aac9ce8b24144bf37f64aace 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-03-22  Werner Lemberg  <wl@gnu.org>
+
+       lily/stem.cc (Stem::extremal_heads, Stem::note_head_positions),
+       lily/dot-column.cc (Dot_column::do_shifts), lily/note-column.cc
+       (Note_column::head_position_interval): Do proper rounding for
+       calls to Staff_symbol_referencer::get_position.
+
 2004-03-21  Werner Lemberg  <wl@gnu.org>
 
        * lily/score.cc (ly_run_translator), lily/paper-def.cc

diff --git a/lily/dot-column.cc b/lily/dot-column.cc
index 46448cd95ff0fb20b959a8d8212d9b5b11274568..523e2955f46ea0728e304085615653e99304dac2 100644 (file)
--- a/lily/dot-column.cc
+++ b/lily/dot-column.cc
@@ -7,6 +7,7 @@
 */
 
 #include <stdio.h>
+#include <math.h>
 #include <map>
 
 #include "dots.hh"
@@ -271,7 +272,7 @@ Dot_column::do_shifts (Grob*me)
            dp.extremal_head_ = Stem::first_head (stem) == note;
        }
       
-      int p = int (Staff_symbol_referencer::get_position (dp.dot_));
+      int p = (int)rint (Staff_symbol_referencer::get_position (dp.dot_));
       dp.pos_= p;
 
       if (dp.extremal_head_)

diff --git a/lily/note-column.cc b/lily/note-column.cc
index 84ac1db2dfbb5f2ca48183edafc1a0ff6b6ce8a2..123535c75ef897002148397ab865f24a3840c9f9 100644 (file)
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -59,7 +59,7 @@ Note_column::head_positions_interval (Grob *me)
     {
       Grob *se = unsmob_grob (ly_car (h));
       
-      int j = int (Staff_symbol_referencer::get_position (se));
+      int j = (int)rint (Staff_symbol_referencer::get_position (se));
       iv.unite (Slice (j,j));
     }
   return iv;

diff --git a/lily/stem.cc b/lily/stem.cc
index 30fc0040c89c08adb7b6887d0551f3fb20eb3432..3562170668e7286fcafe2127ebe26a1305e80b84 100644 (file)
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -194,7 +194,7 @@ Stem::extremal_heads (Grob*me)
       Grob * n = unsmob_grob (ly_car (s));
 
       
-      int p = int (Staff_symbol_referencer::get_position (n));
+      int p = (int)rint (Staff_symbol_referencer::get_position (n));
 
       Direction d = LEFT;
       do {
@@ -225,7 +225,7 @@ Stem::note_head_positions (Grob *me)
   for (SCM s = me->get_property ("note-heads"); gh_pair_p (s); s = ly_cdr (s))
     {
       Grob * n = unsmob_grob (ly_car (s));
-      int p = int (Staff_symbol_referencer::get_position (n));
+      int p = (int)rint (Staff_symbol_referencer::get_position (n));
 
       ps.push (p);
     }