Imported Upstream version 2.16.0

[lilypond.git] / ly / init.ly

diff --git a/ly/init.ly b/ly/init.ly
index c3db3b37170810826995247621026c213d36379f..a8bcc65d1143daa0a9904b2f7d3f71f02154731f 100644 (file)
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -4,20 +4,67 @@
 #(if (and #t (defined? 'set-debug-cell-accesses!))
   (set-debug-cell-accesses! 5000))
 
-\version "2.10.0"
+\version "2.16.0"
 
-\include "declarations-init.ly"
+#(if (not (ly:undead? lilypond-declarations))
+     (ly:parser-include-string parser
+                              "\\include \"declarations-init.ly\""))
 
+%% We need to save the variables of the current module along with
+%% their values: functions defined in the module might refer to the
+%% variables
+
+#(if lilypond-declarations
+     (if (ly:undead? lilypond-declarations)
+        (begin
+          (for-each
+           (lambda (p)
+             (let ((var (cadr p))
+                   (val (cddr p)))
+               (variable-set! var
+                              (if (ly:output-def? val)
+                                  (ly:output-def-clone val)
+                                  val))
+               (module-add! (current-module) (car p) var)))
+           (ly:get-undead lilypond-declarations))
+          (note-names-language parser default-language))
+        (let ((decl '()))
+          (module-for-each
+           (lambda (s v)
+             (let ((val (variable-ref v)))
+               (if (not (ly:lily-parser? val))
+                   (set! decl
+                         (cons
+                          (cons*
+                           s v
+                           (if (ly:output-def? val)
+                               (ly:output-def-clone val)
+                               val))
+                          decl)))))
+           (current-module))
+          (set! lilypond-declarations (ly:make-undead decl)))))
 
 #(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 expect-error #f)
 #(define output-empty-score-list #f)
+#(define output-suffix #f)
+#(hash-clear! default-fret-table)
+#(hash-clear! chord-shape-table)
+#(hash-clear! musicQuotes)
 
 #(use-modules (scm clip-region))
+#(use-modules (srfi srfi-1))
+
+$(if (ly:get-option 'include-settings)
+  (ly:parser-include-string parser
+    (format #f "\\include \"~a\"" (ly:get-option 'include-settings))))
+
 \maininput
 %% there is a problem at the end of the input file
 
@@ -34,13 +81,29 @@
       (defined? 'input-file-name))
   (version-not-seen-message input-file-name))
 
-#(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)))
+#(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)