Liederbuchvorlage wieder lauffähig gemacht

This commit is contained in:
tux 2023-09-16 18:38:53 +02:00
parent 7a0dd88067
commit 55db0e0e31
3 changed files with 4 additions and 4 deletions

View File

@ -121,7 +121,7 @@ includeSong =
\bookOutputName #filename \bookOutputName #filename
#} #}
(ly:parser-parse-string (if (< (list-ref (ly:version) 1) 19) (ly:parser-clone parser) (ly:parser-clone)) (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"))) (let ((label (gensym "index")))
(set! additional-page-switch-label-list (set! additional-page-switch-label-list
(acons label additional-page-numbers additional-page-switch-label-list)) (acons label additional-page-numbers additional-page-switch-label-list))
@ -209,7 +209,7 @@ songs =
;(string-join songs "\n") ;(string-join songs "\n")
"Nicht inkludiert:" "Nicht inkludiert:"
opticalline 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 opticalline
) "\n" ) ) "\n" )
))) )))

View File

@ -9,7 +9,7 @@
(interpret-markup layout props (interpret-markup layout props
(let ((filepath (if (string-null? songfilename) (let ((filepath (if (string-null? songfilename)
filename filename
(ly:format "../../~a/~a/~a" songPath songfilename filename)))) (ly:format "~a/~a/~a" songPath songfilename filename))))
(if (file-exists? filepath) (if (file-exists? filepath)
(make-epsfile-markup Y ysize filepath) (make-epsfile-markup Y ysize filepath)
(if defaultmarkup (if defaultmarkup

View File

@ -6,7 +6,7 @@
#(define noStandaloneOutput (if (defined? 'noStandaloneOutput) noStandaloneOutput #f)) #(define noStandaloneOutput (if (defined? 'noStandaloneOutput) noStandaloneOutput #f))
#(load "json_parser.scm") #(if (defined? 'LAYOUT) #f (load "json_parser.scm"))
#(use-modules (json parser)) #(use-modules (json parser))
\include "basic_format_and_style_settings.ly" \include "basic_format_and_style_settings.ly"
\include #(if (< (list-ref (ly:version) 1) 25) "legacy-lilypond-compatibility-pre-2.25.ly" "void.ly") \include #(if (< (list-ref (ly:version) 1) 25) "legacy-lilypond-compatibility-pre-2.25.ly" "void.ly")