gibt nur noch default style, alles andere in Liederbuchrepos

basic_format_and_style_settings.ly

@@ -1,10 +1,9 @@
 \language "deutsch"
 
+\include "default_style.ly"
 \include "default_author_style.ly"
 \include "default_songinfo_style.ly"
 \include "footer_with_songinfo.ly"
-\include "styles.ly"
-\include #(ly:format "styles/~a.ly" songStyle)
 
 \include #(if (defined? 'customStyleOverridesFile) customStyleOverridesFile "void.ly")
 
@@ -95,14 +94,8 @@ schwarzkopf =
    \override NoteHead.color = #grey
   #})
 
-% hübsche Wiederholungszeichen für den Liedtext
-repStart = "𝄆"
-repStop = "𝄇"
-
-stanzaFormat = "~a."
 stanza =
   #(define-music-function (parser location stanzanumber) (number?)
   #{ \set stanza = #(ly:format stanzaFormat stanzanumber) #})
 
-refString = "Ref.:"
 ref = { \set stanza = \refString }

default_author_style.ly

@@ -6,17 +6,23 @@
               (trail_name (chain-assoc-get 'author:trail_name props #f))
               (birth_year (chain-assoc-get 'author:birth_year props #f))
               (death_year (chain-assoc-get 'author:death_year props #f))
-             (organization (chain-assoc-get 'author:organization props #f)))
+              (organization (chain-assoc-get 'author:organization props #f))
+              (string-present (lambda (str) (and str (not (and (string? str) (string-null? str))))))
+              (render_informations (lambda (infolist) (string-append (car infolist) (if (null? (cdr infolist)) "" (string-append " (" (string-join (cdr infolist) ", ") ")")))))
+              )
           (interpret-markup layout props
-            (string-append
+            (if (or (string-present trail_name) (string-present name))
+              (render_informations (filter string-present (list
+                trail_name
                 name
-              (if trail_name (ly:format " (~a)" trail_name) "")
+                (if (and (string-present birth_year) (string-present death_year))
-              (if (and birth_year death_year)
+                  (ly:format "~a‒~a" birth_year death_year)
-                (ly:format ", (~a‒~a)" birth_year death_year)
+                  (if (string-present birth_year)
-                (if birth_year
+                    (ly:format "*~a" birth_year)
-                  (ly:format ", (*~a)" birth_year)
+                    (if (string-present death_year) (ly:format "†~a" death_year) "")))
-                  (if death_year (ly:format ", (†~a)" death_year) "")))
+                organization
-              (if organization (ly:format ", ~a" organization) "")
+              )))
+              ""
           ))))
       (make-null-markup)
     )

default_style.ly

@@ -12,3 +12,8 @@ songTextLineHeigth = 5
 songTocColumns = 3
 globalSize = 15
 lyricSize = 1.6
+stanzaFormat = "~a."
+refString = "Ref.:"
+% hübsche Wiederholungszeichen für den Liedtext
+repStart = "𝄆"
+repStop = "𝄇"

styles/bock.ly

@@ -1,14 +0,0 @@
-songFormatAndSize = "a6landscape"
-songMargin = 8
-songInfoFontSize = -1.5
-songTitleFont = "Britannic T. custom"
-songChordFont = "TimesNewRomanPS"
-songLyricFont = "Arial"
-songChordFontSeries = #'normal
-songTextChordAlignment = #'left
-songScoreChordFontSize = 3
-songTextChordFontSize = 2
-songTextLineHeigth = 5.5
-songTocColumns = 3
-globalSize = 15
-lyricSize = 1.6

styles/börnel.ly

@@ -1,14 +0,0 @@
-songFormatAndSize = "b6landscape"
-songMargin = 5
-songInfoFontSize = -3.5
-songTitleFont = "Oregano"
-songChordFont = "TeX Gyre Heros"
-songLyricFont = "Liberation Sans"
-songChordFontSeries = #'bold
-songTextChordAlignment = #'center
-songScoreChordFontSize = 0
-songTextChordFontSize = \songScoreChordFontSize
-songTextLineHeigth = 5
-songTocColumns = 3
-globalSize = 15
-lyricSize = 1.6

styles/büdel.ly

@@ -1,14 +0,0 @@
-songFormatAndSize = "a5"
-songMargin = 5
-songInfoFontSize = 0
-songTitleFont = "Fontin Bold"
-songChordFont = "Fontin"
-songLyricFont = "FontinSans"
-songChordFontSeries = #'bold
-songTextChordAlignment = #'left
-songScoreChordFontSize = 2
-songTextChordFontSize = 2
-songTextLineHeigth = 5.3
-songTocColumns = 2
-globalSize = 14
-lyricSize = 1.6