X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Finit.ly;h=91578b7ba3d84124900f4d164a44cdb9dc06958e;hb=814fc3eaa51fcfe0fbc2df1e1bc18b204ba5f076;hp=5a2103e83c4a47822fad73649b43e143bfda1589;hpb=e9b10d6b0e1549a3d3d9ca81c63e1b2d9b431910;p=lilypond.git

diff --git a/ly/init.ly b/ly/init.ly
index 5a2103e83c..91578b7ba3 100644
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -4,21 +4,67 @@
 #(if (and #t (defined? 'set-debug-cell-accesses!))
   (set-debug-cell-accesses! 5000))
 
-\version "2.10.0"
+\version "2.15.35"
 
-\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 (list))
 #(define toplevel-bookparts (list))
-#(define output-count 0) 
 #(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
 
@@ -54,8 +100,10 @@
             (set! toplevel-scores (list))
             (book-handler parser book)))
          ((or (pair? toplevel-scores) output-empty-score-list)
-          (book-handler parser (apply ly:make-book $defaultpaper
-                                      $defaultheader toplevel-scores)))))
+          (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)