X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fbackend-library.scm;h=3a4ccab817871d821b3e6641e1b0e4d044191e2f;hb=e13b4cde643ebb4df93e70fa9fde6b3f2d075221;hp=71ef9096f8e314249dfdd773f0a660918215473a;hpb=0af04b384b79837d4da7b2bab314066c7f947b20;p=lilypond.git

diff --git a/scm/backend-library.scm b/scm/backend-library.scm
index 71ef9096f8..3a4ccab817 100644
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -140,15 +140,15 @@
 
 (define-public (postprocess-output paper-book module filename formats)
   (let* ((completed (completize-formats formats))
-	 (base (string-regexp-substitute "\\.[a-z]+$" "" filename))
+	 (base (dir-basename filename ".ps" ".eps"))
 	 (intermediate (remove (lambda (x) (member x formats)) completed)))
-    
     (for-each (lambda (f)
 		((eval (string->symbol (format "convert-to-~a" f))
 		       module) paper-book filename)) completed)
     (if (ly:get-option 'delete-intermediate-files)
 	(for-each (lambda (f)
-		    (delete-file (string-append base "." f))) intermediate))))
+		    (if (file-exists? f) (delete-file f)))
+		  (map (lambda (x) (string-append base "." x)) intermediate)))))
 
 (define-public (completize-formats formats)
   (define new-fmts '())
@@ -190,15 +190,26 @@
       scope)))
   (apply string-append (map output-scope scopes)))
 
+(define missing-stencil-list '())
+
 (define-public (backend-testing output-module)
   (define (missing-stencil-expression name)
-    (apply
-     (if (ly:get-option 'warning-as-error) ly:error ly:warning)
-     (list (_ "missing stencil expression `~S'") name)))
+    (begin
+      (ly:warning (_ "missing stencil expression `~S'") name)
+      ""))
 
   (map (lambda (x)
 	 (if (not (module-defined? output-module x))
-	     (module-define! output-module x
-			     (lambda* (#:optional y . z)
-			       (missing-stencil-expression x)))))
-       (ly:all-stencil-expressions)))
+	     (begin
+	       (module-define! output-module x
+			       (lambda* (#:optional y . z)
+				 (missing-stencil-expression x)))
+	       (set! missing-stencil-list (append (list x)
+						  missing-stencil-list)))))
+       (ly:all-stencil-commands)))
+
+(define-public (remove-stencil-warnings output-module)
+  (for-each
+    (lambda (x)
+      (module-remove! output-module x))
+    missing-stencil-list))