From: Han-Wen Nienhuys Date: Sat, 10 Jul 2004 10:31:05 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: release/2.3.7~82 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c73208f8ba7aa441b61697b48bd78978fd0ef26b;p=lilypond.git *** empty log message *** --- diff --git a/scm/define-context-properties.scm b/scm/define-context-properties.scm index f79798dda4..cbd7a1daf2 100644 --- a/scm/define-context-properties.scm +++ b/scm/define-context-properties.scm @@ -11,7 +11,7 @@ (define (translator-property-description symbol type? description) (if (not (equal? #f (object-property symbol 'translation-doc))) (begin - (ly:warn "Redefining ~S " (symbol->string symbol))) + (ly:warn "Redefining ~S " symbol) (exit 2) )) diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm index 53c0aecfcc..33bf3a7f71 100644 --- a/scm/define-grob-properties.scm +++ b/scm/define-grob-properties.scm @@ -10,7 +10,7 @@ (define (define-grob-property symbol type? description) (if (not (equal? (object-property symbol 'backend-doc) #f)) (begin - (ly:warn-append "Redefining ~S" (symbol->string symbol)) + (ly:warn-append "Redefining ~S" symbol) (exit 2) )) diff --git a/scm/define-music-properties.scm b/scm/define-music-properties.scm index e496546fdf..86f3f5cefc 100644 --- a/scm/define-music-properties.scm +++ b/scm/define-music-properties.scm @@ -10,7 +10,7 @@ (define (music-property-description symbol type? description) (if (not (equal? #f (object-property symbol 'music-doc))) (begin - (ly:warn "Redefining ~S" (symbol->string symbol)) + (ly:warn "Redefining ~S" symbol) (exit 2) )) (set-object-property! symbol 'music-type? type?) diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm index bb6c47b3e7..724de3993e 100644 --- a/scm/define-music-types.scm +++ b/scm/define-music-types.scm @@ -814,8 +814,7 @@ and values. E.g: (music-name (if (pair? handle) (cdr handle) (begin - (ly:warn (string-append "Unknown repeat type `" name - "'\nSee music-types.scm for supported repeats")) + (ly:warn "Unknown repeat type `~S'\nSee music-types.scm for supported repeats" name) 'VoltaRepeatedMusic)))) (make-music music-name))) diff --git a/scm/music-functions.scm b/scm/music-functions.scm index e63f9579a2..554018145b 100644 --- a/scm/music-functions.scm +++ b/scm/music-functions.scm @@ -742,5 +742,5 @@ use GrandStaff as a context. " '() context)) (else - (ly:warn (string-append "Unknown accidental style: " (symbol->string style))) + (ly:warn "Unknown accidental style: ~S" (symbol->string style)) (make-sequential-music '())))))) diff --git a/scm/output-lib.scm b/scm/output-lib.scm index d034cf6ef9..731c11df1b 100644 --- a/scm/output-lib.scm +++ b/scm/output-lib.scm @@ -237,7 +237,7 @@ centered, X==1 is at the right, X == -1 is at the left." ))) (if (equal? result #f) - (ly:warn (string-append "Unknown bar glyph: `" glyph "'")) + (ly:warn "Unknown bar glyph: `~S'" glyph) (index-cell (cdr result) dir)) ) ) diff --git a/scm/output-pdftex.scm b/scm/output-pdftex.scm index 09d448c1f6..f20f7a02aa 100644 --- a/scm/output-pdftex.scm +++ b/scm/output-pdftex.scm @@ -37,11 +37,10 @@ (display (object-type (car name-mag-pair))) (display (object-type (caaar font-name-alist))) - (ly:warn (string-append - "Programming error: No such font known " - (car name-mag-pair) " " + (ly:warn "Programming error: No such font known ~S ~S" + (car name-mag-pair) (ly:number->string (cdr name-mag-pair)) - )) + ) "") ; issue no command (string-append "\\" (cddr c))) diff --git a/scm/paper.scm b/scm/paper.scm index 163d836245..1904db71c0 100644 --- a/scm/paper.scm +++ b/scm/paper.scm @@ -84,8 +84,8 @@ (cond ((not is-bookpaper?) - (ly:warning "This is not a \\paper {} object:") - (display module)) + (ly:warning "This is not a \\paper {} object, ~S" + module)) ((pair? entry) (set! entry (eval (cdr entry) module)) (set-paper-dimensions module (car entry) (cdr entry)) @@ -123,7 +123,7 @@ (/ val scale)) ;; spurious warnings, eg. for hsize, vsize. -; (ly:warn (format "not a number, ~S = ~S " v val)) +; (ly:warn "not a number, ~S = ~S " v val) )) dim-vars)