Index: scm/lily-library.scm
===================================================================
RCS file: /sources/lilypond/lilypond/scm/lily-library.scm,v
retrieving revision 1.62
diff -u -r1.62 lily-library.scm
--- scm/lily-library.scm	31 Mar 2006 00:23:26 -0000	1.62
+++ scm/lily-library.scm	30 Apr 2006 23:47:37 -0000
@@ -320,10 +320,12 @@
 ;; numbers
 
 (if (not (defined? 'nan?)) ;; guile 1.6 compat
-    (define-public (nan? x) #f))
+    (define-public (nan? x) (not (or (< 0.0 x)
+				     (> 0.0 x)
+				     (= 0.0 x)))))
 
 (if (not (defined? 'inf?))
-    (define-public (inf? x) #f))
+    (define-public (inf? x) (= (/ 1.0 x) 0.0)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; intervals