fix default reference voice and chords for songbook output

This commit is contained in:
tux 2024-05-22 22:38:02 +02:00 committed by Christoph Wagner
parent 5884ab9d2c
commit 86943b9316
3 changed files with 17 additions and 8 deletions

View File

@ -18,3 +18,7 @@ LAYOUT = \layout { \generalLayout }
HEADER = {}
MUSIC = {}
TEXT = \markuplist {""}
verseChords = {}
firstVoice = {}
global = {}

View File

@ -10,7 +10,12 @@ verselayout = \layout {
\override ChordName.font-size = \songTextChordFontSize
}
}
TEXT = \markuplist { \override #`(verselayout . verselayout) \TEXT }
TEXT = \markuplist {
\override #`(verselayout . verselayout)
\override #`(verse-chords . ,#{ \chords { \verseChords } #})
\override #`(verse-reference-voice . ,#{ \global \firstVoice #})
\TEXT
}
% nur Output wenn noStandaloneOutput auf false steht
output = #(if (not noStandaloneOutput)

View File

@ -222,9 +222,9 @@
(interpret-markup-list layout props lines))))
#(define-markup-command (chordlyrics layout props lyrics) (ly:music?)
#:properties ((verse-chords #f)
(verse-reference-voice #f)
(verse-break-voice #f)
#:properties ((verse-chords #{#})
(verse-reference-voice #{#})
(verse-break-voice #{#})
(verse-line-height songTextLineHeigth)
(intraverse-vspace 0))
"Vers mit Akkorden"
@ -236,9 +236,9 @@
\score-equal-height #verse-line-height \score-lines {
\transposable
<<
\new Devnull { #(if (ly:music? verse-break-voice) verse-break-voice) }
#(if (ly:music? verse-chords) (music-clone verse-chords) #{ \chords { \verseChords } #})
\new NullVoice { #(if (ly:music? verse-reference-voice) verse-reference-voice #{ \global \firstVoice #}) }
\new Devnull { #verse-break-voice }
#(music-clone verse-chords)
\new NullVoice { #verse-reference-voice }
\addlyrics { #lyrics }
>>
\layout {