abcjs 6.2.1 → 6.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abcjs",
-  "version": "6.2.1",
+  "version": "6.2.2",
   "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'
 };
 

package/src/tablatures/tab-renderer.js

@@ -227,6 +227,7 @@ 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;

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/engraver-controller.js

@@ -256,14 +256,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 +297,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

package/src/write/svg.js

@@ -345,6 +345,16 @@ Svg.prototype.pathToBack = function (attr) {
 	return el;
 };
 
+Svg.prototype.lineToBack = function (attr) {
+	var el = document.createElementNS(svgNS, 'line');
+	var keys = Object.keys(attr)
+	for (var i = 0; i < keys.length; i++)
+		el.setAttribute(keys[i], attr[keys[i]]);
+	this.prepend(el);
+	return el;
+};
+
+
 Svg.prototype.append = function (el) {
 	if (this.currentGroup.length > 0)
 		this.currentGroup[0].appendChild(el);

package/types/index.d.ts

@@ -259,7 +259,7 @@ declare module 'abcjs' {
 		dragColor?: string;
 		dragging?: boolean;
 		foregroundColor?: string;
-		format?: { [attr in FormatAttributes]: any };
+		format?: { [attr in FormatAttributes]?: any };
 		header_only?: boolean;
 		initialClef?: boolean;
 		jazzchords?: boolean;

package/version.js

@@ -1,3 +1,3 @@
-var version = '6.2.1';
+var version = '6.2.2';
 
 module.exports = version;