From fbdc4a7650e8af067fea1dc31aee7a6a378214e0 Mon Sep 17 00:00:00 2001
From: lingdocs <71590811+lingdocs@users.noreply.github.com>
Date: Tue, 5 Jul 2022 19:35:36 -0500
Subject: [PATCH] perfect page started
---
package.json | 2 +-
.../phrase-diagram/EditableVPEx.tsx | 10 +-
src/content/inflection/inflection-intro.mdx | 2 +-
src/content/verbs/basic-present-verbs.ts | 2 +
src/content/verbs/perfect-verbs.mdx | 102 +++++++++++++++---
yarn.lock | 8 +-
6 files changed, 106 insertions(+), 20 deletions(-)
diff --git a/package.json b/package.json
index 01f90ad..58ad089 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.2.4",
+ "@lingdocs/pashto-inflector": "^3.2.5",
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10",
diff --git a/src/components/phrase-diagram/EditableVPEx.tsx b/src/components/phrase-diagram/EditableVPEx.tsx
index 81fee3a..44c4dcf 100644
--- a/src/components/phrase-diagram/EditableVPEx.tsx
+++ b/src/components/phrase-diagram/EditableVPEx.tsx
@@ -11,7 +11,14 @@ export function EditIcon() {
return ;
}
-function EditableVPEx({ children, opts, formChoice, noEdit, length }: { children: T.VPSelectionState, opts: T.TextOptions, formChoice?: boolean, noEdit?: boolean, length: "long" | "short" }) {
+function EditableVPEx({ children, opts, formChoice, noEdit, length, mode }: {
+ children: T.VPSelectionState,
+ opts: T.TextOptions,
+ formChoice?: boolean,
+ noEdit?: boolean,
+ length: "long" | "short",
+ mode?: "text" | "blocks",
+}) {
const [editing, setEditing] = useState(false);
const [vps, setVps] = useState(children);
function handleReset() {
@@ -44,6 +51,7 @@ function EditableVPEx({ children, opts, formChoice, noEdit, length }: { children
onlyOne="concat"
setForm={formChoice ? handleSetForm : "disable"}
length={length}
+ mode={mode}
/>
;
}
diff --git a/src/content/inflection/inflection-intro.mdx b/src/content/inflection/inflection-intro.mdx
index 7eaea70..6a33f3f 100644
--- a/src/content/inflection/inflection-intro.mdx
+++ b/src/content/inflection/inflection-intro.mdx
@@ -107,7 +107,7 @@ Once a word gets inflected, you can push or bend it even further a second time.
[
{p:"سړی", f:"saRey", e:"man"},
{p:"سړي", f:"saRee"},
- {p:"سړیو", f:"saReyo"},
+ {p:"سړیو", f:"saRiyo"},
],
[
{p:"ښځه", f:"xudza", e:"woman"},
diff --git a/src/content/verbs/basic-present-verbs.ts b/src/content/verbs/basic-present-verbs.ts
index 5f95549..dbb1037 100644
--- a/src/content/verbs/basic-present-verbs.ts
+++ b/src/content/verbs/basic-present-verbs.ts
@@ -20,4 +20,6 @@ export const intransitivePast: T.VerbEntry[] = [
{"ts":1527812645,"i":10822,"p":"ګرځېدل","f":"gurdzedul","g":"gurdzedul","e":"to walk, wander, turn about; to become, to be","c":"v. intrans.","shortIntrans":true,"ec":"walk"},
{"ts":1527816495,"i":3470,"p":"تښتېدل","f":"tuxtedul","g":"tuxtedul","e":"to run off, escape, flee","c":"v. intrans.","shortIntrans":true,"ec":"escape"},
{"ts":1527813680,"i":9218,"p":"غږېدل","f":"ghuGedul, ghaGedul","g":"ghugedul,ghagedul","e":"to speak, talk, converse, sing","c":"v. intrans.","ec":"speak,speaks,speaking,spoke"},
+ {"ts":1527813994,"i":11589,"p":"لوېدل","f":"lwedul","g":"lwedul","e":"to fall, to tumble, go down, settle","c":"v. intrans.","ec":"fall,falls,falling,fell,fallen"},
+ {"ts":1527813710,"i":7321,"p":"زېږېدل","f":"zeGedul","g":"zegedul","e":"to be born, to appear, arise","c":"v. intrans.","ec":"be","ep":"born"},
].map(entry => ({ entry }));
\ No newline at end of file
diff --git a/src/content/verbs/perfect-verbs.mdx b/src/content/verbs/perfect-verbs.mdx
index 0854112..af033a7 100644
--- a/src/content/verbs/perfect-verbs.mdx
+++ b/src/content/verbs/perfect-verbs.mdx
@@ -32,7 +32,9 @@ We use [perfect tenses](https://en.wikipedia.org/wiki/Perfect_(grammar)) when we
In English we're not as strict with using the perfect tense. In fact it can sound a little formal or bookish to always say things like "I've lost my wallet" (perfect) instead of "I lost my wallet" (simple past). In Pashto however, this distinction is very normal and common, and you will see the perfect form used whenever it's important to talk about a state resulting from the action.
-With the past tense we're talking about an event happening. We're just relaying the fact that something happened, without talking about the consequences of that event.
+### Comparing Simple Past to Perfect
+
+With the simple past tense we're talking about an event happening. We're just relaying the fact that something happened, without talking about the consequences of that event.