* scm/sketch.scm:

* scm/ps.scm:
* scm/pdftex.scm:
* scm/pdf.scm:
* scm/tex.scm: Add check for Guile-1.4.1.  Guile includes
patch-level of version in minor-version string.  Arg.

diff --git a/ChangeLog b/ChangeLog
index b174b98a45cf65e785f5b2a6836aea9b0a651050..423144d07157c47e484f801337559cac1c0a007c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-05-29  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * scm/sketch.scm: 
+       * scm/ps.scm: 
+       * scm/pdftex.scm: 
+       * scm/pdf.scm: 
+       * scm/tex.scm: Add check for Guile-1.4.1.  Guile includes
+       patch-level of version in minor-version string.  Arg.
+
 2002-05-29  Han-Wen  <hanwen@cs.uu.nl>
 
        * ly/engraver-init.ly (TabStaffContext): 

diff --git a/scm/pdf.scm b/scm/pdf.scm
index 15b37c91b89f87f06a610e3605fe2cf4f2039a39..834e217ea32a48228295dc7cbafe432b6985c090 100644 (file)
--- a/scm/pdf.scm
+++ b/scm/pdf.scm
@@ -231,12 +231,10 @@
 
 (define my-eval-in-module eval)
 
-(if (or (equal? (minor-version) "4")
+(if (or (equal? (minor-version) "4.1")
+       (equal? (minor-version) "4")
        (equal? (minor-version) "3.4"))
-    (begin
-      (set! my-eval-in-module eval-in-module)
-
-    ))
+    (set! my-eval-in-module eval-in-module))
 
 (define-public (pdf-output-expression expr port)
   (display (my-eval-in-module expr this-module) port) )

diff --git a/scm/pdftex.scm b/scm/pdftex.scm
index 04d15ba650f73bae430bfe24272b1d820f50c918..871841d81db3e2b4058c7ddf5b823537e803b1a3 100644 (file)
--- a/scm/pdftex.scm
+++ b/scm/pdftex.scm
@@ -74,7 +74,8 @@
 
 
 
-(if (or (equal? (minor-version) "4")
+(if (or (equal? (minor-version) "4.1")
+       (equal? (minor-version) "4")
        (equal? (minor-version) "3.4"))
     (define (embedded-pdf expr)
       (let ((ps-string
@@ -222,12 +223,10 @@
 
 (define my-eval-in-module eval)
 
-(if (or (equal? (minor-version) "4")
+(if (or (equal? (minor-version) "4.1")
+       (equal? (minor-version) "4")
        (equal? (minor-version) "3.4"))
-    (begin
-      (set! my-eval-in-module eval-in-module)
-
-    ))
+    (set! my-eval-in-module eval-in-module))
 
 (define-public (pdftex-output-expression expr port)
   (display (my-eval-in-module expr this-module) port) )

diff --git a/scm/ps.scm b/scm/ps.scm
index 6e3c7e5be8ada2098e0f3e24c93aa1837811b96c..3fd3ad1828048bb0698b39a8af57311d18c1b517 100644 (file)
--- a/scm/ps.scm
+++ b/scm/ps.scm
@@ -14,7 +14,8 @@
 
 (debug-enable 'backtrace)
 
-(if (or (equal? (minor-version) "4")
+(if (or (equal? (minor-version) "4.1")
+       (equal? (minor-version) "4")
        (equal? (minor-version) "3.4"))
     (define-public (ps-output-expression expr port)
       (display (eval-in-module expr this-module) port))

diff --git a/scm/sketch.scm b/scm/sketch.scm
index ea071a8815fe8826c876bb875f31b20c9920bb87..5ecc07d96b55f130293ca662557e946e6545d4a6 100644 (file)
--- a/scm/sketch.scm
+++ b/scm/sketch.scm
@@ -30,8 +30,9 @@
 ;;    ))
 
 
-;; guile < 1.4 compatibility for eval
-(if (or (equal? (minor-version) "4")
+;; guile <= 1.4.x compatibility for eval
+(if (or (equal? (minor-version) "4.1")
+       (equal? (minor-version) "4")
        (equal? (minor-version) "3.4"))
     (define (ly-eval e m)
       (eval-in-module e m))

diff --git a/scm/tex.scm b/scm/tex.scm
index 757407d7a7441e33862f00429ecfe2b00f2c950f..1f0a22b403798cb7d4a774c437edde3b47bb79c5 100644 (file)
--- a/scm/tex.scm
+++ b/scm/tex.scm
@@ -121,7 +121,8 @@
   ""
   )
 
-(if (or (equal? (minor-version) "4")
+(if (or (equal? (minor-version) "4.1")
+       (equal? (minor-version) "4")
        (equal? (minor-version) "3.4"))
     (define (embedded-ps expr)
       (let ((ps-string
@@ -273,12 +274,10 @@
 
 (define my-eval-in-module eval)
 
-(if (or (equal? (minor-version) "4")
+(if (or (equal? (minor-version) "4.1")
+       (equal? (minor-version) "4")
        (equal? (minor-version) "3.4"))
-    (begin
-      (set! my-eval-in-module eval-in-module)
-
-    ))
+    (set! my-eval-in-module eval-in-module))
 
 (define-public (tex-output-expression expr port)
   (display (my-eval-in-module expr this-module) port )