add default chordName exceptions

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,10 +1,21 @@
 #(define noStandaloneOutput (if (defined? 'noStandaloneOutput) noStandaloneOutput #f))
 
+#(define windows? (string-prefix-ci? "windows" (utsname:sysname (uname))))
+
 #(if (defined? 'LAYOUT) #f
-  (let ((scmdir (string-append (dirname (current-filename)) file-name-separator-string "scm" file-name-separator-string)))
-    (load (string-append scmdir "json_parser.scm"))
-    (load (string-append scmdir "resolve_inherits.scm"))
-    (load (string-append scmdir "yaml_parser.scm"))))
+  (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")))
 
@@ -17,6 +28,7 @@
 \include "arrows_in_scores.ly"
 \include "swing_style.ly"
 \include "inline_score.ly"
+\include "custom_indentation.ily"
 
 % reset important variables
 LAYOUT = \layout { \generalLayout }

appendix.ly

@@ -26,7 +26,7 @@ appendix =
   "call page-ref to appendix-item"
   (interpret-markup layout props
     (markup #:with-link label
-      #:override (cons 'appendixPage (make-page-ref-markup label "XXX" "?"))
+      #:override (cons 'appendixPage (make-page-ref-markup label "888" "?"))
       (ly:output-def-lookup layout 'appendixReferenceMarkup))))
 
 \paper {

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 {
@@ -38,7 +43,7 @@ generalLayout = \layout {
   }
   \context {
     \Staff
-    \accidentalStyle modern
+    \accidentalStyle modern-voice-cautionary
     \consists Merge_rests_engraver
   }
   \context {
@@ -66,6 +71,7 @@ generalLayout = \layout {
     \override Stem.layer = 2
     \override Flag.layer = 2
     \override Beam.layer = 2
+    \override Accidental.layer = 2
   }
 }
 
@@ -81,11 +87,13 @@ secondVoiceStyle = {
   \override Stem.color = #grey
   \override Flag.color = #grey
   \override Beam.color = #grey
+  \override Accidental.color = #grey
   \override NoteHead.layer = 1
   \override Dots.layer = 1
   \override Stem.layer = 1
   \override Flag.layer = 1
   \override Beam.layer = 1
+  \override Accidental.layer = 1
 }
 
 firstVoiceStyle = {
@@ -94,6 +102,7 @@ firstVoiceStyle = {
   \override Stem.color = #black
   \override Flag.color = #black
   \override Beam.color = #black
+  \override Accidental.color = #black
 }
 
 % Deprecated: einzelne Noten innerhalb von \secondVoiceStyle mit schwarzem statt grauem Kopf
@@ -125,10 +134,15 @@ stanza =
 #}
 )
 
-ref = {
-  \once \override StanzaNumber.layer = 23 % set this to signal that there is a real stanza and no repeat signs
-  \set stanza = \refString
-}
+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 = #(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.
@@ -183,4 +197,37 @@ updown =
     \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))))
+}
+
+melisOff = \set ignoreMelismata = ##t
+melisOn = \unset ignoreMelismata
+
+cue =
+#(define-music-function (zahlen) (number-list?)
+  #{
+      \tag #'cues {
+        \tweak self-alignment-X #LEFT
+        \mark 
+          #(make-on-the-fly-markup
+            (lambda (layout props m) (interpret-markup layout (prepend-alist-chain 'cues zahlen props) (ly:output-def-lookup layout 'cueMarkup)))
+            (make-null-markup))
+      }
+  #})

book_include.ly

@@ -9,7 +9,7 @@
     	     (closedir dir)
     	     files)
     	    (else
-    	     (next (readdir dir) (if (string-match "^(0|\\.)" f) files (cons f files))))))))
+    	     (next (readdir dir) (if (ly:regex-match? (ly:regex-exec (ly:make-regex "^(0|\\.)") f)) files (cons f files))))))))
 
 #(define (file-to-stats filename)
    (set! song-list (cons filename song-list)))

chord_settings.ly

@@ -38,31 +38,35 @@ shiftChords = #(define-music-function (parser location xshift chords) (number? l
 	$chords
 #})
 
-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 }
-      \layout {
-        \LAYOUT
-        \context {
-          \ChordNames
-          \override ChordName.extra-spacing-width = #'(0 . 0.3)
-        }
-        \context {
-          \Score
-          \override SpacingSpanner.spacing-increment = 0
-        }
-      }
-    }
-  }
-#})
-#{
-  \once \set chordNameFunction = #chord-namer
-	#mainchord
-#})
+altChord =
+#(define-music-function (parser location mainchord altchord) (ly:music? ly:music?)
+  (let* ((remove-point-and-click
+           (lambda (grob)
+             (ly:grob-set-property! grob 'cause #f)
+             (ly:text-interface::print grob)))
+         (chord-name (lambda (in-pitches bass inversion context) #{
+           \markup {
+             \translate #'(-0.5 . 0)
+             \score {
+               \chords { \transposable #(cons (car (music-pitches mainchord)) (car in-pitches)) { #(music-clone mainchord) \klamm #(music-clone altchord) } }
+               \layout {
+                 \LAYOUT
+                 \context {
+                   \ChordNames
+                   \override ChordName.extra-spacing-width = #'(0 . 0.3)
+                   \override ChordName.stencil = #remove-point-and-click
+                 }
+                 \context {
+                   \Score
+                   \override SpacingSpanner.spacing-increment = 0
+                 }
+               }
+             }
+           }#})))
+    #{
+      \once \set chordNameFunction = #chord-name
+      #mainchord
+    #}))
 
 % kleine Mollakkorde und Alteration ausgeschrieben
 #(define (note-name->german-markup-nosym pitch lowercase?)
@@ -100,11 +104,42 @@ altChord = #(define-music-function (parser location mainchord altchord) (ly:musi
 % additional bass notes should get uppercased
 #(define (bassnote-name->german-markup-nosym pitch lowercase?)(note-name->german-markup-nosym pitch #f))
 
+defaultChordPrintings = {
+  <c g>-\markup { \super "5" }
+  %% Dur
+  <c e g a>-\markup { \super "6" } %Standardverhalten
+  <c e a >-\markup { \super "6(no5)" }
+  <c e g a d'>-\markup { \super "6/9" }
+  <c e g b d'>-\markup { \super "9" } %Standardverhalten
+  <c e g b d' f'>-\markup { \super "11" } %Standardverhalten
+  <c e g b d' a'>-\markup { \super "13" }
+  %add chords
+  <c e g d'>-\markup { \super "add9" }
+  <c e g f'>-\markup { \super "add11" }
+  <c e g a'>-\markup { \super "add13" }
+  %major chords
+  <c e g h d'>-\markup { \super "maj9" }
+  %% Moll
+  <c es g a>-\markup { \super "6" } %Standardverhalten
+  <c es a >-\markup { \super "6(no5)" }
+  <c es g a d'>-\markup { \super "6/9" }
+  <c es g b d'>-\markup { \super "9" } %Standardverhalten
+  <c es g b d' f'>-\markup { \super "11" } %Standardverhalten
+  <c es g b d' a'>-\markup { \super "13" }
+  %add chords
+  <c es g d'>-\markup { \super "add9" }
+  <c es g f'>-\markup { \super "add11" }
+  <c es g a'>-\markup { \super "add13" }
+  %major chords
+  <c es g h d'>-\markup { \super "maj9" }
+}
 
 #(define chordNameExceptions
-  (if (defined? 'customChordPrintings)
-  (sequential-music-to-chord-exceptions customChordPrintings #t)
-  '()))
+  (append
+    (if (defined? 'customChordPrintings)
+      (sequential-music-to-chord-exceptions customChordPrintings #t)
+      '())
+    (sequential-music-to-chord-exceptions defaultChordPrintings #t)))
 
 generalLayout = \layout {
   \generalLayout

custom_indentation.ily

@@ -0,0 +1,135 @@
+% https://lsr.di.unimi.it/LSR/Snippet?id=1098
+%%%%%%%% HEADER %%%%%%%%
+%
+% this code was prompted by
+% https://lists.gnu.org/archive/html/lilypond-user/2019-07/msg00139.html
+% and offers a pseudoIndent hack suitable for general use
+
+% keywords:
+% indent short-indent indentation system line
+% mid-score temporarily arbitrary individual single just only once
+% coda margin
+% mouse's tale acrostic mesostic spine
+
+%%%%%%%% PSEUDOINDENT FUNCTIONS %%%%%%%%
+
+% these two functions are for indenting individual systems
+% - to left-indent a system, apply \pseudoIndent before the music continues
+% - \pseudoIndents is similar, but lets you also indent on the right
+% - both provide an option for changing that system's instrument names
+
+% N.B. these functions
+% - assume application to non-ragged lines (generally the default)
+% - include a manual \break to ensure application at line start
+% - misbehave if called more than once at the same line start
+
+% the parameters of the (full) pseudoIndents function are:
+% 1: name-tweaks
+%      usually omitted; accepts replacement \markup for instrument names
+%      as an ordered list; starred elements leave their i-names unchanged.
+% 2: left-indent
+%      additional left-indentation, in staff-space units; can be negative,
+%      but avoid a total indentation which implies (unsupported) stretching.
+% 3: right-indent
+%      amount of right-indentation, in staff-space units; can be negative.
+%      - not offered by the (reduced) pseudoIndent function
+
+
+pseudoIndents = % inline alternative to a new \score, also with right-indent
+#(define-music-function (name-tweaks left-indent right-indent)
+  ((markup-list? '()) number? number?)
+  (define (warn-stretched p1 p2) (ly:input-warning (*location*) (G_
+    " pseudoIndents ~s ~s is stretching staff; expect distorted layout") p1 p2))
+  (let* (
+    (narrowing (+ left-indent right-indent)) ; of staff implied by args
+
+    (set-staffsymbol! (lambda (staffsymbol-grob) ; change staff to new width
+      (let* (
+        (left-bound (ly:spanner-bound staffsymbol-grob LEFT))
+        (left-moment (ly:grob-property left-bound 'when))
+        (capo? (moment<=? left-moment ZERO-MOMENT)) ; in first system of score
+        (layout (ly:grob-layout staffsymbol-grob))
+        (lw (ly:output-def-lookup layout 'line-width)) ; debugging info
+        (indent (ly:output-def-lookup layout (if capo? 'indent 'short-indent)))
+        (old-stil (ly:staff-symbol::print staffsymbol-grob))
+        (staffsymbol-x-ext (ly:stencil-extent old-stil X))
+        ;; >=2.19.16's first system has old-stil already narrowed [2]
+        ;; compensate for this (ie being not pristine) when calculating
+        ;; - old leftmost-x (its value is needed when setting so-called 'width)
+        ;; - the new width and position (via local variable narrowing_)
+        (ss-t (ly:staff-symbol-line-thickness staffsymbol-grob))
+        (pristine? (<= 0 (car staffsymbol-x-ext) ss-t)) ; would expect half
+        (leftmost-x (+ indent (if pristine? 0 narrowing)))
+        (narrowing_ (if pristine? narrowing 0)) ; uses 0 if already narrowed
+        (old-width (+ (interval-length staffsymbol-x-ext) ss-t))
+        (new-width (- old-width narrowing_))
+        (new-rightmost-x (+ leftmost-x new-width)) ; and set! this immediately
+        (junk (ly:grob-set-property! staffsymbol-grob 'width new-rightmost-x))
+        (in-situ-stil (ly:staff-symbol::print staffsymbol-grob))
+        (new-stil (ly:stencil-translate-axis in-situ-stil narrowing_ X))
+       ;(new-stil (stencil-with-color new-stil red)) ; for when debugging
+        (new-x-ext (ly:stencil-extent new-stil X)))
+      (ly:grob-set-property! staffsymbol-grob 'stencil new-stil)
+      (ly:grob-set-property! staffsymbol-grob 'X-extent new-x-ext)
+      )))
+
+    (set-X-offset! (lambda (margin-grob) ; move grob across to line start
+      (let* (
+        (old (ly:grob-property-data margin-grob 'X-offset))
+        (new (lambda (grob) (+ (if (procedure? old) (old grob) old) narrowing))))
+      (ly:grob-set-property! margin-grob 'X-offset new))))
+
+    (tweak-text! (lambda (i-name-grob mkup) ; tweak both instrumentname texts
+      (if (and (markup? mkup) (not (string=? (markup->string mkup) "*")))
+      (begin
+        (ly:grob-set-property! i-name-grob 'long-text mkup)
+        (ly:grob-set-property! i-name-grob 'text mkup)
+        )))) ; else retain existing text
+
+    (install-narrowing (lambda (leftedge-grob) ; on staves, + adapt left margin
+      (let* (
+        (sys (ly:grob-system leftedge-grob))
+        (all-grobs (ly:grob-array->list (ly:grob-object sys 'all-elements)))
+        (grobs-named (lambda (name)
+          (filter (lambda (x) (eq? name (grob::name x))) all-grobs)))
+        (first-leftedge-grob (list-ref (grobs-named 'LeftEdge) 0))
+        (relsys-x-of (lambda (g) (ly:grob-relative-coordinate g sys X)))
+        (leftedge-x (relsys-x-of first-leftedge-grob))
+        (leftedged? (lambda (g) (= (relsys-x-of g) leftedge-x)))
+        (leftedged-ss (filter leftedged? (grobs-named 'StaffSymbol))))
+      (if (eq? leftedge-grob first-leftedge-grob) ; ignore other leftedges [1]
+       (begin
+         (for-each set-staffsymbol! leftedged-ss)
+         (for-each set-X-offset! (grobs-named 'SystemStartBar))
+         (for-each set-X-offset! (grobs-named 'InstrumentName))
+         (for-each tweak-text! (grobs-named 'InstrumentName) name-tweaks)
+       ))))))
+
+  (if (negative? narrowing) (warn-stretched left-indent right-indent))
+  #{ % and continue anyway
+    % ensure that these overrides are applied only at begin-of-line
+    \break % (but this does not exclude unsupported multiple application)
+    % give the spacing engine notice regarding the loss of width for music
+    \once \override Score.LeftEdge.X-extent = #(cons narrowing narrowing)
+    % discard line start region of staff and reassemble left-margin elements
+    \once \override Score.LeftEdge.after-line-breaking = #install-narrowing
+    % shift the system to partition the narrowing between left and right
+    \overrideProperty Score.NonMusicalPaperColumn.line-break-system-details
+    .X-offset #(- right-indent)
+    % prevent a leftmost barnumber entering a stretched staff
+    \once \override Score.BarNumber.horizon-padding = #(max 1 (- 1 narrowing))
+  #}))
+
+pseudoIndent = % for changing just left-indent
+#(define-music-function (name-tweaks left-indent)
+  ((markup-list? '()) number?)
+  #{
+    \pseudoIndents $name-tweaks $left-indent 0
+  #})
+
+% [1] versions <2.19.1 can have end-of-line leftedges too
+%     - these were eliminated in issue 3761
+% [2] versions >=2.19.16: the first system behaves differently from the rest
+%     - a side effect of issue 660 ?
+% [3] versions >=2.23.0: LeftEdge's position may well differ in Y (but not in X)
+%     - a side effect of issue 6084 ?

default_songinfo_style.ly

@@ -42,7 +42,16 @@
               (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))))
+              (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
+                    (map
+                      (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)))
+                  '()))))
           (stack-lines DOWN 0.0 (chain-assoc-get 'baseline-skip props)
             (interpret-markup-list layout props
               (append
@@ -53,10 +62,11 @@
                     (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) "")
-                  (if infotext (string-append "\n\n" infotext) "")
-                  (if translation (string-append "\n\nÜbersetzung: " translation) "")
-                  (if pronunciation (string-append "\n\nAussprache: " pronunciation) ""))))))))
+                  (if copyright (string-append "\n\n© " copyright) "")))
+                (string-with-paragraphs->markuplist "" infotext)
+                (string-with-paragraphs->markuplist "Übersetzung: " translation)
+                (string-with-paragraphs->markuplist "Aussprache: " pronunciation)
+                  )))))
       (make-null-markup)
     )
 }

default_style.ly

@@ -3,9 +3,9 @@ songMargin = 5
 songInfoFontSize = 0
 songInfoLineWidthFraction = 0.9
 songTitleSize = 6
-songTitleFont = "LilyPond Sans"
-songChordFont = "LilyPond Sans"
-songLyricFont = "LilyPond Sans"
+songTitleFont = "Liberation Sans"
+songChordFont = "Liberation Sans"
+songLyricFont = "Liberation Sans"
 songChordFontSeries = #'bold
 songTextChordAlignment = #'left
 songScoreChordFontSize = 2
@@ -18,6 +18,18 @@ lyricSize = 1.6
 stanzaFormat = "~a."
 romanStanzaFormat = "~@r."
 refString = "Ref.:"
+refStringWithNumbers = "Ref. ~a:"
 % hübsche Wiederholungszeichen für den Liedtext
 repStart = "𝄆"
 repStop = "𝄇"
+customChordPrintings = {}
+
+\paper {
+  cueMarkup = \markup {
+    \italic
+      #(make-on-the-fly-markup (lambda (layout props m)
+        (interpret-markup layout props
+          (string-join (map (lambda (n) (format #f "~@r." n)) (chain-assoc-get 'cues props)) ", ")))
+        (make-null-markup))
+  }
+}

footer_with_songinfo.ly

@@ -1,8 +1,8 @@
 #(use-modules (ice-9 receive))
-#(define (format-author layout authorId noDetails)
+#(define (format-author author-format-function 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")
@@ -10,17 +10,25 @@
         (assoc-ref author "death_year")
         (assoc-ref author "organization")
       )
-      "unbekannt")))
+      (if (string-null? authorId)
+          "unbekannt"
+          authorId))))
 
 #(define (find-author-ids-by contributionType authors)
-  (filter-map (lambda (authordata) (if (member contributionType (cdr authordata)) (car authordata) #f)) authors))
+  (if authors
+    (filter-map (lambda (authordata) (if (member contributionType (cdr authordata)) (car authordata) #f)) authors)
+    (list)))
 
 #(define (find-author-id-with-part-numbers contributionType 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))
+  (if authors
+    (sort-list
+      (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 (sort-list contributionNumbers <)))
+        )) authors)
+      (lambda (a b) (< (cadr a) (cadr b))))
+    (list)))
 
 #(define-markup-command (print-songinfo layout props) ()
   (define (songinfo-from songId key)
@@ -29,14 +37,17 @@
         (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) " " (format-author layout poetId #f)))
+    (string-append (ly:output-def-lookup layout 'poetPrefix) " " (default-author-format poetId)))
 
   (define (format-composer composerId)
-    (string-append (ly:output-def-lookup layout 'composerPrefix) " " (format-author layout composerId #f)))
+    (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) " " (format-author layout authorId #f)))
+    (string-append (ly:output-def-lookup layout 'poetAndComposerEqualPrefix) " " (default-author-format authorId)))
 
   (define (numbered-contribution-prefix contributionNumbers prefixLookup)
     (string-append
@@ -50,8 +61,7 @@
 
   (define (format-authors authorIds)
     (map (lambda (authorId)
-      (format-author
-        layout
+      (default-author-format
         authorId
         (if (member authorId referencedAuthors)
           #t
@@ -67,22 +77,20 @@
       (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)
+  )
+
   (define (render-partial-contribution-group prefixLookup authorData)
     (if (null? authorData)
       ""
       (let ((firstAuthorContributions (cdar authorData)))
         (receive (authorDataSame authorDataOther)
             (partition (lambda (authorEntry) (equal? (cdr authorEntry) firstAuthorContributions)) authorData)
-          (string-append
+          (join-present (list
             (render-contribution-group (numbered-contribution-prefix firstAuthorContributions prefixLookup) (map car authorDataSame))
-            " "
             (render-partial-contribution-group prefixLookup authorDataOther)
-          ))))
-  )
-
-  (define (join-present items joiner)
-    (string-join (filter (lambda (item) (and (string? item) (not (string-null? (string-trim-both item))))) items) joiner)
-  )
+            ) " ")))))
 
   (define (poet-and-composer-from-authors authors)
     (if authors
@@ -212,14 +220,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/yaml_parser.scm

@@ -1,10 +1,25 @@
-(use-modules (ice-9 popen) (ice-9 textual-ports) (json parser))
+(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)
-  (let* ((python_cmd (string-append "import sys, yaml, json; print(json.dumps(yaml.safe_load(open('" filename "'))))"))
-          (pipe (open-pipe* OPEN_READ "python3" "-c" python_cmd))
-          (json (get-string-all pipe)))
-    (close-pipe pipe)
-    (json-string->scm json)))
+  (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)))
+(define (parse-yml-file filename) (resolve-inherits (yml-file->scm filename)))

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)
@@ -37,7 +45,15 @@ TEXT = \markuplist {
         \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"
         }
       }
     }#})

swing_style.ly

@@ -47,6 +47,55 @@ 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 =
@@ -59,7 +108,7 @@ swingMusic =
         (partial-duration-length (car es))
         (if (ly:music? e)
           (if (and (eq? name 'ContextSpeccedMusic) (eq? (ly:music-property e 'name) 'PartialSet))
-            (ly:duration-length (ly:music-property e 'duration))
+            (ly:duration->moment (ly:music-property e 'duration))
             (if (eq? name 'NoteEvent)
               ZERO-MOMENT
               (partial-duration-length e)

title_with_category_images.ly

@@ -41,7 +41,7 @@
      (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)
       ))
@@ -52,12 +52,9 @@
             (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

@@ -135,7 +135,12 @@
          'elements (list (make-music 'LabelEvent
          'page-label label)))))
    (set! author-index-items (lambda ()
-          (hash-fold (lambda (authorsym authorlist previous-author-items) (append previous-author-items (reverse authorlist))) '() author-index-hash))))
+          (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)
@@ -161,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))))
-            )
-     (interpret-markup layout props
-       (make-column-markup
-         (let ((revlist
+            (lines-reversed
                 (if (markup? text)
                     (list text)
                     (reverse (map (lambda (stil) (markup #:stencil stil))
@@ -179,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)
-                               (make-size-box-to-box-markup #f #t m target-size-markup))
-                          (cons
-                           (make-with-link-symbol-ref-markup 'index:label (make-fill-with-pattern-markup 1 RIGHT "." (car revlist) page))
-                           (cdr revlist)))))))))
+            )
+      (interpret-markup layout props
+        (make-size-box-to-box-markup #f #t
+          (make-with-link-symbol-ref-markup 'index:label
+            (make-column-markup
+              (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 {
@@ -209,7 +219,7 @@
       #(make-on-the-fly-markup
         (lambda (layout props m)
           (interpret-markup layout props
-            (make-justify-string-markup (format-author layout (chain-assoc-get 'index:text props #f) #f))))
+            (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
   }
@@ -276,11 +286,10 @@ headerToTOC = #(define-music-function (parser location header label) (ly:book? s
     ))
     (let*
       (
-       (extractedheadervars (extract-and-check-vars-from-header header '(title starttext alttitle altalttitle categorytitle categories authors)))
+       (extractedheadervars (extract-and-check-vars-from-header header '(title starttext alttitle categorytitle categories authors)))
        (title (assq-ref extractedheadervars 'title))
        (starttext (assq-ref extractedheadervars 'starttext))
        (alttitle (assq-ref extractedheadervars 'alttitle))
-       (altalttitle (assq-ref extractedheadervars 'altalttitle))
        (categorytitle (assq-ref extractedheadervars 'categorytitle))
        (categories (assq-ref extractedheadervars 'categories))
        (authors (assq-ref extractedheadervars 'authors))
@@ -290,8 +299,12 @@ headerToTOC = #(define-music-function (parser location header label) (ly:book? s
            (if categories (add-category-index-item! (string-tokenize categories) 'indexItemMarkup (cons (list (cons 'rawtext (if categorytitle categorytitle title))) '()) label))
            (if authors (add-author-index-item! (all-author-ids authors) 'indexItemMarkup (cons (list (cons 'rawtext (if categorytitle categorytitle title))) '()) label))
            (if starttext (add-to-toc! starttext (cons (list (cons 'rawtext starttext) (cons 'alternative #t)) '())))
-           (if alttitle (add-to-toc! alttitle (cons (list (cons 'rawtext alttitle) (cons 'alternative #t)) '())))
-           (if altalttitle (add-to-toc! altalttitle (cons (list (cons 'rawtext altalttitle) (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)) '())) #{ #})
     ))
 
@@ -317,7 +330,7 @@ headerToTOC = #(define-music-function (parser location header label) (ly:book? s
             (ly:string-substitute "\"" "\\\"" field))
           "\"")))
   (define (format-authors authorIds)
-    (string-join (map (lambda (authorId) (format-author layout authorId #f)) 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]*"))
@@ -345,7 +358,7 @@ headerToTOC = #(define-music-function (parser location header label) (ly:book? s
                    (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 altalttitle categorytitle categories authors year_text year_melody year_translation year_composition infotext translation pronunciation copyright source)))
+                      '(title starttext alttitle categorytitle categories authors year_text year_melody year_translation year_composition infotext translation pronunciation copyright source)))
                    (headervar-or-empty (lambda (varsym)
                      (let ((extracted (assq-ref extractedheadervars varsym)))
                        (if extracted extracted ""))))
@@ -365,8 +378,11 @@ headerToTOC = #(define-music-function (parser location header label) (ly:book? s
                   page-number
                   (headervar-or-empty 'title)
                   (headervar-or-empty 'starttext)
-                  (headervar-or-empty 'alttitle)
-                  (headervar-or-empty 'altalttitle)
+                  (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)))
@@ -391,7 +407,6 @@ headerToTOC = #(define-music-function (parser location header label) (ly:book? s
         "title"
         "starttext"
         "alttitle"
-        "altalttitle"
         "categorytitle"
         "categories"
         "poets"

verses_with_chords.ly

@@ -254,15 +254,17 @@
       \markup {
         \override #`(baseline-skip . ,intraverse-vspace)
         \score-equal-height #verse-line-height \score-lines {
-          \transposable #transposition
           <<
             \new Devnull { #verse-break-voice }
             \new NullVoice = "dummyvoice" { #verse-reference-voice }
-            #(music-clone verse-chords)
+            \transposable #transposition #(music-clone verse-chords)
             \new Lyrics \lyricsto "dummyvoice" { #lyrics }
           >>
           \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
@@ -287,6 +289,7 @@
               \override SpacingSpanner.spacing-increment = 0
               \remove Bar_number_engraver
               \remove Mark_engraver
+              \remove Jump_engraver
               \remove Volta_engraver
               \remove Parenthesis_engraver
             }