Re: Sketch compile error (1.5.23)

[Jan Nieuwenhuizen]

Rune Zedeler <address@hidden> writes:

> GNU LilyPond 1.5.23ERROR: unrecognized defmodule argument (:export
> (sketch-output-expression) :no-backtrace)
> ...
> 
> (Guile 1.4)

Thanks.  Try this:

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

usage 

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.5.23.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.23/CHANGES ./CHANGES
--- ../lilypond-1.5.23/CHANGES  Thu Nov 29 18:34:40 2001
+++ ./CHANGES   Fri Nov 30 20:57:44 2001
@@ -1,3 +1,12 @@
+1.5.23.jcn1
+===========
+
+* Fixes for guile 1.4.
+
+1.5.23
+======
+
+
 1.5.22.jcn1
 ===========
 
diff -purN ../lilypond-1.5.23/VERSION ./VERSION
--- ../lilypond-1.5.23/VERSION  Thu Nov 29 18:34:44 2001
+++ ./VERSION   Fri Nov 30 20:57:53 2001
@@ -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 -purN ../lilypond-1.5.23/scm/lily.scm ./scm/lily.scm
--- ../lilypond-1.5.23/scm/lily.scm     Thu Nov 22 11:57:34 2001
+++ ./scm/lily.scm      Fri Nov 30 20:58:05 2001
@@ -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 -purN ../lilypond-1.5.23/scm/sketch.scm ./scm/sketch.scm
--- ../lilypond-1.5.23/scm/sketch.scm   Sat Nov 10 12:59:13 2001
+++ ./scm/sketch.scm    Fri Nov 30 20:58:05 2001
@@ -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 "")))
 


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