From e2dc938c02cd9cfbad1aa68188262859bb285a88 Mon Sep 17 00:00:00 2001 From: tux Date: Wed, 9 Aug 2023 13:36:46 +0200 Subject: [PATCH] intraverse-vspace eingebaut, um Zeilenabstand zu beeinflussen --- verses_with_chords.ly | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/verses_with_chords.ly b/verses_with_chords.ly index eba7511..e55017a 100644 --- a/verses_with_chords.ly +++ b/verses_with_chords.ly @@ -103,13 +103,14 @@ % Kompletten Vers mit Akkorden #(define-markup-command (chordverse layout props stanza verse) (markup? string?) + #:properties ((intraverse-vspace 0)) "Vers mit Akkorden" (let* ((fromto (chain-assoc-get 'transposition props #f)) (transp (if fromto (string-append "\\transpose " (car fromto) " " (cdr fromto)) ""))) (interpret-markup layout props - (markup #:override `(baseline-skip . ,songTextLineHeigth) #:anchor-x-between #:stanza stanza + (markup #:override `(baseline-skip . ,(+ intraverse-vspace songTextLineHeigth)) #:anchor-x-between #:stanza stanza (make-wrap-newline-markup (ly:regex-replace (ly:make-regex "\\(( *)([^,()]*)( *),([^)]*)\\)") (ly:regex-replace (ly:make-regex "(([^ \n]*\\([^()]*,[^()]+\\)[^ \n(]*)+)") verse " \\concat { " 1 " } ") @@ -119,9 +120,10 @@ % Kompletter Vers aus dem Akkorde entfernt werden #(define-markup-command (nochordverse layout props stanza verse) (markup? string?) + #:properties ((intraverse-vspace 0)) "Vers ohne Akkorde" (interpret-markup layout props - (markup #:override '(baseline-skip . 3.0) #:anchor-x-between #:stanza stanza + (markup #:override `(baseline-skip . ,(+ intraverse-vspace 3.0)) #:anchor-x-between #:stanza stanza #:wrap-newline (ly:regex-replace (ly:make-regex "\\(([^,]*),([^)]*)\\)") verse 1) ) )