Doc: fix calculation of global-staff-size in points (3114)

[lilypond.git] / scm / midi.scm

diff --git a/scm/midi.scm b/scm/midi.scm
index c6d2d430231d039537f140a1b36b5191ccbbd044..48079928221212f9fb12e5d26b7ff5769025a179 100644 (file)
--- a/scm/midi.scm
+++ b/scm/midi.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 2000--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; Copyright (C) 2000--2012 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
 ;; this is broken: we should not ever export variables from Scheme.
 
 ;; define factor of total volume per dynamic marking
-(define-public absolute-volume-alist '())
+(define-session-public absolute-volume-alist '())
 (set! absolute-volume-alist
       (append
        '(
@@ -47,7 +47,7 @@
   (assoc-get s absolute-volume-alist))
 
 ;; define factors of total volume of minimum and maximum volume
-(define-public instrument-equalizer-alist '())
+(define-session-public instrument-equalizer-alist '())
 (set! instrument-equalizer-alist
       (append
        '(
@@ -262,14 +262,14 @@
        instrument-names-alist))
 
 (define-public (percussion? instrument)
-  "returns whether the instrument should use midi channel 9"
+  "Return @code{#t} if the instrument should use MIDI channel 9."
 
   (let* ((inst  (symbol->string instrument))
          (entry (assoc-get inst instrument-names-alist)))
     (and entry (>= entry 32768))))
 
 (define-public (midi-program instrument)
-  "returns the program of the instrument"
+  "Return the program of the instrument."
 
   (let* ((inst  (symbol->string instrument))
          (entry (assoc-get inst instrument-names-alist)))
@@ -282,10 +282,9 @@
 (define-public dynamic-default-volume 0.71)
 
 (define-public (alterations-in-key pitch-list)
-  "Count number of sharps minus number of flats"
-
-  (* (apply + (map cdr pitch-list)) 2))
+  "Count number of sharps minus number of flats."
 
+  (apply + (map (lambda (p) (round (* (cdr p) 2))) pitch-list)) )
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;