From 09d3bb7fa147e720cd1f10c058d287b4bd22fb92 Mon Sep 17 00:00:00 2001
From: tux <tux@goldenerreiter.org>
Date: Sun, 30 Jun 2024 19:02:12 +0200
Subject: [PATCH] improve spacing of chordlyrics

---
 chord_settings.ly     |  9 ---------
 verses_with_chords.ly | 15 ++++++++++++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/chord_settings.ly b/chord_settings.ly
index bcb2350..b8feb9c 100644
--- a/chord_settings.ly
+++ b/chord_settings.ly
@@ -98,15 +98,6 @@ generalLayout = \layout {
   }
 }
 
-#(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))))
-
 % Akkord mit Bunddiagramm anzeigen
 #(define-markup-command (fret-chord layout props fret chord) (string? string?)
    (interpret-markup layout props
diff --git a/verses_with_chords.ly b/verses_with_chords.ly
index 86c8c83..039ee16 100644
--- a/verses_with_chords.ly
+++ b/verses_with_chords.ly
@@ -227,9 +227,18 @@
   #:properties ((baseline-skip))
     (stack-stencils Y DOWN baseline-skip
       (map
-        (lambda (line) (ly:make-stencil (ly:stencil-expr line) (ly:stencil-extent line X) `(0 . ,reference-height)))
+        (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 #{#})
@@ -244,7 +253,7 @@
     #{
       \markup {
         \override #`(baseline-skip . ,intraverse-vspace)
-        \pad-left #-5
+        \pad-left #-7
         \score-equal-height #verse-line-height \score-lines {
           \transposable #transposition
           <<
@@ -257,7 +266,7 @@
             \verselayout
             \context {
               \Staff
-              \override LeftEdge.space-alist.first-note = #'(fixed-space . 5.0)
+              \override LeftEdge.space-alist.first-note = #'(fixed-space . 7.0)
             }
             \context {
               \Lyrics