Merge branch 'master' of git://git.savannah.gnu.org/lilypond.git

[lilypond.git] / ly / init.ly

diff --git a/ly/init.ly b/ly/init.ly
index 93048100aea29d1a662b991db8baeaedb4170afe..380d9d2a0b2944265d07a773ef365205dee7d1d9 100644 (file)
--- 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,15 +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