abcjs 6.3.0 → 6.4.0

package/index.js

@@ -40,6 +40,7 @@ Object.keys(tuneBook).forEach(function (key) {
 });
 
 abcjs.renderAbc = require('./src/api/abc_tunebook_svg');
+abcjs.tuneMetrics = require('./src/api/tune-metrics');
 abcjs.TimingCallbacks = require('./src/api/abc_timing_callbacks');
 
 var glyphs = require('./src/write/creation/glyphs');

package/package.json

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

package/src/api/tune-metrics.js

@@ -0,0 +1,18 @@
+var tunebook = require('./abc_tunebook');
+var EngraverController = require('../write/engraver-controller');
+
+var tuneMetrics = function(abc, params) {
+    function callback(div, tune, tuneNumber, abcString) {
+		div = document.createElement("div");
+		div.setAttribute("style", "visibility: hidden;");
+		document.body.appendChild(div);
+		var engraver_controller = new EngraverController(div, params);
+		var widths = engraver_controller.getMeasureWidths(tune);
+            div.parentNode.removeChild(div);
+        return {sections: widths};
+    }
+
+    return tunebook.renderEngine(callback, "*", abc, params);
+};
+
+module.exports = tuneMetrics;

package/src/data/abc_tune.js

@@ -374,8 +374,9 @@ var Tune = function() {
 					eventHash["event" + voiceTimeMilliseconds].measureStart = true;
 					nextIsBar = false;
 				}
-				if (isTiedToNext)
-					isTiedState = voiceTimeMilliseconds;
+				// TODO-PER: There doesn't seem to be a harm in letting ties be two different notes and it fixes a bug when a tie goes to a new line. If there aren't other problems with this change, then the variable can be removed completely. 
+				// if (isTiedToNext)
+				// 	isTiedState = voiceTimeMilliseconds;
 			}
 		}
 		return { isTiedState: isTiedState, duration: realDuration / timeDivider, nextIsBar: nextIsBar || element.type === 'bar' };
@@ -616,6 +617,16 @@ var Tune = function() {
 	this.deline = function(options) {
 		return delineTune(this.lines, options);
 	}
+	this.findSelectableElement = function(target) {
+		if (this.engraver && this.engraver.selectables)
+			return this.engraver.findSelectableElement(target)
+		return null
+	}
+	this.getSelectableArray = function() {
+		if (this.engraver && this.engraver.selectables)
+			return this.engraver.selectables
+		return []
+	}
 };
 
 module.exports = Tune;

package/src/edit/abc_editarea.js

@@ -44,7 +44,10 @@ try {
 }
 
 var EditArea = function(textareaid) {
-  this.textarea = document.getElementById(textareaid);
+  if (typeof textareaid === "string")
+    this.textarea = document.getElementById(textareaid);
+  else
+    this.textarea = textareaid;
   this.initialText = this.textarea.value;
   this.isDragging = false;
 }

package/src/parse/abc_parse.js

@@ -46,6 +46,8 @@ var Parse = function() {
 			setTiming: tune.setTiming,
 			setUpAudio: tune.setUpAudio,
 			deline: tune.deline,
+			findSelectableElement: tune.findSelectableElement,
+			getSelectableArray: tune.getSelectableArray,
 		};
 		if (tune.lineBreaks)
 			t.lineBreaks = tune.lineBreaks;

package/src/parse/abc_parse_directive.js

@@ -797,6 +797,7 @@ var parseDirective = {};
 			case "pageheight":
 			case "pagewidth":
 			case "rightmargin":
+			case "stafftopmargin":
 			case "staffsep":
 			case "staffwidth":
 			case "subtitlespace":
@@ -1197,6 +1198,11 @@ var parseDirective = {};
 							warn("Directive \"" + cmd + "\" requires a number as a parameter.");
 						tune.formatting.fontboxpadding = tokens[0].floatt;
 						break;
+					case "stafftopmargin":
+						if (tokens.length !== 1 || tokens[0].type !== 'number')
+							warn("Directive \"" + cmd + "\" requires a number as a parameter.");
+						tune.formatting.stafftopmargin = tokens[0].floatt;
+						break;
 					case "stretchlast":
 						var sl = parseStretchLast(tokens);
 						if (sl.value !== undefined)