Feature/Support for Xaphoon fingering (#11)

* add new tab to spreadsheet * add support for xaphoon
eduardomourar · Jan 21, 2020 · 3496839 · 3496839
1 parent 2b113b6
commit 3496839
Show file tree

Hide file tree

Showing 5 changed files with 3,080 additions and 134 deletions.
diff --git a/README.md b/README.md
@@ -9,6 +9,7 @@ This is a plugin that automatically adds fingering diagram/chart for different m
 * Piccolo (wind.flutes.flute.piccolo)
 * Soprano Recorder (wind.flutes.recorder)
 * Low and Tin Whistles (wind.flutes.whistle)
+* Xaphoon (wind.reed.xaphoon)
 
 ### Installation
 * If using MuseScore version 3 then download the [plugin](https://github.com/eduardomourar/fingering-diagram/archive/master.zip) and unzip it.
@@ -28,7 +29,7 @@ Sometimes the diagrams are placed too close together. In order to improve readab
 
 Image exported from the [sample MuseScore file](./sample.mscx) included in this project.
 
-![Screenshot](./screenshot.png)
+<img src="screenshot.png" alt="Screenshot" width="600">
 
 ## IMPORTANT
 NO WARRANTY

diff --git a/fingering.ods b/fingering.ods
diff --git a/fingeringdiagram.qml b/fingeringdiagram.qml
@@ -6,7 +6,7 @@
 //  Requires Fiati music font that can found here:
 //     https://github.com/eduardomourar/fiati
 //
-//  Copyright (c) 2020 Eduardo Rodrigues
+//  Copyright (c) 2019-2020 Eduardo Rodrigues
 //=============================================================================
 import QtQuick 2.9
 import QtQuick.Dialogs 1.1
@@ -221,6 +221,28 @@ MuseScore {
 				} else if (instrument === 'wind.flutes.whistle.tin.g') {
 					this.transpose = -5;
 				}
+			} else if (instrument === 'wind.reed.xaphoon'
+				|| instrument === 'wind.reed.xaphoon.g' || instrument === 'wind.reed.xaphoon.bflat' || instrument === 'wind.reed.xaphoon.d') {
+				this.instrument = 'xaphoon'; // Xaphoon in C
+				this.range = {
+					minPitch: 59, // B3 (written)
+					maxPitch: 84, // C6
+				};
+				this.base = '\uE3C0\uE3C1\uE3C2\uE3C3\uE3C6\uE3C7';
+				this.mapping = [
+					// 1st Octave (B3-B4)
+					'\uE3CD\uE3CE\uE3CF\uE3D1\uE3D2\uE3D3\uE3D5\uE3D6\uE3D7','\uE3CD\uE3CE\uE3CF\uE3D1\uE3D2\uE3D3\uE3D5\uE3D6\uE3D7','\uE3CD\uE3CE\uE3CF\uE3D1\uE3D2\uE3D3\uE3D5\uE3D6\uE3E7','\uE3CD\uE3CE\uE3CF\uE3D1\uE3D2\uE3D3\uE3D5\uE3D6','\uE3CD\uE3CE\uE3CF\uE3D1\uE3D2\uE3D3\uE3D5\uE3D7','\uE3CD\uE3CE\uE3CF\uE3D1\uE3D2\uE3D3\uE3D5','\uE3CD\uE3CE\uE3CF\uE3D1\uE3D2\uE3D3','\uE3CD\uE3CE\uE3CF\uE3D1\uE3D2\uE3D5\uE3D6\uE3D7','\uE3CD\uE3CE\uE3CF\uE3D1\uE3D2\uE427','\uE3CD\uE3CE\uE3CF\uE3D1\uE3D3\uE3D5\uE3D6','\uE3CD\uE3CE\uE3CF\uE3D1\uE427','\uE3CD\uE3CE\uE3CF\uE427','\uE3CD\uE3CE\uE3D1\uE3D2\uE3D3\uE427',
+					// 2nd Octave (C5-C6)
+					'\uE3CD\uE3CE\uE427','\uE3CD\uE3CF\uE3D1\uE3D2\uE427','\uE3CD\uE427','\uE3CE\uE3CF\uE3D1\uE3D2\uE427','\uE3CE\uE427','\uE427','\uE427','\uE43F\uE3CE\uE3CF\uE3D1\uE3D2\uE3D3\uE3D5\uE3D6\uE3D7','\uE43F\uE3CD\uE3CE\uE3CF\uE3D1\uE3D2\uE3D3\uE3D5\uE3D6\uE3E7','\uE43F\uE3CD\uE3CE\uE3CF\uE3D1\uE3D2\uE3D3\uE3D5\uE3D6','\uE43F\uE3CD\uE3CE\uE3CF\uE3D1\uE3D2\uE3D3\uE3D5\uE3D7','\uE43F\uE3CD\uE3CE\uE3CF\uE3D1\uE3D2\uE3D3','\uE43F\uE3CD\uE3CE\uE3CF\uE3D1\uE3D2\uE427',
+				];
+				this.allKeysPressed = '\uE3C0\uE3C1\uE3C2\uE3C3\uE3C6\uE3C7\uE43F\uE3CD\uE3CE\uE3CF\uE3D1\uE3D2\uE3D3\uE3D5\uE3D6\uE3D7';
+				if (instrument === 'wind.reed.xaphoon.g') {
+					this.transpose = 5;
+				} else if (instrument === 'wind.reed.xaphoon.bflat') {
+					this.transpose = 2;
+				} else if (instrument === 'wind.reed.xaphoon.d') {
+					this.transpose = -2;
+				}
 			} else if (instrument === 'brass.trumpet') {	
 				// this.instrument = 'trumpet'; // Trumpet
 				this.range = {