From 76bcb9d6978736273155c6f90f52d43ac11db285 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 20 Jul 2004 18:12:16 +0000 Subject: [PATCH] More collision tests. --- ChangeLog | 5 +---- input/regression/slur-script.ly | 4 ++++ lily/beam.cc | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index bff61f1757..2c113f086f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,4 @@ -2004-07-19 Jan Nieuwenhuizen - - * 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 * po/nl.po: Update. diff --git a/input/regression/slur-script.ly b/input/regression/slur-script.ly index 8ba56f9136..17bdd37121 100644 --- 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 e12cd2cdd7..7539ce8907 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -1158,7 +1158,7 @@ Beam::check_concave (SCM smob) if (is_concave1 || concaveness2 > r2) { Drul_array 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 (r, r))); -- 2.39.5