fixups
This commit is contained in:
parent
54cbfefca0
commit
a0e0e7ed71
|
@ -11,7 +11,7 @@ const isObject = x => (
|
|||
function Table({ headRow, children, opts, wide }) {
|
||||
return (
|
||||
<div style={{ overflowX: "auto", marginBottom: "1em" }}>
|
||||
<table className="table" style={wide ? { minWidth: "635px" } : {}}>
|
||||
<table className="table" style={wide ? { minWidth: "600px" } : {}}>
|
||||
{headRow && <thead>
|
||||
<tr>
|
||||
{headRow.map((h, i) => (
|
||||
|
|
|
@ -199,7 +199,10 @@ Wherever you see an example phrase with a <BlocksIcon /> you can click it to see
|
|||
You will see a bunch of different blocks. Don't worry about learning what they all are, but if you want here's a complete list:
|
||||
|
||||
<details>
|
||||
|
||||
{" "}
|
||||
<summary>All the blocks</summary>
|
||||
|
||||
<ul>
|
||||
<li>
|
||||
<NP />
|
||||
|
@ -227,6 +230,7 @@ You will see a bunch of different blocks. Don't worry about learning what they a
|
|||
<InlinePs opts={opts} ps={{ p: "کولی شي", f: "shee" }} />)
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
</details>
|
||||
|
||||
## The Kids' Section
|
||||
|
|
|
@ -323,10 +323,13 @@ If our possesor is a noun, we can add a possesor to _it_. Try clicking the <Edit
|
|||
A possesor can have another possesor which can have another posseser and so-on and on _forever_. The nerdy word for this phenomenon where things reference/repeat themselves is [recursion](https://en.wikipedia.org/wiki/Recursion). 🤓
|
||||
|
||||
<details>
|
||||
|
||||
{" "}
|
||||
<summary>
|
||||
Click here for another example of what <strong>recursion</strong> looks like
|
||||
(if you don't have epilepsy)
|
||||
</summary>
|
||||
|
||||
<div
|
||||
style={{
|
||||
width: "100%",
|
||||
|
@ -348,6 +351,7 @@ A possesor can have another possesor which can have another posseser and so-on a
|
|||
The starbucks cup has a picture of a starbucks cup, which has a picture of a
|
||||
starbucks cup which has a...
|
||||
</p>
|
||||
|
||||
</details>
|
||||
|
||||
A noun is one of three starting points for making an NP. When you start with a noun you can add adjectives and a possesor to it. (The possesor is another NP, which you can keep building on in the same way.)
|
||||
|
|
|
@ -2306,7 +2306,9 @@ Remember our example about about their brother sitting in your house yesterday?
|
|||
</EditableEPEx>
|
||||
|
||||
<details>
|
||||
|
||||
<summary>Answer:</summary>
|
||||
|
||||
Your brother was sitting in his/her/their house yesterday.
|
||||
</details>
|
||||
|
||||
|
|
|
@ -30,16 +30,8 @@ import deMuCowboysOk from "./de-mu-cowboys-ok.jpg";
|
|||
import deMuCowboysNotOk from "./de-mu-cowboys-not-ok.jpg";
|
||||
import psmd from "../../lib/psmd";
|
||||
|
||||
export const De = (props) => (
|
||||
<InlinePs opts={opts}>
|
||||
{{ p: "دې", f: "de", e: props.e || undefined }}
|
||||
</InlinePs>
|
||||
);
|
||||
export const MU = (props) => (
|
||||
<InlinePs opts={opts}>
|
||||
{{ p: "مو", f: "mU", e: props.e || undefined }}
|
||||
</InlinePs>
|
||||
);
|
||||
export const De = (props) => <InlinePs opts={opts} ps={{ p: "دې", f: "de" }} />;
|
||||
export const MU = (props) => <InlinePs opts={opts} ps={{ p: "مو", f: "mU" }} />;
|
||||
|
||||
In Pashto the [jussive form](https://en.wikipedia.org/wiki/Jussive_mood) is used to make orders or commands directed towards the 3rd person. This is also used for blessings and curses.
|
||||
|
||||
|
@ -70,6 +62,7 @@ There are a couple of questions that can confuse learners when they encounter th
|
|||
In this section, we'll explain how this all works.
|
||||
|
||||
<details>
|
||||
|
||||
<summary>Spoiler quick answer:</summary>
|
||||
|
||||
- _Basic form_: Jussive phrases are made using the jussive <De /> particle with subjunctive or present verbs.
|
||||
|
@ -164,9 +157,9 @@ First let's look at an example without this دې conflict:
|
|||
])}
|
||||
</Examples>
|
||||
|
||||
In this example <InlinePs opts={opts}>{{ p: "تا", f: "taa", e: "you" }}</InlinePs> is the <Servant /> so we can <Link to="/phrase-structure/shortening-vps/">🪄 shrink it</Link> into a <MiniPronoun /> <De />.
|
||||
In this example <InlinePs opts={opts} ps={{ p: "تا", f: "taa", e: "you" }} /> is the <Servant /> so we can <Link to="/phrase-structure/shortening-vps/">🪄 shrink it</Link> into a <MiniPronoun /> <De />.
|
||||
|
||||
But now we've got the problem of the two <InlinePs opts={opts}>{{ p: "دې", f: "de", e: "you" }}</InlinePs> particles. We can't say this:
|
||||
But now we've got the problem of the two <InlinePs opts={opts} ps={{ p: "دې", f: "de", e: "you" }} /> particles. We can't say this:
|
||||
|
||||
<Examples opts={opts}>
|
||||
{psmd([
|
||||
|
@ -193,7 +186,7 @@ So here's the solution in Pashto... 🥁 Instead we **get rid of the jussive <De
|
|||
|
||||
This is interesting, because normally we only use that imperative form when making commands to a **a 2nd person singular** (ie. "you"), but because we lost the ability to use the jussive <De />, we are using to make a _3rd person jussive phrase_.
|
||||
|
||||
Here are more examples of how we use this to resolve the <InlinePs opts={opts}>{{ p: "دې دې", f: "de de" }}</InlinePs> conflict:
|
||||
Here are more examples of how we use this to resolve the <InlinePs opts={opts} ps={{ p: "دې دې", f: "de de" }} /> conflict:
|
||||
|
||||
<Examples opts={opts}>
|
||||
{psmd([
|
||||
|
@ -280,7 +273,7 @@ Things get a little more interesting when the jussive <De /> clashes with the <M
|
|||
<img src={deMuCowboysNotOk} className="img-fluid" />
|
||||
</div>
|
||||
|
||||
Just like you can't say <InlinePs opts={opts}>{{ p: "دې دې", f: "de de" }}</InlinePs>, you also can't have the jussive <De /> together with the second person plural <MU e="you, your" />.
|
||||
Just like you can't say <InlinePs opts={opts} ps={{ p: "دې دې", f: "de de" }} />, you also can't have the jussive <De /> together with the second person plural <MU e="you, your" />.
|
||||
|
||||
<Examples opts={opts}>
|
||||
{psmd([
|
||||
|
|
|
@ -178,18 +178,18 @@ The past participle will always follow the <Link to="/inflection/inflection-patt
|
|||
<th scope="row">Singular (Plain)</th>
|
||||
<td>
|
||||
<div>
|
||||
<Pashto opts={opts}>{{ p: "تللی", f: "tlúlay" }}</Pashto>
|
||||
<Pashto opts={opts} ps={{ p: "تللی", f: "tlúlay" }} />
|
||||
</div>
|
||||
<div>
|
||||
<Phonetics opts={opts}>{{ p: "تللی", f: "tlúlay" }}</Phonetics>
|
||||
<Phonetics opts={opts} ps={{ p: "تللی", f: "tlúlay" }} />
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<div>
|
||||
<Pashto opts={opts}>{{ p: "تللې", f: "tlúle" }}</Pashto>
|
||||
<Pashto opts={opts} ps={{ p: "تللې", f: "tlúle" }} />
|
||||
</div>
|
||||
<div>
|
||||
<Phonetics opts={opts}>{{ p: "تللې", f: "tlúle" }}</Phonetics>
|
||||
<Phonetics opts={opts} ps={{ p: "تللې", f: "tlúle" }} />
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
@ -197,18 +197,18 @@ The past participle will always follow the <Link to="/inflection/inflection-patt
|
|||
<th scope="row">Plural (Inflected)</th>
|
||||
<td>
|
||||
<div>
|
||||
<Pashto opts={opts}>{{ p: "تللي", f: "tlúlee" }}</Pashto>
|
||||
<Pashto opts={opts} ps={{ p: "تللي", f: "tlúlee" }} />
|
||||
</div>
|
||||
<div>
|
||||
<Phonetics opts={opts}>{{ p: "تللي", f: "tlúlee" }}</Phonetics>
|
||||
<Phonetics opts={opts} ps={{ p: "تللي", f: "tlúlee" }} />
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<div>
|
||||
<Pashto opts={opts}>{{ p: "تللې", f: "tlúle" }}</Pashto>
|
||||
<Pashto opts={opts} ps={{ p: "تللې", f: "tlúle" }} />
|
||||
</div>
|
||||
<div>
|
||||
<Phonetics opts={opts}>{{ p: "تللې", f: "tlúle" }}</Phonetics>
|
||||
<Phonetics opts={opts} ps={{ p: "تللې", f: "tlúle" }} />
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
Loading…
Reference in New Issue