X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Finit.ly;h=394b122f3168a0b4f2b2880ba6500fa4029a8fe7;hb=4d405ef96a8a62771d7d9a283ff5369a772e89d8;hp=a4bd1c3a3985a466f1c888ac2a58e30197739ae8;hpb=f14fc1022072cce6d840ba1fcfc322ef86d4e264;p=lilypond.git

diff --git a/ly/init.ly b/ly/init.ly
index a4bd1c3a39..394b122f31 100644
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -1,23 +1,45 @@
-%% Toplevel initialisation file. 
+%% Toplevel initialisation file.
 
 %% switch on debugging.
 #(if (and #t (defined? 'set-debug-cell-accesses!))
   (set-debug-cell-accesses! 5000))
 
-\version "2.10.0"
+\version "2.19.22"
 
-\include "declarations-init.ly"
+#(if (guile-v2)
+  (use-modules (ice-9 curried-definitions)))
 
+#(session-initialize
+  (lambda ()
+   ;; we can't use ly:parser-include-string here since that does not
+   ;; actually do any parsing but merely switches inputs, so the
+   ;; session saved by the session initializer after calling this
+   ;; function has not actually started.  A parser clone, in contrast,
+   ;; can run and complete synchronously and shares the module with
+   ;; the current parser.
+   (ly:parser-parse-string (ly:parser-clone)
+    "\\include \"declarations-init.ly\"")))
 
-#(ly:set-option 'old-relative #f)
-#(define toplevel-scores '())
-#(define output-count 0) 
+#(note-names-language default-language)
+
+#(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 expect-error #f)
 #(define output-empty-score-list #f)
 #(define output-suffix #f)
+
 #(use-modules (scm clip-region))
+#(use-modules (srfi srfi-1))
+#(use-modules (ice-9 pretty-print))
+
+$(if (ly:get-option 'include-settings)
+  (ly:parser-include-string
+    (format #f "\\include \"~a\"" (ly:get-option 'include-settings))))
+
 \maininput
 %% there is a problem at the end of the input file
 
@@ -25,25 +47,35 @@
 %% 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))
 
 #(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)))
 
+#(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)))
+            (for-each (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)
+                (for-each (lambda (score)
+                            (ly:book-add-score! book score))
+                          (reverse! toplevel-scores)))
+            (set! toplevel-scores (list))
+            (book-handler 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 book)))))
 
-#(if (eq? expect-error (ly:parser-has-error? parser))
-  (ly:parser-clear-error parser)
+#(if (eq? expect-error (ly:parser-has-error?))
+  (ly:parser-clear-error)
   (if expect-error
-   (ly:parser-error parser (_ "expected error, but none found"))))
+   (ly:parser-error (_ "expected error, but none found"))))