diff --git a/all_base_includes.ly b/all_base_includes.ly index aa56a48..6e0548f 100644 --- a/all_base_includes.ly +++ b/all_base_includes.ly @@ -17,4 +17,8 @@ LAYOUT = \layout { \generalLayout } HEADER = {} MUSIC = {} -TEXT = \markuplist {""} \ No newline at end of file +TEXT = \markuplist {""} + +verseChords = {} +firstVoice = {} +global = {} diff --git a/standalone_output.ly b/standalone_output.ly index f4812cf..be0b9b4 100644 --- a/standalone_output.ly +++ b/standalone_output.ly @@ -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) diff --git a/verses_with_chords.ly b/verses_with_chords.ly index 7537c9b..6c6a734 100644 --- a/verses_with_chords.ly +++ b/verses_with_chords.ly @@ -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 } + #verse-chords + \new NullVoice { #verse-reference-voice } \addlyrics { #lyrics } >> \layout {