X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdisplay-woodwind-diagrams.scm;h=a2b037e2945fc283c7677c0586ec8ea3f5761a36;hb=462d370942c3791439446722b04f551e8e4e25a7;hp=3468e863e9839259f6125deb111535b20d64d68f;hpb=932d08864d51ed34e4dc58b42303d6a29954aef7;p=lilypond.git

diff --git a/scm/display-woodwind-diagrams.scm b/scm/display-woodwind-diagrams.scm
index 3468e863e9..a2b037e294 100644
--- a/scm/display-woodwind-diagrams.scm
+++ b/scm/display-woodwind-diagrams.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 2010 Mike Solomon <mikesol@stanfordalumni.org>
+;;;; Copyright (C) 2010--2011 Mike Solomon <mikesol@stanfordalumni.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
@@ -668,15 +668,15 @@
   ((make-named-spreadsheet '(clarinet bass-clarinet low-bass-clarinet))
     `((bottom-group-key-names
        . (()
-          ((f
+          ((ees
             . ((offset . (0.0 . ,(* 0 (+ 0.75 CL-RH-HAIR))))
-               (stencil . ,bass-clarinet-rh-f-key-stencil)
-               (text? . ("F" . #f))
+               (stencil . ,bass-clarinet-rh-ees-key-stencil)
+               (text? . ("E" . 0))
                (complexity . trill))))
-          ((f
+          ((ees
             . ((offset . (0.0 . ,(* 0 (+ 0.75 CL-RH-HAIR))))
-               (stencil . ,low-bass-clarinet-rh-f-key-stencil)
-               (text? . ("F" . #f))
+               (stencil . ,low-bass-clarinet-rh-ees-key-stencil)
+               (text? . ("E" . 0))
                (complexity . trill)))
            (d
             . ((offset . (,(+ 1.5 CL-RH-HAIR) . ,(* -1 (+ 0.75 CL-RH-HAIR))))
@@ -743,11 +743,11 @@
                  ,(make-right-hand-key-addresses '(one two three four))
                  (-0.5 . -0.7)))))
       (bottom-right-group-key-addresses
-       . (,(make-right-hand-key-addresses '(fis e ees gis))
+       . (,(make-right-hand-key-addresses '(fis e f gis))
           ,(make-right-hand-key-addresses '(fis e ees gis f))
           ,(make-right-hand-key-addresses '(fis e ees gis f d))))
       (right-hand-key-addresses
-       . (,(make-right-hand-key-addresses '(fis e ees gis))
+       . (,(make-right-hand-key-addresses '(fis e f gis))
           ,(make-right-hand-key-addresses '(fis e ees gis f))
           ,(make-right-hand-key-addresses
               '(low-d low-cis low-c fis e ees gis f d)))))))
@@ -878,22 +878,22 @@
                              (stencil . ,clarinet-rh-fis-key-stencil)
                              (text? . ("F" . 1))
                              (complexity . trill)))
-                         (e
+                         (gis
                           . ((offset . (,(+ 1.5 CL-RH-HAIR)
                                         . ,(* 3 (+ 0.75 CL-RH-HAIR))))
-                             (stencil . ,clarinet-rh-e-key-stencil)
-                             (text? . ("E" . #f))
+                             (stencil . ,clarinet-rh-gis-key-stencil)
+                             (text? . ("G" . 1))
                              (complexity . trill)))
-                         (ees
+                         (e
                           . ((offset . (0.0 . ,(* 2 (+ 0.75 CL-RH-HAIR))))
-                             (stencil . ,clarinet-rh-ees-key-stencil)
-                             (text? . ("E" . 0))
+                             (stencil . ,clarinet-rh-e-key-stencil)
+                             (text? . ("E" . #f))
                              (complexity . trill)))
-                         (gis
+                         (f
                           . ((offset . (,(+ 1.5 CL-RH-HAIR)
                                         . ,(* 1 (+ 0.75 CL-RH-HAIR))))
-                             (stencil . ,clarinet-rh-gis-key-stencil)
-                             (text? . ("G" . 1))
+                             (stencil . ,clarinet-rh-f-key-stencil)
+                             (text? . ("F" . #f))
                              (complexity . trill))))
                        (assoc-get 'bottom-group-key-names change-points)))))
        (graphical-commands
@@ -1944,7 +1944,7 @@ and shut.  To see all of the possibilities for all of the keys of a given
 instrument, invoke @code{(print-keys-verbose 'instrument)}.
 
 Lastly, substituting an empty list for the pressed-key alist will result in
-a diagram with all of the keys drawn but none filled. ie...
+a diagram with all of the keys drawn but none filled, for example:
 
 @example
 \\markup \\woodwind-diagram #'oboe #'()