@goplayerjuggler/abc-tools 1.0.17 → 1.0.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goplayerjuggler/abc-tools",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "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

@@ -179,6 +179,7 @@ function toggleMeterDoubling(abc, smallMeter, largeMeter, currentMeter) {
 
 	const parsed = parseAbc(abc);
 	const { headerLines, barLines, musicText, bars, meter } = parsed;
+
 	// throw if there's a change of meter or unit length in the tune
 	if (barLines.find((bl) => bl.newMeter || bl.newUnitLength)) {
 		throw new Error("change of meter or unit length not handled");
@@ -269,13 +270,6 @@ function toggleMeterDoubling(abc, smallMeter, largeMeter, currentMeter) {
 				continue;
 			}
 
-			// If the current bar starts with a variant, keep its bar line
-			const currentBarVariant = barStartsWithVariant.get(i);
-			if (currentBarVariant) {
-				barLineDecisions.set(i, { action: "keep" });
-				continue;
-			}
-
 			// This is a complete bar - use its barNumber to decide
 			// Without anacrucis: Remove complete bars with even barNumber (0, 2, 4, ...), keep odd ones (1, 3, 5, ...)
 			// With anacrucis: the other way round!
@@ -287,6 +281,15 @@ function toggleMeterDoubling(abc, smallMeter, largeMeter, currentMeter) {
 				? barLine.barNumber % 2 !== 0
 				: barLine.barNumber % 2 === 0;
 			if (remove) {
+				// Check if current bar starts with variant
+				if (barStartsWithVariant.has(i)) {
+					const variantToken = barStartsWithVariant.get(i);
+					barLinesToConvert.set(variantToken.sourceIndex, {
+						oldLength: variantToken.sourceLength,
+						oldText: variantToken.token
+					});
+				}
+				// Also check if next bar starts with variant
 				const nextBarIdx = i + 1;
 				if (nextBarIdx < bars.length && barStartsWithVariant.has(nextBarIdx)) {
 					const variantToken = barStartsWithVariant.get(nextBarIdx);
@@ -302,6 +305,26 @@ function toggleMeterDoubling(abc, smallMeter, largeMeter, currentMeter) {
 			}
 		}
 
+		//  --- Debugging - may be helpful ----
+		// console.log(
+		// 	"Bar line decisions:",
+		// 	Array.from(barLineDecisions.entries()).map(([i, d]) => ({
+		// 		index: i,
+		// 		barLine: barLines[i]?.text,
+		// 		sourceIndex: barLines[i]?.sourceIndex,
+		// 		action: d.action
+		// 	}))
+		// );
+
+		// console.log(
+		// 	"Bar lines:",
+		// 	barLines.map((bl) => ({ text: bl.text, sourceIndex: bl.sourceIndex }))
+		// );
+		// console.log(
+		// 	"Bars starting with variants:",
+		// 	Array.from(barStartsWithVariant.entries())
+		// );
+
 		// Reconstruct music
 		let newMusic = "";
 		let pos = 0;
@@ -383,10 +406,9 @@ function toggleMeter_4_4_to_4_2(abc, currentMeter) {
 }
 
 const defaultCommentForReelConversion =
-	"*abc-tools: convert reel to M:4/4 & L:1/16*";
-const defaultCommentForHornpipeConversion =
-	"*abc-tools: convert hornpipe to M:4/2*";
-const defaultCommentForJigConversion = "*abc-tools: convert jig to M:12/8*";
+	"*abc-tools: convert to M:4/4 & L:1/16*";
+const defaultCommentForHornpipeConversion = "*abc-tools: convert to M:4/2*";
+const defaultCommentForJigConversion = "*abc-tools: convert to M:12/8*";
 /**
  * Adjusts bar lengths and L, M fields - a 
  * reel written in the normal way (M:4/4 L:1/8) is written

package/src/sort/get-contour.js

@@ -159,7 +159,7 @@ function getContour(
 					avg -= 7;
 				}
 			else
-				while (avg < -0.5) {
+				while (avg < -5) {
 					sortKey.forEach((c, i) => (sortKey[i] = shiftChar(c, 1)));
 					avg += 7;
 				}