From b551257a9d5d4bd1b57d32ac0cea4684260dfd83 Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Sun, 18 Sep 2011 01:38:19 +0200
Subject: [PATCH] Warnings: Turn some normal messages into warnings
---
scm/backend-library.scm | 8 +++-----
scm/lily.scm | 7 +++----
scm/ps-to-png.scm | 8 ++------
3 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/scm/backend-library.scm b/scm/backend-library.scm
index b58d8aca89..7ae9afd5d3 100644
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -28,8 +28,7 @@
(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)))))
@@ -88,8 +87,7 @@
"-c.setpdfwrite"
(string-append "-f" name)))))
- (ly:message (_ "Converting to `~a'...") pdf-name)
- (ly:progress "\n")
+ (ly:progress (_ "Converting to `~a'...\n") pdf-name)
(ly:system cmd)))
(define-public (postscript->png resolution paper-width paper-height name)
@@ -98,7 +96,7 @@
;; Do not try to guess the name of the png file,
;; GS produces PNG files like BASE-page%d.png.
- (ly:message (_ "Converting to ~a...") "PNG")
+ (ly:progress (_ "Converting to ~a...") "PNG")
(make-ps-images name
#:resolution resolution
#:page-width paper-width
diff --git a/scm/lily.scm b/scm/lily.scm
index bbea5afab9..ac735bc489 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -348,11 +348,10 @@ Print a message at LOCATION if any predicate failed."
(define (helper pred? arg count)
(if (not (pred? arg))
(begin
- (ly:input-message
+ (ly:input-warning
location
- (format
- #f (_ "wrong type for argument ~a. Expecting ~a, found ~s")
- count (type-name pred?) arg))
+ (_ "wrong type for argument ~a. Expecting ~a, found ~s")
+ count (type-name pred?) arg)
#f)
#t))
diff --git a/scm/ps-to-png.scm b/scm/ps-to-png.scm
index caffb9aeda..936217f184 100644
--- a/scm/ps-to-png.scm
+++ b/scm/ps-to-png.scm
@@ -63,15 +63,11 @@
;; copy of ly:system. ly:* not available via lilypond-ps2png.scm
(define (my-system be-verbose exit-on-error cmd)
(define status 0)
- (if be-verbose
- (begin
- (format (current-error-port) (_ "Invoking `~a'...") cmd)
- (newline (current-error-port))))
+ (ly:debug (_ "Invoking `~a'...\n") cmd)
(set! status (system cmd))
(if (not (= status 0))
(begin
- (format (current-error-port)
- (format #f (_ "~a exited with status: ~S") "GS" status))
+ (ly:error (_ "~a exited with status: ~S") "GS" status)
(if exit-on-error (exit 1))))
status)
--
2.39.5