@goplayerjuggler/abc-tools 1.0.19 → 1.0.20

package/package.json

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

@@ -620,6 +620,7 @@ function toggleMeter_4_4_to_4_2(abc, currentMeter) {
 const defaultCommentForReelConversion =
 	"*abc-tools: convert to M:4/4 & L:1/16*";
 const defaultCommentForHornpipeConversion = "*abc-tools: convert to M:4/2*";
+const defaultCommentForPolkaConversion = "*abc-tools: convert to M:4/4*";
 const defaultCommentForJigConversion = "*abc-tools: convert to M:12/8*";
 /**
  * Adjusts bar lengths and L, M fields - a 
@@ -682,6 +683,20 @@ function convertStandardJig(jig, comment = defaultCommentForJigConversion) {
 	return result;
 }
 
+function convertStandardPolka(t, comment = defaultCommentForPolkaConversion) {
+	const meter = getMeter(t);
+	if (!Array.isArray(meter) || !meter || !meter[0] === 2 || !meter[1] === 4) {
+		throw new Error("invalid meter");
+	}
+
+	let result = //toggleMeter_4_4_to_4_2(reel, meter);
+		toggleMeterDoubling(t, [2, 4], [4, 4], meter);
+	if (comment) {
+		result = result.replace(/(\nK:)/, `\nN:${comment}$1`);
+	}
+	return result;
+}
+
 /**
  * Adjusts bar lengths and M field to alter a
  * hornpipe written in the normal way (M:6/8) so it’s
@@ -792,6 +807,19 @@ function convertToStandardJig(jig, comment = defaultCommentForJigConversion) {
 	return result;
 }
 
+function convertToStandardPolka(t, comment = defaultCommentForPolkaConversion) {
+	const meter = getMeter(t);
+	if (!Array.isArray(meter) || !meter || !meter[0] === 4 || !meter[1] === 4) {
+		throw new Error("invalid meter");
+	}
+
+	let result = toggleMeterDoubling(t, [2, 4], [4, 4], meter);
+	if (comment) {
+		result = result.replace(`\nN:${comment}`, "");
+	}
+	return result;
+}
+
 function convertToStandardHornpipe(
 	hornpipe,
 	comment = defaultCommentForHornpipeConversion
@@ -1033,21 +1061,19 @@ function canDoubleBarLength(abc) {
 		rhythm = getHeaderValue(abc, "R");
 	if (
 		!rhythm ||
-		["reel", "hornpipe", "jig"].indexOf(rhythm.toLowerCase()) < 0
+		["reel", "hornpipe", "jig", "polka"].indexOf(rhythm.toLowerCase()) < 0
 	) {
 		return false;
 	}
 	return (
-		!abc.match(/\[M:/) && //inline meter marking
-		!abc.match(/\[L:/) &&
-		(((rhythm === "reel" || rhythm === "hornpipe") &&
-			l.equals(new Fraction(1, 8)) &&
-			meter[0] === 4 &&
-			meter[1] === 4) ||
-			(rhythm === "jig" &&
+		(!abc.match(/\[M:/) && //inline meter marking
+			!abc.match(/\[L:/) &&
+			(((rhythm === "reel" || rhythm === "hornpipe") &&
 				l.equals(new Fraction(1, 8)) &&
-				meter[0] === 6 &&
-				meter[1] === 8))
+				meter[0] === 4 &&
+				meter[1] === 4) ||
+				(rhythm === "jig" && meter[0] === 6 && meter[1] === 8))) ||
+		(rhythm === "polka" && meter[0] === 2 && meter[1] === 4)
 	);
 }
 function canHalveBarLength(abc) {
@@ -1056,17 +1082,11 @@ function canHalveBarLength(abc) {
 		rhythm = getHeaderValue(abc, "R");
 	if (
 		!rhythm ||
-		["reel", "hornpipe", "jig"].indexOf(rhythm.toLowerCase()) < 0
+		["reel", "hornpipe", "jig", "polka"].indexOf(rhythm.toLowerCase()) < 0
 	) {
 		return false;
 	}
 
-	if (
-		!rhythm ||
-		["reel", "hornpipe", "jig"].indexOf(rhythm.toLowerCase()) < 0
-	) {
-		return false;
-	}
 	return (
 		!abc.match(/\[M:/) && //inline meter marking
 		!abc.match(/\[L:/) &&
@@ -1078,10 +1098,8 @@ function canHalveBarLength(abc) {
 				l.equals(new Fraction(1, 8)) &&
 				meter[0] === 4 &&
 				meter[1] === 2) ||
-			(rhythm === "jig" &&
-				l.equals(new Fraction(1, 8)) &&
-				meter[0] === 12 &&
-				meter[1] === 8))
+			(rhythm === "jig" && meter[0] === 12 && meter[1] === 8) ||
+			(rhythm === "polka" && meter[0] === 4 && meter[1] === 4))
 	);
 }
 
@@ -1090,9 +1108,11 @@ module.exports = {
 	canHalveBarLength,
 	convertStandardJig,
 	convertStandardHornpipe,
+	convertStandardPolka,
 	convertStandardReel,
 	convertToStandardJig,
 	convertToStandardHornpipe,
+	convertToStandardPolka,
 	convertToStandardReel,
 	defaultCommentForReelConversion,
 	doubleBarLength,

package/src/parse/accidental-helpers.js

@@ -135,12 +135,7 @@ function getBarAccidentals(barTokens, keyAccidentals) {
 
 		const noteInfos = extractNoteInfo(token);
 
-		for (const {
-			noteLetter,
-			octaveMarkers,
-			accidental,
-			noteWithOctave
-		} of noteInfos) {
+		for (const { noteLetter, accidental, noteWithOctave } of noteInfos) {
 			const baseNoteLetter = noteLetter.toUpperCase();
 
 			if (accidental) {
@@ -171,8 +166,7 @@ function getBarAccidentals(barTokens, keyAccidentals) {
 function addAccidentalsForMergedBar(
 	secondBarTokens,
 	firstBarAccidentals,
-	keyAccidentals,
-	musicText
+	keyAccidentals
 ) {
 	const modifiedTokens = [];
 	const secondBarAccidentals = new Map();
@@ -206,12 +200,7 @@ function addAccidentalsForMergedBar(
 		let needsModification = false;
 		const modificationsNeeded = [];
 
-		for (const {
-			noteLetter,
-			octaveMarkers,
-			accidental,
-			noteWithOctave
-		} of noteInfos) {
+		for (const { noteLetter, accidental, noteWithOctave } of noteInfos) {
 			const baseNoteLetter = noteLetter.toUpperCase();
 			const firstBarAccidental = firstBarAccidentals.get(noteWithOctave);
 			const keyAccidental = keyAccidentals.get(baseNoteLetter) || null;
@@ -347,12 +336,7 @@ function removeRedundantAccidentals(
 		let needsModification = false;
 		const modificationsNeeded = [];
 
-		for (const {
-			noteLetter,
-			octaveMarkers,
-			accidental,
-			noteWithOctave
-		} of noteInfos) {
+		for (const { noteLetter, accidental, noteWithOctave } of noteInfos) {
 			const baseNoteLetter = noteLetter.toUpperCase();
 			const keyAccidental = keyAccidentals.get(baseNoteLetter) || null;
 			const currentAccidental = secondHalfAccidentals.get(noteWithOctave);
@@ -422,10 +406,9 @@ function removeRedundantAccidentals(
 /**
  * Reconstruct music text from tokens
  * @param {Array<object>} tokens - Array of token objects
- * @param {string} originalMusicText - Original music text for spacing reference
  * @returns {string} - Reconstructed music text
  */
-function reconstructMusicFromTokens(tokens, originalMusicText) {
+function reconstructMusicFromTokens(tokens) {
 	if (tokens.length === 0) return "";
 
 	let result = "";