From 66b5c377551bbeed63dca47ee9c6802b4f2244bf Mon Sep 17 00:00:00 2001 From: tux Date: Sun, 31 Aug 2025 15:48:34 +0200 Subject: [PATCH] adaption_text adaption_music --- .../base/default_songinfo_style.ily | 3 +- .../base/footer_with_songinfo.ily | 35 +++++++++++++++---- private_includes/book/toc_include.ily | 13 ++++--- 3 files changed, 39 insertions(+), 12 deletions(-) diff --git a/private_includes/base/default_songinfo_style.ily b/private_includes/base/default_songinfo_style.ily index a63c8ec..fedffab 100644 --- a/private_includes/base/default_songinfo_style.ily +++ b/private_includes/base/default_songinfo_style.ily @@ -2,7 +2,8 @@ poetPrefix = "Worte:" composerPrefix = "Weise:" compositionPrefix = "Satz:" - adaptionPrefix = "Bearbeitung:" + adaptionTextPrefix = "Bearbeitung Text:" + adaptionMusicPrefix = "Bearbeitung Musik:" poetAndComposerEqualPrefix = "Worte und Weise:" voicePrefix = "Stimme:" versePrefix = "Strophe:" diff --git a/private_includes/base/footer_with_songinfo.ily b/private_includes/base/footer_with_songinfo.ily index 7d7efe4..4fd7ce4 100644 --- a/private_includes/base/footer_with_songinfo.ily +++ b/private_includes/base/footer_with_songinfo.ily @@ -102,16 +102,28 @@ (verseComposerData (find-author-id-with-part-numbers 'meloverse authors)) (voiceComposerData (find-author-id-with-part-numbers 'voice authors)) (compositionIds (find-author-ids-by 'composition authors)) - (adaptionIds (find-author-ids-by 'adaption authors)) + (adaptionTextIds (find-author-ids-by 'adaption_text authors)) + (adaptionMusicIds (find-author-ids-by 'adaption_music authors)) (bridgeIds (find-author-ids-by 'bridge authors)) (interludeIds (find-author-ids-by 'interlude authors)) (year_text (chain-assoc-get 'header:year_text props #f)) (year_translation (chain-assoc-get 'header:year_translation props #f)) (year_melody (chain-assoc-get 'header:year_melody props #f)) (year_composition (chain-assoc-get 'header:year_composition props #f)) - (year_adaption (chain-assoc-get 'header:year_adaption props #f)) + (year_adaption_text (chain-assoc-get 'header:year_adaption_text props #f)) + (year_adaption_music (chain-assoc-get 'header:year_adaption_music props #f)) ) - (if (and (equal? poetIds composerIds) (null? translatorIds) (null? versePoetData) (null? verseComposerData) (null? voiceComposerData) (null? compositionIds) (null? adaptionIds) (null? bridgeIds) (null? interludeIds)) + (if (and + (equal? poetIds composerIds) + (null? translatorIds) + (null? versePoetData) + (null? verseComposerData) + (null? voiceComposerData) + (null? compositionIds) + (null? adaptionTextIds) + (null? adaptionMusicIds) + (null? bridgeIds) + (null? interludeIds)) (list (join-present (list (render-contribution-group (ly:output-def-lookup layout 'poetAndComposerEqualPrefix) poetIds) @@ -133,9 +145,20 @@ (render-contribution-group (ly:output-def-lookup layout 'translationPrefix) translatorIds) year_translation ) ", ") + (join-present (list + (render-contribution-group (ly:output-def-lookup layout 'adaptionTextPrefix) adaptionTextIds) + year_adaption_text + ) ", ") ) "; ") )) - (if (and (null? composerIds) (null? compositionIds) (null? adaptionIds) (null? verseComposerData) (null? voiceComposerData) (null? bridgeIds) (null? interludeIds)) #f + (if (and + (null? composerIds) + (null? compositionIds) + (null? adaptionMusicIds) + (null? verseComposerData) + (null? voiceComposerData) + (null? bridgeIds) + (null? interludeIds)) #f (string-append (ly:output-def-lookup layout 'composerPrefix) " " @@ -151,8 +174,8 @@ year_composition ) ", ") (join-present (list - (render-contribution-group (ly:output-def-lookup layout 'adaptionPrefix) adaptionIds) - year_adaption + (render-contribution-group (ly:output-def-lookup layout 'adaptionMusicPrefix) adaptionMusicIds) + year_adaption_music ) ", ") (render-contribution-group (ly:output-def-lookup layout 'bridgePrefix) bridgeIds) (render-contribution-group (ly:output-def-lookup layout 'interludePrefix) interludeIds) diff --git a/private_includes/book/toc_include.ily b/private_includes/book/toc_include.ily index 27cb0b8..3b26486 100644 --- a/private_includes/book/toc_include.ily +++ b/private_includes/book/toc_include.ily @@ -381,7 +381,8 @@ headerToTOC = #(define-music-function (parser location header label) (ly:book? s (verseComposerData (find-author-id-with-part-numbers 'meloverse authors)) (voiceComposerData (find-author-id-with-part-numbers 'voice authors)) (compositionIds (find-author-ids-by 'composition authors)) - (adaptionIds (find-author-ids-by 'adaption authors)) + (adaptionTextIds (find-author-ids-by 'adaption_text authors)) + (adaptionMusicIds (find-author-ids-by 'adaption_music authors)) (bridgeIds (find-author-ids-by 'bridge authors)) (interludeIds (find-author-ids-by 'interlude authors))) (map csv-escape @@ -397,14 +398,15 @@ headerToTOC = #(define-music-function (parser location header label) (ly:book? s (headervar-or-empty 'categorytitle) (headervar-or-empty 'categories) - (format-authors (append poetIds (map car versePoetData))) + (format-authors (append poetIds adaptionTextIds (map car versePoetData))) (format-authors translatorIds) - (format-authors (append composerIds compositionIds adaptionIds bridgeIds interludeIds (map car voiceComposerData) (map car verseComposerData))) + (format-authors (append composerIds compositionIds adaptionMusicIds bridgeIds interludeIds (map car voiceComposerData) (map car verseComposerData))) (headervar-or-empty 'year_text) (headervar-or-empty 'year_melody) (headervar-or-empty 'year_translation) (headervar-or-empty 'year_composition) - (headervar-or-empty 'year_adaption) + (headervar-or-empty 'year_adaption_text) + (headervar-or-empty 'year_adaption_music) (headervar-or-empty 'copyright) (headervar-or-empty 'source) (format-info-paragraphs (headervar-or-empty 'infotext)) @@ -429,7 +431,8 @@ headerToTOC = #(define-music-function (parser location header label) (ly:book? s "year_melody" "year_translation" "year_composition" - "year_adaption" + "year_adaption_text" + "year_adaption_music" "copyright" "source" "infotext"