new engraver for spacing in chordlyrics

private_includes/base/all.ily

@@ -21,8 +21,17 @@
     )))))
     (scm-load "resolve_inherits.scm")
     (scm-load "yaml_parser.scm")))
-#(define AUTHOR_DATA (if (defined? 'AUTHOR_DATA) AUTHOR_DATA (parse-yml-file "../../lilypond-song-includes/data/authors.yml")))
+
-#(define SONG_DATA (if (defined? 'SONG_DATA) SONG_DATA (parse-yml-file "../../lilypond-song-includes/data/songs.yml")))
+#(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"))))
 
 \include "merge_rests_engraver_override.ily"
 \include "basic_format_and_style_settings.ily"

private_includes/base/verses_with_chords.ily

@@ -256,7 +256,6 @@
 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)
@@ -284,7 +283,6 @@ 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)
@@ -298,7 +296,6 @@ 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
@@ -317,7 +314,8 @@ Chord_lyrics_spacing_engraver =
        ((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)))
+                  (ly:grob-property grob 'begin-of-line-visible)
+                  lyrics-seen-since-break))
             (let* ((last-printed-chord-width (if last-printed-chord (interval-length (ly:grob-extent last-printed-chord last-printed-chord X)) 0))
                    (chord-overwidth (- last-printed-chord-width lyric-width-since-last-chord))
                    (chord-gap 0.5))
@@ -339,6 +337,7 @@ Chord_lyrics_spacing_engraver =
               (set! last-printed-chord grob)
               (set! last-lyric-syllable #f)
               )
+            (ly:grob-set-property! grob 'X-extent '(+inf.0 . -inf.0))
             )
         )
         ((stanza-number-interface this-engraver grob source-engraver)