From 50dfe2b3aa7baf57f31a8e7d12c53e9370fdb5e0 Mon Sep 17 00:00:00 2001 From: Neil Puttock Date: Wed, 16 Jul 2008 20:12:21 +0100 Subject: [PATCH] Fix 418. Don't remember a tied accidental in localKeySignature if 'forced is set. --- .../regression/accidental-forced-tie-barline.ly | 17 +++++++++++++++++ lily/accidental-engraver.cc | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 input/regression/accidental-forced-tie-barline.ly diff --git a/input/regression/accidental-forced-tie-barline.ly b/input/regression/accidental-forced-tie-barline.ly new file mode 100644 index 0000000000..e5c24ddd41 --- /dev/null +++ b/input/regression/accidental-forced-tie-barline.ly @@ -0,0 +1,17 @@ +\version "2.11.53" + +\header { + texidoc = "Cautionary accidentals applied to tied notes after a +bar line are valid for the whole measure." +} + +notes = \relative c' { + fis1 ~ + fis!2 fis ~ + fis?2 fis +} + +<< + \new NoteNames \notes + \new Staff \notes +>> diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc index 211cbe4ab1..aaf8307cd7 100644 --- a/lily/accidental-engraver.cc +++ b/lily/accidental-engraver.cc @@ -480,7 +480,8 @@ Accidental_engraver::stop_translation_timestep () && origin->where_defined (ly_symbol2scm ("localKeySignature"), &localsig)) { bool change = false; - if (accidentals_[i].tied_) + if (accidentals_[i].tied_ + && !(to_boolean (accidentals_[i].accidental_->get_property ("forced")))) { /* Remember an alteration that is different both from -- 2.39.5