From 55db0e0e311861af1c33c4d2f99cec59600120d8 Mon Sep 17 00:00:00 2001
From: tux <tux@goldenerreiter.org>
Date: Sat, 16 Sep 2023 18:38:53 +0200
Subject: [PATCH] =?UTF-8?q?Liederbuchvorlage=20wieder=20lauff=C3=A4hig=20g?=
 =?UTF-8?q?emacht?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 book_include.ly           | 4 ++--
 eps_file_from_song_dir.ly | 2 +-
 general_include.ly        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/book_include.ly b/book_include.ly
index 9fc7733..13c98da 100644
--- a/book_include.ly
+++ b/book_include.ly
@@ -121,7 +121,7 @@ includeSong =
      \bookOutputName #filename
      #}
     (ly:parser-parse-string (if (< (list-ref (ly:version) 1) 19) (ly:parser-clone parser) (ly:parser-clone))
-      (ly:format "\\include \"../../~a/~a/~a.ly\"" songPath filename filename))
+      (ly:format "\\include \"~a/~a/~a.ly\"" songPath filename filename))
     (let ((label (gensym "index")))
       (set! additional-page-switch-label-list
         (acons label additional-page-numbers additional-page-switch-label-list))
@@ -209,7 +209,7 @@ songs =
      ;(string-join songs "\n")
      "Nicht inkludiert:"
      opticalline
-     (string-join (sort-list (lset-difference string=? (files-in-directory (ly:format "../../~a" songPath)) songs) string<?) "\n")
+     (string-join (sort-list (lset-difference string=? (files-in-directory songPath) songs) string<?) "\n")
      opticalline
      ) "\n" )
 )))
diff --git a/eps_file_from_song_dir.ly b/eps_file_from_song_dir.ly
index 9419160..ca0e3e6 100644
--- a/eps_file_from_song_dir.ly
+++ b/eps_file_from_song_dir.ly
@@ -9,7 +9,7 @@
    (interpret-markup layout props
      (let ((filepath (if (string-null? songfilename)
                           filename
-                          (ly:format "../../~a/~a/~a" songPath songfilename filename))))
+                          (ly:format "~a/~a/~a" songPath songfilename filename))))
        (if (file-exists? filepath)
              (make-epsfile-markup Y ysize filepath)
              (if defaultmarkup
diff --git a/general_include.ly b/general_include.ly
index b25d908..d1f0933 100644
--- a/general_include.ly
+++ b/general_include.ly
@@ -6,7 +6,7 @@
 
 #(define noStandaloneOutput (if (defined? 'noStandaloneOutput) noStandaloneOutput #f))
 
-#(load "json_parser.scm")
+#(if (defined? 'LAYOUT) #f (load "json_parser.scm"))
 #(use-modules (json parser))
 \include "basic_format_and_style_settings.ly"
 \include #(if (< (list-ref (ly:version) 1) 25) "legacy-lilypond-compatibility-pre-2.25.ly" "void.ly")