fix ability verb head issues with compile
This commit is contained in:
parent
9d5a2f2859
commit
23c9c95692
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "@lingdocs/pashto-inflector",
|
"name": "@lingdocs/pashto-inflector",
|
||||||
"version": "3.1.4",
|
"version": "3.1.5",
|
||||||
"author": "lingdocs.com",
|
"author": "lingdocs.com",
|
||||||
"description": "A Pashto inflection and verb conjugation engine, inculding React components for displaying Pashto text, inflections, and conjugations",
|
"description": "A Pashto inflection and verb conjugation engine, inculding React components for displaying Pashto text, inflections, and conjugations",
|
||||||
"homepage": "https://verbs.lingdocs.com",
|
"homepage": "https://verbs.lingdocs.com",
|
||||||
|
|
|
@ -166,7 +166,7 @@ function combineIntoText(piecesWVars: (T.Block | T.Kid | T.PsString)[][], subjec
|
||||||
return combine(rest).flatMap(r => (
|
return combine(rest).flatMap(r => (
|
||||||
firstPs.map(fPs => concatPsString(
|
firstPs.map(fPs => concatPsString(
|
||||||
fPs,
|
fPs,
|
||||||
(!("p" in first) && "block" in first && first.block.type === "perfectiveHead" && !("p" in next) && (("block" in next && (next.block.type === "verb" || next.block.type === "negative")) || ("kid" in next && next.kid.type === "mini-pronoun")))
|
(!("p" in first) && "block" in first && first.block.type === "perfectiveHead" && !("p" in next) && (("block" in next && (next.block.type === "verb" || next.block.type === "negative" || next.block.type === "modalVerbBlock")) || ("kid" in next && next.kid.type === "mini-pronoun")))
|
||||||
? ((("block" in next && next.block.type === "negative") || ("kid" in next && next.kid.type === "mini-pronoun")) ? { p: "", f: "-" } : "")
|
? ((("block" in next && next.block.type === "negative") || ("kid" in next && next.kid.type === "mini-pronoun")) ? { p: "", f: "-" } : "")
|
||||||
: " ",
|
: " ",
|
||||||
r,
|
r,
|
||||||
|
|
|
@ -469,7 +469,7 @@ function getPsVerbConjugation(conj: T.VerbConjugation, vs: T.VerbSelectionComple
|
||||||
const hasBa = hasBaParticle(getLong(verbForm)[0]);
|
const hasBa = hasBaParticle(getLong(verbForm)[0]);
|
||||||
if (perfective) {
|
if (perfective) {
|
||||||
const past = isPastTense(vs.tense);
|
const past = isPastTense(vs.tense);
|
||||||
const splitInfo = conj.info[past ? "root" : "stem"].perfectiveSplit;
|
const splitInfo = conj.info[(past || isModalTense(vs.tense)) ? "root" : "stem"].perfectiveSplit;
|
||||||
if (!splitInfo) return { ps: { head: undefined, rest: verbForm }, hasBa };
|
if (!splitInfo) return { ps: { head: undefined, rest: verbForm }, hasBa };
|
||||||
// TODO: Either solve this in the inflector or here, it seems silly (or redundant)
|
// TODO: Either solve this in the inflector or here, it seems silly (or redundant)
|
||||||
// to have a length option in the perfective split stem??
|
// to have a length option in the perfective split stem??
|
||||||
|
|
Loading…
Reference in New Issue