X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Finit.ly;h=8e8a2fc2123436dd8ee428e859b3ff7bfecdaea6;hb=b69c7e78b1a765105ae0895fee662bebeea748d3;hp=88b152a9a1d672564ad1850ea9bdc8a9729bf6e3;hpb=dd0ab344f7daadfef8ccae83291f00aff934e48a;p=lilypond.git

diff --git a/ly/init.ly b/ly/init.ly
index 88b152a9a1..8e8a2fc212 100644
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -4,21 +4,43 @@
 #(if (and #t (defined? 'set-debug-cell-accesses!))
   (set-debug-cell-accesses! 5000))
 
-\version "2.12.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 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)
+#(hash-clear! default-fret-table)
+#(hash-clear! chord-shape-table)
+#(hash-clear! musicQuotes)
+
 #(use-modules (scm clip-region))
+#(use-modules (srfi srfi-1))
+
+$(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