patch::: 1.5.23.jcn1

1.5.23.jcn1
===========

* Fixes for guile 1.4.

1.5.23
======

diff --git a/CHANGES b/CHANGES
index 5c34ea703ff63de34de74f689f8c0f7b97ce5f37..c3a86f2e5761dfee25a258cad27567859742c55e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,12 @@
+1.5.23.jcn1
+===========
+
+* Fixes for guile 1.4.
+
+1.5.23
+======
+
+
 1.5.22.jcn1
 ===========
 

diff --git a/VERSION b/VERSION
index 753f92fe0eba58d345daa6bad2a4675863bebe42..b3f6bc031ae8ec0410aa59a947db73b2ac2037e5 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=23
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/scm/lily.scm b/scm/lily.scm
index 5f10a15e7c704fa54d1903f59104cfd5ddd80939..0fd88bb740c7abd5efd5b6b346fd973b81512ed8 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -151,7 +151,6 @@
     (map ly-load
                                        ; load-from-path
         '("output-lib.scm"
-          "sketch.scm"
           "pdf.scm"
           "pdftex.scm"
           "c++.scm"
@@ -175,6 +174,3 @@
           "midi.scm"
           )))
 
-
-
-1

diff --git a/scm/sketch.scm b/scm/sketch.scm
index c5417abeabe99a810a3f7f7e0105af51e5fc9f29..76eb7755968c7c59f4b0573f99313465f91434e0 100644 (file)
--- a/scm/sketch.scm
+++ b/scm/sketch.scm
@@ -1,3 +1,4 @@
+
 ;;; sketch.scm -- implement Scheme output routines for Sketch
 ;;;
 ;;;  source file of the GNU LilyPond music typesetter
@@ -29,19 +30,20 @@
 ;;    ))
 
 
+;; guile < 1.4 compatibility for eval
+(define (ly-eval e m)
+  (eval-in-module e m))
 
-(define-module (scm sketch)
-  :export (sketch-output-expression)
-  :no-backtrace)
+(define-module (scm sketch))
+(debug-enable 'backtrace)
 
 (define this-module (current-module))
 
-(define (sketch-output-expression expr port)
+(define-public (sketch-output-expression expr port)
   (display (dispatch expr) port))
 
 (use-modules
- (guile)
- (guile-user))
+ (guile))
 
 (use-modules (ice-9 format))
 
@@ -52,10 +54,10 @@
      ((eq? keyword 'placebox)
       (dispatch-x-y (cadr expr) (+ 150 (caddr expr)) (cadddr expr)))
      (else
-      (apply (eval keyword this-module) (cdr expr))))))
+      (apply (ly-eval keyword this-module) (cdr expr))))))
 
 (define (dispatch-x-y x y expr)
-  (apply (eval (car expr) this-module) (append (list x y) (cdr expr))))
+  (apply (ly-eval (car expr) this-module) (append (list x y) (cdr expr))))
 
 
 
@@ -117,7 +119,7 @@
 
 (define (fontify x y name-mag-pair exp)
   (string-append (select-font name-mag-pair)
-                (apply (eval (car exp) this-module)
+                (apply (ly-eval (car exp) this-module)
                        (append (list x y) (cdr exp)))))
 ;;              (if (string? exp) exp "")))