diff --git a/package.json b/package.json index 7370680..aa73a44 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.9", + "@lingdocs/pashto-inflector": "^3.2.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/components/phrase-diagram/EditableVPEx.tsx b/src/components/phrase-diagram/EditableVPEx.tsx index d4bfbe0..81fee3a 100644 --- a/src/components/phrase-diagram/EditableVPEx.tsx +++ b/src/components/phrase-diagram/EditableVPEx.tsx @@ -11,7 +11,7 @@ export function EditIcon() { return ; } -function EditableVPEx({ children, opts, formChoice, noEdit }: { children: T.VPSelectionState, opts: T.TextOptions, formChoice?: boolean, noEdit?: boolean }) { +function EditableVPEx({ children, opts, formChoice, noEdit, length }: { children: T.VPSelectionState, opts: T.TextOptions, formChoice?: boolean, noEdit?: boolean, length: "long" | "short" }) { const [editing, setEditing] = useState(false); const [vps, setVps] = useState(children); function handleReset() { @@ -43,6 +43,7 @@ function EditableVPEx({ children, opts, formChoice, noEdit }: { children: T.VPSe justify="left" onlyOne="concat" setForm={formChoice ? handleSetForm : "disable"} + length={length} /> ; } diff --git a/src/content/verbs/continuous-past-in-reality.svg b/src/content/verbs/continuous-past-in-reality.svg new file mode 100644 index 0000000..babb273 --- /dev/null +++ b/src/content/verbs/continuous-past-in-reality.svg @@ -0,0 +1,411 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/content/verbs/past-verbs.mdx b/src/content/verbs/past-verbs.mdx index 9cee592..42902a3 100644 --- a/src/content/verbs/past-verbs.mdx +++ b/src/content/verbs/past-verbs.mdx @@ -1,5 +1,5 @@ --- -title: Past Tense +title: Past Tense 😱 --- import { @@ -13,8 +13,10 @@ import Link from "../../components/Link"; import Formula from "../../components/formula/Formula"; import verbTreePastPresent from "./verb-tree-past-present.svg"; import verbTreeImperfectivePerfective from "./verb-tree-imperfective-perfective.svg"; -import imperfectiveFuture from "./imperfective-future-graph.svg"; -import perfectiveFuture from "./perfective-future-graph.svg"; +import simplePast from "./simple-past-in-reality.svg"; +import continuousPast from "./continuous-past-in-reality.svg"; +import unoReverseMeme from "./uno-reverse-meme.jpg"; +import EditableVPEx, { EditIcon } from "../../components/phrase-diagram/EditableVPEx"; import BasicVerbShowCase from "../../components/BasicVerbShowCase"; export function KingIcon() { @@ -25,7 +27,7 @@ export function ServantIcon() { return ; }; -Past tense verbs in Pashto are famous for being very difficult and confusing for the learner. Thankfully there are some very simple rules that we can learn, and with a little practice (ok, a *lot* of practice) you'll find there's nothing confusing about past tense verbs in Pashto at all. +Past tense verbs in Pashto are famous for being very difficult and confusing for the learner. Thankfully there are some very simple rules that we can learn, and with a little practice (ok, a *lot* of practice) you'll find there's nothing scary about the past tense in Pashto at all. Now that we're making past tense verbs, we will be using the **bottom half** of the roots and stems tree. @@ -57,9 +59,19 @@ Then, we will see **what really trips people up** when learning Pashto is that < **First we'll introduce the two forms (simple and continuous past) using intransitive verbs**, and then later we'll see how things change when we use transitive verbs. Let's go! -## Past tense with intransitive verbs +## Past tense with intransitive verbs 😀 -### Simple Past +We'll start by looking at the *intransitive* verbs in the past tense because it's much simpler. The subject is the king that controls the verb and there's no weird inflection going on. + +### Simple Past + +The simple past tense is used for **single, one-time, complete actions**. It's also known as the "[preterite](https://en.wikipedia.org/wiki/Preterite)" or "perfective past." + +It uses the **perfective root** because it's looking at the event in the perfective aspect, as a complete whole. + +
+ +
Perfective root +{` `} @@ -68,7 +80,19 @@ Then, we will see **what really trips people up** when learning Pashto is that < -### Continuous Past +Notice how when you can use the *short or the long* version of the roots. + +### Continuous Past + +The continuous past tense is used for: + +- actions that were ongoing, in progress or repeated in the past +- actions that were going to happen (but didn't) +- actions that "would" happen + - as in they *would* happen *if* ... + - or as in they would happen regularly/habitually in the past + +The continuous past uses the **imperfective root** because it's looking at the event in the imperfective aspect, and seeing the action as in progress, ongoing, or incompleted. It's often used to set the background for other events, as in: Imperfective root +{` `} @@ -77,9 +101,9 @@ Then, we will see **what really trips people up** when learning Pashto is that < -## Past Tense with Transitive Verbs +## Past tense with transitive verbs 😵 -Here's where things get interesting. With non-past tense verbs the *subject* is the king of the phrase, leaving the servant role to the object. But with past tense transitive verbs, the roles are reversed! With past tense transitive verbs in Pashto: +Here's where things get interesting. Remember, with non-past tense transitive verbs the *subject* is always the of the phrase, leaving the servant role to the object. But **with past tense transitive verbs, the roles are reversed!** With past tense transitive verbs in Pashto: - The **object** is the **king** of the phrase - The *object* commands the verb! @@ -90,6 +114,58 @@ Also, another weird thing that happens is that the **subject** is inflected. - The **subject** gets **inflected** - The **object** does NOT get inflected -This isn't just some insanity unique to Pashto, in linguistics it's known as [ergative alignment](https://en.wikipedia.org/wiki/Ergative%E2%80%93absolutive_alignment). And in Pashto this seemingly "backwards" phrase structure hits us whenever we use a past tense transitive verb. +Just when you thought you were getting the hang of things, Pashto goes ahead a deals you an uno reverse card! -IN PROGRESS \ No newline at end of file +
+ uno reverse meme with pashto transitive past tense +
+ +This isn't just some insanity unique to Pashto. In linguistics it's known as [ergative alignment](https://en.wikipedia.org/wiki/Ergative%E2%80%93absolutive_alignment). And in Pashto this seemingly "backwards" phrase structure hits us whenever we use a past tense transitive verb. + +The tenses (simple and continous past) stay the same and the formulas for making them are the same, but the phrase structure changes. Have a look at the examples below. Try editing them and changing the subjects and objects to see how it affects the verb. Remember, the **object is king** and the **subject inflects**. + +### Examples with simple past + + + Perfective root +{` `} + Past verb ending + + +{ +{"blocks":[{"key":0.03311699983526872,"block":{"type":"subjectSelection","selection":{"type":"NP","selection":{"type":"pronoun","person":0,"distance":"far"}}}},{"key":0.9335532893306246,"block":{"type":"objectSelection","selection":{"type":"NP","selection":{"type":"pronoun","person":2,"distance":"far"}}}}],"verb":{"type":"verb","verb":{"entry":{"ts":1527812275,"i":11610,"p":"لیدل","f":"leedul","g":"leedul","e":"to see","c":"v. trans./gramm. trans.","psp":"وین","psf":"ween","tppp":"لید","tppf":"leed","ec":"see,sees,seeing,saw,seen"}},"verbTense":"perfectivePast","perfectTense":"presentPerfect","imperativeTense":"imperfectiveImperative","tenseCategory":"basic","transitivity":"transitive","isCompound":false,"voice":"active","negative":false,"canChangeTransitivity":true,"canChangeVoice":true,"canChangeStatDyn":false},"form":{"removeKing":false,"shrinkServant":false}} +} + +{ +{"blocks":[{"key":0.03311699983526872,"block":{"type":"subjectSelection","selection":{"type":"NP","selection":{"type":"pronoun","person":0,"distance":"far"}}}},{"key":0.9335532893306246,"block":{"type":"objectSelection","selection":{"type":"NP","selection":{"type":"pronoun","person":10,"distance":"far"}}}}],"verb":{"type":"verb","verb":{"entry":{"ts":1527812275,"i":11610,"p":"لیدل","f":"leedul","g":"leedul","e":"to see","c":"v. trans./gramm. trans.","psp":"وین","psf":"ween","tppp":"لید","tppf":"leed","ec":"see,sees,seeing,saw,seen"}},"verbTense":"perfectivePast","perfectTense":"presentPerfect","imperativeTense":"imperfectiveImperative","tenseCategory":"basic","transitivity":"transitive","isCompound":false,"voice":"active","negative":false,"canChangeTransitivity":true,"canChangeVoice":true,"canChangeStatDyn":false},"form":{"removeKing":false,"shrinkServant":false}} +} + +{ +{"blocks":[{"key":0.021807382558673538,"block":{"type":"subjectSelection","selection":{"type":"NP","selection":{"type":"noun","entry":{"ts":1527812881,"i":11709,"p":"ماشوم","f":"maashoom","g":"maashoom","e":"child, kid","c":"n. m. anim. unisex","ec":"child","ep":"children"},"gender":"masc","genderCanChange":true,"number":"plural","numberCanChange":true,"adjectives":[]}}}},{"key":0.03701805628286148,"block":{"type":"objectSelection","selection":{"type":"NP","selection":{"type":"pronoun","person":0,"distance":"far"}}}}],"verb":{"type":"verb","verb":{"entry":{"ts":1527815399,"i":14483,"p":"وهل","f":"wahul","g":"wahul","e":"to hit","c":"v. trans.","tppp":"واهه","tppf":"waahu","ec":"hit,hits,hitting,hit,hit"}},"verbTense":"perfectivePast","perfectTense":"presentPerfect","imperativeTense":"imperfectiveImperative","tenseCategory":"basic","transitivity":"transitive","isCompound":false,"voice":"active","negative":false,"canChangeTransitivity":false,"canChangeVoice":true,"canChangeStatDyn":false},"form":{"removeKing":false,"shrinkServant":false}} +} + +{ + {"blocks":[{"key":0.7215647271503056,"block":{"type":"subjectSelection","selection":{"type":"NP","selection":{"type":"pronoun","person":3,"distance":"far"}}}},{"key":0.5243897934182491,"block":{"type":"objectSelection","selection":{"type":"NP","selection":{"type":"noun","entry":{"ts":1527812564,"i":6538,"p":"ډوډۍ","f":"DoDúy","g":"DoDuy","e":"bread, food, meal","c":"n. f."},"gender":"fem","genderCanChange":false,"number":"singular","numberCanChange":true,"adjectives":[]}}}}],"verb":{"type":"verb","verb":{"entry":{"ts":1527812790,"i":5795,"p":"خوړل","f":"khoRul","g":"khoRul","e":"to eat, to bite","c":"v. trans.","psp":"خور","psf":"khor","tppp":"خوړ","tppf":"khoR","ec":"eat,eats,eating,ate,eaten"}},"verbTense":"perfectivePast","perfectTense":"presentPerfect","imperativeTense":"imperfectiveImperative","tenseCategory":"basic","transitivity":"transitive","isCompound":false,"voice":"active","negative":false,"canChangeTransitivity":false,"canChangeVoice":true,"canChangeStatDyn":false},"form":{"removeKing":false,"shrinkServant":false}} +} + +### Examples with continous past + + + Imperfective root +{` `} + Past verb ending + + +{ +{"blocks":[{"key":0.03311699983526872,"block":{"type":"subjectSelection","selection":{"type":"NP","selection":{"type":"pronoun","person":0,"distance":"far"}}}},{"key":0.9335532893306246,"block":{"type":"objectSelection","selection":{"type":"NP","selection":{"type":"pronoun","person":2,"distance":"far"}}}}],"verb":{"type":"verb","verb":{"entry":{"ts":1527812275,"i":11610,"p":"لیدل","f":"leedul","g":"leedul","e":"to see","c":"v. trans./gramm. trans.","psp":"وین","psf":"ween","tppp":"لید","tppf":"leed","ec":"see,sees,seeing,saw,seen"}},"verbTense":"imperfectivePast","perfectTense":"presentPerfect","imperativeTense":"imperfectiveImperative","tenseCategory":"basic","transitivity":"transitive","isCompound":false,"voice":"active","negative":false,"canChangeTransitivity":true,"canChangeVoice":true,"canChangeStatDyn":false},"form":{"removeKing":false,"shrinkServant":false}} +} + +{ +{"blocks":[{"key":0.03311699983526872,"block":{"type":"subjectSelection","selection":{"type":"NP","selection":{"type":"pronoun","person":0,"distance":"far"}}}},{"key":0.9335532893306246,"block":{"type":"objectSelection","selection":{"type":"NP","selection":{"type":"pronoun","person":10,"distance":"far"}}}}],"verb":{"type":"verb","verb":{"entry":{"ts":1527812275,"i":11610,"p":"لیدل","f":"leedul","g":"leedul","e":"to see","c":"v. trans./gramm. trans.","psp":"وین","psf":"ween","tppp":"لید","tppf":"leed","ec":"see,sees,seeing,saw,seen"}},"verbTense":"imperfectivePast","perfectTense":"presentPerfect","imperativeTense":"imperfectiveImperative","tenseCategory":"basic","transitivity":"transitive","isCompound":false,"voice":"active","negative":false,"canChangeTransitivity":true,"canChangeVoice":true,"canChangeStatDyn":false},"form":{"removeKing":false,"shrinkServant":false}} +} + +{ +{"blocks":[{"key":0.021807382558673538,"block":{"type":"subjectSelection","selection":{"type":"NP","selection":{"type":"noun","entry":{"ts":1527812881,"i":11709,"p":"ماشوم","f":"maashoom","g":"maashoom","e":"child, kid","c":"n. m. anim. unisex","ec":"child","ep":"children"},"gender":"masc","genderCanChange":true,"number":"plural","numberCanChange":true,"adjectives":[]}}}},{"key":0.03701805628286148,"block":{"type":"objectSelection","selection":{"type":"NP","selection":{"type":"pronoun","person":0,"distance":"far"}}}}],"verb":{"type":"verb","verb":{"entry":{"ts":1527815399,"i":14483,"p":"وهل","f":"wahul","g":"wahul","e":"to hit","c":"v. trans.","tppp":"واهه","tppf":"waahu","ec":"hit,hits,hitting,hit,hit"}},"verbTense":"imperfectivePast","perfectTense":"presentPerfect","imperativeTense":"imperfectiveImperative","tenseCategory":"basic","transitivity":"transitive","isCompound":false,"voice":"active","negative":false,"canChangeTransitivity":false,"canChangeVoice":true,"canChangeStatDyn":false},"form":{"removeKing":false,"shrinkServant":false}} +} + +{ + {"blocks":[{"key":0.7215647271503056,"block":{"type":"subjectSelection","selection":{"type":"NP","selection":{"type":"pronoun","person":3,"distance":"far"}}}},{"key":0.5243897934182491,"block":{"type":"objectSelection","selection":{"type":"NP","selection":{"type":"noun","entry":{"ts":1527812564,"i":6538,"p":"ډوډۍ","f":"DoDúy","g":"DoDuy","e":"bread, food, meal","c":"n. f."},"gender":"fem","genderCanChange":false,"number":"singular","numberCanChange":true,"adjectives":[]}}}}],"verb":{"type":"verb","verb":{"entry":{"ts":1527812790,"i":5795,"p":"خوړل","f":"khoRul","g":"khoRul","e":"to eat, to bite","c":"v. trans.","psp":"خور","psf":"khor","tppp":"خوړ","tppf":"khoR","ec":"eat,eats,eating,ate,eaten"}},"verbTense":"imperfectivePast","perfectTense":"presentPerfect","imperativeTense":"imperfectiveImperative","tenseCategory":"basic","transitivity":"transitive","isCompound":false,"voice":"active","negative":false,"canChangeTransitivity":false,"canChangeVoice":true,"canChangeStatDyn":false},"form":{"removeKing":false,"shrinkServant":false}} +} diff --git a/src/content/verbs/simple-past-in-reality.svg b/src/content/verbs/simple-past-in-reality.svg new file mode 100644 index 0000000..4b59379 --- /dev/null +++ b/src/content/verbs/simple-past-in-reality.svg @@ -0,0 +1,414 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/src/content/verbs/uno-card.jpg b/src/content/verbs/uno-card.jpg new file mode 100644 index 0000000..dc4a582 Binary files /dev/null and b/src/content/verbs/uno-card.jpg differ diff --git a/src/content/verbs/uno-reverse-meme.jpg b/src/content/verbs/uno-reverse-meme.jpg new file mode 100644 index 0000000..1fbb58f Binary files /dev/null and b/src/content/verbs/uno-reverse-meme.jpg differ diff --git a/src/content/verbs/uno-reverse.png b/src/content/verbs/uno-reverse.png new file mode 100644 index 0000000..552e736 Binary files /dev/null and b/src/content/verbs/uno-reverse.png differ diff --git a/yarn.lock b/yarn.lock index 0d01de0..e6d3cf0 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.9": - version "3.1.9" - resolved "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-3.1.9.tgz#1c31c4b9ab8ee851de2465fa6950c3cbf5818b4a" - integrity sha512-dcgkGZPubUKsbesllERajAYkNIbemKNvoYu4JyvwZZ4kjq3TI9NPFtHE5uNPJ1R52mrbMrkm2aT2ss2SrybCRg== +"@lingdocs/pashto-inflector@^3.2.2": + version "3.2.2" + resolved "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-3.2.2.tgz#d9a6c7c95fc53d51b8594e1827c7fb1e3abcd947" + integrity sha512-JrkOKFmhYUBkMuaR+Mf0hFJUFWooynWjMPzSF84NnWDCGiDbE+7u/BoMy4TkmtDXRWlDeTGerLkB79xu9QswoQ== dependencies: "@formkit/auto-animate" "^1.0.0-beta.1" classnames "^2.2.6"