Remove manually added *mclef interpretations

craigsapp/humlib#95
WolfgangDrescher · Feb 12, 2024 · 6974efa · 6974efa
1 parent 2ea73f5
commit 6974efa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 30 deletions.
diff --git a/scripts/extract-cadences.mjs b/scripts/extract-cadences.mjs
@@ -37,19 +37,6 @@ function tokenIsDataRecord(token, includeNullToken = false) {
     return !token.startsWith('!') && !token.startsWith('*') && !token.startsWith('=') && !(!includeNullToken && token === '.');
 }
 
-function addMclefInterpretations(file, kern) {
-    const mclefLine = execSync(`cat ${file}`).toString().split('\n').find((line) => line.includes('*mclef'));
-    if (mclefLine) {
-        kern = kern.split('\n').map(line => {
-            if (mclefLine && line.includes('*clef')) {
-                return `${line}\n${mclefLine}`;
-            }
-            return line;
-        }).join('\n');
-    }
-    return kern;
-}
-
 execSync(`rm -rf ${cadencesKernPath}`);
 execSync(`mkdir -p ${cadencesKernPath}`);
 execSync(`rm -rf ${cadencesYamlPath}`);
@@ -86,8 +73,7 @@ getFiles(pathToKernScores).forEach(file => {
                 const startLine = startLineIndex + 1;
                 const endLine = endLineIndex + 1;
 
-                const kern = execSync(`cat ${file} | myank -I -l ${startLine}-${endLine} --hide-starting --hide-ending`).toString().trim();
-                const cadenceKern = addMclefInterpretations(file, kern);
+                const cadenceKern = execSync(`cat ${file} | myank -I -l ${startLine}-${endLine} --hide-starting --hide-ending`).toString().trim();
                 const cadenceFilename = `${uuidv5(cadenceKern, UUID_NAMESPACE)}.krn`;
                 fs.writeFileSync(`${cadencesKernPath}${cadenceFilename}`, cadenceKern);
 

diff --git a/scripts/extract-imitations.mjs b/scripts/extract-imitations.mjs
@@ -105,19 +105,6 @@ function formatImitationKern(kern, upperStartBeat, upperEndBeat, lowerStartBeat,
     return formattedLines.join('\n');
 }
 
-function addMclefInterpretations(file, kern) {
-    const mclefLine = execSync(`cat ${file}`).toString().split('\n').find((line) => line.includes('*mclef'));
-    if (mclefLine) {
-        kern = kern.split('\n').map(line => {
-            if (mclefLine && line.includes('*clef')) {
-                return `${line}\n${mclefLine}`;
-            }
-            return line;
-        }).join('\n');
-    }
-    return kern;
-}
-
 execSync(`rm -rf ${imitationsKernPath}`);
 execSync(`mkdir -p ${imitationsKernPath}`);
 execSync(`rm -rf ${imitationsYamlPath}`);
@@ -169,8 +156,7 @@ getFiles(pathToKernScores).forEach(file => {
                 const endBeat = Math.max(upperEndBeat, lowerEndBeat);
 
                 const formattedKern = formatImitationKern(kern, upperStartBeat, upperEndBeat, lowerStartBeat, lowerEndBeat);
-                const tmpKern = execSync(`echo ${escapeShell(formattedKern)} | extractxx -f 1-4 | myank -I -l ${startLine}-${endLine} --hide-starting --hide-ending | echo -ne "$(cat)" | cat - <(echo -e -n "\n!!!RDF**kern: @ = marked note, color=#ccc\n!!!RDF**kern: { = phrase, brack")`, { shell: '/bin/bash' }).toString().trim();
-                const imitationKern = addMclefInterpretations(file, tmpKern);
+                const imitationKern = execSync(`echo ${escapeShell(formattedKern)} | extractxx -f 1-4 | myank -I -l ${startLine}-${endLine} --hide-starting --hide-ending | echo -ne "$(cat)" | cat - <(echo -e -n "\n!!!RDF**kern: @ = marked note, color=#ccc\n!!!RDF**kern: { = phrase, brack")`, { shell: '/bin/bash' }).toString().trim();
                 const imitationFilename = `${uuidv5(imitationKern, UUID_NAMESPACE)}.krn`;
                 fs.writeFileSync(`${imitationsKernPath}${imitationFilename}`, imitationKern);