include adaptions/editings in author system

This update allows the alttitle header field to accept a list of alternative titles instead of a single value. Each title in the list is processed and added to the table of contents as an alternative title, enhancing flexibility and usability.

all_base_includes.ly

@@ -1,7 +1,24 @@
 #(define noStandaloneOutput (if (defined? 'noStandaloneOutput) noStandaloneOutput #f))
 
-#(if (defined? 'LAYOUT) #f (load "json_parser.scm"))
+#(define windows? (string-prefix-ci? "windows" (utsname:sysname (uname))))
-#(use-modules (json parser))
+
+#(if (defined? 'LAYOUT) #f
+  (let ((scm-load (lambda (filename) (load (
+    string-append
+      ; on windows the detection of absolute pathes is broken (cause they start with a drive letter and not with a /)
+      ; so we have to use relative pathes for load. That works in frescobaldi, but not if you call lilypond from command line,
+      ; with a relative path to the .ly file, so we use absolute pathes on posix systems, where it works.
+      (if windows?
+        ""
+        (string-append (dirname (current-filename)) file-name-separator-string))
+      "scm" file-name-separator-string filename
+    )))))
+    (scm-load "json_parser.scm")
+    (scm-load "resolve_inherits.scm")
+    (scm-load "yaml_parser.scm")))
+#(define AUTHOR_DATA (if (defined? 'AUTHOR_DATA) AUTHOR_DATA (parse-yml-file "../../lilypond-song-includes/data/authors.yml")))
+#(define SONG_DATA (if (defined? 'SONG_DATA) SONG_DATA (parse-yml-file "../../lilypond-song-includes/data/songs.yml")))
+
 \include "basic_format_and_style_settings.ly"
 \include "eps_file_from_song_dir.ly"
 \include "title_with_category_images.ly"

appendix.ly

@@ -0,0 +1,44 @@
+appendix =
+#(define-void-function (parser location title) (markup?)
+  (define (appendix-item->markup layout props appendix-item)
+    (interpret-markup layout props
+      (markup
+          #:override (cons 'appendixItem:heading (assoc-ref appendix-item "heading"))
+          #:override (cons 'appendixItem:text (assoc-ref appendix-item "text"))
+          (ly:output-def-lookup layout 'appendixItemMarkup))))
+  (ly:book-add-bookpart! (ly:parser-lookup '$current-book)
+  #{
+    \bookpart {
+      \markup { #title }
+      #(for-each
+          (lambda (item)
+            (add-score (ly:make-page-label-marker (string->symbol (car item))))
+            (add-text
+              (make-on-the-fly-markup
+                (lambda (layout props arg) (appendix-item->markup layout props (cdr item)))
+                (make-null-markup)))
+          )
+        (reverse APPENDIX_DATA))
+    }
+  #}))
+
+#(define-markup-command (appendix-ref layout props label) (symbol?)
+  "call page-ref to appendix-item"
+  (interpret-markup layout props
+    (markup #:with-link label
+      #:override (cons 'appendixPage (make-page-ref-markup label "888" "?"))
+      (ly:output-def-lookup layout 'appendixReferenceMarkup))))
+
+\paper {
+  appendixItemMarkup = \markup {
+    \left-column {
+      \line { \large \bold \fromproperty #'appendixItem:heading }
+      \vspace #0.2
+      \sans \wordwrap-field #'appendixItem:text
+      \vspace #0.7
+    }
+  }
+  appendixReferenceMarkup = \markup {
+    \fromproperty #'appendixPage
+  }
+}

basic_format_and_style_settings.ly

@@ -24,6 +24,11 @@
   markup-system-spacing = #'((basic-distance . 1))
   score-markup-spacing = #'((padding . 2))
   top-markup-spacing = #'((basic-distance . 0) (minimum-distance . 0) (padding . 0))
+  refMarkupFormatter = #(lambda (layout props stanzanumbers)
+    (interpret-markup layout props
+    (if (null? stanzanumbers)
+        refString
+        (ly:format refStringWithNumbers (string-join (map (lambda (stanzanumber) (ly:format "~a" stanzanumber)) stanzanumbers) ", ")))))
 }
 
 generalLayout = \layout {
@@ -105,22 +110,35 @@ romanStanza =
   #(define-music-function (parser location) ()
   #{ \override StanzaNumber.style = #'roman #})
 
+override-stanza =
+#(define-music-function (parser location stanzanumber) (number?)
+#{
+  \once \override StanzaNumber.forced-spacing = #stanzanumber % misuse property "forced-spacing" to override the stanzanumber
+#}
+)
+
 stanza =
 #(define-music-function (parser location stanzanumber) (number?)
 #{
   \once \override StanzaNumber.layer = 23 % set this to signal that there is a real stanza and no repeat signs
   \applyContext
   #(lambda (context)
-    (let* ((stanzastyle (ly:assoc-get 'style (ly:context-grob-definition context 'StanzaNumber)))
+    (let* ((stanzanumber (ly:assoc-get 'forced-spacing (ly:context-grob-definition context 'StanzaNumber) stanzanumber))
+           (stanzastyle (ly:assoc-get 'style (ly:context-grob-definition context 'StanzaNumber)))
            (formattedStanzaNumber (format #f (if (eq? stanzastyle 'roman) romanStanzaFormat stanzaFormat) stanzanumber)))
         (ly:context-set-property! context 'stanza formattedStanzaNumber)))
 #}
 )
 
-ref = {
+ref =
+#(define-music-function (stanzanumbers lyrics) ((number-list? (list)) ly:music?)
+#{ \lyricmode {
     \once \override StanzaNumber.layer = 23 % set this to signal that there is a real stanza and no repeat signs
-  \set stanza = \refString
+    \set stanza = #(make-on-the-fly-markup (lambda (layout props m) ((ly:output-def-lookup layout 'refMarkupFormatter) layout props stanzanumbers)) (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.layer = 23 we set that also as stanza.
@@ -148,3 +166,49 @@ repStopWithTag = \lyricmode {
     \set stanza = \markup { \repStop }
   }
 }
+
+rightHyphen = \lyricmode {
+  \once \override StanzaNumber.font-series = #'normal
+  \once \override StanzaNumber.direction = 1
+  \set stanza = "-"
+}
+
+leftHyphen = \lyricmode {
+  \once \override StanzaNumber.font-series = #'normal
+  \set stanza = "-"
+}
+
+multiVerseSkips =
+#(define-music-function (parser location skips) (number?)
+  #{ \tag #'multiVerse { \repeat unfold #skips { \skip4 } } #})
+
+alt =
+#(define-music-function (parser location a b) (ly:music? ly:music?)
+  #{ \tag #'firstVerse { #a } \tag #'multiVerse { #b } #})
+
+updown =
+#(define-music-function (parser location word) (string?)
+#{
+  \lyricmode {
+    \tag #'up { \markup { #(string-capitalize word) } }
+    \tag #'down { \markup { #(string-downcase word) } }
+  }
+#})
+
+dottedExtender = {
+  \override LyricExtender.style = #'dotted-line
+  \override LyricExtender.thickness = 2
+  \override LyricExtender.Y-offset = 0.1
+  \override LyricExtender.stencil =
+    #(lambda (grob)
+      (let* ((stil (ly:lyric-extender::print grob))
+             (nostil (null? stil))
+             (x-ext (if nostil 0 (ly:stencil-extent stil X))))
+         (if nostil
+           stil
+           (make-connected-line
+             (list
+               (cons (car x-ext) 0)
+               (cons (cdr x-ext) 0))
+             grob))))
+}

break_paged_output.ily

@@ -0,0 +1,2 @@
+\include "lilypond-book-preamble.ly"
+#(ly:set-option 'separate-page-formats "pdf")

chord_settings.ly

@@ -38,13 +38,14 @@ shiftChords = #(define-music-function (parser location xshift chords) (number? l
 	$chords
 #})
 
-altChord = #(define-music-function (parser location mainchord altchord) (ly:music? ly:music?)
+altChord =
+#(define-music-function (parser location mainchord altchord) (ly:music? ly:music?)
 (define (chord-namer in-pitches bass inversion context)
 #{
   \markup {
     \translate #'(-0.5 . 0)
     \score {
-      \chords { #mainchord \klamm #altchord }
+      \chords { \transposable #TRANSPOSITION { #(music-clone mainchord) \klamm #(music-clone altchord) } }
       \layout {
         \LAYOUT
         \context {
@@ -138,3 +139,33 @@ generalLayout = \layout {
           }
         }
      #}))
+
+% If you add this engraver to ChordNames Context chords get only printed on chordchanges and if its the first chord after line break.
+Ensure_first_chord_after_line_break_printed_engraver =
+  #(lambda (ctx)
+     (define last-system-column-rank 0)
+     (make-engraver
+      (acknowledgers
+       ((chord-name-interface this-engraver grob source-engraver)
+          (ly:grob-set-property! grob 'after-line-breaking
+            (lambda (grob)
+              (let ((current-system-column-rank (car (ly:grob-spanned-column-rank-interval (ly:grob-system grob)))))
+                (if (and
+                       (ly:context-property ctx 'chordChanges #f)
+                       (ly:grob-property grob 'begin-of-line-visible #f)
+                       (not (= last-system-column-rank current-system-column-rank)))
+                  ; the current chord handling implementation in lilypond uses 'begin-of-line-visible to mark repeated chords
+                  (ly:grob-set-property! grob 'begin-of-line-visible #f))
+                (set! last-system-column-rank current-system-column-rank)
+                (ly:chord-name::after-line-breaking grob)
+                )))))))
+
+% If you add this engraver to ChordNames Context chords get only printed on chordchanges and not at newline.
+Ignoring_newline_chord_changes_engraver =
+  #(lambda (ctx)
+     (make-engraver
+      (acknowledgers
+       ((chord-name-interface this-engraver grob source-engraver)
+         (when (and (ly:context-property ctx 'chordChanges #f) (ly:grob-property grob 'begin-of-line-visible #f))
+                  (ly:grob-suicide! grob)
+                )))))

default_songinfo_style.ly

@@ -2,6 +2,7 @@
   poetPrefix = "Worte:"
   composerPrefix = "Weise:"
   compositionPrefix = "Satz:"
+  adaptionPrefix = "Bearbeitung:"
   poetAndComposerEqualPrefix = "Worte und Weise:"
   voicePrefix = "Stimme:"
   versePrefix = "Strophe:"

default_style.ly

@@ -3,9 +3,9 @@ songMargin = 5
 songInfoFontSize = 0
 songInfoLineWidthFraction = 0.9
 songTitleSize = 6
-songTitleFont = "LilyPond Sans"
+songTitleFont = "Liberation Sans"
-songChordFont = "LilyPond Sans"
+songChordFont = "Liberation Sans"
-songLyricFont = "LilyPond Sans"
+songLyricFont = "Liberation Sans"
 songChordFontSeries = #'bold
 songTextChordAlignment = #'left
 songScoreChordFontSize = 2
@@ -18,6 +18,7 @@ lyricSize = 1.6
 stanzaFormat = "~a."
 romanStanzaFormat = "~@r."
 refString = "Ref.:"
+refStringWithNumbers = "Ref. ~a:"
 % hübsche Wiederholungszeichen für den Liedtext
 repStart = "𝄆"
 repStop = "𝄇"

footer_with_songinfo.ly

@@ -1,15 +1,8 @@
 #(use-modules (ice-9 receive))
-#(define-markup-command (print-songinfo layout props) ()
+#(define (format-author author-format-function authorId noDetails)
-  (define (songinfo-from songId key)
-    (let ((song (if (defined? 'SONG_DATA) (assoc-ref SONG_DATA songId) #f)))
-      (if song
-        (assoc-ref song key)
-        (ly:warning (ly:format "song with id ~a not found" songId)))))
-
-  (define (format-author authorId noDetails)
   (let ((author (if (defined? 'AUTHOR_DATA) (assoc-ref AUTHOR_DATA authorId) #f)))
     (if author
-        ((ly:output-def-lookup layout 'authorFormat)
+      (author-format-function
         noDetails
         (assoc-ref author "name")
         (assoc-ref author "trail_name")
@@ -17,28 +10,42 @@
         (assoc-ref author "death_year")
         (assoc-ref author "organization")
       )
-        "unbekannt")))
+      (if (string-null? authorId)
+          "unbekannt"
+          authorId))))
 
-  (define (format-poet poetId)
+#(define (find-author-ids-by contributionType authors)
-    (string-append (ly:output-def-lookup layout 'poetPrefix) " " (format-author poetId #f)))
+  (if authors
-
-  (define (format-composer composerId)
-    (string-append (ly:output-def-lookup layout 'composerPrefix) " " (format-author composerId #f)))
-
-  (define (format-poet-and-composer authorId)
-    (string-append (ly:output-def-lookup layout 'poetAndComposerEqualPrefix) " " (format-author authorId #f)))
-
-  (define (find-author-ids-by contributionType authors)
     (filter-map (lambda (authordata) (if (member contributionType (cdr authordata)) (car authordata) #f)) authors)
-  )
+    (list)))
 
-  (define (find-author-id-with-part-numbers contributionType authors)
+#(define (find-author-id-with-part-numbers contributionType authors)
+  (if authors
     (filter-map (lambda (authordata)
       (let ((contributionNumbers (filter-map (lambda (contribution) (if (and (list? contribution) (equal? contributionType (car contribution))) (cadr contribution) #f)) (cdr authordata)))
             (authorId (car authordata)))
         (if (null? contributionNumbers) #f (cons authorId contributionNumbers))
       )) authors)
-  )
+    (list)))
+
+#(define-markup-command (print-songinfo layout props) ()
+  (define (songinfo-from songId key)
+    (let ((song (if (defined? 'SONG_DATA) (assoc-ref SONG_DATA songId) #f)))
+      (if song
+        (assoc-ref song key)
+        (ly:warning (ly:format "song with id ~a not found" songId)))))
+
+  (define* (default-author-format authorId #:optional (noDetails #f))
+    (format-author (ly:output-def-lookup layout 'authorFormat) authorId noDetails))
+
+  (define (format-poet poetId)
+    (string-append (ly:output-def-lookup layout 'poetPrefix) " " (default-author-format poetId)))
+
+  (define (format-composer composerId)
+    (string-append (ly:output-def-lookup layout 'composerPrefix) " " (default-author-format composerId)))
+
+  (define (format-poet-and-composer authorId)
+    (string-append (ly:output-def-lookup layout 'poetAndComposerEqualPrefix) " " (default-author-format authorId)))
 
   (define (numbered-contribution-prefix contributionNumbers prefixLookup)
     (string-append
@@ -52,7 +59,7 @@
 
   (define (format-authors authorIds)
     (map (lambda (authorId)
-      (format-author
+      (default-author-format
         authorId
         (if (member authorId referencedAuthors)
           #t
@@ -95,14 +102,16 @@
             (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))
             (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))
             )
-        (if (and (equal? poetIds composerIds) (null? translatorIds) (null? versePoetData) (null? verseComposerData) (null? voiceComposerData) (null? compositionIds) (null? bridgeIds) (null? interludeIds))
+        (if (and (equal? poetIds composerIds) (null? translatorIds) (null? versePoetData) (null? verseComposerData) (null? voiceComposerData) (null? compositionIds) (null? adaptionIds) (null? bridgeIds) (null? interludeIds))
           (list
             (join-present (list
               (render-contribution-group (ly:output-def-lookup layout 'poetAndComposerEqualPrefix) poetIds)
@@ -126,7 +135,7 @@
                   ) ", ")
                 ) "; ")
               ))
-            (if (and (null? composerIds) (null? compositionIds) (null? verseComposerData) (null? voiceComposerData) (null? bridgeIds) (null? interludeIds)) #f
+            (if (and (null? composerIds) (null? compositionIds) (null? adaptionIds) (null? verseComposerData) (null? voiceComposerData) (null? bridgeIds) (null? interludeIds)) #f
               (string-append
                 (ly:output-def-lookup layout 'composerPrefix)
                 " "
@@ -141,6 +150,10 @@
                     (render-contribution-group (ly:output-def-lookup layout 'compositionPrefix) compositionIds)
                     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 'bridgePrefix) bridgeIds)
                   (render-contribution-group (ly:output-def-lookup layout 'interludePrefix) interludeIds)
                 ) "; ")
@@ -213,14 +226,14 @@
   oddFooterMarkup = \markup {
     \fill-line {
       \line { \null }
-      \line { \general-align #Y #DOWN \fractional-line-width \print-songinfo }
+      \line { \if \on-last-page-of-part \general-align #Y #DOWN \fractional-line-width \print-songinfo }
       \line { \if \should-print-page-number \print-pagenumber }
     }
   }
   evenFooterMarkup  = \markup {
     \fill-line {
       \line { \if \should-print-page-number \print-pagenumber }
-      \line { \general-align #Y #DOWN \fractional-line-width \print-songinfo }
+      \line { \if \on-last-page-of-part \general-align #Y #DOWN \fractional-line-width \print-songinfo }
       \line { \null }
     }
   }

inline_score.ly

@@ -6,3 +6,8 @@ inline-score =
     #{
       \transposable #TRANSPOSITION #music
     #})
+
+fill-midi =
+#(define-void-function (music) (ly:music?)
+   (set! INLINESCOREMUSIC #{ \INLINESCOREMUSIC #music #})
+)

scm/resolve_inherits.scm

@@ -0,0 +1,22 @@
+(define (resolve-inherit-entry-in-list alist entry)
+  (let* ((key (car entry))
+        (attributes (cdr entry))
+        (inherits (assoc-ref attributes "inherits")))
+    (if inherits
+      (let* ((alist-without-entry (alist-delete key alist))
+            (inherit-entry (assoc inherits alist-without-entry))
+            (inherits-attributes (if inherit-entry (alist-copy (cdr (resolve-inherit-entry-in-list alist-without-entry inherit-entry)))))
+            (override-attributes (alist-delete "inherits" attributes)))
+        (if inherit-entry
+          (begin
+            (for-each (lambda (attribute) (assoc-set! inherits-attributes (car attribute) (cdr attribute))) override-attributes)
+            (cons key inherits-attributes)
+          )
+          (ly:error "~a can not inherit from ~a" key inherits))
+      )
+      entry
+    )))
+
+(define (resolve-inherits alist)
+  (map (lambda (entry) (resolve-inherit-entry-in-list alist entry)) alist)
+)

scm/yaml_parser.scm

@@ -0,0 +1,25 @@
+(if (not windows?) (use-modules (ice-9 popen)))
+(use-modules (ice-9 textual-ports) (json parser))
+
+; We use Python to convert the data yamls like the authors.yml to json, that we can parse in scheme.
+; Windows does not like Pipes, so we use a tmpfile instead.
+; Be sure you have PyYAML installed. On Windows that could be done for example like "py -m pip install PyYAML"
+(define (yml-file->scm filename)
+  (if windows?
+    (let* ((port (make-tmpfile #f))
+            (tmpfilepath (port-filename port))
+            (ignore (close-port port))
+            (python_code (string-append "import sys, yaml, json; f = open(r'" tmpfilepath "', 'w'); f.write(json.dumps(yaml.safe_load(open(r'" filename "')))); f.close()"))
+            (status (system (string-append (search-executable '("python3" "python" "py")) " -X utf8 -c \"" python_code "\"")))
+            (readport (open-file tmpfilepath "r" #:encoding "UTF-8"))
+            (json (get-string-all readport)))
+      (close-port readport)
+      (delete-file tmpfilepath)
+      (json-string->scm (if (status:exit-val status) json "{}")))
+    (let* ((python_code (string-append "import sys, yaml, json; print(json.dumps(yaml.safe_load(open(r'" filename "'))))"))
+            (pipe (open-pipe (string-append "PYTHONHOME='' " (search-executable '("python3" "python" "py")) " -X utf8 -c \"" python_code "\"") OPEN_READ))
+            (json (get-string-all pipe)))
+      (close-pipe pipe)
+      (json-string->scm json))))
+
+(define (parse-yml-file filename) (resolve-inherits (yml-file->scm filename)))

snippet_include.ly

@@ -3,6 +3,3 @@
 #(define noDefaultOutput (if (defined? 'noDefaultOutput) noDefaultOutput #f))
 
 \include #(if noDefaultOutput "void.ly" "all_base_includes.ly")
-
-#(define AUTHOR_DATA (if (defined? 'AUTHOR_DATA) AUTHOR_DATA (call-with-input-file "../data/authors.json" json->scm)))
-#(define SONG_DATA (if (defined? 'SONG_DATA) SONG_DATA (call-with-input-file "../data/songs.json" json->scm)))

standalone_output.ly

@@ -10,6 +10,14 @@ verselayout = \layout {
     \override ChordName.font-size = \songTextChordFontSize
   }
 }
+
+LAYOUT = \layout {
+  \LAYOUT
+  #(let
+    ((custom-size (ly:output-def-lookup LAYOUT 'size #f)))
+    (if custom-size (layout-set-staff-size custom-size)))
+}
+
 TEXT = \markuplist {
   \override #`(transposition . ,TRANSPOSITION)
   \override #`(verselayout . ,verselayout)
@@ -18,37 +26,35 @@ TEXT = \markuplist {
   \TEXT
 }
 
-% nur Output wenn noStandaloneOutput auf false steht
+#(if (not noStandaloneOutput)
-output = #(if (not noStandaloneOutput)
+(begin
-#{
+  (let ((header (ly:book-header HEADER)) (paper (ly:book-paper HEADER)))
-  \bookpart {
+    (if header (set! $defaultheader header))
-    \HEADER
+    (if paper (set! $defaultpaper paper))
-
+  )
+  (add-score #{
     \score {
       \MUSIC
       \layout { \LAYOUT }
-    }
+    }#})
-
+  (add-score TEXT)
-    \TEXT
+  (add-score #{
-
     \score {
       \unfoldRepeats { \MUSIC \INLINESCOREMUSIC }
       \midi {
         \context {
           \Score
           % Tempo des midi files
-          tempoWholesPerMinute = #(ly:make-moment midiQuarterNoteSpeed 4)
+          tempoWholesPerMinute = #(/ midiQuarterNoteSpeed 4)
+        }
+        \context {
+          \Staff
+          \remove "Staff_performer"
+        }
+        \context {
+          \Voice
+          \consists "Staff_performer"
         }
       }
-    }
+    }#})
-
+))
-
-  }
-#}
-)
-
-% if we don't want a standalone output, cause we compile a book, we just have an empty output here,
-% so lilypond does not generate output for this song
-\book {
-  \bookpart { \output }
-}

swing_style.ly

@@ -46,3 +46,76 @@ swing = \mark \markup {
     }
   }
 }
+
+swingOff = \mark \markup {
+  \line \general-align #Y #DOWN {
+    \score {
+      \new Staff \with {
+        fontSize = #-2
+        \override StaffSymbol.line-count = #0
+%        \override VerticalAxisGroup.Y-extent = #'(0 . 0)
+      }
+      \relative {
+        \stemUp
+        \override Score.SpacingSpanner.common-shortest-duration = #(ly:make-moment 3 16)
+        \override Beam.positions = #'(2 . 2)
+        h'8[ h8]
+      }
+      \layout {
+        ragged-right= ##t
+        indent = 0
+        \context {
+          \Staff \remove "Clef_engraver"
+          \remove "Time_signature_engraver"
+        }
+      }
+    }
+    " ="
+    \score {
+      \new Staff \with {
+        fontSize = #-2
+        \override StaffSymbol.line-count = #0
+%        \override VerticalAxisGroup.Y-extent = #'(0 . 0)
+      }
+      \relative {
+        \stemUp
+        \override Score.SpacingSpanner.common-shortest-duration = #(ly:make-moment 3 16)
+        \override Beam.positions = #'(2 . 2)
+        h'8 [h8]
+      }
+      \layout {
+        ragged-right= ##t
+        indent = 0
+        \context {
+          \Staff
+          \remove "Clef_engraver"
+          \remove "Time_signature_engraver"
+        }
+      }
+    }
+  }
+}
+
+\include "swing.ly"
+
+swingMusic =
+#(define-music-function (parser location music) (ly:music?)
+  (define (partial-duration-length m)
+    (let ((name (ly:music-property m 'name))
+          (es (ly:music-property m 'elements))
+          (e (ly:music-property m 'element)))
+      (if (pair? es)
+        (partial-duration-length (car es))
+        (if (ly:music? e)
+          (if (and (eq? name 'ContextSpeccedMusic) (eq? (ly:music-property e 'name) 'PartialSet))
+            (ly:duration->moment (ly:music-property e 'duration))
+            (if (eq? name 'NoteEvent)
+              ZERO-MOMENT
+              (partial-duration-length e)
+            )
+          )
+          ZERO-MOMENT))))
+#{
+  \swing
+  \applySwingWithOffset 8 #'(2 1) #(partial-duration-length music) #music
+#})

title_with_category_images.ly

@@ -41,22 +41,20 @@
      (ly:make-stencil
       (list 'embedded-ps
              (ly:format
-              "[/Action /GoTo /View [/Fit] /Title (~a) /OUT pdfmark" (pdf-encode title)))
+              "[/Action /GoTo /View [/XYZ -4 currentpagedevice /PageSize get 1 get 4 add null] /Title (~a) /OUT pdfmark" (pdf-encode title)))
       empty-interval empty-interval
       ;'(0 . 0) '(0 . 0)
       ))
 
 #(define-markup-command (title-with-category-images layout props right)(boolean?)
    (interpret-markup layout props
-     (let* ((title (chain-assoc-get 'header:title props #f))
+     (let* ((title (chain-assoc-get 'header:title props ""))
-            (pdfbookmark (chain-assoc-get 'header:songfilename props title)))
+            (starttext (chain-assoc-get 'header:starttext props #f))
+            (pdfbookmark (if starttext (string-append starttext " | " title) title)))
      (if title
-     ;(if (chain-assoc-get 'header:categories props #f)
        (if right
          #{\markup { \title-to-pdf-toc #pdfbookmark \fill-line \general-align #Y #UP { \null \bookTitleMarkupCustom \category-images } } #}
          #{\markup { \title-to-pdf-toc #pdfbookmark \fill-line \general-align #Y #UP { \category-images \bookTitleMarkupCustom \null } } #})
-       ;#{\markup \fill-line \general-align #Y #UP { \null \bookTitleMarkupCustom \null } #})
-      ;(make-null-markup))
       #{ \markup { " " } #})
      )))
 

toc_include.ly

@@ -114,7 +114,33 @@
    (set! category-index-items (lambda ()
           (append-map (lambda (kv) (reverse (hashq-ref category-index-hash (car kv) (list)))) category-names))))
 
+% code for author index
+#(define*-public (add-author-index-item! authorIDs markup-symbol text #:optional label) #f)
+#(define-public (author-index-items) #f)
 
+#(let ((author-index-hash (make-hash-table)))
+   (set! add-author-index-item!
+   (lambda* (authorIDs markup-symbol text #:optional (label (gensym "index")))
+     (for-each (lambda (authorID)
+            (let* ((authorsym (string->symbol authorID))
+                   (authorlist (hashq-ref author-index-hash authorsym
+                              (list (list label 'indexAuthorMarkup authorID)))))
+                (hashq-set! author-index-hash authorsym
+                  (cons (list label markup-symbol text) authorlist))
+                ))
+       authorIDs)
+       (make-music 'EventChord
+         'page-marker #t
+         'page-label label
+         'elements (list (make-music 'LabelEvent
+         'page-label label)))))
+   (set! author-index-items (lambda ()
+          (append-map cdr
+            (sort-list
+              (hash-map->list
+                (lambda (authorsym authorlist) (cons (string-downcase (symbol->string authorsym)) (reverse authorlist)))
+                author-index-hash)
+              (lambda (a b) (string-ci<? (car a) (car b))))))))
 
 
 #(define-markup-command (with-link-symbol-ref layout props symbol arg)
@@ -140,16 +166,13 @@
      (markup #:override (cons 'baseline-skip 3.5) (if catname (make-left-column-markup (string-split (cadr catname) #\newline)) category)))))
 
 #(define-markup-command (index-item-with-pattern layout props)()
-     (let (
+    (let* (
             (text (chain-assoc-get 'index:text props))
             (page (chain-assoc-get 'index:page props))
             (width (-
                      (chain-assoc-get 'line-width props)
                      (interval-length (ly:stencil-extent (interpret-markup layout props "XXXX") X))))
-            )
+            (lines-reversed
-     (interpret-markup layout props
-       (make-column-markup
-         (let ((revlist
                 (if (markup? text)
                     (list text)
                     (reverse (map (lambda (stil) (markup #:stencil stil))
@@ -158,17 +181,25 @@
                                 (list (cons 'line-width width) (cons 'font-shape 'italic))
                                 (list (cons 'line-width width))) props) #f
                         (chain-assoc-get 'rawtext text))))))
-               (target-size-markup
+            (last-line-with-dots (make-fill-with-pattern-markup 1 RIGHT "." (car lines-reversed) page))
+            (lines-without-dots (cdr lines-reversed))
+            (target-line-size-markup
                  (make-column-markup
                    (list
                     (make-simple-markup "Agj")
                     (make-vspace-markup 0.2))))
             )
-               (reverse (map (lambda (m)
+      (interpret-markup layout props
-                               (make-size-box-to-box-markup #f #t m target-size-markup))
+        (make-size-box-to-box-markup #f #t
-                          (cons
+          (make-with-link-symbol-ref-markup 'index:label
-                           (make-with-link-symbol-ref-markup 'index:label (make-fill-with-pattern-markup 1 RIGHT "." (car revlist) page))
+            (make-column-markup
-                           (cdr revlist)))))))))
+              (reverse (cons
+                          last-line-with-dots
+                          (map (lambda (m) (make-size-box-to-box-markup #f #t m target-line-size-markup)) lines-without-dots)))))
+          ; this column is just to have a reference height for resizing
+          (make-column-markup
+            (reverse (map (lambda (m) (make-size-box-to-box-markup #f #t m target-line-size-markup)) (cons last-line-with-dots lines-without-dots))))
+                          ))))
 
 \paper {
   indexItemMarkup = \markup {
@@ -182,7 +213,16 @@
     \fill-line { \line { \vcenter \category-image-symbol-ref #7 #'index:text \hspace #3 \vcenter \sans \bold \fontsize #3 \category-name-symbol-ref #'index:text } \null }
     \vspace #.4
   }
-
+  indexAuthorMarkup = \markup \override #'(baseline-skip . 1.5) \left-column {
+    \vspace #1
+    \sans \bold \fontsize #3
+      #(make-on-the-fly-markup
+        (lambda (layout props m)
+          (interpret-markup layout props
+            (make-justify-string-markup (format-author (ly:output-def-lookup layout 'authorFormat) (chain-assoc-get 'index:text props #f) #t))))
+        (make-null-markup))
+    \vspace #.4
+  }
 }
 
 #(define (prepare-item-markup items layout)
@@ -200,7 +240,8 @@
   ( _i "Outputs index alphabetical sorted or in categories" )
     (let ((items (case index-type
             ((alphabetical) index-items)
-            ((categories) category-index-items)))
+            ((categories) category-index-items)
+            ((authors) author-index-items)))
           (title (interpret-markup layout props title-markup)))
       (cons title
       (interpret-markup-list layout props
@@ -219,29 +260,176 @@ indexSection =
    "Add a section line to the alphabetical index, using @code{indexSectionMarkup} paper variable markup. This can be used to divide the alphabetical index into different sections, for example one section for each first letter."
    (add-index-item! 'indexSectionMarkup text sorttext))
 
-#(define (extract-var-from-module module sym)
+#(define (extract-and-check-vars-from-header bookheader varlist)
-  (let ((variableref (assoc-ref module sym)))
+  (let* ((headervars (hash-map->list cons (struct-ref (ly:book-header bookheader) 0)))
-    (if variableref (variable-ref variableref) #f))
+         (extract-var-and-check (lambda (headervar)
-  )
+           (let* ((variableref (assoc-ref headervars headervar))
+                  (extracted (if variableref (variable-ref variableref) #f)))
+              (if (and extracted (not (and (string? extracted) (string-null? extracted)))) extracted #f)))))
+    (map (lambda (varsymbol)
+      (cons varsymbol (extract-var-and-check varsymbol))
+    ) varlist)))
 
 headerToTOC = #(define-music-function (parser location header label) (ly:book? symbol?)
+    (define (all-author-ids 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))
+            (adaptionIds (find-author-ids-by 'adaption authors))
+            (bridgeIds (find-author-ids-by 'bridge authors))
+            (interludeIds (find-author-ids-by 'interlude authors)))
+        (delete-duplicates
+          (append poetIds translatorIds (map car versePoetData) composerIds (map car verseComposerData) (map car voiceComposerData) compositionIds adaptionIds bridgeIds interludeIds))
+    ))
     (let*
       (
-       (headervars (hash-map->list cons (struct-ref (ly:book-header header) 0)))
+       (extractedheadervars (extract-and-check-vars-from-header header '(title starttext alttitle categorytitle categories authors)))
-       (extract-var-and-check (lambda (headervar) (let
+       (title (assq-ref extractedheadervars 'title))
-                                                   ((extracted (extract-var-from-module headervars headervar)))
+       (starttext (assq-ref extractedheadervars 'starttext))
-                                                   (if (and extracted (not (string-null? extracted))) extracted #f)
+       (alttitle (assq-ref extractedheadervars 'alttitle))
-                                                    )))
+       (categorytitle (assq-ref extractedheadervars 'categorytitle))
-       (title (extract-var-and-check 'title))
+       (categories (assq-ref extractedheadervars 'categories))
-       (alttitle (extract-var-and-check 'alttitle))
+       (authors (assq-ref extractedheadervars 'authors))
-       (altalttitle (extract-var-and-check 'altalttitle))
-       (categorytitle (extract-var-and-check 'categorytitle))
-       (categories (extract-var-and-check 'categories))
        (add-to-toc! (lambda (toctitle tocmarkup)
                       (add-index-item! 'indexItemMarkup tocmarkup toctitle label)))
        )
            (if categories (add-category-index-item! (string-tokenize categories) 'indexItemMarkup (cons (list (cons 'rawtext (if categorytitle categorytitle title))) '()) label))
-           (if alttitle (add-to-toc! alttitle (cons (list (cons 'rawtext alttitle) (cons 'alternative #t)) '())))
+           (if authors (add-author-index-item! (all-author-ids authors) 'indexItemMarkup (cons (list (cons 'rawtext (if categorytitle categorytitle title))) '()) label))
-           (if altalttitle (add-to-toc! altalttitle (cons (list (cons 'rawtext altalttitle) (cons 'alternative #t)) '())))
+           (if starttext (add-to-toc! starttext (cons (list (cons 'rawtext starttext) (cons 'alternative #t)) '())))
+           (if alttitle
+               (if (list? alttitle)
+                   (for-each (lambda (alt)
+                                (add-to-toc! alt (cons (list (cons 'rawtext alt) (cons 'alternative #t)) '())))
+                             alttitle)
+                   (add-to-toc! alttitle (cons (list (cons 'rawtext alttitle) (cons 'alternative #t)) '()))))
            (if title (add-to-toc! title (cons (list (cons 'rawtext title)) '())) #{ #})
     ))
+
+
+%% https://github.com/NalaGinrut/guile-csv/blob/master/csv/csv.scm
+
+#(define* (sxml->csv sxml port #:key (delimiter #\,))
+  (let* ((d (string delimiter))
+         (csv (map (lambda (l) (string-join l d)) sxml)))
+    (for-each (lambda (l)
+                (format port "~a~%" l))
+              csv)))
+
+#(define csv-write sxml->csv)
+
+#(define-markup-command (write-toc-csv layout props) ()
+  (define (csv-escape field)
+    (if (string-null? field)
+        field
+        (string-append
+          "\""
+          (ly:string-substitute "\n" "\\n"
+            (ly:string-substitute "\"" "\\\"" field))
+          "\"")))
+  (define (format-authors authorIds)
+    (string-join (map (lambda (authorId) (format-author (ly:output-def-lookup layout 'authorFormat) authorId #f)) authorIds) ", "))
+  (define cr-regex (ly:make-regex "\r"))
+  (define crlf-regex (ly:make-regex "\r\n"))
+  (define para-sep-regex (ly:make-regex "\n[ \t\n]*\n[ \t\n]*"))
+  (define whitespace-regex (ly:make-regex "[ \t\n]+"))
+  (define leading-whitespace-regex (ly:make-regex "^[ \t\n]+"))
+  (define trailing-whitespace-regex (ly:make-regex "[ \t\n]+$"))
+  (define (cleanup-whitespaces str)
+    (ly:regex-replace leading-whitespace-regex
+      (ly:regex-replace trailing-whitespace-regex
+        (ly:regex-replace whitespace-regex str " ")
+        "")
+      ""))
+  (define (format-info-paragraphs text)
+    (let* ((para-strings (ly:regex-split
+                        para-sep-regex
+                        (ly:regex-replace
+                         cr-regex
+                         (ly:regex-replace crlf-regex text "\n")
+                         "\n")))
+         (para-lines (map cleanup-whitespaces para-strings)))
+    (string-join para-lines "\n")))
+  (define (generate-toc-csv labelPageTable)
+    (let ((song-lines (map (lambda (song)
+            (let* ((filename (symbol->string (car song)))
+                   (songvars (cdr song))
+                   (page-number (number->string (assoc-get (assq-ref songvars 'label) labelPageTable)))
+                   (extractedheadervars (extract-and-check-vars-from-header (assq-ref songvars 'header)
+                      '(title starttext alttitle categorytitle categories authors year_text year_melody year_translation year_composition year_adaption infotext translation pronunciation copyright source)))
+                   (headervar-or-empty (lambda (varsym)
+                     (let ((extracted (assq-ref extractedheadervars varsym)))
+                       (if extracted extracted ""))))
+                   (authors (assq-ref extractedheadervars 'authors))
+                   (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))
+                   (adaptionIds (find-author-ids-by 'adaption authors))
+                   (bridgeIds (find-author-ids-by 'bridge authors))
+                   (interludeIds (find-author-ids-by 'interlude authors)))
+              (map csv-escape
+                (list
+                  filename
+                  page-number
+                  (headervar-or-empty 'title)
+                  (headervar-or-empty 'starttext)
+                  (let ((alttitle-value (headervar-or-empty 'alttitle)))
+                    (if (list? alttitle-value)
+                        (string-join alttitle-value ", ")  ; Wenn eine Liste, dann zusammenfügen
+                        alttitle-value))  ; Wenn kein Liste, den originalen Wert verwenden
+
+                  (headervar-or-empty 'categorytitle)
+                  (headervar-or-empty 'categories)
+                  (format-authors (append poetIds (map car versePoetData)))
+                  (format-authors translatorIds)
+                  (format-authors (append composerIds compositionIds adaptionIds 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 'copyright)
+                  (headervar-or-empty 'source)
+                  (format-info-paragraphs (headervar-or-empty 'infotext))
+                  (format-info-paragraphs (headervar-or-empty 'translation))
+                  (format-info-paragraphs (headervar-or-empty 'pronunciation))
+              ))))
+            (alist-delete 'imagePage (alist-delete 'emptyPage song-list)))))
+    (call-with-output-file "toc.csv"
+      (lambda (port)
+       (csv-write (cons '(
+        "filename"
+        "page-number"
+        "title"
+        "starttext"
+        "alttitle"
+        "categorytitle"
+        "categories"
+        "poets"
+        "translators"
+        "composers"
+        "year_text"
+        "year_melody"
+        "year_translation"
+        "year_composition"
+        "year_adaption"
+        "copyright"
+        "source"
+        "infotext"
+        "translation"
+        "pronunciation"
+        ) song-lines) port))
+  )))
+  ; we use a delayed stencil to have all the page references available
+  (ly:make-stencil
+    `(delay-stencil-evaluation
+      ,(delay (let* ((table (ly:output-def-lookup layout 'label-page-table)))
+        (generate-toc-csv (if (list? table) table '()))
+        empty-stencil)))))

verses_with_chords.ly

@@ -263,6 +263,9 @@
           >>
           \layout {
             \verselayout
+            #(let
+              ((custom-size (ly:output-def-lookup verselayout 'size #f)))
+              (if custom-size (layout-set-staff-size custom-size)))
             ragged-right = ##t
             \context {
               \Lyrics
@@ -277,6 +280,7 @@
               \ChordNames
               \override VerticalAxisGroup.staff-affinity = ##f
               \override ChordName.extra-spacing-width = #'(-0.1 . 0.1)
+              \consists \Ensure_first_chord_after_line_break_printed_engraver
             }
             \context {
               \Score