Compare commits

..

No commits in common. "2ef75b3710fe16c614f61603bda3a675b865e931" and "da800c984157aca3d73f93dff979dc88650beba1" have entirely different histories.

4 changed files with 16 additions and 36 deletions

View File

@ -17,7 +17,7 @@
"@formkit/auto-animate": "^1.0.0-beta.6", "@formkit/auto-animate": "^1.0.0-beta.6",
"@fortawesome/fontawesome-free": "5.15.4", "@fortawesome/fontawesome-free": "5.15.4",
"@lingdocs/lingdocs-main": "^0.3.3", "@lingdocs/lingdocs-main": "^0.3.3",
"@lingdocs/ps-react": "^7.1.4", "@lingdocs/ps-react": "^7.1.3",
"@mdx-js/rollup": "^2.2.1", "@mdx-js/rollup": "^2.2.1",
"@stefanprobst/rehype-extract-toc": "^2.2.0", "@stefanprobst/rehype-extract-toc": "^2.2.0",
"@types/mdx": "^2.0.3", "@types/mdx": "^2.0.3",

View File

@ -110,7 +110,7 @@ It's important to know that _not all words can be inflected_. If a word doesn't
### Pattern 1 feminine nouns without an ـه - a ending ### Pattern 1 feminine nouns without an ـه - a ending
There are a number of feminine nouns which follow the basic pattern, but are missing an <InlinePs opts={opts} ps={{ p: "ـه", f: "a" }} /> ending. There are a number of feminine nouns which follow the basic pattern, but are missing an <InlinePs opts={opts} ps={{ p: "ـه", f: "a" }}> ending.
For example: For example:

View File

@ -30,25 +30,16 @@ All nouns in Pashto are either <Masc /> or <Fem />. Thankfully, you can pretty m
**<span style={{ backgroundColor: mascColor }}>Masculine</span> words end in:** **<span style={{ backgroundColor: mascColor }}>Masculine</span> words end in:**
- a consonant - a consonant
- 'y' and 'w' sounds such as:
- <InlinePs opts={opts} ps={{ p: "وی", f: "ooy" }} /> or <InlinePs
opts={opts}
ps={{ p: "ای", f: "aay" }}
/>
- <InlinePs opts={opts} ps={{ p: "ی", f: "aw" }} />
- <InlinePs opts={opts} ps={{ p: "ی", f: "ay" }} /> - <InlinePs opts={opts} ps={{ p: "ی", f: "ay" }} />
- <InlinePs opts={opts} ps={{ p: "ـه", f: "u" }} /> - <InlinePs opts={opts} ps={{ p: "ـه", f: "u" }} />
- <InlinePs opts={opts} ps={{ p: "و", f: "oo" }} /> - <InlinePs opts={opts} ps={{ p: "وی", f: "ooy" }} /> or <InlinePs
opts={opts}
ps={{ p: "ای", f: "aay" }}
/>
**<span style={{ backgroundColor: femColor }}>Feminine</span> words end in:** **<span style={{ backgroundColor: femColor }}>Feminine</span> words end in:**
- all the other vowels/dipthongs - all the other vowels (<InlinePs opts={opts} ps={{ p: "ا", f: "aa" }} />, <InlinePs opts={opts} ps={{ p: "ـه", f: "a" }} />, <InlinePs opts={opts} ps={{ p: "ي", f: "ee" }} />, <InlinePs opts={opts} ps={{ p: "ۍ", f: "uy" }} />, etc.)
- <InlinePs opts={opts} ps={{ p: "ا", f: "aa" }} />
- <InlinePs opts={opts} ps={{ p: "ي", f: "ee" }} />
- <InlinePs opts={opts} ps={{ p: "و", f: "o" }} />
- <InlinePs opts={opts} ps={{ p: "ۍ", f: "uy" }} />
- <InlinePs opts={opts} ps={{ p: "ـه", f: "a" }} />
- <InlinePs opts={opts} ps={{ p: "ـه", f: "i" }} />
- <InlinePs opts={opts} ps={{ p: "ـه", f: "U" }} />
<GenderTable <GenderTable
rows={[ rows={[
@ -94,8 +85,8 @@ All nouns in Pashto are either <Masc /> or <Fem />. Thankfully, you can pretty m
}, },
{ {
masc: { masc: {
ending: { p: "و", f: "oo" }, ending: { p: "و", f: "aw" },
ex: { p: "لاټو", f: "laaTóo", e: "spinning top" }, ex: { p: "کنډو", f: "kanDáw", e: "crack" },
}, },
fem: { fem: {
ending: { p: "و", f: "o" }, ending: { p: "و", f: "o" },
@ -112,24 +103,13 @@ All nouns in Pashto are either <Masc /> or <Fem />. Thankfully, you can pretty m
ex: { p: "ملګرې", f: "malgure", e: "female friend" }, ex: { p: "ملګرې", f: "malgure", e: "female friend" },
}, },
}, },
{
masc: {
ending: { p: "و", f: "aw " },
ex: { p: "کنډو", f: "kanDáw", e: "crack" },
},
fem: {
ending: { p: "ه", f: "U" },
ex: { p: "توجه", f: "tawajÚ" },
},
}
]} ]}
/> />
**A couple of other things to watch out for:** **A couple of other things to watch out for:**
- Loanwords ending in <InlinePs opts={opts} ps={{p:"و", f:"oo"}} /> such as <InlinePs opts={opts} ps={{p:"اردو", f:"oordóo", e: "army"}} /> can be either <Masc />. - Words ending in <InlinePs opts={opts} ps={{p:"و", f:"oo"}} /> can be either <Masc /> or <Fem />.
- The word for water <InlinePs opts={opts} ps={{p:"اوبه", f:"oobú"}} /> is an exception, as it is feminine plural. - Words ending in <InlinePs opts={opts} ps={{ p: "ـه", f: "u" }} /> can also be <Fem /> plural, as in <InlinePs opts={opts} ps={{ p: "اوبه", f: "oobu", e: "water" }} />
<GameDisplay record={nounGenderGame1} /> <GameDisplay record={nounGenderGame1} />

View File

@ -1597,10 +1597,10 @@
rambda "^6.7.0" rambda "^6.7.0"
react-select "^5.2.2" react-select "^5.2.2"
"@lingdocs/ps-react@^7.1.4": "@lingdocs/ps-react@^7.1.3":
version "7.1.4" version "7.1.3"
resolved "https://npm.lingdocs.com/@lingdocs/ps-react/-/ps-react-7.1.4.tgz#63ba377930b40fafff2726f0b73182c7df7cf783" resolved "https://npm.lingdocs.com/@lingdocs/ps-react/-/ps-react-7.1.3.tgz#6fbe039a8544ed659da3caaa63c41513dbe7b7ff"
integrity sha512-EqNsutdAnN6UvAL2OBPwYSYB+Fp22iuZli+JfatxbijNto7H8GhqMwcetGeG/G5gP82vs7akiXEX41D3pvYYmA== integrity sha512-UAeuXybQ3SCqv7cdKpOS6KxCoPww3ELvSM6amQhfjqN2VtohvMCw66ZpASJ6YUOKz4BhsPDDUSA9PTvrSNwYWQ==
dependencies: dependencies:
"@formkit/auto-animate" "^1.0.0-beta.3" "@formkit/auto-animate" "^1.0.0-beta.3"
classnames "^2.2.6" classnames "^2.2.6"