new engraver for spacing in chordlyrics

all_base_includes.ly

@@ -1,9 +1,3 @@
-#(define include_dir_not_added? (if (defined? 'include_dir_not_added?) include_dir_not_added? #t))
-#(if include_dir_not_added?
-   (let* ((common-include-dir (dirname (dirname (dirname (current-filename))))))
-      (ly:parser-append-to-include-path common-include-dir)
-      (set! include_dir_not_added? #f)))
-
 #(define noStandaloneOutput (if (defined? 'noStandaloneOutput) noStandaloneOutput #f))
 
 #(define windows? (string-prefix-ci? "windows" (utsname:sysname (uname))))
@@ -25,15 +19,15 @@
 #(define AUTHOR_DATA (if (defined? 'AUTHOR_DATA) AUTHOR_DATA (parse-yml-file "../../lilypond-song-includes/data/authors.yml")))
 #(define SONG_DATA (if (defined? 'SONG_DATA) SONG_DATA (parse-yml-file "../../lilypond-song-includes/data/songs.yml")))
 
-\include "basic_format_and_style_settings.ily"
-\include "eps_file_from_song_dir.ily"
-\include "title_with_category_images.ily"
-\include "chord_settings.ily"
-\include "transposition.ily"
-\include "verses_with_chords.ily"
-\include "arrows_in_scores.ily"
-\include "swing_style.ily"
-\include "inline_score.ily"
+\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"
 \include "custom_indentation.ily"
 \include "include_from_song.ily"
 

basic_format_and_style_settings.ly

@@ -1,10 +1,10 @@
 \language "deutsch"
 
-\include "default_style.ily"
-\include "default_songinfo_style.ily"
-\include "footer_with_songinfo.ily"
+\include "default_style.ly"
+\include "default_songinfo_style.ly"
+\include "footer_with_songinfo.ly"
 
-\include #(if (defined? 'customStyleOverridesFile) customStyleOverridesFile "../void.ily")
+\include #(if (defined? 'customStyleOverridesFile) customStyleOverridesFile "void.ly")
 
 #(set-default-paper-size songFormatAndSize)
 #(set-global-staff-size globalSize)
@@ -121,18 +121,16 @@ override-stanza =
 #}
 )
 
-#(define (stanza . stanzanumbers)
+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* ((stanzanumber-override (ly:assoc-get 'forced-spacing (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 stanzanumber-override (list stanzanumber-override) stanzanumbers))
-                        ", "))))
+    (let* ((stanzanumber (ly:assoc-get 'forced-spacing (ly:context-grob-definition context 'StanzaNumber) stanzanumber))
+           (stanzastyle (ly:assoc-get 'style (ly:context-grob-definition context 'StanzaNumber)))
+           (formattedStanzaNumber (format #f (if (eq? stanzastyle 'roman) romanStanzaFormat stanzaFormat) stanzanumber)))
+        (ly:context-set-property! context 'stanza formattedStanzaNumber)))
 #}
 )
 
@@ -194,16 +192,12 @@ alt =
 
 updown =
 #(define-music-function (parser location word) (string?)
-(let ((first-char (string-take word 1))
-      (rest (substring word 1 (string-length word))))
 #{
   \lyricmode {
-    \markup {
-      \tag #'up #(string-append (string-capitalize first-char) rest)
-      \tag #'down #(string-append (string-downcase first-char) rest)
-    }
+    \tag #'up { \markup { #(string-capitalize word) } }
+    \tag #'down { \markup { #(string-downcase word) } }
   }
-#}))
+#})
 
 dottedExtender = {
   \override LyricExtender.style = #'dotted-line
@@ -237,19 +231,3 @@ cue =
             (make-null-markup))
       }
   #})
-
-#(define-markup-command (ruf-style layout props text) (string?)
-   (interpret-markup layout props
-                     (markup #:italic (string-append "(" text ")"))))
-rufWithMarkup =
-#(define-music-function (text) (markup?)
-   #{
-     \lyricmode {
-       \once \override StanzaNumber.font-series = #'normal
-       \once \override StanzaNumber.direction = 1
-       \set stanza = #text
-     }
-   #})
-ruf =
-#(define-music-function (text) (string?)
-   (rufWithMarkup (make-ruf-style-markup text)))

default_output.ly

@@ -4,4 +4,4 @@ HEADER = \bookpart {
     \basicSongInfo
   }
 }
-\include #(if noDefaultOutput "../private_includes/void.ily" "layout_bottom.ily")
+\include #(if noDefaultOutput "void.ly" "standalone_output.ly")

default_songinfo_style.ly

@@ -2,8 +2,7 @@
   poetPrefix = "Worte:"
   composerPrefix = "Weise:"
   compositionPrefix = "Satz:"
-  adaptionTextPrefix = "Bearbeitung Text:"
-  adaptionMusicPrefix = "Bearbeitung Musik:"
+  adaptionPrefix = "Bearbeitung:"
   poetAndComposerEqualPrefix = "Worte und Weise:"
   voicePrefix = "Stimme:"
   versePrefix = "Strophe:"
@@ -52,7 +51,7 @@
                       (lambda (paragraph)
                         (make-wordwrap-internal-markup-list #t
                           #{ \markuplist { $(ly:parser-include-string paragraph) } #}))
-                      (ly:regex-split (ly:make-regex "\n[ \t\n]*\n[ \t\n]*") (string-append prefix text))))
+                      (ly:regex-split (ly:make-regex "\n[ \t\n]*\n[ \t\n]*") text)))
                   '()))))
           (stack-lines DOWN 0.0 (chain-assoc-get 'baseline-skip props)
             (interpret-markup-list layout props

footer_with_songinfo.ly

@@ -102,28 +102,16 @@
             (verseComposerData (find-author-id-with-part-numbers 'meloverse authors))
             (voiceComposerData (find-author-id-with-part-numbers 'voice authors))
             (compositionIds (find-author-ids-by 'composition authors))
-            (adaptionTextIds (find-author-ids-by 'adaption_text authors))
-            (adaptionMusicIds (find-author-ids-by 'adaption_music authors))
+            (adaptionIds (find-author-ids-by 'adaption authors))
             (bridgeIds (find-author-ids-by 'bridge authors))
             (interludeIds (find-author-ids-by 'interlude authors))
             (year_text (chain-assoc-get 'header:year_text props #f))
             (year_translation (chain-assoc-get 'header:year_translation props #f))
             (year_melody (chain-assoc-get 'header:year_melody props #f))
             (year_composition (chain-assoc-get 'header:year_composition props #f))
-            (year_adaption_text (chain-assoc-get 'header:year_adaption_text props #f))
-            (year_adaption_music (chain-assoc-get 'header:year_adaption_music props #f))
+            (year_adaption (chain-assoc-get 'header:year_adaption props #f))
             )
-        (if (and
-              (equal? poetIds composerIds)
-              (null? translatorIds)
-              (null? versePoetData)
-              (null? verseComposerData)
-              (null? voiceComposerData)
-              (null? compositionIds)
-              (null? adaptionTextIds)
-              (null? adaptionMusicIds)
-              (null? bridgeIds)
-              (null? interludeIds))
+        (if (and (equal? poetIds composerIds) (null? translatorIds) (null? versePoetData) (null? verseComposerData) (null? voiceComposerData) (null? compositionIds) (null? adaptionIds) (null? bridgeIds) (null? interludeIds))
           (list
             (join-present (list
               (render-contribution-group (ly:output-def-lookup layout 'poetAndComposerEqualPrefix) poetIds)
@@ -145,20 +133,9 @@
                     (render-contribution-group (ly:output-def-lookup layout 'translationPrefix) translatorIds)
                     year_translation
                   ) ", ")
-                  (join-present (list
-                    (render-contribution-group (ly:output-def-lookup layout 'adaptionTextPrefix) adaptionTextIds)
-                    year_adaption_text
-                  ) ", ")
                 ) "; ")
               ))
-            (if (and
-                  (null? composerIds)
-                  (null? compositionIds)
-                  (null? adaptionMusicIds)
-                  (null? verseComposerData)
-                  (null? voiceComposerData)
-                  (null? bridgeIds)
-                  (null? interludeIds)) #f
+            (if (and (null? composerIds) (null? compositionIds) (null? adaptionIds) (null? verseComposerData) (null? voiceComposerData) (null? bridgeIds) (null? interludeIds)) #f
               (string-append
                 (ly:output-def-lookup layout 'composerPrefix)
                 " "
@@ -174,8 +151,8 @@
                     year_composition
                   ) ", ")
                   (join-present (list
-                    (render-contribution-group (ly:output-def-lookup layout 'adaptionMusicPrefix) adaptionMusicIds)
-                    year_adaption_music
+                    (render-contribution-group (ly:output-def-lookup layout 'adaptionPrefix) adaptionIds)
+                    year_adaption
                   ) ", ")
                   (render-contribution-group (ly:output-def-lookup layout 'bridgePrefix) bridgeIds)
                   (render-contribution-group (ly:output-def-lookup layout 'interludePrefix) interludeIds)

general_include.ly

@@ -1,5 +1,6 @@
+\version "2.25.8"
 #(ly:set-option 'relative-includes #t)
 
 #(define noDefaultOutput #t)
 
-\include "../private_includes/base/all.ily"
+\include "all_base_includes.ly"

include_from_song.ily

@@ -5,7 +5,7 @@ includeFromSong =
     (ly:parser-parse-string (ly:parser-clone)
       (ly:format "\\include \"~a\""
       (string-append
-        (dirname (dirname (dirname (dirname (current-filename)))))
+        (dirname (dirname (current-filename)))
         file-name-separator-string
         "lilypond-song-includes"
         file-name-separator-string

public_includes/book_top.ily

@@ -1,3 +0,0 @@
-\include "../private_includes/book/book_include.ily"
-\include "../private_includes/book/toc_include.ily"
-\include "../private_includes/book/appendix.ily"

snippet_include.ly

@@ -2,4 +2,4 @@
 
 #(define noDefaultOutput (if (defined? 'noDefaultOutput) noDefaultOutput #f))
 
-\include #(if noDefaultOutput "../private_includes/void.ily" "../private_includes/base/all.ily")
+\include #(if noDefaultOutput "void.ly" "all_base_includes.ly")

styles.ly

@@ -0,0 +1,16 @@
+#(define bookStyle
+  (if (not (defined? 'bookStyle))
+      #f
+      bookStyle))
+
+#(define songStyle
+  (if (not (defined? 'songStyle))
+      (if (not (defined? 'defaultSongStyle)) 'default defaultSongStyle)
+      songStyle))
+
+#(if (not (boolean? bookStyle))
+         (set! songStyle bookStyle))
+
+#(define (bock-style layout props)
+  "Whether we have bockstyle or not"
+  (eq? songStyle 'bock))

toc_include.ly

@@ -381,8 +381,7 @@ headerToTOC = #(define-music-function (parser location header label) (ly:book? s
                    (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))
-                   (adaptionTextIds (find-author-ids-by 'adaption_text authors))
-                   (adaptionMusicIds (find-author-ids-by 'adaption_music authors))
+                   (adaptionIds (find-author-ids-by 'adaption authors))
                    (bridgeIds (find-author-ids-by 'bridge authors))
                    (interludeIds (find-author-ids-by 'interlude authors)))
               (map csv-escape
@@ -398,15 +397,14 @@ headerToTOC = #(define-music-function (parser location header label) (ly:book? s
 
                   (headervar-or-empty 'categorytitle)
                   (headervar-or-empty 'categories)
-                  (format-authors (append poetIds adaptionTextIds (map car versePoetData)))
+                  (format-authors (append poetIds (map car versePoetData)))
                   (format-authors translatorIds)
-                  (format-authors (append composerIds compositionIds adaptionMusicIds bridgeIds interludeIds (map car voiceComposerData) (map car verseComposerData)))
+                  (format-authors (append composerIds compositionIds adaptionIds bridgeIds interludeIds (map car voiceComposerData) (map car verseComposerData)))
                   (headervar-or-empty 'year_text)
                   (headervar-or-empty 'year_melody)
                   (headervar-or-empty 'year_translation)
                   (headervar-or-empty 'year_composition)
-                  (headervar-or-empty 'year_adaption_text)
-                  (headervar-or-empty 'year_adaption_music)
+                  (headervar-or-empty 'year_adaption)
                   (headervar-or-empty 'copyright)
                   (headervar-or-empty 'source)
                   (format-info-paragraphs (headervar-or-empty 'infotext))
@@ -431,8 +429,7 @@ headerToTOC = #(define-music-function (parser location header label) (ly:book? s
         "year_melody"
         "year_translation"
         "year_composition"
-        "year_adaption_text"
-        "year_adaption_music"
+        "year_adaption"
         "copyright"
         "source"
         "infotext"

verses_with_chords.ly

@@ -253,6 +253,113 @@
                                     (make-pad-right-markup -0.1 (make-tied-lyric-markup text))
                                     text))))
 
+Chord_lyrics_spacing_engraver =
+#(lambda (ctx)
+   (let ((last-note-head #f)
+         (note-head-extended #f)
+         (last-lyric-syllable-width 0)
+         (lyric-width-since-last-chord 0)
+         (notes-on-syllable-count 0)
+         (last-chord-name #f)
+         (remaining-chord-width 0)
+         (last-rest #f)
+         (rest-count 0)
+         (multi-measure-rest-count 0)
+         (stanza-shift 0))
+     (make-engraver
+      (listeners
+       ((multi-measure-rest-event engraver event)
+        (set! multi-measure-rest-count (+ multi-measure-rest-count 1))
+        )
+       ((break-event engraver event)
+        (set! last-note-head #f)
+        (set! note-head-extended #f)
+        (set! last-lyric-syllable-width 0)
+        (set! lyric-width-since-last-chord 0)
+        (set! notes-on-syllable-count 0)
+        (set! last-chord-name #f)
+        (set! remaining-chord-width 0)
+        (set! last-rest #f)
+        (set! rest-count 0)
+        (set! multi-measure-rest-count 0)
+        (set! stanza-shift 0)
+        ))
+      (acknowledgers
+       ((note-head-interface this-engraver grob source-engraver)
+        (if (and (> rest-count 0) (not last-note-head))
+            (let ((rest-spacing-on-line-start 1.2))
+              (ly:grob-set-property! grob 'minimum-X-extent (cons (- rest-spacing-on-line-start) 0))
+              (set! stanza-shift rest-spacing-on-line-start)
+              ))
+        (set! notes-on-syllable-count (+ 1 notes-on-syllable-count))
+        (set! last-note-head grob)
+        (set! note-head-extended #f)
+        (set! last-rest #f)
+        (set! rest-count 0)
+        (set! multi-measure-rest-count 0)
+        )
+       ((lyric-syllable-interface this-engraver grob source-engraver)
+        (set! remaining-chord-width (max 0 (- remaining-chord-width lyric-width-since-last-chord)))
+        (set! last-lyric-syllable-width (- (cdr (ly:grob-extent grob grob X)) 0.2))
+        (set! lyric-width-since-last-chord (+ lyric-width-since-last-chord last-lyric-syllable-width))
+        (if last-note-head (set! notes-on-syllable-count 1))
+        )
+       ((chord-name-interface this-engraver grob source-engraver)
+        (if (not (and
+                  (boolean? (ly:grob-property grob 'begin-of-line-visible))
+                  (ly:grob-property grob 'begin-of-line-visible)))
+            (let ((on-a-rest (> rest-count 0)))
+              (if (not on-a-rest)
+                  (set! notes-on-syllable-count (- notes-on-syllable-count 1)))
+              (if (and last-chord-name (= multi-measure-rest-count 1) (> lyric-width-since-last-chord remaining-chord-width))
+                  (ly:grob-set-property! last-chord-name 'extra-spacing-width (cons -0.1 (+ 0.1 (- lyric-width-since-last-chord remaining-chord-width)))))
+              (if last-note-head
+                  (let* ((last-note-min-x-extent (ly:grob-property last-note-head 'minimum-X-extent))
+                         (last-note-min-x-lower (if (pair? last-note-min-x-extent) (car last-note-min-x-extent) 0))
+                         (last-note-min-x-upper (if (pair? last-note-min-x-extent) (cdr last-note-min-x-extent) 0)))
+                    (if on-a-rest
+                        (begin
+                         (if (not note-head-extended)
+                             (begin
+                              (ly:grob-set-property! last-note-head 'minimum-X-extent
+                                                     (cons last-note-min-x-lower (- last-lyric-syllable-width -2 (* 2.2 rest-count))))
+                              (set! note-head-extended #t)
+                              ))
+                         (ly:grob-set-property! last-rest 'minimum-X-extent (cons 0 2))
+                         )
+                        (if (and (> lyric-width-since-last-chord 0)
+                                 (> remaining-chord-width lyric-width-since-last-chord))
+                            (ly:grob-set-property! last-note-head 'minimum-X-extent
+                                                   (cons (- -1.2 (- remaining-chord-width lyric-width-since-last-chord)) last-note-min-x-upper))
+                            (let* ((width-per-note-head 0.5)
+                                   (note-width-since-last-chord (* width-per-note-head notes-on-syllable-count)))
+                              (if (> remaining-chord-width note-width-since-last-chord)
+                                  (ly:grob-set-property! last-note-head 'minimum-X-extent
+                                                         (cons (- note-width-since-last-chord remaining-chord-width) last-note-min-x-upper))
+                                  )
+                              )
+                            )
+                        )))
+              (set! last-chord-name grob)
+              (set! remaining-chord-width
+                    (if (and on-a-rest (equal? (ly:prob-property (ly:grob-property grob 'cause) 'duration) (ly:prob-property (ly:grob-property last-rest 'cause) 'duration)))
+                        0
+                        (cdr (ly:grob-extent grob grob X))))
+              (set! lyric-width-since-last-chord 0)
+              (set! notes-on-syllable-count (if on-a-rest 0 1))
+              ))
+        )
+       ((rest-interface this-engraver grob source-engraver)
+        (set! rest-count (+ 1 rest-count))
+        (set! last-rest grob)
+        (set! multi-measure-rest-count 0)
+        )
+       ((stanza-number-interface this-engraver grob source-engraver)
+        (ly:grob-set-property! grob 'padding (+ 1 stanza-shift)))
+       ))))
+
+%#(ly:set-option 'debug-skylines #t)
+
 #(define-markup-command (chordlyrics layout props lyrics) (ly:music?)
    #:properties ((verse-chords #{#})
                  (verse-reference-voice #{#})
@@ -298,6 +405,8 @@
              % \override SpacingSpanner.strict-note-spacing = ##t
               \override SpacingSpanner.uniform-stretching = ##t
               \override SpacingSpanner.spacing-increment = 0
+              %\override SpacingSpanner.packed-spacing = ##t
+              \consists \Chord_lyrics_spacing_engraver
               \remove Bar_number_engraver
               \remove Mark_engraver
               \remove Jump_engraver
@@ -331,9 +440,10 @@
               \NullVoice
               \consists Rest_engraver
               \omit Rest
+              \override Rest.X-extent = #'(0 . 0)
               \undo \omit NoteHead
               \hide NoteHead
-              \override NoteHead.X-extent = #'(0 . 0)
+              \override NoteHead.X-extent = #'(0 . 0.5)
             }
           }
         }