lilypond-book: File search fallback when kpsewhich fails.

[lilypond.git] / ly / init.ly

diff --git a/ly/init.ly b/ly/init.ly
index c27d8c840948e91ae399cb8be700b2b62a784602..7dbb1042aaea642228b2ec8de27d381078331b5e 100644 (file)
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -4,12 +4,22 @@
 #(if (and #t (defined? 'set-debug-cell-accesses!))
   (set-debug-cell-accesses! 5000))
 
-\version "2.14.0"
+\version "2.16.0"
 
-\include "declarations-init.ly"
+#(session-initialize
+  (lambda ()
+   ;; we can't use ly:parser-include-string here since that does not
+   ;; actually do any parsing but merely switches inputs, so the
+   ;; session saved by the session initializer after calling this
+   ;; function has not actually started.  A parser clone, in contrast,
+   ;; can run and complete synchronously and shares the module with
+   ;; the current parser.
+   (ly:parser-parse-string (ly:parser-clone parser)
+    "\\include \"declarations-init.ly\"")))
 
+#(note-names-language parser default-language)
 
-#(ly:set-option 'old-relative #f)
+#(define location #f)
 #(define toplevel-scores (list))
 #(define toplevel-bookparts (list))
 #(define $defaultheader #f)
@@ -19,13 +29,13 @@
 #(define expect-error #f)
 #(define output-empty-score-list #f)
 #(define output-suffix #f)
-#(define book-filename #f)
-#(define book-output-suffix #f)
+
 #(use-modules (scm clip-region))
+#(use-modules (srfi srfi-1))
 
-#(if (ly:get-option 'include-settings)
+$(if (ly:get-option 'include-settings)
   (ly:parser-include-string parser
-    (format "\\include \"~a\"" (ly:get-option 'include-settings))))
+    (format #f "\\include \"~a\"" (ly:get-option 'include-settings))))
 
 \maininput
 %% there is a problem at the end of the input file
@@ -34,11 +44,6 @@
 %% Above and below comments compensate for the parser's look-ahead.
 %%
 
-#(if (and (ly:get-option 'old-relative)
-      (defined? 'input-file-name)
-      (not (ly:get-option 'old-relative-used)))
-  (old-relative-not-used-message input-file-name))%% there is a problem at the end of the input file
-
 #(if (and (not version-seen)
       (defined? 'input-file-name))
   (version-not-seen-message input-file-name))