From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sat, 10 Jul 2004 10:30:14 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.3.7~83
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=296510eefec838a9fba88f99942a7cf122d34a78;p=lilypond.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index ab153cfc93..6c472b9399 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-07-10  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+	* scm/*.scm: adapt ly:warn calls.
+
 	* lily/lily-guile.cc (LY_DEFINE): use format on ly:warn arguments.
 
 	* lily/repeat-acknowledge-engraver.cc (process_music): look at
diff --git a/scm/beam.scm b/scm/beam.scm
index 874e0423d5..0ac7f7f81f 100644
--- a/scm/beam.scm
+++ b/scm/beam.scm
@@ -83,9 +83,8 @@
 	    (not (almost-equal want-r (cdr posns))))
 	(begin
 	  (ly:warn
-	   (format "Error in beam quanting found. Want (~S,~S) found (~S)."
-		   want-l want-r posns
-		   ))
+	    "Error in beam quanting found. Want (~S,~S) found (~S)."
+		   want-l want-r posns )
 	  (set! (ly:grob-property beam 'quant-score)
 		(format "(~S,~S)" want-l want-r)))
 	(set! (ly:grob-property beam 'quant-score) "")
@@ -102,16 +101,14 @@
     
     (if (not correct)
 	(begin
-	  (ly:warn
-	   (format "Error in beam quanting found. Want ~S 0 found ~S."
-		   (procedure-name comparison) slope-sign
-		   ))
+	  (ly:warn "Error in beam quanting found. Want ~S 0 found ~S."
+		   (procedure-name comparison) slope-sign)
 	  (set! (ly:grob-property beam 'quant-score)
 		(format "~S 0" (procedure-name comparison) )))
 	(set! (ly:grob-property beam 'quant-score) "")
 
 	
-	  )))
+	)))
 		 
 (define-public (check-quant-callbacks l r)
   (list Beam::least_squares
diff --git a/scm/clef.scm b/scm/clef.scm
index bfddb1644c..b7171de8d5 100644
--- a/scm/clef.scm
+++ b/scm/clef.scm
@@ -121,7 +121,7 @@
 	       (csp (make-music 'ContextSpeccedMusic)))
 	  (context-spec-music seq 'Staff))
 	(begin
-	  (ly:warn (format "Unknown clef type `~a'
-See scm/lily.scm for supported clefs" clef-name))
+	  (ly:warn "Unknown clef type `~a'
+See scm/lily.scm for supported clefs" clef-name)
 	  (make-music 'Music)))))
 
diff --git a/scm/define-context-properties.scm b/scm/define-context-properties.scm
index 18382269dd..f79798dda4 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 (string-append "Redefining " (symbol->string symbol) "\n"))
+	(ly:warn  "Redefining ~S " (symbol->string symbol)))
 	(exit 2)
       ))
   
diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index 4c3261e7b0..53c0aecfcc 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 (string-append "Redefining " (symbol->string symbol) "\n"))
+	(ly:warn-append "Redefining ~S" (symbol->string symbol))
 	(exit 2)
       ))
   
diff --git a/scm/define-music-properties.scm b/scm/define-music-properties.scm
index 6e1940b94a..e496546fdf 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 (string-append "Redefining " (symbol->string symbol) "\n"))
+	(ly:warn "Redefining ~S" (symbol->string symbol))
 	(exit 2)
 	))
   (set-object-property! symbol 'music-type? type?)