fix(alphatex): Wrong instrument articulations for export

Author: Danielku15

src/importer/AlphaTexImporter.ts

@@ -187,6 +187,8 @@ export class AlphaTexImporter extends ScoreImporter {
 
     private _slurs: Map<string, Note> = new Map<string, Note>();
 
+    private _articulationValueToIndex = new Map<number, number>();
+
     private _accidentalMode: AlphaTexAccidentalMode = AlphaTexAccidentalMode.Explicit;
 
     public logErrors: boolean = false;
@@ -380,6 +382,7 @@ export class AlphaTexImporter extends ScoreImporter {
         const staff = this._currentTrack.staves[0];
         staff.displayTranspositionPitch = 0;
         staff.stringTuning.tunings = Tuning.getDefaultTuningFor(6)!.tunings;
+        this._articulationValueToIndex.clear();
 
         this.beginStaff(staff);
 
@@ -2579,7 +2582,22 @@ export class AlphaTexImporter extends ScoreImporter {
                 note.fret = fret;
             }
         } else if (this._currentStaff.isPercussion) {
-            note.percussionArticulation = fret;
+            const articulationValue = fret;
+            let articulationIndex: number = 0;
+            if (this._articulationValueToIndex.has(articulationValue)) {
+                articulationIndex = this._articulationValueToIndex.get(articulationValue)!;
+            } else {
+                articulationIndex = this._currentTrack.percussionArticulations.length;
+                const articulation = PercussionMapper.getArticulationByValue(articulationValue);
+                if (articulation === null) {
+                    this.errorMessage(`Unknown articulation value ${articulationValue}`);
+                }
+
+                this._currentTrack.percussionArticulations.push(articulation!);
+                this._articulationValueToIndex.set(articulationValue, articulationIndex)!;
+            }
+
+            note.percussionArticulation = articulationIndex;
         } else {
             note.octave = octave;
             note.tone = tone;

test/exporter/Gp7Exporter.test.ts

@@ -8,6 +8,7 @@ import { JsonConverter } from '@src/model/JsonConverter';
 import { ScoreLoader } from '@src/importer/ScoreLoader';
 import { ComparisonHelpers } from '@test/model/ComparisonHelpers';
 import { AlphaTexImporter } from '@src/importer/AlphaTexImporter';
+import { expect } from 'chai';
 
 describe('Gp7ExporterTest', () => {
     async function loadScore(name: string): Promise<Score | null> {
@@ -137,6 +138,34 @@ describe('Gp7ExporterTest', () => {
         ComparisonHelpers.expectJsonEqual(expectedJson, actualJson, '<alphatex>', ['accidentalmode']);
     });
 
+    it('alphatex-drumps-to-gp7', () => {
+        const tex = `\\track "Drums"
+        \\instrument percussion
+        \\clef neutral 
+        \\articulation Kick 36
+        \\articulation Unused 46
+        Kick.4 42.4 Kick.4 42.4
+        `;
+
+        const importer = new AlphaTexImporter();
+        importer.initFromString(tex, new Settings());
+        const expected = importer.readScore();
+        const exported = exportGp7(expected);
+
+        const actual = prepareImporterWithBytes(exported).readScore();
+
+        const expectedJson = JsonConverter.scoreToJsObject(expected);
+        const actualJson = JsonConverter.scoreToJsObject(actual);
+
+        ComparisonHelpers.expectJsonEqual(expectedJson, actualJson, '<alphatex>', ['accidentalmode']);
+
+        expect(actual.tracks[0].percussionArticulations).to.have.length(2);
+        expect(actual.tracks[0].staves[0].bars[0].voices[0].beats[0].notes[0].percussionArticulation).to.equal(0)
+        expect(actual.tracks[0].staves[0].bars[0].voices[0].beats[1].notes[0].percussionArticulation).to.equal(1);
+        expect(actual.tracks[0].staves[0].bars[0].voices[0].beats[2].notes[0].percussionArticulation).to.equal(0)
+        expect(actual.tracks[0].staves[0].bars[0].voices[0].beats[3].notes[0].percussionArticulation).to.equal(1);
+    });
+
     it('gp7-lyrics-null', async () => {
         await testRoundTripEqual('guitarpro7/lyrics-null.gp', null);
     });