Skip to content

feat: use diatonic spelling instead of chromatic spelling #2534

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 2 commits into from
Feb 1, 2026
Merged

feat: use diatonic spelling instead of chromatic spelling #2534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a49bdc2
feat: use diatonic spelling instead of chromatic spelling
Danielku15 Feb 1, 2026
e7d0027
test: add test cases for new calculations
Danielku15 Feb 1, 2026
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
3 changes: 3 additions & 0 deletions packages/alphatab/src/importer/GpifParser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2581,6 +2581,9 @@ export class GpifParser {
switch (c.localName) {
case 'Accidental':
switch (c.innerText) {
case '':
note.accidentalMode = NoteAccidentalMode.ForceNatural;
break;
case 'x':
note.accidentalMode = NoteAccidentalMode.ForceDoubleSharp;
break;
Expand Down
3 changes: 2 additions & 1 deletion packages/alphatab/src/importer/MusicXmlImporter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,8 @@ class TrackInfo {
// no display pitch defined?
musicXmlStaffSteps = 4; // middle of bar
} else {
musicXmlStaffSteps = AccidentalHelper.calculateNoteSteps(bar.keySignature, bar.clef, noteValue);
const spelling = ModelUtils.resolveSpelling(bar.keySignature, noteValue, NoteAccidentalMode.Default);
musicXmlStaffSteps = AccidentalHelper.calculateNoteSteps(bar.clef, spelling);
}

// to translate this into the "staffLine" semantics we need to subtract additionally the steps "missing" from the absent lines
Expand Down
9 changes: 8 additions & 1 deletion packages/alphatab/src/importer/alphaTex/AlphaTex1LanguageHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ import { Fingers } from '@coderline/alphatab/model/Fingers';
import { GolpeType } from '@coderline/alphatab/model/GolpeType';
import { GraceType } from '@coderline/alphatab/model/GraceType';
import { HarmonicType } from '@coderline/alphatab/model/HarmonicType';
import { KeySignature } from '@coderline/alphatab/model/KeySignature';
import { KeySignatureType } from '@coderline/alphatab/model/KeySignatureType';
import { Lyrics } from '@coderline/alphatab/model/Lyrics';
import { BeamingRules, type MasterBar } from '@coderline/alphatab/model/MasterBar';
Expand Down Expand Up @@ -3318,7 +3319,13 @@ export class AlphaTex1LanguageHandler implements IAlphaTexLanguageImportHandler
Atnf.prop(properties, 'slur', Atnf.identValue(slurId));
}

if (note.accidentalMode !== NoteAccidentalMode.Default) {
// NOTE: it would be better to check via accidentalhelper what accidentals we really need to force
const skipAccidental =
note.accidentalMode === NoteAccidentalMode.Default ||
(note.beat.voice.bar.keySignature === KeySignature.C &&
note.accidentalMode === NoteAccidentalMode.ForceNatural);

if (!skipAccidental) {
Atnf.prop(
properties,
'acc',
Expand Down
Loading
Loading