Issue 3153: Let music inside of #{ ... #} originate from @code{location} if set

[lilypond.git] / ly / init.ly

diff --git a/ly/init.ly b/ly/init.ly
index 04fa98748391acb1a11c0388fc4a9cc94f6c2718..8e8a2fc2123436dd8ee428e859b3ff7bfecdaea6 100644 (file)
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -1,21 +1,45 @@
 %% Toplevel initialisation file. 
 
-% switch on debugging.
+%% switch on debugging.
 #(if (and #t (defined? 'set-debug-cell-accesses!))
   (set-debug-cell-accesses! 5000))
 
-#(define-public midi-debug  #f)
+\version "2.16.0"
 
+#(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 parser)
+    "\\include \"declarations-init.ly\"")))
 
-\version "2.4.0"
+#(note-names-language parser default-language)
 
-\include "declarations-init.ly"
+#(ly:set-option 'old-relative #f)
+#(define location #f)
+#(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))
 
-#(ly:set-option 'new-relative)
-#(define toplevel-scores '())
-#(define $globalheader #f)
-#(define version-seen? #f)
+$(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
@@ -27,15 +51,37 @@
 #(if (and (ly:get-option 'old-relative)
       (defined? 'input-file-name)
       (not (ly:get-option 'old-relative-used)))
-  (ly:warning (string-append
-           "\n"
-           input-file-name ": old relative compatibility was not used."
-       )))%% there is a problem at the end of the input file
+  (old-relative-not-used-message input-file-name))%% there is a problem at the end of the input file
 
-#(if (not version-seen?)
-  (version-not-seen-message))
+#(if (and (not version-seen)
+      (defined? 'input-file-name))
+  (version-not-seen-message input-file-name))
 
-#(if (pair? toplevel-scores)
-  (ly:parser-print-book parser
-   (apply ly:make-book $defaultpaper $globalheader 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"))))