diff --git a/lieder/sandbox/sandbox.ly b/lieder/sandbox/sandbox.ly index 909f21c..62c7968 100644 --- a/lieder/sandbox/sandbox.ly +++ b/lieder/sandbox/sandbox.ly @@ -2,7 +2,7 @@ %songStyle = #'büdel \include "../../lilypond-custom-includes/base_config.ly" -\include "../../liedbausteine/sandbox.ly" +\include "../../lilypond-song-includes/liedbausteine/sandbox.ly" HEADER = \bookpart { diff --git a/lilypond-common-includes b/lilypond-common-includes index d677467..8b0fc2d 160000 --- a/lilypond-common-includes +++ b/lilypond-common-includes @@ -1 +1 @@ -Subproject commit d6774670f36d6c45b06e217a516980c3563de1c1 +Subproject commit 8b0fc2d7c9fb453f823197ade19da6e8b7f1dafa diff --git a/lilypond-custom-includes/base_config.ly b/lilypond-custom-includes/base_config.ly index 4730846..ddfd8aa 100644 --- a/lilypond-custom-includes/base_config.ly +++ b/lilypond-custom-includes/base_config.ly @@ -5,5 +5,5 @@ customStyleOverridesFile = "../lilypond-custom-includes/custom_style_overrides.l \include "categories.ly" \include "../lilypond-common-includes/general_include.ly" -AUTHOR_DATA = #(call-with-input-file "../../data/authors.json" json->scm) -SONG_DATA = #(call-with-input-file "../../data/songs.json" json->scm) +AUTHOR_DATA = #(call-with-input-file "../../lilypond-song-includes/data/authors.json" json->scm) +SONG_DATA = #(call-with-input-file "../../lilypond-song-includes/data/songs.json" json->scm) diff --git a/data/authors.json b/lilypond-song-includes/data/authors.json similarity index 100% rename from data/authors.json rename to lilypond-song-includes/data/authors.json diff --git a/data/songs.json b/lilypond-song-includes/data/songs.json similarity index 100% rename from data/songs.json rename to lilypond-song-includes/data/songs.json diff --git a/liedbausteine/sandbox.ly b/lilypond-song-includes/liedbausteine/sandbox.ly similarity index 85% rename from liedbausteine/sandbox.ly rename to lilypond-song-includes/liedbausteine/sandbox.ly index 3929b65..333cb21 100644 --- a/liedbausteine/sandbox.ly +++ b/lilypond-song-includes/liedbausteine/sandbox.ly @@ -1,5 +1,7 @@ \version "2.25.8" +\include "../../lilypond-common-includes/snippet_include.ly" + basicSongInfo = \header { title = "Liedtitel" alttitle = "Alternativtitel" @@ -120,4 +122,31 @@ Anführungszeichen sind so „ und so “" columnVerseMarkup = "Stro(phen,a:m) können jetzt auch in (Spal,f)ten! -Voll (krass,e) (eh,a:m)!" \ No newline at end of file +Voll (krass,e) (eh,a:m)!" + +MUSIC = +{ + << + \songChords + \new ChoirStaff = "firstStaff" + << + \new Voice = "firstVoice" { \firstVoice } + \addlyrics { \firstVerse } + \addlyrics { \secondVerse } + >> + >> +} + +TEXT = \markuplist +{ + \group-verses { + \chordverse #"3." \thirdVerseMarkup + \chordverse #"4." \fourthVerseMarkup + \chordverse #"5." \fifthVerseMarkup + \chordverse #"6." \sixthVerseMarkup + \chordverse #"7." \seventhVerseMarkup + \chordverse #"8." \columnVerseMarkup + } +} + +\include "../../lilypond-common-includes/default_output.ly" \ No newline at end of file