lilypond-1.3.145

diff --git a/buildscripts/clean-fonts.sh b/buildscripts/clean-fonts.sh
index 18e070ca0f44df73a1771e990f8f27df660ddfe4..9c132f67b1b38543f5bf6c02cb2d736edec2bd39 100644 (file)
--- a/buildscripts/clean-fonts.sh
+++ b/buildscripts/clean-fonts.sh
@@ -1,4 +1,10 @@
-#!/bin/sh
+#!@SHELL@
+# use kpsewhich?
+# maybe (optionally) (not) clean stuff from other versions, ie, don't clean
+#     /var/spool/texmf/tfm/lilypond/<NOT-OUR-VERSION>/
+# ?
+
+VERSION="@TOPLEVEL_VERSION@
 
 case  $# in
 0) 
@@ -7,25 +13,21 @@ case  $# in
     WHAT=$1;;
 esac
 
-# should use kpsepath 
+dirs=".
+/var/lib/texmf
+/var/spool/texmf
+/var/tmp/texfonts
+/var/texfonts
+"
 
-TEXDIRS=.
-if [ -d /var/lib/texmf ]; then
-    TEXDIRS="$TEXDIRS /var/lib/texmf"
-fi
-if [ -d /var/spool/texmf ]; then
-    TEXDIRS="$TEXDIRS /var/tmp/texmf"
-fi
-if [ -d /var/tmp/texfonts ]; then
-    TEXDIRS="$TEXDIRS /var/spool/texfonts"
-fi
-if [ -d /var/texfonts ]; then
-    TEXDIRS="$TEXDIRS /var/texfonts"
-fi
-if [ -z "$TEXDIR" ]; then
+for i in $dirs; do
+       if [ -d "$i" ]; then
+               TEXDIRS="$TEXDIRS $i"
+       fi
+done
+
+if [ -z "$TEXDIRS" -o "$TEXDIRS" = "." ]; then
     TEXDIRS=". /var"
-else
-    TEXDIRS=". $TEXDIRS"
 fi
 
 # remove possibly stale .pk/.tfm files 

diff --git a/scm/chord-name.scm b/scm/chord-name.scm
index 8261fe0b3ca38554e239c6a050718c537c536b56..920875a15b9585d5fa882010da01004051d22fa8 100644 (file)
--- a/scm/chord-name.scm
+++ b/scm/chord-name.scm
@@ -256,7 +256,6 @@
 
 (define (pitch->note-name pitch)
   (cons (cadr pitch) (caddr pitch)))
-  
 
 (define (accidental->text acc)
     (if (= acc 0)
@@ -270,7 +269,7 @@
                                (list (append '((raise . 0.6))
                                  (list
                                   (string-append "accidentals-" 
-                                                 (number->string acc))))))))))))
+                                                 (number->string acc))))))))))))
 )
 
 (define (pitch->text pitch)

diff --git a/scm/drums.scm b/scm/drums.scm
index b1eff86751fc2458180ed463060728c2237da5de..187844cd5db595ff1fdcc1adedcc2312342b8817 100644 (file)
--- a/scm/drums.scm
+++ b/scm/drums.scm
@@ -1,5 +1,7 @@
-; drum-"hack". See input/tricks/drums.ly and ly/drumpitch.ly
-; 2001/03/25 Rune Zedeler <rune@zedeler.dk>
+;;;; drum-"hack". See input/tricks/drums.ly and ly/drumpitch.ly
+;;;; 2001/03/25 Rune Zedeler <rune@zedeler.dk>
+
+;;;; changed eval to ly-eval for guile 1.4/1.4.1 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) ) )

diff --git a/scm/interface-description.scm b/scm/interface-description.scm
index ee1b65a218f1906ea4747548408fa6f2726a0f04..80fe44bc27f09c53046449c9300ca3984a33498f 100644 (file)
--- a/scm/interface-description.scm
+++ b/scm/interface-description.scm
@@ -775,10 +775,10 @@ direction = Forced direction for all ties"
    ))
 
 
-(eval (cons
-       'begin
-       (map (lambda (x) (list 'define (car x) (list 'quote (cdr x))))
-           all-interfaces)))
+(ly-eval (cons
+         'begin
+         (map (lambda (x) (list 'define (car x) (list 'quote (cdr x))))
+              all-interfaces)))
 
 
 (define (interface-names) (map (lambda (x) (symbol->string (car x))) all-interfaces))