adaption_text adaption_music
This commit is contained in:
		| @@ -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:" | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user