Skip to content

Improve tie handling for mxml #1219

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 1 commit into from
Jul 6, 2023
Merged

Improve tie handling for mxml #1219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions src/importer/MusicXmlImporter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,8 +810,15 @@ export class MusicXmlImporter extends ScoreImporter {
this._tieStarts.push(note);
}
} else if (element.getAttribute('type') === 'stop' && this._tieStarts.length > 0 && !note.isTieDestination) {
note.isTieDestination = true;
note.tieOrigin = this._tieStarts[0];
const tieOrigin = this._tieStarts[0];
// no cross track/staff or voice ties supported for now
if(tieOrigin.beat.voice.index === note.beat.voice.index &&
tieOrigin.beat.voice.bar.staff.index === note.beat.voice.bar.staff.index &&
tieOrigin.beat.voice.bar.staff.track.index === note.beat.voice.bar.staff.track.index) {
note.isTieDestination = true;
note.tieOrigin = this._tieStarts[0];
}

this._tieStarts.splice(0, 1);
this._tieStartIds.delete(note.id);
}
Expand Down
5 changes: 3 additions & 2 deletions src/model/Note.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -999,11 +999,12 @@ export class Note {

this._noteIdBag = null; // not needed anymore
} else {
if (!this.isTieDestination && this.tieOrigin == null) {
// no tie destination at all?
if (!this.isTieDestination && this.tieOrigin === null) {
return;
}

let tieOrigin = Note.findTieOrigin(this);
let tieOrigin = this.tieOrigin ?? Note.findTieOrigin(this);
if (!tieOrigin) {
this.isTieDestination = false;
} else {
Expand Down
158 changes: 158 additions & 0 deletions test-data/musicxml3/tie-destination.musicxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
<?xml version="1.0" encoding='UTF-8' standalone='no' ?>
<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 3.0 Partwise//EN" "http://www.musicxml.org/dtds/partwise.dtd">
<score-partwise version="3.0">
<part-list>
<score-part id="P1">
<part-name>Acoustic Guitar</part-name>
<part-name-display>
<display-text>Acoustic Guitar</display-text>
</part-name-display>
<part-abbreviation>A. Gtr.</part-abbreviation>
<part-abbreviation-display>
<display-text>A. Gtr.</display-text>
</part-abbreviation-display>
<score-instrument id="P2-I1">
<instrument-name>Acoustic Guitar</instrument-name>
<instrument-sound>pluck.guitar.steel-string</instrument-sound>
<solo />
<virtual-instrument>
<virtual-library>General MIDI</virtual-library>
<virtual-name>Acoustic Guitar (steel)</virtual-name>
</virtual-instrument>
</score-instrument>
</score-part>
</part-list>
<part id="P1">
<measure number="1" width="227">
<attributes>
<divisions>256</divisions>
<key color="#000000">
<fifths>0</fifths>
<mode>major</mode>
</key>
<time color="#000000">
<beats>4</beats>
<beat-type>4</beat-type>
</time>
<staves>1</staves>
<clef number="1" color="#000000">
<sign>TAB</sign>
<line>2</line>
</clef>
<staff-details number="1" print-object="yes">
<staff-lines>6</staff-lines>
<staff-tuning line="1">
<tuning-step>E</tuning-step>
<tuning-octave>2</tuning-octave>
</staff-tuning>
<staff-tuning line="2">
<tuning-step>A</tuning-step>
<tuning-octave>2</tuning-octave>
</staff-tuning>
<staff-tuning line="3">
<tuning-step>D</tuning-step>
<tuning-octave>3</tuning-octave>
</staff-tuning>
<staff-tuning line="4">
<tuning-step>G</tuning-step>
<tuning-octave>3</tuning-octave>
</staff-tuning>
<staff-tuning line="5">
<tuning-step>B</tuning-step>
<tuning-octave>3</tuning-octave>
</staff-tuning>
<staff-tuning line="6">
<tuning-step>E</tuning-step>
<tuning-octave>4</tuning-octave>
</staff-tuning>
</staff-details>
</attributes>
<harmony color="#000000" default-y="45">
<root>
<root-step>F</root-step>
<root-alter>1</root-alter>
</root>
<kind>minor</kind>
<staff>1</staff>
</harmony>
<note color="#000000" default-x="60" default-y="43">
<pitch>
<step>C</step>
<alter>1</alter>
<octave>5</octave>
</pitch>
<duration>384</duration>
<instrument id="P2-I1" />
<voice>1</voice>
<type>quarter</type>
<dot />
<stem>up</stem>
<staff>1</staff>
<notations>
<technical>
<fret>9</fret>
<string>1</string>
</technical>
</notations>
</note>
<note color="#000000" default-x="115" default-y="44">
<pitch>
<step>A</step>
<octave>4</octave>
</pitch>
<duration>128</duration>
<tie type="start" />
<instrument id="P2-I1" />
<voice>1</voice>
<type>eighth</type>
<stem>up</stem>
<staff>1</staff>
<notations>
<tied type="start" orientation="over" />
<technical>
<fret>5</fret>
<string>1</string>
</technical>
</notations>
</note>
<note color="#000000" default-x="146" default-y="43">
<pitch>
<step>A</step>
<octave>4</octave>
</pitch>
<duration>256</duration>
<tie type="stop" />
<instrument id="P2-I1" />
<voice>1</voice>
<type>quarter</type>
<stem>up</stem>
<staff>1</staff>
<notations>
<tied type="stop" orientation="over" />
<technical>
<fret>5</fret>
<string>1</string>
</technical>
</notations>
</note>
<note color="#000000" default-x="187" default-y="43">
<pitch>
<step>G</step>
<octave>4</octave>
</pitch>
<duration>256</duration>
<instrument id="P2-I1" />
<voice>1</voice>
<type>quarter</type>
<stem>up</stem>
<staff>1</staff>
<notations>
<technical>
<fret>3</fret>
<string>1</string>
</technical>
</notations>
</note>
</measure>
</part>
</score-partwise>
20 changes: 20 additions & 0 deletions test/importer/MusicXmlImporter.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { MusicXmlImporterTestHelper } from '@test/importer/MusicXmlImporterTestHelper';
import { Score } from '@src/model/Score';
import { JsonConverter } from '@src/model';

describe('MusicXmlImporterTests', () => {
it('track-volume', async () => {
Expand Down Expand Up @@ -47,4 +48,23 @@ describe('MusicXmlImporterTests', () => {
expect(score.masterBars[1].tempoAutomation).toBeTruthy();
expect(score.masterBars[1].tempoAutomation?.value).toBe(60);
});
it('tie-destination', async () => {
let score: Score = await MusicXmlImporterTestHelper.testReferenceFile(
'test-data/musicxml3/tie-destination.musicxml'
);

expect(score.tracks[0].staves[0].bars[0].voices[0].beats[1].notes[0].isTieOrigin).toBeTrue();
expect(score.tracks[0].staves[0].bars[0].voices[0].beats[1].notes[0].tieDestination).toBeTruthy();

expect(score.tracks[0].staves[0].bars[0].voices[0].beats[2].notes[0].isTieDestination).toBeTrue();
expect(score.tracks[0].staves[0].bars[0].voices[0].beats[2].notes[0].tieOrigin).toBeTruthy();

score = JsonConverter.jsObjectToScore(JsonConverter.scoreToJsObject(score));

expect(score.tracks[0].staves[0].bars[0].voices[0].beats[1].notes[0].isTieOrigin).toBeTrue();
expect(score.tracks[0].staves[0].bars[0].voices[0].beats[1].notes[0].tieDestination).toBeTruthy();

expect(score.tracks[0].staves[0].bars[0].voices[0].beats[2].notes[0].isTieDestination).toBeTrue();
expect(score.tracks[0].staves[0].bars[0].voices[0].beats[2].notes[0].tieOrigin).toBeTruthy();
});
});