X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Finit.ly;h=91578b7ba3d84124900f4d164a44cdb9dc06958e;hb=da77ae29b4974f89fa168729ffcda756a39688c0;hp=1a9ec369cbbde283f99e7bf40e3662600516d0b1;hpb=01a35dca425ac280b50864c0526ac6b3879723cf;p=lilypond.git

diff --git a/ly/init.ly b/ly/init.ly
index 1a9ec369cb..91578b7ba3 100644
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -4,19 +4,66 @@
 #(if (and #t (defined? 'set-debug-cell-accesses!))
   (set-debug-cell-accesses! 5000))
 
-#(define-public midi-debug  #f)
+\version "2.15.35"
 
+#(if (not (ly:undead? lilypond-declarations))
+     (ly:parser-include-string parser
+			       "\\include \"declarations-init.ly\""))
 
-\version "2.7.39"
-
-\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 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,7 +81,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"))))