Skip to content

Add brushes and arpeggio to alphaTex #799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Danielku15 merged 4 commits into from
Oct 2, 2022
Merged

Add brushes and arpeggio to alphaTex #799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ecc1005
Add brushes and arpeggio to alphaTex
jonaro00 Mar 17, 2022
d86cd6d
Consistency and comments
jonaro00 Apr 19, 2022
f4d5f59
Tweak brush duration
jonaro00 Oct 2, 2022
5becd29
Add brush/arpeggio tests
jonaro00 Oct 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions src/importer/AlphaTexImporter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { Automation, AutomationType } from '@src/model/Automation';
import { Bar } from '@src/model/Bar';
import { Beat } from '@src/model/Beat';
import { BendPoint } from '@src/model/BendPoint';
import { BrushType } from '@src/model/BrushType';
import { Chord } from '@src/model/Chord';
import { Clef } from '@src/model/Clef';
import { CrescendoType } from '@src/model/CrescendoType';
Expand Down Expand Up @@ -1313,6 +1314,37 @@ export class AlphaTexImporter extends ScoreImporter {
this._sy = this.newSy();
return true;
}
if (syData === 'bu' || syData === 'bd' || syData === 'au' || syData === 'ad') {
switch (syData) {
case 'bu':
beat.brushType = BrushType.BrushUp;
break;
case 'bd':
beat.brushType = BrushType.BrushDown;
break;
case 'au':
beat.brushType = BrushType.ArpeggioUp;
break;
case 'ad':
beat.brushType = BrushType.ArpeggioDown;
break;
}
this._sy = this.newSy();
if (this._sy === AlphaTexSymbols.Number) {
// explicit duration
beat.brushDuration = (this._syData as number);
this._sy = this.newSy();
return true;
}
// default to calcuated duration
beat.updateDurations();
if (syData === 'bu' || syData === 'bd') {
beat.brushDuration = beat.playbackDuration / 4 / beat.notes.length;
} else if (syData === 'au' || syData === 'ad') {
beat.brushDuration = beat.playbackDuration / beat.notes.length;
}
return true;
}
if (syData === 'ch') {
this._sy = this.newSy();
let chordName: string = (this._syData as string);
Expand Down
56 changes: 55 additions & 1 deletion test/importer/AlphaTexImporter.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { StaveProfile } from '@src/StaveProfile';
import { AlphaTexImporter } from '@src/importer/AlphaTexImporter';
import { UnsupportedFormatError } from '@src/importer/UnsupportedFormatError';
import { Beat } from '@src/model/Beat';
import { BrushType } from '@src/model/BrushType';
import { Clef } from '@src/model/Clef';
import { CrescendoType } from '@src/model/CrescendoType';
import { Duration } from '@src/model/Duration';
Expand Down Expand Up @@ -153,6 +154,59 @@ describe('AlphaTexImporterTest', () => {
expect(score.tracks[0].staves[0].bars[0].voices[0].beats[0].tremoloSpeed).toEqual(Duration.Sixteenth);
});

it('brushes-arpeggio', () => {
let tex: string = `
(1.1 2.2 3.3 4.4).4{bd 60} (1.1 2.2 3.3 4.4).8{bu 60} (1.1 2.2 3.3 4.4).2{ad 60} (1.1 2.2 3.3 4.4).16{au 60} r |
(1.1 2.2 3.3 4.4).4{bd 120} (1.1 2.2 3.3 4.4).8{bu 120} (1.1 2.2 3.3 4.4).2{ad 120} (1.1 2.2 3.3 4.4).16{au 120} r |
(1.1 2.2 3.3 4.4).4{bd} (1.1 2.2 3.3 4.4).8{bu} (1.1 2.2 3.3 4.4).2{ad} (1.1 2.2 3.3 4.4).16{au} r
`;
let score: Score = parseTex(tex);
expect(score.tracks.length).toEqual(1);
expect(score.masterBars.length).toEqual(3);
expect(score.tracks[0].staves[0].bars[0].voices[0].beats.length).toEqual(5);
expect(score.tracks[0].staves[0].bars[0].voices[0].beats[0].brushType).toEqual(BrushType.BrushDown);
expect(score.tracks[0].staves[0].bars[0].voices[0].beats[0].playbackDuration).toEqual(960);
expect(score.tracks[0].staves[0].bars[0].voices[0].beats[0].brushDuration).toEqual(60);
expect(score.tracks[0].staves[0].bars[0].voices[0].beats[1].brushType).toEqual(BrushType.BrushUp);
expect(score.tracks[0].staves[0].bars[0].voices[0].beats[1].playbackDuration).toEqual(480);
expect(score.tracks[0].staves[0].bars[0].voices[0].beats[1].brushDuration).toEqual(60);
expect(score.tracks[0].staves[0].bars[0].voices[0].beats[2].brushType).toEqual(BrushType.ArpeggioDown);
expect(score.tracks[0].staves[0].bars[0].voices[0].beats[2].playbackDuration).toEqual(1920);
expect(score.tracks[0].staves[0].bars[0].voices[0].beats[2].brushDuration).toEqual(60);
expect(score.tracks[0].staves[0].bars[0].voices[0].beats[3].brushType).toEqual(BrushType.ArpeggioUp);
expect(score.tracks[0].staves[0].bars[0].voices[0].beats[3].playbackDuration).toEqual(240);
expect(score.tracks[0].staves[0].bars[0].voices[0].beats[3].brushDuration).toEqual(60);
expect(score.tracks[0].staves[0].bars[0].voices[0].beats[4].isRest).toEqual(true);
expect(score.tracks[0].staves[0].bars[0].voices[0].beats[4].brushType).toEqual(BrushType.None);
expect(score.tracks[0].staves[0].bars[0].voices[0].beats[4].playbackDuration).toEqual(240);
expect(score.tracks[0].staves[0].bars[0].voices[0].beats[4].brushDuration).toEqual(0);
expect(score.tracks[0].staves[0].bars[1].voices[0].beats.length).toEqual(5);
expect(score.tracks[0].staves[0].bars[1].voices[0].beats[0].brushType).toEqual(BrushType.BrushDown);
expect(score.tracks[0].staves[0].bars[1].voices[0].beats[0].brushDuration).toEqual(120);
expect(score.tracks[0].staves[0].bars[1].voices[0].beats[1].brushType).toEqual(BrushType.BrushUp);
expect(score.tracks[0].staves[0].bars[1].voices[0].beats[1].brushDuration).toEqual(120);
expect(score.tracks[0].staves[0].bars[1].voices[0].beats[2].brushType).toEqual(BrushType.ArpeggioDown);
expect(score.tracks[0].staves[0].bars[1].voices[0].beats[2].brushDuration).toEqual(120);
expect(score.tracks[0].staves[0].bars[1].voices[0].beats[3].brushType).toEqual(BrushType.ArpeggioUp);
expect(score.tracks[0].staves[0].bars[1].voices[0].beats[3].brushDuration).toEqual(120);
expect(score.tracks[0].staves[0].bars[1].voices[0].beats[4].isRest).toEqual(true);
expect(score.tracks[0].staves[0].bars[1].voices[0].beats[4].brushType).toEqual(BrushType.None);
expect(score.tracks[0].staves[0].bars[1].voices[0].beats[4].brushDuration).toEqual(0);
expect(score.tracks[0].staves[0].bars[2].voices[0].beats.length).toEqual(5);
expect(score.tracks[0].staves[0].bars[2].voices[0].beats[0].brushType).toEqual(BrushType.BrushDown);
expect(score.tracks[0].staves[0].bars[2].voices[0].beats[0].brushDuration).toEqual(60);
expect(score.tracks[0].staves[0].bars[2].voices[0].beats[1].brushType).toEqual(BrushType.BrushUp);
expect(score.tracks[0].staves[0].bars[2].voices[0].beats[1].brushDuration).toEqual(30);
expect(score.tracks[0].staves[0].bars[2].voices[0].beats[2].brushType).toEqual(BrushType.ArpeggioDown);
expect(score.tracks[0].staves[0].bars[2].voices[0].beats[2].brushDuration).toEqual(480);
expect(score.tracks[0].staves[0].bars[2].voices[0].beats[3].brushType).toEqual(BrushType.ArpeggioUp);
expect(score.tracks[0].staves[0].bars[2].voices[0].beats[3].brushDuration).toEqual(60);
expect(score.tracks[0].staves[0].bars[2].voices[0].beats[4].isRest).toEqual(true);
expect(score.tracks[0].staves[0].bars[2].voices[0].beats[4].brushType).toEqual(BrushType.None);
expect(score.tracks[0].staves[0].bars[2].voices[0].beats[4].brushDuration).toEqual(0);

});

it('hamonics-issue79', () => {
let tex: string = ':8 3.3{nh} 3.3{ah} 3.3{th} 3.3{ph} 3.3{sh}';
let score: Score = parseTex(tex);
Expand Down Expand Up @@ -904,7 +958,7 @@ describe('AlphaTexImporterTest', () => {
expect(score.tracks[0].name).toEqual("🎸");
expect(score.tracks[0].staves[0].bars[0].voices[0].beats[2].lyrics![0]).toEqual("🤘");
});

it('does-not-hang-on-backslash', () => {
try {
parseTex('\\title Test . 3.3 \\')
Expand Down