Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ export class RenderStylesheetSerializer {
m.set(k.toString(), v);
}
}
o.set("globaldisplaychorddiagramsinscore", obj.globalDisplayChordDiagramsInScore);
o.set("singletracktracknamepolicy", obj.singleTrackTrackNamePolicy as number);
o.set("multitracktracknamepolicy", obj.multiTrackTrackNamePolicy as number);
o.set("firstsystemtracknamemode", obj.firstSystemTrackNameMode as number);
Expand Down Expand Up @@ -89,6 +90,9 @@ export class RenderStylesheetSerializer {
obj.perTrackChordDiagramsOnTop!.set(Number.parseInt(k), v as boolean);
});
return true;
case "globaldisplaychorddiagramsinscore":
obj.globalDisplayChordDiagramsInScore = v! as boolean;
return true;
case "singletracktracknamepolicy":
obj.singleTrackTrackNamePolicy = JsonHelper.parseEnum<TrackNamePolicy>(v, TrackNamePolicy)!;
return true;
Expand Down
8 changes: 8 additions & 0 deletions packages/alphatab/src/importer/BinaryStylesheet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,9 @@ export class BinaryStylesheet {
case 'Global/DrawChords':
score.stylesheet.globalDisplayChordDiagramsOnTop = value as boolean;
break;
case 'System/drawChordInScore':
score.stylesheet.globalDisplayChordDiagramsInScore = value as boolean;
break;
case 'System/showTrackNameSingle':
if (!(value as boolean)) {
score.stylesheet.singleTrackTrackNamePolicy = TrackNamePolicy.Hidden;
Expand Down Expand Up @@ -460,6 +463,11 @@ export class BinaryStylesheet {
score.stylesheet.globalDisplayChordDiagramsOnTop,
DataType.Boolean
);
binaryStylesheet.addValue(
'System/drawChordInScore',
score.stylesheet.globalDisplayChordDiagramsInScore,
DataType.Boolean
);

switch (score.stylesheet.singleTrackTrackNamePolicy) {
case TrackNamePolicy.Hidden:
Expand Down
19 changes: 15 additions & 4 deletions packages/alphatab/src/importer/MusicXmlImporter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1362,6 +1362,15 @@ export class MusicXmlImporter extends ScoreImporter {
chord.name += degreeParenthesis ? `(${degree})` : degree;
}

if (element.getAttribute('print-frame', 'no') === 'yes') {
chord.showDiagram = true;
this._score.stylesheet.globalDisplayChordDiagramsInScore = true;
}

if (element.getAttribute('print-object', 'yes') === 'yes') {
chord.showDiagram = true;
}

if (this._nextBeatChord === null) {
this._nextBeatChord = chord;
}
Expand Down Expand Up @@ -2703,8 +2712,10 @@ export class MusicXmlImporter extends ScoreImporter {
}

private static readonly _b4Value = 71;
private _estimateBeamDirection(note: Note): BeamDirection {
return note.calculateRealValue(false, false) < MusicXmlImporter._b4Value ? BeamDirection.Down : BeamDirection.Up;
private _estimateBeamDirection(note: Note): BeamDirection {
return note.calculateRealValue(false, false) < MusicXmlImporter._b4Value
? BeamDirection.Down
: BeamDirection.Up;
}

private _parseNoteHead(element: XmlNode, note: Note, beatDuration: Duration, beamDirection: BeamDirection) {
Expand Down Expand Up @@ -3297,7 +3308,7 @@ export class MusicXmlImporter extends ScoreImporter {
}
}

private _parseArpeggiate(element: XmlNode, beat: Beat) {
private _parseArpeggiate(element: XmlNode, beat: Beat) {
const direction = element.getAttribute('direction', 'down');
switch (direction) {
case 'down':
Expand Down Expand Up @@ -3607,7 +3618,7 @@ export class MusicXmlImporter extends ScoreImporter {
}
}

private _parseTied(element: XmlNode, note: Note, staff: Staff): void {
private _parseTied(element: XmlNode, note: Note, staff: Staff): void {
const type = element.getAttribute('type');
const number = element.getAttribute('number', '');

Expand Down
Loading