Autorensystem flexibilisiert

implement default bridge style
fix customize layout sizing
2026-01-11 20:03:31 +01:00 · 2025-12-29 18:06:00 +01:00 · 2025-12-22 11:29:32 +01:00 · 2025-12-15 21:41:45 +01:00
6 changed files with 178 additions and 104 deletions
--- a/private_includes/base/basic_format_and_style_settings.ily
+++ b/private_includes/base/basic_format_and_style_settings.ily
@@ -29,6 +29,11 @@
    (if (null? stanzanumbers)
        refString
        (ly:format refStringWithNumbers (string-join (map (lambda (stanzanumber) (ly:format "~a" stanzanumber)) stanzanumbers) ", ")))))
+  bridgeMarkupFormatter = #(lambda (layout props stanzanumbers)
+    (interpret-markup layout props
+    (if (null? stanzanumbers)
+        bridgeString
+        (ly:format bridgeStringWithNumbers (string-join (map (lambda (stanzanumber) (ly:format "~a" stanzanumber)) stanzanumbers) ", ")))))
 }

 generalLayout = \layout {
@@ -79,6 +84,11 @@ generalLayout = \layout {
  }
 }

+#(define (customized-layout base-layout)
+   (let
+     ((custom-size (ly:output-def-lookup base-layout 'size #f)))
+     (if custom-size (layout-set-staff-size custom-size))))
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% kleine Helferlein:

@@ -171,6 +181,23 @@ ref =
 #}
 )

+bridge =
+#(define-music-function (stanzanumbers lyrics) ((number-list? (list)) ly:music?)
+#{ \lyricmode {
+    \once \override StanzaNumber.details.custom-realstanza = ##t % set this to signal that there is a real stanza and no repeat signs
+    \applyContext
+    #(lambda (context)
+      (handle-stanza-numbers context stanzanumbers
+        (lambda (numbers)
+          (make-on-the-fly-markup
+            (lambda (layout props m)
+              ((ly:output-def-lookup layout 'bridgeMarkupFormatter) layout props numbers))
+            (make-null-markup)))))
+    #lyrics
+  }
+#}
+)
+
 % prints a repStart Sign as stanza if the tag 'repeats is kept.
 % if there was a stanza already set by the stanza function with StanzaNumber.details.custom-realstanza = ##t we set that also as stanza.
 repStartWithTag = \lyricmode {
--- a/private_includes/base/default_songinfo_style.ily
+++ b/private_includes/base/default_songinfo_style.ily
@@ -2,8 +2,8 @@
  poetPrefix = "Worte:"
  composerPrefix = "Weise:"
  compositionPrefix = "Satz:"
-  adaptionTextPrefix = "Bearbeitung Text:"
-  adaptionMusicPrefix = "Bearbeitung Musik:"
+  adaptionTextPrefix = "Bearbeitung:"
+  adaptionMusicPrefix = "Bearbeitung:"
  poetAndComposerEqualPrefix = "Worte und Weise:"
  voicePrefix = "Stimme:"
  versePrefix = "Strophe:"
@@ -12,6 +12,7 @@
  pronunciationPrefix = "Aussprache:"
  interludePrefix = "Zwischenspiel:"
  bridgePrefix = "Bridge:"
+  author-joiner = #(lambda (author-list) (string-join author-list ", "))

  authorFormat =
    #(lambda (noDetails name trail_name birth_year death_year organization)
@@ -31,6 +32,105 @@
              ""
          )))

+  authorContributionFormat =
+    #(lambda* (render-contribution-group render-partial-contribution-group #:key
+        (poetIds '())
+        (translatorIds '())
+        (versePoetData '())
+        (composerIds '())
+        (verseComposerData '())
+        (voiceComposerData '())
+        (compositionIds '())
+        (adaptionTextIds '())
+        (adaptionMusicIds '())
+        (bridgeIds '())
+        (interludeIds '())
+        (year_text #f)
+        (year_translation #f)
+        (year_melody #f)
+        (year_composition #f)
+        (year_adaption_text #f)
+        (year_adaption_music #f)
+        (poetAndComposerEqualPrefix "")
+        (poetPrefix "")
+        (composerPrefix "")
+        (translationPrefix "")
+        (pronunciationPrefix "")
+        (compositionPrefix "")
+        (adaptionTextPrefix "")
+        (adaptionMusicPrefix "")
+        (bridgePrefix "")
+        (interludePrefix ""))
+      (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 poetAndComposerEqualPrefix poetIds)
+            (if (equal? year_text year_melody) year_text (join-present (list year_text year_melody) "/"))
+          ) ", ")
+          #f)
+        (list
+          (if (and (null? poetIds) (null? versePoetData) (null? translatorIds)) #f
+            (string-append
+              poetPrefix
+              " "
+              (join-present (list
+                (join-present (list
+                  (render-contribution-group "" poetIds)
+                  year_text
+                ) ", ")
+                (render-partial-contribution-group 'versePrefix versePoetData)
+                (join-present (list
+                  (render-contribution-group adaptionTextPrefix adaptionTextIds)
+                  year_adaption_text
+                ) ", ")
+                (join-present (list
+                  (render-contribution-group translationAuthorPrefix translatorIds)
+                  year_translation
+                ) ", ")
+              ) "; ")
+            ))
+          (if (and
+                (null? composerIds)
+                (null? compositionIds)
+                (null? adaptionMusicIds)
+                (null? verseComposerData)
+                (null? voiceComposerData)
+                (null? bridgeIds)
+                (null? interludeIds)) #f
+            (string-append
+              composerPrefix
+              " "
+              (join-present (list
+                (join-present (list
+                  (render-contribution-group "" composerIds)
+                  year_melody
+                ) ", ")
+                (render-partial-contribution-group 'versePrefix verseComposerData)
+                (render-partial-contribution-group 'voicePrefix voiceComposerData)
+                (join-present (list
+                  (render-contribution-group compositionPrefix compositionIds)
+                  year_composition
+                ) ", ")
+                (join-present (list
+                  (render-contribution-group adaptionMusicPrefix adaptionMusicIds)
+                  year_adaption_music
+                ) ", ")
+                (render-contribution-group bridgePrefix bridgeIds)
+                (render-contribution-group interludePrefix interludeIds)
+              ) "; ")
+            )))))
+
+
  songinfoMarkup =
    #(make-on-the-fly-markup
      (lambda (layout props m)
@@ -45,13 +145,15 @@
              (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))
+              (concat-markupped-strings (lambda (text)
+                (ly:regex-replace (ly:make-regex "(\\S+)(\\\\\\w+(?:\\s+\\[^\\{\\s]*|\\s*\\{[^\\}]*\\}))(\\S*)") text "\\concat {" 1 "\\line {" 2 "}" 3 "}")))
              (string-with-paragraphs->markuplist (lambda (prefix text)
                (if text
                  (apply append
                    (map
                      (lambda (paragraph)
                        (make-wordwrap-internal-markup-list #t
-                          #{ \markuplist { $(ly:parser-include-string paragraph) } #}))
+                          #{ \markuplist { $(ly:parser-include-string (concat-markupped-strings paragraph)) } #}))
                      (ly:regex-split (ly:make-regex "\r?\n[ \t\r\n]*\n[ \t\r\n]*") (string-append prefix text))))
                  '())))
              (poet-and-composer-markup-list
--- a/private_includes/base/default_style.ily
+++ b/private_includes/base/default_style.ily
@@ -18,6 +18,8 @@ lyricSize = 1.6
 stanzaFormat = "~a."
 refString = "Ref.:"
 refStringWithNumbers = "Ref. ~a:"
+bridgeString = "Bridge:"
+bridgeStringWithNumbers = "Bridge ~a:"
 % hübsche Wiederholungszeichen für den Liedtext
 repStart = "𝄆"
 repStop = "𝄇"
--- a/private_includes/base/footer_with_songinfo.ily
+++ b/private_includes/base/footer_with_songinfo.ily
@@ -30,6 +30,9 @@
      (lambda (a b) (< (cadr a) (cadr b))))
    (list)))

+#(define (join-present items joiner)
+  (string-join (filter (lambda (item) (and (string? item) (not (string-null? (string-trim-both item))))) items) joiner))
+
 #(define-markup-command (print-songinfo layout props) ()
  (define (songinfo-from songId key)
    (let ((song (if (defined? 'SONG_DATA) (assoc-ref SONG_DATA songId) #f)))
@@ -74,11 +77,7 @@
  (define (render-contribution-group contributionPrefix authorIds)
    (if (null? authorIds)
      ""
-      (string-append contributionPrefix " " (string-join (format-authors authorIds) ", ")))
-  )
-
-  (define (join-present items joiner)
-    (string-join (filter (lambda (item) (and (string? item) (not (string-null? (string-trim-both item))))) items) joiner)
+      (string-append contributionPrefix " " ((ly:output-def-lookup layout 'author-joiner) (format-authors authorIds))))
  )

  (define (render-partial-contribution-group prefixLookup authorData)
@@ -94,93 +93,37 @@

  (define (poet-and-composer-from-authors authors)
    (if authors
-      (let (
-            (poetIds (find-author-ids-by 'text authors))
-            (translatorIds (find-author-ids-by 'translation authors))
-            (versePoetData (find-author-id-with-part-numbers 'verse authors))
-            (composerIds (find-author-ids-by 'melody authors))
-            (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))
-            (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_text (chain-assoc-get 'header:year_adaption_text props #f))
-            (year_adaption_music (chain-assoc-get 'header:year_adaption_music props #f))
+      ((ly:output-def-lookup layout 'authorContributionFormat)
+        render-contribution-group
+        render-partial-contribution-group
+        #:poetIds (find-author-ids-by 'text authors)
+        #:translatorIds (find-author-ids-by 'translation authors)
+        #:versePoetData (find-author-id-with-part-numbers 'verse authors)
+        #:composerIds (find-author-ids-by 'melody authors)
+        #: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)
+        #: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_text (chain-assoc-get 'header:year_adaption_text props #f)
+        #:year_adaption_music (chain-assoc-get 'header:year_adaption_music props #f)
+        #:poetAndComposerEqualPrefix (ly:output-def-lookup layout 'poetAndComposerEqualPrefix)
+        #:poetPrefix (ly:output-def-lookup layout 'poetPrefix)
+        #:composerPrefix (ly:output-def-lookup layout 'composerPrefix)
+        #:translationPrefix (ly:output-def-lookup layout 'translationPrefix)
+        #:pronunciationPrefix (ly:output-def-lookup layout 'pronunciationPrefix)
+        #:compositionPrefix (ly:output-def-lookup layout 'compositionPrefix)
+        #:adaptionTextPrefix (ly:output-def-lookup layout 'adaptionTextPrefix)
+        #:adaptionMusicPrefix (ly:output-def-lookup layout 'adaptionMusicPrefix)
+        #:bridgePrefix (ly:output-def-lookup layout 'bridgePrefix)
+        #:interludePrefix (ly:output-def-lookup layout 'interludePrefix)
      )
-        (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)
-              (if (equal? year_text year_melody) year_text (join-present (list year_text year_melody) "/"))
-            ) ", ")
-            #f)
-          (list
-            (if (and (null? poetIds) (null? versePoetData) (null? translatorIds)) #f
-              (string-append
-                (ly:output-def-lookup layout 'poetPrefix)
-                " "
-                (join-present (list
-                  (join-present (list
-                    (render-contribution-group "" poetIds)
-                    year_text
-                  ) ", ")
-                  (render-partial-contribution-group 'versePrefix versePoetData)
-                  (join-present (list
-                    (render-contribution-group (ly:output-def-lookup layout 'translationAuthorPrefix) 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? adaptionMusicIds)
-                  (null? verseComposerData)
-                  (null? voiceComposerData)
-                  (null? bridgeIds)
-                  (null? interludeIds)) #f
-              (string-append
-                (ly:output-def-lookup layout 'composerPrefix)
-                " "
-                (join-present (list
-                  (join-present (list
-                    (render-contribution-group "" composerIds)
-                    year_melody
-                  ) ", ")
-                  (render-partial-contribution-group 'versePrefix verseComposerData)
-                  (render-partial-contribution-group 'voicePrefix voiceComposerData)
-                  (join-present (list
-                    (render-contribution-group (ly:output-def-lookup layout 'compositionPrefix) compositionIds)
-                    year_composition
-                  ) ", ")
-                  (join-present (list
-                    (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)
-                ) "; ")
-              )))))
      (list #f #f)
    )
  )
--- a/private_includes/base/verses_with_chords.ily
+++ b/private_includes/base/verses_with_chords.ily
@@ -68,7 +68,7 @@
       \size-box-to-box-style-dependent ##t ##f
         \general-align #X #LEFT \override #`(direction . ,UP) \override #'(baseline-skip . 1) \dir-column \chord-alignment-style-dependent {
           \pad-to-box #'(0 . 0) #`(0 . ,(- verse-text-chord-distance 0.8)) { #text }
-           \size-box-to-box ##f ##t #uptext \score { \chords { g4:m a } \layout { $verselayout } }
+           \size-box-to-box ##f ##t #uptext \score { \chords { g4:m a } \layout { $verselayout #(customized-layout verselayout) } }
         }
         #text
       }
@@ -89,7 +89,7 @@
     (if (and (string? arg) (string-null? arg))
         " "
         #{\markup
-           \score { \new Lyrics { \lyricmode { #(if (ly:music? arg) arg #{ \set stanza = #arg #}) "" } } \layout { $verselayout } }
+           \score { \new Lyrics { \lyricmode { #(if (ly:music? arg) arg #{ \set stanza = #arg #}) "" } } \layout { $verselayout #(customized-layout verselayout) } }
         #}
     )))

@@ -141,7 +141,7 @@
       (make-wrap-newline-markup
               (ly:regex-replace (ly:make-regex "\\(( *)([^,()]*)( *),([^)]*)\\)")
                 (ly:regex-replace (ly:make-regex "(([^ \n]*\\([^()]*,[^()]+\\)[^ \n(]*)+)") (handle-custom-newlines custom-verse-breaks verse) " \\concat { " 1 " } ")
-                "\\textup \\line { \"" 1 "\" " 2 " \"" 3 "\" } \\score { " transp " \\chords { s4 " 4 " } \\layout { $verselayout } }")
+                "\\textup \\line { \"" 1 "\" " 2 " \"" 3 "\" } \\score { " transp " \\chords { s4 " 4 " } \\layout { $verselayout #(customized-layout verselayout) } }")
                )
     ))))

@@ -302,9 +302,10 @@ Chord_lyrics_spacing_engraver =
                (ly:grob-set-property! grob 'extra-spacing-width
                                       (cons (- chord-width-since-last-lyric) (cdr (ly:grob-property grob 'extra-spacing-width '(0 . 0)))))
                (if last-printed-chord
-                  (begin
-                    (if stanza (ly:grob-set-property! stanza 'padding chord-width-since-last-lyric))
-                    (place-at-right-edge grob last-printed-chord 0)
+                  (let ((gap-for-starting-rest 2.0))
+                    (if stanza (ly:grob-set-property! stanza 'padding (+ 1 gap-for-starting-rest)))
+                    (ly:grob-set-parent! grob X last-printed-chord)
+                    (ly:grob-set-property! grob 'X-offset gap-for-starting-rest)
                    )))
            )
        (set! last-lyric-syllable grob)
@@ -366,6 +367,7 @@ Chord_lyrics_spacing_engraver =
          >>
          \layout {
            $verselayout
+            #(customized-layout verselayout)
            ragged-right = ##t
            \context {
              \Lyrics
--- a/public_includes/layout_bottom.ily
+++ b/public_includes/layout_bottom.ily
@@ -2,9 +2,7 @@ MUSIC = { \transposable #TRANSPOSITION \MUSIC }

 LAYOUT = \layout {
  \LAYOUT
-  #(let
-    ((custom-size (ly:output-def-lookup LAYOUT 'size #f)))
-    (if custom-size (layout-set-staff-size custom-size)))
+  #(customized-layout LAYOUT)
 }

 verselayout = \layout {
Author	SHA1	Message	Date
Christoph Wagner	bbd6d44455	Autorensystem flexibilisiert	2026-01-11 20:03:31 +01:00
zuk (Jakob Krueger)	f68e2f10ae	implement default bridge style	2025-12-29 18:06:00 +01:00
Christoph Wagner	463d61fbd9	fix customize layout sizing	2025-12-22 11:29:32 +01:00
tux	2d14a5b632	new engraver for spacing in chordlyrics	2025-12-15 21:41:45 +01:00