More collision tests.

diff --git a/ChangeLog b/ChangeLog
index bff61f17571ddf43533b410e4d4c030b7338d632..2c113f086f1362c0b0d47d41c887cac3b3a2797e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,4 @@
-2004-07-19  Jan Nieuwenhuizen  <janneke@gnu.org>
-
-       * lily/slur-quanting.cc (score_extra_encompass): Bigger penalty
-       for and bigger y-padding for extra_encompass.  Fixes slur-script.ly.
+2004-07-20  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * po/nl.po: Update.
 

diff --git a/input/regression/slur-script.ly b/input/regression/slur-script.ly
index 8ba56f913623e7e6c127906bb36a2745847602a6..17bdd371211763aaeed0e32a120605ef5c5bab9a 100644 (file)
--- a/input/regression/slur-script.ly
+++ b/input/regression/slur-script.ly
@@ -13,6 +13,10 @@
 \relative
 {
     b4-.( b-. b-.)
+    
+    b(-.  d-.)
+    d(-.  b-.)
+    
     b--( b-- b--)
     b->( b-> b->)
     b-.--( b-.-- b-.--)

diff --git a/lily/beam.cc b/lily/beam.cc
index e12cd2cdd7ab1e6dd9c79fc6a4e04b25087d4ba4..7539ce8907ae55b531c500a1d2ba1170f6006b74 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -1158,7 +1158,7 @@ Beam::check_concave (SCM smob)
   if (is_concave1 || concaveness2 > r2)
     {
       Drul_array<Real> pos = ly_scm2interval (me->get_property ("positions"));
-      Real r = linear_combination (pos, 0);
+      Real r = linear_combination (pos, 0.0);
 
       r /= Staff_symbol_referencer::staff_space (me);
       me->set_property ("positions", ly_interval2scm (Drul_array<Real> (r, r)));