This commit is contained in:
lingdocs 2022-08-23 17:26:19 +04:00
parent 21a0efdd8a
commit 19a87a2ca5
2 changed files with 7 additions and 3 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "@lingdocs/pashto-inflector", "name": "@lingdocs/pashto-inflector",
"version": "3.7.6", "version": "3.7.7",
"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",

View File

@ -1,7 +1,7 @@
import * as T from "../../types"; import * as T from "../../types";
import { import {
capitalizeFirstLetter, capitalizeFirstLetter,
concatPsString, getLong, getShort, concatPsString, getLong, getShort, isVerbBlock,
} from "../p-text-helpers"; } from "../p-text-helpers";
import { negativeParticle } from "../../lib/grammar-units"; import { negativeParticle } from "../../lib/grammar-units";
import * as grammarUnits from "../grammar-units"; import * as grammarUnits from "../grammar-units";
@ -21,6 +21,7 @@ import {
getSubjectSelectionFromBlocks, getSubjectSelectionFromBlocks,
getVerbFromBlocks, getVerbFromBlocks,
hasEquativeWithLengths, hasEquativeWithLengths,
isRenderedVerbB,
specifyBlockLength, specifyBlockLength,
specifyEquativeLength, specifyEquativeLength,
} from "./blocks-utils"; } from "./blocks-utils";
@ -166,7 +167,10 @@ function combineIntoText(piecesWVars: (T.Block | T.Kid | T.PsString)[][], subjec
const rest = pieces.slice(1); const rest = pieces.slice(1);
const firstPs = ("p" in first) const firstPs = ("p" in first)
? [first] ? [first]
: (blankOut?.equative && "block" in first && first.block.type === "equative") : (
(blankOut?.equative && "block" in first && first.block.type === "equative") ||
(blankOut?.verb && "block" in first && isRenderedVerbB(first.block))
)
? [blank] ? [blank]
: ((blankOut?.ba) && "kid" in first && first.kid.type === "ba") : ((blankOut?.ba) && "kid" in first && first.kid.type === "ba")
? [kidsBlank] ? [kidsBlank]