Re: Lily 1.5.24

[Jan Nieuwenhuizen]

Mats Bengtsson <address@hidden> writes:

> I just tried to run it, but no matter if I use Guile 1.4 or 1.3.4
> I get:

Ah, it seems that my guile fixes didn't come through fully, try this:


Generated by address@hidden,
>From = lilypond-1.5.24, To = lilypond-1.5.24.jcn1

usage 

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.5.24.jcn1.diff

Patches do not contain automatically generated files 
or (urg) empty directories, 
i.e., you should rerun autoconf, configure

diff -purN ../lilypond-1.5.24/VERSION ./VERSION
--- ../lilypond-1.5.24/VERSION  Sat Dec  1 15:39:18 2001
+++ ./VERSION   Sat Dec  1 22:01:28 2001
@@ -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 -purN ../lilypond-1.5.24/scm/sketch.scm ./scm/sketch.scm
--- ../lilypond-1.5.24/scm/sketch.scm   Sat Dec  1 13:11:57 2001
+++ ./scm/sketch.scm    Sat Dec  1 22:00:12 2001
@@ -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))
 


-- 
Jan Nieuwenhuizen <address@hidden> | GNU LilyPond - The music typesetter
http://www.xs4all.nl/~jantien       | http://www.lilypond.org