From 377beeab57d07944c9ce537b041d0f59a70732b5 Mon Sep 17 00:00:00 2001
From: tux <tux@goldenerreiter.org>
Date: Sun, 11 May 2025 11:39:19 +0200
Subject: [PATCH] refactor and fix tagging bug

---
 verses_with_chords.ly | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/verses_with_chords.ly b/verses_with_chords.ly
index b5dc38e..636bfba 100644
--- a/verses_with_chords.ly
+++ b/verses_with_chords.ly
@@ -221,20 +221,21 @@
                        (cons (car x) (+ (cdr x) amount))
                        y)))
 
-#(define-markup-command (score-equal-height-with-indents layout props reference-height lines)
-  (number? markup-list?)
+#(define-markup-command (score-equal-height-with-indents layout props lines)
+  (markup-list?)
   #:category music
-  #:properties ((baseline-skip)
+  #:properties ((intraverse-vspace 0)
+                (verse-line-height songTextLineHeigth)
                 (line-indents '()))
     (let ((indents-max-index (- (length line-indents) 1)))
-      (stack-stencils Y DOWN baseline-skip
+      (stack-stencils Y DOWN intraverse-vspace
         (index-map
           (lambda (index line)
             (let ((stil
                     (ly:make-stencil
                       (ly:stencil-expr line)
                       (ly:stencil-extent line X)
-                      `(,(/ reference-height -2.0) . ,(/ reference-height 2.0)))))
+                      `(,(/ verse-line-height -2.0) . ,(/ verse-line-height 2.0)))))
               (if (<= index indents-max-index)
                 (ly:stencil-translate-axis
                   stil
@@ -256,20 +257,17 @@
    #: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-with-indents #verse-line-height \score-lines {
+        \score-equal-height-with-indents \score-lines {
           <<
-            \new Devnull { #verse-break-voice }
-            \new NullVoice = "dummyvoice" { #verse-reference-voice }
+            \new Devnull { #(music-clone verse-break-voice) }
+            \new NullVoice = "dummyvoice" { #(music-clone verse-reference-voice) }
             \transposable #transposition #(music-clone verse-chords)
             \new Lyrics \lyricsto "dummyvoice" { #lyrics }
           >>