From bbaf95bbad502905c487290b4b6d90000bf7856f Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Mon, 1 Dec 2014 18:17:41 +0100 Subject: [PATCH] Issue 4010: Chord repeats should not repeat forced/cautionary accidentals --- input/regression/chord-repetition-accidentals.ly | 11 +++++++++++ scm/music-functions.scm | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 input/regression/chord-repetition-accidentals.ly 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 +{ + q q q | + 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? -- 2.39.5