From 8c01bbd6b4a19a545b660717895d53df94cf8a1f Mon Sep 17 00:00:00 2001 From: Lynn Date: Thu, 4 Jan 2024 02:37:02 +0100 Subject: [PATCH] Sort prefixes after regular words --- dictionary.json | 180 ++++++++++++++++++++++----------------------- tools/normalize.js | 2 +- 2 files changed, 91 insertions(+), 91 deletions(-) diff --git a/dictionary.json b/dictionary.json index 499c6ef..b5d2a47 100644 --- a/dictionary.json +++ b/dictionary.json @@ -344,16 +344,6 @@ "examples": [], "fields": [] }, - { - "toaq": "baq-", - "type": "determiner prefix form", - "english": "fills object of verb with báq (generic; X-kind)", - "gloss": "of:GEN", - "short": "", - "keywords": [], - "notes": [], - "examples": [] - }, { "toaq": "báq", "type": "determiner", @@ -379,6 +369,16 @@ } ] }, + { + "toaq": "baq-", + "type": "determiner prefix form", + "english": "fills object of verb with báq (generic; X-kind)", + "gloss": "of:GEN", + "short": "", + "keywords": [], + "notes": [], + "examples": [] + }, { "toaq": "batata", "type": "predicate", @@ -475,8 +475,8 @@ "examples": [] }, { - "toaq": "beı-", - "type": "focus particle prefix form", + "toaq": "béı", + "type": "focus particle", "english": "contrastive focus", "gloss": "FOC.CONTR", "short": "", @@ -485,8 +485,8 @@ "examples": [] }, { - "toaq": "béı", - "type": "focus particle", + "toaq": "beı-", + "type": "focus particle prefix form", "english": "contrastive focus", "gloss": "FOC.CONTR", "short": "", @@ -5843,20 +5843,20 @@ "fields": [] }, { - "toaq": "ha-", - "type": "prefix", - "english": "X-er; more X; comparative", - "gloss": "CMPR", + "toaq": "há", + "type": "pronoun", + "english": "generic impersonal pronoun; one/you/they/people", + "gloss": "3I.ANIM", "short": "", "keywords": [], "notes": [], "examples": [] }, { - "toaq": "há", - "type": "pronoun", - "english": "generic impersonal pronoun; one/you/they/people", - "gloss": "3I.ANIM", + "toaq": "ha-", + "type": "prefix", + "english": "X-er; more X; comparative", + "gloss": "CMPR", "short": "", "keywords": [], "notes": [], @@ -6593,20 +6593,20 @@ "fields": [] }, { - "toaq": "hu-", - "type": "prefix", - "english": "derives anaphoric pronouns referring to phrases headed by the specified stem", - "gloss": "PREV", + "toaq": "hú", + "type": "determiner", + "english": "endophoric; the aforementioned X", + "gloss": "ENDO", "short": "", "keywords": [], "notes": [], "examples": [] }, { - "toaq": "hú", - "type": "determiner", - "english": "endophoric; the aforementioned X", - "gloss": "ENDO", + "toaq": "hu-", + "type": "prefix", + "english": "derives anaphoric pronouns referring to phrases headed by the specified stem", + "gloss": "PREV", "short": "", "keywords": [], "notes": [], @@ -8299,8 +8299,8 @@ "fields": [] }, { - "toaq": "juaq-", - "type": "focus particle prefix form", + "toaq": "júaq", + "type": "focus particle", "english": "even", "gloss": "even", "short": "", @@ -8309,8 +8309,8 @@ "examples": [] }, { - "toaq": "júaq", - "type": "focus particle", + "toaq": "juaq-", + "type": "focus particle prefix form", "english": "even", "gloss": "even", "short": "", @@ -8788,20 +8788,20 @@ "fields": [] }, { - "toaq": "ke-", - "type": "determiner prefix form", - "english": "fills object of verb with ké (exophoric; this X (not previously mentioned))", - "gloss": "of:EXO", + "toaq": "ké", + "type": "determiner", + "english": "exophoric; this X (not previously mentioned)", + "gloss": "EXO", "short": "", "keywords": [], "notes": [], "examples": [] }, { - "toaq": "ké", - "type": "determiner", - "english": "exophoric; this X (not previously mentioned)", - "gloss": "EXO", + "toaq": "ke-", + "type": "determiner prefix form", + "english": "fills object of verb with ké (exophoric; this X (not previously mentioned))", + "gloss": "of:EXO", "short": "", "keywords": [], "notes": [], @@ -9422,8 +9422,8 @@ "fields": [] }, { - "toaq": "ku-", - "type": "focus particle prefix form", + "toaq": "kú", + "type": "focus particle", "english": "non-contrastive focus", "gloss": "FOC", "short": "", @@ -9432,8 +9432,8 @@ "examples": [] }, { - "toaq": "kú", - "type": "focus particle", + "toaq": "ku-", + "type": "focus particle prefix form", "english": "non-contrastive focus", "gloss": "FOC", "short": "", @@ -10925,8 +10925,8 @@ "fields": [] }, { - "toaq": "mao-", - "type": "focus particle prefix form", + "toaq": "máo", + "type": "focus particle", "english": "also", "gloss": "also", "short": "", @@ -10935,8 +10935,8 @@ "examples": [] }, { - "toaq": "máo", - "type": "focus particle", + "toaq": "mao-", + "type": "focus particle prefix form", "english": "also", "gloss": "also", "short": "", @@ -12157,20 +12157,20 @@ "fields": [] }, { - "toaq": "na-", - "type": "prefix", - "english": "conjunctionizer", - "gloss": "CONJ", + "toaq": "nä", + "type": "cleft verb", + "english": "raise argument to the front of the clause", + "gloss": "CLE", "short": "", "keywords": [], "notes": [], "examples": [] }, { - "toaq": "nä", - "type": "cleft verb", - "english": "raise argument to the front of the clause", - "gloss": "CLE", + "toaq": "na-", + "type": "prefix", + "english": "conjunctionizer", + "gloss": "CONJ", "short": "", "keywords": [], "notes": [], @@ -15828,16 +15828,6 @@ ], "fields": [] }, - { - "toaq": "sa-", - "type": "determiner prefix form", - "english": "fills object of verb with sá (existential quantifier)", - "gloss": "of:some", - "short": "", - "keywords": [], - "notes": [], - "examples": [] - }, { "toaq": "sá", "type": "determiner", @@ -15857,6 +15847,16 @@ } ] }, + { + "toaq": "sa-", + "type": "determiner prefix form", + "english": "fills object of verb with sá (existential quantifier)", + "gloss": "of:some", + "short": "", + "keywords": [], + "notes": [], + "examples": [] + }, { "toaq": "sabaq", "type": "predicate", @@ -18700,8 +18700,8 @@ "examples": [] }, { - "toaq": "to-", - "type": "focus particle prefix form", + "toaq": "tó", + "type": "focus particle", "english": "only", "gloss": "only", "short": "", @@ -18710,8 +18710,8 @@ "examples": [] }, { - "toaq": "tó", - "type": "focus particle", + "toaq": "to-", + "type": "focus particle prefix form", "english": "only", "gloss": "only", "short": "", @@ -18922,16 +18922,6 @@ "examples": [], "fields": [] }, - { - "toaq": "tu-", - "type": "determiner prefix form", - "english": "fills object of verb with tú (singular universal quantifier)", - "gloss": "of:each", - "short": "", - "keywords": [], - "notes": [], - "examples": [] - }, { "toaq": "tú", "type": "determiner", @@ -18951,6 +18941,16 @@ } ] }, + { + "toaq": "tu-", + "type": "determiner prefix form", + "english": "fills object of verb with tú (singular universal quantifier)", + "gloss": "of:each", + "short": "", + "keywords": [], + "notes": [], + "examples": [] + }, { "toaq": "tua", "type": "predicate", @@ -19208,20 +19208,20 @@ "fields": [] }, { - "toaq": "tuq-", - "type": "determiner prefix form", - "english": "fills object of verb with túq (collective universal quantifier)", - "gloss": "of:all", + "toaq": "túq", + "type": "determiner", + "english": "collective universal quantifier", + "gloss": "all", "short": "", "keywords": [], "notes": [], "examples": [] }, { - "toaq": "túq", - "type": "determiner", - "english": "collective universal quantifier", - "gloss": "all", + "toaq": "tuq-", + "type": "determiner prefix form", + "english": "fills object of verb with túq (collective universal quantifier)", + "gloss": "of:all", "short": "", "keywords": [], "notes": [], diff --git a/tools/normalize.js b/tools/normalize.js index 5e55bd6..ba6f609 100755 --- a/tools/normalize.js +++ b/tools/normalize.js @@ -12,7 +12,7 @@ function sortify(s) { .toLowerCase() .replace(/ı/g, "i") .replace(/ꝡ/g, "v") - .replace(/[^a-z\ ]/g, ""); + .replace(/[^a-z\ -]/g, ""); // It doesn't look like Array.sort is stable, so we'll tack on the original // string at the end of the sort key. For example "dâ" is sorted as "da,dâ".