From 076fd07be568a0e747d58258e00516ff6506b27c Mon Sep 17 00:00:00 2001
From: lingdocs <71590811+lingdocs@users.noreply.github.com>
Date: Mon, 27 Jun 2022 14:02:00 -0500
Subject: [PATCH] proper 8 categories of equatives
---
package.json | 2 +-
src/content/equatives/other-equatives.mdx | 46 ++++++++++++++-----
src/content/index.ts | 6 +--
.../unreal-conditionals.mdx | 4 +-
src/games/games.tsx | 8 ++++
src/games/sub-cores/EquativeGame.tsx | 4 +-
yarn.lock | 8 ++--
7 files changed, 56 insertions(+), 22 deletions(-)
rename src/content/{recipies => recipes}/unreal-conditionals.mdx (77%)
diff --git a/package.json b/package.json
index bda79ed..fcb74be 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
"@formkit/auto-animate": "^1.0.0-beta.1",
"@fortawesome/fontawesome-free": "^5.15.4",
"@lingdocs/lingdocs-main": "^0.3.1",
- "@lingdocs/pashto-inflector": "^3.1.1",
+ "@lingdocs/pashto-inflector": "^3.1.2",
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10",
diff --git a/src/content/equatives/other-equatives.mdx b/src/content/equatives/other-equatives.mdx
index 58fe375..b61aefb 100644
--- a/src/content/equatives/other-equatives.mdx
+++ b/src/content/equatives/other-equatives.mdx
@@ -33,6 +33,7 @@ import {
equativeGamePast,
equativeGameWouldBe,
equativeGamePastSubjunctive,
+ equativeGameWouldHaveBeen,
} from "../../games/games";
import GameDisplay from "../../games/GameDisplay";
@@ -400,7 +401,7 @@ Because this is based on the the non-inflecting tail, *it doesn't change at all,
+ non-inflecting tail
-export function WithTailChoice() {
+export function WithTailChoice(props) {
const [choice, setChoice] = React.useState("aay");
const waay = concatPsString(
{p: "و", f: "w"},
@@ -423,15 +424,20 @@ export function WithTailChoice() {
-## Overview
+## "Would have been" Equative
-#### Present Equative
+This is used to talk about:
+
+- If some hypothetical condition were true, A would have been B
+- A should have been B, or it would have been good if A would have been B
+
+
+ + past subjunctive
+
+
+
+
+
+
+## Overview of 8 Equatives
+
+#### 1. Present Equative
- A is B currently
- A is B categorically, definately
-#### Habitual Equative
+#### 2. Habitual Equative
- A is B habitually, repeatedly, generally
- A tends to be B
-#### Subjunctive Equative
+#### 3. Subjunctive Equative
- One desires or wants A to be B
- A should/must be B (judgement)
- If/it's possible that A is B
- ...so that A is B (purpose)
-#### Future Equative
+#### 4. Future Equative
- A will be B
- presuming or guessing that A will be B
-#### Past Equative
+#### 5. Past Equative
- A was B
- (if) A turns out to be B
-#### "Would be" Equative
+#### 6. "Would be" Equative
- A was B habitually
- Presuming or guessing that A was B
- A would have been B (as the result of a hypothetical outcome)
- A should have been B
-#### Past Subjunctive Equative
+#### 7. Past Subjunctive Equative
- A should have been B
- If A were B (unreal conditional)
- I wish/if only A were B!
+
+#### 8. "Would have been" Equative
+- A would have been B
diff --git a/src/content/index.ts b/src/content/index.ts
index d0f92fd..9232d0c 100644
--- a/src/content/index.ts
+++ b/src/content/index.ts
@@ -90,7 +90,7 @@ import * as theFiveYeys from "!babel-loader!@lingdocs/mdx-loader!./writing/the-f
import * as typingIssues from "!babel-loader!@lingdocs/mdx-loader!./writing/typing-issues.mdx";
// @ts-ignore
-import * as unrealConditionals from "!babel-loader!@lingdocs/mdx-loader!./recipies/unreal-conditionals.mdx";
+import * as unrealConditionals from "!babel-loader!@lingdocs/mdx-loader!./recipes/unreal-conditionals.mdx";
// @ts-ignore
import * as games from "!babel-loader!@lingdocs/mdx-loader!./games.mdx";
@@ -300,8 +300,8 @@ const contentTree = [
],
},
{
- heading: "Recipies 👩🍳",
- subdirectory: "recipies",
+ heading: "Recipes 👩🍳",
+ subdirectory: "recipes",
chapters: [
{
import: unrealConditionals,
diff --git a/src/content/recipies/unreal-conditionals.mdx b/src/content/recipes/unreal-conditionals.mdx
similarity index 77%
rename from src/content/recipies/unreal-conditionals.mdx
rename to src/content/recipes/unreal-conditionals.mdx
index aafc209..fa0bc26 100644
--- a/src/content/recipies/unreal-conditionals.mdx
+++ b/src/content/recipes/unreal-conditionals.mdx
@@ -10,8 +10,8 @@ title: Unreal Conditionals
- past subjunctive equative / perfect
#### B. Then something else would be true
- currently
- - continuous past / ba + continuous past
+ - continuous past / habitual continuous past
- "would be" equative
- in the past
- "would be" equative / perfect
- - ba + past subjunctive equative / perfect
+ - "would have been" equative / perfect
diff --git a/src/games/games.tsx b/src/games/games.tsx
index 1c60af0..6928bed 100644
--- a/src/games/games.tsx
+++ b/src/games/games.tsx
@@ -84,6 +84,13 @@ export const equativeGamePastSubjunctive = makeGameRecord(
(id, link) => () => ,
);
+export const equativeGameWouldHaveBeen = makeGameRecord(
+ 'Write the "would have been" equative',
+ "equative-would-have-been",
+ "/equatives/other-equatives/#wold-have-been-equative",
+ (id, link) => () => ,
+);
+
export const equativeGameAllIdentify = makeGameRecord(
"Identify the equative (all tenses)",
"equative-past-summary-identify",
@@ -124,6 +131,7 @@ const games: { chapter: string, items: GameRecord[] }[] = [
equativeGamePast,
equativeGameWouldBe,
equativeGamePastSubjunctive,
+ equativeGameWouldHaveBeen,
equativeGameSituations,
equativeGameAllIdentify,
equativeGameAllProduce,
diff --git a/src/games/sub-cores/EquativeGame.tsx b/src/games/sub-cores/EquativeGame.tsx
index 2c58ec8..092789a 100644
--- a/src/games/sub-cores/EquativeGame.tsx
+++ b/src/games/sub-cores/EquativeGame.tsx
@@ -54,7 +54,7 @@ const locAdverbs: T.LocativeAdverbEntry[] = [
{"ts":1527812449,"i":13937,"p":"هلته","f":"hálta, álta","g":"halta,alta","e":"there","c":"loc. adv."},
].filter(tp.isLocativeAdverbEntry);
const tenses: T.EquativeTense[] = [
- "present", "habitual", "subjunctive", "future", "past", "wouldBe", "pastSubjunctive",
+ "present", "habitual", "subjunctive", "future", "past", "wouldBe", "pastSubjunctive", "wouldHaveBeen"
];
type Situation = {
@@ -466,6 +466,8 @@ function humanReadableTense(tense: T.EquativeTense | "allProduce"): string {
? "past subjunctive"
: tense === "wouldBe"
? `"would be"`
+ : tense === "wouldHaveBeen"
+ ? `"would have been"`
: tense;
}
diff --git a/yarn.lock b/yarn.lock
index 3e896d3..726914b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1695,10 +1695,10 @@
rambda "^6.7.0"
react-select "^5.2.2"
-"@lingdocs/pashto-inflector@^3.1.1":
- version "3.1.1"
- resolved "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-3.1.1.tgz#607cb0ed6a3569bd86b8033ce12cbb9f530150a7"
- integrity sha512-tMG1viHjZDJVKR5Hwr0s/fHDYqTM0XMOPgWdSZtMgY4VVJIQgms9gaT9aVVibRsfO8p7GauteE+B1hwaIbMxpg==
+"@lingdocs/pashto-inflector@^3.1.2":
+ version "3.1.2"
+ resolved "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-3.1.2.tgz#cdd43202fb5c934964a5370762587853fbea968b"
+ integrity sha512-B2Yb7Thx1HPhsB9ZumDVvjGETHGejiClalsOxnXaWStDEPmsmemgDvmn5Zp/6E2gUhCr9dW6vIaLfG5wYSxG+A==
dependencies:
"@formkit/auto-animate" "^1.0.0-beta.1"
classnames "^2.2.6"