X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fchord-repetition-init.ly;h=1e3c7ad1056dab7c36c7dca5f63c3040f01aa8c0;hb=fd1ca52ad6472f4eb07dacfdc25472e97ca6a170;hp=f19e3a10b50d5433168ed4c92bafedf90526599d;hpb=223ad8f5799657a5b628d862dd927f4197486b02;p=lilypond.git

diff --git a/ly/chord-repetition-init.ly b/ly/chord-repetition-init.ly
index f19e3a10b5..1e3c7ad105 100644
--- a/ly/chord-repetition-init.ly
+++ b/ly/chord-repetition-init.ly
@@ -1,51 +1,41 @@
 %%% -*- Mode: Scheme -*-
-\version "2.13.9"
+\version "2.19.22"
 %{
+  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 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.
+  The default behavior is straightforward: don't keep anything but the
+  rhythmic events themselves.
 %}
 
-#(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")))
-   ;; 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).
-   (make-music
-    'EventChord
-    'origin location
-    'elements (append! (filter identity
-                               (map (lambda (event)
-                                      (and (eqv? (ly:music-property event 'name) 'NoteEvent)
-                                           (make-music
-                                            'NoteEvent
-                                            'pitch (ly:music-property event 'pitch)
-                                            'duration duration)))
-                                    (ly:music-property previous-chord 'elements)))
-                       articulations)))
+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
+   #})
 
-#(ly:parser-set-repetition-symbol parser 'q)
-#(ly:parser-set-repetition-function parser default-repeat-chord)
+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)))