X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fbackend-library.scm;h=2f1bc6f41acffa7ac6c317c9b727e9a6b3ce9196;hb=fb3cbeb081c0362f9ede37d95104e43bfa66044d;hp=67f66598300e19dc84c537bae6a680a9dca4d44b;hpb=7f65b882cf00bdc468eef1f2517161b56e3a3851;p=lilypond.git

diff --git a/scm/backend-library.scm b/scm/backend-library.scm
index 67f6659830..2f1bc6f41a 100644
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -2,12 +2,15 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2005--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2005--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;; Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 
 ;; backend helpers.
 
+(use-modules (scm ps-to-png)
+	     (ice-9 optargs))
+
 (define-public (ly:system command . rest)
   (let* ((status 0)
 	 (dev-null "/dev/null")
@@ -16,7 +19,9 @@
 		       command
 		       (format #f "~a > ~a 2>&1 " command dev-null))))
     (if (ly:get-option 'verbose)
-	(ly:message (_ "Invoking `~a'...") command))
+	(begin
+	  (ly:message (_ "Invoking `~a'...") command))
+	  (ly:progress "\n"))
 
     (set! status
 	  (if (pair? rest)
@@ -75,20 +80,20 @@
 		    ".pdf"))
 	 (is-eps (string-match "\\.eps$" name))
 	 (paper-size-string (if is-eps
-				" -dEPSCrop "
-				(ly:format "-dDEVICEWIDTHPOINTS=~$ \
--dDEVICEHEIGHTPOINTS=~$ "
-					paper-width paper-height )))
+				"-dEPSCrop"
+				(ly:format "-dDEVICEWIDTHPOINTS=~$\
+ -dDEVICEHEIGHTPOINTS=~$"
+					paper-width paper-height)))
 
-	 (cmd (simple-format #f
+	 (cmd (ly:format
 		      "~a\
  ~a\
  ~a\
  ~a\
- -dCompatibilityLevel=1.4 \
+ -dCompatibilityLevel=1.4\
  -dNOPAUSE\
  -dBATCH\
- -r1200 \
+ -r1200\
  -sDEVICE=pdfwrite\
  -sOutputFile=~S\
  -c .setpdfwrite\
@@ -98,9 +103,8 @@
 		      (if (ly:get-option 'verbose) "" "-q")
 		      (if (or (ly:get-option 'gs-load-fonts)
 			      (ly:get-option 'gs-load-lily-fonts))
-			      
-			  " -dNOSAFER "
-			  " -dSAFER ")
+			  "-dNOSAFER"
+			  "-dSAFER")
 		      paper-size-string
 		      pdf-name
 		      name)))
@@ -117,8 +121,6 @@
     (ly:progress "\n")
     (ly:system cmd)))
 
-(use-modules (scm ps-to-png))
-
 (define-public (postscript->png resolution paper-width paper-height name)
   (let* ((verbose (ly:get-option 'verbose))
 	 (rename-page-1 #f))
@@ -138,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 '())
@@ -188,3 +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)
+    (begin
+      (ly:warning (_ "missing stencil expression `~S'") name)
+      ""))
+
+  (map (lambda (x)
+	 (if (not (module-defined? output-module x))
+	     (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))