fix markup tag group trouble accross songs

private_includes/base/all.ily

@@ -39,6 +39,7 @@
 \include "title_with_category_images.ily"
 \include "chord_settings.ily"
 \include "transposition.ily"
+\include "markup_tag_groups_hack.ily"
 \include "verses_with_chords.ily"
 \include "arrows_in_scores.ily"
 \include "swing_style.ily"

private_includes/base/markup_tag_groups_hack.ily

@@ -0,0 +1,13 @@
+% We have to record the tag groups for markup, so we use the right tag groups during markup interpretiton.
+recordedTagGroups = #'()
+
+tagGroup =
+#(define-void-function (tags) (symbol-list?)
+   (let ((err (define-tag-group tags)))
+     (if err (ly:parser-error err (*location*))
+         (set! recordedTagGroups (cons tags recordedTagGroups)))))
+
+#(define-markup-command (handle-tag-groups layout props recorded-groups m) (list? markup?)
+   (resetTagGroups)
+   (every (lambda (group) (define-tag-group group)) recorded-groups)
+   (interpret-markup layout props m))

private_includes/book/toc_include.ily

@@ -287,11 +287,8 @@ headerToTOC = #(define-music-function (parser location header label) (ly:book? s
             (compositionIds (find-author-ids-by 'composition authors))
             (adaptionIds (find-author-ids-by 'adaption authors))
             (bridgeIds (find-author-ids-by 'bridge authors))
-            (interludeIds (find-author-ids-by 'interlude authors))
+            (interludeIds (find-author-ids-by 'interlude authors)))
-            (realAuthorIds (map car AUTHOR_DATA)))
+        (delete-duplicates
-        (lset-intersection
-          equal?
-          realAuthorIds
           (append poetIds translatorIds (map car versePoetData) composerIds (map car verseComposerData) (map car voiceComposerData) compositionIds adaptionIds bridgeIds interludeIds))
     ))
     (let*

public_includes/layout_bottom.ily

@@ -18,6 +18,7 @@ TEXT = \markuplist {
   \override #`(verselayout . ,verselayout)
   \override #`(verse-chords . ,#{ \chords { \verseChords } #})
   \override #`(verse-reference-voice . ,#{ \global \firstVoice  #})
+  \handle-tag-groups \recordedTagGroups
   \TEXT
 }
 
@@ -29,6 +30,7 @@ TEXT = \markuplist {
         \override #`(verselayout . ,verselayout)
         \override #`(verse-chords . ,#{ \chords { \verseChords } #})
         \override #`(verse-reference-voice . ,#{ \global \firstVoice  #})
+        \handle-tag-groups \recordedTagGroups
         #text
       }
     #})
@@ -75,4 +77,4 @@ TEXT = \markuplist {
         }
       }
     }#})
-))
+))