abcjs 6.0.0-beta.35 → 6.0.0-beta.39

package/src/write/svg.js

@@ -193,8 +193,9 @@ Svg.prototype.text = function(text, attr, target) {
 				line.appendChild(ts2);
 			}
 			if (parts[2]) {
+				var dist = parts[1] ? "0.4em" : "0.1em";
 				var ts3 = document.createElementNS(svgNS, 'tspan');
-				ts3.setAttribute("dy", "0.1em");
+				ts3.setAttribute("dy", dist);
 				ts3.setAttribute("style", "font-size:0.7em");
 				ts3.textContent = parts[2];
 				line.appendChild(ts3);

package/test.js

@@ -1,3 +1,26 @@
+/**!
+Copyright (c) 2009-2022 Paul Rosen and Gregory Dyke
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+ **This text is from: http://opensource.org/licenses/MIT**
+!**/
 var abcjs = require('./index');
 var version = require('./version');
 var Parse = require('./src/parse/abc_parse');

package/types/index.d.ts

@@ -48,7 +48,7 @@ declare module 'abcjs' {
 
 	export type FormatAttributes = "titlefont" | "gchordfont" | "composerfont" | "footerfont" | "headerfont" | "historyfont" | "infofont" |
 		"measurefont" | "partsfont" | "repeatfont" | "subtitlefont" | "tempofont" | "textfont" | "voicefont" | "tripletfont" | "vocalfont" |
-		"wordsfont" | "annotationfont" | "scale" | "partsbox" | "freegchord" | "fontboxpadding" | "stretchlast";
+		"wordsfont" | "annotationfont" | "scale" | "partsbox" | "freegchord" | "fontboxpadding" | "stretchlast" | "tablabelfont" | "tabnumberfont" | "tabgracefont";
 
 	export type MidiCommands = "nobarlines" | "barlines" | "beataccents" | "nobeataccents" | "droneon" | "droneoff" | "noportamento" | "channel" | "c" |
 		"drumon" | "drumoff" | "fermatafixed" | "fermataproportional" | "gchordon" | "gchordoff" | "bassvol" | "chordvol" |
@@ -274,7 +274,7 @@ declare module 'abcjs' {
 		fadeLength?: number;
 		sequenceCallback?: (sequence: Array<NoteMapTrack>, context: any) => Array<NoteMapTrack>;
 		callbackContext?: any; // Anything is ok. It is just passed back in the callback
-		onEnded?: () => void;
+		onEnded?: (context: any) => void;
 		pan?: Array<number>;
 		voicesOff?: boolean | Array<number>;
 		drum?: string;
@@ -291,11 +291,11 @@ declare module 'abcjs' {
 }
 
 	export interface SynthVisualOptions {
-		displayLoop: boolean | false
-		displayRestart: boolean | false
-		displayPlay: boolean | false
-		displayProgress: boolean | false
-		displayWarp: boolean | false
+		displayLoop?: boolean;
+		displayRestart?: boolean;
+		displayPlay?: boolean;
+		displayProgress?: boolean;
+		displayWarp?: boolean;
 	}
 
 	export type DownloadLabelFn = (visualObj: TuneObject, index: number) => string;
@@ -352,6 +352,11 @@ declare module 'abcjs' {
 		measureStart?: boolean;
 	}
 
+	export interface PercMapElement {
+		sound: number;
+		noteHead: NoteHeadType;
+	}
+
 	export interface Formatting {
 		alignbars?: number;
 		aligncomposer?: Alignment;
@@ -407,7 +412,7 @@ declare module 'abcjs' {
 			drone?: MidiParam;
 			droneoff?: MidiParam;
 			droneon?: MidiParam;
-			drum: MidiParam;
+			drum?: MidiParam;
 			drumbars?: MidiParam;
 			drummap: MidiParam;
 			drumoff?: MidiParam;
@@ -415,7 +420,7 @@ declare module 'abcjs' {
 			expand?: MidiParam;
 			fermatafixed?: MidiParam;
 			fermataproportional?: MidiParam;
-			gchord: MidiParam;
+			gchord?: MidiParam;
 			gchordon?: MidiParam;
 			gchordoff?: MidiParam;
 			grace?: MidiParam;
@@ -445,7 +450,7 @@ declare module 'abcjs' {
 		parskipfac?: number;
 		partsbox?: boolean;
 		partsspace?: number;
-		percmap?: any; // TODO
+		percmap?: Array<PercMapElement>;
 		playtempo?: string;
 		rightmargin?: number;
 		scale?: number;
@@ -485,6 +490,9 @@ declare module 'abcjs' {
 		partsfont: Font;
 		repeatfont: Font;
 		subtitlefont: Font;
+		tabgracefont: Font;
+		tablabelfont: Font;
+		tabnumberfont: Font;
 		tempofont: Font;
 		textfont: Font;
 		titlefont: Font;
@@ -728,7 +736,31 @@ declare module 'abcjs' {
 
 	export type TuneObjectArray = [TuneObject]
 
-	export type AbcElem = any // TODO
+	export interface AbcElem {
+		el_type: string //TODO enumerate these
+		abselem: any;
+		beambr?: number;
+		chord?: Array<any>
+		decoration: Array<any>
+		duration: number
+		endBeam?: boolean
+		endSlur?: number
+		endTriplet?: true
+		gracenotes?: Array<any>
+		lyric?: Array<any>
+		noStem?: boolean
+		pitches?: Array<any>
+		positioning?: any
+		rest?: any
+		startBeam?: boolean
+		startTriplet?: number
+		tripletMultiplier?: number
+		tripletR?: number
+		stemConnectsToAbove?: true
+		style?: NoteHeadType
+		startChar: number
+		endChar: number
+	}
 
 	export interface ClickListenerDrag {
 		step: number;
@@ -770,7 +802,7 @@ declare module 'abcjs' {
 		height: number;
 		left: number;
 		width: number;
-		elements: Array< any>; // TODO
+		elements: Array< HTMLElement>;
 		startCharArray: Array<number>;
 		endCharArray: Array<number>;
 		midiPitches: MidiPitches
@@ -835,7 +867,7 @@ declare module 'abcjs' {
 
 	export interface SequenceBeat {
 		el_type: "beat";
-		beats: any; // TODO
+		beats: [number,number,number];
 	}
 
 	export interface SequenceBeatAccents {
@@ -864,9 +896,9 @@ declare module 'abcjs' {
 	export type MidiFile = any // This is a standard midi file format
 
 	export interface MidiBufferPromise {
-		cached: [any] // TODO
-		error: [any] // TODO
-		loaded: [any] // TODO
+		cached: Array<string>;
+		error: Array<string>;
+		loaded: Array<string>;
 	}
 
 	export interface AudioTrack {
@@ -977,22 +1009,39 @@ declare module 'abcjs' {
 	//
 	// Audio
 	//
-	export type AudioControl = any // TODO
+	export interface AudioControl {
+		disable: (isDisabled: boolean) => void;
+		setWarp: (tempo: number, warp: number) => void;
+		setTempo: (tempo: number) => void;
+		resetAll: () => void;
+		pushPlay: (push: boolean) => void;
+		pushLoop: (push: boolean) => void;
+		setProgress: (percent: number, totalTime: number) => void;
+	}
 
 	export interface MidiBuffer {
 		init(params?: MidiBufferOptions): Promise<MidiBufferPromise>
 		prime(): Promise<void>
 		start(): void
-		pause(): void
+		pause(): number
 		resume(): void
-		seek(position: number, units: ProgressUnit): void
-		stop(): void
-		download(): any // returns audio buffer in wav format
+		seek(position: number, units?: ProgressUnit): void
+		stop(): number
+		download(): string // returns audio buffer in wav format as a reference to a blob
+	}
+
+	export interface SynthInitResponse {
+		status: "no-audio-context" | "created";
+		loadingResponse?: {
+			cached: Array<string>
+			error: Array<string>
+			loaded: Array<string>
+		}
 	}
 
 	export interface SynthObjectController {
 		disable(isDisabled: boolean): void
-		setTune(visualObj: TuneObject, userAction: Boolean, audioParams?: AbcVisualParams): Promise<any> // TODO
+		setTune(visualObj: TuneObject, userAction: Boolean, audioParams?: AbcVisualParams): Promise<SynthInitResponse>
 		load(selector: string, cursorControl?: any, visualOptions?: SynthVisualOptions): void
 		play(): void
 		pause(): void
@@ -1015,12 +1064,11 @@ declare module 'abcjs' {
 		let SynthSequence: { new (): SynthSequenceClass }
 
 		export function supportsAudio(): boolean
-		export function registerAudioContext(AudioContext): boolean
+		export function registerAudioContext(ac?: AudioContext): boolean
 		export function activeAudioContext(): AudioContext
-		export function CreateSynthControl(element: Selector, options: AbcVisualParams): AudioControl // TODO
+		export function CreateSynthControl(element: Selector, options: AbcVisualParams): AudioControl
 		export function getMidiFile(source: String | TuneObject, options?: MidiFileOptions): MidiFile;
 		export function playEvent(pitches: MidiPitches, graceNotes: MidiGracePitches, milliSecondsPerMeasure: number): Promise<void>;
-		export function activeAudioContext(): AudioContext
 		export function sequence(visualObj: TuneObject, options: AbcVisualParams): AudioSequence
 	}
 

package/version.js

@@ -1,3 +1,3 @@
-var version = '6.0.0-beta.34';
+var version = '6.0.0-beta.39';
 
 module.exports = version;