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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ bin/
*.user
*.tgz
test-results/
debug.log
debug.log
src/generated/VersionInfo.ts
4 changes: 2 additions & 2 deletions src.compiler/csharp/CSharpAstTransformer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ export default class CSharpAstTransformer {
this._context.addTsNodeDiagnostics(
p,
'Unsupported export',
ts.DiagnosticCategory.Error
ts.DiagnosticCategory.Message
);
}
});
Expand All @@ -191,7 +191,7 @@ export default class CSharpAstTransformer {
this._context.addTsNodeDiagnostics(
d,
'Unsupported export',
ts.DiagnosticCategory.Error
ts.DiagnosticCategory.Message
);
}
})
Expand Down
16 changes: 15 additions & 1 deletion src.compiler/typescript/AlphaTabGenerator.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import * as ts from 'typescript';
import cloneEmit from './CloneEmitter';
import serializerEmit from './SerializerEmitter';
import transpiler from '../TranspilerBase'
import transpiler from '../TranspilerBase';
import * as path from 'path';
import * as fs from 'fs';

transpiler([{
name: 'Clone',
Expand All @@ -11,4 +13,16 @@ transpiler([{
emit: serializerEmit
}]);

// Write version file
import { version } from '../../package.json';
const fileHandle = fs.openSync('src/generated/VersionInfo.ts', 'w');
fs.writeSync(fileHandle, '// <auto-generated>\n');
fs.writeSync(fileHandle, '// This code was auto-generated.\n');
fs.writeSync(fileHandle, '// Changes to this file may cause incorrect behavior and will be lost if\n');
fs.writeSync(fileHandle, '// the code is regenerated.\n');
fs.writeSync(fileHandle, '// </auto-generated>\n');
fs.writeSync(fileHandle, 'export class VersionInfo {\n');
fs.writeSync(fileHandle, ` public static readonly version:string = '${version}';\n`);
fs.writeSync(fileHandle, ` public static readonly date:string = '${new Date().toISOString()}';\n`);
fs.writeSync(fileHandle, '}\n');
ts.sys.exit(ts.ExitStatus.Success);
2 changes: 1 addition & 1 deletion src.csharp/AlphaTab.Windows/WinForms/AlphaTabControl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public IEnumerable<Track>? Tracks
/// <remarks>
/// The control has an overall background on which the notation
/// itself is placed in a page-style fashion depending on the chosen layout.
/// The <see cref="AlphaTabControl.BackColor"/> property controls the background
/// The <see cref="Control.BackColor"/> property controls the background
/// of the overall area background while this property controls the background of
/// the part showing the notation.
/// </remarks>
Expand Down
3 changes: 3 additions & 0 deletions src/alphatab.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ export {
Logger
};

import { VersionInfo } from '@src/generated/VersionInfo';
export const meta = VersionInfo;

import { ScoreImporter } from '@src/importer/ScoreImporter';
import { ScoreLoader } from '@src/importer/ScoreLoader';
import { UnsupportedFormatError } from '@src/importer/UnsupportedFormatError';
Expand Down
2 changes: 1 addition & 1 deletion src/rendering/layout/ScoreLayout.ts
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ export abstract class ScoreLayout {

public renderAnnotation(): void {
// attention, you are not allowed to remove change this notice within any version of this library without permission!
let msg: string = 'rendered by alphaTab (https://alphaTab.net)';
let msg: string = 'rendered by alphaTab';
let canvas: ICanvas = this.renderer.canvas!;
let resources: RenderingResources = this.renderer.settings.display.resources;
let size: number = 12 * this.renderer.settings.display.scale;
Expand Down
Binary file modified test-data/visual-tests/effects-and-annotations/bends.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test-data/visual-tests/effects-and-annotations/brush.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test-data/visual-tests/effects-and-annotations/chords.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test-data/visual-tests/effects-and-annotations/dynamics.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test-data/visual-tests/effects-and-annotations/fade-in.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test-data/visual-tests/effects-and-annotations/fingering.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test-data/visual-tests/effects-and-annotations/let-ring.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test-data/visual-tests/effects-and-annotations/markers.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test-data/visual-tests/effects-and-annotations/palm-mute.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test-data/visual-tests/effects-and-annotations/pick-stroke.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test-data/visual-tests/effects-and-annotations/slides.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test-data/visual-tests/effects-and-annotations/tap.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test-data/visual-tests/effects-and-annotations/tempo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test-data/visual-tests/effects-and-annotations/text.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test-data/visual-tests/effects-and-annotations/tremolo-bar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test-data/visual-tests/effects-and-annotations/tremolo-picking.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test-data/visual-tests/effects-and-annotations/trill.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test-data/visual-tests/effects-and-annotations/triplet-feel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test-data/visual-tests/effects-and-annotations/tuplets-advanced.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test-data/visual-tests/effects-and-annotations/tuplets.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test-data/visual-tests/effects-and-annotations/vibrato.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test-data/visual-tests/general/alternate-endings.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test-data/visual-tests/general/repeats.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test-data/visual-tests/general/song-details.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test-data/visual-tests/general/tuning.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test-data/visual-tests/guitar-tabs/rhythm-with-beams.png
Binary file modified test-data/visual-tests/guitar-tabs/rhythm.png
Binary file modified test-data/visual-tests/guitar-tabs/string-variations.png
Binary file modified test-data/visual-tests/layout/multi-track.png
Binary file modified test-data/visual-tests/layout/multi-voice.png
Binary file modified test-data/visual-tests/layout/page-layout-5barsperrow.png
Binary file modified test-data/visual-tests/layout/page-layout-5to8.png
Binary file modified test-data/visual-tests/layout/page-layout.png
Binary file modified test-data/visual-tests/music-notation/accidentals.png
Binary file modified test-data/visual-tests/music-notation/beams-advanced.png
Binary file modified test-data/visual-tests/music-notation/clefs.png
Binary file modified test-data/visual-tests/music-notation/forced-accidentals.png
Binary file modified test-data/visual-tests/music-notation/key-signatures.png
Binary file modified test-data/visual-tests/music-notation/notes-rests-beams.png
Binary file modified test-data/visual-tests/music-notation/rest-collisions.png
Binary file modified test-data/visual-tests/music-notation/time-signatures.png
Binary file modified test-data/visual-tests/notation-elements/chord-diagrams-off.png
Binary file modified test-data/visual-tests/notation-elements/chord-diagrams-on.png
Binary file modified test-data/visual-tests/notation-elements/effects-off.png
Binary file modified test-data/visual-tests/notation-elements/effects-on.png
Binary file modified test-data/visual-tests/notation-elements/guitar-tuning-off.png
Binary file modified test-data/visual-tests/notation-elements/guitar-tuning-on.png
Binary file modified test-data/visual-tests/notation-elements/score-info-album.png
Binary file modified test-data/visual-tests/notation-elements/score-info-all.png
Binary file modified test-data/visual-tests/notation-elements/score-info-artist.png
Binary file modified test-data/visual-tests/notation-elements/score-info-copyright.png
Binary file modified test-data/visual-tests/notation-elements/score-info-music.png
Binary file modified test-data/visual-tests/notation-elements/score-info-subtitle.png
Binary file modified test-data/visual-tests/notation-elements/score-info-title.png
Binary file modified test-data/visual-tests/notation-elements/score-info-words.png
Binary file modified test-data/visual-tests/notation-elements/track-names-off.png
Binary file modified test-data/visual-tests/notation-elements/track-names-on.png
Binary file modified test-data/visual-tests/special-notes/dead-notes.png
Binary file modified test-data/visual-tests/special-notes/ghost-notes.png
Binary file modified test-data/visual-tests/special-notes/grace-notes-advanced.png
Binary file modified test-data/visual-tests/special-notes/grace-notes.png
Binary file modified test-data/visual-tests/special-notes/tied-notes.png
Binary file modified test-data/visual-tests/special-tracks/drum-tabs.png
Binary file modified test-data/visual-tests/special-tracks/grand-staff.png
Binary file modified test-data/visual-tests/special-tracks/percussion.png
2 changes: 1 addition & 1 deletion tsconfig.base.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"moduleResolution": "node",
"target": "es5",
"target": "es6",
"module": "es6",
"lib": [
"es2015",
Expand Down
10 changes: 2 additions & 8 deletions tsconfig.build-csharp.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"extends": "./tsconfig.base.json",
"compilerOptions": {
"target": "es6",
"outDir": "dist/lib.csharp",
"module": "commonjs",
"resolveJsonModule": true,
"declaration": false,
"declarationDir": null,
"sourceMap": false,
Expand All @@ -20,13 +20,7 @@
"@test*": [
"test*"
]
},
"plugins": [
{
"transform": "./src.compiler/csharp/CSharpTranspilerPlugin.ts",
"after": true
},
]
}
},
"include": [
"src",
Expand Down