From 487bf457fb8f1b733d843eb5318aac5d1c43a273 Mon Sep 17 00:00:00 2001 From: tux Date: Wed, 27 Nov 2024 20:28:57 +0100 Subject: [PATCH] load AUTHOR_DATA via path convention --- all_base_includes.ly | 3 +++ snippet_include.ly | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/all_base_includes.ly b/all_base_includes.ly index 408a272..b71665d 100644 --- a/all_base_includes.ly +++ b/all_base_includes.ly @@ -5,6 +5,9 @@ (load (string-append scmdir "json_parser.scm")) (load (string-append scmdir "resolve_inherits.scm")) (load (string-append scmdir "yaml_parser.scm")))) +#(define AUTHOR_DATA (if (defined? 'AUTHOR_DATA) AUTHOR_DATA (parse-yml-file "../../lilypond-song-includes/data/authors.yml"))) +#(define SONG_DATA (if (defined? 'SONG_DATA) SONG_DATA (parse-yml-file "../../lilypond-song-includes/data/songs.yml"))) + \include "basic_format_and_style_settings.ly" \include "eps_file_from_song_dir.ly" \include "title_with_category_images.ly" diff --git a/snippet_include.ly b/snippet_include.ly index 2ab3abc..f4944a3 100644 --- a/snippet_include.ly +++ b/snippet_include.ly @@ -3,6 +3,3 @@ #(define noDefaultOutput (if (defined? 'noDefaultOutput) noDefaultOutput #f)) \include #(if noDefaultOutput "void.ly" "all_base_includes.ly") - -#(define AUTHOR_DATA (if (defined? 'AUTHOR_DATA) AUTHOR_DATA (parse-yml-file "../data/authors.yml"))) -#(define SONG_DATA (if (defined? 'SONG_DATA) SONG_DATA (parse-yml-file "../data/songs.yml")))