Merge branch 'master' into nested-bookparts

[lilypond.git] / scm / midi.scm

diff --git a/scm/midi.scm b/scm/midi.scm
index ed82a5a525c2e56aef6db4f71c9b5f6f07742978..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--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2000--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 
 
 
@@ -18,17 +18,17 @@
       '(
        ("sf" . 1.00)
        ("fffff" . 0.95)
-       ("ffff" . 0.91)
-       ("fff" . 0.81)
-       ("ff" . 0.71)
-       ("f" . 0.61)
-       ("mf" . 0.50)
-       ("mp" . 0.40)
-       ("p" . 0.30)
-       ("pp" . 0.20)
-       ("ppp" . 0.10)
-       ("pppp" . 0.08)
-       ("ppppp" . 0.05)
+       ("ffff" . 0.92)
+       ("fff" . 0.85)
+       ("ff" . 0.80)
+       ("f" . 0.75)
+       ("mf" . 0.68)
+       ("mp" . 0.61)
+       ("p" . 0.55)
+       ("pp" . 0.49)
+       ("ppp" . 0.42)
+       ("pppp" . 0.34)
+       ("ppppp" . 0.25)
        )
       absolute-volume-alist))
 
@@ -56,6 +56,11 @@
         )
        instrument-equalizer-alist))
 
+(define-public (default-instrument-equalizer s)
+  (let ((entry (assoc s instrument-equalizer-alist)))
+    (if entry
+       (cdr entry))))
+
 ;; (name . program+32768*(channel10 ? 1 : 0))
 (define instrument-names-alist '())
 (set! instrument-names-alist
@@ -249,11 +254,6 @@
          )
        instrument-names-alist))
 
-(define-public (default-instrument-equalizer s)
-  (let ((entry (assoc s instrument-equalizer-alist)))
-    (if entry
-       (cdr entry))))
-
 (define-public (percussion? instrument)
   "
 returns whether the instrument should use midi channel 9
@@ -276,4 +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 (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))))))