X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=ly%2Finit.ly;h=c27d8c840948e91ae399cb8be700b2b62a784602;hb=94ecf2d9c75797163920353c5199d02c43e0a4e6;hp=08334138ff194d40f01c7fab9eef72f3cc4eddc4;hpb=9c31b0d42a407a412a324a6586cfb0437de4bfd8;p=lilypond.git

diff --git a/ly/init.ly b/ly/init.ly
index 08334138ff..c27d8c8409 100644
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -1,37 +1,73 @@
-% Toplevel initialisation file. 
+%% Toplevel initialisation file. 
 
-#(define-public point-and-click #f)
-#(define-public midi-debug #f)
+%% switch on debugging.
+#(if (and #t (defined? 'set-debug-cell-accesses!))
+  (set-debug-cell-accesses! 5000))
 
-
-\version "2.1.36"
+\version "2.14.0"
 
 \include "declarations-init.ly"
 
 
-#(ly:set-option 'new-relative)
-#(ly:set-point-and-click #f)
+#(ly:set-option 'old-relative #f)
+#(define toplevel-scores (list))
+#(define toplevel-bookparts (list))
+#(define $defaultheader #f)
+#(define $current-book #f)
+#(define $current-bookpart #f)
+#(define version-seen #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))
 
-\maininput
-% there is a problem at the end of the input file
+#(if (ly:get-option 'include-settings)
+  (ly:parser-include-string parser
+    (format "\\include \"~a\"" (ly:get-option 'include-settings))))
 
+\maininput
+%% there is a problem at the end of the input file
 
 %%
-%% above and below message is to compensate for look ahead of the parser.
+%% 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)))
-  (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))
 
+#(ly:set-option 'protected-scheme-parsing #f)
 
-#(if (ly:get-option 'verbose)
-  (begin
-   (gc)
-   (write (gc-stats) (current-error-port))
-   ))
+#(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"))))