From: nsceaux <nsceaux>
Date: Sun, 26 Feb 2006 11:03:52 +0000 (+0000)
Subject: * scm/framework-ps.scm:
X-Git-Tag: release/2.7.38^2~41
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f5694cc843c41e74b4b69974b4925ba42a8e1ade;p=lilypond.git

* 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 8fa10c4635..717196cf54 100644
--- 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 8fd51ebfaf..607a05a437 100644
--- 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 d3e75530a3..2e7fde2763 100644
--- 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