Compare commits
1 Commits
main
...
782b8d3fd7
| Author | SHA1 | Date | |
|---|---|---|---|
| 782b8d3fd7 |
@@ -39,7 +39,6 @@
|
|||||||
\include "title_with_category_images.ily"
|
\include "title_with_category_images.ily"
|
||||||
\include "chord_settings.ily"
|
\include "chord_settings.ily"
|
||||||
\include "transposition.ily"
|
\include "transposition.ily"
|
||||||
\include "markup_tag_groups_hack.ily"
|
|
||||||
\include "verses_with_chords.ily"
|
\include "verses_with_chords.ily"
|
||||||
\include "arrows_in_scores.ily"
|
\include "arrows_in_scores.ily"
|
||||||
\include "swing_style.ily"
|
\include "swing_style.ily"
|
||||||
|
|||||||
@@ -1,13 +0,0 @@
|
|||||||
% 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))
|
|
||||||
@@ -287,8 +287,11 @@ headerToTOC = #(define-music-function (parser location header label) (ly:book? s
|
|||||||
(compositionIds (find-author-ids-by 'composition authors))
|
(compositionIds (find-author-ids-by 'composition authors))
|
||||||
(adaptionIds (find-author-ids-by 'adaption authors))
|
(adaptionIds (find-author-ids-by 'adaption authors))
|
||||||
(bridgeIds (find-author-ids-by 'bridge authors))
|
(bridgeIds (find-author-ids-by 'bridge authors))
|
||||||
(interludeIds (find-author-ids-by 'interlude authors)))
|
(interludeIds (find-author-ids-by 'interlude authors))
|
||||||
(delete-duplicates
|
(realAuthorIds (map car AUTHOR_DATA)))
|
||||||
|
(lset-intersection
|
||||||
|
equal?
|
||||||
|
realAuthorIds
|
||||||
(append poetIds translatorIds (map car versePoetData) composerIds (map car verseComposerData) (map car voiceComposerData) compositionIds adaptionIds bridgeIds interludeIds))
|
(append poetIds translatorIds (map car versePoetData) composerIds (map car verseComposerData) (map car voiceComposerData) compositionIds adaptionIds bridgeIds interludeIds))
|
||||||
))
|
))
|
||||||
(let*
|
(let*
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ TEXT = \markuplist {
|
|||||||
\override #`(verselayout . ,verselayout)
|
\override #`(verselayout . ,verselayout)
|
||||||
\override #`(verse-chords . ,#{ \chords { \verseChords } #})
|
\override #`(verse-chords . ,#{ \chords { \verseChords } #})
|
||||||
\override #`(verse-reference-voice . ,#{ \global \firstVoice #})
|
\override #`(verse-reference-voice . ,#{ \global \firstVoice #})
|
||||||
\handle-tag-groups \recordedTagGroups
|
|
||||||
\TEXT
|
\TEXT
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -30,7 +29,6 @@ TEXT = \markuplist {
|
|||||||
\override #`(verselayout . ,verselayout)
|
\override #`(verselayout . ,verselayout)
|
||||||
\override #`(verse-chords . ,#{ \chords { \verseChords } #})
|
\override #`(verse-chords . ,#{ \chords { \verseChords } #})
|
||||||
\override #`(verse-reference-voice . ,#{ \global \firstVoice #})
|
\override #`(verse-reference-voice . ,#{ \global \firstVoice #})
|
||||||
\handle-tag-groups \recordedTagGroups
|
|
||||||
#text
|
#text
|
||||||
}
|
}
|
||||||
#})
|
#})
|
||||||
@@ -77,4 +75,4 @@ TEXT = \markuplist {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}#})
|
}#})
|
||||||
))
|
))
|
||||||
Reference in New Issue
Block a user