144: guile-1.4 fixes

[Jan Nieuwenhuizen]

Here's some fixes for all you bleeding edge people.

--- scm/drums.scm~      Mon Mar 26 11:56:08 2001
+++ scm/drums.scm       Wed Mar 28 11:57:17 2001
@@ -1,5 +1,7 @@
-; drum-"hack". See input/tricks/drums.ly and ly/drumpitch.ly
-; 2001/03/25 Rune Zedeler <address@hidden>
+;;;; drum-"hack". See input/tricks/drums.ly and ly/drumpitch.ly
+;;;; 2001/03/25 Rune Zedeler <address@hidden>
+
+;;;; changed eval to ly-eval for guile 1.3.4/1.4 compatibility --jcn
 
 (define (seq-music-list elts)
    (let* ( (ml (ly-make-music "Sequential_music")) )
@@ -98,7 +100,7 @@
              (begin
               (display p) ;; UGH. FIXME. pitch->string ???
               (ly-warn " unknown drumpitch.")
-              (cdar (eval kit))
+              (cdar (ly-eval kit))
           ))
          ((eq? p (caddr (car pitches))) ((name->paper kit) (caar pitches)) )
         (else                          (p2p (cdr pitches) ) )
@@ -106,12 +108,12 @@
    )
  )
 (define ((name->paper kit) n)
-   (let n2p ((pitches (eval kit)))
+   (let n2p ((pitches (ly-eval kit)))
      (cond ((eq? pitches '())
              (begin
               (ly-warn (string-append "Kit `" (symbol->string kit) "' doesn't 
contain drum `" n
                                       "'\nSee lily/drumpitch.ly for supported 
drums."))
-              (cdar (eval kit))
+              (cdar (ly-eval kit))
             ))
            ((eq? n (caar pitches))  (cdar pitches) )
           (else                    (n2p (cdr pitches) ) )
--- scm/interface-description.scm~      Wed Mar 28 01:26:12 2001
+++ scm/interface-description.scm       Wed Mar 28 12:00:37 2001
@@ -775,7 +775,7 @@
    ))
 
 
-(eval (cons
+(ly-eval (cons
        'begin
        (map (lambda (x) (list 'define (car x) (list 'quote (cdr x))))
            all-interfaces)))

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