new engraver for spacing in chordlyrics

2025-11-19 17:44:03 +01:00
6 changed files with 65 additions and 82 deletions
--- a/private_includes/base/all.ily
+++ b/private_includes/base/all.ily
@@ -21,17 +21,8 @@
    )))))
    (scm-load "resolve_inherits.scm")
    (scm-load "yaml_parser.scm")))
-
-#(define (song-includes-data-path filename)
-  (string-join
-    (list
-      (dirname (dirname (dirname (dirname (current-filename)))))
-      "lilypond-song-includes"
-      "data"
-      filename)
-    file-name-separator-string))
-#(define AUTHOR_DATA (if (defined? 'AUTHOR_DATA) AUTHOR_DATA (parse-yml-file (song-includes-data-path "authors.yml"))))
-#(define SONG_DATA (if (defined? 'SONG_DATA) SONG_DATA (parse-yml-file (song-includes-data-path "songs.yml"))))
+#(define AUTHOR_DATA (if (defined? 'AUTHOR_DATA) AUTHOR_DATA (parse-yml-file "../../lilypond-song-includes/data/authors.yml")))
+#(define SONG_DATA (if (defined? 'SONG_DATA) SONG_DATA (parse-yml-file "../../lilypond-song-includes/data/songs.yml")))

 \include "merge_rests_engraver_override.ily"
 \include "basic_format_and_style_settings.ily"
--- a/private_includes/base/basic_format_and_style_settings.ily
+++ b/private_includes/base/basic_format_and_style_settings.ily
@@ -49,7 +49,6 @@ generalLayout = \layout {
  \context {
    \Score
    \remove "Bar_number_engraver"
-    \remove "Metronome_mark_engraver"
    \RemoveEmptyStaves
    \override VerticalAxisGroup.remove-first = ##t
    \overrideTimeSignatureSettings
@@ -134,23 +133,18 @@ override-stanza =
 #}
 )

-#(define (handle-stanza-numbers context numbers number-formater)
-  (let* ((stanzanumbers (ly:assoc-get 'custom-stanzanumber-override (ly:assoc-get 'details (ly:context-grob-definition context 'StanzaNumber) '()) numbers))
-         (stanza-style (ly:assoc-get 'style (ly:context-grob-definition context 'StanzaNumber)))
-         (roman-format (lambda (stanzanumber) (format #f "~@r" stanzanumber))))
-      (ly:context-set-property! context 'stanza
-        (number-formater
-          (if (eq? stanza-style 'roman)
-              (map roman-format stanzanumbers)
-              stanzanumbers)))))
-
 #(define (stanza . stanzanumbers)
 #{
  \once \override StanzaNumber.details.custom-realstanza = ##t % set this to signal that there is a real stanza and no repeat signs
  \applyContext
  #(lambda (context)
-    (handle-stanza-numbers context stanzanumbers
-      (lambda (numbers) (string-join (map (lambda (n) (format #f stanzaFormat n)) numbers) ", "))))
+    (let* ((stanzanumbers-override (ly:assoc-get 'custom-stanzanumber-override (ly:assoc-get 'details (ly:context-grob-definition context 'StanzaNumber) '()) #f))
+           (stanza-style (ly:assoc-get 'style (ly:context-grob-definition context 'StanzaNumber)))
+           (stanza-format (lambda (stanzanumber) (format #f (if (eq? stanza-style 'roman) romanStanzaFormat stanzaFormat) stanzanumber))))
+        (ly:context-set-property! context 'stanza
+          (string-join (map stanza-format
+                            (if stanzanumbers-override stanzanumbers-override stanzanumbers))
+                        ", "))))
 #}
 )

@@ -158,14 +152,7 @@ ref =
 #(define-music-function (stanzanumbers lyrics) ((number-list? (list)) ly:music?)
 #{ \lyricmode {
    \once \override StanzaNumber.details.custom-realstanza = ##t % set this to signal that there is a real stanza and no repeat signs
-    \applyContext
-    #(lambda (context)
-      (handle-stanza-numbers context stanzanumbers
-        (lambda (numbers)
-          (make-on-the-fly-markup
-            (lambda (layout props m)
-              ((ly:output-def-lookup layout 'refMarkupFormatter) layout props numbers))
-            (make-null-markup)))))
+    \set stanza = #(make-on-the-fly-markup (lambda (layout props m) ((ly:output-def-lookup layout 'refMarkupFormatter) layout props stanzanumbers)) (make-null-markup))
    #lyrics
  }
 #}
--- a/private_includes/base/default_style.ily
+++ b/private_includes/base/default_style.ily
@@ -16,6 +16,7 @@ songTocColumns = 3
 globalSize = 15
 lyricSize = 1.6
 stanzaFormat = "~a."
+romanStanzaFormat = "~@r."
 refString = "Ref.:"
 refStringWithNumbers = "Ref. ~a:"
 % hübsche Wiederholungszeichen für den Liedtext
--- a/private_includes/base/verses_with_chords.ily
+++ b/private_includes/base/verses_with_chords.ily
@@ -60,20 +60,19 @@

 % Text über Text mittig darstellen
 #(define-markup-command (textup layout props text uptext) (markup? markup?)
-   #:properties ((verselayout generalLayout)
-                 (verse-text-chord-distance songTextChordDistance))
   "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) \dir-column \chord-alignment-style-dependent {
-           \pad-to-box #'(0 . 0) #`(0 . ,(- verse-text-chord-distance 0.8)) { #text }
-           \size-box-to-box ##f ##t #uptext \score { \chords { g4:m a } \layout { $verselayout } }
+         \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 { \verselayout } }
         }
         #text
       }
     #}
-   ))
+   )))

 #(define-markup-command (anchor-x-between layout props arga argb)
   (markup? markup?)
@@ -83,15 +82,16 @@
            (ly:stencil-aligned-to m X (- (/ (* la 2) l) 1))
     ))

-#(define-markup-command (stanza-raw layout props arg) (string-or-music?)
-   #:properties ((verselayout generalLayout))
+#(define-markup-command (stanza-raw layout props arg)
+   (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 { #(if (ly:music? arg) arg #{ \set stanza = #arg #}) "" } } \layout { $verselayout } }
+           \score { \new Lyrics { \lyricmode { #(if (ly:music? arg) arg #{ \set stanza = #arg #}) "" } } \layout { \verselayout } }
         #}
-     )))
+     ))))

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

@@ -256,6 +256,7 @@
 Chord_lyrics_spacing_engraver =
 #(lambda (ctx)
   (let ((last-lyric-syllable #f)
+         (last-lyric-syllable-width 0)
         (lyric-width-since-last-chord 0)
         (music-columns-for-last-syllable 0)
         (last-printed-chord #f)
@@ -283,6 +284,7 @@ Chord_lyrics_spacing_engraver =
        )
       ((break-event engraver event)
        (set! last-lyric-syllable #f)
+        (set! last-lyric-syllable-width 0)
        (set! lyric-width-since-last-chord 0)
        (set! music-columns-for-last-syllable 0)
        (set! last-printed-chord #f)
@@ -296,16 +298,16 @@ Chord_lyrics_spacing_engraver =
       ((lyric-syllable-interface this-engraver grob source-engraver)
        (let ((syllable-width (interval-length (ly:grob-extent grob grob X))))
          (set! lyric-width-since-last-chord (+ lyric-width-since-last-chord syllable-width))
+          (set! last-lyric-syllable-width syllable-width)
          )
        (if (> chord-width-since-last-lyric 0)
            (if lyrics-seen-since-break
                (ly:grob-set-property! grob 'extra-spacing-width
                                       (cons (- chord-width-since-last-lyric) (cdr (ly:grob-property grob 'extra-spacing-width '(0 . 0)))))
                (if last-printed-chord
-                  (let ((gap-for-starting-rest 2.0))
-                    (if stanza (ly:grob-set-property! stanza 'padding (+ 1 gap-for-starting-rest)))
-                    (ly:grob-set-parent! grob X last-printed-chord)
-                    (ly:grob-set-property! grob 'X-offset gap-for-starting-rest)
+                  (begin
+                    (if stanza (ly:grob-set-property! stanza 'padding chord-width-since-last-lyric))
+                    (place-at-right-edge grob last-printed-chord 0)
                    )))
            )
        (set! last-lyric-syllable grob)
@@ -366,7 +368,10 @@ Chord_lyrics_spacing_engraver =
            \new Lyrics \lyricsto "dummyvoice" { #lyrics }
          >>
          \layout {
-            $verselayout
+            \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
--- a/private_includes/book/toc_include.ily
+++ b/private_includes/book/toc_include.ily
@@ -90,7 +90,7 @@
     (for-each (lambda (category)
            (let* ((catsym (string->symbol category))
                   (catlist (hashq-ref category-index-hash catsym
-                              (list (list label 'indexCategoryMarkup `(((combine-with-next . #t) (rawtext . ,category))))))))
+                              (list (list label 'indexCategoryMarkup `(((rawtext . ,category))))))))
              (if (assq catsym category-names)
                (hashq-set! category-index-hash catsym
                  (cons (list label markup-symbol textoptions) catlist))
@@ -114,7 +114,7 @@
     (for-each (lambda (authorID)
            (let* ((authorsym (string->symbol authorID))
                   (authorlist (hashq-ref author-index-hash authorsym
-                              (list (list label 'indexAuthorMarkup `(((combine-with-next . #t) (rawtext . ,authorID))))))))
+                              (list (list label 'indexAuthorMarkup `(((rawtext . ,authorID))))))))
                (hashq-set! author-index-hash authorsym
                  (cons (list label markup-symbol textoptions) authorlist))
                ))
@@ -218,29 +218,20 @@
 }

 #(define (prepare-item-markup items layout)
-  (define (single-item-markup index-item)
-    (let* ((label (car index-item))
-           (index-markup (cadr index-item))
-           (textoptions (caddr index-item))
-           (text (chain-assoc-get 'rawtext textoptions))
-           (alternative (chain-assoc-get 'alternative textoptions))
-           (songnumber (chain-assoc-get 'songnumber textoptions)))
-      (markup #:override (cons 'index:label label)
-        #:override (cons 'index:page (markup #:custom-page-number label -1))
-        #:override (cons 'index:text text)
-        #:override (cons 'index:alternative alternative)
-        #:override (cons 'index:songnumber songnumber)
-        (ly:output-def-lookup layout index-markup))))
-  (if (null? items)
-      items
-      (let* ((index-item (car items))
-             (combine-with-next (chain-assoc-get 'combine-with-next (caddr index-item) #f))
-             (restitems (cdr items))
-             (item-markup (single-item-markup index-item)))
-        (if (and combine-with-next (not (null? restitems)))
-            (cons (make-column-markup (list item-markup (single-item-markup (car restitems)))) (prepare-item-markup (cdr restitems) layout))
-            (cons item-markup (prepare-item-markup restitems layout))))
-      ))
+   (map (lambda (index-item)
+         (let* ((label (car index-item))
+                (index-markup (cadr index-item))
+                (textoptions (caddr index-item))
+                (text (chain-assoc-get 'rawtext textoptions))
+                (alternative (chain-assoc-get 'alternative textoptions))
+                (songnumber (chain-assoc-get 'songnumber textoptions)))
+           (markup #:override (cons 'index:label label)
+             #:override (cons 'index:page (markup #:custom-page-number label -1))
+             #:override (cons 'index:text text)
+             #:override (cons 'index:alternative alternative)
+             #:override (cons 'index:songnumber songnumber)
+             (ly:output-def-lookup layout index-markup))))
+       (items)))

 #(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" )
@@ -254,7 +245,7 @@
        (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))))))
+          (prepare-item-markup items layout))))))

 indexItem =
 #(define-music-function (parser location sorttext text) (string? markup?)
@@ -264,7 +255,7 @@ indexItem =
 indexSection =
 #(define-music-function (parser location sorttext text) (string? markup?)
   "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 (prepend-alist-chain 'combine-with-next #t (prepend-alist-chain 'rawtext text '())) sorttext))
+   (add-index-item! 'indexSectionMarkup (prepend-alist-chain 'rawtext text '()) sorttext))

 #(define (extract-and-check-vars-from-header bookheader varlist)
  (let* ((headervars (hash-map->list cons (struct-ref (ly:book-header bookheader) 0)))
--- a/public_includes/layout_bottom.ily
+++ b/public_includes/layout_bottom.ily
@@ -1,11 +1,7 @@
-MUSIC = { \transposable #TRANSPOSITION \MUSIC }
+% set the speed of the midi music
+#(define midiQuarterNoteSpeed (if (defined? 'midiQuarterNoteSpeed) midiQuarterNoteSpeed 90))

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

 verselayout = \layout {
  \LAYOUT
@@ -15,6 +11,13 @@ verselayout = \layout {
  }
 }

+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)
@@ -67,6 +70,11 @@ TEXT = \markuplist {
    \score {
      \unfoldRepeats { \MUSIC \INLINESCOREMUSIC }
      \midi {
+        \context {
+          \Score
+          % Tempo des midi files
+          tempoWholesPerMinute = #(/ midiQuarterNoteSpeed 4)
+        }
        \context {
          \Staff
          \remove "Staff_performer"