with better past tense endings
This commit is contained in:
parent
3308a77c5c
commit
2551a2d894
|
@ -6,7 +6,7 @@
|
||||||
"@formkit/auto-animate": "^1.0.0-beta.1",
|
"@formkit/auto-animate": "^1.0.0-beta.1",
|
||||||
"@fortawesome/fontawesome-free": "^5.15.4",
|
"@fortawesome/fontawesome-free": "^5.15.4",
|
||||||
"@lingdocs/lingdocs-main": "^0.3.1",
|
"@lingdocs/lingdocs-main": "^0.3.1",
|
||||||
"@lingdocs/pashto-inflector": "^3.4.0",
|
"@lingdocs/pashto-inflector": "^3.4.2",
|
||||||
"@testing-library/jest-dom": "^5.11.4",
|
"@testing-library/jest-dom": "^5.11.4",
|
||||||
"@testing-library/react": "^11.1.0",
|
"@testing-library/react": "^11.1.0",
|
||||||
"@testing-library/user-event": "^12.1.10",
|
"@testing-library/user-event": "^12.1.10",
|
||||||
|
|
|
@ -125,7 +125,7 @@ So with this verb we add a complement - something that the subject is *becoming*
|
||||||
{"blocks":[{"key":0.8034429811171007,"block":{"type":"subjectSelection","selection":{"type":"NP","selection":{"type":"pronoun","person":0,"distance":"far"}}}},{"key":0.19673719282869384,"block":{"type":"objectSelection","selection":"none"}}],"verb":{"type":"verb","verb":{"entry":{"ts":1581086654898,"i":10697,"p":"کېدل","f":"kedul","g":"kedul","e":"to become _____","c":"v. intrans. irreg.","ssp":"ش","ssf":"sh","prp":"شول","prf":"shwul","pprtp":"شوی","pprtf":"shúwey","noOo":true,"ec":"become","ep":"_____"}},"verbTense":"presentVerb","perfectTense":"presentPerfect","imperativeTense":"imperfectiveImperative","tenseCategory":"basic","transitivity":"intransitive","isCompound":false,"voice":"active","negative":false,"canChangeTransitivity":false,"canChangeVoice":false,"canChangeStatDyn":false},"externalComplement":{"type":"complement","selection":{"type":"adjective","entry":{"ts":1527815306,"i":7598,"p":"ستړی","f":"stúRey","g":"stuRey","e":"tired","c":"adj."}}},"form":{"removeKing":false,"shrinkServant":false}}
|
{"blocks":[{"key":0.8034429811171007,"block":{"type":"subjectSelection","selection":{"type":"NP","selection":{"type":"pronoun","person":0,"distance":"far"}}}},{"key":0.19673719282869384,"block":{"type":"objectSelection","selection":"none"}}],"verb":{"type":"verb","verb":{"entry":{"ts":1581086654898,"i":10697,"p":"کېدل","f":"kedul","g":"kedul","e":"to become _____","c":"v. intrans. irreg.","ssp":"ش","ssf":"sh","prp":"شول","prf":"shwul","pprtp":"شوی","pprtf":"shúwey","noOo":true,"ec":"become","ep":"_____"}},"verbTense":"presentVerb","perfectTense":"presentPerfect","imperativeTense":"imperfectiveImperative","tenseCategory":"basic","transitivity":"intransitive","isCompound":false,"voice":"active","negative":false,"canChangeTransitivity":false,"canChangeVoice":false,"canChangeStatDyn":false},"externalComplement":{"type":"complement","selection":{"type":"adjective","entry":{"ts":1527815306,"i":7598,"p":"ستړی","f":"stúRey","g":"stuRey","e":"tired","c":"adj."}}},"form":{"removeKing":false,"shrinkServant":false}}
|
||||||
}</EditableVPEx>
|
}</EditableVPEx>
|
||||||
|
|
||||||
Notice how the **complement inflects according to the subject**.
|
Notice how the **if the complement is an adjective in will inflect according to the subject**.
|
||||||
|
|
||||||
<EditableVPEx opts={opts}>{
|
<EditableVPEx opts={opts}>{
|
||||||
{"blocks":[{"key":0.8034429811171007,"block":{"type":"subjectSelection","selection":{"type":"NP","selection":{"type":"pronoun","person":1,"distance":"far"}}}},{"key":0.19673719282869384,"block":{"type":"objectSelection","selection":"none"}}],"verb":{"type":"verb","verb":{"entry":{"ts":1581086654898,"i":10697,"p":"کېدل","f":"kedul","g":"kedul","e":"to become _____","c":"v. intrans. irreg.","ssp":"ش","ssf":"sh","prp":"شول","prf":"shwul","pprtp":"شوی","pprtf":"shúwey","noOo":true,"ec":"become","ep":"_____"}},"verbTense":"presentVerb","perfectTense":"presentPerfect","imperativeTense":"imperfectiveImperative","tenseCategory":"basic","transitivity":"intransitive","isCompound":false,"voice":"active","negative":false,"canChangeTransitivity":false,"canChangeVoice":false,"canChangeStatDyn":false},"externalComplement":{"type":"complement","selection":{"type":"adjective","entry":{"ts":1527815306,"i":7598,"p":"ستړی","f":"stúRey","g":"stuRey","e":"tired","c":"adj."}}},"form":{"removeKing":false,"shrinkServant":false}}
|
{"blocks":[{"key":0.8034429811171007,"block":{"type":"subjectSelection","selection":{"type":"NP","selection":{"type":"pronoun","person":1,"distance":"far"}}}},{"key":0.19673719282869384,"block":{"type":"objectSelection","selection":"none"}}],"verb":{"type":"verb","verb":{"entry":{"ts":1581086654898,"i":10697,"p":"کېدل","f":"kedul","g":"kedul","e":"to become _____","c":"v. intrans. irreg.","ssp":"ش","ssf":"sh","prp":"شول","prf":"shwul","pprtp":"شوی","pprtf":"shúwey","noOo":true,"ec":"become","ep":"_____"}},"verbTense":"presentVerb","perfectTense":"presentPerfect","imperativeTense":"imperfectiveImperative","tenseCategory":"basic","transitivity":"intransitive","isCompound":false,"voice":"active","negative":false,"canChangeTransitivity":false,"canChangeVoice":false,"canChangeStatDyn":false},"externalComplement":{"type":"complement","selection":{"type":"adjective","entry":{"ts":1527815306,"i":7598,"p":"ستړی","f":"stúRey","g":"stuRey","e":"tired","c":"adj."}}},"form":{"removeKing":false,"shrinkServant":false}}
|
||||||
|
@ -301,7 +301,7 @@ Like its brother <InlinePs opts={opts} ps={{ p: "کېدل", f: "kedúl", e: "to
|
||||||
{"blocks":[{"key":0.049217458592629715,"block":{"type":"subjectSelection","selection":{"type":"NP","selection":{"type":"pronoun","person":3,"distance":"far"}}}},{"key":0.7895952701078488,"block":{"type":"objectSelection","selection":{"type":"NP","selection":{"type":"pronoun","person":0,"distance":"far"}}}}],"verb":{"type":"verb","verb":{"entry":{"ts":1579015359582,"i":10631,"p":"کول","f":"kawul","g":"kawul","e":"to make ____ ____ (as in \"He's making me angry.\")","c":"v. trans. irreg.","ssp":"کړ","ssf":"kR","prp":"کړل","prf":"kRul","pprtp":"کړی","pprtf":"kúRey","noOo":true,"ec":"make,makes,making,made,made","ep":"_____"}},"verbTense":"presentVerb","perfectTense":"presentPerfect","imperativeTense":"imperfectiveImperative","tenseCategory":"basic","transitivity":"transitive","isCompound":false,"voice":"active","negative":false,"canChangeTransitivity":false,"canChangeVoice":true,"canChangeStatDyn":false},"externalComplement":{"type":"complement","selection":{"type":"adjective","entry":{"ts":1527815306,"i":7598,"p":"ستړی","f":"stúRey","g":"stuRey","e":"tired","c":"adj."}}},"form":{"removeKing":false,"shrinkServant":false}}
|
{"blocks":[{"key":0.049217458592629715,"block":{"type":"subjectSelection","selection":{"type":"NP","selection":{"type":"pronoun","person":3,"distance":"far"}}}},{"key":0.7895952701078488,"block":{"type":"objectSelection","selection":{"type":"NP","selection":{"type":"pronoun","person":0,"distance":"far"}}}}],"verb":{"type":"verb","verb":{"entry":{"ts":1579015359582,"i":10631,"p":"کول","f":"kawul","g":"kawul","e":"to make ____ ____ (as in \"He's making me angry.\")","c":"v. trans. irreg.","ssp":"کړ","ssf":"kR","prp":"کړل","prf":"kRul","pprtp":"کړی","pprtf":"kúRey","noOo":true,"ec":"make,makes,making,made,made","ep":"_____"}},"verbTense":"presentVerb","perfectTense":"presentPerfect","imperativeTense":"imperfectiveImperative","tenseCategory":"basic","transitivity":"transitive","isCompound":false,"voice":"active","negative":false,"canChangeTransitivity":false,"canChangeVoice":true,"canChangeStatDyn":false},"externalComplement":{"type":"complement","selection":{"type":"adjective","entry":{"ts":1527815306,"i":7598,"p":"ستړی","f":"stúRey","g":"stuRey","e":"tired","c":"adj."}}},"form":{"removeKing":false,"shrinkServant":false}}
|
||||||
}</EditableVPEx>
|
}</EditableVPEx>
|
||||||
|
|
||||||
Notice how the **complement is inflected** to change **according to what the object is**.
|
Notice how **if the complement is an adjective it will inflect according the object**.
|
||||||
|
|
||||||
<EditableVPEx opts={opts}>{
|
<EditableVPEx opts={opts}>{
|
||||||
{"blocks":[{"key":0.049217458592629715,"block":{"type":"subjectSelection","selection":{"type":"NP","selection":{"type":"pronoun","person":3,"distance":"far"}}}},{"key":0.7895952701078488,"block":{"type":"objectSelection","selection":{"type":"NP","selection":{"type":"pronoun","person":1,"distance":"far"}}}}],"verb":{"type":"verb","verb":{"entry":{"ts":1579015359582,"i":10631,"p":"کول","f":"kawul","g":"kawul","e":"to make ____ ____ (as in \"He's making me angry.\")","c":"v. trans. irreg.","ssp":"کړ","ssf":"kR","prp":"کړل","prf":"kRul","pprtp":"کړی","pprtf":"kúRey","noOo":true,"ec":"make,makes,making,made,made","ep":"_____"}},"verbTense":"perfectivePast","perfectTense":"presentPerfect","imperativeTense":"imperfectiveImperative","tenseCategory":"basic","transitivity":"transitive","isCompound":false,"voice":"active","negative":false,"canChangeTransitivity":false,"canChangeVoice":true,"canChangeStatDyn":false},"externalComplement":{"type":"complement","selection":{"type":"adjective","entry":{"ts":1527815306,"i":7598,"p":"ستړی","f":"stúRey","g":"stuRey","e":"tired","c":"adj."}}},"form":{"removeKing":false,"shrinkServant":false}}
|
{"blocks":[{"key":0.049217458592629715,"block":{"type":"subjectSelection","selection":{"type":"NP","selection":{"type":"pronoun","person":3,"distance":"far"}}}},{"key":0.7895952701078488,"block":{"type":"objectSelection","selection":{"type":"NP","selection":{"type":"pronoun","person":1,"distance":"far"}}}}],"verb":{"type":"verb","verb":{"entry":{"ts":1579015359582,"i":10631,"p":"کول","f":"kawul","g":"kawul","e":"to make ____ ____ (as in \"He's making me angry.\")","c":"v. trans. irreg.","ssp":"کړ","ssf":"kR","prp":"کړل","prf":"kRul","pprtp":"کړی","pprtf":"kúRey","noOo":true,"ec":"make,makes,making,made,made","ep":"_____"}},"verbTense":"perfectivePast","perfectTense":"presentPerfect","imperativeTense":"imperfectiveImperative","tenseCategory":"basic","transitivity":"transitive","isCompound":false,"voice":"active","negative":false,"canChangeTransitivity":false,"canChangeVoice":true,"canChangeStatDyn":false},"externalComplement":{"type":"complement","selection":{"type":"adjective","entry":{"ts":1527815306,"i":7598,"p":"ستړی","f":"stúRey","g":"stuRey","e":"tired","c":"adj."}}},"form":{"removeKing":false,"shrinkServant":false}}
|
||||||
|
|
|
@ -52,7 +52,7 @@ Pashto learners often get very confused while because there are **three differen
|
||||||
|
|
||||||
Depending on what kind of verb you're using, the sentence structure will **completely change**. If you're used to speaking a language (like most) where the sentence structure never changes this will seem a little insane at first! But don't worry, once you understand what these three structures are it will all make sense and your brain will get used to them with a lot of practice.
|
Depending on what kind of verb you're using, the sentence structure will **completely change**. If you're used to speaking a language (like most) where the sentence structure never changes this will seem a little insane at first! But don't worry, once you understand what these three structures are it will all make sense and your brain will get used to them with a lot of practice.
|
||||||
|
|
||||||
### 1. With Intransitive Verbs 🛴
|
### 1. With intransitive verbs 🛴
|
||||||
|
|
||||||
Intransitive verbs are **verbs that don't have an object**. For example, the verbs:
|
Intransitive verbs are **verbs that don't have an object**. For example, the verbs:
|
||||||
|
|
||||||
|
|
|
@ -16,10 +16,12 @@ https://creativecommons.org/licenses/by-sa/4.0/legalcode
|
||||||
|
|
||||||
import {
|
import {
|
||||||
addToForm,
|
addToForm,
|
||||||
defaultTextOptions,
|
defaultTextOptions as opts,
|
||||||
grammarUnits,
|
grammarUnits,
|
||||||
VerbFormDisplay,
|
VerbFormDisplay,
|
||||||
|
InlinePs,
|
||||||
} from "@lingdocs/pashto-inflector";
|
} from "@lingdocs/pashto-inflector";
|
||||||
|
import Link from "../../components/Link";
|
||||||
|
|
||||||
export function addTail(form) {
|
export function addTail(form) {
|
||||||
return addToForm([{ p: "ـ", f: "-" }], form, true);
|
return addToForm([{ p: "ـ", f: "-" }], form, true);
|
||||||
|
@ -27,28 +29,37 @@ export function addTail(form) {
|
||||||
|
|
||||||
## Present Verb Endings
|
## Present Verb Endings
|
||||||
|
|
||||||
These endings are added on to the ends of present, subjunctive, and future verbs.
|
These endings are added on to the ends of <Link to="/verbs/roots-and-stems/">verb stems</Link> to make present, subjunctive, and future verbs.
|
||||||
|
|
||||||
<VerbFormDisplay
|
<VerbFormDisplay
|
||||||
displayForm={addTail(grammarUnits.presentEndings)}
|
displayForm={addTail(grammarUnits.presentEndings)}
|
||||||
textOptions={defaultTextOptions}
|
textOptions={opts}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
## Imperative Verb Endings
|
## Imperative Verb Endings
|
||||||
|
|
||||||
These endings are added on to the ends of imperative verbs.
|
These endings are added on to the ends <Link to="/verbs/roots-and-stems/">verb stems</Link> to make imperative verbs.
|
||||||
|
|
||||||
<VerbFormDisplay
|
<VerbFormDisplay
|
||||||
displayForm={addTail(grammarUnits.imperativeEndings)}
|
displayForm={addTail(grammarUnits.imperativeEndings)}
|
||||||
textOptions={defaultTextOptions}
|
textOptions={opts}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
## Past Verb Endings
|
## Past Verb Endings
|
||||||
|
|
||||||
These endings are added on to the ends of simple and continuous past verbs.
|
These endings are added on to the ends <Link to="/verbs/roots-and-stems/">verb roots</Link> to make past-tense verbs.
|
||||||
|
|
||||||
<VerbFormDisplay
|
<VerbFormDisplay
|
||||||
displayForm={addTail(grammarUnits.pastEndings)}
|
displayForm={addTail(grammarUnits.pastEndings.short)}
|
||||||
textOptions={defaultTextOptions}
|
textOptions={opts}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
### Notes about past verb endings
|
||||||
|
|
||||||
|
- the <InlinePs opts={opts} ps={{ p: "هْ", f: "u" }} /> ending is only used with the <strong>short</strong> forms of the roots. (without the <InlinePs opts={opts} ps={{ p: "ل", f: "l", e: "" }} />)
|
||||||
|
- The **short form of the 3rd pers. masc. sing.** verbs in the past is a bit interesting. The ending is often left off (if it ends in a consanant like <InlinePs opts={opts} ps={{ p: "ولید", f: "óoleed", e: "" }} /> or is irregular like <InlinePs opts={opts} ps={{ p: "کاوه", f: "kaawú" }} /> from <InlinePs opts={opts} ps={{ p: "کول", f: "kawul" }} /> or <InlinePs opts={opts} ps={{ p: "خوت", f: "khot" }} /> from <InlinePs opts={opts} ps={{ p: "ختل", f: "khatúl" }} />
|
||||||
|
- The **3rd pers. masc. plur.** form of verbs is the same regardless of whether the short or long roots are used.
|
||||||
|
- In the **Kandahari dialect** some different endings are used;
|
||||||
|
- 3rd pers. masc. sing.: <InlinePs opts={opts} ps={{ p: "ـی", f: "ey", e: "" }} />
|
||||||
|
- 3rd pers. masc. plur.: <InlinePs opts={opts} ps={{ p: "ـله", f: "ulu", e: "" }} />
|
||||||
|
|
||||||
|
|
|
@ -1695,10 +1695,10 @@
|
||||||
rambda "^6.7.0"
|
rambda "^6.7.0"
|
||||||
react-select "^5.2.2"
|
react-select "^5.2.2"
|
||||||
|
|
||||||
"@lingdocs/pashto-inflector@^3.4.0":
|
"@lingdocs/pashto-inflector@^3.4.2":
|
||||||
version "3.4.0"
|
version "3.4.2"
|
||||||
resolved "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-3.4.0.tgz#a29892e22cca7aa7a7fa1a078bfc0d4ce5c1e222"
|
resolved "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-3.4.2.tgz#7d892f6b92efe34cbfd0137c68a2f4b5414cc13b"
|
||||||
integrity sha512-WBq0uatnfAJREl/GZFNd5OMxLvQ/B2tQABv4dM6sLp9jmZXOAh3rrQSBmEf0RTjdTsyL4XSDEJ7Rw7vDDxQhiw==
|
integrity sha512-11hfAA7ezEY5SrMWzZeoFuAeeZ+ficHlJnv4bVEwC2dLjlck1IVpqvshcuMPUg1f79t5Syjt5rwIeYHlfX6yRA==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@formkit/auto-animate" "^1.0.0-beta.1"
|
"@formkit/auto-animate" "^1.0.0-beta.1"
|
||||||
classnames "^2.2.6"
|
classnames "^2.2.6"
|
||||||
|
|
Loading…
Reference in New Issue