X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Finit.ly;h=394b122f3168a0b4f2b2880ba6500fa4029a8fe7;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=91578b7ba3d84124900f4d164a44cdb9dc06958e;hpb=2f0c6eb19208485a86d3416db3f3640a1d54752a;p=lilypond.git

diff --git a/ly/init.ly b/ly/init.ly
index 91578b7ba3..394b122f31 100644
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -1,50 +1,27 @@
-%% Toplevel initialisation file. 
+%% Toplevel initialisation file.
 
 %% switch on debugging.
 #(if (and #t (defined? 'set-debug-cell-accesses!))
   (set-debug-cell-accesses! 5000))
 
-\version "2.15.35"
+\version "2.19.22"
 
-#(if (not (ly:undead? lilypond-declarations))
-     (ly:parser-include-string parser
-			       "\\include \"declarations-init.ly\""))
+#(if (guile-v2)
+  (use-modules (ice-9 curried-definitions)))
 
-%% We need to save the variables of the current module along with
-%% their values: functions defined in the module might refer to the
-%% variables
+#(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\"")))
 
-#(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)))))
+#(note-names-language default-language)
 
-#(ly:set-option 'old-relative #f)
 #(define toplevel-scores (list))
 #(define toplevel-bookparts (list))
 #(define $defaultheader #f)
@@ -54,15 +31,13 @@
 #(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))
+#(use-modules (ice-9 pretty-print))
 
 $(if (ly:get-option 'include-settings)
-  (ly:parser-include-string parser
+  (ly:parser-include-string
     (format #f "\\include \"~a\"" (ly:get-option 'include-settings))))
 
 \maininput
@@ -72,11 +47,6 @@ $(if (ly:get-option 'include-settings)
 %% 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))
@@ -88,24 +58,24 @@ $(if (ly:get-option 'include-settings)
                          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))
+            (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)
-                (map (lambda (score)
-                       (ly:book-add-score! book score))
-                     (reverse! toplevel-scores)))
+                (for-each (lambda (score)
+                            (ly:book-add-score! book score))
+                          (reverse! toplevel-scores)))
             (set! toplevel-scores (list))
-            (book-handler parser book)))
+            (book-handler book)))
          ((or (pair? toplevel-scores) output-empty-score-list)
-          (let ((book (apply ly:make-book $defaultpaper 
+          (let ((book (apply ly:make-book $defaultpaper
                              $defaultheader toplevel-scores)))
             (set! toplevel-scores (list))
-            (book-handler parser book)))))
+            (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"))))