* scm/framework-ps.scm:

* scm/lily-library.scm (nan?, inf?): Move guile 1.6 compatibility
layer for inf? and nan? from framework-ps to lily-library.

diff --git a/ChangeLog b/ChangeLog
index 8fa10c463552775475a53ff4a578a7917ce1d9fb..717196cf542721e3aac94d42b8473f57d5eb15ae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-26  Nicolas Sceaux  <nicolas.sceaux@free.fr>
+
+       * scm/framework-ps.scm:         
+       * scm/lily-library.scm (nan?, inf?): Move guile 1.6 compatibility
+       layer for inf? and nan? from framework-ps to lily-library.
+
 2006-02-26  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * buildscripts/substitute-encoding.py (Module): remove file.

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 8fd51ebfafd4bb6285687c50a190a0b74d1e4988..607a05a437d3b3e37886e6979f349cb42474ad0f 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -439,12 +439,6 @@
     (postprocess-output book framework-ps-module filename
                         (ly:output-formats))))
 
-(if (not (defined? 'nan?))
-    (define (nan? x) #f))
-
-(if (not (defined? 'inf?))
-    (define (inf? x) #f))
-
 (define-public (dump-stencil-as-EPS paper dump-me filename load-fonts?)
   (define (mm-to-bp-box mmbox)
     (let* ((scale (ly:output-def-lookup paper 'output-scale))

diff --git a/scm/lily-library.scm b/scm/lily-library.scm
index d3e75530a3e99678f4ca2f86709554e32065214d..2e7fde27636932dcb0448afa89d824fbe8cb02d2 100644 (file)
--- a/scm/lily-library.scm
+++ b/scm/lily-library.scm
@@ -316,6 +316,15 @@ found."
       (cons (cons (car coords) (cadr coords))
            (ly:list->offsets accum (cddr coords)))))
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; numbers
+
+(if (not (defined? 'nan?)) ;; guile 1.6 compat
+    (define-public (nan? x) #f))
+
+(if (not (defined? 'inf?))
+    (define-public (inf? x) #f))
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; intervals