Merge with master

[lilypond.git] / ly / init.ly

diff --git a/ly/init.ly b/ly/init.ly
index 29694bb3d8a3d6a63ca76f4815ea1de3938c12de..c3db3b37170810826995247621026c213d36379f 100644 (file)
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -1,22 +1,23 @@
 %% 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.6.0"
+\version "2.10.0"
 
 \include "declarations-init.ly"
 
 
 #(ly:set-option 'old-relative #f)
 #(define toplevel-scores '())
-#(define $globalheader #f)
-#(define version-seen? #f)
+#(define output-count 0) 
+#(define $defaultheader #f)
+#(define version-seen #f)
+#(define expect-error #f) 
+#(define output-empty-score-list #f)
 
+#(use-modules (scm clip-region))
 \maininput
 %% there is a problem at the end of the input file
 
@@ -29,11 +30,19 @@
       (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?)
+#(if (and (not version-seen)
       (defined? 'input-file-name))
   (version-not-seen-message input-file-name))
 
-#(if (pair? toplevel-scores)
-  (toplevel-book-handler
+#(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 $globalheader toplevel-scores)))
+   (apply ly:make-book $defaultpaper $defaultheader toplevel-scores)))
+
+
+#(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"))))