*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index ab153cfc93d15ba4894df3a5550d0ccfa9d0efcf..6c472b9399c6ab1e644316fcf4aa4612b5c78a30 100644 (file)
--- 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 874e0423d584c69944799daf0b909a9bcf60623e..0ac7f7f81f105265393acf90c22fc34466e2582b 100644 (file)
--- 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 bfddb1644c74083db85cdd9615c056624baba3d3..b7171de8d52904a4558e8739b0b15febb66f7639 100644 (file)
--- 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 18382269ddba755937f8e6548e4a8106874d25f9..f79798dda423f35247abdfdc32b2e016dc6e7fc7 100644 (file)
--- 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 4c3261e7b0a14ae15a580bf7c8a8dd5fa49a1ed5..53c0aecfcced0a30e8031aefefe12d7d9ab22e7e 100644 (file)
--- 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 6e1940b94abe09ab8c5bb4e4ccb039a23e1116e7..e496546fdfbf92a59d24d8d2bef8419410ef2312 100644 (file)
--- 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?)