Merge commit 'origin'

[lilypond.git] / scm / midi.scm

diff --git a/scm/midi.scm b/scm/midi.scm
index 396a4a964511f56ded5703c75839432d059f3c61..358fa0accaa7ea7d22cdc8812388c83e77b97464 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--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 
 
 
@@ -103,7 +103,7 @@
          ("electric guitar (muted)" . ,(- 29 1))
          ("overdriven guitar" . ,(- 30 1))
          ("distorted guitar" . ,(- 31 1))
-         ("guitar harmo(dinics" . ,(- 32 1))
+         ("guitar harmonics" . ,(- 32 1))
 
          ; (33-40 bass)
          ("acoustic bass" . ,(- 33 1))
@@ -122,7 +122,7 @@
          ("contrabass" . ,(- 44 1))
          ("tremolo strings" . ,(- 45 1))
          ("pizzicato strings" . ,(- 46 1))
-         ("orchestral strings" . ,(- 47 1))
+         ("orchestral harp" . ,(- 47 1))
          ("timpani" . ,(- 48 1))
 
          ; (49-56 ensemble)
@@ -276,25 +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)
-  (let
-      loop
-    ((perfs (ly:paper-book-performances paper-book))
-     (count 0))
-
-
-    (if (pair?  perfs)
-       (begin
-         (ly:performance-write
-          (car perfs)
-          (if (> count 0)
-              (format #f "~a-~a.midi" basename count)
-              (format #f "~a.midi" basename)))
-         (loop (cdr perfs) (1+ count))))))
+(define-public (write-performances-midis performances basename . rest)
+  (let ((midi-ext (ly:get-option 'midi-extension)))
+    (let
+       loop
+      ((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.~a" basename count midi-ext)
+                (format #f "~a.~a" basename midi-ext)))
+           (loop (cdr perfs) (1+ count)))))))