* GNUmakefile.in (EXTRA_DIST_FILES): remove VIM stuff.

[lilypond.git] / scm / midi.scm

diff --git a/scm/midi.scm b/scm/midi.scm
index d44492d961e87e56b900779ea9a63cdc48d343d3..b41308b77abda626c346f9df1800f60e233d7d19 100644 (file)
--- a/scm/midi.scm
+++ b/scm/midi.scm
@@ -2,11 +2,17 @@
 ;;;
 ;;;  source file of the GNU LilyPond music typesetter
 ;;; 
-;;; (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; (c)  2000--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 
 
+
+;;;;;;;;;;;;;;;;;;
+;;; TODO:
+
+;; this is broken: we should not ever export variables from Scheme.
+
 ;; define factor of total volume per dynamic marking
-(define absolute-volume-alist '())
+(define-public absolute-volume-alist '())
 (set! absolute-volume-alist
       (append 
       '(
@@ -26,14 +32,14 @@
        )
       absolute-volume-alist))
 
-(define (default-dynamic-absolute-volume s)
+(define-public (default-dynamic-absolute-volume s)
   (let ((entry (assoc s absolute-volume-alist)))
     (if entry
        (cdr entry))))
 
 ;; define factors of total volume of minimum and maximum volume
-(define instrument-equaliser-alist '())
-(set! instrument-equaliser-alist
+(define-public instrument-equalizer-alist '())
+(set! instrument-equalizer-alist
       (append 
        '(
         ("flute" . (0 . 0.7))
@@ -48,7 +54,7 @@
         ("cello" . (0.2 . 0.8))
         ("contrabass" . (0.2 . 0.8))
         )
-       instrument-equaliser-alist))
+       instrument-equalizer-alist))
 
 ;; (name . program+32768*(channel10 ? 1 : 0) )
 (define instrument-names-alist '())
@@ -150,7 +156,7 @@
          ("recorder" . ,(- 75 1))
          ("pan flute" . ,(- 76 1))
          ("blown bottle" . ,(- 77 1))
-         ("skakuhachi" . ,(- 78 1))
+         ("shakuhachi" . ,(- 78 1))
          ("whistle" . ,(- 79 1))
          ("ocarina" . ,(- 80 1))
 
@@ -246,22 +252,26 @@
 )
 
 
-(define (default-instrument-equaliser s)
-  (let ((entry (assoc s instrument-equaliser-alist)))
+(define-public (default-instrument-equalizer s)
+  (let ((entry (assoc s instrument-equalizer-alist)))
     (if entry
        (cdr entry))))
 
-;; returns whether the instrument should use midi channel 9
-(define (percussion-p instrument)
+
+(define-public (percussion? instrument)
+  "
+returns whether the instrument should use midi channel 9
+"
   (let* ((inst  (symbol->string instrument))
          (entry (assoc inst instrument-names-alist))
        )
      (and entry (>= (cdr entry) 32768))
-  )
-)
+  ))
 
-;; returns the program of the instrument
-(define (midi-program instrument)
+(define-public (midi-program instrument)
+"
+returns the program of the instrument
+"
   (let* ((inst  (symbol->string instrument))
          (entry (assoc inst instrument-names-alist))
        )
@@ -271,14 +281,8 @@
 
 ;; 90 == 90/127 == 0.71 is supposed to be the default value
 ;; urg: we should set this at start of track
-(define dynamic-default-volume 0.71)
-
-;; Count number of sharps minus number of flats
-(define (accidentals-in-key pitch-list)
-  (apply + (map cdr pitch-list)))
+(define-public dynamic-default-volume 0.71)
 
-;; Characterise the key as major if the alteration of the 
-;; third scale note is the same as that of the main note
-;; Note: MIDI cannot handle other tonalities than major/minor.
-(define (major-key pitch-list)
-  (eq? (cdr (list-ref pitch-list 4)) (cdr (list-ref pitch-list 6))))
+(define-public (alterations-in-key pitch-list)
+  "Count number of sharps minus number of flats"
+  (/ (apply + (map cdr pitch-list)) 2))