abcjs 6.2.1 → 6.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abcjs",
-  "version": "6.2.1",
+  "version": "6.2.3",
   "description": "Renderer for abc music notation",
   "main": "index.js",
   "types": "types/index.d.ts",

package/src/api/abc_tablatures.js

@@ -13,6 +13,8 @@ var GuitarTablature = require('../tablatures/instruments/guitar/tab-guitar');
 // Existing tab classes 
 var pluginTab = {
   'violin': 'ViolinTab',
+  'fiddle': 'ViolinTab',
+  'mandolin': 'ViolinTab',
   'guitar': 'GuitarTab'
 };
 
@@ -82,6 +84,9 @@ var abcTablatures = {
           // plugin.init(tune, tuneNumber, args, ii);
           returned.push(pluginInstance);
           nbPlugins++;
+        } else if (instrument === '') {
+          // create a placeholder - there is no tab for this staff
+          returned.push(null)
         } else {
           // unknown tab plugin 
           //this.emit_error('Undefined tablature plugin: ' + tabName)

package/src/api/abc_tunebook_svg.js

@@ -117,12 +117,12 @@ var renderAbc = function(output, abc, parserParams, engraverParams, renderParams
             div.setAttribute("style", "visibility: hidden;");
             document.body.appendChild(div);
         }
-    	if (params.afterParsing)
-    		params.afterParsing(tune, tuneNumber, abcString);
         if (!removeDiv && params.wrap && params.staffwidth) {
-	        tune = doLineWrapping(div, tune, tuneNumber, abcString, params);
+            tune = doLineWrapping(div, tune, tuneNumber, abcString, params);
 	        return tune;
         }
+        if (params.afterParsing)
+            params.afterParsing(tune, tuneNumber, abcString);
         renderOne(div, tune, params, tuneNumber, 0);
         if (removeDiv)
             div.parentNode.removeChild(div);
@@ -145,6 +145,8 @@ function doLineWrapping(div, tune, tuneNumber, abcString, params) {
         if (warnings)
             tune.warnings = warnings;
     }
+    if (params.afterParsing)
+        params.afterParsing(tune, tuneNumber, abcString);
     renderOne(div, tune, ret.revisedParams, tuneNumber, 0);
 	tune.explanation = ret.explanation;
 	return tune;

package/src/parse/abc_parse_music.js

@@ -9,6 +9,20 @@ var tune;
 var tuneBuilder;
 var header;
 
+var {
+  legalAccents,
+  volumeDecorations,
+  dynamicDecorations,
+  accentPseudonyms,
+  accentDynamicPseudonyms,
+  nonDecorations,
+  durations,
+  pitches,
+  rests,
+  accMap,
+  tripletQ
+} = require('./abc_parse_settings')
+
 var MusicParser = function(_tokenizer, _warn, _multilineVars, _tune, _tuneBuilder, _header) {
 	tokenizer = _tokenizer;
 	warn = _warn;
@@ -76,7 +90,6 @@ var MusicParser = function(_tokenizer, _warn, _multilineVars, _tune, _tuneBuilde
 // double-quote: chord symbol
 // less-than, greater-than, slash: duration
 // back-tick, space, tab: space
-var nonDecorations = "ABCDEFGabcdefgxyzZ[]|^_{";	// use this to prescreen so we don't have to look for a decoration at every note.
 
 var isInTie = function(multilineVars, overlayLevel, el) {
 	if (multilineVars.inTie[overlayLevel] === undefined)
@@ -540,15 +553,8 @@ MusicParser.prototype.parseMusic = function(line) {
 						// Create a warning if this is not a displayable duration.
 						// The first item on a line is a regular note value, each item after that represents a dot placed after the previous note.
 						// Only durations less than a whole note are tested because whole note durations have some tricky rules.
-						var durations = [
-							0.5, 0.75, 0.875, 0.9375, 0.96875, 0.984375,
-							0.25, 0.375, 0.4375, 0.46875, 0.484375, 0.4921875,
-							0.125, 0.1875, 0.21875, 0.234375, 0.2421875, 0.24609375,
-							0.0625, 0.09375, 0.109375, 0.1171875, 0.12109375, 0.123046875,
-							0.03125, 0.046875, 0.0546875, 0.05859375, 0.060546875, 0.0615234375,
-							0.015625, 0.0234375, 0.02734375, 0.029296875, 0.0302734375, 0.03076171875,
-						];
-						if (el.duration < 1 && durations.indexOf(el.duration) === -1 && el.duration !== 0) {
+
+            if (el.duration < 1 && durations.indexOf(el.duration) === -1 && el.duration !== 0) {
 							if (!el.rest || el.rest.type !== 'spacer')
 								warn("Duration not representable: " + line.substring(startI, i), line, i);
 						}
@@ -717,35 +723,8 @@ function durationOfMeasure(multilineVars) {
 	return parseInt(meter.value[0].num, 10) / parseInt(meter.value[0].den, 10);
 }
 
-var legalAccents = [
-	"trill", "lowermordent", "uppermordent", "mordent", "pralltriller", "accent",
-	"fermata", "invertedfermata", "tenuto", "0", "1", "2", "3", "4", "5", "+", "wedge",
-	"open", "thumb", "snap", "turn", "roll", "breath", "shortphrase", "mediumphrase", "longphrase",
-	"segno", "coda", "D.S.", "D.C.", "fine", "beambr1", "beambr2",
-	"slide", "marcato",
-	"upbow", "downbow", "/", "//", "///", "////", "trem1", "trem2", "trem3", "trem4",
-	"turnx", "invertedturn", "invertedturnx", "trill(", "trill)", "arpeggio", "xstem", "mark", "umarcato",
-	"style=normal", "style=harmonic", "style=rhythm", "style=x", "style=triangle", "D.C.alcoda", "D.C.alfine", "D.S.alcoda", "D.S.alfine", "editorial", "courtesy"
-];
-
-var volumeDecorations = [
-	"p", "pp", "f", "ff", "mf", "mp", "ppp", "pppp",  "fff", "ffff", "sfz"
-];
-
-var dynamicDecorations = [
-	"crescendo(", "crescendo)", "diminuendo(", "diminuendo)", "glissando(", "glissando)"
-];
-
-var accentPseudonyms = [
-	["<", "accent"], [">", "accent"], ["tr", "trill"],
-	["plus", "+"], [ "emphasis", "accent"],
-	[ "^", "umarcato" ], [ "marcato", "umarcato" ]
-];
-
-var accentDynamicPseudonyms = [
-	["<(", "crescendo("], ["<)", "crescendo)"],
-	[">(", "diminuendo("], [">)", "diminuendo)"]
-];
+
+
 
 var letter_to_accent = function(line, i) {
 	var macro = multilineVars.macros[line[i]];
@@ -877,17 +856,6 @@ var letter_to_bar = function(line, curr_pos) {
 	return [ret.len+retRep.len, ret.token, retRep.token];
 };
 
-var tripletQ = {
-	2: 3,
-	3: 2,
-	4: 3,
-	5: 2, // TODO-PER: not handling 6/8 rhythm yet
-	6: 2,
-	7: 2, // TODO-PER: not handling 6/8 rhythm yet
-	8: 3,
-	9: 2 // TODO-PER: not handling 6/8 rhythm yet
-};
-
 var letter_to_open_slurs_and_triplets =  function(line, i) {
 	// consume spaces, and look for all the open parens. If there is a number after the open paren,
 	// that is a triplet. Otherwise that is a slur. Collect all the slurs and the first triplet.
@@ -1050,9 +1018,6 @@ var addEndBeam = function(el) {
 	return el;
 };
 
-var pitches = {A: 5, B: 6, C: 0, D: 1, E: 2, F: 3, G: 4, a: 12, b: 13, c: 7, d: 8, e: 9, f: 10, g: 11};
-var rests = {x: 'invisible', X: 'invisible-multimeasure', y: 'spacer', z: 'rest', Z: 'multimeasure' };
-var accMap = { 'dblflat': '__', 'flat': '_', 'natural': '=', 'sharp': '^', 'dblsharp': '^^', 'quarterflat': '_/', 'quartersharp': '^/'};
 var getCoreNote = function(line, index, el, canHaveBrokenRhythm) {
 	//var el = { startChar: index };
 	var isComplete = function(state) {

package/src/parse/abc_parse_settings.js

@@ -0,0 +1,165 @@
+module.exports.legalAccents = [
+  'trill',
+  'lowermordent',
+  'uppermordent',
+  'mordent',
+  'pralltriller',
+  'accent',
+  'fermata',
+  'invertedfermata',
+  'tenuto',
+  '0',
+  '1',
+  '2',
+  '3',
+  '4',
+  '5',
+  '+',
+  'wedge',
+  'open',
+  'thumb',
+  'snap',
+  'turn',
+  'roll',
+  'breath',
+  'shortphrase',
+  'mediumphrase',
+  'longphrase',
+  'segno',
+  'coda',
+  'D.S.',
+  'D.C.',
+  'fine',
+  'beambr1',
+  'beambr2',
+  'slide',
+  'marcato',
+  'upbow',
+  'downbow',
+  '/',
+  '//',
+  '///',
+  '////',
+  'trem1',
+  'trem2',
+  'trem3',
+  'trem4',
+  'turnx',
+  'invertedturn',
+  'invertedturnx',
+  'trill(',
+  'trill)',
+  'arpeggio',
+  'xstem',
+  'mark',
+  'umarcato',
+  'style=normal',
+  'style=harmonic',
+  'style=rhythm',
+  'style=x',
+  'style=triangle',
+  'D.C.alcoda',
+  'D.C.alfine',
+  'D.S.alcoda',
+  'D.S.alfine',
+  'editorial',
+  'courtesy'
+];
+
+module.exports.volumeDecorations = [
+  'p',
+  'pp',
+  'f',
+  'ff',
+  'mf',
+  'mp',
+  'ppp',
+  'pppp',
+  'fff',
+  'ffff',
+  'sfz'
+];
+
+module.exports.dynamicDecorations = [
+  'crescendo(',
+  'crescendo)',
+  'diminuendo(',
+  'diminuendo)',
+  'glissando(',
+  'glissando)',
+  '~(',
+  '~)'
+];
+
+module.exports.accentPseudonyms = [
+  ['<', 'accent'],
+  ['>', 'accent'],
+  ['tr', 'trill'],
+  ['plus', '+'],
+  ['emphasis', 'accent'],
+  ['^', 'umarcato'],
+  ['marcato', 'umarcato']
+];
+
+module.exports.accentDynamicPseudonyms = [
+  ['<(', 'crescendo('],
+  ['<)', 'crescendo)'],
+  ['>(', 'diminuendo('],
+  ['>)', 'diminuendo)']
+];
+
+module.exports.nonDecorations = 'ABCDEFGabcdefgxyzZ[]|^_{'; // use this to prescreen so we don't have to look for a decoration at every note.
+
+module.exports.durations = [
+  0.5, 0.75, 0.875, 0.9375, 0.96875, 0.984375, 0.25, 0.375, 0.4375, 0.46875,
+  0.484375, 0.4921875, 0.125, 0.1875, 0.21875, 0.234375, 0.2421875, 0.24609375,
+  0.0625, 0.09375, 0.109375, 0.1171875, 0.12109375, 0.123046875, 0.03125,
+  0.046875, 0.0546875, 0.05859375, 0.060546875, 0.0615234375, 0.015625,
+  0.0234375, 0.02734375, 0.029296875, 0.0302734375, 0.03076171875
+];
+
+module.exports.pitches = {
+  A: 5,
+  B: 6,
+  C: 0,
+  D: 1,
+  E: 2,
+  F: 3,
+  G: 4,
+  a: 12,
+  b: 13,
+  c: 7,
+  d: 8,
+  e: 9,
+  f: 10,
+  g: 11
+};
+
+module.exports.rests = {
+  x: 'invisible',
+  X: 'invisible-multimeasure',
+  y: 'spacer',
+  z: 'rest',
+  Z: 'multimeasure'
+};
+
+module.exports.accMap = {
+  dblflat: '__',
+  flat: '_',
+  natural: '=',
+  sharp: '^',
+  dblsharp: '^^',
+  quarterflat: '_/',
+  quartersharp: '^/'
+};
+
+module.exports.tripletQ = {
+  2: 3,
+  3: 2,
+  4: 3,
+  5: 2, // TODO-PER: not handling 6/8 rhythm yet
+  6: 2,
+  7: 2, // TODO-PER: not handling 6/8 rhythm yet
+  8: 3,
+  9: 2 // TODO-PER: not handling 6/8 rhythm yet
+};

package/src/synth/create-synth.js

@@ -511,6 +511,10 @@ function CreateSynth() {
 		return self.audioBuffers[0];
 	};
 
+	self.getIsRunning = function() {
+		return self.isRunning;
+	}
+
 	/////////////// Private functions //////////////
 
 	self._deviceCapable = function() {

package/src/synth/place-note.js

@@ -17,6 +17,12 @@ function placeNote(outputAudioBuffer, sampleRate, sound, startArray, volumeMulti
 		len = 0.005; // Have some small audible length no matter how short the note is.
 	var offlineCtx = new OfflineAC(2,Math.floor((len+fadeTimeSec)*sampleRate),sampleRate);
 	var noteName = pitchToNoteName[sound.pitch];
+	if (!soundsCache[sound.instrument]) {
+		// It shouldn't happen that the entire instrument cache wasn't created, but this has been seen in practice, so guard against it.
+		if (debugCallback)
+			debugCallback('placeNote skipped (instrument empty): '+sound.instrument+':'+noteName)
+		return Promise.resolve();
+	}
 	var noteBufferPromise = soundsCache[sound.instrument][noteName];
 
 	if (!noteBufferPromise) {

package/src/synth/play-event.js

@@ -2,7 +2,7 @@ var SynthSequence = require('./synth-sequence');
 var CreateSynth = require('./create-synth');
 var activeAudioContext = require("./active-audio-context");
 
-function playEvent(midiPitches, midiGracePitches, millisecondsPerMeasure) {
+function playEvent(midiPitches, midiGracePitches, millisecondsPerMeasure, soundFontUrl, debugCallback) {
 	var sequence = new SynthSequence();
 
 	for (var i = 0; i < midiPitches.length; i++) {
@@ -21,18 +21,20 @@ function playEvent(midiPitches, midiGracePitches, millisecondsPerMeasure) {
 	var ac = activeAudioContext();
 	if (ac.state === "suspended") {
 		return ac.resume().then(function () {
-			return doPlay(sequence, millisecondsPerMeasure);
+			return doPlay(sequence, millisecondsPerMeasure, soundFontUrl, debugCallback);
 		});
 	} else {
-		return doPlay(sequence, millisecondsPerMeasure);
+		return doPlay(sequence, millisecondsPerMeasure, soundFontUrl, debugCallback);
 	}
 }
 
-function doPlay(sequence, millisecondsPerMeasure) {
+function doPlay(sequence, millisecondsPerMeasure, soundFontUrl, debugCallback) {
 	var buffer = new CreateSynth();
 	return buffer.init({
 		sequence: sequence,
-		millisecondsPerMeasure: millisecondsPerMeasure
+		millisecondsPerMeasure: millisecondsPerMeasure,
+		options: { soundFontUrl: soundFontUrl },
+		debugCallback: debugCallback,
 	}).then(function () {
 		return buffer.prime();
 	}).then(function () {

package/src/tablatures/tab-absolute-elements.js

@@ -177,10 +177,11 @@ TabAbsoluteElements.prototype.build = function (plugin,
   tabVoice,
   voiceIndex,
   staffIndex,
-  keySig ) {
+  keySig,
+  tabVoiceIndex ) {
   var staffSize = getInitialStaffSize(staffAbsolute);
   var source = staffAbsolute[staffIndex+voiceIndex];
-  var dest = staffAbsolute[staffSize+staffIndex+voiceIndex];
+  var dest = staffAbsolute[tabVoiceIndex];
   var tabPos = null;
   var defNote = null;
   if (source.children[0].abcelem.el_type != 'clef') {

package/src/tablatures/tab-renderer.js

@@ -227,15 +227,17 @@ TabRenderer.prototype.doLayout = function () {
   this.tabStaff.voices = [];
   for (var ii = 0; ii < nbVoices; ii++) {
     var tabVoice = new VoiceElement(0, 0);
+    if (ii > 0) tabVoice.duplicate = true;
     var nameHeight = buildTabName(this, tabVoice) / spacing.STEP;
     nameHeight = Math.max(nameHeight, 1) // If there is no label for the tab line, then there needs to be a little padding
     staffGroup.staffs[this.staffIndex].top += nameHeight;
     staffGroup.height += nameHeight * spacing.STEP;
     tabVoice.staff = staffGroupInfos;
+    var tabVoiceIndex = voices.length
     voices.splice(voices.length, 0, tabVoice);
     var keySig = checkVoiceKeySig(voices, ii + this.staffIndex);
     this.tabStaff.voices[ii] = [];
-    this.absolutes.build(this.plugin, voices, this.tabStaff.voices[ii], ii , this.staffIndex ,keySig);
+    this.absolutes.build(this.plugin, voices, this.tabStaff.voices[ii], ii , this.staffIndex ,keySig, tabVoiceIndex);
   }
   linkStaffAndTabs(staffGroup.staffs); // crossreference tabs and staff
 };

package/src/test/abc_parser_lint.js

@@ -51,18 +51,18 @@
 var parseCommon = require('../parse/abc_common');
 var JSONSchema = require('./jsonschema-b4');
 
-var ParserLint = function() {
-	"use strict";
-	var decorationList = { type: 'array', optional: true, items: { type: 'string', Enum: [
-		"trill", "lowermordent", "uppermordent", "mordent", "pralltriller", "accent",
-		"fermata", "invertedfermata", "tenuto", "0", "1", "2", "3", "4", "5", "+", "wedge",
-		"open", "thumb", "snap", "turn", "roll", "irishroll", "breath", "shortphrase", "mediumphrase", "longphrase",
-		"segno", "coda", "D.S.", "D.C.", "fine", "crescendo(", "crescendo)", "diminuendo(", "diminuendo)", "glissando(", "glissando)",
-		"p", "pp", "f", "ff", "mf", "mp", "ppp", "pppp",  "fff", "ffff", "sfz", "repeatbar", "repeatbar2", "slide",
-		"upbow", "downbow", "staccato", "trem1", "trem2", "trem3", "trem4",
-		"/", "//", "///", "////", "turnx", "invertedturn", "invertedturnx", "arpeggio", "trill(", "trill)", "xstem",
-		"mark", "marcato", "umarcato", "D.C.alcoda", "D.C.alfine", "D.S.alcoda", "D.S.alfine", "editorial", "courtesy"
-	] } };
+var { legalAccents } = require('../parse/abc_parse_settings');
+
+var ParserLint = function () {
+  'use strict';
+  var decorationList = {
+    type: 'array',
+    optional: true,
+    items: {
+      type: 'string',
+      Enum: legalAccents
+    }
+  };
 
 	var tempoProperties =  {
 		duration: { type: "array", optional: true, output: "join", requires: [ 'bpm'], items: { type: "number"} },

package/src/write/creation/abstract-engraver.js

@@ -747,6 +747,12 @@ AbstractEngraver.prototype.addNoteToAbcElement = function (abselem, elem, dot, s
 			else
 				p1 += 1;
 		}
+		if (noteHead && noteHead.c === 'noteheads.triangle.quarter') {
+			if (dir === 'down')
+				p2 -= 0.7;
+			else
+				p1 -= 1.2;
+		}
 		abselem.addRight(new RelativeElement(null, dx, 0, p1, { "type": "stem", "pitch2": p2, linewidth: width, bottom: p1 - 1 }));
 		//var RelativeElement = function RelativeElement(c, dx, w, pitch, opt) {
 		min = Math.min(p1, p2);

package/src/write/creation/decoration.js

@@ -313,10 +313,12 @@ Decoration.prototype.dynamicDecoration = function (voice, decoration, abselem, p
 				crescendo = { start: this.startCrescendoX, stop: abselem };
 				this.startCrescendoX = undefined;
 				break;
+			case '~(':
 			case "glissando(":
 				this.startGlissandoX = abselem;
 				glissando = undefined;
 				break;
+			case '~)':
 			case "glissando)":
 				glissando = { start: this.startGlissandoX, stop: abselem };
 				this.startGlissandoX = undefined;

package/src/write/creation/glyphs.js

@@ -105,7 +105,7 @@ glyphs['noteheads.slash.quarter'] = { d: [['M', 9, -6], ['l', 0, 4], ['l', -9, 9
 
 glyphs['noteheads.harmonic.quarter'] = { d: [['M', 3.63, -4.02], ['c', 0.09, -0.06, 0.18, -0.09, 0.24, -0.03], ['c', 0.03, 0.03, 0.87, 0.93, 1.83, 2.01], ['c', 1.50, 1.65, 1.80, 1.98, 1.80, 2.04], ['c', 0.00, 0.06, -0.30, 0.39, -1.80, 2.04], ['c', -0.96, 1.08, -1.80, 1.98, -1.83, 2.01], ['c', -0.06, 0.06, -0.15, 0.03, -0.24, -0.03], ['c', -0.12, -0.09, -3.54, -3.84, -3.60, -3.93], ['c', -0.03, -0.03, -0.03, -0.09, -0.03, -0.15], ['c', 0.03, -0.06, 3.45, -3.84, 3.63, -3.96], ['z']], w: 7.5, h: 8.165 };
 
-glyphs['noteheads.triangle.quarter'] = { d: [['M', 0, 0], ['l', 9, 0], ['l', -4.5, -9], ['z']], w: 9, h: 9 };
+glyphs['noteheads.triangle.quarter'] = { d: [['M', 0, 4], ['l', 9, 0], ['l', -4.5, -9], ['z']], w: 9, h: 9 };
 
 var pathClone = function (pathArray) {
 	var res = [];

package/src/write/draw/glissando.js

@@ -11,6 +11,7 @@ function drawGlissando(renderer, params, selectables) {
 	var rightY = renderer.calcY(params.anchor2.heads[0].pitch)
 	var leftX = params.anchor1.x + params.anchor1.w / 2
 	var rightX = params.anchor2.x + params.anchor2.w / 2
+	
 	var len = lineLength(leftX, leftY, rightX, rightY)
 	var marginLeft = params.anchor1.w / 2 + margin
 	var marginRight = params.anchor2.w / 2 + margin

package/src/write/draw/print-line.js

@@ -7,14 +7,23 @@ function printLine(renderer, x1, x2, y, klass, name, dy) {
 	x2 = roundNumber(x2);
 	var y1 = roundNumber(y - dy);
 	var y2 = roundNumber(y + dy);
-	// TODO-PER: This fixes a firefox bug where a path needs to go over the 0.5 mark or it isn't displayed
-	if (renderer.firefox112 && dy < 1) {
-		var int = Math.floor(y2)
-		var distToHalf = 0.52 - (y2 - int)
-		if (distToHalf > 0) {
-			y1 += distToHalf
-			y2 += distToHalf
+	// TODO-PER: This fixes a firefox bug where it isn't displayed
+	if (renderer.firefox112) {
+		y += dy / 2; // Because the y coordinate is the edge of where the line goes but the width widens from the middle.
+		var attr = {
+			x1: x1,
+			x2: x2,
+			y1: y,
+			y2: y,
+			stroke: renderer.foregroundColor,
+			'stroke-width': Math.abs(dy*2)
 		}
+		if (klass)
+			attr['class'] = klass;
+		if (name)
+			attr['data-name'] = name;
+		
+		return renderer.paper.lineToBack(attr);
 	}
 
 	var pathString = sprintf("M %f %f L %f %f L %f %f L %f %f z", x1, y1, x2, y1,

package/src/write/draw/print-stem.js

@@ -12,15 +12,23 @@ function printStem(renderer, x, dx, y1, y2, klass, name) {
 	}
 	x = roundNumber(x);
 	var x2 = roundNumber(x + dx);
-	// TODO-PER: This fixes a firefox bug where a path needs to go over the 0.5 mark or it isn't displayed
-	if (renderer.firefox112 && Math.abs(dx) < 1) {
-		var higher = Math.max(x,x2)
-		var int = Math.floor(higher)
-		var distToHalf = 0.52 - (higher - int)
-		if (distToHalf > 0) {
-			x += distToHalf
-			x2 += distToHalf
+	// TODO-PER: This fixes a firefox bug where it isn't displayed
+	if (renderer.firefox112) {
+		x += dx / 2; // Because the x coordinate is the edge of where the line goes but the width widens from the middle.
+		var attr = {
+			x1: x,
+			x2: x,
+			y1: y1,
+			y2: y2,
+			stroke: renderer.foregroundColor,
+			'stroke-width': Math.abs(dx)
 		}
+		if (klass)
+			attr['class'] = klass;
+		if (name)
+			attr['data-name'] = name;
+		
+		return renderer.paper.lineToBack(attr);
 	}
 	var pathArray = [["M", x, y1], ["L", x, y2], ["L", x2, y2], ["L", x2, y1], ["z"]];
 	var attr = { path: "" };

package/src/write/draw/set-paper-size.js

@@ -1,5 +1,5 @@
 function setPaperSize(renderer, maxwidth, scale, responsive) {
-	var w = (maxwidth + renderer.padding.right) * scale;
+	var w = (maxwidth + renderer.padding.left + renderer.padding.right) * scale;
 	var h = (renderer.y + renderer.padding.bottom) * scale;
 	if (renderer.isPrint)
 		h = Math.max(h, 1056); // 11in x 72pt/in x 1.33px/pt

package/src/write/draw/tie.js

@@ -17,7 +17,15 @@ function drawTie(renderer, params, linestartx, lineendx, selectables) {
 		klass = "abcjs-hint";
 	var fudgeY = params.fixedY ? 1.5 : 0; // TODO-PER: This just compensates for drawArc, which contains too much knowledge of ties and slurs.
 	var el = drawArc(renderer, params.startX, params.endX, params.startY + fudgeY, params.endY + fudgeY, params.above, klass, params.isTie, params.dotted);
-	selectables.wrapSvgEl({ el_type: "slur", startChar: -1, endChar: -1 }, el);
+	var startChar = -1
+	// This gets the start and end points of the contents of the slur. We assume that the parenthesis are just to the outside of that.
+	if (params.anchor1 && !params.isTie)
+		startChar = params.anchor1.parent.abcelem.startChar - 1
+	var endChar = -1
+	if (params.anchor2 && !params.isTie)
+		endChar = params.anchor2.parent.abcelem.endChar + 1
+
+	selectables.wrapSvgEl({ el_type: "slur", startChar: startChar, endChar: endChar }, el);
 	return [el];
 }
 

package/src/write/engraver-controller.js

@@ -40,6 +40,7 @@ var EngraverController = function (paper, params) {
 	this.responsive = params.responsive;
 	this.space = 3 * spacing.SPACE;
 	this.initialClef = params.initialClef;
+	this.expandToWidest = !!params.expandToWidest;
 	this.scale = params.scale ? parseFloat(params.scale) : 0;
 	this.classes = new Classes({ shouldAddClasses: params.add_classes });
 	if (!(this.scale > 0.1))
@@ -242,7 +243,12 @@ EngraverController.prototype.engraveTune = function (abcTune, tuneNumber, lineOf
 	this.constructTuneElements(abcTune);
 
 	// Do all the positioning, both horizontally and vertically
-	var maxWidth = layout(this.renderer, abcTune, this.width, this.space);
+	var maxWidth = layout(this.renderer, abcTune, this.width, this.space, this.expandToWidest);
+
+	//Set the top text now that we know the width
+	if (this.expandToWidest && maxWidth > this.width+1) {
+		abcTune.topText = new TopText(abcTune.metaText, abcTune.metaTextInfo, abcTune.formatting, abcTune.lines, maxWidth, this.renderer.isPrint, this.renderer.padding.left, this.renderer.spacing, this.getTextSize);
+	}
 
 	// Deal with tablature for staff
 	if (abcTune.tablatures) {
@@ -256,14 +262,14 @@ EngraverController.prototype.engraveTune = function (abcTune, tuneNumber, lineOf
 
 	if (this.oneSvgPerLine) {
 		var div = this.renderer.paper.svg.parentNode
-		this.svgs = splitSvgIntoLines(div, abcTune.metaText.title, this.responsive)
+		this.svgs = splitSvgIntoLines(this.renderer, div, abcTune.metaText.title, this.responsive)
 	} else {
 		this.svgs = [this.renderer.paper.svg];
 	}
 	setupSelection(this, this.svgs);
 };
 
-function splitSvgIntoLines(output, title, responsive) {
+function splitSvgIntoLines(renderer, output, title, responsive) {
 	// Each line is a top level <g> in the svg. To split it into separate
 	// svgs iterate through each of those and put them in a new svg. Since
 	// they are placed absolutely, the viewBox needs to be manipulated to
@@ -297,7 +303,9 @@ function splitSvgIntoLines(output, title, responsive) {
 			svg.setAttribute("height", height)
 		if (responsive === 'resize')
 			svg.style.position = ''
-		svg.setAttribute("viewBox", "0 " + nextTop + " " + width + " " + height)
+		// TODO-PER: Hack! Not sure why this is needed.
+		var viewBoxHeight = renderer.firefox112 ? height+1 : height
+		svg.setAttribute("viewBox", "0 " + nextTop + " " + width + " " + viewBoxHeight)
 		svg.appendChild(style.cloneNode(true))
 		var titleEl = document.createElement("title")
 		titleEl.innerText = fullTitle