diff --git a/lieder/authors_sandbox/authors_sandbox.ly b/lieder/authors_sandbox/authors_sandbox.ly index b3f799c..47ab273 100644 --- a/lieder/authors_sandbox/authors_sandbox.ly +++ b/lieder/authors_sandbox/authors_sandbox.ly @@ -10,7 +10,7 @@ \bookpart { \header { authors = #'( - ("kumpel" text melody)) + ("kumpelerbe" text melody)) year_text = "1600" year_melody = "1600" } diff --git a/lilypond-common-includes b/lilypond-common-includes index 5ee1a7b..88f0dc9 160000 --- a/lilypond-common-includes +++ b/lilypond-common-includes @@ -1 +1 @@ -Subproject commit 5ee1a7b6be20820432c7c1a86a4d369a6522a257 +Subproject commit 88f0dc9f8fee1cd3f7152cd7e56798bb97699ee0 diff --git a/lilypond-custom-includes/base_config.ly b/lilypond-custom-includes/base_config.ly index bcbb5d4..f4d0ae6 100644 --- a/lilypond-custom-includes/base_config.ly +++ b/lilypond-custom-includes/base_config.ly @@ -4,5 +4,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 "../../lilypond-song-includes/data/authors.json" json->scm) -SONG_DATA = #(call-with-input-file "../../lilypond-song-includes/data/songs.json" json->scm) +AUTHOR_DATA = #(resolve-inherits (call-with-input-file "../../lilypond-song-includes/data/authors.json" json->scm)) +SONG_DATA = #(resolve-inherits (call-with-input-file "../../lilypond-song-includes/data/songs.json" json->scm)) diff --git a/lilypond-song-includes/data/authors.json b/lilypond-song-includes/data/authors.json index 215c8da..c574120 100644 --- a/lilypond-song-includes/data/authors.json +++ b/lilypond-song-includes/data/authors.json @@ -14,5 +14,9 @@ "nocheiner": { "name": "Jemand anderes", "death_year": "2050" + }, + "kumpelerbe": { + "inherits": "kumpel", + "organization": "Bund der crazy Kumpels" } } \ No newline at end of file