From db4b7e9bc92edad08161c7a24f30e37bdee30beb Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 29 May 2002 11:47:12 +0000 Subject: [PATCH] * 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. --- ChangeLog | 9 +++++++++ scm/pdf.scm | 8 +++----- scm/pdftex.scm | 11 +++++------ scm/ps.scm | 3 ++- scm/sketch.scm | 5 +++-- scm/tex.scm | 11 +++++------ 6 files changed, 27 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index b174b98a45..423144d071 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2002-05-29 Jan Nieuwenhuizen + + * 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 * ly/engraver-init.ly (TabStaffContext): diff --git a/scm/pdf.scm b/scm/pdf.scm index 15b37c91b8..834e217ea3 100644 --- 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 04d15ba650..871841d81d 100644 --- 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 6e3c7e5be8..3fd3ad1828 100644 --- 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 ea071a8815..5ecc07d96b 100644 --- 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 757407d7a7..1f0a22b403 100644 --- 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 ) -- 2.39.5