Imported Upstream version 2.16.0

[lilypond.git] / scm / backend-library.scm

diff --git a/scm/backend-library.scm b/scm/backend-library.scm
index 706bccb2de51a29a565501f9c8bbb29975b52fd5..0734a1a83427339603fd641ff19488ccac5073b0 100644 (file)
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 2005--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; Copyright (C) 2005--2012 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;; Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
@@ -24,15 +24,11 @@
             (ice-9 optargs))
 
 (define-public (ly:system command)
-  (if (ly:get-option 'verbose)
-      (begin
-       (ly:message (_ "Invoking `~a'...") (string-join command)))
-      (ly:progress "\n"))
+  (ly:debug (_ "Invoking `~a'...") (string-join command))
   (let ((status (apply ly:spawn command)))
     (if (> status 0)
        (begin
-         (ly:message (_ "`~a' failed (~a)") command status)
-         (ly:progress "\n")
+         (ly:warning (_ "`~a' failed (~a)\n") command status)
          ;; hmmm.  what's the best failure option? 
          (throw 'ly-file-failed)))))
 
@@ -91,8 +87,7 @@
               "-c.setpdfwrite"
               (string-append "-f" name)))))
 
-    (ly:message (_ "Converting to `~a'...") pdf-name)
-    (ly:progress "\n")
+    (ly:message (_ "Converting to `~a'...\n") pdf-name)
     (ly:system cmd)))
 
 (define-public (postscript->png resolution paper-width paper-height name)
@@ -117,7 +112,7 @@
         (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))
+               ((eval (string->symbol (format #f "convert-to-~a" f))
                       module) paper-book filename)) completed)
     (if (ly:get-option 'delete-intermediate-files)
        (for-each (lambda (f)