more equative content

src/components/Carousel.js

@@ -45,9 +45,9 @@ export default function(props) {
                     onClick={back}
                 />
                     {title ?
-                        <div className="h5 text-center">{title}</div>
+                        <div className="h5">{title}</div>
                         :
-                        <div className="text-center">{body}</div>
+                        <div>{body}</div>
                     }
                 <img 
                     src={rightChevron}
@@ -57,7 +57,7 @@ export default function(props) {
                     alt={"next"}
                 /> 
             </div>
-            {title && <div>
+            {title && <div className="text-center">
                 {body}
             </div>}
         </div>

src/content/equatives/other-equatives.mdx

@@ -27,39 +27,6 @@ import Formula from "../../components/Formula";
 import Link from "../../components/Link";
 export const opts = defaultTextOptions;
 
-In the last section we looked at the present equative, which we use to say something *is* something currently. But sometimes we want to say something *was*, *will be*, or *generally is*. For these different ideas we will need the following different forms: 
-
-## Subjunctive / Habitual Equative
-
-This is used to talk about something being something, when the statement involves a wish, desire, hope, or statement of whether it should or shouldn't be.
-
-It is also used to say that something is generally or repeatedly something. This is like the the [habitual be](https://en.wikipedia.org/wiki/Habitual_be) found in African American Vernacular English (AAVE), as in, "The grass *be* wet in the morning."
-
-It's the same as the present equative above, except for the 3rd person.
-
-<EquativeFormChoice 
-    forms={{
-        sentence: {
-            displayForm: addToForm(
-                [grammarUnits.pronouns.far.plain, " ", { p: "...", f: "..." }, " "],
-                grammarUnits.equativeEndings.subjunctive,
-            ),
-            english: [
-                ["I am ...", "We are ..."],
-                ["I am ...", "We are ..."],
-                ["You are ...", "You are ..."],
-                ["You are ...", "You are ..."],
-                ["He/she/it is ...", "They are ..."],
-                ["He/she/it is ...", "They are ..."],
-            ],
-        },
-        pure: {
-            displayForm: grammarUnits.equativeEndings.subjunctive,
-        },
-    }}
-    opts={defaultTextOptions}
-/>
-
 ## Future / Presumptive Equative
 
 This is used to say that something will be something in the future. It's also used to guess or surmise about something being something.

src/content/equatives/present-equative.mdx

@@ -122,16 +122,13 @@ export function EquativeIllustration({forms, opts}) {
 
 <EquativeIllustration />
 
-**Warning: ⚠** Often times English speakers learning Pashto will be tempted to just forget the equative when they get to the end of the sentence because it might feel like they're done, or it might be hard to remember which equative to use. But don't leave it out, it's a vital part of the sentence! 
+**Warning: ⚠** *Often times English speakers learning Pashto will be tempted to just forget the equative at the end because it can feel like they're done the sentence, or it might be hard to remember which equative to use. But don't leave it out, it's a vital part of the sentence!* 
 
-When we look at these three sentences, we notice two rules that will be true for both English and Pashto. 
+The important thing about the equative is that **the equative has to agree with the subject**. Just like it would sound strange to say "I are tired," in Pashto you can't say ❌ <InlinePs opts={defaultTextOptions} ps={{ p: "زه ستړی یو", f: "zu stuRey yoo" }} /> ❌.
 
-1. **You have to use the right equative for the subject**. It would sound strange to say "I are tired."
+## Present Equative Form
-2. **The subject and complement have to agree**. It would be wrong to say "We are student."
 
-First of all, let's look at which equatives you have to use depending on what the subject is:
+Here are the **present equative endings** that you have to use depending on the subject. **We use this form when we are saying that "A = B" right now, currently**.
-
-## 1. Present Equative Form
 
 <EquativeFormChoice 
     forms={{
@@ -162,27 +159,22 @@ Flip through the following examples and notice how the equative changes dependin
 
 <Carousel 
     items={[
-        { p: "زه خوشحاله یم", f: "zu khosháala yum", e: "I am happy" },
+        { title: "1st pers. sing.", ex: { p: "زه خوشحاله یم", f: "zu khosháala yum", e: "I am happy" }},
-        { p: "ته خوشحاله یې", f: "tu khosháala ye", e: "You are happy" },
+        { title: "2nd pers. sing.", ex: { p: "ته خوشحاله یې", f: "tu khosháala ye", e: "You are happy" }},
-        { p: "هغه خوشحاله دی", f: "haghá khosháala dey", e: "He is happy" },
+        { title: "3rd pers. sing. masc.", ex: { p: "هغه خوشحاله دی", f: "haghá khosháala dey", e: "He is happy" }},
-        { p: "پلوشه خوشحاله ده", f: "pulwasha khosháala da", e: "Pulwasha is happy" },
+        { title: "3rd pers. sing. fem.", ex: { p: "پلوشه خوشحاله ده", f: "pulwasha khosháala da", e: "Pulwasha is happy" }},
-        { p: "مونږ خوشحاله یو", f: "moonG khosháala yoo", e: "We are happy" },
+        { title: "1st pers. plur. masc.", ex: { p: "مونږ خوشحاله یو", f: "moonG khosháala yoo", e: "We are happy" }},
-        { p: "تاسو خوشحاله یئ", f: "taaso khosháala yeyy", e: "You (pl.) are happy" },
+        { title: "2nd pers. plur.", ex: { p: "تاسو خوشحاله یئ", f: "taaso khosháala yeyy", e: "You (pl.) are happy" }},
-        { p: "ماشومان خوشحاله دي", f: "maashoomáan khosháala dee", e: "The children are happy" },
+        { title: "3rd pers. plur.", ex: { p: "ماشومان خوشحاله دي", f: "maashoomáan khosháala dee", e: "The children are happy" }},
-        { p: "دوي خوشحاله دي", f: "dwee khosháala dee", e: "They are happy" },
+        { title: "3rd pers. plur.", ex: { p: "دوي خوشحاله دي", f: "dwee khosháala dee", e: "They are happy" }},
     ]} 
     render={(item) => ({
-        body: <Examples opts={defaultTextOptions}>{[item]}</Examples>,
+        title: item.title,
+        body: <Examples opts={defaultTextOptions}>{[item.ex]}</Examples>,
     })}
 />
 
-## 2. Subject / Complement Agreement
+## Examples 
-
-We also mentioned how the subject and the complement need to agree.
-
-### Agreement in number
-
-Natually, if the subject is plural, the complement will be plural as well.
 
 <Examples opts={defaultTextOptions}>{[
     { p: "هغه ماشوم دی", f: "haghá mashóom dey", e: "He is a child" },
@@ -193,9 +185,7 @@ Natually, if the subject is plural, the complement will be plural as well.
     { p: "دا ستا کورونه دی", f: "daa staa koróona dee", e: "Those are your houses" },
 ]}</Examples>
 
-### Agreement in gender
+Notice how the equative agrees with the subject, but also how the complement can inflect (change) depending on the gender and number. We'll understand more about how this works when we look at *inflection*.
-
-But that's not all, in Pashto, many nouns and adjectives inflect (change) according to their gender. The subject and complement need to agree in gender as well. 
 
 <Examples opts={defaultTextOptions}>{[
     { p: "زه ستړی یم", f: "zu stúRey yum", e: "I (m.) am tired 👨"},

src/content/equatives/subjunctive-habitual-equative.mdx

@@ -0,0 +1,147 @@
+---
+title: Subjunctive / Habitual Equative
+---
+
+import {
+    addToForm,
+    defaultTextOptions,
+    grammarUnits,
+    Examples,
+    concatPsString,
+    InlinePs,
+} from "@lingdocs/pashto-inflector";
+import EquativeFormChoice from "../../components/EquativeFormChoice";
+import Link from "../../components/Link";
+export const opts = defaultTextOptions;
+import grassBeWet from "../../images/grass-be-wet.jpg";
+
+In the last section we looked at the present equative, which we use to say something *is* something currently. But **we can only use the present equative for something is something *right now, at this moment***. What if we want to say that something *generally is something* or if we *hope something is something*? For that **we need to use a different form**.
+
+## Subjunctive / Habitual Equative Form
+
+<EquativeFormChoice 
+    forms={{
+        sentence: {
+            displayForm: addToForm(
+                [grammarUnits.pronouns.far.plain, " ", { p: "...", f: "..." }, " "],
+                grammarUnits.equativeEndings.subjunctive,
+            ),
+            english: [
+                ["I am ...", "We are ..."],
+                ["I am ...", "We are ..."],
+                ["You are ...", "You are ..."],
+                ["You are ...", "You are ..."],
+                ["He/she/it is ...", "They are ..."],
+                ["He/she/it is ...", "They are ..."],
+            ],
+        },
+        pure: {
+            displayForm: grammarUnits.equativeEndings.subjunctive,
+        },
+    }}
+    opts={opts}
+/>
+
+This form is used with two different meanings:
+
+1. **Subjunctive** - to talk about something being something when the statement involves a hypothetical condition, a wish, desire, hope, or statement of whether it should or shouldn't be, as in:
+
+    <Examples opts={opts}>{[
+        { p: "امید لرم چې خوشحاله وي", f: "Umeed larum che khosháala wee", e: "I hope he's happy" },
+    ]}</Examples>
+
+2. **Habitual** - to say that something is generally or repeatedly something, as in:
+
+    <Examples opts={opts}>{[
+        { p: "سحار کې چمن لوند وي", f: "saháar ke chaman loond wee", e: "The grass is wet in the morning. (generally, habitually)" },
+    ]}</Examples>
+
+### With a Subjunctive Meaning
+
+#### Judgement/obligation
+
+The subjunctive form can be used to talk about it being being good or bad, necessary, or required that something is something.
+
+<Examples opts={opts}>{[
+    { p: "ښه ده چې دلته یې", f: "xa da che dălta ye.", e: "It's good that you're here." },
+    { p: "هغوي باید په ښوونځي کې وي", f: "hagwee baayad pu xowundzee ke wee.", e: "They have to be in school." },
+]}</Examples>
+
+#### Desire
+
+<Examples opts={opts}>{[
+    { p: "امید لرم چې هلته وي", f: "Umeed larum che halta wee.", e: "I hope they're there." },
+    { p: "هغه غواړي چې مونږ په کور کې یو", f: "haghá ghwaaRee che moonG pu kor ke yoo.", e: "He wants us to be home." },
+]}</Examples>
+
+#### Conditions
+
+The subjunctive form is also used to talk about conditions or possibilities. *If A = B, then...* or *It could be that A = B ...*
+
+<Examples opts={opts}>{[
+    { p: "که دوکان کې وریژې وي نو وایې خله", f: "ku dokaan ke wrejze wee, no waa-ye-khla", e: "If there's rice in the store, buy it" },
+    { p: "کېدی شي چې ډوډۍ تیاره وي", f: "kedey shee che DoDúy tayaara wee", e: "The food could be ready" },
+]}</Examples>
+
+### With a Habitual Meaning
+
+This same form is used when you are saying that **A = B generally, habitually, or repeatedly**. For example:
+
+<Examples opts={opts}>{[
+    { p: "هغه تر ماښامه پورې په دوکان کې وي", f: "haghá tur maaxaama pore pu dookáan ke wee", e: "He's in the shop until evening. (generally, habitually)" },
+    { p: "اته بجو نه بعد دوکان بند وي", f: "atu bajo na bad dookáan band wee", e: "The shop is closed after 8 o'clock. (generally, habitually)" },
+]}</Examples>
+
+⚠ **Warning**: For English speakers **it take some time to get used to choosing between the *present* and *habitual* equatives**. Standard English uses the same form for both, but in Pashto the forms change!
+
+<Examples opts={opts}>{[
+    { p: "ماښام دوکان بند وي.", f: "maaxáam dookáan band wee", e: "The shop is closed in the evening. (generally, every day - habitual form)" },
+    { p: "دوکان دند دی.", f: "dookáan band dey.", e: "The shop is closed. (right now, at this moment - present form)" },
+]}</Examples>
+
+In English, we just say "is" in both situations. But **in Pashto, you have to pick between the two forms**. Use the present form for things that are something in the moment, and use the habitual form for things are generally or habitually something.
+
+Interestingly, there is also a separate [habitual equative](https://en.wikipedia.org/wiki/Habitual_be) or "habitual be" in Southern or African American Vernacular English (AAVE). Take this pun for example:
+
+<img className="img-fluid mb-4" src={grassBeWet} />
+
+<div style={{ overflowX: "auto" }}>
+        <table class="table" style={{ minWidth: "400px" }}>
+            <thead>
+                <tr>
+                    <th scope="col">Form</th>
+                    <th scope="col">Standard English</th>
+                    <th scope="col">AAVE</th>
+                    <th scope="col">Pashto</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <th scope="row">Present</th>
+                    <td>
+                        <div>The grass <strong>is</strong> wet</div>
+                        <div className="small text-muted">right now</div>
+                    </td>
+                    <td>The grass <strong>is</strong> wet</td>
+                    <td>
+                        <Examples opts={opts}>{[
+                            { p: "چمن لوند دی", f: "chaman loond dey" },
+                        ]}</Examples>
+                    </td>
+                </tr>
+                <tr>
+                    <th scope="row">Habitual</th>
+                    <td>
+                        <div>The grass <strong>is</strong> wet in the morning</div>
+                        <div className="small text-muted">generally</div>
+                    </td>
+                    <td>The grass <strong>be</strong> wet in the morning</td>
+                    <td>
+                        <Examples opts={opts}>{[
+                            { p: "په سحار کې چمن لوند وي", f: "pu sahaar ke chaman loond wee" },
+                        ]}</Examples>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+</div>

src/content/index.js

@@ -9,9 +9,9 @@
 /* eslint-disable import/no-webpack-loader-syntax */
 import * as about from "!babel-loader!mdx-loader!./about.mdx";
 
-import * as equativePresent from "!babel-loader!mdx-loader!./equatives/equative-present.mdx"
+import * as presentEquative from "!babel-loader!mdx-loader!./equatives/present-equative.mdx"
-import * as equativeOthers from "!babel-loader!mdx-loader!./equatives/equative-others.mdx";
+import * as subjunctiveHabitualEquative from "!babel-loader!mdx-loader!./equatives/subjunctive-habitual-equative.mdx";
-// import * as advancedEquative from "!babel-loader!mdx-loader!./equative/equative-advanced.mdx";
+import * as otherEquatives from "!babel-loader!mdx-loader!./equatives/other-equatives.mdx";
 
 import * as verbEndings from "!babel-loader!mdx-loader!./verbs/verb-endings.mdx";
 import * as rootsAndStems from "!babel-loader!mdx-loader!./verbs/roots-and-stems.mdx";
@@ -32,12 +32,16 @@ const contentTree = [
         subdirectory: "equatives",
         chapters: [
             {
-                import: equativePresent,
+                import: presentEquative,
-                slug: "equative-present",
+                slug: "present-equative",
             },
             {
-                import: equativeOthers,
+                import: subjunctiveHabitualEquative,
-                slug: "equative-others",
+                slug: "subjunctive-habitual-equative",
+            },
+            {
+                import: otherEquatives,
+                slug: "other-equatives",
             },
         ],
     },