Feature/issue 2630v2

packages/alphatab/src/importer/MusicXmlImporter.ts

@@ -6,7 +6,7 @@ import { MidiUtils } from '@coderline/alphatab/midi/MidiUtils';
 import { AccentuationType } from '@coderline/alphatab/model/AccentuationType';
 import { Automation, AutomationType } from '@coderline/alphatab/model/Automation';
 import { Bar, BarLineStyle, SustainPedalMarkerType, SustainPedalMarker } from '@coderline/alphatab/model/Bar';
-import { Beat, BeatBeamingMode } from '@coderline/alphatab/model/Beat';
+import { Beat, BeatBeamingMode, TupletShowNumber } from '@coderline/alphatab/model/Beat';
 import { BendPoint } from '@coderline/alphatab/model/BendPoint';
 import { BrushType } from '@coderline/alphatab/model/BrushType';
 import { Chord } from '@coderline/alphatab/model/Chord';
@@ -2429,6 +2429,9 @@ export class MusicXmlImporter extends ScoreImporter {
         let tupletNumerator = -1;
         let tupletDenominator = -1;
 
+        let tupletShowNumber: TupletShowNumber = TupletShowNumber.Actual;
+        let tupletShowBracket: boolean = true;
+
         let preferredBeamDirection: BeamDirection | null = null;
 
         // Note level
@@ -2599,6 +2602,8 @@ export class MusicXmlImporter extends ScoreImporter {
             } else {
                 newBeat.tupletNumerator = tupletNumerator;
                 newBeat.tupletDenominator = tupletDenominator;
+                newBeat.showTupletNumber = tupletShowNumber;
+                newBeat.showTupletBracket = tupletShowBracket;
                 newBeat.dots = dots;
                 newBeat.preferredBeamDirection = preferredBeamDirection;
                 this._applyBeatDurationFromTicks(newBeat, durationInTicks, beatDuration, true);
@@ -3278,7 +3283,9 @@ export class MusicXmlImporter extends ScoreImporter {
                         this._parseSlur(c, note);
                     }
                     break;
-                // case 'tuplet': Handled via time-modification
+                case 'tuplet': //Handled via time-modification
+                    this._parseTupletVisibility(c, beat);
+                    break;
                 case 'glissando':
                     if (note) {
                         this._parseGlissando(c, note);
@@ -3322,6 +3329,25 @@ export class MusicXmlImporter extends ScoreImporter {
         }
     }
 
+    private _parseTupletVisibility(element: XmlNode, beat: Beat) {
+        if (element.getAttribute('type') === 'start') {
+
+            switch (element.getAttribute('show-number', 'actual')) {
+                case 'none': 
+                    beat.showTupletNumber = TupletShowNumber.None;
+                    break;
+                case 'both': 
+                    beat.showTupletNumber = TupletShowNumber.Both;
+                    break;
+                default:
+                    beat.showTupletNumber = TupletShowNumber.Actual;
+                    break;
+            }
+
+            beat.showTupletBracket = element.getAttribute('bracket', 'yes') !== 'no';
+        }
+    }
+
     private _getStaffContext(staff: Staff) {
         if (!this._staffToContext.has(staff)) {
             const context = new StaffContext();

packages/alphatab/src/model/Beat.ts

@@ -179,6 +179,28 @@ export enum BeatSubElement {
     NumberedTuplet = 22
 }
 
+/**
+ * Lists the different modes for rendering a tuplet number.
+ * @public
+ */
+export enum TupletShowNumber {
+    /**
+     * Show the actual note count only.
+     * The renderer may still decide whether the denominator is implied by the meter.
+     */
+    Actual = 0,
+
+    /**
+     * Show both numerator and denominator.
+     */
+    Both = 1,
+
+    /**
+     * Do not show any tuplet number.
+     */
+    None = 2
+}
+
 /**
  * Defines the custom styles for beats.
  * @json
@@ -443,6 +465,16 @@ export class Beat {
      */
     public tupletNumerator: number = -1;
 
+    /**
+     * Gets or sets the tuplet number visibility.
+     */
+    public showTupletNumber: TupletShowNumber = TupletShowNumber.Actual;
+
+    /**
+     * Gets or sets the tuplet bracket visibility.
+     */
+    public showTupletBracket: boolean = true;
+
     public get hasTuplet(): boolean {
         return (
             !(this.tupletDenominator === -1 && this.tupletNumerator === -1) &&