X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Finit.ly;h=6546ed422aa676bffd633bacf013b9c8e7086e9b;hb=0acfe2cc783865a3f1b855cff58d43fe4410cbca;hp=eab90ef3d5905527c56ee3c36edabbc4cba0f243;hpb=0c289671d105bea58592607cb508aef59aee882b;p=lilypond.git

diff --git a/ly/init.ly b/ly/init.ly
index eab90ef3d5..6546ed422a 100644
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -4,24 +4,27 @@
 #(if (and #t (defined? 'set-debug-cell-accesses!))
   (set-debug-cell-accesses! 5000))
 
-#(define-public midi-debug  #f)
-
-
-
-
-\version "2.10.0"
+\version "2.15.18"
 
 \include "declarations-init.ly"
 
 
 #(ly:set-option 'old-relative #f)
-#(define toplevel-scores '())
-#(define output-count 0) 
+#(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)
+#(use-modules (scm clip-region))
 
+$(if (ly:get-option 'include-settings)
+  (ly:parser-include-string parser
+    (format #f "\\include \"~a\"" (ly:get-option 'include-settings))))
 
-#(use-modules (scm clip-region))
 \maininput
 %% there is a problem at the end of the input file
 
@@ -38,7 +41,31 @@
       (defined? 'input-file-name))
   (version-not-seen-message input-file-name))
 
-#(if (pair? toplevel-scores)
-  (toplevel-book-handler
-   parser
-   (apply ly:make-book $defaultpaper $defaultheader toplevel-scores)))
+#(ly:set-option 'protected-scheme-parsing #f)
+
+#(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"))))