patch::: 1.5.24.jcn1

diff --git a/VERSION b/VERSION
index cb07dab4b84006c027e5b4ce600f39092624db94..376d694c28904d47a5b4dee79bc74963c56cc9c1 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=24
-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/sketch.scm b/scm/sketch.scm
index 80c76752e3d9c30e47f35b1532c65dd71fcf98e8..30ec4a4ce0844002fc1808de573c5851659fbcdd 100644 (file)
--- a/scm/sketch.scm
+++ b/scm/sketch.scm
@@ -19,6 +19,7 @@
 ;;     elif symbol == 'char':
 ;;         out.write ('moveto( %f %f); char(%d)' % (x,y,rest))
 
+
 ;; (define (dispatch x y expr)
 ;;  (let ((keyword (car expr))) 
 ;;   (cond
@@ -29,10 +30,16 @@
 ;;    ))
 
 
+;; guile < 1.4 compatibility for eval
+(if (or (equal? (minor-version) "4")
+       (equal? (minor-version) "3.4"))
+    (define (ly-eval e m)
+      (eval-in-module e m))
+    (define (ly-eval e m)
+      (eval e m)))
 
-(define-module (scm sketch) )
-;   :export (sketch-output-expression)
-;  :no-backtrace
+(define-module (scm sketch))
+(debug-enable 'backtrace)
 
 (define this-module (current-module))
 
@@ -40,8 +47,7 @@
   (display (dispatch expr) port))
 
 (use-modules
- (guile)
- (guile-user))
+ (guile))
 
 (use-modules (ice-9 format))