From 1273cd95f450940c2fed68e8ddebdd38486ba22d Mon Sep 17 00:00:00 2001 From: Mike Solomon Date: Wed, 23 Feb 2011 18:37:50 -0500 Subject: [PATCH] Fixes clarinet fingering charts --- python/convertrules.py | 9 ++++++++ scm/define-woodwind-diagrams.scm | 12 +++++------ scm/display-woodwind-diagrams.scm | 34 +++++++++++++++---------------- 3 files changed, 32 insertions(+), 23 deletions(-) diff --git a/python/convertrules.py b/python/convertrules.py index b1e21616e8..34099734f5 100644 --- a/python/convertrules.py +++ b/python/convertrules.py @@ -3193,6 +3193,15 @@ def conv(str): return str +@rule ((2, 13, 51), + _ ("Woodwind diagrams: Changes to the clarinet diagram.")) +def conv(str): + if re.search(r'woodwind-diagram', str): + stderr_write("\n") + stderr_write(NOT_SMART % _("woodwind-diagrams. Clarinet fingering changed to reflect actual anatomy of instrument.\n")) + stderr_write(UPDATE_MANUALLY) + return str + # Guidelines to write rules (please keep this at the end of this file) # # - keep at most one rule per version; if several conversions should be done, diff --git a/scm/define-woodwind-diagrams.scm b/scm/define-woodwind-diagrams.scm index 501e63779a..29825fd5a5 100644 --- a/scm/define-woodwind-diagrams.scm +++ b/scm/define-woodwind-diagrams.scm @@ -864,13 +864,13 @@ returns @samp{1/3}." CL-RH-H-STRETCH CL-RH-V-STRETCH)) -(define clarinet-rh-e-key-stencil +(define clarinet-rh-gis-key-stencil (standard-path-stencil '((0.0 1.0 1.0 1.0 1.0 0.0) (1.0 -1.0 0.0 -1.0 0.0 0.0)) CL-RH-H-STRETCH CL-RH-V-STRETCH)) -(define clarinet-rh-ees-key-stencil +(define clarinet-rh-e-key-stencil (standard-path-stencil `(,(bezier-head-for-stencil '((0.0 . 0.0) (0.0 . -1.0) (1.0 . -1.0) (1.0 . 0.0)) @@ -887,9 +887,9 @@ returns @samp{1/3}." CL-RH-H-STRETCH CL-RH-V-STRETCH)) -(define clarinet-rh-gis-key-stencil clarinet-rh-e-key-stencil) +(define clarinet-rh-f-key-stencil clarinet-rh-gis-key-stencil) -(define bass-clarinet-rh-f-key-stencil +(define bass-clarinet-rh-ees-key-stencil (standard-path-stencil `(,(bezier-head-for-stencil '((0.0 . 0.0) (0.0 . -1.0) (1.0 . -1.0) (1.0 . 0.0)) @@ -901,9 +901,9 @@ returns @samp{1/3}." CL-RH-H-STRETCH (- CL-RH-V-STRETCH))) -(define low-bass-clarinet-rh-f-key-stencil clarinet-rh-ees-key-stencil) +(define low-bass-clarinet-rh-ees-key-stencil clarinet-rh-e-key-stencil) -(define clarinet-rh-d-key-stencil clarinet-rh-e-key-stencil) +(define clarinet-rh-d-key-stencil clarinet-rh-gis-key-stencil) ;;; Saxophone family stencils diff --git a/scm/display-woodwind-diagrams.scm b/scm/display-woodwind-diagrams.scm index 197c1c199c..a2b037e294 100644 --- a/scm/display-woodwind-diagrams.scm +++ b/scm/display-woodwind-diagrams.scm @@ -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 -- 2.39.2