Merge with master

[lilypond.git] / ly / init.ly

diff --git a/ly/init.ly b/ly/init.ly
index 2e3e849bd9a45c94086d49bc3acf7aa736498dee..c3db3b37170810826995247621026c213d36379f 100644 (file)
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -1,19 +1,23 @@
 %% Toplevel initialisation file. 
 
-#(define-public point-and-click #f)
-#(define-public midi-debug  #f)
+%% switch on debugging.
+#(if (and #t (defined? 'set-debug-cell-accesses!))
+  (set-debug-cell-accesses! 5000))
 
-
-\version "2.3.16"
+\version "2.10.0"
 
 \include "declarations-init.ly"
 
 
-#(ly:set-option 'new-relative)
-#(ly:set-point-and-click #f)
-#(define  toplevel-scores '())
-#(define $globalheader #f)
+#(ly:set-option 'old-relative #f)
+#(define toplevel-scores '())
+#(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
 
@@ -24,12 +28,21 @@
 #(if (and (ly:get-option 'old-relative)
       (defined? 'input-file-name)
       (not (ly:get-option 'old-relative-used)))
-  (ly:warn (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 (and (not version-seen)
+      (defined? 'input-file-name))
+  (version-not-seen-message input-file-name))
+
+#(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 $defaultheader toplevel-scores)))
 
-#(if (pair? toplevel-scores)
-  (ly:parser-print-book parser
-   (apply ly:make-book $defaultpaper $globalheader (reverse 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"))))