@goplayerjuggler/abc-tools 1.0.23 → 1.0.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goplayerjuggler/abc-tools",
-  "version": "1.0.23",
+  "version": "1.0.25",
   "description": "sorting algorithm and implementation for ABC tunes; plus other tools for parsing and manipulating ABC tunes",
   "main": "src/index.js",
   "scripts": {

package/src/incipit.js

@@ -296,12 +296,13 @@ function getIncipit(data) {
 			(currentMeter[0] === 4 &&
 				currentMeter[1] === 2 &&
 				unitLength.den === 8) ||
-			(currentMeter[0] === 12 && currentMeter[1] === 8)
-		) {
+			(currentMeter[0] === 12 && currentMeter[1] === 8) ||
+			(currentMeter[0] >= 12 && currentMeter[0] < 16)
+		)
 			numBars = new Fraction(3, 2);
-		} else if (currentMeter[0] === 3 && currentMeter[1] === 4) {
+		else if (currentMeter[0] === 3 && [4, 8].indexOf(currentMeter[1]) >= 0)
 			numBars = 3;
-		}
+		else if (currentMeter[0] >= 16) numBars = 1;
 	}
 	abc = sanitise(abc);
 	return getFirstBars(abc, numBars, withAnacrucis, false, { all: true });

package/src/manipulator.js

@@ -176,7 +176,7 @@ function hasAnacrucis(abc) {
  */
 function toggleMeterDoubling(abc, smallMeter, largeMeter, currentMeter) {
 	//if no L: header at all: add one
-	if (!/\nL:\s*1\/8/.test(abc)) abc = abc.replace("\nK:", "\nL:1/8\nK:");
+	if (!/\nL:\s*1\/\d+/.test(abc)) abc = abc.replace("\nK:", "\nL:1/8\nK:");
 	if (!currentMeter) currentMeter = getMeter(abc);
 
 	const isSmall =
@@ -725,6 +725,30 @@ function convertStandardHornpipe(
 	}
 	return result;
 }
+
+/**
+ * Doubles the bar length of an ABC string when the
+ * ABC is eligible (as determined by canDoubleBarLength()).
+ * @param {string} abc
+ * @param {string} rhythm
+ * @returns {string}
+ */
+function maybeConvertStandardTune(abc, rhythm) {
+	if (!canDoubleBarLength(abc, { rhythm })) return abc;
+	switch (rhythm) {
+		case "reel":
+			return convertStandardReel(abc);
+		case "jig":
+			return convertStandardJig(abc);
+		case "polka":
+			return convertStandardPolka(abc);
+		case "hornpipe":
+			return convertStandardHornpipe(abc);
+		default:
+			return abc;
+	}
+}
+
 function doubleBarLength(abc, comment = null) {
 	const meter = getMeter(abc);
 	if (!Array.isArray(meter) || !meter) {
@@ -1061,10 +1085,12 @@ function getFirstBars(
 	)}`;
 }
 
-function canDoubleBarLength(abc) {
-	const meter = getMeter(abc),
+function canDoubleBarLength(abc, info = {}) {
+	const {
+		meter = getMeter(abc),
 		l = getUnitLength(abc),
-		rhythm = getHeaderValue(abc, "R");
+		rhythm = getHeaderValue(abc, "R")
+	} = info;
 	if (
 		!rhythm ||
 		["reel", "hornpipe", "jig", "polka"].indexOf(rhythm.toLowerCase()) < 0
@@ -1125,6 +1151,7 @@ module.exports = {
 	filterHeaders,
 	getFirstBars,
 	hasAnacrucis,
+	maybeConvertStandardTune,
 	normaliseKey,
 	toggleMeter_4_4_to_4_2,
 	toggleMeter_6_8_to_12_8,