From: Nicolas Sceaux <nicolas.sceaux@free.fr>
Date: Sat, 18 Oct 2008 15:14:55 +0000 (+0200)
Subject: Merge branch 'master' into nested-bookparts
X-Git-Tag: release/2.11.65-1~51^2~2^2~14
X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=def21b306e2b8fa2d5630fab0878e9922e197f0c

Merge branch 'master' into nested-bookparts

Conflicts:

	scm/midi.scm
---

def21b306e2b8fa2d5630fab0878e9922e197f0c
diff --cc scm/midi.scm
index 863128e905,5d3277d820..cf43d3af75
--- a/scm/midi.scm
+++ b/scm/midi.scm
@@@ -284,18 -284,19 +284,17 @@@ returns the program of the instrumen
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  ;;
  
 -(define-public (write-performances-midis performances basename)
 +(define-public (write-performances-midis performances basename . rest)
+   (let ((midi-ext (ly:get-option 'midi-extension)))
 -    (let
 -	loop
 -      ((perfs performances)
 -       (count 0))
 -
 -
 -      (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)))))))
 +  (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.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))))))