X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Finit.ly;h=380d9d2a0b2944265d07a773ef365205dee7d1d9;hb=b8e19438b2d69674efcf408586950e384d5e4b06;hp=d1923659f981c3a90e8e3a1447a921a470b68186;hpb=33fee1aae93af367e6d2f0a80bef3e1b38eda9eb;p=lilypond.git

diff --git a/ly/init.ly b/ly/init.ly
index d1923659f9..380d9d2a0b 100644
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -4,7 +4,7 @@
 #(if (and #t (defined? 'set-debug-cell-accesses!))
   (set-debug-cell-accesses! 5000))
 
-\version "2.12.0"
+\version "2.14.0"
 
 \include "declarations-init.ly"
 
@@ -12,13 +12,21 @@
 #(ly:set-option 'old-relative #f)
 #(define toplevel-scores (list))
 #(define toplevel-bookparts (list))
-#(define output-count 0) 
 #(define $defaultheader #f)
+#(define $current-book #f)
+#(define $current-bookpart #f)
 #(define version-seen #f)
-#(define expect-error #f) 
+#(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))
+
+#(if (ly:get-option 'include-settings)
+  (ly:parser-include-string parser
+    (format #f "\\include \"~a\"" (ly:get-option 'include-settings))))
+
 \maininput
 %% there is a problem at the end of the input file
 
@@ -54,8 +62,10 @@
             (set! toplevel-scores (list))
             (book-handler parser book)))
          ((or (pair? toplevel-scores) output-empty-score-list)
-          (book-handler parser (apply ly:make-book $defaultpaper
-                                      $defaultheader toplevel-scores)))))
+          (let ((book (apply ly:make-book $defaultpaper 
+                             $defaultheader toplevel-scores)))
+            (set! toplevel-scores (list))
+            (book-handler parser book)))))
 
 #(if (eq? expect-error (ly:parser-has-error? parser))
   (ly:parser-clear-error parser)