docs(releases): finish the 1.9.0 notes, load real MusicXML and Capella demos, fix Capella import (#3002)

Author: Danielku15

packages/alphatab/src/importer/CapellaParser.ts

@@ -550,7 +550,7 @@ export class CapellaParser {
     }
 
     private _voiceStates: Map<string, CapellaVoiceState> = new Map();
-    private _currentVoiceState!: CapellaVoiceState;
+    private _currentVoiceState: CapellaVoiceState = new CapellaVoiceState();
     private _currentBar!: Bar;
     private _currentVoice!: Voice;
 
@@ -572,7 +572,7 @@ export class CapellaParser {
         element: XmlNode
     ) {
         const voiceStateKey = `${staffId}_${voiceIndex}`;
-        if (this._currentVoiceState && !this._currentVoiceState.currentBarComplete) {
+        if (!this._currentVoiceState.currentBarComplete) {
             this._currentBar.masterBar.isAnacrusis = true;
         }
 
@@ -704,12 +704,14 @@ export class CapellaParser {
                             chordBeat.preferredBeamDirection = this._currentVoiceState.voiceStemDir;
                         }
                         this._parseDuration(chordBeat, c.findChildElement('duration')!);
-                        chordBeat.updateDurations();
-                        this._currentVoiceState.currentPosition += chordBeat.playbackDuration;
                         this._currentVoice.addBeat(chordBeat);
 
                         this._parseChord(chordBeat, c);
 
+                        // the duration depends on the voice and the notes (full-bar rest detection)
+                        chordBeat.updateDurations();
+                        this._currentVoiceState.currentPosition += chordBeat.playbackDuration;
+
                         if (this._currentVoiceState.currentPosition >= this._currentVoiceState.currentBarDuration) {
                             this._currentVoiceState.currentBarComplete = true;
                         }
@@ -718,9 +720,9 @@ export class CapellaParser {
                         const restBeat = this._parseRestDurations(c.findChildElement('duration')!);
                         if (restBeat) {
                             this._initFromPreviousBeat(restBeat, this._currentVoice);
+                            this._currentVoice.addBeat(restBeat);
                             restBeat.updateDurations();
                             this._currentVoiceState.currentPosition += restBeat.playbackDuration;
-                            this._currentVoice.addBeat(restBeat);
 
                             if (this._currentVoiceState.currentPosition >= this._currentVoiceState.currentBarDuration) {
                                 this._currentVoiceState.currentBarComplete = true;

packages/alphatab/test-data/capella/twinkle-mozart.capx

@@ -0,0 +1,90 @@
+import { ScoreLoader } from '@coderline/alphatab/importer/ScoreLoader';
+import { IOHelper } from '@coderline/alphatab/io/IOHelper';
+import { Clef } from '@coderline/alphatab/model/Clef';
+import { Duration } from '@coderline/alphatab/model/Duration';
+import type { Score } from '@coderline/alphatab/model/Score';
+import type { Staff } from '@coderline/alphatab/model/Staff';
+import { Settings } from '@coderline/alphatab/Settings';
+import { TestPlatform } from 'test/TestPlatform';
+import { describe, expect, it } from 'vitest';
+
+describe('CapellaImporterTests', () => {
+    function pitches(staff: Staff): number[][] {
+        return staff.bars.map(b => b.voices[0].beats.map(beat => (beat.isRest ? -1 : beat.notes[0].realValue)));
+    }
+
+    function capXml(noteObjects: string): Score {
+        const xml = `<?xml version="1.0" encoding="UTF-8"?>
+<score xmlns="http://www.capella.de/CapXML/3.0">
+  <info/>
+  <layout>
+    <staves>
+      <staffLayout description="Voice"><notation defaultClef="treble"/><sound instr="0" volume="100"/></staffLayout>
+    </staves>
+  </layout>
+  <systems>
+    <system>
+      <staves>
+        <staff layout="Voice" defaultTime="4/4">
+          <voices><voice><noteObjects>${noteObjects}</noteObjects></voice></voices>
+        </staff>
+      </staves>
+    </system>
+  </systems>
+</score>`;
+        return ScoreLoader.loadScoreFromBytes(IOHelper.stringToBytes(xml), new Settings());
+    }
+
+    it('grand-staff', async () => {
+        const data = await TestPlatform.loadFile('test-data/capella/twinkle-mozart.capx');
+        const score = ScoreLoader.loadScoreFromBytes(data, new Settings());
+
+        expect(score.title).toBe('Twinkle, Twinkle Little Star');
+        expect(score.artist).toBe('W.A. Mozart (1756-1791)');
+        expect(score.tracks[0].name).toBe('Piano');
+        expect(score.masterBars.length).toBe(4);
+        expect(score.tempo).toBe(100);
+        expect(score.tracks.length).toBe(1);
+
+        expect(score.tracks[0].staves.length).toBe(2);
+        const rightHand = score.tracks[0].staves[0];
+        const leftHand = score.tracks[0].staves[1];
+        expect(rightHand.bars[0].clef).toBe(Clef.G2);
+        expect(leftHand.bars[0].clef).toBe(Clef.F4);
+        expect(pitches(rightHand)).toEqual([
+            [60, 60, 67, 67],
+            [69, 69, 67],
+            [65, 65, 64, 64],
+            [62, 62, 60]
+        ]);
+        expect(pitches(leftHand)).toEqual([
+            [48, 52, 55, 52],
+            [53, 57, 55, 52],
+            [50, 53, 48, 52],
+            [43, 47, 48]
+        ]);
+        expect(rightHand.bars[1].voices[0].beats[2].duration).toBe(Duration.Half);
+        expect(rightHand.bars[0].voices[0].beats.map(b => b.lyrics![0])).toEqual(['Twin-', 'kle,', 'twin-', 'kle,']);
+    });
+
+    it('whole-notes-and-rests', () => {
+        const score = capXml(`
+            <chord><duration base="1/1"/><heads><head pitch="C5"/></heads></chord>
+            <barline type="single"/>
+            <rest><duration base="1/1"/></rest>
+            <barline type="single"/>
+            <rest><duration base="1"/></rest>
+            <barline type="single"/>
+            <chord><duration base="1/2"/><heads><head pitch="E5"/></heads></chord>
+            <rest><duration base="1/2"/></rest>
+            <barline type="end"/>`);
+
+        const staff = score.tracks[0].staves[0];
+        expect(score.masterBars.length).toBe(4);
+        expect(pitches(staff)).toEqual([[60], [-1], [-1], [64, -1]]);
+        expect(staff.bars[1].voices[0].beats[0].isFullBarRest).toBe(true);
+        expect(staff.bars[2].voices[0].beats[0].isFullBarRest).toBe(true);
+        expect(staff.bars[0].voices[0].beats[0].isFullBarRest).toBe(false);
+        expect(score.masterBars.map(m => m.isAnacrusis)).toEqual([false, false, false, false]);
+    });
+});

packages/alphatab/test/importer/CapellaImporter.test.ts

@@ -14,11 +14,9 @@ import { AlphaTab } from '@site/src/components/AlphaTab';
 
 Scores authored in Capella arrive as `.capx` archives — Capella's XML container format. alphaTab imports them so a Capella export opens in the same viewer as your Guitar Pro and MusicXML files, without a separate conversion step.
 
-:::info
-The Capella importer routes through the same content-sniffing load path as every other format. The preview below loads a curated Guitar Pro fixture for parity with sibling pages; point `core.file` at a `.capx` file in your own project to exercise the Capella importer end-to-end.
-:::
+The preview below loads a `.capx` file with the theme of Mozart's variations K. 265 on a piano grand staff, with lyrics under the right hand:
 
-<AlphaTab tex={false} file="/files/features/Chords.gp5" />
+<AlphaTab tex={false} file="/files/twinkle-mozart.capx" />
 
 ## Scope of the Capella importer