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 (file)
index 0000000..50b20db
--- /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 db39742e2171d0b4efd574ddc3d00389d04ad93c..bc746a826f6141447000323d102b1ff9f64ca072 100644 (file)
--- 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?