X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Finit.ly;h=88b152a9a1d672564ad1850ea9bdc8a9729bf6e3;hb=08cfa4c826e8bdc741e893a293dfb384a42c267d;hp=8fa1a1ad0cae63b73b5dcba9a3dca6c586e6c9af;hpb=4e4a3b4106cb4982f0c06ca26bad2f2641c0382e;p=lilypond.git

diff --git a/ly/init.ly b/ly/init.ly
index 8fa1a1ad0c..88b152a9a1 100644
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -1,22 +1,24 @@
 %% Toplevel initialisation file. 
 
-% switch on debugging.
+%% switch on debugging.
 #(if (and #t (defined? 'set-debug-cell-accesses!))
   (set-debug-cell-accesses! 5000))
 
-#(define-public midi-debug  #f)
-
-
-\version "2.4.0"
+\version "2.12.0"
 
 \include "declarations-init.ly"
 
 
-#(ly:set-option 'new-relative)
-#(define toplevel-scores '())
-#(define $globalheader #f)
-#(define version-seen? #f)
-
+#(ly:set-option 'old-relative #f)
+#(define toplevel-scores (list))
+#(define toplevel-bookparts (list))
+#(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
 
@@ -27,15 +29,37 @@
 #(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 (pair? toplevel-scores)
-  (ly:parser-print-book parser
-   (apply ly:make-book $defaultpaper $globalheader toplevel-scores)))
+#(let ((book-handler (if (defined? 'default-toplevel-book-handler)
+                         default-toplevel-book-handler
+                         toplevel-book-handler)))
+   (cond ((pair? toplevel-bookparts)
+          (let ((book (ly:make-book $defaultpaper $defaultheader)))
+            (map (lambda (part)
+                   (ly:book-add-bookpart! book part))
+                 (reverse! toplevel-bookparts))
+            (set! toplevel-bookparts (list))
+            ;; if scores have been defined after the last explicit \bookpart:
+            (if (pair? toplevel-scores)
+                (map (lambda (score)
+                       (ly:book-add-score! book score))
+                     (reverse! toplevel-scores)))
+            (set! toplevel-scores (list))
+            (book-handler parser book)))
+         ((or (pair? toplevel-scores) output-empty-score-list)
+          (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)
+  (if expect-error
+   (ly:parser-error parser (_ "expected error, but none found"))))