From 6da3d3676951f4ff0debbded83fb74f5f9af33ab Mon Sep 17 00:00:00 2001 From: Jakob Krueger Date: Sun, 23 Jul 2023 10:50:50 +0200 Subject: [PATCH] Bugfix Beispielliederbuch Vorlage light entschlackt Common includes geupdatet --- lieder/vorlage_light/vorlage_light.ly | 22 ++++++------------- .../beispiel_liederbuch.ly | 2 +- lilypond-common-includes | 2 +- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/lieder/vorlage_light/vorlage_light.ly b/lieder/vorlage_light/vorlage_light.ly index afdaa7d..aa0c04b 100644 --- a/lieder/vorlage_light/vorlage_light.ly +++ b/lieder/vorlage_light/vorlage_light.ly @@ -4,9 +4,9 @@ HEADER = \bookpart { \header { - title = "Round and round" - poet = "Worte und Weise: unbekannt" - composer = " " + title = "Titel" + poet = "Worte:" + composer = "Weise:" categories = "" songinfo = "wasauchimmer" } @@ -16,32 +16,24 @@ global = { %Takt \time 4/4 %Tonart - \key a \minor + \key c \major } firstVerse = \lyricmode { \set stanza = "1." -Round and round the earth is tur -- ning -tur -- ning al -- ways round to mor -- ning -and from mor -- ning round to night. + Lyrics } firstVoice = \relative c' { \global - a4 a e' e - d c8 (h) a4 a - e' e a a - g f8 (e) e4 e - d h c d - h a8 (g) a2 + c \bar "|." } MUSIC = { << \chords { - a1:m g2 a1:m a2:m d2 a:m - g2 f e:m a:m + c } \new ChoirStaff = "firstStaff" << diff --git a/liederbuecher/beispiel_liederbuch/beispiel_liederbuch.ly b/liederbuecher/beispiel_liederbuch/beispiel_liederbuch.ly index 37dea58..71c81ed 100644 --- a/liederbuecher/beispiel_liederbuch/beispiel_liederbuch.ly +++ b/liederbuecher/beispiel_liederbuch/beispiel_liederbuch.ly @@ -6,7 +6,7 @@ imagePagePath = "categories" songPath = "lieder" -\include "../../lilypond-common-includes/general_include.ly" +\include "../../lilypond-custom-includes/base_config.ly" \include "../../lilypond-common-includes/book_include.ly" \include "../../lilypond-common-includes/toc_include.ly" diff --git a/lilypond-common-includes b/lilypond-common-includes index eba0cc5..7e7d682 160000 --- a/lilypond-common-includes +++ b/lilypond-common-includes @@ -1 +1 @@ -Subproject commit eba0cc537551d407307b6896ff72fd495d8dd113 +Subproject commit 7e7d6820fbd61eb8400657a2cbcae9b7fe3d5a96