X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fchord-repetition-init.ly;h=1e3c7ad1056dab7c36c7dca5f63c3040f01aa8c0;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=0c986a34ba4b1962c96f812df57bcb41c4931703;hpb=0950de32403b199efc8454ca527f1201ee458417;p=lilypond.git

diff --git a/ly/chord-repetition-init.ly b/ly/chord-repetition-init.ly
index 0c986a34ba..1e3c7ad105 100644
--- a/ly/chord-repetition-init.ly
+++ b/ly/chord-repetition-init.ly
@@ -1,79 +1,41 @@
 %%% -*- Mode: Scheme -*-
-\version "2.13.17"
+\version "2.19.22"
 %{
-
-The following functions define the chord repetition behavior, and may
-be invoked by the user to customize it.
-
-ly:parser-set-repetition-symbol
-  set the chord repetition shortcut.
-  `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 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.
-  `tab-repeat-chord' may be used in tablatures to preserve the string information.
+  Chord repetition behavior is not customizable in the parser.  That
+  is due to it usually being done by the toplevel music handler
+  affecting every bit of music at the same time, not closely related
+  to music input.  Customized behavior is instead accomplished by
+  calling \chordRepeats explicitly on some music list with a list of
+  event types you wish to keep by default (if any events of that kind
+  are found already on the repeat chord, however, they still get
+  removed from the original).
+
+  The default behavior is straightforward: don't keep anything but the
+  rhythmic events themselves.
 %}
 
-#(define-public ((make-repeat-chord-function chord-element-types note-articulation-types)
-                 previous-chord location duration articulations)
-   "Make a chord repetition function.
-The returned functions copies the notes from @var{previous-chord} into a new chord.
-Chord elements, which type is found in @var{chord-element-types}, are copied into
-the new chord. Note articulations, which type is found in @var{note-articulation-types},
-are also copied. All other events are not copied into the new chord."
-   (define (filter-events events event-types)
-     (filter (lambda (event)
-	       (and (memq (ly:music-property event 'name) event-types) event))
-	     events))
-   ;; 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 from an other music block, which is certainly not
-   ;; what the user has intended, as anywy the result will be buggy.
-   ;; 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")))
-   ;; Instead of copying the previous chord, then removing the
-   ;; undesired elements (like articulations), a new empty chord is built.
-   ;; Then, the pitch found in the previous chord are added to the new
-   ;; chord, without any "decoration" (e.g. cautionary accidentals,
-   ;; fingerings, text scripts, articulations).  Only the events of types
-   ;; given in `chord-elements-types' and `note-articulation-types' are
-   ;; copied from the original chord elements and note articulations,
-   ;; respectively.
-   (let ((elements (ly:music-property (ly:music-deep-copy previous-chord) 'elements)))
-     (make-music
-      'EventChord
-      'origin location
-      'elements (append!
-                 (map (lambda (note)
-                        (let ((new-note (make-music 'NoteEvent
-                                                    'origin location
-                                                    'pitch (ly:music-property note 'pitch)
-                                                    'duration duration))
-                              (articulations
-                               (filter-events (ly:music-property note 'articulations)
-                                              note-articulation-types)))
-                          (if (not (null? articulations))
-                              (set! (ly:music-property new-note 'articulations)
-                                    articulations))
-                          new-note))
-                      (filter-events elements '(NoteEvent)))
-                 (filter-events elements chord-element-types)
-                 articulations))))
-
-#(define-public default-repeat-chord
-   (make-repeat-chord-function '() '()))
-
-#(define-public tab-repeat-chord
-   (make-repeat-chord-function '(StringNumberEvent) '(StringNumberEvent)))
-
-% default settings
-#(ly:parser-set-repetition-symbol parser 'q)
-#(ly:parser-set-repetition-function parser default-repeat-chord)
+chordRepeats =
+#(define-music-function (event-types music)
+   ((list? '()) ly:music?)
+   "Walk through @var{music} putting the notes of the previous chord
+into repeat chords, as well as an optional list of @var{event-types}
+such as @code{#'(string-number-event)}."
+   (expand-repeat-chords! (cons 'rhythmic-event event-types) music))
+
+tabChordRepeats =
+#(define-music-function (event-types music)
+   ((list? '()) ly:music?)
+   "Walk through @var{music} putting the notes, fingerings and string
+numbers of the previous chord into repeat chords, as well as an
+optional list of @var{event-types} such as @code{#'(articulation-event)}."
+   #{ \chordRepeats
+      #(append '(string-number-event fingering-event) event-types)
+      #music
+   #})
+
+tabChordRepetition =
+#(define-void-function () ()
+   (_i "Include the string and fingering information in a chord repetition.
+This function is deprecated; try using @code{\\tabChordRepeats} instead.")
+   (ly:parser-define! '$chord-repeat-events
+                      '(string-number-event fingering-event)))