Merge branch 'master' into nested-bookparts

[lilypond.git] / scm / midi.scm

diff --git a/scm/midi.scm b/scm/midi.scm
index 9aad4bd1baa9cf58f633b298dacf87b356f7a56f..cf43d3af7592759e5f5887812a1b6f2667665ce1 100644 (file)
--- a/scm/midi.scm
+++ b/scm/midi.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2000--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 
 
 
@@ -276,24 +276,25 @@ returns the program of the instrument
 
 (define-public (alterations-in-key pitch-list)
   "Count number of sharps minus number of flats"
-  (/ (apply + (map cdr pitch-list)) 2))
+  
+  (* (apply + (map cdr pitch-list)) 2))
 
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 
-(define-public (paper-book-write-midis paper-book basename)
+(define-public (write-performances-midis performances basename . rest)
+  (let ((midi-ext (ly:get-option 'midi-extension)))
   (let
       loop
-      ((perfs (ly:paper-book-performances paper-book))
-       (count 0))
-      
+    ((perfs performances)
+     (count (if (null? rest) 0 (car rest))))
     (if (pair?  perfs)
        (begin
          (ly:performance-write
           (car perfs)
           (if (> count 0)
-              (format #f "~a-~a.midi" basename count)
-              (format #f "~a.midi" basename)))
+              (format #f "~a-~a.~a" basename count midi-ext)
+              (format #f "~a.~a" basename midi-ext)))
          (loop (cdr perfs) (1+ count))))))