Fix 418.

Don't remember a tied accidental in localKeySignature if 'forced is set.

diff --git a/input/regression/accidental-forced-tie-barline.ly b/input/regression/accidental-forced-tie-barline.ly
new file mode 100644 (file)
index 0000000..e5c24dd
--- /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 211cbe4ab199d59074a935bf72dd8ed04ea2d0e4..aaf8307cd7932b660429f8d10d82b30a17006417 100644 (file)
--- 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