be able to format everything of the songinfo with markup

private_includes/base/default_songinfo_style.ily

@@ -2,11 +2,13 @@
   poetPrefix = "Worte:"
   composerPrefix = "Weise:"
   compositionPrefix = "Satz:"
-  adaptionPrefix = "Bearbeitung:"
+  adaptionTextPrefix = "Bearbeitung Text:"
+  adaptionMusicPrefix = "Bearbeitung Musik:"
   poetAndComposerEqualPrefix = "Worte und Weise:"
   voicePrefix = "Stimme:"
   versePrefix = "Strophe:"
   translationPrefix = "Übersetzung:"
+  pronunciationPrefix = "Aussprache:"
   interludePrefix = "Zwischenspiel:"
   bridgePrefix = "Bridge:"
 
@@ -42,8 +44,6 @@
               (year_melody (chain-assoc-get 'songinfo:year_melody props #f))
               (poet-with-year (if (and poet-maybe-with-composer year_text) (string-append poet-maybe-with-composer ", " year_text) poet-maybe-with-composer))
               (composer-with-year (if (and composer year_melody) (string-append composer ", " year_melody) composer))
-              (poet-and-composer-oneliner (if (and poet-with-year composer-with-year) (markup poet-with-year between-poet-and-composer-markup composer-with-year) #f))
-              (current-line-width (chain-assoc-get 'line-width props (ly:output-def-lookup layout 'line-width)))
               (string-with-paragraphs->markuplist (lambda (prefix text)
                 (if text
                   (apply append
@@ -51,22 +51,26 @@
                       (lambda (paragraph)
                         (make-wordwrap-internal-markup-list #t
                           #{ \markuplist { $(ly:parser-include-string paragraph) } #}))
-                      (ly:regex-split (ly:make-regex "\n[ \t\n]*\n[ \t\n]*") text)))
+                      (ly:regex-split (ly:make-regex "\n[ \t\n]*\n[ \t\n]*") (string-append prefix text))))
-                  '()))))
+                  '())))
+              (poet-and-composer-markup-list
+                (string-with-paragraphs->markuplist "" (string-append
+                  (if poet-with-year (string-append "\n\n" poet-with-year) "")
+                  (if composer-with-year (string-append "\n\n" composer-with-year) "")
+                )))
+              (poet-and-composer-oneliner (if (and poet-with-year composer-with-year) (make-line-markup (cons (cadr poet-and-composer-markup-list) (cons between-poet-and-composer-markup (cddr poet-and-composer-markup-list)))) #f))
+              (current-line-width (chain-assoc-get 'line-width props (ly:output-def-lookup layout 'line-width))))
           (stack-lines DOWN 0.0 (chain-assoc-get 'baseline-skip props)
             (interpret-markup-list layout props
               (append
                 (if (and poet-and-composer-oneliner (< (interval-length (ly:stencil-extent (interpret-markup layout props poet-and-composer-oneliner) X)) current-line-width))
                   (list poet-and-composer-oneliner)
-                  (make-wordwrap-string-internal-markup-list #t (string-append
+                  poet-and-composer-markup-list)
-                    (if poet-with-year (string-append "\n\n" poet-with-year) "")
+                (string-with-paragraphs->markuplist "" (string-append
-                    (if composer-with-year (string-append "\n\n" composer-with-year) "")
-                  )))
-                (make-wordwrap-string-internal-markup-list #t (string-append
                   (if copyright (string-append "\n\n© " copyright) "")))
                 (string-with-paragraphs->markuplist "" infotext)
-                (string-with-paragraphs->markuplist "Übersetzung: " translation)
+                (string-with-paragraphs->markuplist (string-append (ly:output-def-lookup layout 'translationPrefix) " ") translation)
-                (string-with-paragraphs->markuplist "Aussprache: " pronunciation)
+                (string-with-paragraphs->markuplist (string-append (ly:output-def-lookup layout 'pronunciationPrefix) " ") pronunciation)
                   )))))
       (make-null-markup)
     )

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)
+                    (render-contribution-group (ly:output-def-lookup layout 'adaptionMusicPrefix) adaptionMusicIds)
-                    year_adaption
+                    year_adaption_music
                   ) ", ")
                   (render-contribution-group (ly:output-def-lookup layout 'bridgePrefix) bridgeIds)
                   (render-contribution-group (ly:output-def-lookup layout 'interludePrefix) interludeIds)

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"