X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=ly%2Finit.ly;h=a4bd1c3a3985a466f1c888ac2a58e30197739ae8;hb=15986e5345edd20f0707950f4640cbbd79ced98b;hp=5e3305072a644edc116d8bfef3b500abdcd31027;hpb=4300e287a18cbc4569c79f8e8445609dc7d4546a;p=lilypond.git

diff --git a/ly/init.ly b/ly/init.ly
index 5e3305072a..a4bd1c3a39 100644
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -1,18 +1,23 @@
 %% Toplevel initialisation file. 
 
-#(define-public midi-debug  #f)
+%% switch on debugging.
+#(if (and #t (defined? 'set-debug-cell-accesses!))
+  (set-debug-cell-accesses! 5000))
 
-
-\version "2.4.0"
+\version "2.10.0"
 
 \include "declarations-init.ly"
 
 
-#(ly:set-option 'new-relative)
+#(ly:set-option 'old-relative #f)
 #(define toplevel-scores '())
-#(define $globalheader #f)
-#(define version-seen? #f)
-
+#(define output-count 0) 
+#(define $defaultheader #f)
+#(define version-seen #f)
+#(define expect-error #f) 
+#(define output-empty-score-list #f)
+#(define output-suffix #f)
+#(use-modules (scm clip-region))
 \maininput
 %% there is a problem at the end of the input file
 
@@ -23,15 +28,22 @@
 #(if (and (ly:get-option 'old-relative)
       (defined? 'input-file-name)
       (not (ly:get-option 'old-relative-used)))
-  (ly:warn (string-append
-	    "\n"
-	    input-file-name ": old relative compatibility was not used."
-	)))%% there is a problem at the end of the input file
+  (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 (not version-seen?)
-  (version-not-seen-message))
+#(ly:set-option 'protected-scheme-parsing #f)
+#(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 (pair? toplevel-scores)
-  (ly:parser-print-book parser
-   (apply ly:make-book $defaultpaper $globalheader (reverse 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"))))