abcjs 6.1.6 → 6.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abcjs",
-  "version": "6.1.6",
+  "version": "6.1.8",
   "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/data/abc_tune.js

@@ -399,6 +399,8 @@ var Tune = function() {
 
 				var voices = group.voices;
 				for (var v = 0; v < voices.length; v++) {
+					if (voices[v].staff && voices[v].staff.isTabStaff)
+						continue;
 					var noteFound = false;
 					if (!voicesArr[v])
 						voicesArr[v] = [];

package/src/parse/abc_parse.js

@@ -78,6 +78,7 @@ var Parse = function() {
 			this.hasMainTitle = false;
 			this.default_length = 0.125;
 			this.clef = { type: 'treble', verticalPos: 0 };
+			this.octave = 0;
 			this.next_note_duration = 0;
 			this.start_new_line = true;
 			this.is_in_header = true;

package/src/parse/abc_parse_key_voice.js

@@ -408,6 +408,16 @@ var parseKeyVoice = {};
 					multilineVars.clef.staffscale = tokens[0].floatt;
 					tokens.shift();
 					break;
+				case "octave":
+					tokens.shift();
+					if (tokens.length === 0) { warn("Expected = after octave", str, 0); return ret; }
+					token = tokens.shift();
+					if (token.token !== "=") { warn("Expected = after octave", str, token.start); break; }
+					if (tokens.length === 0) { warn("Expected parameter after octave=", str, 0); return ret; }
+					if (tokens[0].type !== 'number') { warn("Expected number after octave", str, tokens[0].start); break; }
+					multilineVars.octave = tokens[0].intt;
+					tokens.shift();
+					break;
 				case "style":
 					tokens.shift();
 					if (tokens.length === 0) { warn("Expected = after style", str, 0); return ret; }
@@ -716,7 +726,6 @@ var parseKeyVoice = {};
 						addNextTokenToVoiceInfo(id, 'staffscale', 'number');
 						break;
 					case 'octave':
-						// TODO-PER: This is accepted, but not implemented, yet.
 						addNextTokenToVoiceInfo(id, 'octave', 'number');
 						break;
 					case 'volume':

package/src/parse/abc_parse_music.js

@@ -1128,6 +1128,7 @@ var getCoreNote = function(line, index, el, canHaveBrokenRhythm) {
 			case 'g':
 				if (state === 'startSlur' || state === 'sharp2' || state === 'flat2' || state === 'pitch') {
 					el.pitch = pitches[line.charAt(index)];
+					el.pitch += 7 * (multilineVars.currentVoice && multilineVars.currentVoice.octave !== undefined ? multilineVars.currentVoice.octave : multilineVars.octave);
 					el.name = line.charAt(index);
 					if (el.accidental)
 						el.name = accMap[el.accidental] + el.name;

package/src/synth/pitches-to-perc.js

@@ -55,6 +55,18 @@ var pitchMap = {
 	n13: "=b",
 	s13: "^b",
 	x13: "b",
+	f14: "_c'",
+	n14: "=c'",
+	s14: "^c'",
+	x14: "c'",
+	f15: "_d'",
+	n15: "=d'",
+	s15: "^d'",
+	x15: "d'",
+	f16: "_e'",
+	n16: "=e'",
+	s16: "^e'",
+	x16: "e'",
 }
 
 function pitchesToPerc(pitchObj) {

package/src/tablatures/instruments/string-patterns.js

@@ -103,7 +103,7 @@ function handleChordNotes(self, notes) {
 
 function noteToNumber(self, note, stringNumber, secondPosition , firstSize) {
   var strings = self.strings;
-  note.checkKeyAccidentals(self.accidentals) ;
+  note.checkKeyAccidentals(self.accidentals, self.measureAccidentals) ;
   if (secondPosition) {
     strings = secondPosition;
   }
@@ -131,6 +131,22 @@ function noteToNumber(self, note, stringNumber, secondPosition , firstSize) {
 }
 
 function toNumber(self, note) {
+  if (note.isAltered || note.natural) {
+    var acc;
+    if (note.isFlat) {
+      if (note.isDouble)
+        acc = "__"
+      else
+        acc = "_"  
+    } else if (note.isSharp) {
+      if (note.isDouble)
+        acc = "^^"
+      else
+        acc = "^"  
+    } else if (note.natural)
+      acc = "="
+    self.measureAccidentals[note.name.toUpperCase()] = acc  
+  }
   var num = null;
   var str = 0;
   var lowestString = self.strings[self.strings.length - 1];
@@ -254,6 +270,7 @@ function StringPatterns(plugin) {
     // override default
     this.highestNote = highestNote;
   }
+  this.measureAccidentals = {}
   this.capo = 0;
   if (capo) {
     this.capo = capo;

package/src/tablatures/instruments/tab-note.js

@@ -115,7 +115,18 @@ TabNote.prototype.isLowerThan = function (note) {
   return false;
 };
 
-TabNote.prototype.checkKeyAccidentals = function(accidentals) {
+TabNote.prototype.checkKeyAccidentals = function(accidentals, measureAccidentals) {
+  if (this.isAltered || this.natural)
+    return
+  if (measureAccidentals[this.name.toUpperCase()]) {
+    switch (measureAccidentals[this.name.toUpperCase()]) {
+      case "__": this.acc = -2; return;
+      case "_": this.acc = -1; return;
+      case "=": this.acc = 0; return;
+      case "^": this.acc = 1; return;
+      case "^^": this.acc = 2; return;
+    }
+  }  
   if (accidentals) {
     var curNote = this.name;
     for (var iii = 0; iii < accidentals.length; iii++) {

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

@@ -27,6 +27,8 @@ function cloneAbsolute(absSrc) {
     if (returned.abcelem.el_type === "note")
       returned.abcelem.el_type = 'tabNumber';
   }
+  // TODO-PER: This fixes the classes because the element isn't created at the right time.
+  absSrc.cloned = returned
   return returned;
 }
 
@@ -226,6 +228,7 @@ TabAbsoluteElements.prototype.build = function (plugin,
         }
         break;
       case 'bar':
+        plugin.semantics.strings.measureAccidentals = {}
         var lastBar = false;
         if (ii === source.children.length-1) {
           // used for final line bar drawing

package/src/tablatures/tab-renderer.js

@@ -228,6 +228,7 @@ TabRenderer.prototype.doLayout = function () {
   for (var ii = 0; ii < nbVoices; ii++) {
     var tabVoice = new VoiceElement(0, 0);
     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;

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/classes.js

@@ -79,6 +79,10 @@ Classes.prototype.generate = function (c) {
 		return "";
 	var ret = [];
 	if (c && c.length > 0) ret.push(c);
+	if (c === "tab-number") // TODO-PER-HACK! straighten out the tablature
+		return ret.join(' ')
+	if (c === "text instrument-name")
+		return "abcjs-text abcjs-instrument-name"	
 	if (this.lineNumber !== null) ret.push("l"+this.lineNumber);
 	if (this.measureNumber !== null) ret.push("m"+this.measureNumber);
 	if (this.measureNumber !== null) ret.push("mm"+this.measureTotal()); // measureNumber is null between measures so this is still the test for measureTotal

package/src/write/draw/absolute.js

@@ -32,6 +32,14 @@ function drawAbsolute(renderer, params, bartop, selectables, staffPos) {
 	}
 	var g = elementGroup.endGroup(klass, params.type);
 	if (g) {
+		// TODO-PER-HACK! This corrects the classes because the tablature is not being created at the right time.
+		if (params.cloned) {
+			params.cloned.overrideClasses = g.className.baseVal
+		}
+		if (params.overrideClasses) {
+			var type = g.classList && g.classList.length > 0 ? g.classList[0] + ' ' : ''
+			g.setAttribute("class", type + params.overrideClasses)
+		}
 		if (isTempo) {
 			params.startChar = params.abcelem.startChar;
 			params.endChar = params.abcelem.endChar;

package/src/write/selection.js

@@ -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.6';
+var version = '6.1.8';
 
 module.exports = version;