From: David Kastrup <dak@gnu.org>
Date: Mon, 1 Dec 2014 17:17:41 +0000 (+0100)
Subject: Issue 4010: Chord repeats should not repeat forced/cautionary accidentals
X-Git-Tag: release/2.19.16-1~2^2~54^2~15
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bbaf95bbad502905c487290b4b6d90000bf7856f;p=lilypond.git

Issue 4010: Chord repeats should not repeat forced/cautionary accidentals
---

diff --git a/input/regression/chord-repetition-accidentals.ly b/input/regression/chord-repetition-accidentals.ly
new file mode 100644
index 0000000000..50b20db168
--- /dev/null
+++ b/input/regression/chord-repetition-accidentals.ly
@@ -0,0 +1,11 @@
+\version "2.18.0"
+
+\header {
+  texidoc = "Chord repeats should omit forced and reminder accidentals."
+}
+
+\relative
+{
+  <f'! a d f!> q q q |
+  <f? a d f?> q q q
+}
diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index db39742e21..bc746a826f 100644
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -751,7 +751,11 @@ duration is replaced with the specified @var{duration}."
                    (set! (ly:music-property m 'articulations)
                          (set-origin! (filter! keep-element? arts))))
                (if (ly:duration? (ly:music-property m 'duration))
-                   (set! (ly:music-property m 'duration) duration))))
+                   (set! (ly:music-property m 'duration) duration))
+               (if (ly:music-property m 'cautionary #f)
+                   (set! (ly:music-property m 'cautionary) #f))
+               (if (ly:music-property m 'force-accidental #f)
+                   (set! (ly:music-property m 'force-accidental) #f))))
            elts)
           (append! elts (ly:music-property repeat-chord 'elements))))
   (let ((arts (filter keep-element?