abcjs 6.0.0-beta.7 → 6.0.0

package/src/write/top-text.js

@@ -0,0 +1,54 @@
+const addTextIf = require("./add-text-if");
+
+function TopText(metaText, metaTextInfo, formatting, lines, width, isPrint, paddingLeft, spacing, getTextSize) {
+	this.rows = [];
+
+	if (metaText.header && isPrint) {
+		// Note: whether there is a header or not doesn't change any other positioning, so this doesn't change the Y-coordinate.
+		// This text goes above the margin, so we'll temporarily move up.
+		var headerTextHeight = getTextSize.calc("X", "headerfont", 'abcjs-header abcjs-meta-top').height;
+		addTextIf(this.rows, { marginLeft: paddingLeft, text: metaText.header.left, font: 'headerfont', klass: 'header meta-top', marginTop: -headerTextHeight, info: metaTextInfo.header, name: "header"}, getTextSize);
+		addTextIf(this.rows, { marginLeft: paddingLeft + width / 2, text: metaText.header.center, font: 'headerfont', klass: 'header meta-top', marginTop: -headerTextHeight, anchor: 'middle', info: metaTextInfo.header, name: "header"}, getTextSize);
+		addTextIf(this.rows, { marginLeft: paddingLeft + width, text: metaText.header.right, font: 'headerfont', klass: 'header meta-top', marginTop: -headerTextHeight, anchor: 'end', info: metaTextInfo.header, name: "header"}, getTextSize);
+
+//		TopText.prototype.addTextIf = function (marginLeft, text, font, klass, marginTop, marginBottom, anchor, getTextSize, absElemType, noMove) {
+	}
+	if (isPrint)
+		this.rows.push({move: spacing.top});
+	var tAnchor = formatting.titleleft ? 'start' : 'middle';
+	var tLeft = formatting.titleleft ? paddingLeft : paddingLeft + width / 2;
+	if (metaText.title) {
+		addTextIf(this.rows, { marginLeft: tLeft, text: metaText.title, font: 'titlefont', klass: 'title meta-top', marginTop: spacing.title, anchor: tAnchor, absElemType: "title", info: metaTextInfo.title, name: "title"}, getTextSize);
+	}
+	if (lines.length) {
+		var index = 0;
+		while (index < lines.length && lines[index].subtitle) {
+			addTextIf(this.rows, {marginLeft: tLeft, text: lines[index].subtitle.text, font: 'subtitlefont', klass: 'text meta-top subtitle', marginTop: spacing.subtitle, anchor: tAnchor, absElemType: "subtitle", info: lines[index].subtitle, name: "subtitle"}, getTextSize);
+			index++;
+		}
+	}
+
+	if (metaText.rhythm || metaText.origin || metaText.composer) {
+		this.rows.push({move: spacing.composer});
+		if (metaText.rhythm && metaText.rhythm.length > 0) {
+			var noMove = !!(metaText.composer || metaText.origin);
+			addTextIf(this.rows, { marginLeft: paddingLeft, text: metaText.rhythm, font: 'infofont', klass: 'meta-top rhythm', absElemType: "rhythm", noMove: true, info: metaTextInfo.rhythm, name: "rhythm"}, getTextSize);
+		}
+		var composerLine = "";
+		if (metaText.composer) composerLine += metaText.composer;
+		if (metaText.origin) composerLine += ' (' + metaText.origin + ')';
+		if (composerLine.length > 0) {
+			addTextIf(this.rows, { marginLeft: paddingLeft + width, text: composerLine, font: 'composerfont', klass: 'meta-top composer', anchor: "end", absElemType: "composer", info: metaTextInfo.composer, name: "composer"}, getTextSize);
+		}
+	}
+
+	if (metaText.author && metaText.author.length > 0) {
+		addTextIf(this.rows, { marginLeft: paddingLeft + width, text: metaText.author, font: 'composerfont', klass: 'meta-top author', anchor: "end", absElemType: "author", info: metaTextInfo.author, name: "author" }, getTextSize);
+	}
+
+	if (metaText.partOrder && metaText.partOrder.length > 0) {
+		addTextIf(this.rows, { marginLeft: paddingLeft, text: metaText.partOrder, font: 'partsfont', klass: 'meta-top part-order', absElemType: "partOrder", info: metaTextInfo.partOrder, name: "part-order"}, getTextSize);
+	}
+}
+
+module.exports = TopText;

package/src/write/unhighlight.js

@@ -0,0 +1,11 @@
+var setClass = require('./set-class');
+
+var unhighlight = function (klass, color) {
+	if (klass === undefined)
+		klass = "abcjs-note_selected";
+	if (color === undefined)
+		color = "#000000";
+	setClass(this.elemset, "", klass, color);
+};
+
+module.exports = unhighlight;

package/temp.txt

@@ -0,0 +1,17 @@
+    Fix the bar number display when wrapping.
+    Don't add extra padding when creating minimal music (like one note)
+    Fix selection data for unaligned words
+    Pass back actual selectable element when one of its children is clicked.
+    Don't put extra classes and data- attributes on compound symbols (like "12/8")
+    Fix spacing for triplet number
+    Don't add extra space at the bottom if there is no bottom text.
+    Allow aria-label to not be set.
+    Fix adding class names to dynamics and some other elements.
+    Fix regression where the left line of multi-staff music was misplaced if the bottom line is for percussion.
+
+    Start beta 40
+
+    gracenotes now are processed through %%percmap
+    Return audioContext in prime because of iOS finickiness.
+    Fix iOS not playing because audioContext doesn't stay running
+    Fix iOS not playing because audioContext doesn't stay running

package/test.js

@@ -1,75 +1,38 @@
+/**!
+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 animation = require('./src/api/abc_animation');
-var tuneBook = require('./src/api/abc_tunebook');
-
-var abcjs = {};
+var Parse = require('./src/parse/abc_parse');
+var EngraverController = require('./src/write/abc_engraver_controller')
 
 abcjs.signature = "abcjs-test v" + version;
 
-Object.keys(animation).forEach(function (key) {
-	abcjs[key] = animation[key];
-});
-
-Object.keys(tuneBook).forEach(function (key) {
-	abcjs[key] = tuneBook[key];
-});
-
-abcjs.renderAbc = require('./src/api/abc_tunebook_svg');
-abcjs.renderMidi = require('./src/api/abc_tunebook_midi');
-abcjs.TimingCallbacks = require('./src/api/abc_timing_callbacks');
-
-var glyphs = require('./src/write/abc_glyphs');
-abcjs.setGlyph = glyphs.setSymbol;
-
-var CreateSynth = require('./src/synth/create-synth');
-var instrumentIndexToName = require('./src/synth/instrument-index-to-name');
-var pitchToNoteName = require('./src/synth/pitch-to-note-name');
-var SynthSequence = require('./src/synth/synth-sequence');
-var CreateSynthControl = require('./src/synth/create-synth-control');
-var registerAudioContext = require('./src/synth/register-audio-context');
-var activeAudioContext = require('./src/synth/active-audio-context');
-var supportsAudio = require('./src/synth/supports-audio');
-var playEvent = require('./src/synth/play-event');
-var SynthController = require('./src/synth/synth-controller');
-
-abcjs.synth = {
-	CreateSynth: CreateSynth,
-	instrumentIndexToName: instrumentIndexToName,
-	pitchToNoteName: pitchToNoteName,
-	SynthController: SynthController,
-	SynthSequence: SynthSequence,
-	CreateSynthControl: CreateSynthControl,
-	registerAudioContext: registerAudioContext,
-	activeAudioContext: activeAudioContext,
-	supportsAudio: supportsAudio,
-	playEvent: playEvent
-};
-
-var parser = require('./src/parse/abc_parse');
-abcjs['parse'] = { Parse: parser };
-
-var engraverController = require('./src/write/abc_engraver_controller');
-abcjs['write'] = { EngraverController: engraverController };
-
-var editor = require('./src/edit/abc_editor');
-abcjs['Editor'] = editor;
-
-var midi = require('./src/midi/abc_midi_controls');
-var sequence = require('./src/midi/abc_midi_sequencer');
-var flatten = require('./src/midi/abc_midi_flattener');
-var midiCreate = require('./src/midi/abc_midi_create');
-var midiUiGenerator = require('./src/midi/abc_midi_ui_generator');
-abcjs['midi'] = midi;
-abcjs['midi'].sequence = sequence;
-abcjs['midi'].flatten = flatten;
-abcjs['midi'].create = midiCreate;
-abcjs['midi'].midiUiGenerator = midiUiGenerator;
-
 var parserLint = require('./src/test/abc_parser_lint');
 var verticalLint = require('./src/test/abc_vertical_lint');
 var midiLint = require('./src/test/abc_midi_lint');
 var midiSequencerLint = require('./src/test/abc_midi_sequencer_lint');
 var renderingLint = require('./src/test/rendering-lint');
-abcjs['test'] = { ParserLint: parserLint, verticalLint: verticalLint, midiLint: midiLint, midiSequencerLint: midiSequencerLint, renderingLint: renderingLint };
+abcjs['test'] = { Parse: Parse, EngraverController: EngraverController, ParserLint: parserLint, verticalLint: verticalLint, midiLint: midiLint, midiSequencerLint: midiSequencerLint, renderingLint: renderingLint };
 
 module.exports = abcjs;