tpmkms 9.4.5-beta.4 → 9.4.5-beta.6

package/common/latin_helpers.js

@@ -0,0 +1,358 @@
+function wordPlusInflectedWord(choice) {
+  const inflected_word = choice.word
+  const word = inflected_word.normalize('NFKD').replace(/[^\x00-\x7F]/g, '');
+  choice.inflected_word = inflected_word
+  choice.word = word
+  return choice
+}
+
+function getDeclensions(nominative, genitive = null) {
+  // Normalize input
+  nominative = nominative.toLowerCase().trim();
+  genitive = genitive ? genitive.toLowerCase().trim() : null;
+
+  // Regular expressions for declension identification
+  const firstDeclension = /a$/;
+  const secondDeclensionUs = /us$/;
+  const secondDeclensionEr = /er$/;
+  const secondDeclensionUm = /um$/;
+  const fourthDeclensionUs = /us$/; // Needs context (genitive)
+  const fourthDeclensionU = /u$/;
+  const fifthDeclension = /es$/;
+
+  // Irregular nouns
+  const irregularNouns = {
+    vis: {
+      declension: "3rd-i",
+      forms: [
+        { declension: "nominative", number: "singular", ending: "vis", word: "vis" },
+        { declension: "genitive", number: "singular", ending: "vis", word: "vis" },
+        { declension: "dative", number: "singular", ending: "vi", word: "vi" },
+        { declension: "accusative", number: "singular", ending: "vim", word: "vim" },
+        { declension: "ablative", number: "singular", ending: "vi", word: "vi" },
+        { declension: "nominative", number: "plural", ending: "vires", word: "vires" },
+        { declension: "genitive", number: "plural", ending: "virium", word: "virium" },
+        { declension: "dative", number: "plural", ending: "viribus", word: "viribus" },
+        { declension: "accusative", number: "plural", ending: "vires", word: "vires" },
+        { declension: "ablative", number: "plural", ending: "viribus", word: "viribus" }
+      ].map( wordPlusInflectedWord )
+    },
+    domus: {
+      declension: "4th",
+      forms: [
+        { declension: "nominative", number: "singular", ending: "domus", word: "domus" },
+        { declension: "genitive", number: "singular", ending: "ūs", word: "domūs" },
+        { declension: "dative", number: "singular", ending: "uī", word: "domuī" },
+        { declension: "accusative", number: "singular", ending: "um", word: "domum" },
+        { declension: "ablative", number: "singular", ending: "ō", word: "domō" },
+        { declension: "nominative", number: "plural", ending: "ūs", word: "domūs" },
+        { declension: "genitive", number: "plural", ending: "uum", word: "domuum" },
+        { declension: "dative", number: "plural", ending: "ibus", word: "domibus" },
+        { declension: "accusative", number: "plural", ending: "ūs", word: "domūs" },
+        { declension: "ablative", number: "plural", ending: "ibus", word: "domibus" },
+        { declension: "vocative", number: "singular", ending: "domus", word: "domus" }
+      ].map( wordPlusInflectedWord )
+    }
+  };
+
+  // Helper to get stem
+  function getStem(noun, declension, gen) {
+    if (irregularNouns[noun]) return null; // Handled separately
+    if (declension === "1st") return noun.slice(0, -1); // Remove -a
+    if (declension === "2nd-us") return noun.slice(0, -2); // Remove -us
+    if (declension === "2nd-er") {
+      const knownErWithE = ["puer", "liber", "vir"];
+      return knownErWithE.includes(noun) ? noun : noun.slice(0, -2) + "r"; // Remove -er, add r for ager
+    }
+    if (declension === "2nd-um") return noun.slice(0, -2); // Remove -um
+    if (declension === "4th-us") return noun.slice(0, -2); // Remove -us
+    if (declension === "4th-u") return noun.slice(0, -1); // Remove -u only
+    if (declension === "5th") return noun.slice(0, -2); // Remove -es
+    if (declension === "3rd" || declension === "3rd-i") {
+      if (!gen) throw new Error("Genitive required for 3rd declension.");
+      return gen.slice(0, -2); // Remove -is from genitive
+    }
+    return null;
+  }
+
+  // Determine declension
+  let declension = null;
+  let isNeuter = false;
+  if (irregularNouns[nominative]) {
+    declension = irregularNouns[nominative].declension;
+  } else if (firstDeclension.test(nominative)) {
+    declension = "1st";
+  } else if (secondDeclensionUs.test(nominative)) {
+    // Differentiate 2nd vs 4th using genitive if provided
+    if (genitive && genitive.endsWith("ūs")) declension = "4th-us";
+    else declension = "2nd-us";
+  } else if (secondDeclensionEr.test(nominative)) {
+    declension = "2nd-er";
+  } else if (secondDeclensionUm.test(nominative)) {
+    declension = "2nd-um";
+    isNeuter = true;
+  } else if (fourthDeclensionU.test(nominative)) {
+    declension = "4th-u";
+    isNeuter = true;
+  } else if (fifthDeclension.test(nominative)) {
+    declension = "5th";
+  } else if (genitive) {
+    // Assume 3rd declension if genitive provided and no other match
+    const iStemNouns = ["navis", "mare", "animal"];
+    declension = iStemNouns.includes(nominative) ? "3rd-i" : "3rd";
+    if (nominative === "mare") isNeuter = true;
+  } else {
+    return [{ declension: "error", number: null, ending: null, word: "Invalid noun or missing genitive for 3rd declension." }];
+  }
+
+  // Handle irregular nouns
+  if (irregularNouns[nominative]) {
+    return irregularNouns[nominative].forms;
+  }
+
+  // Get stem
+  let stem;
+  try {
+    stem = getStem(nominative, declension, genitive);
+  } catch (e) {
+    return [{ declension: "error", number: null, ending: null, word: e.message }];
+  }
+  if (!stem) return [{ declension: "error", number: null, ending: null, word: "Unable to determine stem." }];
+
+  // Define endings for each declension
+  const endings = {
+    "1st": {
+      nominativeSingular: { ending: "a", number: "singular" },
+      genitiveSingular: { ending: "ae", number: "singular" },
+      dativeSingular: { ending: "ae", number: "singular" },
+      accusativeSingular: { ending: "am", number: "singular" },
+      ablativeSingular: { ending: "ā", number: "singular" },
+      nominativePlural: { ending: "ae", number: "plural" },
+      genitivePlural: { ending: "ārum", number: "plural" },
+      dativePlural: { ending: "īs", number: "plural" },
+      accusativePlural: { ending: "ās", number: "plural" },
+      ablativePlural: { ending: "īs", number: "plural" },
+      vocativeSingular: { ending: "a", number: "singular" }
+    },
+    "2nd-us": {
+      nominativeSingular: { ending: "us", number: "singular" },
+      genitiveSingular: { ending: "ī", number: "singular" },
+      dativeSingular: { ending: "ō", number: "singular" },
+      accusativeSingular: { ending: "um", number: "singular" },
+      ablativeSingular: { ending: "ō", number: "singular" },
+      nominativePlural: { ending: "ī", number: "plural" },
+      genitivePlural: { ending: "ōrum", number: "plural" },
+      dativePlural: { ending: "īs", number: "plural" },
+      accusativePlural: { ending: "ōs", number: "plural" },
+      ablativePlural: { ending: "īs", number: "plural" },
+      vocativeSingular: { ending: "e", number: "singular" }
+    },
+    "2nd-er": {
+      nominativeSingular: { ending: nominative, number: "singular" },
+      genitiveSingular: { ending: "ī", number: "singular" },
+      dativeSingular: { ending: "ō", number: "singular" },
+      accusativeSingular: { ending: nominative === "puer" || nominative === "liber" || nominative === "ager" ? "um" : "rum", number: "singular" },
+      ablativeSingular: { ending: "ō", number: "singular" },
+      nominativePlural: { ending: "ī", number: "plural" },
+      genitivePlural: { ending: "ōrum", number: "plural" },
+      dativePlural: { ending: "īs", number: "plural" },
+      accusativePlural: { ending: "ōs", number: "plural" },
+      ablativePlural: { ending: "īs", number: "plural" },
+      vocativeSingular: { ending: nominative, number: "singular" }
+    },
+    "2nd-um": {
+      nominativeSingular: { ending: "um", number: "singular" },
+      genitiveSingular: { ending: "ī", number: "singular" },
+      dativeSingular: { ending: "ō", number: "singular" },
+      accusativeSingular: { ending: "um", number: "singular" },
+      ablativeSingular: { ending: "ō", number: "singular" },
+      nominativePlural: { ending: "a", number: "plural" },
+      genitivePlural: { ending: "ōrum", number: "plural" },
+      dativePlural: { ending: "īs", number: "plural" },
+      accusativePlural: { ending: "a", number: "plural" },
+      ablativePlural: { ending: "īs", number: "plural" },
+      vocativeSingular: { ending: "um", number: "singular" }
+    },
+    "3rd": {
+      nominativeSingular: { ending: nominative, number: "singular" },
+      genitiveSingular: { ending: "is", number: "singular" },
+      dativeSingular: { ending: "ī", number: "singular" },
+      accusativeSingular: { ending: isNeuter ? nominative : "em", number: "singular" },
+      ablativeSingular: { ending: "e", number: "singular" },
+      nominativePlural: { ending: isNeuter ? "a" : "ēs", number: "plural" },
+      genitivePlural: { ending: "um", number: "plural" },
+      dativePlural: { ending: "ibus", number: "plural" },
+      accusativePlural: { ending: isNeuter ? "a" : "ēs", number: "plural" },
+      ablativePlural: { ending: "ibus", number: "plural" },
+      vocativeSingular: { ending: nominative, number: "singular" }
+    },
+    "3rd-i": {
+      nominativeSingular: { ending: nominative, number: "singular" },
+      genitiveSingular: { ending: "is", number: "singular" },
+      dativeSingular: { ending: "ī", number: "singular" },
+      accusativeSingular: { ending: isNeuter ? nominative : "em", number: "singular" },
+      ablativeSingular: { ending: isNeuter ? "ī" : "e", number: "singular" },
+      nominativePlural: { ending: isNeuter ? "ia" : "ēs", number: "plural" },
+      genitivePlural: { ending: "ium", number: "plural" },
+      dativePlural: { ending: "ibus", number: "plural" },
+      accusativePlural: { ending: isNeuter ? "ia" : "ēs", number: "plural" },
+      ablativePlural: { ending: "ibus", number: "plural" },
+      vocativeSingular: { ending: nominative, number: "singular" }
+    },
+    "4th-us": {
+      nominativeSingular: { ending: "us", number: "singular" },
+      genitiveSingular: { ending: "ūs", number: "singular" },
+      dativeSingular: { ending: "uī", number: "singular" },
+      accusativeSingular: { ending: "um", number: "singular" },
+      ablativeSingular: { ending: "ū", number: "singular" },
+      nominativePlural: { ending: "ūs", number: "plural" },
+      genitivePlural: { ending: "uum", number: "plural" },
+      dativePlural: { ending: "ibus", number: "plural" },
+      accusativePlural: { ending: "ūs", number: "plural" },
+      ablativePlural: { ending: "ibus", number: "plural" },
+      vocativeSingular: { ending: "us", number: "singular" }
+    },
+    "4th-u": {
+      nominativeSingular: { ending: "ū", number: "singular" },
+      genitiveSingular: { ending: "ūs", number: "singular" },
+      dativeSingular: { ending: "ū", number: "singular" },
+      accusativeSingular: { ending: "ū", number: "singular" },
+      ablativeSingular: { ending: "ū", number: "singular" },
+      nominativePlural: { ending: "ua", number: "plural" },
+      genitivePlural: { ending: "uum", number: "plural" },
+      dativePlural: { ending: "ibus", number: "plural" },
+      accusativePlural: { ending: "ua", number: "plural" },
+      ablativePlural: { ending: "ibus", number: "plural" },
+      vocativeSingular: { ending: "ū", number: "singular" }
+    },
+    "5th": {
+      nominativeSingular: { ending: "ēs", number: "singular" },
+      genitiveSingular: { ending: "eī", number: "singular" },
+      dativeSingular: { ending: "eī", number: "singular" },
+      accusativeSingular: { ending: "em", number: "singular" },
+      ablativeSingular: { ending: "ē", number: "singular" },
+      nominativePlural: { ending: "ēs", number: "plural" },
+      genitivePlural: { ending: "ērum", number: "plural" },
+      dativePlural: { ending: "ēbus", number: "plural" },
+      accusativePlural: { ending: "ēs", number: "plural" },
+      ablativePlural: { ending: "ēbus", number: "plural" },
+      vocativeSingular: { ending: "ēs", number: "singular" }
+    }
+  };
+
+  // Generate forms
+  const forms = [];
+  for (const caseName in endings[declension]) {
+    const [caseType, number] = caseName.match(/([a-zA-Z]+)(Singular|Plural)/).slice(1);
+    const ending = endings[declension][caseName].ending;
+    const word = ending === nominative ? nominative : stem + ending;
+    forms.push(wordPlusInflectedWord({
+      declension: caseType.toLowerCase(),
+      number: number.toLowerCase(),
+      ending,
+      word,
+    }));
+  }
+
+  return forms;
+}
+
+function getIsIOType(infinitive) {
+  const thirdIOVerbs = [
+    'capere',   // to take, seize
+    'cupere',   // to desire
+    'facere',   // to make, do
+    'iacere',   // to throw
+    'quaerere', // to seek, ask
+    'sapere',   // to know, taste
+    'sedēre'    // to sit (semi-deponent)
+  ];
+
+  return thirdIOVerbs.includes(infinitive);
+}
+
+function conjugateVerb(infinitive) {
+  if (typeof infinitive !== 'string' || !infinitive.endsWith('re')) {
+    throw new Error('Input must be a Latin verb infinitive ending in -re');
+  }
+
+  let conjugation, stem, first_singular_stem, isIOType;
+  if (infinitive.endsWith('are')) {
+    conjugation = 1;
+    stem = infinitive.slice(0, -2); // Remove "-are" (e.g., "amare" → "ama")
+    first_singular_stem = infinitive.slice(0, -3); // Remove "-are" (e.g., "amare" → "ama")
+  } else if (infinitive.endsWith('ēre') && !['ducere', 'capere', 'facere'].includes(infinitive)) {
+    conjugation = 2;
+    stem = infinitive.slice(0, -3); // Remove "-ere" (e.g., "videre" → "vide")
+    first_singular_stem = stem
+  } else if (infinitive.endsWith('ire')) {
+    conjugation = 4;
+    stem = infinitive.slice(0, -2); // Remove "-ire" (e.g., "audire" → "audi")
+    first_singular_stem = stem
+  } else {
+    conjugation = 3; // Third and third -io (e.g., "ducere" → "duc")
+    stem = infinitive.slice(0, -3); // Remove "-ere"
+    first_singular_stem = stem
+    isIOType = getIsIOType(infinitive)
+  }
+
+  const endings = {
+    1: [
+      { number: 'singular', person: 'first', ending: 'o' },
+      { number: 'singular', person: 'second', ending: 's' },
+      { number: 'singular', person: 'third', ending: 't' },
+      { number: 'plural', person: 'first', ending: 'mus' },
+      { number: 'plural', person: 'second', ending: 'tis' },
+      { number: 'plural', person: 'third', ending: 'nt' },
+    ],
+    2: [
+      { number: 'singular', person: 'first', ending: 'eo' },
+      { number: 'singular', person: 'second', ending: 'es' },
+      { number: 'singular', person: 'third', ending: 'et' },
+      { number: 'plural', person: 'first', ending: 'emus' },
+      { number: 'plural', person: 'second', ending: 'etis' },
+      { number: 'plural', person: 'third', ending: 'ent' },
+    ],
+    3: [
+      { number: 'singular', person: 'first', ending: 'o' },
+      { number: 'singular', person: 'second', ending: 'is' },
+      { number: 'singular', person: 'third', ending: 'it' },
+      { number: 'plural', person: 'first', ending: 'imus' },
+      { number: 'plural', person: 'second', ending: 'itis' },
+      { number: 'plural', person: 'third', ending: 'unt' },
+    ],
+    4: [
+      { number: 'singular', person: 'first', ending: 'o' },
+      { number: 'singular', person: 'second', ending: 's' },
+      { number: 'singular', person: 'third', ending: 't' },
+      { number: 'plural', person: 'first', ending: 'mus' },
+      { number: 'plural', person: 'second', ending: 'tis' },
+      { number: 'plural', person: 'third', ending: 'unt' },
+    ],
+  };
+
+  // if (conjugation === 3 && ['capere', 'facere'].includes(infinitive)) {
+  if (conjugation === 3 && isIOType) {
+    endings[3][0].ending = 'io'; // Third -io first-person singular
+    endings[3][5].ending = 'iunt'; // Third -io third-person plural
+  }
+
+  const conjugationEndings = endings[conjugation];
+  const conjugations = conjugationEndings.map(({ number, person, ending }) => {
+    // Special handling for "dare" first-person singular
+    let word;
+    if (person === 'first' && number === 'singular') {
+      word = first_singular_stem + ending;
+    } else if (conjugation === 1 || conjugation === 4) {
+      // Preserve stem vowel for first and fourth conjugations
+      word = stem + ending;
+    } else {
+      word = stem + ending;
+    }
+    return { word, number, person };
+  });
+
+  return conjugations;
+}
+
+module.exports = { conjugateVerb, getDeclensions };

package/common/people.instance.json

@@ -5130,7 +5130,7 @@
         "opChoices": [
           {
             "op": [
-              "unknown",
+              "by",
               0
             ],
             "ops": [
@@ -5153,24 +5153,16 @@
               [
                 "owns",
                 0
-              ],
-              [
-                "unknown",
-                0
               ]
             ],
             "counter": 1
           },
           {
             "op": [
-              "by",
+              "owned",
               0
             ],
             "ops": [
-              [
-                "by",
-                0
-              ],
               [
                 "isEd",
                 0
@@ -5192,7 +5184,7 @@
           },
           {
             "op": [
-              "owned",
+              "unknown",
               0
             ],
             "ops": [
@@ -5205,11 +5197,11 @@
                 0
               ],
               [
-                "owned",
+                "owns",
                 0
               ],
               [
-                "owns",
+                "unknown",
                 0
               ]
             ],
@@ -5486,9 +5478,31 @@
           [
             "owns",
             0
+          ]
+        ],
+        [
+          [
+            "isEd",
+            0
           ],
           [
-            "unknown",
+            "means",
+            0
+          ],
+          [
+            "owned",
+            0
+          ],
+          [
+            "ownee",
+            0
+          ],
+          [
+            "owner",
+            0
+          ],
+          [
+            "owns",
             0
           ]
         ],
@@ -5584,7 +5598,7 @@
               "operators": [
                 {
                   "marker": [
-                    "unknown",
+                    "ownee",
                     0
                   ],
                   "range": {
@@ -5679,7 +5693,7 @@
               "operators": [
                 {
                   "marker": [
-                    "unknown",
+                    "ownee",
                     0
                   ],
                   "range": {
@@ -5710,20 +5724,10 @@
                 {
                   "marker": [
                     "by",
-                    0
+                    1
                   ],
                   "range": {
                     "start": 15,
-                    "end": 16
-                  }
-                },
-                {
-                  "marker": [
-                    "owner",
-                    0
-                  ],
-                  "range": {
-                    "start": 18,
                     "end": 22
                   }
                 },
@@ -5802,16 +5806,6 @@
                     "end": 13
                   }
                 },
-                {
-                  "marker": [
-                    "by",
-                    1
-                  ],
-                  "range": {
-                    "start": 15,
-                    "end": 22
-                  }
-                },
                 {
                   "marker": [
                     "means",
@@ -8804,10 +8798,6 @@
       [
         "owns",
         0
-      ],
-      [
-        "unknown",
-        0
       ]
     ],
     [
@@ -8888,6 +8878,32 @@
         0
       ]
     ],
+    [
+      [
+        "isEd",
+        0
+      ],
+      [
+        "means",
+        0
+      ],
+      [
+        "owned",
+        0
+      ],
+      [
+        "ownee",
+        0
+      ],
+      [
+        "owner",
+        0
+      ],
+      [
+        "owns",
+        0
+      ]
+    ],
     [
       [
         "isEd",
@@ -9765,7 +9781,7 @@
           "operators": [
             {
               "marker": [
-                "unknown",
+                "ownee",
                 0
               ],
               "range": {
@@ -9860,7 +9876,7 @@
           "operators": [
             {
               "marker": [
-                "unknown",
+                "ownee",
                 0
               ],
               "range": {
@@ -9891,20 +9907,10 @@
             {
               "marker": [
                 "by",
-                0
+                1
               ],
               "range": {
                 "start": 15,
-                "end": 16
-              }
-            },
-            {
-              "marker": [
-                "owner",
-                0
-              ],
-              "range": {
-                "start": 18,
                 "end": 22
               }
             },
@@ -9983,16 +9989,6 @@
                 "end": 13
               }
             },
-            {
-              "marker": [
-                "by",
-                1
-              ],
-              "range": {
-                "start": 15,
-                "end": 22
-              }
-            },
             {
               "marker": [
                 "means",