@goplayerjuggler/abc-tools 1.0.22 → 1.0.23

package/package.json

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

package/src/manipulator.js

@@ -175,6 +175,8 @@ function hasAnacrucis(abc) {
  * @throws {Error} If the current meter doesn't match either smallMeter or largeMeter
  */
 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 (!currentMeter) currentMeter = getMeter(abc);
 
 	const isSmall =
@@ -649,7 +651,7 @@ function convertStandardReel(
 	}
 
 	let result = //toggleMeter_4_4_to_4_2(reel, meter);
-		toggleMeterDoubling(reel, [4, 4], [4, 2], meter);
+		toggleMeterDoubling(reel, meter, [4, 2], meter);
 	if (comment) {
 		result = result.replace(/(\nK:)/, `\nN:${comment}$1`);
 	}
@@ -1074,8 +1076,8 @@ function canDoubleBarLength(abc) {
 			!abc.match(/\[L:/) &&
 			(((rhythm === "reel" || rhythm === "hornpipe") &&
 				l.equals(new Fraction(1, 8)) &&
-				meter[0] === 4 &&
-				meter[1] === 4) ||
+				((meter[0] === 4 && meter[1] === 4) ||
+					(meter[0] === 2 && meter[1] === 2))) ||
 				(rhythm === "jig" && meter[0] === 6 && meter[1] === 8))) ||
 		(rhythm === "polka" && meter[0] === 2 && meter[1] === 4)
 	);

package/src/sort/contour-sort.js

@@ -204,8 +204,10 @@ function sort(arr, options = {}) {
 		],
 		applySwingTransform = ["hornpipe", "barndance", "fling", "mazurka"],
 		getAbc: getAbcForContour = getAbcForContour_default,
-		getContourOptions = {
-			withSvg: true
+		getContourOptions = () => {
+			return {
+				withSvg: true
+			};
 		}
 	} = options;
 
@@ -223,13 +225,21 @@ function sort(arr, options = {}) {
 	for (const tune of arr) {
 		if (!tune.contour) {
 			try {
+				const contourOptions = getContourOptions();
+				// if (
+				// 	tune.title?.indexOf("oldrick") >= 0 ||
+				// ) {
+				// 	console.log("debug");
+				// }
 				const withSwingTransform =
 					applySwingTransform.indexOf(tune.rhythm) >= 0;
 				const shortAbc = getAbcForContour(tune);
 
 				if (shortAbc) {
-					getContourOptions.withSwingTransform = withSwingTransform;
-					tune.contour = getContour(shortAbc, getContourOptions);
+					contourOptions.withSwingTransform = withSwingTransform;
+					if (Object.hasOwn(tune, "contourShift"))
+						contourOptions.contourShift = tune.contourShift;
+					tune.contour = getContour(shortAbc, contourOptions);
 				}
 			} catch (error) {
 				console.log(error);