Alternativchords mit Klammern

set spacing for rests in chordlyrics
more precise Links in PDF toc
2024-09-04 09:39:57 +02:00 · 2024-09-03 12:13:23 +02:00 · 2024-07-19 14:32:41 +02:00 · 2024-07-17 13:34:00 +02:00 · 2024-07-12 07:55:55 +02:00 · 2024-07-10 22:29:58 +02:00
24 changed files with 1223 additions and 424 deletions
--- a/all_base_includes.ly
+++ b/all_base_includes.ly
@ -0,0 +1,23 @@
+#(define noStandaloneOutput (if (defined? 'noStandaloneOutput) noStandaloneOutput #f))
+
+#(if (defined? 'LAYOUT) #f (load "json_parser.scm"))
+#(use-modules (json parser))
+\include "basic_format_and_style_settings.ly"
+\include "eps_file_from_song_dir.ly"
+\include "title_with_category_images.ly"
+\include "chord_settings.ly"
+\include "transposition.ly"
+\include "verses_with_chords.ly"
+\include "arrows_in_scores.ly"
+\include "swing_style.ly"
+\include "inline_score.ly"
+
+% reset important variables
+LAYOUT = \layout { \generalLayout }
+HEADER = {}
+MUSIC = {}
+TEXT = \markuplist {""}
+
+verseChords = {}
+firstVoice = {}
+global = {}
--- a/auto_rest_merging.ly
+++ b/auto_rest_merging.ly
@ -1,86 +0,0 @@
-%% http://lsr.dsi.unimi.it/LSR/Item?id=336
-%% see also http://code.google.com/p/lilypond/issues/detail?id=1228
-
-%% Usage:
-%%   \new Staff \with {
-%%     \override RestCollision.positioning-done = #merge-rests-on-positioning
-%%   } << \somevoice \\ \othervoice >>
-%% or (globally):
-%%   \layout {
-%%     \context {
-%%       \Staff
-%%       \override RestCollision.positioning-done = #merge-rests-on-positioning
-%%     }
-%%   }
-%%
-%% Limitations:
-%% - only handles two voices
-%% - does not handle multi-measure/whole-measure rests
-
-#(define (rest-score r)
-  (let ((score 0)
-	(yoff (ly:grob-property-data r 'Y-offset))
-	(sp (ly:grob-property-data r 'staff-position)))
-    (if (number? yoff)
-	(set! score (+ score 2))
-	(if (eq? yoff 'calculation-in-progress)
-	    (set! score (- score 3))))
-    (and (number? sp)
-	 (<= 0 2 sp)
-	 (set! score (+ score 2))
-	 (set! score (- score (abs (- 1 sp)))))
-    score))
-
-#(define (merge-rests-on-positioning grob)
-  (let* ((can-merge #f)
-	 (elts (ly:grob-object grob 'elements))
-	 (num-elts (and (ly:grob-array? elts)
-			(ly:grob-array-length elts)))
-	 (two-voice? (= num-elts 2)))
-    (if two-voice?
-	(let* ((v1-grob (ly:grob-array-ref elts 0))
-	       (v2-grob (ly:grob-array-ref elts 1))
-	       (v1-rest (ly:grob-object v1-grob 'rest))
-	       (v2-rest (ly:grob-object v2-grob 'rest)))
-	  (and
-	   (ly:grob? v1-rest)
-	   (ly:grob? v2-rest)
-	   (let* ((v1-duration-log (ly:grob-property v1-rest 'duration-log))
-		  (v2-duration-log (ly:grob-property v2-rest 'duration-log))
-		  (v1-dot (ly:grob-object v1-rest 'dot))
-		  (v2-dot (ly:grob-object v2-rest 'dot))
-		  (v1-dot-count (and (ly:grob? v1-dot)
-				     (ly:grob-property v1-dot 'dot-count -1)))
-		  (v2-dot-count (and (ly:grob? v2-dot)
-				     (ly:grob-property v2-dot 'dot-count -1))))
-	     (set! can-merge
-		   (and
-		    (number? v1-duration-log)
-		    (number? v2-duration-log)
-		    (= v1-duration-log v2-duration-log)
-		    (eq? v1-dot-count v2-dot-count)))
-	     (if can-merge
-		 ;; keep the rest that looks best:
-		 (let* ((keep-v1? (>= (rest-score v1-rest)
-				      (rest-score v2-rest)))
-			(rest-to-keep (if keep-v1? v1-rest v2-rest))
-			(dot-to-kill (if keep-v1? v2-dot v1-dot)))
-		   ;; uncomment if you're curious of which rest was chosen:
-		   ;;(ly:grob-set-property! v1-rest 'color green)
-		   ;;(ly:grob-set-property! v2-rest 'color blue)
-		   (ly:grob-suicide! (if keep-v1? v2-rest v1-rest))
-		   (if (ly:grob? dot-to-kill)
-		       (ly:grob-suicide! dot-to-kill))
-		   (ly:grob-set-property! rest-to-keep 'direction 0)
-		   (ly:rest::y-offset-callback rest-to-keep)))))))
-    (if can-merge
-	#t
-	(ly:rest-collision::calc-positioning-done grob))))
-
-generalLayout = \layout {
-  \generalLayout
-  \context {
-    \Staff
-    \override RestCollision.positioning-done = #merge-rests-on-positioning
-  }
-}
--- a/basic_format_and_style_settings.ly
+++ b/basic_format_and_style_settings.ly
@ -1,25 +1,19 @@
 \language "deutsch"

-\include "styles.ly"
-\include #(ly:format "styles/~a.ly" songStyle)
+\include "default_style.ly"
+\include "default_songinfo_style.ly"
+\include "footer_with_songinfo.ly"

 \include #(if (defined? 'customStyleOverridesFile) customStyleOverridesFile "void.ly")

 #(set-default-paper-size songFormatAndSize)
 #(set-global-staff-size globalSize)

-#(define (default-pango size)
-  (make-pango-font-tree
-    songChordFont
-    songLyricFont
-    "Luxi Mono"
-    (/ size 20)))
-
 \paper {
-  #(define fonts (default-pango globalSize))
+  property-defaults.fonts.serif = \songChordFont
+  property-defaults.fonts.sans = \songLyricFont
  %annotate-spacing = ##t
  % spacing stuff
-  lyric-size = #lyricSize
  two-sided = ##t
  inner-margin = 1.5\cm
  outer-margin = \songMargin
@ -45,6 +39,7 @@ generalLayout = \layout {
  \context {
    \Staff
    \accidentalStyle modern
+    \consists Merge_rests_engraver
  }
  \context {
    \Score
@ -66,6 +61,11 @@ generalLayout = \layout {
    \Voice
    % ich will lines breaken wie ich will!
    \remove "Forbid_line_break_engraver"
+    \override NoteHead.layer = 2
+    \override Dots.layer = 2
+    \override Stem.layer = 2
+    \override Flag.layer = 2
+    \override Beam.layer = 2
  }
 }

@ -77,27 +77,74 @@ textp = \lyricmode { \markup { \raise #1 \musicglyph #"rests.3" } }
 % zweite Stimme alles grau
 secondVoiceStyle = {
  \override NoteHead.color = #grey
+  \override Dots.color = #grey
  \override Stem.color = #grey
  \override Flag.color = #grey
  \override Beam.color = #grey
+  \override NoteHead.layer = 1
+  \override Dots.layer = 1
+  \override Stem.layer = 1
+  \override Flag.layer = 1
+  \override Beam.layer = 1
 }

 firstVoiceStyle = {
  \override NoteHead.color = #black
+  \override Dots.color = #black
  \override Stem.color = #black
  \override Flag.color = #black
  \override Beam.color = #black
 }

-% einzelne Noten innerhalb von \secondVoiceStyle mit schwarzem statt grauem Kopf
+% Deprecated: einzelne Noten innerhalb von \secondVoiceStyle mit schwarzem statt grauem Kopf
 schwarzkopf =
  #(define-music-function (parser location noten) (ly:music?)
-  #{
-   \revert NoteHead.color
-   $noten
-   \override NoteHead.color = #grey
-  #})
+    (begin (ly:warning "\\schwarzkopf brauchts nicht mehr, das kann ersatzlos weg!") noten))

-% hübsche Wiederholungszeichen für den Liedtext
-repStart = "𝄆"
-repStop = "𝄇"
+romanStanza =
+  #(define-music-function (parser location) ()
+  #{ \override StanzaNumber.style = #'roman #})
+
+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)))
+           (formattedStanzaNumber (format #f (if (eq? stanzastyle 'roman) romanStanzaFormat stanzaFormat) stanzanumber)))
+        (ly:context-set-property! context 'stanza formattedStanzaNumber)))
+#}
+)
+
+ref = {
+  \once \override StanzaNumber.layer = 23 % set this to signal that there is a real stanza and no repeat signs
+  \set stanza = \refString
+}
+
+% 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.
+repStartWithTag = \lyricmode {
+  \tag #'repeats {
+    \applyContext
+    #(lambda (context)
+      (let ((lastStanza (ly:context-property context 'stanza))
+            (printLastStanza (= (ly:assoc-get 'layer (ly:context-grob-definition context 'StanzaNumber) 0) 23))
+            (stanzaFontSeries (ly:assoc-get 'font-series (ly:context-grob-definition context 'StanzaNumber) 'normal)))
+      (ly:context-set-property! context 'stanza
+        (make-concat-markup
+          (if printLastStanza
+            (list (make-override-markup `(font-series . ,stanzaFontSeries) lastStanza) (make-hspace-markup 1) repStart)
+            (list repStart)
+            )))))
+    \once \override StanzaNumber.font-series = #'normal
+  }
+}
+
+repStopWithTag = \lyricmode {
+  \tag #'repeats {
+    \once \override StanzaNumber.font-series = #'normal
+    \once \override StanzaNumber.direction = 1
+    \set stanza = \markup { \repStop }
+  }
+}
--- a/book_include.ly
+++ b/book_include.ly
@ -1,5 +1,3 @@
-\version "2.18"
-
 #(define song-list '())

 #(define (files-in-directory dirname)
@ -120,8 +118,8 @@ includeSong =
     #{
     \bookOutputName #filename
     #}
-    (ly:parser-parse-string (if (< (list-ref (ly:version) 1) 19) (ly:parser-clone parser) (ly:parser-clone))
-      (ly:format "\\include \"../../~a/~a/~a.ly\"" songPath filename filename))
+    (ly:parser-parse-string (ly:parser-clone)
+      (ly:format "\\include \"~a/~a/~a.ly\"" songPath filename filename))
    (let ((label (gensym "index")))
      (set! additional-page-switch-label-list
        (acons label additional-page-numbers additional-page-switch-label-list))
@ -155,7 +153,7 @@ imagepage =
 songs =
 #(define-void-function (parser location) ()
 (for-each (lambda (songitems)
-   (ly:book-add-bookpart! (if (< (list-ref (ly:version) 1) 19) (ly:parser-lookup parser '$current-book) (ly:parser-lookup '$current-book))
+   (ly:book-add-bookpart! (ly:parser-lookup '$current-book)
    (let ((filename (car songitems))
          (songvars (cdr songitems)))
      (if (eq? filename 'emptyPage)
@ -209,7 +207,7 @@ songs =
     ;(string-join songs "\n")
     "Nicht inkludiert:"
     opticalline
-     (string-join (sort-list (lset-difference string=? (files-in-directory (ly:format "../../~a" songPath)) songs) string<?) "\n")
+     (string-join (sort-list (lset-difference string=? (files-in-directory songPath) songs) string<?) "\n")
     opticalline
     ) "\n" )
 )))
@ -217,16 +215,16 @@ songs =
 %%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Include Images once and reference them:
 #(define bbox-regexp
-  (make-regexp "%%BoundingBox:[ \t]+([0-9-]+)[ \t]+([0-9-]+)[ \t]+([0-9-]+)[ \t]+([0-9-]+)"))
+  (ly:make-regex "%%BoundingBox:[ \t]+([0-9-]+)[ \t]+([0-9-]+)[ \t]+([0-9-]+)[ \t]+([0-9-]+)"))

 #(define (get-postscript-bbox string)
  "Extract the bbox from STRING, or return #f if not present."
  (let*
-      ((match (regexp-exec bbox-regexp string)))
+      ((match (ly:regex-exec bbox-regexp string)))

    (if match
        (map (lambda (x)
-               (string->number (match:substring match x)))
+               (string->number (ly:regex-match-substring match x)))
             (cdr (iota 5)))

        #f)))
--- a/chord_settings.ly
+++ b/chord_settings.ly
@ -8,6 +8,16 @@ klamm = #(define-music-function (parser location chords) (ly:music?)
 	\set chordNameFunction = #ignatzek-chord-names
 #})

+repeats-around-chords =
+#(define-music-function (parser location chords) (ly:music?)
+#{
+  \once \set noChordSymbol = \markup { \normal-text \repStart }
+  r4
+	$chords
+  \once \set noChordSymbol = \markup { \normal-text \repStop }
+  r4
+#})
+
 bchord =
 #(define-music-function (parser location chords) (ly:music?)
 #{
@ -16,6 +26,44 @@ bchord =
 	\revert ChordName.font-series
 #})

+shiftChord = #(define-music-function (parser location xshift chord) (number? ly:music?)
+#{
+	\once \override ChordName.extra-offset = #`(,xshift . 0)
+	$chord
+#})
+
+shiftChords = #(define-music-function (parser location xshift chords) (number? ly:music?)
+#{
+	\override ChordName.extra-offset = #`(,xshift . 0)
+	$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
+#})
+
 % kleine Mollakkorde und Alteration ausgeschrieben
 #(define (note-name->german-markup-nosym pitch lowercase?)
   (define (pitch-alteration-semitones pitch) (inexact->exact (round (* (ly:pitch-alteration pitch) 2))))
@ -65,7 +113,7 @@ generalLayout = \layout {
    \semiGermanChords
    \override ChordName.font-size = \songScoreChordFontSize
    \override ChordName.font-series = \songChordFontSeries
-    \override ChordName.font-family = #'roman
+    \override ChordName.font-family = #'serif
    chordNameLowercaseMinor = ##t
    chordChanges = ##t
    % eigenen chordRootNamer damit F# = Fis und Gb = Ges (also alteration ausgeschrieben)
@ -73,16 +121,6 @@ generalLayout = \layout {
    chordNoteNamer = #bassnote-name->german-markup-nosym
    majorSevenSymbol = "maj7"
    chordNameExceptions = \chordNameExceptions
-    % der baseline-skip der Akkorde beeinflusst, wie hoch die Hochstellung ist
-    \override ChordName.baseline-skip = #1.0
-  }
-}
-
-verseChordLayout = \layout {
-  \generalLayout
-  \context {
-    \ChordNames
-    \override ChordName.font-size = \songTextChordFontSize
  }
 }

@ -91,13 +129,11 @@ verseChordLayout = \layout {
   (interpret-markup layout props
     #{ \markup { \override #'(baseline-skip . 2)
          \center-column {
-            \score { \new ChordNames { #(if (< (list-ref (ly:version) 1) 19)
-              (ly:parser-include-string parser (string-append "\\chordmode { s4 " chord " }"))
-              (ly:parser-include-string (string-append "\\chordmode { s4 " chord " }"))
-              ) } \layout { \generalLayout } }
-            \override #'(fret-diagram-details . (
-                     (barre-type . straight))) {
-            \fret-diagram-terse #fret
+            \score { \new ChordNames {
+              #(ly:parser-include-string (string-append "\\chordmode { s4 " chord " }"))
+            } \layout { \generalLayout } }
+            \override #'(fret-diagram-details . ((barre-type . straight))) {
+              \fret-diagram-terse #fret
            }
          }
        }
--- a/default_output.ly
+++ b/default_output.ly
@ -0,0 +1,7 @@
+#(define noDefaultOutput (if (defined? 'noDefaultOutput) noDefaultOutput #f))
+HEADER = \bookpart {
+  \header {
+    \basicSongInfo
+  }
+}
+\include #(if noDefaultOutput "void.ly" "standalone_output.ly")
--- a/default_songinfo_style.ly
+++ b/default_songinfo_style.ly
@ -0,0 +1,62 @@
+\paper {
+  poetPrefix = "Worte:"
+  composerPrefix = "Weise:"
+  compositionPrefix = "Satz:"
+  poetAndComposerEqualPrefix = "Worte und Weise:"
+  voicePrefix = "Stimme:"
+  versePrefix = "Strophe:"
+  translationPrefix = "Übersetzung:"
+  interludePrefix = "Zwischenspiel:"
+  bridgePrefix = "Bridge:"
+
+  authorFormat =
+    #(lambda (noDetails name trail_name birth_year death_year organization)
+        (let ((string-present (lambda (str) (and str (not (and (string? str) (string-null? str))))))
+              (render_informations (lambda (infolist) (string-append (car infolist) (if (or noDetails (null? (cdr infolist))) "" (string-append " (" (string-join (cdr infolist) ", ") ")"))))))
+            (if (or (string-present trail_name) (string-present name))
+              (render_informations (filter string-present (list
+                trail_name
+                name
+                (if (and (string-present birth_year) (string-present death_year))
+                  (ly:format "~a‒~a" birth_year death_year)
+                  (if (string-present birth_year)
+                    (ly:format "*~a" birth_year)
+                    (if (string-present death_year) (ly:format "†~a" death_year) "")))
+                organization
+              )))
+              ""
+          )))
+
+  songinfoMarkup =
+    #(make-on-the-fly-markup
+      (lambda (layout props m)
+        (let* ((between-poet-and-composer-markup (chain-assoc-get 'header:between-poet-and-composer-markup props (make-hspace-markup 3)))
+              (poet-maybe-with-composer (chain-assoc-get 'songinfo:poet-maybe-with-composer props #f))
+              (composer (chain-assoc-get 'songinfo:composer props #f))
+              (copyright (chain-assoc-get 'songinfo:copyright props #f))
+              (infotext (chain-assoc-get 'songinfo:infotext props #f))
+              (translation (chain-assoc-get 'songinfo:translation props #f))
+              (pronunciation (chain-assoc-get 'songinfo:pronunciation props #f))
+              (year_text (chain-assoc-get 'songinfo:year_text props #f))
+              (year_melody (chain-assoc-get 'songinfo:year_melody props #f))
+              (poet-with-year (if (and poet-maybe-with-composer year_text) (string-append poet-maybe-with-composer ", " year_text) poet-maybe-with-composer))
+              (composer-with-year (if (and composer year_melody) (string-append composer ", " year_melody) composer))
+              (poet-and-composer-oneliner (if (and poet-with-year composer-with-year) (markup poet-with-year between-poet-and-composer-markup composer-with-year) #f))
+              (current-line-width (chain-assoc-get 'line-width props (ly:output-def-lookup layout 'line-width))))
+          (stack-lines DOWN 0.0 (chain-assoc-get 'baseline-skip props)
+            (interpret-markup-list layout props
+              (append
+                (if (and poet-and-composer-oneliner (< (interval-length (ly:stencil-extent (interpret-markup layout props poet-and-composer-oneliner) X)) current-line-width))
+                  (list poet-and-composer-oneliner)
+                  (make-wordwrap-string-internal-markup-list #t (string-append
+                    (if poet-with-year (string-append "\n\n" poet-with-year) "")
+                    (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) ""))))))))
+      (make-null-markup)
+    )
+}
--- a/default_style.ly
+++ b/default_style.ly
@ -0,0 +1,23 @@
+songFormatAndSize = "a5"
+songMargin = 5
+songInfoFontSize = 0
+songInfoLineWidthFraction = 0.9
+songTitleSize = 6
+songTitleFont = "LilyPond Sans"
+songChordFont = "LilyPond Sans"
+songLyricFont = "LilyPond Sans"
+songChordFontSeries = #'bold
+songTextChordAlignment = #'left
+songScoreChordFontSize = 2
+songTextChordFontSize = \songScoreChordFontSize
+songTextChordDistance = 2.8
+songTextLineHeigth = 5.8
+songTocColumns = 3
+globalSize = 15
+lyricSize = 1.6
+stanzaFormat = "~a."
+romanStanzaFormat = "~@r."
+refString = "Ref.:"
+% hübsche Wiederholungszeichen für den Liedtext
+repStart = "𝄆"
+repStop = "𝄇"
--- a/eps_file_from_song_dir.ly
+++ b/eps_file_from_song_dir.ly
@ -9,7 +9,7 @@
   (interpret-markup layout props
     (let ((filepath (if (string-null? songfilename)
                          filename
-                          (ly:format "../../~a/~a/~a" songPath songfilename filename))))
+                          (ly:format "~a/~a/~a" songPath songfilename filename))))
       (if (file-exists? filepath)
             (make-epsfile-markup Y ysize filepath)
             (if defaultmarkup
--- a/footer_with_songinfo.ly
+++ b/footer_with_songinfo.ly
@ -1,33 +1,193 @@
+#(use-modules (ice-9 receive))
 #(define-markup-command (print-songinfo layout props) ()
- (interpret-markup layout props
-   (let (
-         (blockwidth (* (chain-assoc-get 'header:songinfo-size-factor props 0.9) (ly:output-def-lookup layout 'line-width)))
-         (infotext (chain-assoc-get 'header:songinfo props #f))
-         (poet (chain-assoc-get 'header:poet props #f))
-         (composer (chain-assoc-get 'header:composer props #f))
-         (poet-and-composer-stacked (chain-assoc-get 'header:poet-and-composer-stacked props songInfoPoetAndComposerStacked))
-         (between-poet-and-composer-markup (chain-assoc-get 'header:between-poet-and-composer-markup props (make-hspace-markup 3)))
-         (copyright (chain-assoc-get 'header:copyright props #f)))
-     (if (chain-assoc-get 'page:is-bookpart-last-page props #f)
-         (markup #:override '(baseline-skip . 3.0) (
-             make-fontsize-markup songInfoFontSize
-             (make-sans-markup
-             ;%\override #'(line-width . 92) \wordwrap-field #symbol
-             (make-column-markup (list
-               (make-line-markup
-                (list
-                 (if (and poet (not (and (string? poet) (string-null? poet)))) (markup poet between-poet-and-composer-markup) "")
-                 (if (and composer (not poet-and-composer-stacked)) composer ""))
-               )
-               (if (and composer poet-and-composer-stacked) (make-line-markup (list composer)) "")
-               (make-override-markup `(line-width . ,blockwidth) (make-justify-string-markup (string-append
-                 (if (and copyright (not (and (string? copyright) (string-null? copyright)))) (ly:format "© ~a\n\n" copyright) "")
-                 (if infotext infotext "")
-               )))
-             )))
-           )
-         )
-       (make-null-markup))))
+  (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)
+          noDetails
+          (assoc-ref author "name")
+          (assoc-ref author "trail_name")
+          (assoc-ref author "birth_year")
+          (assoc-ref author "death_year")
+          (assoc-ref author "organization")
+        )
+        "unbekannt")))
+
+  (define (format-poet poetId)
+    (string-append (ly:output-def-lookup layout 'poetPrefix) " " (format-author poetId #f)))
+
+  (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)
+  )
+
+  (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)
+  )
+
+  (define (numbered-contribution-prefix contributionNumbers prefixLookup)
+    (string-append
+      (string-join (map (lambda (contributionNumber) (ly:format "~a." contributionNumber)) contributionNumbers) ", ")
+      " "
+      (ly:output-def-lookup layout prefixLookup)
+    )
+  )
+
+  (define referencedAuthors '())
+
+  (define (format-authors authorIds)
+    (map (lambda (authorId)
+      (format-author
+        authorId
+        (if (member authorId referencedAuthors)
+          #t
+          (begin
+            (set! referencedAuthors (cons authorId referencedAuthors))
+            #f)))
+    ) authorIds)
+  )
+
+  (define (render-contribution-group contributionPrefix authorIds)
+    (if (null? authorIds)
+      ""
+      (string-append contributionPrefix " " (string-join (format-authors authorIds) ", ")))
+  )
+
+  (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
+            (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
+      (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))
+            (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))
+            )
+        (if (and (equal? poetIds composerIds) (null? translatorIds) (null? versePoetData) (null? verseComposerData) (null? voiceComposerData) (null? compositionIds) (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 'translationPrefix) translatorIds)
+                    year_translation
+                  ) ", ")
+                ) "; ")
+              ))
+            (if (and (null? composerIds) (null? compositionIds) (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
+                  ) ", ")
+                  (render-contribution-group (ly:output-def-lookup layout 'bridgePrefix) bridgeIds)
+                  (render-contribution-group (ly:output-def-lookup layout 'interludePrefix) interludeIds)
+                ) "; ")
+              )))))
+      (list #f #f)
+    )
+  )
+
+  (interpret-markup layout props
+    (if (chain-assoc-get 'page:is-bookpart-last-page props #f)
+    (let* ((authors (chain-assoc-get 'header:authors props #f))
+           (poet-and-composers (poet-and-composer-from-authors authors))
+           (songId (chain-assoc-get 'header:songId props #f))
+           (poetId (chain-assoc-get 'header:poetId props (if songId (songinfo-from songId "poet") #f)))
+           (composerId (chain-assoc-get 'header:composerId props (if songId (songinfo-from songId "composer") #f)))
+           (poet-and-composer-same (equal? poetId composerId)))
+      (let ((infotext (chain-assoc-get 'header:infotext props (chain-assoc-get 'header:songinfo props #f)))
+            (poet-maybe-with-composer (chain-assoc-get 'header:poet props (if poetId (if poet-and-composer-same (format-poet-and-composer poetId) (format-poet poetId)) (car poet-and-composers))))
+            (composer (chain-assoc-get 'header:composer props (if (and composerId (not poet-and-composer-same)) (format-composer composerId) (cadr poet-and-composers))))
+            (copyright (chain-assoc-get 'header:copyright props #f))
+            (translation (chain-assoc-get 'header:translation props #f))
+            (pronunciation (chain-assoc-get 'header:pronunciation props #f))
+            (year_text (if (string? (car poet-and-composers)) #f (chain-assoc-get 'header:year_text props #f)))
+            (year_melody (if (string? (car poet-and-composers)) #f (chain-assoc-get 'header:year_melody props #f))))
+            (markup
+              #:override (cons 'songinfo:poet-maybe-with-composer
+                (if (and poet-maybe-with-composer (not (and (string? poet-maybe-with-composer) (string-null? poet-maybe-with-composer)))) poet-maybe-with-composer #f))
+              #:override (cons 'songinfo:composer
+                (if (and composer (not (and (string? composer) (string-null? composer)))) composer #f))
+              #:override (cons 'songinfo:copyright
+                (if (and copyright (not (and (string? copyright) (string-null? copyright)))) copyright #f))
+              #:override (cons 'songinfo:infotext
+                (if (and infotext (not (and (string? infotext) (string-null? infotext)))) infotext #f))
+              #:override (cons 'songinfo:translation
+                (if (and translation (not (and (string? translation) (string-null? translation)))) translation #f))
+              #:override (cons 'songinfo:pronunciation
+                (if (and pronunciation (not (and (string? pronunciation) (string-null? pronunciation)))) pronunciation #f))
+              #:override (cons 'songinfo:year_text
+                (if (and year_text (not (and (string? year_text) (string-null? year_text)))) year_text #f))
+              #:override (cons 'songinfo:year_melody
+                (if (and year_melody (not (and (string? year_melody) (string-null? year_melody)))) year_melody #f))
+              #:override '(baseline-skip . 3.0)
+              #:fontsize songInfoFontSize
+              #:sans
+              (ly:output-def-lookup layout 'songinfoMarkup)
+            )))
+      (make-null-markup)))
 )

 #(define-markup-command (print-pagenumber layout props)()
@ -40,6 +200,12 @@
        )
   ))))

+#(define-markup-command (fractional-line-width layout props arg)(markup?)
+  (interpret-markup layout props
+    (make-override-markup
+      `(line-width . ,(* (chain-assoc-get 'header:songinfo-size-factor props songInfoLineWidthFraction) (ly:output-def-lookup layout 'line-width)))
+      arg)))
+
 \paper {
  print-first-page-number = ##t
  first-page-number = #0
@ -47,14 +213,14 @@
  oddFooterMarkup = \markup {
    \fill-line {
      \line { \null }
-      \line { \general-align #Y #DOWN \print-songinfo }
+      \line { \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 \print-songinfo }
+      \line { \general-align #Y #DOWN \fractional-line-width \print-songinfo }
      \line { \null }
    }
  }
--- a/general_include.ly
+++ b/general_include.ly
@ -1,25 +1,6 @@
-\version "2.18"
-
+\version "2.25.8"
 #(ly:set-option 'relative-includes #t)

-\include #(if (< (list-ref (ly:version) 1) 24) "legacy-lilypond-compatibility.ly" "void.ly")
+#(define noDefaultOutput #t)

-#(define noStandaloneOutput (if (defined? 'noStandaloneOutput) noStandaloneOutput #f))
-
-\include "basic_format_and_style_settings.ly"
-\include "eps_file_from_song_dir.ly"
-\include "title_with_category_images.ly"
-\include "footer_with_songinfo.ly"
-\include "auto_rest_merging.ly"
-\include "chord_settings.ly"
-\include "transposition.ly"
-\include "verses_with_chords.ly"
-\include "arrows_in_scores.ly"
-\include "swing_style.ly"
-\include "inline_score.ly"
-
-% reset important variables
-LAYOUT = \layout { \generalLayout }
-HEADER = {}
-MUSIC = {}
-TEXT = \markuplist {""}
+\include "all_base_includes.ly"
--- a/inline_score.ly
+++ b/inline_score.ly
@ -1,5 +1,8 @@
+INLINESCOREMUSIC = {}
+
 inline-score =
 #(define-music-function (music) (ly:music?)
+   (set! INLINESCOREMUSIC #{ \INLINESCOREMUSIC #music #})
    #{
-      \transposable #music
+      \transposable #TRANSPOSITION #music
    #})
--- a/json_parser.scm
+++ b/json_parser.scm
@ -0,0 +1,482 @@
+;;; (json parser) --- Guile JSON implementation.
+
+;; Copyright (C) 2013-2020 Aleix Conchillo Flaque <aconchillo@gmail.com>
+;;
+;; This file is part of guile-json.
+;;
+;; guile-json is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3 of the License, or
+;; (at your option) any later version.
+;;
+;; guile-json is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with guile-json. If not, see https://www.gnu.org/licenses/.
+
+;;; Commentary:
+
+;; JSON module for Guile
+
+;;; Code:
+
+(define-module (json parser)
+  #:use-module (ice-9 rdelim)
+  #:use-module (ice-9 streams)
+  #:use-module (rnrs io ports)
+  #:export (json->scm
+            json-string->scm
+            json-seq->scm
+            json-seq-string->scm))
+
+;;
+;; Miscellaneuos helpers
+;;
+
+(define (json-exception port)
+  (throw 'json-invalid port))
+
+(define (digit? c)
+  (case c
+    ((#\0 #\1 #\2 #\3 #\4 #\5 #\6 #\7 #\8 #\9) #t)
+    (else #f)))
+
+(define (whitespace? c)
+  (case c
+    ((#\sp #\ht #\lf #\cr) #t)
+    (else #f)))
+
+(define (control-char? ch)
+  (<= (char->integer ch) #x1F))
+
+(define (skip-whitespaces port)
+  (let ((ch (peek-char port)))
+    (cond
+     ((whitespace? ch)
+      (read-char port)
+      (skip-whitespaces port))
+     (else *unspecified*))))
+
+(define (expect-string port expected return)
+  (let loop ((n 0))
+    (cond
+     ;; All characters match.
+     ((= n (string-length expected)) return)
+     ;; Go to next characters.
+     ((eqv? (read-char port) (string-ref expected n))
+      (loop (+ n 1)))
+     ;; Anything else is an error.
+     (else (json-exception port)))))
+
+(define (expect-delimiter port delimiter)
+  (let ((ch (read-char port)))
+    (cond
+     ((not (eqv? ch delimiter)) (json-exception port))
+     ;; Unexpected EOF.
+     ((eof-object? ch) (json-exception port)))))
+
+(define (skip-record-separators port)
+  (when (eqv? #\rs (peek-char port))
+    (read-char port)
+    (skip-record-separators port)))
+
+;;
+;; Number parsing helpers
+;;
+
+(define (expect-digit port)
+  (let ((ch (peek-char port)))
+    (cond
+     ((not (digit? ch)) (json-exception port))
+     ;; Unexpected EOF.
+     ((eof-object? ch) (json-exception port)))))
+
+;; Read + or -, and return 1 or -1 respectively. If something different is
+;; found, return 1.
+(define (read-sign port)
+  (let ((ch (peek-char port)))
+    (cond
+     ((eqv? ch #\+)
+      (read-char port)
+      1)
+     ((eqv? ch #\-)
+      (read-char port)
+      -1)
+     (else 1))))
+
+(define (read-digit-value port)
+  (let ((ch (read-char port)))
+    (cond
+     ((eqv? ch #\0) 0)
+     ((eqv? ch #\1) 1)
+     ((eqv? ch #\2) 2)
+     ((eqv? ch #\3) 3)
+     ((eqv? ch #\4) 4)
+     ((eqv? ch #\5) 5)
+     ((eqv? ch #\6) 6)
+     ((eqv? ch #\7) 7)
+     ((eqv? ch #\8) 8)
+     ((eqv? ch #\9) 9)
+     (else (json-exception port)))))
+
+;; Read digits [0..9].
+(define (read-digits port)
+  (expect-digit port)
+  (let loop ((ch (peek-char port)) (number 0))
+    (cond
+     ((digit? ch)
+      (let ((value (read-digit-value port)))
+        (loop (peek-char port) (+ (* number 10) value))))
+     (else number))))
+
+(define (read-digits-fraction port)
+  (expect-digit port)
+  (let loop ((ch (peek-char port)) (number 0) (length 0))
+    (cond
+     ((digit? ch)
+      (let ((value (read-digit-value port)))
+        (loop (peek-char port) (+ (* number 10) value) (+ length 1))))
+     (else
+      (/ number (expt 10 length))))))
+
+(define (read-exponent port)
+  (let ((ch (peek-char port)))
+    (cond
+     ((or (eqv? ch #\e) (eqv? ch #\E))
+      (read-char port)
+      (let ((sign (read-sign port))
+            (digits (read-digits port)))
+        (if (<= digits 1000) ;; Some maximum exponent.
+            (expt 10 (* sign digits))
+            (json-exception port))))
+     (else 1))))
+
+(define (read-fraction port)
+  (let ((ch (peek-char port)))
+    (cond
+     ((eqv? ch #\.)
+      (read-char port)
+      (read-digits-fraction port))
+     (else 0))))
+
+(define (read-positive-number port)
+  (let* ((number
+          (let ((ch (peek-char port)))
+            (cond
+             ;; Numbers that start with 0 must be a fraction.
+             ((eqv? ch #\0)
+              (read-char port)
+              0)
+             ;; Otherwise read more digits.
+             (else (read-digits port)))))
+         (fraction (read-fraction port))
+         (exponent (read-exponent port))
+         (result (* (+ number fraction) exponent)))
+    (if (and (zero? fraction) (>= exponent 1))
+        result
+        (exact->inexact result))))
+
+(define (json-read-number port)
+  (let ((ch (peek-char port)))
+    (cond
+     ;; Negative numbers.
+     ((eqv? ch #\-)
+      (read-char port)
+      (expect-digit port)
+      (* -1 (read-positive-number port)))
+     ;; Positive numbers.
+     ((digit? ch)
+      (read-positive-number port))
+     ;; Anything else is an error.
+     (else (json-exception port)))))
+
+;;
+;; Object parsing helpers
+;;
+
+(define (read-pair port null ordered)
+  ;; Read key.
+  (let ((key (json-read-string port)))
+    (skip-whitespaces port)
+    (let ((ch (peek-char port)))
+      (cond
+       ;; Skip colon and read value.
+       ((eqv? ch #\:)
+        (read-char port)
+        (cons key (json-read port null ordered)))
+       ;; Anything other than colon is an error.
+       (else (json-exception port))))))
+
+(define (json-read-object port null ordered)
+  (expect-delimiter port #\{)
+  (let loop ((pairs '()) (added #t))
+    (skip-whitespaces port)
+    (let ((ch (peek-char port)))
+      (cond
+       ;; End of object.
+       ((eqv? ch #\})
+        (read-char port)
+        (cond
+         (added (if ordered (reverse! pairs) pairs))
+         (else (json-exception port))))
+       ;; Read one pair and continue.
+       ((eqv? ch #\")
+        (let ((pair (read-pair port null ordered)))
+          (loop (cons pair pairs) #t)))
+       ;; Skip comma and read more pairs.
+       ((eqv? ch #\,)
+        (read-char port)
+        (cond
+         (added (loop pairs #f))
+         (else (json-exception port))))
+       ;; Invalid object.
+       (else (json-exception port))))))
+
+;;
+;; Array parsing helpers
+;;
+
+(define (json-read-array port null ordered)
+  (expect-delimiter port #\[)
+  (skip-whitespaces port)
+  (cond
+   ;; Special case when array is empty.
+   ((eqv? (peek-char port) #\])
+    (read-char port)
+    #())
+   (else
+    ;; Read first element in array.
+    (let loop ((values (list (json-read port null ordered))))
+      (skip-whitespaces port)
+      (let ((ch (peek-char port)))
+        (cond
+         ;; Unexpected EOF.
+         ((eof-object? ch) (json-exception port))
+         ;; Handle comma (if there's a comma there should be another element).
+         ((eqv? ch #\,)
+          (read-char port)
+          (loop (cons (json-read port null ordered) values)))
+         ;; End of array.
+         ((eqv? ch #\])
+          (read-char port)
+          (list->vector (reverse! values)))
+         ;; Anything else other than comma and end of array is wrong.
+         (else (json-exception port))))))))
+
+;;
+;; String parsing helpers
+;;
+
+(define (read-hex-digit->integer port)
+  (let ((ch (read-char port)))
+    (cond
+     ((eqv? ch #\0) 0)
+     ((eqv? ch #\1) 1)
+     ((eqv? ch #\2) 2)
+     ((eqv? ch #\3) 3)
+     ((eqv? ch #\4) 4)
+     ((eqv? ch #\5) 5)
+     ((eqv? ch #\6) 6)
+     ((eqv? ch #\7) 7)
+     ((eqv? ch #\8) 8)
+     ((eqv? ch #\9) 9)
+     ((or (eqv? ch #\A) (eqv? ch #\a)) 10)
+     ((or (eqv? ch #\B) (eqv? ch #\b)) 11)
+     ((or (eqv? ch #\C) (eqv? ch #\c)) 12)
+     ((or (eqv? ch #\D) (eqv? ch #\d)) 13)
+     ((or (eqv? ch #\E) (eqv? ch #\e)) 14)
+     ((or (eqv? ch #\F) (eqv? ch #\f)) 15)
+     (else (json-exception port)))))
+
+(define (read-unicode-value port)
+  (+ (* 4096 (read-hex-digit->integer port))
+      (* 256 (read-hex-digit->integer port))
+      (* 16 (read-hex-digit->integer port))
+      (read-hex-digit->integer port)))
+
+;; Unicode codepoint with surrogates is:
+;;   10000 + (high - D800) + (low - DC00)
+;; which is equivalent to:
+;;  (high << 10) + low - 35FDC00
+;; see
+;;   https://github.com/aconchillo/guile-json/issues/58#issuecomment-662744070
+(define (json-surrogate-pair->unicode high low)
+  (+ (* high #x400) low #x-35FDC00))
+
+(define (read-unicode-char port)
+  (let ((codepoint (read-unicode-value port)))
+    (cond
+     ;; Surrogate pairs. `codepoint` already contains the higher surrogate
+     ;; (between D800 and DC00) . At this point we are expecting another
+     ;; \uXXXX that holds the lower surrogate (between DC00 and DFFF).
+     ((and (>= codepoint #xD800) (< codepoint #xDC00))
+      (expect-string port "\\u" #f)
+      (let ((low-surrogate (read-unicode-value port)))
+        (if (and (>= low-surrogate #xDC00) (< low-surrogate #xE000))
+            (integer->char (json-surrogate-pair->unicode codepoint low-surrogate))
+            (json-exception port))))
+     ;; Reserved for surrogates (we just need to check starting from the low
+     ;; surrogates).
+     ((and (>= codepoint #xDC00) (< codepoint #xE000))
+      (json-exception port))
+     (else (integer->char codepoint)))))
+
+(define (read-control-char port)
+  (let ((ch (read-char port)))
+    (cond
+     ((eqv? ch #\") #\")
+     ((eqv? ch #\\) #\\)
+     ((eqv? ch #\/) #\/)
+     ((eqv? ch #\b) #\bs)
+     ((eqv? ch #\f) #\ff)
+     ((eqv? ch #\n) #\lf)
+     ((eqv? ch #\r) #\cr)
+     ((eqv? ch #\t) #\ht)
+     ((eqv? ch #\u) (read-unicode-char port))
+     (else (json-exception port)))))
+
+(define (json-read-string port)
+  (expect-delimiter port #\")
+  (let loop ((chars '()) (ch (read-char port)))
+    (cond
+     ;; Unexpected EOF.
+     ((eof-object? ch) (json-exception port))
+     ;; Unescaped control characters are not allowed.
+     ((control-char? ch) (json-exception port))
+     ;; End of string.
+     ((eqv? ch #\") (reverse-list->string chars))
+     ;; Escaped characters.
+     ((eqv? ch #\\)
+      (loop (cons (read-control-char port) chars) (read-char port)))
+     ;; All other characters.
+     (else
+      (loop (cons ch chars) (read-char port))))))
+
+;;
+;; Booleans and null parsing helpers
+;;
+
+(define (json-read-true port)
+  (expect-string port "true" #t))
+
+(define (json-read-false port)
+  (expect-string port "false" #f))
+
+(define (json-read-null port null)
+  (expect-string port "null" null))
+
+;;
+;; Main parser functions
+;;
+
+(define (json-read port null ordered)
+  (skip-whitespaces port)
+  (let ((ch (peek-char port)))
+    (cond
+     ;; Unexpected EOF.
+     ((eof-object? ch) (json-exception port))
+     ;; Read JSON values.
+     ((eqv? ch #\t) (json-read-true port))
+     ((eqv? ch #\f) (json-read-false port))
+     ((eqv? ch #\n) (json-read-null port null))
+     ((eqv? ch #\{) (json-read-object port null ordered))
+     ((eqv? ch #\[) (json-read-array port null ordered))
+     ((eqv? ch #\") (json-read-string port))
+     ;; Anything else should be a number.
+     (else (json-read-number port)))))
+
+;;
+;; Public procedures
+;;
+
+(define* (json->scm #:optional (port (current-input-port))
+                    #:key (null 'null) (ordered #f) (concatenated #f))
+  "Parse a JSON document into native. Takes one optional argument,
+@var{port}, which defaults to the current input port from where the JSON
+document is read. It also takes a few of keyword arguments: @{null}: value for
+JSON's null, it defaults to the 'null symbol, @{ordered} to indicate whether
+JSON objects order should be preserved or not (the default) and @{concatenated}
+which can be used to tell the parser that more JSON documents might come after a
+properly parsed document."
+  (let loop ((value (json-read port null ordered)))
+    ;; Skip any trailing whitespaces.
+    (skip-whitespaces port)
+    (cond
+     ;; If we reach the end the parsing succeeded.
+     ((eof-object? (peek-char port)) value)
+     ;; If there's anything else other than the end, check if user wants to keep
+     ;; parsing concatenated valid JSON documents, otherwise parser fails.
+     (else
+      (cond (concatenated value)
+            (else (json-exception port)))))))
+
+(define* (json-string->scm str #:key (null 'null) (ordered #f))
+  "Parse a JSON document into native. Takes a string argument,
+@var{str}, that contains the JSON document. It also takes a couple of keyword
+argument: @{null}: value for JSON's null, it defaults to the 'null symbol and
+@{ordered} to indicate whether JSON objects order should be preserved or
+not (the default)."
+  (call-with-input-string str (lambda (p) (json->scm p #:null null #:ordered ordered))))
+
+(define* (json-seq->scm #:optional (port (current-input-port))
+                        #:key (null 'null) (ordered #f)
+                        (handle-truncate 'skip) (truncated-object 'truncated))
+  "Lazy parse a JSON text sequence from the port @var{port}.
+This procedure returns a stream of parsed documents. The optional argument
+@var{port} defines the port to read from and defaults to the current input
+port. It also takes a few keyword arguments: @{null}: value for JSON's null
+(defaults to the 'null symbol), @{ordered} to indicate whether JSON objects
+order should be preserved or not (the default), @{handle-truncate}: defines how
+to handle data loss, @{truncated-object}: used to replace unparsable
+objects. Allowed values for @{handle-truncate} argument are 'throw (throw an
+exception), 'stop (stop parsing and end the stream), 'skip (default, skip
+corrupted fragment and return the next entry), 'replace (skip corrupted fragment
+and return @{truncated-object} instead)."
+  (letrec ((handle-truncation
+            (case handle-truncate
+              ((throw) json-exception)
+              ((stop) (const (eof-object)))
+              ((skip)
+               (lambda (port)
+                 (read-delimited "\x1e" port 'peek)
+                 (read-entry port)))
+              ((replace)
+               (lambda (port)
+                 (read-delimited "\x1e" port 'peek)
+                 truncated-object))))
+           (read-entry
+            (lambda (port)
+              (let ((ch (read-char port)))
+                (cond
+                 ((eof-object? ch) ch)
+                 ((not (eqv? ch #\rs))
+                  (handle-truncation port))
+                 (else
+                  (skip-record-separators port)
+                  (catch 'json-invalid
+                    (lambda ()
+                      (let ((next (json-read port null ordered)))
+                        (if (eqv? #\lf (peek-char port))
+                            (begin
+                              (read-char port)
+                              next)
+                            (handle-truncation port))))
+                    (lambda (_ port)
+                      (handle-truncation port)))))))))
+    (port->stream port read-entry)))
+
+(define* (json-seq-string->scm str #:key (null 'null) (ordered #f)
+                               (handle-truncate 'skip) (truncated-object 'truncated))
+  "Lazy parse a JSON text sequence from the string @var{str}.
+This procedure returns a stream of parsed documents and also takes the same
+keyword arguments as @code{json-seq->scm}."
+  (call-with-input-string str
+    (lambda (p)
+      (json-seq->scm p #:null null #:ordered ordered
+                     #:handle-truncate handle-truncate
+                     #:truncated-object truncated-object))))
+
+;;; (json parser) ends here
--- a/legacy-lilypond-compatibility.ly
+++ b/legacy-lilypond-compatibility.ly
@ -1,27 +0,0 @@
-% this is to be compatible to older lilypond versions
-\version "2.18.0"
-
-#(define (on-first-page layout props)
-  "Whether the markup is printed on the first page of the book."
-  (= (chain-assoc-get 'page:page-number props -1)
-     (book-first-page layout props)))
-
-#(define-markup-command (if layout props condition? argument)
-  (procedure? markup?)
-  #:category conditionals
-  (if (condition? layout props)
-      (interpret-markup layout props argument)
-      empty-stencil))
-
-#(define (on-first-page-of-part layout props)
-  "Whether the markup is printed on the first page of the book part."
-  (= (chain-assoc-get 'page:page-number props -1)
-     (ly:output-def-lookup layout 'first-page-number)))
-
-#(define (should-print-page-number layout props)
-  "Whether the page number should be printed on this page.  This depends
-on the settings @code{print-@/page-@/numbers} and
-@code{print-@/first-@/page-@/number} of the @code{\\paper} block."
-  (and (eq? #t (ly:output-def-lookup layout 'print-page-number))
-       (or (not (on-first-page layout props))
-           (eq? #t (ly:output-def-lookup layout 'print-first-page-number)))))
--- a/snippet_include.ly
+++ b/snippet_include.ly
@ -0,0 +1,8 @@
+#(ly:set-option 'relative-includes #t)
+
+#(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)))
--- a/standalone_output.ly
+++ b/standalone_output.ly
@ -1,7 +1,22 @@
 % set the speed of the midi music
 #(define midiQuarterNoteSpeed (if (defined? 'midiQuarterNoteSpeed) midiQuarterNoteSpeed 90))

-MUSIC = { \transposable \MUSIC }
+MUSIC = { \transposable #TRANSPOSITION \MUSIC }
+
+verselayout = \layout {
+  \LAYOUT
+  \context {
+    \ChordNames
+    \override ChordName.font-size = \songTextChordFontSize
+  }
+}
+TEXT = \markuplist {
+  \override #`(transposition . ,TRANSPOSITION)
+  \override #`(verselayout . ,verselayout)
+  \override #`(verse-chords . ,#{ \chords { \verseChords } #})
+  \override #`(verse-reference-voice . ,#{ \global \firstVoice  #})
+  \TEXT
+}

 % nur Output wenn noStandaloneOutput auf false steht
 output = #(if (not noStandaloneOutput)
@ -17,7 +32,7 @@ output = #(if (not noStandaloneOutput)
    \TEXT

    \score {
-      \unfoldRepeats \MUSIC
+      \unfoldRepeats { \MUSIC \INLINESCOREMUSIC }
      \midi {
        \context {
          \Score
--- a/styles.ly
+++ b/styles.ly
@ -5,7 +5,7 @@

 #(define songStyle
  (if (not (defined? 'songStyle))
-      (if (not (defined? 'defaultSongStyle)) 'börnel defaultSongStyle)
+      (if (not (defined? 'defaultSongStyle)) 'default defaultSongStyle)
      songStyle))

 #(if (not (boolean? bookStyle))
--- a/styles/bock.ly
+++ b/styles/bock.ly
@ -1,15 +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
-songInfoPoetAndComposerStacked = ##f
-songTocColumns = 3
-globalSize = 15
-lyricSize = 1.6
--- a/styles/börnel.ly
+++ b/styles/börnel.ly
@ -1,15 +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
-songInfoPoetAndComposerStacked = ##f
-songTocColumns = 3
-globalSize = 15
-lyricSize = 1.6
--- a/styles/büdel.ly
+++ b/styles/büdel.ly
@ -1,15 +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
-songInfoPoetAndComposerStacked = ##t
-songTocColumns = 2
-globalSize = 14
-lyricSize = 1.6
--- a/title_with_category_images.ly
+++ b/title_with_category_images.ly
@ -4,7 +4,7 @@
 \markup {
  \override #'(baseline-skip . 3.5)
  \center-column {
-    \override #`(font-name . ,songTitleFont) { \fontsize #6 \fromproperty #'header:title }
+    \override #`(font-name . ,songTitleFont) { \fontsize #songTitleSize \fromproperty #'header:title }
    \large \bold \fromproperty #'header:subtitle
    \smaller \bold \fromproperty #'header:subsubtitle
  }
@ -35,23 +35,13 @@
           (string-tokenize (chain-assoc-get 'header:categories props ""))))
       (make-null-markup))))

-#(define pdf-encode
-   (if (< (list-ref (ly:version) 1) 24)
-       ly:encode-string-for-pdf
-   (@@ (lily framework-ps) pdf-encode)))
+#(define pdf-encode (@@ (lily framework-ps) pdf-encode))
 % PDF tags
 #(define-markup-command (title-to-pdf-toc layout props title) (string?)
     (ly:make-stencil
      (list 'embedded-ps
             (ly:format
-              "[/Action /GoTo /View [/Fit] /Title <~a> /OUT pdfmark"
-               (fold
-                (lambda (ch hexout)
-                  (string-append hexout
-                   (format #f "~2,'0x" (char->integer ch))))
-                 ""
-                 (string->list
-                   (pdf-encode title)))))
+              "[/Action /GoTo /View [/Fit] /Title (~a) /OUT pdfmark" (pdf-encode title)))
      empty-interval empty-interval
      ;'(0 . 0) '(0 . 0)
      ))
--- a/toc_include.ly
+++ b/toc_include.ly
@ -19,13 +19,20 @@
        (map (lambda (foo)
         (make-general-align-markup Y UP (make-override-markup '(baseline-skip . 1) (make-column-markup
          (let add-to-col ((lines restlines) (height-left height))
-            (let* ((finished (null? lines))
-                   (linestencil (if (not finished) (interpret-markup layout (cons (list (cons 'line-width line-width) (cons 'baseline-skip 1)) props) (markup #:center-align (car lines)))))
-                   (calc-height (- height-left (if finished 0 (interval-length (ly:stencil-extent linestencil Y))))))
-              (set! restlines lines)
-              (if (or (< calc-height 0) (null? lines))
-                (list)
-                (cons (markup #:stencil linestencil) (add-to-col (cdr lines) calc-height)))))))))
+            (set! restlines lines)
+            (if (null? lines)
+              '()
+              (let* ((line-to-stencil (lambda (line) (interpret-markup layout (cons (list (cons 'line-width line-width) (cons 'baseline-skip 1)) props) (markup line))))
+                     (stencil-height (lambda (stencil) (interval-length (ly:stencil-extent stencil Y))))
+                     (linestencil (line-to-stencil (car lines)))
+                     (current-line-height (stencil-height linestencil))
+                     (new-height-left (- height-left current-line-height))
+                     (next-line-height (if (null? (cdr lines)) current-line-height (stencil-height (line-to-stencil (cadr lines)))))
+                     (no-space-for-next-line (and (< next-line-height current-line-height) (< new-height-left next-line-height)))
+                     )
+                (if (or (< new-height-left 0) no-space-for-next-line)
+                  '()
+                  (cons (markup #:stencil linestencil) (add-to-col (cdr lines) new-height-left))))))))))
          (make-list cols))))
     (if (null? restlines)
         (list)
@ -160,30 +167,15 @@
               (reverse (map (lambda (m)
                               (make-size-box-to-box-markup #f #t m target-size-markup))
                          (cons
-                           (make-fill-with-pattern-markup 1 RIGHT "." (car revlist) page)
+                           (make-with-link-symbol-ref-markup 'index:label (make-fill-with-pattern-markup 1 RIGHT "." (car revlist) page))
                           (cdr revlist)))))))))

 \paper {
-  indexTitleMarkup = \markup \column {
-    \fontsize #5 \sans \bold \fill-line { \null \fromproperty #'index:text \null }
-    \vspace #.5
-    \justify {
-      Da die allermeisten Lieder unter verschiedenen Namen bekannt sind,
-      wollen wir euch ein Inhaltsverzeichnis an die Hand geben, mit dem ihr hoffentlich auf verschiedene Arten fündig werdet.
-      Die Liedtitel, die auch die Überschriften sind, findet ihr normal gedruckt.
-      Alle weiteren Alternativtitel oder Liedanfänge sind zur Unterscheidung kursiv gedruckt.
-    }
-    \vspace #1
-  }
-  categoryTitleMarkup = \markup \column {
-    \fontsize #5 \sans \bold \fill-line { \null \fromproperty #'index:text \null }
-    \vspace #1
-  }
-  indexItemMarkup = \markup \with-link-symbol-ref #'index:label {
+  indexItemMarkup = \markup {
    \index-item-with-pattern
  }
-  indexSectionMarkup = \markup \override #'(baseline-skip . 1.5) \column {
-    \fill-line { \sans \bold \fontsize #3 \fromproperty #'index:text \null }
+  indexSectionMarkup = \markup \override #'(baseline-skip . 1.5) \left-column {
+    \sans \bold \fontsize #3 \fromproperty #'index:text
    \null
  }
  indexCategoryMarkup = \markup \override #'(baseline-skip . 1.5) \column {
@ -192,29 +184,7 @@
  }

 }
-%{
-#(define-markup-list-command (index layout props) ()
-  ( _i "Outputs an alphabetical sorted index, using the paper
-  variable @code{indexTitleMarkup} for its title, then the list of
-  lines built using the @code{indexItem} music function
-  Usage: @code{\\markuplines \\index}" )
-  (cons (interpret-markup layout (cons (list (cons 'index:text "Inhaltsverzeichnis")) props)
-        (ly:output-def-lookup layout 'indexTitleMarkup))
-    (space-lines (chain-assoc-get 'baseline-skip props)
-        (map (lambda (index-item)
-         (let ((label (car index-item))
-         (index-markup (cadr index-item))
-         (text (caddr index-item)))
-           (interpret-markup
-             layout
-             (cons (list (cons 'index:page
-              (markup #:page-ref label "XXX" "?"))
-             (cons 'index:text text)
-             (cons 'index:label label))
-             props)
-             (ly:output-def-lookup layout index-markup))))
-       (index-items)))))
-%}
+
 #(define (prepare-item-markup items layout)
   (map (lambda (index-item)
         (let ((label (car index-item))
@ -226,33 +196,18 @@
             (ly:output-def-lookup layout index-markup))))
       (items)))

-
-#(define-markup-list-command (colindex layout props) ()
-  ( _i "Outputs an alphabetical sorted index, using the paper
-  variable @code{indexTitleMarkup} for its title, then the list of
-  lines built using the @code{indexItem} music function
-  Usage: @code{\\markuplines \\index}" )
-      (let ((title (interpret-markup layout (cons (list (cons 'index:text "Inhaltsverzeichnis")) props)
-        (ly:output-def-lookup layout 'indexTitleMarkup))))
-        (cons title
-  (interpret-markup-list layout props
-    (make-columnlayout-markup-list songTocColumns 2
-      (let ((h (- (ly:output-def-lookup layout 'paper-height) 12)))
-        (cons (- h (interval-length (ly:stencil-extent title Y))) h))
-      (prepare-item-markup index-items layout))))))
-
-#(define-markup-list-command (categoryindex layout props) ()
-  ( _i "Outputs categorized song titles" )
-    (if (null-list? (category-index-items))
-        (list)
-      (let ((title (interpret-markup layout (cons (list (cons 'index:text "Inhaltsverzeichnis nach Kategorien")) props)
-        (ly:output-def-lookup layout 'categoryTitleMarkup))))
-        (cons title
-  (interpret-markup-list layout props
-    (make-columnlayout-markup-list songTocColumns 2
-      (let ((h (- (ly:output-def-lookup layout 'paper-height) 12)))
-        (cons (- h (interval-length (ly:stencil-extent title Y))) h))
-      (prepare-item-markup category-index-items layout)))))))
+#(define-markup-list-command (index-in-columns-with-title layout props index-type title-markup) (symbol? markup?)
+  ( _i "Outputs index alphabetical sorted or in categories" )
+    (let ((items (case index-type
+            ((alphabetical) index-items)
+            ((categories) category-index-items)))
+          (title (interpret-markup layout props title-markup)))
+      (cons title
+      (interpret-markup-list layout props
+        (make-columnlayout-markup-list songTocColumns 2
+          (let ((h (- (ly:output-def-lookup layout 'paper-height) 12)))
+            (cons (- h (interval-length (ly:stencil-extent title Y))) h))
+          (prepare-item-markup items layout))))))

 indexItem =
 #(define-music-function (parser location sorttext text) (string? markup?)
@ -264,18 +219,6 @@ 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))

-%{
-addTitleToTOC = #(define-music-function (parser location title) (string?)
-  #{
-    \indexItem #title \markup { #title }
-  #})
-
-addAltTitleToTOC = #(define-music-function (parser location title) (string?)
-  #{
-    \indexItem #title \markup { \italic #title }
-  #})
-%}
-
 #(define (extract-var-from-module module sym)
  (let ((variableref (assoc-ref module sym)))
    (if variableref (variable-ref variableref) #f))
--- a/transposition.ly
+++ b/transposition.ly
@ -1,13 +1,22 @@
-TRANSPOSITION = ##f
+TRANSPOSITION = #(cons #f #f)

 transposeGlobal =
 #(define-void-function (from to) (ly:pitch? ly:pitch?)
   (set! TRANSPOSITION (cons from to)))

 transposable =
-#(define-music-function (music) (ly:music?)
-  (if TRANSPOSITION
+#(define-music-function (fromto music) (pair? ly:music?)
+  (if (car fromto)
    #{
-      \transpose #(car TRANSPOSITION) #(cdr TRANSPOSITION) #music
+      \transpose #(car fromto) #(cdr fromto) #music
    #}
    music))
+
+% Akkorde in Strophen transponieren
+#(define-markup-list-command (transpose layout props from to markuplist)
+  (markup? markup? markup-list?)
+
+  (define (markup->pitch m)
+    (ly:assoc-get (string->symbol (markup->string m)) pitchnames))
+
+  (interpret-markup-list layout (prepend-alist-chain 'transposition (cons (markup->pitch from) (markup->pitch to)) props) markuplist))
--- a/verses_with_chords.ly
+++ b/verses_with_chords.ly
@ -1,18 +1,13 @@
-% guile regular expressions aktivieren:
-#(use-modules (ice-9 regex))
-
 % parsing line by line
 #(define-markup-command (wrap-newline layout props text) (string?)
   "Text Zeile für Zeile parsen"
   (interpret-markup layout props
     #{ \markup { \column {
-     $(let ((verse-markup-string (string-append "\\line { "
-            (regexp-substitute/global #f "\n"
-               text
-             'pre " } \\line { " 'post )
+     $(let ((verse-markup-string (
+        string-append "\\line { "
+          (ly:regex-replace (ly:make-regex "\r?\n") text " } \\line { ")
          " \\size-box-to-box ##f ##t \"\" \"Agj\" }" )))
-       ;(ly:parse-string-expression (if (< (list-ref (ly:version) 1) 19) (ly:parser-clone parser) (ly:parser-clone)) verse-markup-string))
-       (if (< (list-ref (ly:version) 1) 19) (ly:parser-include-string parser verse-markup-string) (ly:parser-include-string verse-markup-string)))
+       (ly:parser-include-string verse-markup-string))
     }}#}
   )
 )
@ -57,11 +52,6 @@
     ((center) (make-size-box-to-box-markup use-x use-y abox bbox))
     ((left) (make-size-box-to-box-left-aligned-markup use-x use-y abox bbox)))))

-% Akkorde in Strophen transponieren
-#(define-markup-list-command (transpose layout props from to markuplist)
-  (markup? markup? markup-list?)
-  (interpret-markup-list layout (prepend-alist-chain 'transposition (cons from to) props) markuplist))
-
 #(define-markup-command (chord-alignment-style-dependent layout props chord-with-text) (markup?)
   (interpret-markup layout props
   (case songTextChordAlignment
@ -71,17 +61,18 @@
 % Text über Text mittig darstellen
 #(define-markup-command (textup layout props text uptext) (markup? markup?)
   "Markup über Text mittig darstellen."
+   (let ((verselayout (chain-assoc-get 'verselayout props generalLayout)))
   (interpret-markup layout props
     #{\markup {
       \size-box-to-box-style-dependent ##t ##f
         \general-align #X #LEFT \override #`(direction . ,UP) \override #'(baseline-skip . 1.0) \dir-column \chord-alignment-style-dependent {
           \pad-to-box #'(0 . 0) #'(0 . 2.0) { #text }
-           \size-box-to-box ##f ##t #uptext \score { \chords { g4:m a } \layout { \generalLayout } }
+           \size-box-to-box ##f ##t #uptext \score { \chords { g4:m a } \layout { \verselayout } }
         }
         #text
       }
     #}
-   ))
+   )))

 #(define-markup-command (anchor-x-between layout props arga argb)
   (markup? markup?)
@ -92,50 +83,92 @@
     ))

 #(define-markup-command (stanza-raw layout props arg)
-   (markup?)
+   (string-or-music?)
+   (let ((verselayout (chain-assoc-get 'verselayout props generalLayout)))
   (interpret-markup layout props
     (if (and (string? arg) (string-null? arg))
         " "
         #{\markup
-           \score { \new Lyrics { \lyricmode { \set stanza = #arg "" } } \layout { \generalLayout } }
+           \score { \new Lyrics { \lyricmode { #(if (ly:music? arg) arg #{ \set stanza = #arg #}) "" } } \layout { \verselayout } }
         #}
-     )))
+     ))))

 #(define-markup-command (stanza layout props arg)
-   (markup?)
+   (string-or-music?)
   (interpret-markup layout props
     (make-size-box-to-box-markup #f #t (make-stanza-raw-markup arg) (make-stanza-raw-markup "x"))))

+#(define (handle-custom-newlines custom-verse-breaks text)
+  (if (null? custom-verse-breaks)
+    text
+    (let make-custom-linebreaks
+      ((break-words custom-verse-breaks)
+       (newtext (ly:regex-replace (ly:make-regex "\r?\n") text " ")))
+      (if (null? break-words)
+          newtext
+          (make-custom-linebreaks
+            (cdr break-words)
+            (ly:regex-replace
+              (ly:make-regex
+                (string-append
+                  "("
+                  (string-concatenate
+                    (map
+                      (lambda (character)
+                        (let ((escaped_char (ly:regex-quote (string character))))
+                             (string-append "(?: *,[^,)]+\\)" escaped_char "|\\(?" escaped_char ")")))
+                      (string->list (car break-words))))
+                  "(?: *,[^,)]+\\))?)(.*)$"))
+              newtext
+              1 "\n" 2))))))
+
+#(use-modules (lily display-lily))
+
 % Kompletten Vers mit Akkorden
-#(define-markup-command (chordverse layout props stanza verse) (markup? string?)
+#(define-markup-command (chordverse layout props stanza verse) (string-or-music? string?)
+   #:properties (
+    (intraverse-vspace 0)
+    (custom-verse-breaks '())
+    (transposition (cons #f #f))
+    (verselayout generalLayout)
+    )
   "Vers mit Akkorden"
-   (let* ((fromto (chain-assoc-get 'transposition props #f))
-          (transp (if fromto
-                    (string-append "\\transpose " (car fromto) " " (cdr fromto))
+   (let ((transp (if (car transposition)
+                    (string-append "\\transpose " (symbol->string (note-name->lily-string (car transposition))) " " (symbol->string (note-name->lily-string (cdr transposition))))
                    "")))
   (interpret-markup layout props
-     (markup #:override `(baseline-skip . ,songTextLineHeigth) #:anchor-x-between #:stanza stanza
+     (markup #:override `(baseline-skip . ,(+ intraverse-vspace songTextLineHeigth)) #:anchor-x-between #:stanza stanza
       (make-wrap-newline-markup
-               (regexp-substitute/global #f "\\(( *)([^,()]*)( *),([^)]*)\\)"
-                 (regexp-substitute/global #f "(([^ \n]*\\([^()]*\\)[^ \n]*)+)" verse
-                                         'pre " \\concat { " 1 " } " 'post)
-                'pre "\\textup \\line { \"" 1 "\" " 2 " \"" 3 "\" } \\score { \\transposable " transp " \\chords { s4 " 4 " } \\layout { \\verseChordLayout } }" 'post))
+               (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 } }")
+                )
     ))))

 % Kompletter Vers aus dem Akkorde entfernt werden
-#(define-markup-command (nochordverse layout props stanza verse) (markup? string?)
+#(define-markup-command (nochordverse layout props stanza verse) (string-or-music? string?)
+   #:properties ((intraverse-vspace 0)(custom-verse-breaks '()))
   "Vers ohne Akkorde"
   (interpret-markup layout props
-     (markup #:override '(baseline-skip . 3.0) #:anchor-x-between #:stanza stanza
-           #:wrap-newline (regexp-substitute/global #f "\\(([^,]*),([^)]*)\\)" verse 'pre 1 'post )
+     (markup #:override `(baseline-skip . ,(+ intraverse-vspace 3.0)) #:anchor-x-between #:stanza stanza
+           #:wrap-newline (ly:regex-replace (ly:make-regex "\\(([^,]*),([^)]*)\\)") (handle-custom-newlines custom-verse-breaks verse) 1)
     )
   )
 )

 #(define-markup-command (verseformat layout props verse) (markup?)
+   #:properties ((verselayout generalLayout))
   "Textformatierung für Strophen"
   (interpret-markup layout props
-       (make-sans-markup (make-fontsize-markup (ly:output-def-lookup layout 'lyric-size) verse))
+     (let* (
+         (layout-scale (ly:output-def-lookup layout 'output-scale 1.0))
+         (verselayout-scale (ly:output-def-lookup verselayout 'output-scale layout-scale))
+         (mag-scale (/ verselayout-scale layout-scale))
+         (lyric-context-props (ly:context-def-lookup (ly:assoc-get 'Lyrics (ly:output-find-context-def verselayout 'Lyrics)) 'property-ops))
+         (lyric-size (caddr (find (lambda (prop) (and (equal? 'push (car prop)) (equal? 'LyricText (cadr prop)) (equal? 'font-size (cadddr prop)))) lyric-context-props)))
+       )
+       (make-magnify-markup mag-scale (make-sans-markup (make-fontsize-markup lyric-size verse)))
+     )
   )
 )

@ -145,26 +178,157 @@
                 (verse-hspace 1)
                 (verse-ordering-horizontal #f))
   "Gruppiere Strophen in einem Markup auf Wunsch spaltenweise"
-   (let ((h (make-hash-table verse-cols))
-         (index 0)
-         (column-item-count (ceiling (/ (length versegroup) verse-cols))))
-     (for-each (lambda (el)
-        (let ((i (if verse-ordering-horizontal
-                     (modulo index verse-cols)
-                     (floor (/ index column-item-count)))))
-         (hashv-set! h i (cons el (hashv-ref h i (list)))) (set! index (+ index 1))))
-       versegroup)
-     (interpret-markup layout props
-       (make-fill-line-markup (cons (make-verseformat-markup (make-line-markup
-         (reverse (hash-fold (lambda (key value l)
-             (cons (make-column-markup
-                       (fold (lambda (v verses)
-                          (cons v (if (null? verses)
-                                      verses
-                                      (cons (make-vspace-markup verse-vspace) verses))))
-                        (list) value))
-                    (if (null-list? l)
-                        l
-                        (cons (make-hspace-markup verse-hspace) l))))
-           (list) h))))
-                                (list))))))
+   (define (add-markup-between-elements reverses markup-between elements)
+     ((if reverses fold fold-right) (lambda (element filled-list)
+              (cons element (if (null? filled-list) '() (cons markup-between filled-list))))
+        '() elements))
+   (let* ((column-item-count (ceiling (/ (length versegroup) verse-cols)))
+          (column-data (make-list verse-cols)))
+    (let columnize-list ((index 0) (items versegroup))
+      (if (not (null? items))
+        (let* ((column-index (if verse-ordering-horizontal
+                                 (modulo index verse-cols)
+                                 (floor (/ index column-item-count))))
+               (column-markups (list-ref column-data column-index)))
+          (list-set! column-data column-index (cons (car items) column-markups))
+          (columnize-list (+ index 1) (cdr items)))))
+    (interpret-markup layout props
+      (make-fill-line-markup (list (make-verseformat-markup (make-line-markup
+        (add-markup-between-elements #f
+          (make-hspace-markup verse-hspace)
+          (map (lambda (column-markups)
+              (make-column-markup
+                (add-markup-between-elements #t (make-vspace-markup verse-vspace) column-markups)))
+            column-data)))))))))
+
+#(define-markup-command (pad-left layout props amount arg)
+  (number? markup?)
+  (let* ((m (interpret-markup layout props arg))
+         (x (ly:stencil-extent m X))
+         (y (ly:stencil-extent m Y)))
+    (ly:stencil-translate
+      (ly:make-stencil (ly:stencil-expr m)
+                       (cons (- (car x) amount) (cdr x))
+                       y)
+      `(,amount . 0))))
+
+#(define-markup-command (pad-right layout props amount arg)
+  (number? markup?)
+  (let* ((m (interpret-markup layout props arg))
+         (x (ly:stencil-extent m X))
+         (y (ly:stencil-extent m Y)))
+      (ly:make-stencil (ly:stencil-expr m)
+                       (cons (car x) (+ (cdr x) amount))
+                       y)))
+
+#(define-markup-command (score-equal-height layout props reference-height lines)
+  (number? markup-list?)
+  #:category music
+  #:properties ((baseline-skip))
+    (stack-stencils Y DOWN baseline-skip
+      (map
+        (lambda (line) (ly:make-stencil (ly:stencil-expr line) (ly:stencil-extent line X) `(,(/ reference-height -2.0) . ,(/ reference-height 2.0))))
+        (interpret-markup-list layout props lines))))
+
+#(define-public (custom-lyric-text::print grob)
+  "Allow interpretation of tildes as lyric tieing marks."
+  ;; See also similar code in Lyric_performer.
+  (let ((text (ly:grob-property grob 'text)))
+
+    (grob-interpret-markup grob (if (string? text)
+                                    (make-pad-right-markup -0.1 (make-tied-lyric-markup text))
+                                    text))))
+
+#(define-markup-command (chordlyrics layout props lyrics) (ly:music?)
+   #:properties ((verse-chords #{#})
+                 (verse-reference-voice #{#})
+                 (verse-break-voice #{#})
+                 (verse-line-height songTextLineHeigth)
+                 (verse-text-chord-distance songTextChordDistance)
+                 (intraverse-vspace 0)
+                 (transposition (cons #f #f))
+                 (verselayout generalLayout))
+  "Vers mit Akkorden"
+  (interpret-markup layout props
+    #{
+      \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)
+            \new Lyrics \lyricsto "dummyvoice" { #lyrics }
+          >>
+          \layout {
+            \verselayout
+            ragged-right = ##t
+            \context {
+              \Lyrics
+              \override VerticalAxisGroup.nonstaff-relatedstaff-spacing.basic-distance = #verse-text-chord-distance
+              \override LyricText.parent-alignment-X = #LEFT
+              \override LyricText.self-alignment-X = #LEFT
+              \override LyricText.word-space = 0.8
+              \override LyricSpace.minimum-distance = 0.8
+              \override LyricText.stencil = #custom-lyric-text::print
+            }
+            \context {
+              \ChordNames
+              \override VerticalAxisGroup.staff-affinity = ##f
+              \override ChordName.extra-spacing-width = #'(-0.1 . 0.1)
+            }
+            \context {
+              \Score
+              \override PaperColumn.keep-inside-line = ##f
+             % \override SpacingSpanner.strict-note-spacing = ##t
+              \override SpacingSpanner.uniform-stretching = ##t
+              \override SpacingSpanner.spacing-increment = 0
+              \remove Bar_number_engraver
+              \remove Mark_engraver
+              \remove Volta_engraver
+              \remove Parenthesis_engraver
+            }
+            \context {
+              \Staff
+              \remove Staff_symbol_engraver
+              \remove Clef_engraver
+              \remove Time_signature_engraver
+              \remove Bar_engraver
+              \remove Separating_line_group_engraver
+              \omit KeySignature
+              \omit KeyCancellation
+            }
+            \context {
+              \Voice
+              \remove Stem_engraver
+              \remove Rest_engraver
+              \remove Multi_measure_rest_engraver
+              \remove Phrasing_slur_engraver
+              \remove Slur_engraver
+              \remove Tie_engraver
+              \remove Dynamic_engraver
+              \remove Note_heads_engraver
+            }
+            \context {
+              \NullVoice
+              \consists Rest_engraver
+              \omit Rest
+             % \undo \omit NoteHead
+             % \hide NoteHead
+            }
+          }
+        }
+      }
+    #}
+  )
+)
+
+#(define-markup-command (nochordlyrics layout props lyrics) (ly:music?)
+    "Vers ohne Akkorde"
+  (interpret-markup layout props
+    (markup
+      #:override `(verse-chords . ,#{#})
+      #:override `(verse-line-height . ,(- songTextLineHeigth 2))
+      #:chordlyrics lyrics))
+)
Author	SHA1	Message	Date
tux	b4690f63bc	Alternativchords mit Klammern	2024-09-04 09:39:57 +02:00
tux	958efca6aa	set spacing for rests in chordlyrics	2024-09-03 12:13:23 +02:00
tux	81a5676965	more precise Links in PDF toc	2024-07-19 14:32:41 +02:00
tux	5ee1a7b6be	show year also for same author on text and melody	2024-07-17 13:34:00 +02:00
tux	162d32c53d	hide KeyCancellation in chordlyrics	2024-07-12 07:55:55 +02:00
tux	a3c3a67b33	make songTitleSize customizable	2024-07-10 22:29:58 +02:00
tux	09d3bb7fa1	improve spacing of chordlyrics	2024-06-30 19:02:12 +02:00
tux	bab581042a	deprecate \schwarzkopf and solve the problem with layers	2024-06-30 15:27:53 +02:00
Christoph Wagner	3b87476549	have repeat signs as stanzas in lyrics	2024-06-30 10:28:21 +02:00
Christoph Wagner	c4bfc17b89	support für römische Zahlen in den Strophen	2024-06-29 19:18:05 +02:00
Christoph Wagner	e388559f23	auch die Punktierung grau machen im secondVoiceStyle	2024-06-29 16:56:53 +02:00
tux	e17c544763	Anteil der songinfo Breite an Gesamtbreite konfigurierbar	2024-06-25 12:17:54 +02:00
tux	3c2f27b477	use upstream merge rest engraver	2024-06-02 19:46:43 +02:00
tux	b3d46ff607	fix tranpose	2024-05-27 14:56:44 +02:00
tux	0df95f6441	Textakkordabstands finetuning	2024-05-26 22:08:09 +02:00
tux	201a54f60a	recognize verselayout and use lyrictext font size to render verse markup	2024-05-25 17:28:02 +02:00
tux	0199813a81	repair transposition for books	2024-05-25 13:14:14 +02:00
Christoph Wagner	bce9ffe763	hide multi measure rests in chordlyrics	2024-05-22 22:55:41 +02:00
tux	86943b9316	fix default reference voice and chords for songbook output	2024-05-22 22:55:41 +02:00
tux	5884ab9d2c	rework authorsystem * add translation, interlude, bridge and meloverse * fix rendering bugs	2024-05-12 18:31:39 +02:00
Christoph Wagner	199f515be9	fix verse-chord multiple transpose problem	2024-05-12 16:13:56 +02:00
Christoph Wagner	8c7386807b	fix spacing in new chordlyrics system	2024-03-30 18:12:51 +01:00
tux	7f7cac99f4	add chordlyrics and nochordlyrics	2024-03-24 11:22:49 +01:00
Christoph Wagner	395e959432	unknown author and shiftChords	2024-02-16 20:00:10 +01:00
tux	e72efbd156	custom line breaks more robust refs #21	2024-02-04 16:29:10 +01:00
tux	a0f60bc1c7	Autorensystem erweitert mit Angaben von Teilbeiträgen	2024-01-03 22:31:59 +01:00
tux	f5d5e1b020	neues System für Autorenangaben	2023-12-30 20:14:31 +01:00
Jakob Krueger	4f43791541	Styleanpassungen Default style	2023-12-24 00:05:33 +01:00
Christoph Wagner	2f906344de	fix custom line break issue with comma	2023-11-23 10:24:06 +01:00
tux	b23ba5c0dc	Aussprache ist natürlich pronunciation	2023-11-22 18:36:59 +01:00
tux	bc769f0831	gibt nur noch default style, alles andere in Liederbuchrepos	2023-11-22 17:33:02 +01:00
tux	6975cb1713	einheitliche ref und stanza Formatierung	2023-11-22 16:48:44 +01:00
tux	fbaf7a2c86	drop lilypond pre 2.25.8 compatibility, cause its not working anyway	2023-11-22 15:28:31 +01:00
tux	8b0fc2d7c9	snippets einzeln baubar und default layout	2023-11-02 23:13:11 +01:00
Christoph Wagner	14e01900c2	songinfo Ausrichtung einfacher anpassbar gemacht	2023-11-01 09:48:52 +01:00
tux	bf596edb2c	songinfogenerierung optimiert	2023-10-31 18:48:15 +01:00
tux	d6774670f3	Songinfogenerierung verbessert	2023-10-31 13:31:50 +01:00
tux	260664462d	fix custom verse breaks for windows	2023-10-30 23:24:18 +01:00
tux	9de2869750	erlaube Umbrüche in Versen nach angegebenen Texten	2023-10-29 22:54:10 +01:00
tux	f0010c7746	Layoutmodifikationen auch für Strophen nutzen	2023-10-29 16:25:15 +01:00
tux	bedb2c0e22	fix chord name font	2023-10-28 09:34:26 +02:00
tux	33c3d47504	Strophensortierung gefixt	2023-09-25 01:39:55 +02:00
tux	15f37accaa	repeats around chords	2023-09-18 18:08:33 +02:00
tux	c26fddd963	Inhaltsverzeichniserzeugung refactored	2023-09-17 18:08:52 +02:00
tux	55db0e0e31	Liederbuchvorlage wieder lauffähig gemacht	2023-09-16 18:38:53 +02:00
tux	7a0dd88067	add json parser for structured data like AUTHOR_DATA and SONG_DATA	2023-08-20 12:14:30 +02:00
tux	c20d0327e7	einheitliche Funktionalität zur Autorenanzeige #3	2023-08-11 16:25:06 +02:00
Jakob Krueger	05ea776add	Größerer intraverse space für Büdel-style	2023-08-10 15:18:12 +02:00
tux	7ddd597bed	PDF Bookmarks gefixt	2023-08-10 13:20:16 +02:00
Christoph Wagner	5c6fde06cc	verbesserte Spaltenumbruchmethode #2	2023-08-10 10:14:01 +02:00
Christoph Wagner	973d72301c	shiftChord für manuelle Feinjustierung eingeführt #1	2023-08-10 09:39:07 +02:00
tux	fbf273dae9	smarter breaks in toc columns closes #2	2023-08-09 16:39:17 +02:00
tux	e2dc938c02	intraverse-vspace eingebaut, um Zeilenabstand zu beeinflussen	2023-08-09 13:36:46 +02:00
tux	301681fffb	use new lilypond 2.25 regexes and font definitions	2023-08-09 11:17:58 +02:00
tux	d900a95d79	add inline score music to midi output	2023-08-07 19:11:29 +02:00