Changes to ensure exclusion of metalanguage in AECD as per #106

Author: fbanados

lib/convert/AECD.js

@@ -146,10 +146,11 @@ class Entry {
    */
   static #splitDefinition(definition) {
     return definition
-    .split(/[1-9]\./u)                   // divide definition by sense numbers
-    .filter(Boolean)                     // remove empty strings
-    .map(str => str.trim())              // trim white space
-    .map(str => str.replace(/,$/u, ``)); // remove trailing commas
+    .split(';')                   // divide definition by semicolon
+    .filter(Boolean)                      // remove empty strings
+    .map(str => str.trim())               // trim white space
+    .map(str => str.replace(/,$/u, ``))   // remove trailing commas
+    .map(str => str.replace(/\.$/u, ``)); // and trailiing periods.
   }
 
   /**

lib/convert/dlx2importjson.js

@@ -74,6 +74,14 @@ const EnglishFunctionWords = [
 
 const EnglishFunctionWordsRegExp = new RegExp(`\\b(${ EnglishFunctionWords.join(`|`) })\\b`, `giu`);
 
+const AlwaysRemovedKeywords = [
+  `Var\\.`,
+  `Alt\\.`
+]
+
+const AlwaysRemovedKeywordsRegExp = new RegExp(`\\b(${ AlwaysRemovedKeywords.join(`|`) })`, `giu`);
+
+
 /**
  * Converts a single Plains Cree entry in DaFoDiL format to import JSON format.
  * @param   {Object} dlxEntry The DaFoDiL entry to convert.
@@ -137,7 +145,7 @@ function convertEntry({
 
     const isPronoun         = pos === `PrA`;
     const displayDefinition = original;
-    const coreDefinition    = removeParentheticals(definition);
+    const coreDefinition    = removeParentheticals(definition.replaceAll(AlwaysRemovedKeywordsRegExp, ``));
 
     const semanticDefinition = createSemanticDefinition(definition, {
       i,
@@ -187,7 +195,7 @@ function convertEntry({
 
 function createSemanticDefinition(definition, { isPronoun, literalMeaning, notes, scientificName }) {
 
-  let semanticDefinition = definition;
+  let semanticDefinition = definition.replaceAll(AlwaysRemovedKeywordsRegExp, ``);
   let match;
 
   while ((match = parentheticalRegExp.exec(semanticDefinition)) !== null) {