Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / ly / init.ly

diff --git a/ly/init.ly b/ly/init.ly
index a0505d8eeaef8678635b90f418778413856bc7cf..062ca06cbdfdfb4c5780fbc7e6732d27e5038035 100644 (file)
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -1,37 +1,46 @@
-% Toplevel initialisation file. 
+%% 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))
 
+#(define-public midi-debug  #f)
 
-\version "2.1.28"
+
+
+
+\version "2.10.0"
 
 \include "declarations-init.ly"
 
 
-#(ly:set-option 'new-relative)
-#(ly:set-point-and-click #f)
+#(ly:set-option 'old-relative #f)
+#(define toplevel-scores '())
+#(define output-count 0) 
+#(define $defaultheader #f)
+#(define version-seen #f)
 
-\maininput
-% there is a problem at the end of the input file
 
+#(use-modules (scm clip-region))
+\maininput
+%% there is a problem at the end of the input file
 
 %%
-%% above and below message is to compensate for look ahead of the parser.
+%% 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)))
-  (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
-
-
-
-#(if (ly:get-option 'verbose)
-  (begin
-   (gc)
-   (write (gc-stats) (current-error-port))
-   ))
-
+  (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 (pair? toplevel-scores)
+  ((if (defined? 'default-toplevel-book-handler)
+    default-toplevel-book-handler
+    toplevel-book-handler)
+   parser
+   (apply ly:make-book $defaultpaper $defaultheader toplevel-scores)))