* lily/tie.cc (get_configuration): don't crash if left_dot is NULL.

* flower/include/real.hh: std::fabs too.

diff --git a/ChangeLog b/ChangeLog
index 971bfd1f27faaf48a09cd67c307a1e647d1b5ac8..6534f18e440706d173cc64d85d9fe54bdd31dde1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-08  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * lily/tie.cc (get_configuration): don't crash if left_dot is NULL.
+
+       * flower/include/real.hh: std::fabs too.
+
 2005-09-08  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * Documentation/user/instrument-notation.itely (Entering lyrics):

diff --git a/flower/include/real.hh b/flower/include/real.hh
index e44094f072d8a710c6fee34d234320832fe59b56..f4248f5d2fa8a2e26fedecd07c6104ddd7ee9c91 100644 (file)
--- a/flower/include/real.hh
+++ b/flower/include/real.hh
@@ -18,6 +18,7 @@ extern const Real infinity_f;
 using namespace std;
 using std::isnan;
 using std::isinf;
+using std::fabs;
 
 template<class T> inline T abs (T x)
 {

diff --git a/lily/tie.cc b/lily/tie.cc
index 6e62f424f0111ca404a9462ce87e58730e366070..5efe2d072d5bcfb16a1634bd48efe124deab7823 100644 (file)
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -261,7 +261,9 @@ Tie::get_configuration (Grob *me_grob, Grob *common,
     Avoid dot
    */
   Grob *left_dot = unsmob_grob (me->get_bound (LEFT)->get_object ("dot"));
-  int dot_pos = int (Staff_symbol_referencer::get_position (left_dot));
+  int dot_pos = dot_pos
+    ? int (Staff_symbol_referencer::get_position (left_dot))
+    : 0;
   if (left_dot
       && (staff_position == dot_pos
          || staff_position + dir == dot_pos))