* lily/staff-symbol-referencer.cc (on_staff_line): idem.

* lily/tie-formatting-problem.cc
(set_ties_config_standard_directions): use abs iso fabs for ints.

diff --git a/ChangeLog b/ChangeLog
index 24f39002c506f5f00e03c77ef5ac45213afed77a..7b8a73bd885f28d79d10edb6f0df0fca4c465883 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-01-28  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/staff-symbol-referencer.cc (on_staff_line): idem.
+
+       * lily/tie-formatting-problem.cc
+       (set_ties_config_standard_directions): use abs iso fabs for ints.
+
        * Documentation/topdocs/INSTALL.texi (Top): document ncsb requirement.
 
        * mf/feta-bolletjes.mf (overdone_heads): solfa_noteheight, a

diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc
index 367bed131dcbe6f333dea910387f22bbf19b5288..b866302a21641da7e8c750b2432899f21b5d04d3 100644 (file)
--- a/lily/staff-symbol-referencer.cc
+++ b/lily/staff-symbol-referencer.cc
@@ -42,7 +42,7 @@ Staff_symbol_referencer::on_line (Grob *me, int pos)
 bool
 Staff_symbol_referencer::on_staff_line (Grob *me, int pos)
 {
-  return on_line (me, pos) && fabs (pos) <= 2 * staff_radius (me);
+  return on_line (me, pos) && abs (pos) <= 2 * staff_radius (me);
 }
 
 Grob *

diff --git a/lily/tie-formatting-problem.cc b/lily/tie-formatting-problem.cc
index c0c31a31acb13fbe557efb008c1901b72d234b00..87ea44b36bf0695a0e13dd0050d62a8024fa153b 100644 (file)
--- a/lily/tie-formatting-problem.cc
+++ b/lily/tie-formatting-problem.cc
@@ -334,7 +334,7 @@ Tie_formatting_problem::generate_configuration (int pos, Direction dir) const
       if (h < details_.intra_space_threshold_ * 0.5 * details_.staff_space_)
        {
          if (!Staff_symbol_referencer::on_line (details_.staff_symbol_referencer_, pos)
-             && fabs (pos) < 2 * Staff_symbol_referencer::staff_radius (details_.staff_symbol_referencer_))
+             && abs (pos) < 2 * Staff_symbol_referencer::staff_radius (details_.staff_symbol_referencer_))
            {
              conf->center_tie_vertically (details_);
            }