Merge branch 'lilypond/translation' of ssh://git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / ly / chord-repetition-init.ly

diff --git a/ly/chord-repetition-init.ly b/ly/chord-repetition-init.ly
index 3ff4578b60da24402d4d2173809a831b87f3c358..bea929f4c658a5a8ce6f2682c8abfb4261b4da26 100644 (file)
--- a/ly/chord-repetition-init.ly
+++ b/ly/chord-repetition-init.ly
@@ -1,6 +1,8 @@
-\version "2.13.8"
+%%% -*- Mode: Scheme -*-
+\version "2.13.9"
 %{
-Two functions define the chord repetition behavior, and may
+
+The following functions define the chord repetition behavior, and may
 be invoked by the user to customize it.
 
 ly:parser-set-repetition-symbol
@@ -8,27 +10,48 @@ ly:parser-set-repetition-symbol
   `q' is the default value set in this file.
 
 ly:parser-set-repetition-function
+
   set the function that is invoked when a chord repetition symbol
-  is encountered by the parser: a three argument function
-  (previous-chord, duration, list of articulations) which is supposed
-  to return a new chord.
+  is encountered by the parser: a four argument function
+  (previous-chord, location, duration, list of articulations) which is
+  supposed to return a new chord.
   `default-repeat-chord' is the default function set in this file.
 %}
 
-#(define-public (default-repeat-chord previous-chord duration articulations)
-   "Copy the previous chord, filter out events which are not notes, set the
-chord duration, add articulations."
-   (let ((new-chord (ly:music-deep-copy previous-chord)))
+#(define-public (default-repeat-chord previous-chord location duration articulations)
+   "Copy the previous chord, filter out events which are not notes, set
+the chord duration, add articulations."
+   ;; If previous-chord has an length property, then it means that it
+   ;; has been processed by a music iterator.  In other words, the chord
+   ;; has been memorized in an other music block, which is certainly not
+   ;; what the user has intended.  In that case, raise a warning.
+   (if (not (and (ly:music? previous-chord)
+                 (null? (ly:music-property previous-chord 'length))))
+       (ly:input-message location
+                         (_ "No memorized chord in music block before chord repetition")))
+   (let* ((new-chord (ly:music-deep-copy previous-chord))
+          (notes (filter (lambda (event)
+                           (eqv? (ly:music-property event 'name) 'NoteEvent))
+                         (ly:music-property new-chord 'elements))))
+     ;; remove possible cautionary/forced accidentals from notes
+     (for-each (lambda (note)
+                 (if (eqv? (ly:music-property note 'cautionary) #t)
+                     (set! (ly:music-property note 'cautionary) #f))
+                 (if (eqv? (ly:music-property note 'force-accidental) #t)
+                     (set! (ly:music-property note 'force-accidental) #f)))
+               notes)
+     ;; Add articulations and notes to the new event chord
      (set! (ly:music-property new-chord 'elements)
-           (append! articulations
-                    (filter (lambda (event)
-                              (eqv? (ly:music-property event 'name) 'NoteEvent))
-                            (ly:music-property new-chord 'elements))))
+           (append! notes articulations))
+     ;; Set the duration of each event
      (for-each (lambda (event)
                  (if (ly:duration? (ly:music-property event 'duration))
                      (set! (ly:music-property event 'duration) duration)))
                (ly:music-property new-chord 'elements))
-    new-chord))
+     ;; Set the new chord origin
+     (set! (ly:music-property new-chord 'origin) location)
+     ;; return the new chord
+     new-chord))
 
 #(ly:parser-set-repetition-symbol parser 'q)
 #(ly:parser-set-repetition-function parser default-repeat-chord)