Merge with master

[lilypond.git] / ly / init.ly

diff --git a/ly/init.ly b/ly/init.ly
index a5df75caf9ea231d7617d3154abb3510780f9fa7..c3db3b37170810826995247621026c213d36379f 100644 (file)
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -1,8 +1,48 @@
-% Toplevel initialisation file. 
+%% Toplevel initialisation file. 
 
+%% switch on debugging.
+#(if (and #t (defined? 'set-debug-cell-accesses!))
+  (set-debug-cell-accesses! 5000))
 
-\version "1.3.110";
+\version "2.10.0"
 
-\include "declarations.ly";
+\include "declarations-init.ly"
 
+
+#(ly:set-option 'old-relative #f)
+#(define toplevel-scores '())
+#(define output-count 0) 
+#(define $defaultheader #f)
+#(define version-seen #f)
+#(define expect-error #f) 
+#(define output-empty-score-list #f)
+
+#(use-modules (scm clip-region))
 \maininput
+%% there is a problem at the end of the input file
+
+%%
+%% 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))
+
+#(if (or (pair? toplevel-scores) output-empty-score-list)
+  ((if (defined? 'default-toplevel-book-handler)
+    default-toplevel-book-handler
+    toplevel-book-handler)
+   parser
+   (apply ly:make-book $defaultpaper $defaultheader toplevel-scores)))
+
+
+#(if (eq? expect-error (ly:parser-has-error? parser))
+  (ly:parser-clear-error parser)
+  (if expect-error
+   (ly:parser-error parser (_ "expected error, but none found"))))