From 2e6c1772fe5be4b3264051d2b288c142c513036b Mon Sep 17 00:00:00 2001 From: Stefan Vukovic Date: Tue, 11 Jun 2024 13:00:22 +0200 Subject: [PATCH] add redundant tags --- 3-tidy-up.js | 11 +- data/test/dict/de/en/term_bank_2.json | 204 ++++++----- data/test/dict/es/en/term_bank_2.json | 505 ++++++++++++++++++-------- data/test/dict/fr/en/term_bank_2.json | 60 +-- data/test/dict/la/en/term_bank_2.json | 172 +++++++-- data/test/tidy/de-en-forms-0.json | 188 ++++++---- data/test/tidy/es-en-forms-0.json | 341 ++++++++++++----- data/test/tidy/fr-en-forms-0.json | 40 +- data/test/tidy/la-en-forms-0.json | 102 +++++- 9 files changed, 1098 insertions(+), 525 deletions(-) diff --git a/3-tidy-up.js b/3-tidy-up.js index ef75dc9..9bf016b 100644 --- a/3-tidy-up.js +++ b/3-tidy-up.js @@ -106,7 +106,7 @@ const blacklistedTags = [ 'includes-article', 'obsolete', 'archaic', - 'used-in-the-form' + 'used-in-the-form', ]; const identityTags = [ @@ -115,6 +115,11 @@ const identityTags = [ 'infinitive', ] +const redundantTags = [ + 'multiword-construction', + 'combined-form' +]; + let lineCount = 0; consoleOverwrite(`3-tidy-up.js started...`); @@ -137,10 +142,12 @@ function handleLine(line) { if (word && pos && senses) { if (forms) { forms.forEach((formData) => { - const { form, tags } = formData; + const { form } = formData; + let { tags } = formData; if(!form) return; if(!tags) return; if(form === '-') return; + tags = tags.filter(tag => !redundantTags.includes(tag)); const isBlacklisted = tags.some(value => blacklistedTags.includes(value)); if (isBlacklisted) return; const isIdentity = !tags.some(value => !identityTags.includes(value)); diff --git a/data/test/dict/de/en/term_bank_2.json b/data/test/dict/de/en/term_bank_2.json index 459f8cf..72f926f 100644 --- a/data/test/dict/de/en/term_bank_2.json +++ b/data/test/dict/de/en/term_bank_2.json @@ -419,8 +419,7 @@ "first-person", "singular", "perfect", - "indicative", - "multiword-construction" + "indicative" ] ], [ @@ -429,8 +428,7 @@ "first/third-person", "singular", "perfect", - "subjunctive", - "multiword-construction" + "subjunctive" ] ] ], @@ -450,8 +448,7 @@ "first/third-person", "plural", "perfect", - "indicative", - "multiword-construction" + "indicative" ] ], [ @@ -460,8 +457,7 @@ "first/third-person", "plural", "perfect", - "subjunctive", - "multiword-construction" + "subjunctive" ] ] ], @@ -481,8 +477,7 @@ "second-person", "singular", "perfect", - "indicative", - "multiword-construction" + "indicative" ] ] ], @@ -502,8 +497,7 @@ "second-person", "plural", "perfect", - "indicative", - "multiword-construction" + "indicative" ] ] ], @@ -523,8 +517,7 @@ "second-person", "singular", "perfect", - "subjunctive", - "multiword-construction" + "subjunctive" ] ] ], @@ -544,8 +537,7 @@ "second-person", "plural", "perfect", - "subjunctive", - "multiword-construction" + "subjunctive" ] ] ], @@ -565,8 +557,7 @@ "third-person", "singular", "perfect", - "indicative", - "multiword-construction" + "indicative" ] ] ], @@ -586,8 +577,7 @@ "first/third-person", "singular", "pluperfect", - "indicative", - "multiword-construction" + "indicative" ] ] ], @@ -607,8 +597,7 @@ "first/third-person", "plural", "pluperfect", - "indicative", - "multiword-construction" + "indicative" ] ] ], @@ -628,8 +617,7 @@ "first/third-person", "singular", "pluperfect", - "subjunctive", - "multiword-construction" + "subjunctive" ] ] ], @@ -649,8 +637,7 @@ "first/third-person", "plural", "pluperfect", - "subjunctive", - "multiword-construction" + "subjunctive" ] ] ], @@ -670,8 +657,7 @@ "second-person", "singular", "pluperfect", - "indicative", - "multiword-construction" + "indicative" ] ] ], @@ -691,8 +677,7 @@ "second-person", "plural", "pluperfect", - "indicative", - "multiword-construction" + "indicative" ] ] ], @@ -712,8 +697,7 @@ "second-person", "singular", "pluperfect", - "subjunctive", - "multiword-construction" + "subjunctive" ] ] ], @@ -733,8 +717,26 @@ "second-person", "plural", "pluperfect", - "subjunctive", - "multiword-construction" + "subjunctive" + ] + ] + ], + 0, + "" + ], + [ + "pflegen werden", + "", + "non-lemma", + "", + 0, + [ + [ + "pflegen", + [ + "future", + "future-i", + "infinitive" ] ] ], @@ -755,8 +757,7 @@ "singular", "future", "future-i", - "indicative", - "multiword-construction" + "indicative" ] ], [ @@ -788,8 +789,7 @@ "plural", "future", "future-i", - "indicative", - "multiword-construction" + "indicative" ] ], [ @@ -843,8 +843,7 @@ "plural", "future", "future-i", - "indicative", - "multiword-construction" + "indicative" ] ], [ @@ -920,8 +919,7 @@ "singular", "future", "future-i", - "indicative", - "multiword-construction" + "indicative" ] ] ], @@ -986,8 +984,26 @@ "singular", "future", "future-i", - "indicative", - "multiword-construction" + "indicative" + ] + ] + ], + 0, + "" + ], + [ + "gepflegt haben werden", + "", + "non-lemma", + "", + 0, + [ + [ + "pflegen", + [ + "future", + "future-ii", + "infinitive" ] ] ], @@ -1008,8 +1024,7 @@ "singular", "future", "future-ii", - "indicative", - "multiword-construction" + "indicative" ] ], [ @@ -1041,8 +1056,7 @@ "plural", "future", "future-ii", - "indicative", - "multiword-construction" + "indicative" ] ], [ @@ -1096,8 +1110,7 @@ "plural", "future", "future-ii", - "indicative", - "multiword-construction" + "indicative" ] ], [ @@ -1173,8 +1186,7 @@ "singular", "future", "future-ii", - "indicative", - "multiword-construction" + "indicative" ] ] ], @@ -1239,8 +1251,7 @@ "singular", "future", "future-ii", - "indicative", - "multiword-construction" + "indicative" ] ] ], @@ -1420,8 +1431,7 @@ "first-person", "singular", "perfect", - "indicative", - "multiword-construction" + "indicative" ] ], [ @@ -1430,8 +1440,7 @@ "first/third-person", "singular", "perfect", - "subjunctive", - "multiword-construction" + "subjunctive" ] ] ], @@ -1451,8 +1460,7 @@ "first/third-person", "plural", "perfect", - "indicative", - "multiword-construction" + "indicative" ] ], [ @@ -1461,8 +1469,7 @@ "first/third-person", "plural", "perfect", - "subjunctive", - "multiword-construction" + "subjunctive" ] ] ], @@ -1482,8 +1489,7 @@ "second-person", "singular", "perfect", - "indicative", - "multiword-construction" + "indicative" ] ] ], @@ -1503,8 +1509,7 @@ "second-person", "plural", "perfect", - "indicative", - "multiword-construction" + "indicative" ] ] ], @@ -1524,8 +1529,7 @@ "second-person", "singular", "perfect", - "subjunctive", - "multiword-construction" + "subjunctive" ] ] ], @@ -1545,8 +1549,7 @@ "second-person", "plural", "perfect", - "subjunctive", - "multiword-construction" + "subjunctive" ] ] ], @@ -1566,8 +1569,7 @@ "third-person", "singular", "perfect", - "indicative", - "multiword-construction" + "indicative" ] ] ], @@ -1587,8 +1589,7 @@ "first/third-person", "singular", "pluperfect", - "indicative", - "multiword-construction" + "indicative" ] ] ], @@ -1608,8 +1609,7 @@ "first/third-person", "plural", "pluperfect", - "indicative", - "multiword-construction" + "indicative" ] ] ], @@ -1629,8 +1629,7 @@ "first/third-person", "singular", "pluperfect", - "subjunctive", - "multiword-construction" + "subjunctive" ] ] ], @@ -1650,8 +1649,7 @@ "first/third-person", "plural", "pluperfect", - "subjunctive", - "multiword-construction" + "subjunctive" ] ] ], @@ -1671,8 +1669,7 @@ "second-person", "singular", "pluperfect", - "indicative", - "multiword-construction" + "indicative" ] ] ], @@ -1692,8 +1689,7 @@ "second-person", "plural", "pluperfect", - "indicative", - "multiword-construction" + "indicative" ] ] ], @@ -1713,8 +1709,7 @@ "second-person", "singular", "pluperfect", - "subjunctive", - "multiword-construction" + "subjunctive" ] ] ], @@ -1734,8 +1729,26 @@ "second-person", "plural", "pluperfect", - "subjunctive", - "multiword-construction" + "subjunctive" + ] + ] + ], + 0, + "" + ], + [ + "gepflogen haben werden", + "", + "non-lemma", + "", + 0, + [ + [ + "pflegen", + [ + "future", + "future-ii", + "infinitive" ] ] ], @@ -1756,8 +1769,7 @@ "singular", "future", "future-ii", - "indicative", - "multiword-construction" + "indicative" ] ], [ @@ -1789,8 +1801,7 @@ "plural", "future", "future-ii", - "indicative", - "multiword-construction" + "indicative" ] ], [ @@ -1844,8 +1855,7 @@ "plural", "future", "future-ii", - "indicative", - "multiword-construction" + "indicative" ] ], [ @@ -1921,8 +1931,7 @@ "singular", "future", "future-ii", - "indicative", - "multiword-construction" + "indicative" ] ] ], @@ -1987,8 +1996,7 @@ "singular", "future", "future-ii", - "indicative", - "multiword-construction" + "indicative" ] ] ], diff --git a/data/test/dict/es/en/term_bank_2.json b/data/test/dict/es/en/term_bank_2.json index bb0bd8a..50b5016 100644 --- a/data/test/dict/es/en/term_bank_2.json +++ b/data/test/dict/es/en/term_bank_2.json @@ -1313,6 +1313,289 @@ 0, "" ], + [ + "vivirme", + "", + "non-lemma", + "", + 0, + [ + [ + "vivir", + [ + "accusative", + "infinitive", + "object-first-person", + "object-singular" + ] + ], + [ + "vivir", + [ + "dative", + "infinitive", + "object-first-person", + "object-singular" + ] + ] + ], + 0, + "" + ], + [ + "vivirte", + "", + "non-lemma", + "", + 0, + [ + [ + "vivir", + [ + "accusative", + "infinitive", + "object-second-person", + "object-singular" + ] + ], + [ + "vivir", + [ + "dative", + "infinitive", + "object-second-person", + "object-singular" + ] + ] + ], + 0, + "" + ], + [ + "vivirle", + "", + "non-lemma", + "", + 0, + [ + [ + "vivir", + [ + "dative", + "infinitive", + "object-third-person", + "object-singular" + ] + ] + ], + 0, + "" + ], + [ + "vivirse", + "", + "non-lemma", + "", + 0, + [ + [ + "vivir", + [ + "accusative", + "infinitive", + "object-third-person", + "object-plural" + ] + ], + [ + "vivir", + [ + "accusative", + "infinitive", + "object-third-person", + "object-singular" + ] + ], + [ + "vivir", + [ + "dative", + "infinitive", + "object-third-person", + "object-plural" + ] + ], + [ + "vivir", + [ + "dative", + "infinitive", + "object-third-person", + "object-singular" + ] + ] + ], + 0, + "" + ], + [ + "vivirnos", + "", + "non-lemma", + "", + 0, + [ + [ + "vivir", + [ + "accusative", + "infinitive", + "object-first-person", + "object-plural" + ] + ], + [ + "vivir", + [ + "dative", + "infinitive", + "object-first-person", + "object-plural" + ] + ] + ], + 0, + "" + ], + [ + "viviros", + "", + "non-lemma", + "", + 0, + [ + [ + "vivir", + [ + "accusative", + "infinitive", + "object-second-person", + "object-plural" + ] + ], + [ + "vivir", + [ + "dative", + "infinitive", + "object-second-person", + "object-plural" + ] + ] + ], + 0, + "" + ], + [ + "vivirles", + "", + "non-lemma", + "", + 0, + [ + [ + "vivir", + [ + "dative", + "infinitive", + "object-third-person", + "object-plural" + ] + ] + ], + 0, + "" + ], + [ + "vivirlo", + "", + "non-lemma", + "", + 0, + [ + [ + "vivir", + [ + "accusative", + "infinitive", + "object-third-person", + "object-singular" + ] + ] + ], + 0, + "" + ], + [ + "vivirla", + "", + "non-lemma", + "", + 0, + [ + [ + "vivir", + [ + "accusative", + "infinitive", + "object-third-person", + "object-singular" + ] + ] + ], + 0, + "" + ], + [ + "vivirlos", + "", + "non-lemma", + "", + 0, + [ + [ + "vivir", + [ + "accusative", + "infinitive", + "object-third-person", + "object-plural" + ] + ] + ], + 0, + "" + ], + [ + "vivirlas", + "", + "non-lemma", + "", + 0, + [ + [ + "vivir", + [ + "accusative", + "infinitive", + "object-third-person", + "object-plural" + ] + ] + ], + 0, + "" + ], [ "viviéndome", "", @@ -1326,8 +1609,7 @@ "accusative", "gerund", "object-first-person", - "object-singular", - "combined-form" + "object-singular" ] ], [ @@ -1336,8 +1618,7 @@ "dative", "gerund", "object-first-person", - "object-singular", - "combined-form" + "object-singular" ] ] ], @@ -1357,8 +1638,7 @@ "accusative", "gerund", "object-second-person", - "object-singular", - "combined-form" + "object-singular" ] ], [ @@ -1367,8 +1647,7 @@ "dative", "gerund", "object-second-person", - "object-singular", - "combined-form" + "object-singular" ] ] ], @@ -1388,8 +1667,7 @@ "dative", "gerund", "object-third-person", - "object-singular", - "combined-form" + "object-singular" ] ] ], @@ -1409,8 +1687,7 @@ "accusative", "gerund", "object-third-person", - "object-plural", - "combined-form" + "object-plural" ] ], [ @@ -1419,8 +1696,7 @@ "accusative", "gerund", "object-third-person", - "object-singular", - "combined-form" + "object-singular" ] ], [ @@ -1429,8 +1705,7 @@ "dative", "gerund", "object-third-person", - "object-plural", - "combined-form" + "object-plural" ] ], [ @@ -1439,8 +1714,7 @@ "dative", "gerund", "object-third-person", - "object-singular", - "combined-form" + "object-singular" ] ] ], @@ -1460,8 +1734,7 @@ "accusative", "gerund", "object-first-person", - "object-plural", - "combined-form" + "object-plural" ] ], [ @@ -1470,8 +1743,7 @@ "dative", "gerund", "object-first-person", - "object-plural", - "combined-form" + "object-plural" ] ] ], @@ -1491,8 +1763,7 @@ "accusative", "gerund", "object-second-person", - "object-plural", - "combined-form" + "object-plural" ] ], [ @@ -1501,8 +1772,7 @@ "dative", "gerund", "object-second-person", - "object-plural", - "combined-form" + "object-plural" ] ] ], @@ -1522,8 +1792,7 @@ "dative", "gerund", "object-third-person", - "object-plural", - "combined-form" + "object-plural" ] ] ], @@ -1543,8 +1812,7 @@ "accusative", "gerund", "object-third-person", - "object-singular", - "combined-form" + "object-singular" ] ] ], @@ -1564,8 +1832,7 @@ "accusative", "gerund", "object-third-person", - "object-singular", - "combined-form" + "object-singular" ] ] ], @@ -1585,8 +1852,7 @@ "accusative", "gerund", "object-third-person", - "object-plural", - "combined-form" + "object-plural" ] ] ], @@ -1606,8 +1872,7 @@ "accusative", "gerund", "object-third-person", - "object-plural", - "combined-form" + "object-plural" ] ] ], @@ -1631,7 +1896,6 @@ "imperative", "object-first-person", "object-singular", - "combined-form", "with-tú" ] ], @@ -1645,7 +1909,6 @@ "imperative", "object-first-person", "object-singular", - "combined-form", "with-tú" ] ] @@ -1670,7 +1933,6 @@ "imperative", "object-second-person", "object-singular", - "combined-form", "with-tú" ] ], @@ -1684,7 +1946,6 @@ "imperative", "object-second-person", "object-singular", - "combined-form", "with-tú" ] ] @@ -1709,7 +1970,6 @@ "imperative", "object-third-person", "object-singular", - "combined-form", "with-tú" ] ] @@ -1734,7 +1994,6 @@ "imperative", "object-first-person", "object-plural", - "combined-form", "with-tú" ] ], @@ -1748,7 +2007,6 @@ "imperative", "object-first-person", "object-plural", - "combined-form", "with-tú" ] ] @@ -1773,7 +2031,6 @@ "imperative", "object-third-person", "object-plural", - "combined-form", "with-tú" ] ] @@ -1798,7 +2055,6 @@ "imperative", "object-third-person", "object-singular", - "combined-form", "with-tú" ] ] @@ -1823,7 +2079,6 @@ "imperative", "object-third-person", "object-singular", - "combined-form", "with-tú" ] ] @@ -1848,7 +2103,6 @@ "imperative", "object-third-person", "object-plural", - "combined-form", "with-tú" ] ] @@ -1873,7 +2127,6 @@ "imperative", "object-third-person", "object-plural", - "combined-form", "with-tú" ] ] @@ -1898,7 +2151,6 @@ "imperative", "object-first-person", "object-singular", - "combined-form", "with-vos" ] ], @@ -1912,7 +2164,6 @@ "imperative", "object-first-person", "object-singular", - "combined-form", "with-vos" ] ] @@ -1937,7 +2188,6 @@ "imperative", "object-second-person", "object-singular", - "combined-form", "with-vos" ] ], @@ -1951,7 +2201,6 @@ "imperative", "object-second-person", "object-singular", - "combined-form", "with-vos" ] ] @@ -1976,7 +2225,6 @@ "imperative", "object-third-person", "object-singular", - "combined-form", "with-vos" ] ] @@ -2001,7 +2249,6 @@ "imperative", "object-first-person", "object-plural", - "combined-form", "with-vos" ] ], @@ -2015,7 +2262,6 @@ "imperative", "object-first-person", "object-plural", - "combined-form", "with-vos" ] ] @@ -2040,7 +2286,6 @@ "imperative", "object-third-person", "object-plural", - "combined-form", "with-vos" ] ] @@ -2065,7 +2310,6 @@ "imperative", "object-third-person", "object-singular", - "combined-form", "with-vos" ] ] @@ -2090,7 +2334,6 @@ "imperative", "object-third-person", "object-singular", - "combined-form", "with-vos" ] ] @@ -2115,7 +2358,6 @@ "imperative", "object-third-person", "object-plural", - "combined-form", "with-vos" ] ] @@ -2140,7 +2382,6 @@ "imperative", "object-third-person", "object-plural", - "combined-form", "with-vos" ] ] @@ -2164,8 +2405,7 @@ "singular", "imperative", "object-first-person", - "object-singular", - "combined-form" + "object-singular" ] ], [ @@ -2177,8 +2417,7 @@ "singular", "imperative", "object-first-person", - "object-singular", - "combined-form" + "object-singular" ] ] ], @@ -2201,8 +2440,7 @@ "singular", "imperative", "object-third-person", - "object-singular", - "combined-form" + "object-singular" ] ] ], @@ -2225,8 +2463,7 @@ "singular", "imperative", "object-third-person", - "object-singular", - "combined-form" + "object-singular" ] ], [ @@ -2238,8 +2475,7 @@ "singular", "imperative", "object-third-person", - "object-singular", - "combined-form" + "object-singular" ] ] ], @@ -2262,8 +2498,7 @@ "singular", "imperative", "object-first-person", - "object-plural", - "combined-form" + "object-plural" ] ], [ @@ -2275,8 +2510,7 @@ "singular", "imperative", "object-first-person", - "object-plural", - "combined-form" + "object-plural" ] ] ], @@ -2299,8 +2533,7 @@ "singular", "imperative", "object-third-person", - "object-plural", - "combined-form" + "object-plural" ] ] ], @@ -2323,8 +2556,7 @@ "singular", "imperative", "object-third-person", - "object-singular", - "combined-form" + "object-singular" ] ] ], @@ -2347,8 +2579,7 @@ "singular", "imperative", "object-third-person", - "object-singular", - "combined-form" + "object-singular" ] ] ], @@ -2371,8 +2602,7 @@ "singular", "imperative", "object-third-person", - "object-plural", - "combined-form" + "object-plural" ] ] ], @@ -2395,8 +2625,7 @@ "singular", "imperative", "object-third-person", - "object-plural", - "combined-form" + "object-plural" ] ] ], @@ -2418,8 +2647,7 @@ "plural", "imperative", "object-second-person", - "object-singular", - "combined-form" + "object-singular" ] ], [ @@ -2430,8 +2658,7 @@ "plural", "imperative", "object-second-person", - "object-singular", - "combined-form" + "object-singular" ] ] ], @@ -2453,8 +2680,7 @@ "plural", "imperative", "object-third-person", - "object-singular", - "combined-form" + "object-singular" ] ] ], @@ -2476,8 +2702,7 @@ "plural", "imperative", "object-first-person", - "object-plural", - "combined-form" + "object-plural" ] ], [ @@ -2488,8 +2713,7 @@ "plural", "imperative", "object-first-person", - "object-plural", - "combined-form" + "object-plural" ] ] ], @@ -2511,8 +2735,7 @@ "plural", "imperative", "object-second-person", - "object-plural", - "combined-form" + "object-plural" ] ], [ @@ -2523,8 +2746,7 @@ "plural", "imperative", "object-second-person", - "object-plural", - "combined-form" + "object-plural" ] ] ], @@ -2546,8 +2768,7 @@ "plural", "imperative", "object-third-person", - "object-plural", - "combined-form" + "object-plural" ] ] ], @@ -2569,8 +2790,7 @@ "plural", "imperative", "object-third-person", - "object-singular", - "combined-form" + "object-singular" ] ] ], @@ -2592,8 +2812,7 @@ "plural", "imperative", "object-third-person", - "object-singular", - "combined-form" + "object-singular" ] ] ], @@ -2615,8 +2834,7 @@ "plural", "imperative", "object-third-person", - "object-plural", - "combined-form" + "object-plural" ] ] ], @@ -2638,8 +2856,7 @@ "plural", "imperative", "object-third-person", - "object-plural", - "combined-form" + "object-plural" ] ] ], @@ -2662,8 +2879,7 @@ "plural", "imperative", "object-first-person", - "object-singular", - "combined-form" + "object-singular" ] ], [ @@ -2675,8 +2891,7 @@ "plural", "imperative", "object-first-person", - "object-singular", - "combined-form" + "object-singular" ] ] ], @@ -2699,8 +2914,7 @@ "plural", "imperative", "object-third-person", - "object-singular", - "combined-form" + "object-singular" ] ] ], @@ -2723,8 +2937,7 @@ "plural", "imperative", "object-first-person", - "object-plural", - "combined-form" + "object-plural" ] ], [ @@ -2736,8 +2949,7 @@ "plural", "imperative", "object-first-person", - "object-plural", - "combined-form" + "object-plural" ] ] ], @@ -2760,8 +2972,7 @@ "plural", "imperative", "object-second-person", - "object-plural", - "combined-form" + "object-plural" ] ], [ @@ -2773,8 +2984,7 @@ "plural", "imperative", "object-second-person", - "object-plural", - "combined-form" + "object-plural" ] ] ], @@ -2797,8 +3007,7 @@ "plural", "imperative", "object-third-person", - "object-plural", - "combined-form" + "object-plural" ] ] ], @@ -2821,8 +3030,7 @@ "plural", "imperative", "object-third-person", - "object-singular", - "combined-form" + "object-singular" ] ] ], @@ -2845,8 +3053,7 @@ "plural", "imperative", "object-third-person", - "object-singular", - "combined-form" + "object-singular" ] ] ], @@ -2869,8 +3076,7 @@ "plural", "imperative", "object-third-person", - "object-plural", - "combined-form" + "object-plural" ] ] ], @@ -2893,8 +3099,7 @@ "plural", "imperative", "object-third-person", - "object-plural", - "combined-form" + "object-plural" ] ] ], @@ -2917,8 +3122,7 @@ "plural", "imperative", "object-first-person", - "object-singular", - "combined-form" + "object-singular" ] ], [ @@ -2930,8 +3134,7 @@ "plural", "imperative", "object-first-person", - "object-singular", - "combined-form" + "object-singular" ] ] ], @@ -2954,8 +3157,7 @@ "plural", "imperative", "object-third-person", - "object-singular", - "combined-form" + "object-singular" ] ] ], @@ -2978,8 +3180,7 @@ "plural", "imperative", "object-first-person", - "object-plural", - "combined-form" + "object-plural" ] ], [ @@ -2991,8 +3192,7 @@ "plural", "imperative", "object-first-person", - "object-plural", - "combined-form" + "object-plural" ] ] ], @@ -3015,8 +3215,7 @@ "plural", "imperative", "object-third-person", - "object-plural", - "combined-form" + "object-plural" ] ] ], @@ -3039,8 +3238,7 @@ "plural", "imperative", "object-third-person", - "object-plural", - "combined-form" + "object-plural" ] ], [ @@ -3052,8 +3250,7 @@ "plural", "imperative", "object-third-person", - "object-plural", - "combined-form" + "object-plural" ] ] ], @@ -3076,8 +3273,7 @@ "plural", "imperative", "object-third-person", - "object-singular", - "combined-form" + "object-singular" ] ] ], @@ -3100,8 +3296,7 @@ "plural", "imperative", "object-third-person", - "object-singular", - "combined-form" + "object-singular" ] ] ], @@ -3124,8 +3319,7 @@ "plural", "imperative", "object-third-person", - "object-plural", - "combined-form" + "object-plural" ] ] ], @@ -3148,8 +3342,7 @@ "plural", "imperative", "object-third-person", - "object-plural", - "combined-form" + "object-plural" ] ] ], diff --git a/data/test/dict/fr/en/term_bank_2.json b/data/test/dict/fr/en/term_bank_2.json index da5f6ab..9314d12 100644 --- a/data/test/dict/fr/en/term_bank_2.json +++ b/data/test/dict/fr/en/term_bank_2.json @@ -58,8 +58,7 @@ [ "present", "gerund", - "participle", - "multiword-construction" + "participle" ] ] ], @@ -656,8 +655,7 @@ [ "present", "perfect", - "indicative", - "multiword-construction" + "indicative" ] ] ], @@ -675,8 +673,7 @@ "prendre", [ "pluperfect", - "indicative", - "multiword-construction" + "indicative" ] ] ], @@ -695,8 +692,7 @@ [ "past", "indicative", - "anterior", - "multiword-construction" + "anterior" ] ] ], @@ -715,8 +711,7 @@ [ "future", "perfect", - "indicative", - "multiword-construction" + "indicative" ] ] ], @@ -734,8 +729,7 @@ "prendre", [ "perfect", - "conditional", - "multiword-construction" + "conditional" ] ] ], @@ -913,8 +907,7 @@ "prendre", [ "past", - "subjunctive", - "multiword-construction" + "subjunctive" ] ] ], @@ -932,8 +925,7 @@ "prendre", [ "pluperfect", - "subjunctive", - "multiword-construction" + "subjunctive" ] ] ], @@ -952,8 +944,7 @@ [ "first/second-person", "plural", - "imperative", - "multiword-construction" + "imperative" ] ], [ @@ -961,8 +952,7 @@ [ "second-person", "singular", - "imperative", - "multiword-construction" + "imperative" ] ] ], @@ -1000,8 +990,7 @@ [ "present", "gerund", - "participle", - "multiword-construction" + "participle" ] ] ], @@ -1648,8 +1637,7 @@ [ "present", "perfect", - "indicative", - "multiword-construction" + "indicative" ] ] ], @@ -1667,8 +1655,7 @@ "sembler", [ "pluperfect", - "indicative", - "multiword-construction" + "indicative" ] ] ], @@ -1687,8 +1674,7 @@ [ "past", "indicative", - "anterior", - "multiword-construction" + "anterior" ] ] ], @@ -1707,8 +1693,7 @@ [ "future", "perfect", - "indicative", - "multiword-construction" + "indicative" ] ] ], @@ -1726,8 +1711,7 @@ "sembler", [ "perfect", - "conditional", - "multiword-construction" + "conditional" ] ] ], @@ -1865,8 +1849,7 @@ "sembler", [ "past", - "subjunctive", - "multiword-construction" + "subjunctive" ] ] ], @@ -1884,8 +1867,7 @@ "sembler", [ "pluperfect", - "subjunctive", - "multiword-construction" + "subjunctive" ] ] ], @@ -1904,8 +1886,7 @@ [ "first/second-person", "plural", - "imperative", - "multiword-construction" + "imperative" ] ], [ @@ -1913,8 +1894,7 @@ [ "second-person", "singular", - "imperative", - "multiword-construction" + "imperative" ] ] ], diff --git a/data/test/dict/la/en/term_bank_2.json b/data/test/dict/la/en/term_bank_2.json index 88845d5..8541210 100644 --- a/data/test/dict/la/en/term_bank_2.json +++ b/data/test/dict/la/en/term_bank_2.json @@ -141,6 +141,52 @@ 0, "" ], + [ + "legere", + "", + "non-lemma", + "", + 0, + [ + [ + "legō", + [ + "present", + "active", + "infinitive" + ] + ], + [ + "legō", + [ + "present", + "infinitive" + ] + ], + [ + "legō", + [ + "second-person", + "singular", + "present", + "imperative", + "passive" + ] + ], + [ + "legō", + [ + "second-person", + "singular", + "present", + "passive", + "indicative" + ] + ] + ], + 0, + "" + ], [ "legi", "lēgī", @@ -1007,37 +1053,6 @@ 0, "" ], - [ - "legere", - "", - "non-lemma", - "", - 0, - [ - [ - "legō", - [ - "second-person", - "singular", - "present", - "imperative", - "passive" - ] - ], - [ - "legō", - [ - "second-person", - "singular", - "present", - "passive", - "indicative" - ] - ] - ], - 0, - "" - ], [ "legitur", "", @@ -2393,6 +2408,101 @@ 0, "" ], + [ + "legisse", + "lēgisse", + "non-lemma", + "", + 0, + [ + [ + "legō", + [ + "perfect", + "active", + "infinitive" + ] + ] + ], + 0, + "" + ], + [ + "lecturum esse", + "lēctūrum esse", + "non-lemma", + "", + 0, + [ + [ + "legō", + [ + "future", + "active", + "infinitive" + ] + ] + ], + 0, + "" + ], + [ + "legi", + "legī", + "non-lemma", + "", + 0, + [ + [ + "legō", + [ + "present", + "passive", + "infinitive" + ] + ] + ], + 0, + "" + ], + [ + "lectum esse", + "lēctum esse", + "non-lemma", + "", + 0, + [ + [ + "legō", + [ + "perfect", + "passive", + "infinitive" + ] + ] + ], + 0, + "" + ], + [ + "lectum iri", + "lēctum īrī", + "non-lemma", + "", + 0, + [ + [ + "legō", + [ + "future", + "passive", + "infinitive" + ] + ] + ], + 0, + "" + ], [ "legens", "legēns", diff --git a/data/test/tidy/de-en-forms-0.json b/data/test/tidy/de-en-forms-0.json index 8c1e396..14cb1b0 100644 --- a/data/test/tidy/de-en-forms-0.json +++ b/data/test/tidy/de-en-forms-0.json @@ -250,8 +250,8 @@ [ "verb", [ - "first-person singular perfect indicative multiword-construction", - "first/third-person singular perfect subjunctive multiword-construction" + "first-person singular perfect indicative", + "first/third-person singular perfect subjunctive" ] ] ] @@ -265,8 +265,8 @@ [ "verb", [ - "first/third-person plural perfect indicative multiword-construction", - "first/third-person plural perfect subjunctive multiword-construction" + "first/third-person plural perfect indicative", + "first/third-person plural perfect subjunctive" ] ] ] @@ -280,7 +280,7 @@ [ "verb", [ - "second-person singular perfect indicative multiword-construction" + "second-person singular perfect indicative" ] ] ] @@ -294,7 +294,7 @@ [ "verb", [ - "second-person plural perfect indicative multiword-construction" + "second-person plural perfect indicative" ] ] ] @@ -308,7 +308,7 @@ [ "verb", [ - "second-person singular perfect subjunctive multiword-construction" + "second-person singular perfect subjunctive" ] ] ] @@ -322,7 +322,7 @@ [ "verb", [ - "second-person plural perfect subjunctive multiword-construction" + "second-person plural perfect subjunctive" ] ] ] @@ -336,7 +336,7 @@ [ "verb", [ - "third-person singular perfect indicative multiword-construction" + "third-person singular perfect indicative" ] ] ] @@ -350,7 +350,7 @@ [ "verb", [ - "first/third-person singular pluperfect indicative multiword-construction" + "first/third-person singular pluperfect indicative" ] ] ] @@ -364,7 +364,7 @@ [ "verb", [ - "first/third-person plural pluperfect indicative multiword-construction" + "first/third-person plural pluperfect indicative" ] ] ] @@ -378,7 +378,7 @@ [ "verb", [ - "first/third-person singular pluperfect subjunctive multiword-construction" + "first/third-person singular pluperfect subjunctive" ] ] ] @@ -392,7 +392,7 @@ [ "verb", [ - "first/third-person plural pluperfect subjunctive multiword-construction" + "first/third-person plural pluperfect subjunctive" ] ] ] @@ -406,7 +406,7 @@ [ "verb", [ - "second-person singular pluperfect indicative multiword-construction" + "second-person singular pluperfect indicative" ] ] ] @@ -420,7 +420,7 @@ [ "verb", [ - "second-person plural pluperfect indicative multiword-construction" + "second-person plural pluperfect indicative" ] ] ] @@ -434,7 +434,7 @@ [ "verb", [ - "second-person singular pluperfect subjunctive multiword-construction" + "second-person singular pluperfect subjunctive" ] ] ] @@ -448,7 +448,21 @@ [ "verb", [ - "second-person plural pluperfect subjunctive multiword-construction" + "second-person plural pluperfect subjunctive" + ] + ] + ] + } + ], + [ + "pflegen werden", + { + "_type": "map", + "map": [ + [ + "verb", + [ + "future future-i infinitive" ] ] ] @@ -462,8 +476,8 @@ [ "verb", [ - "first-person singular future future-i indicative multiword-construction", - "first/third-person singular future future-i subjunctive multiword-construction subjunctive-i" + "first-person singular future future-i indicative", + "first/third-person singular future future-i subjunctive subjunctive-i" ] ] ] @@ -477,8 +491,8 @@ [ "verb", [ - "first/third-person plural future future-i indicative multiword-construction", - "first/third-person plural future future-i subjunctive multiword-construction subjunctive-i" + "first/third-person plural future future-i indicative", + "first/third-person plural future future-i subjunctive subjunctive-i" ] ] ] @@ -492,7 +506,7 @@ [ "verb", [ - "second-person singular future future-i subjunctive multiword-construction subjunctive-i" + "second-person singular future future-i subjunctive subjunctive-i" ] ] ] @@ -506,8 +520,8 @@ [ "verb", [ - "second-person plural future future-i indicative multiword-construction", - "second-person plural future future-i subjunctive multiword-construction subjunctive-i" + "second-person plural future future-i indicative", + "second-person plural future future-i subjunctive subjunctive-i" ] ] ] @@ -521,7 +535,7 @@ [ "verb", [ - "first/third-person singular future future-i subjunctive multiword-construction subjunctive-ii" + "first/third-person singular future future-i subjunctive subjunctive-ii" ] ] ] @@ -535,7 +549,7 @@ [ "verb", [ - "first/third-person plural future future-i subjunctive multiword-construction subjunctive-ii" + "first/third-person plural future future-i subjunctive subjunctive-ii" ] ] ] @@ -549,7 +563,7 @@ [ "verb", [ - "second-person singular future future-i indicative multiword-construction" + "second-person singular future future-i indicative" ] ] ] @@ -563,7 +577,7 @@ [ "verb", [ - "second-person singular future future-i subjunctive multiword-construction subjunctive-ii" + "second-person singular future future-i subjunctive subjunctive-ii" ] ] ] @@ -577,7 +591,7 @@ [ "verb", [ - "second-person plural future future-i subjunctive multiword-construction subjunctive-ii" + "second-person plural future future-i subjunctive subjunctive-ii" ] ] ] @@ -591,7 +605,21 @@ [ "verb", [ - "third-person singular future future-i indicative multiword-construction" + "third-person singular future future-i indicative" + ] + ] + ] + } + ], + [ + "gepflegt haben werden", + { + "_type": "map", + "map": [ + [ + "verb", + [ + "future future-ii infinitive" ] ] ] @@ -605,8 +633,8 @@ [ "verb", [ - "first-person singular future future-ii indicative multiword-construction", - "first/third-person singular future future-ii subjunctive multiword-construction subjunctive-i" + "first-person singular future future-ii indicative", + "first/third-person singular future future-ii subjunctive subjunctive-i" ] ] ] @@ -620,8 +648,8 @@ [ "verb", [ - "first/third-person plural future future-ii indicative multiword-construction", - "first/third-person plural future future-ii subjunctive multiword-construction subjunctive-i" + "first/third-person plural future future-ii indicative", + "first/third-person plural future future-ii subjunctive subjunctive-i" ] ] ] @@ -635,7 +663,7 @@ [ "verb", [ - "second-person singular future future-ii subjunctive multiword-construction subjunctive-i" + "second-person singular future future-ii subjunctive subjunctive-i" ] ] ] @@ -649,8 +677,8 @@ [ "verb", [ - "second-person plural future future-ii indicative multiword-construction", - "second-person plural future future-ii subjunctive multiword-construction subjunctive-i" + "second-person plural future future-ii indicative", + "second-person plural future future-ii subjunctive subjunctive-i" ] ] ] @@ -664,7 +692,7 @@ [ "verb", [ - "first/third-person singular future future-ii subjunctive multiword-construction subjunctive-ii" + "first/third-person singular future future-ii subjunctive subjunctive-ii" ] ] ] @@ -678,7 +706,7 @@ [ "verb", [ - "first/third-person plural future future-ii subjunctive multiword-construction subjunctive-ii" + "first/third-person plural future future-ii subjunctive subjunctive-ii" ] ] ] @@ -692,7 +720,7 @@ [ "verb", [ - "second-person singular future future-ii indicative multiword-construction" + "second-person singular future future-ii indicative" ] ] ] @@ -706,7 +734,7 @@ [ "verb", [ - "second-person singular future future-ii subjunctive multiword-construction subjunctive-ii" + "second-person singular future future-ii subjunctive subjunctive-ii" ] ] ] @@ -720,7 +748,7 @@ [ "verb", [ - "second-person plural future future-ii subjunctive multiword-construction subjunctive-ii" + "second-person plural future future-ii subjunctive subjunctive-ii" ] ] ] @@ -734,7 +762,7 @@ [ "verb", [ - "third-person singular future future-ii indicative multiword-construction" + "third-person singular future future-ii indicative" ] ] ] @@ -860,8 +888,8 @@ [ "verb", [ - "first-person singular perfect indicative multiword-construction", - "first/third-person singular perfect subjunctive multiword-construction" + "first-person singular perfect indicative", + "first/third-person singular perfect subjunctive" ] ] ] @@ -875,8 +903,8 @@ [ "verb", [ - "first/third-person plural perfect indicative multiword-construction", - "first/third-person plural perfect subjunctive multiword-construction" + "first/third-person plural perfect indicative", + "first/third-person plural perfect subjunctive" ] ] ] @@ -890,7 +918,7 @@ [ "verb", [ - "second-person singular perfect indicative multiword-construction" + "second-person singular perfect indicative" ] ] ] @@ -904,7 +932,7 @@ [ "verb", [ - "second-person plural perfect indicative multiword-construction" + "second-person plural perfect indicative" ] ] ] @@ -918,7 +946,7 @@ [ "verb", [ - "second-person singular perfect subjunctive multiword-construction" + "second-person singular perfect subjunctive" ] ] ] @@ -932,7 +960,7 @@ [ "verb", [ - "second-person plural perfect subjunctive multiword-construction" + "second-person plural perfect subjunctive" ] ] ] @@ -946,7 +974,7 @@ [ "verb", [ - "third-person singular perfect indicative multiword-construction" + "third-person singular perfect indicative" ] ] ] @@ -960,7 +988,7 @@ [ "verb", [ - "first/third-person singular pluperfect indicative multiword-construction" + "first/third-person singular pluperfect indicative" ] ] ] @@ -974,7 +1002,7 @@ [ "verb", [ - "first/third-person plural pluperfect indicative multiword-construction" + "first/third-person plural pluperfect indicative" ] ] ] @@ -988,7 +1016,7 @@ [ "verb", [ - "first/third-person singular pluperfect subjunctive multiword-construction" + "first/third-person singular pluperfect subjunctive" ] ] ] @@ -1002,7 +1030,7 @@ [ "verb", [ - "first/third-person plural pluperfect subjunctive multiword-construction" + "first/third-person plural pluperfect subjunctive" ] ] ] @@ -1016,7 +1044,7 @@ [ "verb", [ - "second-person singular pluperfect indicative multiword-construction" + "second-person singular pluperfect indicative" ] ] ] @@ -1030,7 +1058,7 @@ [ "verb", [ - "second-person plural pluperfect indicative multiword-construction" + "second-person plural pluperfect indicative" ] ] ] @@ -1044,7 +1072,7 @@ [ "verb", [ - "second-person singular pluperfect subjunctive multiword-construction" + "second-person singular pluperfect subjunctive" ] ] ] @@ -1058,7 +1086,21 @@ [ "verb", [ - "second-person plural pluperfect subjunctive multiword-construction" + "second-person plural pluperfect subjunctive" + ] + ] + ] + } + ], + [ + "gepflogen haben werden", + { + "_type": "map", + "map": [ + [ + "verb", + [ + "future future-ii infinitive" ] ] ] @@ -1072,8 +1114,8 @@ [ "verb", [ - "first-person singular future future-ii indicative multiword-construction", - "first/third-person singular future future-ii subjunctive multiword-construction subjunctive-i" + "first-person singular future future-ii indicative", + "first/third-person singular future future-ii subjunctive subjunctive-i" ] ] ] @@ -1087,8 +1129,8 @@ [ "verb", [ - "first/third-person plural future future-ii indicative multiword-construction", - "first/third-person plural future future-ii subjunctive multiword-construction subjunctive-i" + "first/third-person plural future future-ii indicative", + "first/third-person plural future future-ii subjunctive subjunctive-i" ] ] ] @@ -1102,7 +1144,7 @@ [ "verb", [ - "second-person singular future future-ii subjunctive multiword-construction subjunctive-i" + "second-person singular future future-ii subjunctive subjunctive-i" ] ] ] @@ -1116,8 +1158,8 @@ [ "verb", [ - "second-person plural future future-ii indicative multiword-construction", - "second-person plural future future-ii subjunctive multiword-construction subjunctive-i" + "second-person plural future future-ii indicative", + "second-person plural future future-ii subjunctive subjunctive-i" ] ] ] @@ -1131,7 +1173,7 @@ [ "verb", [ - "first/third-person singular future future-ii subjunctive multiword-construction subjunctive-ii" + "first/third-person singular future future-ii subjunctive subjunctive-ii" ] ] ] @@ -1145,7 +1187,7 @@ [ "verb", [ - "first/third-person plural future future-ii subjunctive multiword-construction subjunctive-ii" + "first/third-person plural future future-ii subjunctive subjunctive-ii" ] ] ] @@ -1159,7 +1201,7 @@ [ "verb", [ - "second-person singular future future-ii indicative multiword-construction" + "second-person singular future future-ii indicative" ] ] ] @@ -1173,7 +1215,7 @@ [ "verb", [ - "second-person singular future future-ii subjunctive multiword-construction subjunctive-ii" + "second-person singular future future-ii subjunctive subjunctive-ii" ] ] ] @@ -1187,7 +1229,7 @@ [ "verb", [ - "second-person plural future future-ii subjunctive multiword-construction subjunctive-ii" + "second-person plural future future-ii subjunctive subjunctive-ii" ] ] ] @@ -1201,7 +1243,7 @@ [ "verb", [ - "third-person singular future future-ii indicative multiword-construction" + "third-person singular future future-ii indicative" ] ] ] diff --git a/data/test/tidy/es-en-forms-0.json b/data/test/tidy/es-en-forms-0.json index eebdec9..0765371 100644 --- a/data/test/tidy/es-en-forms-0.json +++ b/data/test/tidy/es-en-forms-0.json @@ -827,6 +827,167 @@ ] } ], + [ + "vivirme", + { + "_type": "map", + "map": [ + [ + "verb", + [ + "accusative infinitive object-first-person object-singular", + "dative infinitive object-first-person object-singular" + ] + ] + ] + } + ], + [ + "vivirte", + { + "_type": "map", + "map": [ + [ + "verb", + [ + "accusative infinitive object-second-person object-singular", + "dative infinitive object-second-person object-singular" + ] + ] + ] + } + ], + [ + "vivirle", + { + "_type": "map", + "map": [ + [ + "verb", + [ + "dative infinitive object-third-person object-singular" + ] + ] + ] + } + ], + [ + "vivirse", + { + "_type": "map", + "map": [ + [ + "verb", + [ + "accusative infinitive object-third-person object-plural", + "accusative infinitive object-third-person object-singular", + "dative infinitive object-third-person object-plural", + "dative infinitive object-third-person object-singular" + ] + ] + ] + } + ], + [ + "vivirnos", + { + "_type": "map", + "map": [ + [ + "verb", + [ + "accusative infinitive object-first-person object-plural", + "dative infinitive object-first-person object-plural" + ] + ] + ] + } + ], + [ + "viviros", + { + "_type": "map", + "map": [ + [ + "verb", + [ + "accusative infinitive object-second-person object-plural", + "dative infinitive object-second-person object-plural" + ] + ] + ] + } + ], + [ + "vivirles", + { + "_type": "map", + "map": [ + [ + "verb", + [ + "dative infinitive object-third-person object-plural" + ] + ] + ] + } + ], + [ + "vivirlo", + { + "_type": "map", + "map": [ + [ + "verb", + [ + "accusative infinitive object-third-person object-singular" + ] + ] + ] + } + ], + [ + "vivirla", + { + "_type": "map", + "map": [ + [ + "verb", + [ + "accusative infinitive object-third-person object-singular" + ] + ] + ] + } + ], + [ + "vivirlos", + { + "_type": "map", + "map": [ + [ + "verb", + [ + "accusative infinitive object-third-person object-plural" + ] + ] + ] + } + ], + [ + "vivirlas", + { + "_type": "map", + "map": [ + [ + "verb", + [ + "accusative infinitive object-third-person object-plural" + ] + ] + ] + } + ], [ "viviéndome", { @@ -835,8 +996,8 @@ [ "verb", [ - "accusative gerund object-first-person object-singular combined-form", - "dative gerund object-first-person object-singular combined-form" + "accusative gerund object-first-person object-singular", + "dative gerund object-first-person object-singular" ] ] ] @@ -850,8 +1011,8 @@ [ "verb", [ - "accusative gerund object-second-person object-singular combined-form", - "dative gerund object-second-person object-singular combined-form" + "accusative gerund object-second-person object-singular", + "dative gerund object-second-person object-singular" ] ] ] @@ -865,7 +1026,7 @@ [ "verb", [ - "dative gerund object-third-person object-singular combined-form" + "dative gerund object-third-person object-singular" ] ] ] @@ -879,10 +1040,10 @@ [ "verb", [ - "accusative gerund object-third-person object-plural combined-form", - "accusative gerund object-third-person object-singular combined-form", - "dative gerund object-third-person object-plural combined-form", - "dative gerund object-third-person object-singular combined-form" + "accusative gerund object-third-person object-plural", + "accusative gerund object-third-person object-singular", + "dative gerund object-third-person object-plural", + "dative gerund object-third-person object-singular" ] ] ] @@ -896,8 +1057,8 @@ [ "verb", [ - "accusative gerund object-first-person object-plural combined-form", - "dative gerund object-first-person object-plural combined-form" + "accusative gerund object-first-person object-plural", + "dative gerund object-first-person object-plural" ] ] ] @@ -911,8 +1072,8 @@ [ "verb", [ - "accusative gerund object-second-person object-plural combined-form", - "dative gerund object-second-person object-plural combined-form" + "accusative gerund object-second-person object-plural", + "dative gerund object-second-person object-plural" ] ] ] @@ -926,7 +1087,7 @@ [ "verb", [ - "dative gerund object-third-person object-plural combined-form" + "dative gerund object-third-person object-plural" ] ] ] @@ -940,7 +1101,7 @@ [ "verb", [ - "accusative gerund object-third-person object-singular combined-form" + "accusative gerund object-third-person object-singular" ] ] ] @@ -954,7 +1115,7 @@ [ "verb", [ - "accusative gerund object-third-person object-singular combined-form" + "accusative gerund object-third-person object-singular" ] ] ] @@ -968,7 +1129,7 @@ [ "verb", [ - "accusative gerund object-third-person object-plural combined-form" + "accusative gerund object-third-person object-plural" ] ] ] @@ -982,7 +1143,7 @@ [ "verb", [ - "accusative gerund object-third-person object-plural combined-form" + "accusative gerund object-third-person object-plural" ] ] ] @@ -996,8 +1157,8 @@ [ "verb", [ - "informal accusative second-person singular imperative object-first-person object-singular combined-form with-tú", - "informal dative second-person singular imperative object-first-person object-singular combined-form with-tú" + "informal accusative second-person singular imperative object-first-person object-singular with-tú", + "informal dative second-person singular imperative object-first-person object-singular with-tú" ] ] ] @@ -1011,8 +1172,8 @@ [ "verb", [ - "informal accusative second-person singular imperative object-second-person object-singular combined-form with-tú", - "informal dative second-person singular imperative object-second-person object-singular combined-form with-tú" + "informal accusative second-person singular imperative object-second-person object-singular with-tú", + "informal dative second-person singular imperative object-second-person object-singular with-tú" ] ] ] @@ -1026,7 +1187,7 @@ [ "verb", [ - "informal dative second-person singular imperative object-third-person object-singular combined-form with-tú" + "informal dative second-person singular imperative object-third-person object-singular with-tú" ] ] ] @@ -1040,8 +1201,8 @@ [ "verb", [ - "informal accusative second-person singular imperative object-first-person object-plural combined-form with-tú", - "informal dative second-person singular imperative object-first-person object-plural combined-form with-tú" + "informal accusative second-person singular imperative object-first-person object-plural with-tú", + "informal dative second-person singular imperative object-first-person object-plural with-tú" ] ] ] @@ -1055,7 +1216,7 @@ [ "verb", [ - "informal dative second-person singular imperative object-third-person object-plural combined-form with-tú" + "informal dative second-person singular imperative object-third-person object-plural with-tú" ] ] ] @@ -1069,7 +1230,7 @@ [ "verb", [ - "informal accusative second-person singular imperative object-third-person object-singular combined-form with-tú" + "informal accusative second-person singular imperative object-third-person object-singular with-tú" ] ] ] @@ -1083,7 +1244,7 @@ [ "verb", [ - "informal accusative second-person singular imperative object-third-person object-singular combined-form with-tú" + "informal accusative second-person singular imperative object-third-person object-singular with-tú" ] ] ] @@ -1097,7 +1258,7 @@ [ "verb", [ - "informal accusative second-person singular imperative object-third-person object-plural combined-form with-tú" + "informal accusative second-person singular imperative object-third-person object-plural with-tú" ] ] ] @@ -1111,7 +1272,7 @@ [ "verb", [ - "informal accusative second-person singular imperative object-third-person object-plural combined-form with-tú" + "informal accusative second-person singular imperative object-third-person object-plural with-tú" ] ] ] @@ -1125,8 +1286,8 @@ [ "verb", [ - "informal accusative second-person singular imperative object-first-person object-singular combined-form with-vos", - "informal dative second-person singular imperative object-first-person object-singular combined-form with-vos" + "informal accusative second-person singular imperative object-first-person object-singular with-vos", + "informal dative second-person singular imperative object-first-person object-singular with-vos" ] ] ] @@ -1140,8 +1301,8 @@ [ "verb", [ - "informal accusative second-person singular imperative object-second-person object-singular combined-form with-vos", - "informal dative second-person singular imperative object-second-person object-singular combined-form with-vos" + "informal accusative second-person singular imperative object-second-person object-singular with-vos", + "informal dative second-person singular imperative object-second-person object-singular with-vos" ] ] ] @@ -1155,7 +1316,7 @@ [ "verb", [ - "informal dative second-person singular imperative object-third-person object-singular combined-form with-vos" + "informal dative second-person singular imperative object-third-person object-singular with-vos" ] ] ] @@ -1169,8 +1330,8 @@ [ "verb", [ - "informal accusative second-person singular imperative object-first-person object-plural combined-form with-vos", - "informal dative second-person singular imperative object-first-person object-plural combined-form with-vos" + "informal accusative second-person singular imperative object-first-person object-plural with-vos", + "informal dative second-person singular imperative object-first-person object-plural with-vos" ] ] ] @@ -1184,7 +1345,7 @@ [ "verb", [ - "informal dative second-person singular imperative object-third-person object-plural combined-form with-vos" + "informal dative second-person singular imperative object-third-person object-plural with-vos" ] ] ] @@ -1198,7 +1359,7 @@ [ "verb", [ - "informal accusative second-person singular imperative object-third-person object-singular combined-form with-vos" + "informal accusative second-person singular imperative object-third-person object-singular with-vos" ] ] ] @@ -1212,7 +1373,7 @@ [ "verb", [ - "informal accusative second-person singular imperative object-third-person object-singular combined-form with-vos" + "informal accusative second-person singular imperative object-third-person object-singular with-vos" ] ] ] @@ -1226,7 +1387,7 @@ [ "verb", [ - "informal accusative second-person singular imperative object-third-person object-plural combined-form with-vos" + "informal accusative second-person singular imperative object-third-person object-plural with-vos" ] ] ] @@ -1240,7 +1401,7 @@ [ "verb", [ - "informal accusative second-person singular imperative object-third-person object-plural combined-form with-vos" + "informal accusative second-person singular imperative object-third-person object-plural with-vos" ] ] ] @@ -1254,8 +1415,8 @@ [ "verb", [ - "formal accusative second-person singular imperative object-first-person object-singular combined-form", - "formal dative second-person singular imperative object-first-person object-singular combined-form" + "formal accusative second-person singular imperative object-first-person object-singular", + "formal dative second-person singular imperative object-first-person object-singular" ] ] ] @@ -1269,7 +1430,7 @@ [ "verb", [ - "formal dative second-person singular imperative object-third-person object-singular combined-form" + "formal dative second-person singular imperative object-third-person object-singular" ] ] ] @@ -1283,8 +1444,8 @@ [ "verb", [ - "formal accusative second-person singular imperative object-third-person object-singular combined-form", - "formal dative second-person singular imperative object-third-person object-singular combined-form" + "formal accusative second-person singular imperative object-third-person object-singular", + "formal dative second-person singular imperative object-third-person object-singular" ] ] ] @@ -1298,8 +1459,8 @@ [ "verb", [ - "formal accusative second-person singular imperative object-first-person object-plural combined-form", - "formal dative second-person singular imperative object-first-person object-plural combined-form" + "formal accusative second-person singular imperative object-first-person object-plural", + "formal dative second-person singular imperative object-first-person object-plural" ] ] ] @@ -1313,7 +1474,7 @@ [ "verb", [ - "formal dative second-person singular imperative object-third-person object-plural combined-form" + "formal dative second-person singular imperative object-third-person object-plural" ] ] ] @@ -1327,7 +1488,7 @@ [ "verb", [ - "formal accusative second-person singular imperative object-third-person object-singular combined-form" + "formal accusative second-person singular imperative object-third-person object-singular" ] ] ] @@ -1341,7 +1502,7 @@ [ "verb", [ - "formal accusative second-person singular imperative object-third-person object-singular combined-form" + "formal accusative second-person singular imperative object-third-person object-singular" ] ] ] @@ -1355,7 +1516,7 @@ [ "verb", [ - "formal accusative second-person singular imperative object-third-person object-plural combined-form" + "formal accusative second-person singular imperative object-third-person object-plural" ] ] ] @@ -1369,7 +1530,7 @@ [ "verb", [ - "formal accusative second-person singular imperative object-third-person object-plural combined-form" + "formal accusative second-person singular imperative object-third-person object-plural" ] ] ] @@ -1383,8 +1544,8 @@ [ "verb", [ - "accusative first-person plural imperative object-second-person object-singular combined-form", - "dative first-person plural imperative object-second-person object-singular combined-form" + "accusative first-person plural imperative object-second-person object-singular", + "dative first-person plural imperative object-second-person object-singular" ] ] ] @@ -1398,7 +1559,7 @@ [ "verb", [ - "dative first-person plural imperative object-third-person object-singular combined-form" + "dative first-person plural imperative object-third-person object-singular" ] ] ] @@ -1412,8 +1573,8 @@ [ "verb", [ - "accusative first-person plural imperative object-first-person object-plural combined-form", - "dative first-person plural imperative object-first-person object-plural combined-form" + "accusative first-person plural imperative object-first-person object-plural", + "dative first-person plural imperative object-first-person object-plural" ] ] ] @@ -1427,8 +1588,8 @@ [ "verb", [ - "accusative first-person plural imperative object-second-person object-plural combined-form", - "dative first-person plural imperative object-second-person object-plural combined-form" + "accusative first-person plural imperative object-second-person object-plural", + "dative first-person plural imperative object-second-person object-plural" ] ] ] @@ -1442,7 +1603,7 @@ [ "verb", [ - "dative first-person plural imperative object-third-person object-plural combined-form" + "dative first-person plural imperative object-third-person object-plural" ] ] ] @@ -1456,7 +1617,7 @@ [ "verb", [ - "accusative first-person plural imperative object-third-person object-singular combined-form" + "accusative first-person plural imperative object-third-person object-singular" ] ] ] @@ -1470,7 +1631,7 @@ [ "verb", [ - "accusative first-person plural imperative object-third-person object-singular combined-form" + "accusative first-person plural imperative object-third-person object-singular" ] ] ] @@ -1484,7 +1645,7 @@ [ "verb", [ - "accusative first-person plural imperative object-third-person object-plural combined-form" + "accusative first-person plural imperative object-third-person object-plural" ] ] ] @@ -1498,7 +1659,7 @@ [ "verb", [ - "accusative first-person plural imperative object-third-person object-plural combined-form" + "accusative first-person plural imperative object-third-person object-plural" ] ] ] @@ -1512,8 +1673,8 @@ [ "verb", [ - "informal accusative second-person plural imperative object-first-person object-singular combined-form", - "informal dative second-person plural imperative object-first-person object-singular combined-form" + "informal accusative second-person plural imperative object-first-person object-singular", + "informal dative second-person plural imperative object-first-person object-singular" ] ] ] @@ -1527,7 +1688,7 @@ [ "verb", [ - "informal dative second-person plural imperative object-third-person object-singular combined-form" + "informal dative second-person plural imperative object-third-person object-singular" ] ] ] @@ -1541,8 +1702,8 @@ [ "verb", [ - "informal accusative second-person plural imperative object-first-person object-plural combined-form", - "informal dative second-person plural imperative object-first-person object-plural combined-form" + "informal accusative second-person plural imperative object-first-person object-plural", + "informal dative second-person plural imperative object-first-person object-plural" ] ] ] @@ -1556,8 +1717,8 @@ [ "verb", [ - "informal accusative second-person plural imperative object-second-person object-plural combined-form", - "informal dative second-person plural imperative object-second-person object-plural combined-form" + "informal accusative second-person plural imperative object-second-person object-plural", + "informal dative second-person plural imperative object-second-person object-plural" ] ] ] @@ -1571,7 +1732,7 @@ [ "verb", [ - "informal dative second-person plural imperative object-third-person object-plural combined-form" + "informal dative second-person plural imperative object-third-person object-plural" ] ] ] @@ -1585,7 +1746,7 @@ [ "verb", [ - "informal accusative second-person plural imperative object-third-person object-singular combined-form" + "informal accusative second-person plural imperative object-third-person object-singular" ] ] ] @@ -1599,7 +1760,7 @@ [ "verb", [ - "informal accusative second-person plural imperative object-third-person object-singular combined-form" + "informal accusative second-person plural imperative object-third-person object-singular" ] ] ] @@ -1613,7 +1774,7 @@ [ "verb", [ - "informal accusative second-person plural imperative object-third-person object-plural combined-form" + "informal accusative second-person plural imperative object-third-person object-plural" ] ] ] @@ -1627,7 +1788,7 @@ [ "verb", [ - "informal accusative second-person plural imperative object-third-person object-plural combined-form" + "informal accusative second-person plural imperative object-third-person object-plural" ] ] ] @@ -1641,8 +1802,8 @@ [ "verb", [ - "formal accusative second-person plural imperative object-first-person object-singular combined-form", - "formal dative second-person plural imperative object-first-person object-singular combined-form" + "formal accusative second-person plural imperative object-first-person object-singular", + "formal dative second-person plural imperative object-first-person object-singular" ] ] ] @@ -1656,7 +1817,7 @@ [ "verb", [ - "formal dative second-person plural imperative object-third-person object-singular combined-form" + "formal dative second-person plural imperative object-third-person object-singular" ] ] ] @@ -1670,8 +1831,8 @@ [ "verb", [ - "formal accusative second-person plural imperative object-first-person object-plural combined-form", - "formal dative second-person plural imperative object-first-person object-plural combined-form" + "formal accusative second-person plural imperative object-first-person object-plural", + "formal dative second-person plural imperative object-first-person object-plural" ] ] ] @@ -1685,7 +1846,7 @@ [ "verb", [ - "formal dative second-person plural imperative object-third-person object-plural combined-form" + "formal dative second-person plural imperative object-third-person object-plural" ] ] ] @@ -1699,8 +1860,8 @@ [ "verb", [ - "formal accusative second-person plural imperative object-third-person object-plural combined-form", - "formal dative second-person plural imperative object-third-person object-plural combined-form" + "formal accusative second-person plural imperative object-third-person object-plural", + "formal dative second-person plural imperative object-third-person object-plural" ] ] ] @@ -1714,7 +1875,7 @@ [ "verb", [ - "formal accusative second-person plural imperative object-third-person object-singular combined-form" + "formal accusative second-person plural imperative object-third-person object-singular" ] ] ] @@ -1728,7 +1889,7 @@ [ "verb", [ - "formal accusative second-person plural imperative object-third-person object-singular combined-form" + "formal accusative second-person plural imperative object-third-person object-singular" ] ] ] @@ -1742,7 +1903,7 @@ [ "verb", [ - "formal accusative second-person plural imperative object-third-person object-plural combined-form" + "formal accusative second-person plural imperative object-third-person object-plural" ] ] ] @@ -1756,7 +1917,7 @@ [ "verb", [ - "formal accusative second-person plural imperative object-third-person object-plural combined-form" + "formal accusative second-person plural imperative object-third-person object-plural" ] ] ] diff --git a/data/test/tidy/fr-en-forms-0.json b/data/test/tidy/fr-en-forms-0.json index 1d26eb1..70b502f 100644 --- a/data/test/tidy/fr-en-forms-0.json +++ b/data/test/tidy/fr-en-forms-0.json @@ -51,7 +51,7 @@ [ "verb", [ - "present gerund participle multiword-construction" + "present gerund participle" ] ] ] @@ -436,7 +436,7 @@ [ "verb", [ - "present perfect indicative multiword-construction" + "present perfect indicative" ] ] ] @@ -450,7 +450,7 @@ [ "verb", [ - "pluperfect indicative multiword-construction" + "pluperfect indicative" ] ] ] @@ -464,7 +464,7 @@ [ "verb", [ - "past indicative anterior multiword-construction" + "past indicative anterior" ] ] ] @@ -478,7 +478,7 @@ [ "verb", [ - "future perfect indicative multiword-construction" + "future perfect indicative" ] ] ] @@ -492,7 +492,7 @@ [ "verb", [ - "perfect conditional multiword-construction" + "perfect conditional" ] ] ] @@ -618,7 +618,7 @@ [ "verb", [ - "past subjunctive multiword-construction" + "past subjunctive" ] ] ] @@ -632,7 +632,7 @@ [ "verb", [ - "pluperfect subjunctive multiword-construction" + "pluperfect subjunctive" ] ] ] @@ -646,8 +646,8 @@ [ "verb", [ - "first/second-person plural imperative multiword-construction", - "second-person singular imperative multiword-construction" + "first/second-person plural imperative", + "second-person singular imperative" ] ] ] @@ -683,7 +683,7 @@ [ "verb", [ - "present gerund participle multiword-construction" + "present gerund participle" ] ] ] @@ -1097,7 +1097,7 @@ [ "verb", [ - "present perfect indicative multiword-construction" + "present perfect indicative" ] ] ] @@ -1111,7 +1111,7 @@ [ "verb", [ - "pluperfect indicative multiword-construction" + "pluperfect indicative" ] ] ] @@ -1125,7 +1125,7 @@ [ "verb", [ - "past indicative anterior multiword-construction" + "past indicative anterior" ] ] ] @@ -1139,7 +1139,7 @@ [ "verb", [ - "future perfect indicative multiword-construction" + "future perfect indicative" ] ] ] @@ -1153,7 +1153,7 @@ [ "verb", [ - "perfect conditional multiword-construction" + "perfect conditional" ] ] ] @@ -1251,7 +1251,7 @@ [ "verb", [ - "past subjunctive multiword-construction" + "past subjunctive" ] ] ] @@ -1265,7 +1265,7 @@ [ "verb", [ - "pluperfect subjunctive multiword-construction" + "pluperfect subjunctive" ] ] ] @@ -1279,8 +1279,8 @@ [ "verb", [ - "first/second-person plural imperative multiword-construction", - "second-person singular imperative multiword-construction" + "first/second-person plural imperative", + "second-person singular imperative" ] ] ] diff --git a/data/test/tidy/la-en-forms-0.json b/data/test/tidy/la-en-forms-0.json index 2cf98f8..5fe2dec 100644 --- a/data/test/tidy/la-en-forms-0.json +++ b/data/test/tidy/la-en-forms-0.json @@ -103,6 +103,23 @@ { "_type": "map", "map": [ + [ + "legere", + { + "_type": "map", + "map": [ + [ + "verb", + [ + "present active infinitive", + "present infinitive", + "second-person singular present imperative passive", + "second-person singular present passive indicative" + ] + ] + ] + } + ], [ "lēgī", { @@ -654,21 +671,6 @@ ] } ], - [ - "legere", - { - "_type": "map", - "map": [ - [ - "verb", - [ - "second-person singular present imperative passive", - "second-person singular present passive indicative" - ] - ] - ] - } - ], [ "legitur", { @@ -1567,6 +1569,76 @@ ] } ], + [ + "lēgisse", + { + "_type": "map", + "map": [ + [ + "verb", + [ + "perfect active infinitive" + ] + ] + ] + } + ], + [ + "lēctūrum esse", + { + "_type": "map", + "map": [ + [ + "verb", + [ + "future active infinitive" + ] + ] + ] + } + ], + [ + "legī", + { + "_type": "map", + "map": [ + [ + "verb", + [ + "present passive infinitive" + ] + ] + ] + } + ], + [ + "lēctum esse", + { + "_type": "map", + "map": [ + [ + "verb", + [ + "perfect passive infinitive" + ] + ] + ] + } + ], + [ + "lēctum īrī", + { + "_type": "map", + "map": [ + [ + "verb", + [ + "future passive infinitive" + ] + ] + ] + } + ], [ "legēns", {