images and text for gender

_pages/toki-pona/lesson-04-direct-objects.md

@@ -31,25 +31,44 @@ vocabulary_row_2:
   text: poki
 - image: "/images/t47_tokipona/nimi/t47_nimi_sitelen.jpg"
   text: sitelen
+direct_objects:
+- image: /images/t47_tokipona/kamasona/direct_objects/mimokuekili.jpg
+  text: mi moku e kili.
+- image: /images/t47_tokipona/kamasona/direct_objects/onalilukinepoki.jpg
+  text: ona li lukin e poki.
+three_blocks:
+- image: /images/t47_tokipona/kamasona/direct_objects/three_block_top.png
+- image: /images/t47_tokipona/kamasona/direct_objects/three_block_left.png
+compounds:
+- image: /images/t47_tokipona/kamasona/direct_objects/janlitokilisitelen.jpg
+  text: jan li toki li sitelen
+- image: /images/t47_tokipona/kamasona/direct_objects/lawalipalilisona.jpg
+  text: lawa li pali li sona
+two_direct_objects:
+- image: /images/t47_tokipona/kamasona/direct_objects/mimoemoete.jpg
+  text: mi moku e moku e telo.
+- image: /images/t47_tokipona/kamasona/direct_objects/milukinemaesuno.jpg
+  text: mi lukin e ma e suno.
 toki_pona_tests:
-- image: /images/t47_tokipona/kamasona/direct_objects/misoneijo.jpg
+- image: /images/t47_tokipona/kamasona/direct_objects/misonaeijo.jpg
   text: mi sona e ijo.
-- image: /images/t47_tokipona/kamasona/direct_objects/x.jpg
+- image: /images/t47_tokipona/kamasona/direct_objects/telolisulilipona.jpg
   text: telo li suli li pona.
-- image: /images/t47_tokipona/kamasona/direct_objects/x.jpg
-  text: sewi li pana e sona.
-- image: /images/t47_tokipona/kamasona/direct_objects/x.jpg
+toki_pona_tests_2:
+- image: /images/t47_tokipona/kamasona/direct_objects/malijoeteloesuno.jpg
   text: ma li jo e telo e suno.
+- image: /images/t47_tokipona/kamasona/direct_objects/sewilipanaesona.jpg
+  text: sewi li pana e sona.
 english_tests:
-- image: /images/t47_tokipona/kamasona/direct_objects/misoneijo.jpg
-  text: I know the thing, I know something
-- image: /images/t47_tokipona/kamasona/direct_objects/x.jpg
+- image: /images/t47_tokipona/kamasona/direct_objects/malijoeteloesuno.jpg
+  text: The land has water and sunshine.
+- image: /images/t47_tokipona/kamasona/direct_objects/misonaeijo.jpg
+  text: I know something.
+english_tests_2:
+- image: /images/t47_tokipona/kamasona/direct_objects/telolisulilipona.jpg
   text: Water is important and good.
-- image: /images/t47_tokipona/kamasona/direct_objects/x.jpg
+- image: /images/t47_tokipona/kamasona/direct_objects/sewilipanaesona.jpg
   text: The gods gives knowledge.
-- image: /images/t47_tokipona/kamasona/direct_objects/x.jpg
-  text: The land has water and sunshine.
-
 ---
 
 {% include image_dictionary.html definitions=page.vocabulary_row_1 %}
@@ -78,9 +97,7 @@ english_tests:
 
 In the last lesson, we saw how _li_ works as a container for the predicate in a basic sentence. When there is a direct object, the particle _e_ forms a second container for the object:
 
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/direct_objects/mimokuekili.jpg" caption="mi moku e kili." %}
-
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/direct_objects/onlilukinepoki.jpg" caption="ona li lukin e poki." %}
+{% include image_dictionary.html definitions=page.direct_objects %}
 
 #### three block structure
 
@@ -92,9 +109,7 @@ We are now looking at sentences with a subject, action, and an object. This tran
 
 Remember how we move down and to the right? We also want to keep each sentence as compact as possible, not strung out in a long line. Here are two useful arrangements for a three-block sentence:
 
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/direct_objects/three_block_top.png" %}
-
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/direct_objects/three_block_left.png" %}
+{% include image_dictionary.html definitions=page.three_blocks %}
 
 Notice how in both cases, one of the blocks is larger in size? This keeps the sentence in a relatively square shape. It also clues us in to the direction that the sentence is to be read. You must read either across an entire row, or down an entire column.
 
@@ -108,14 +123,12 @@ When deciding how to lay out your sentences, the important thing to consider is
 
 ### compound sentences
 
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/direct_objects/janlilulisit.jpg" caption="jan li toki li sitelen" %}
-
 Now we can really see how sitelen sitelen treats language as spatial, rather than linear. In this respect, long compound sentences can prove an organizational challenge, since a string of actions or objects separated by _li_ or _e_ become atomic blocks that must be arranged in space.
 
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/direct_objects/mipalilisona.jpg" caption="mi pali li sona" %}
-
 A grouping of a couple actions or objects, however, can still be managed quite easily. In a sentence with two actions, the three block structure from above will still work.
 
+{% include image_dictionary.html definitions=page.compounds %}
+
 #### four equal sized blocks
 
 {% include image_and_caption.html image="/images/t47_tokipona/kamasona/direct_objects/four_blocks.png" caption="four block structure" %}
@@ -133,9 +146,7 @@ One good example of the four block structure is a sentence with two direct objec
 
 By running down the columns, the subject with rest on top of the action, and the objects will stack to the right:
 
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/direct_objects/mimoemoete.jpg" caption="mi moku e moku e telo." %}
-
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/direct_objects/miluemaesu.jpg" caption="mi lukin e ma e suno." %}
+{% include image_dictionary.html definitions=page.two_direct_objects %}
 
 ### columns and rows
 
@@ -146,8 +157,10 @@ Now that our sentences are getting longer, we’ve started to talk about block s
 #### translate into toki pona (hover or tab through to reveal the answer):
 
 {% include image_dictionary.html definitions=page.toki_pona_tests reveal_text='true' %}
+{% include image_dictionary.html definitions=page.toki_pona_tests_2 reveal_text='true' %}
 
-#### compare your English translations to mine:
+#### now compare your English translations to mine:
 
 {% include image_dictionary.html definitions=page.english_tests reveal_text='true' %}
+{% include image_dictionary.html definitions=page.english_tests_2 reveal_text='true' %}
 

_pages/toki-pona/lesson-05a-gender.md

@@ -1,35 +1,35 @@
 ---
 layout: page
-title: Gender, Plurality, Negation, Other, and Every
+title: Gender, Plurality, Inclusion and Exclusion
 sitelen_lessons_index: 7
 permalink: /toki-pona/gender
 
 url_previous: /toki-pona/modifiers
 # url_next: /toki-pona/nature
 url_next: /toki-pona/commands
 
-vocabulary:
-- image: /images/t47_tokipona/nimi/t47_nimi_ala.jpg
-  text: ala
-- image: /images/t47_tokipona/nimi/t47_nimi_ale.jpg
-  text: ale
+vocabulary_row_1:
 - image: /images/t47_tokipona/nimi/t47_nimi_kulupu.jpg
   text: kulupu
 - image: /images/t47_tokipona/nimi/t47_nimi_mama.jpg
   text: mama
+- image: /images/t47_tokipona/nimi/t47_nimi_mama_old.jpg
+  text: mama (alt)
 - image: /images/t47_tokipona/nimi/t47_nimi_meli.jpg
   text: meli
 - image: /images/t47_tokipona/nimi/t47_nimi_mije.jpg
   text: mije
+- image: /images/t47_tokipona/nimi/t47_nimi_tonsi.jpg
+  text: tonsi
+vocabulary_row_2:
+- image: /images/t47_tokipona/nimi/t47_nimi_ala.jpg
+  text: ala
+- image: /images/t47_tokipona/nimi/t47_nimi_ale.jpg
+  text: ale
 - image: /images/t47_tokipona/nimi/t47_nimi_pilin.jpg
   text: pilin
 - image: /images/t47_tokipona/nimi/t47_nimi_sin.jpg
   text: sin
-unofficial_words:
-- image: /images/t47_tokipona/nimi/t47_nimi_tonsi.jpg
-  text: tonsi
-- image: /images/t47_tokipona/nimi/t47_nimi_mama_old.jpg
-  text: mama (alt)
 ona_examples:
 - image: /images/t47_tokipona/kamasona/basic/onalipona.jpg
   text: 'he is good!'
@@ -38,34 +38,41 @@ ona_examples:
 - image: /images/t47_tokipona/kamasona/basic/onalipona.jpg
   text: 'they are good!'
 gender_examples:
-- image: /images/t47_tokipona/kamasona/basic/mijelipilinpona.jpg
-  text: 'he is good!'
-- image: /images/t47_tokipona/kamasona/basic/mijelipilinpona.jpg
+- image: /images/t47_tokipona/kamasona/gender/mijelipilinpona.jpg
   text: mije li pilin pona.
-- image: /images/t47_tokipona/kamasona/basic/lawamelilisuli.jpg
-  text: lawa meli li suli.
-- image: /images/t47_tokipona/kamasona/basic/nilikuluputonsi.jpg
-  text: ona li kulupu tonsi.
+- image: /images/t47_tokipona/kamasona/gender/lawameliliwawa.jpg
+  text: lawa meli li wawa.
+- image: /images/t47_tokipona/kamasona/gender/kuluputonsilisuli.jpg
+  text: kulupu tonsi li suli.
+mama_examples:
+- image: /images/t47_tokipona/kamasona/t47_kaso09_13.jpg
+  text: jan sonja li mama pi toki pona
+- image: /images/t47_tokipona/kamasona/gender/sowelisuli.jpg
+  text: soweli suli li mama e soweli lili mute.
 mute_examples:
-- image: /images/t47_tokipona/kamasona/gender/mimute.png
-  text: 'mi mute li toki'
-- image: /images/t47_tokipona/kamasona/gender/mimute.png
-  text: 'sina mute li toki'
-- image: /images/t47_tokipona/kamasona/gender/onamutelitoki.png
-  text: 'ona mute li toki'
+- image: /images/t47_tokipona/kamasona/gender/mimutelitoki.jpg
+  text: mi mute li toki.
+- image: /images/t47_tokipona/kamasona/gender/sinamutelimamapona.jpg
+  text: sina mute li mama pona.
+- image: /images/t47_tokipona/kamasona/gender/onamutelinasaala.jpg
+  text: ona mute li nasa ala.
 ala_verb_examples:
-- image: /images/t47_tokipona/kamasona/t47_kaso08_01.jpg
-  text: ona li lape ala.
+- image: /images/t47_tokipona/kamasona/gender/onalipilinponaala.jpg
+  text: ona li pilin pona ala.
 - image: /images/t47_tokipona/kamasona/t47_kaso08_03.jpg
   text: ni li musi ala!
 ala_description_examples:
 - image: /images/t47_tokipona/kamasona/gender/tomolijakiala.jpg
   text: tomo li jaki ala.
-- image: /images/t47_tokipona/kamasona/gender/mokonilisuwiala.jpg
-  text: moko ni li suwi ala.
-- image: /images/t47_tokipona/kamasona/gender/mijoewawaala.jpg
-  text: mi jo e wawa ala.
-
+- image: /images/t47_tokipona/kamasona/gender/mokunilisuwiala.jpg
+  text: moku ni li suwi ala.
+- image: /images/t47_tokipona/kamasona/gender/miwawaala.jpg
+  text: mi wawa ala.
+ante_examples:
+- image: /images/t47_tokipona/kamasona/gender/jananteliutala.jpg
+  text: moku ni li lete. moku ante li seli.
+- image: /images/t47_tokipona/kamasona/gender/jananteliutala.jpg
+  text: jan ante li toki utala.
 ale_examples:
 - image: /images/t47_tokipona/kamasona/t47_kaso08_06.jpg
   text: jan ali li kama.
@@ -78,52 +85,66 @@ sin_versions:
   text: sin
 - image: "/images/t47_tokipona/nimi/t47_nimi_sin.jpg"
   text: sin
+toki_pona_tests:
+- image: /images/t47_tokipona/kamasona/gender/misonaalaesina.jpg
+  text: mi sona ala e sina.
+- image: /images/t47_tokipona/kamasona/gender/mijeliteloleteelenjaki.jpg
+  text: mije li telo lete e len jaki.
+english_tests:
+- image: /images/t47_tokipona/kamasona/gender/misonaalaesina.jpg
+  text: I don't understand you.
+- image: /images/t47_tokipona/kamasona/gender/mijeliteloleteelenjaki.jpg
+  text: The man cold washed the dirty clothes.
+- image: /images/t47_tokipona/kamasona/gender/sowelisuli.jpg
+  text: The adult bear raises many cubs.
+- image: /images/t47_tokipona/kamasona/gender/mamasinlipilinnasa.jpg
+  text: the new parent feels out of sorts.
 ---
 
-{% include image_dictionary.html definitions=page.vocabulary %}
-
-additional vocabulary
-
-{% include image_dictionary.html definitions=page.unofficial_words %}
+{% include image_dictionary.html definitions=page.vocabulary_row_1 %}
+{% include image_dictionary.html definitions=page.vocabulary_row_2 %}
 
 {:.grammar}
 >### grammar review
 >_The grammar in this lesson is covered in chapters 2, 4 and 6 in [pu](https://www.amazon.com/dp/B012M1RLXS), lessons 8 and 9 in [Pije](http://tokipona.net/tp/janpije/okamasona.php), and page 2 and 5 in [Lentan](https://rnd.neocities.org/tokipona/)._
 >
+> Besides _jan_ and _ona_, there are several words that can work as head nouns and be readily understood as referring to an individual, or a general or specific or group of people. The most common of these is: _meli_, _mije_, and the unofficial word _tonsi_. _kulupu_ works in this capacity as well, but always implies plurality.
 
-### gender and plurality
+### identity and plurality
 
-One of the beautiful things about toki pona, in my opinion, is that gender and plurality tends to remain unspoken by default. Let's translate _ona li pona!_:
+One of the beautiful things about toki pona, in my opinion, is that gender and plurality tends to remain unspoken by default. Let's draw _he is good!_, _she is good!_, and finally _they are good!_
 
 {% include image_dictionary.html definitions=page.ona_examples %}
 
 We can however express gender and plurality more explicitly if necessary.
 
 #### gender
 
-Besides _meli_ and _mije_ for man and woman, many in the toki pona community also employ _tonsi_ to express gender identity outside of the more limited binary concept of gender. Like many words, they all can take on many roles in the sentence.
+Besides _meli_ and _mije_ for man and woman, many in the toki pona community also employ _tonsi_ to express identity outside of the binary concept of gender. Like many words, they all can take on many roles in the sentence.
 
-% include image_dictionary.html definitions=page.ona_examples %}
+{% include image_dictionary.html definitions=page.gender_examples %}
 
 #### plurality
 
-To express more than one of anything we have already seen we can use mute to modify our head noun. This works with _mi_, _sina_ and _ona_ as well, to make _us_, _you (plural)_, and _they_ explicit:
+To express more than one of anything we have already seen we can use mute as a modifier. This works with _mi_, _sina_ and _ona_ as well, to make _us_, _you-plural_, and _they_ explicit:
 
 {% include image_dictionary.html definitions=page.mute_examples %}
 
 Additionally _kulupu_ is used regularly to talk about a community or group of people:
 
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/gender/kulupumiliwawasuli." caption="kulupu mi li wawa suli." %}
+{% include image_and_caption.html image="/images/t47_tokipona/kamasona/gender/kulupumiliwawasuli.jpg" caption="kulupu mi li wawa suli." %}
 
 #### mama
 
-_mama_ is unusual in that there are two glyphs for one word. I've added a second glyph for reasons explained in more depth [here]({% post_url 2020-08-07-mi-ante-e-sitelen-tawa-nimi-mama %}). Although there has never been an inherent gender to _mama_, is use has expanded far beyond the examples present in texts when I was first learning toki pona.
+{% include image_dictionary.html definitions=page.mama_examples %}
 
-The older glyph will always be here, it has historical precedent, and in some contexts may be the preferable of the two.  The example sentence in _pu_ is a case in point. But by being figurative and _meli_, it comes loaded with additional pretext, and so I've added the newer glyph for uses when one wants to free the image from these constraints.
+_mama_ is unusual in sitelen sitelen   in that there are two glyphs for one word. I've added a second glyph for [reasons explained more in depth here]({% post_url 2020-08-07-mi-ante-e-sitelen-tawa-nimi-mama %}). Although there has never been an inherent gender to _mama_, its use has expanded far beyond the examples present in texts when I was first learning toki pona.
 
+The older glyph will always be here, it has historical precedent, and in some sentences it can actually add context.  The example sentence in _pu_ is a case in point. But by being figurative and _meli_, it comes loaded with additional pretext, and so I've added the second glyph for uses when one wants to free the image from these constraints.
 
+### Inclusion and Exclusion
 
-### negation
+#### negation with ala
 
 If you understand how modifiers work then negation shouldn't be too much trouble, since adding _ala_ to negate nouns or verbs follows the same block order rules.
 
@@ -135,21 +156,25 @@ To negate a verb, _ala_ comes directly after the verb.  And if it is modifying a
 
 {% include image_dictionary.html definitions=page.ala_verb_examples %}
 
-### description with ala
+##### description with ala
 
 With toki pona's limited vocabulary, using _ala_ it to modify adjectives becomes particularly powerful.  For example, _pona_ could potentially express cleanliness in context, but the exact meaning would be ambiguous. _jaki_, on the other hand comes much more limited in scope and _jaki ala_ would almost certainly be understood to mean clean, without dirt, etc.
 
 {% include image_dictionary.html definitions=page.ala_description_examples %}
 
-### ale / ali
+### ante
+
+As a modifier, _ante_ can indicate the other, or another. It pairs well both implicitly and explicitly with ni.
+
+{% include image_dictionary.html definitions=page.ante_examples %}
+
+### inclusion
 
 There may be two ways to spell it, but only one glyph block for _ale/ali_. Just like the modifiers we have already seen, it follows normal block order rules.
 
 {% include image_dictionary.html definitions=page.ale_examples %}
 
-<!-- ### ante -->
-
-### expressing new, another, more
+#### expressing new, another, more
 
 There are two things to note when working with _sin_, one of which you may have already noticed if you have spend much time looking at [the syllabary](/toki-pona/dictionaries/syllabary/). The glyph for sin is the same as it's syllable equivalent, _si_ with a suffix of _n_.
 
@@ -159,15 +184,13 @@ Take note again of the two variations of _i_ within the glyphs above, and rememb
 
 The other thing to note about _sin_ is that it can naturally take on a rectangular proportion, something that we referred to as a short or thin block in [modifiers](/toki-pona/modifiers). As _sin_ is often used as a modifier, you will find comes in quite handy.
 
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/gender/x.jpg" caption="seme li lon insa poki sin?" %}
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/gender/x.jpg" caption="jan sin li seme?" %}
+{% include image_and_caption.html image="/images/t47_tokipona/kamasona/gender/mamasinlipilinnasa.jpg" caption="mama sin li pilin nasa" %}
+
 
+#### translate into toki pona (hover or tab through to reveal the answer):
 
-### test your comprehension
+{% include image_dictionary.html definitions=page.toki_pona_tests reveal_text='true' %}
 
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/t47_kaso09_13.jpg"
-   caption="jan sonja li mama pi toki pona"
-   reveal_text=true
-%}
+#### now compare your English translations to mine:
 
--> mi sona ala e toki sina. I don't understand you.
+{% include image_dictionary.html definitions=page.english_tests reveal_text='true' %}