From cc6bf9259bf0d1ec37dfdc4104961519dc9bff7a Mon Sep 17 00:00:00 2001 From: Keith OHara Date: Tue, 20 Mar 2012 23:15:57 -0700 Subject: [PATCH] Make a regression test fail more obviously, if it fails. --- input/regression/accidental-broken-tie-spacing.ly | 10 +++++++--- lily/item.cc | 4 ++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/input/regression/accidental-broken-tie-spacing.ly b/input/regression/accidental-broken-tie-spacing.ly index b9eccd8ced..2284562fa3 100644 --- a/input/regression/accidental-broken-tie-spacing.ly +++ b/input/regression/accidental-broken-tie-spacing.ly @@ -1,11 +1,15 @@ \version "2.14.0" +\paper { ragged-right = ##t } \header { texidoc = "When a tie is broken, the spacing engine must consider the -accidental after the line break, to prevent a collision from occurring." +accidental after the line break. The second and third lines should have +the same note spacing." } -{ \key g \major gis''1~ \break gis''4 -\repeat unfold 43 {d4 \noBreak} } +{ \key bes \major r1 \break + eses''4 r2 eses''4~ \break + eses''4 r2 f''4 +} diff --git a/lily/item.cc b/lily/item.cc index 6ea5643a54..0c3169a776 100644 --- a/lily/item.cc +++ b/lily/item.cc @@ -241,6 +241,10 @@ Item::pure_height (Grob *g, int start, int end) { if (cached_pure_height_valid_) return cached_pure_height_ + pure_relative_y_coordinate (g, start, end); + /* Note: cached_pure_height_ does not notice if start changes, implicitly + assuming that Items' pure_heights do not depend on 'start' or 'end'. + Accidental_interface::pure_height(), however, does depend on 'start'. + */ cache_pure_height (Grob::pure_height (this, start, end)); return cached_pure_height_ + pure_relative_y_coordinate (g, start, end); -- 2.39.5