updated equative explorer
This commit is contained in:
parent
1b935db7ea
commit
6cb2d5dbc5
|
@ -189,7 +189,8 @@ export function TenseSelector({ state, dispatch }: {
|
||||||
}) {
|
}) {
|
||||||
const options: { value: EquativeTense, label: string }[] = [
|
const options: { value: EquativeTense, label: string }[] = [
|
||||||
{ value: "present", label: "Present" },
|
{ value: "present", label: "Present" },
|
||||||
{ value: "subjunctive", label: "Habitual / Subjunctive" },
|
{ value: "habitual", label: "Habitual" },
|
||||||
|
{ value: "subjunctive", label: "Subjunctive" },
|
||||||
{ value: "past", label: "Past" },
|
{ value: "past", label: "Past" },
|
||||||
{ value: "future", label: "Future" },
|
{ value: "future", label: "Future" },
|
||||||
{ value: "wouldBe", label: '"Would Be"' },
|
{ value: "wouldBe", label: '"Would Be"' },
|
||||||
|
|
|
@ -73,7 +73,7 @@ export function assembleEquativeOutput(o: EquativeClauseOutput): T.SingleOrLengt
|
||||||
|
|
||||||
function makeEquative(e: EquativeClause) {
|
function makeEquative(e: EquativeClause) {
|
||||||
function getEngEq(row: number, col: number): string[] {
|
function getEngEq(row: number, col: number): string[] {
|
||||||
const t = grammarUnits.englishEquative[e.tense === "subjunctive" ? "present" : e.tense];
|
const t = grammarUnits.englishEquative[(e.tense === "subjunctive" || e.tense === "habitual") ? "present" : e.tense];
|
||||||
return typeof t === "string"
|
return typeof t === "string"
|
||||||
? [t]
|
? [t]
|
||||||
: [t[row][col]];
|
: [t[row][col]];
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
type EquativeTense = "present" | "subjunctive" | "past" | "future" | "wouldBe" | "pastSubjunctive";
|
type EquativeTense = "present" | "subjunctive" | "habitual" | "past" | "future" | "wouldBe" | "pastSubjunctive";
|
||||||
type NounNumber = "singular" | "plural";
|
type NounNumber = "singular" | "plural";
|
||||||
|
|
||||||
type EquativeClause = {
|
type EquativeClause = {
|
||||||
|
|
Loading…
Reference in New Issue