From 27f581f26bd825e590b4f48ab860b50cb486f2bc Mon Sep 17 00:00:00 2001 From: tux Date: Fri, 11 Aug 2023 16:31:29 +0200 Subject: [PATCH] =?UTF-8?q?Autoren=20k=C3=B6nnen=20jetzt=20aus=20Autorenve?= =?UTF-8?q?rzeichnis=20geladen=20und=20automatisch=20angezeigt=20werden?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lieder/vorlage/vorlage.ly | 10 +++++----- lieder/vorlage_light/vorlage_light.ly | 4 ++-- lieder/vorlage_satz/vorlage_satz.ly | 4 ++-- lilypond-common-includes | 2 +- lilypond-custom-includes/authors.ly | 16 ++++++++++++++++ lilypond-custom-includes/base_config.ly | 1 + 6 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 lilypond-custom-includes/authors.ly diff --git a/lieder/vorlage/vorlage.ly b/lieder/vorlage/vorlage.ly index 485d6e7..9f6417a 100644 --- a/lieder/vorlage/vorlage.ly +++ b/lieder/vorlage/vorlage.ly @@ -16,8 +16,8 @@ HEADER = \bookpart { alttitle = "Alternativtitel" titlesize = 11 titletopspace = 2 - poet = "Worte: Christoph Wagner(tux), (1985‒20xx) oder (*1985), BdP Stamm Goldener Reiter, 2013" - composer = "Weise: Christoph" + poetId = #'dude + composerId = #'dude copyright = "Fumpeverlag" categories = "see" songinfo = "Hintergrund @@ -102,7 +102,7 @@ bridgeVerse = \lyricmode { } MUSIC = -{ +{ << \chords { s4 d2 h:m fis:m b g1 \klamm{a2. d4} c1/h @@ -118,7 +118,7 @@ MUSIC = >> } -BRIDGE = +BRIDGE = { << \chords { a2:m a:m a:m a:m } @@ -193,7 +193,7 @@ TEXT = \markuplist } \group-verses { %\override #'(baseline-skip . 1) %Damit verändert man den Abstand der Notenzeilen - \score { + \score { \inline-score \BRIDGE \layout { \generalLayout } diff --git a/lieder/vorlage_light/vorlage_light.ly b/lieder/vorlage_light/vorlage_light.ly index aa0c04b..d100b10 100644 --- a/lieder/vorlage_light/vorlage_light.ly +++ b/lieder/vorlage_light/vorlage_light.ly @@ -5,8 +5,8 @@ HEADER = \bookpart { \header { title = "Titel" - poet = "Worte:" - composer = "Weise:" + poetId = #'dude + composerId = #'kumpel categories = "" songinfo = "wasauchimmer" } diff --git a/lieder/vorlage_satz/vorlage_satz.ly b/lieder/vorlage_satz/vorlage_satz.ly index c8974b4..6b1252a 100644 --- a/lieder/vorlage_satz/vorlage_satz.ly +++ b/lieder/vorlage_satz/vorlage_satz.ly @@ -6,8 +6,8 @@ HEADER = \bookpart { \header { title = "Chorsatz" alttitle = "" - poet = "Worte: " - composer = "Weise: " + poetId = #'dude + composerId = #'dude categories = "" songinfo = "" } diff --git a/lilypond-common-includes b/lilypond-common-includes index 05ea776..c20d032 160000 --- a/lilypond-common-includes +++ b/lilypond-common-includes @@ -1 +1 @@ -Subproject commit 05ea776addce9be8ddd87e32e51eae350f861e08 +Subproject commit c20d0327e792d04666ee163eb9b2a730853a3d5a diff --git a/lilypond-custom-includes/authors.ly b/lilypond-custom-includes/authors.ly new file mode 100644 index 0000000..14f1cfb --- /dev/null +++ b/lilypond-custom-includes/authors.ly @@ -0,0 +1,16 @@ +AUTHORS = #'( + (dude . ( + (name . "Krasser Dude") + (trail_name . "dud") + (birth_year . "1950") + ;(death_year . "2050") + (organization . "Bund der krassen Dudes") + )) + (kumpel . ( + (name . "Krasser Kumpel") + (trail_name . "dudekumpel") + ;(birth_year . "1960") + (death_year . "2050") + (organization . "Bund der krassen Kumpels") + )) +) \ No newline at end of file diff --git a/lilypond-custom-includes/base_config.ly b/lilypond-custom-includes/base_config.ly index feefe33..5dfa274 100644 --- a/lilypond-custom-includes/base_config.ly +++ b/lilypond-custom-includes/base_config.ly @@ -3,5 +3,6 @@ defaultSongStyle = #'börnel customStyleOverridesFile = "../lilypond-custom-includes/custom_style_overrides.ly" +\include "authors.ly" \include "categories.ly" \include "../lilypond-common-includes/general_include.ly" \ No newline at end of file