X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Finit.ly;h=6dc602828cbdc95eee9ec3354a840b50307a9057;hb=7d033c021cb977f6fafbd86eadc836fd208c4135;hp=2f718ed93d1efcd1965646ecc0146ec9162af7dc;hpb=24a671e48f7b0391dab19a01fdad4d7aa6bb9783;p=lilypond.git

diff --git a/ly/init.ly b/ly/init.ly
index 2f718ed93d..6dc602828c 100644
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -15,7 +15,8 @@
 #(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
@@ -33,7 +34,8 @@
       (defined? 'input-file-name))
   (version-not-seen-message input-file-name))
 
-#(if (pair? toplevel-scores)
+#(ly:set-option 'protected-scheme-parsing #f)
+#(if (or (pair? toplevel-scores) output-empty-score-list)
   ((if (defined? 'default-toplevel-book-handler)
     default-toplevel-book-handler
     toplevel-book-handler)
@@ -41,5 +43,7 @@
    (apply ly:make-book $defaultpaper $defaultheader toplevel-scores)))
 
 
-#(if expect-error
-  (ly:parser-clear-error parser))
+#(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"))))