abcjs 6.1.5 → 6.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abcjs",
-  "version": "6.1.5",
+  "version": "6.1.7",
   "description": "Renderer for abc music notation",
   "main": "index.js",
   "types": "types/index.d.ts",
@@ -10,7 +10,8 @@
     "build:basic": "npm run webpack -- --mode development --config-name basic",
     "build:basic-min": "npm run webpack -- --mode production --config-name basic",
     "build:plugin": "npm run webpack -- --mode production --config-name plugin",
-    "test": "echo 'To run tests, open the file tests/all.html in a browser.'",
+    "test-server": "npx http-server",
+    "test": "concurrently \"http-server\" \"npx opener http://localhost:8080/tests/all.html\"",
     "docs:dev": "vuepress dev docs",
     "docs:build": "vuepress build docs",
     "build:analyze": "npm run build:basic -- --env analyze"
@@ -43,15 +44,18 @@
   },
   "homepage": "https://abcjs.net",
   "devDependencies": {
-    "@babel/core": "7.14.3",
-    "@babel/preset-env": "7.14.4",
+    "@babel/core": "7.20.2",
+    "@babel/preset-env": "7.20.2",
     "@tarp/require": "1.4.3",
-    "babel-loader": "8.2.2",
-    "chai": "4.3.4",
-    "mocha": "8.4.0",
+    "babel-loader": "9.1.0",
+    "chai": "4.3.7",
+    "concurrently": "7.5.0",
+    "http-server": "14.1.1",
+    "mocha": "10.1.0",
+    "opener": "1.5.2",
     "vuepress": "2.0.0-beta.26",
-    "vuex": "4.0.0",
-    "webpack-bundle-analyzer": "4.4.2",
-    "webpack-cli": "4.9.0"
+    "vuex": "4.1.0",
+    "webpack-bundle-analyzer": "4.7.0",
+    "webpack-cli": "4.10.0"
   }
 }

package/src/write/abc_abstract_engraver.js

@@ -920,8 +920,11 @@ AbstractEngraver.prototype.createNote = function(elem, nostem, isSingleLineStaff
 
 AbstractEngraver.prototype.addMeasureNumber = function (number, abselem) {
 	var measureNumDim = this.getTextSize.calc(number, "measurefont", 'bar-number');
-	var dx = measureNumDim.width > 18 && abselem.abcelem.type === "treble" ? -7 : 0;
-	abselem.addFixed(new RelativeElement(number, dx, measureNumDim.width, 11+measureNumDim.height / spacing.STEP, {type:"barNumber", dim: this.getTextSize.attr("measurefont", 'bar-number')}));
+	var dx = 0;
+	if (abselem.isClef) // If this is a clef rather than bar line, then the number shouldn't be centered because it could overlap the left side. This is an easy way to let it be centered but move it over, too.
+	 	dx += measureNumDim.width / 2
+	var vert = measureNumDim.width > 10 && abselem.abcelem.type === "treble" ? 13 : 11
+	abselem.addFixed(new RelativeElement(number, dx, measureNumDim.width, vert+measureNumDim.height / spacing.STEP, {type:"barNumber", dim: this.getTextSize.attr("measurefont", 'bar-number')}));
 };
 
 AbstractEngraver.prototype.createBarLine = function (voice, elem, isFirstStaff) {

package/src/write/selection.js

@@ -32,7 +32,7 @@ function getCoord(ev) {
 
 	// when renderer.options.responsive === 'resize' the click coords are in relation to the HTML
 	// element, we need to convert to the SVG viewBox coords
-	if (svg.viewBox.baseVal) { // Firefox passes null to this when no viewBox is given
+	if (svg && svg.viewBox && svg.viewBox.baseVal) { // Firefox passes null to this when no viewBox is given
 		// Chrome makes these values null when no viewBox is given.
 		if (svg.viewBox.baseVal.width !== 0)
 			scaleX = svg.viewBox.baseVal.width / svg.clientWidth
@@ -302,7 +302,7 @@ function mouseUp(ev) {
 	var _ev = ev;
 	if (ev.type === 'touchend' && this.lastTouchMove) {
 		attachMissingTouchEventAttributes(this.lastTouchMove);
-		if (this.lastTouchMove.touches.length > 0)
+		if (this.lastTouchMove && this.lastTouchMove.touches && this.lastTouchMove.touches.length > 0)
 			_ev = this.lastTouchMove.touches[0];
 	}
 
@@ -357,10 +357,10 @@ function notifySelect(target, dragStep, dragMax, dragIndex, ev) {
 	if (target.staffPos)
 		analysis.staffPos = target.staffPos;
 	var closest = ev.target;
-	while (closest && !closest.dataset.name && closest.tagName.toLowerCase() !== 'svg')
+	while (closest && closest.dataset && !closest.dataset.name && closest.tagName.toLowerCase() !== 'svg')
 		closest = closest.parentNode;
 	var parent = ev.target;
-	while (parent && !parent.dataset.index && parent.tagName.toLowerCase() !== 'svg')
+	while (parent && parent.dataset && !parent.dataset.index && parent.tagName.toLowerCase() !== 'svg')
 		parent = parent.parentNode;
 	analysis.name = parent.dataset.name;
 	analysis.clickedName = closest.dataset.name;

package/version.js

@@ -1,3 +1,3 @@
-var version = '6.1.5';
+var version = '6.1.7';
 
 module.exports = version;