new images in first lessons

_data/old_sitemap.yml

@@ -1,6 +1,6 @@
 - page: /toki-pona/lesson-1/
   rewrite_rule: true
-  redirect_url: /toki-pona/o-kama-pona
+  redirect_url: /toki-pona/kama-pona
 - page: /toki-pona/lesson-2/
   rewrite_rule: true
   redirect_url: /toki-pona/syllables-1

_pages/toki-pona/dictionaries/glyphs.md

@@ -251,7 +251,7 @@ supplimental_definitions:
   text: kin
 - image: "/images/t47_tokipona/nimi/t47_nimi_kipisi.jpg"
   text: kipisi
-- image: "/images/t47_tokipona/nimi/t47_nimi_mama.jpg"
+- image: "/images/t47_tokipona/nimi/t47_nimi_mama_old.jpg"
   text: mama (old)
 - image: "/images/t47_tokipona/nimi/t47_nimi_namako.jpg"
   text: namako

_pages/toki-pona/lesson-01-welcome.md

@@ -1,8 +1,8 @@
 ---
 layout: page
-title: Welcome - o kama pona
+title: Welcome - kama pona
 sitelen_lessons_index: 0
-permalink: /toki-pona/o-kama-pona
+permalink: /toki-pona/kama-pona
 
 url_next: /toki-pona/syllables-1
 ---

_pages/toki-pona/lesson-02-syllables.md

@@ -4,7 +4,7 @@ title: Syllables Part 1
 sitelen_lessons_index: 1
 permalink: /toki-pona/syllables-1
 
-url_previous: /toki-pona/o-kama-pona
+url_previous: /toki-pona/kama-pona
 url_next: /toki-pona/syllables-2
 
 consonant_definitions:

_pages/toki-pona/lesson-02a-syllables-2.md

@@ -48,13 +48,45 @@ syllable_words:
   text: sin
 - image: /images/t47_tokipona/kalalili/t47_kalalili_tan.jpg
   text: tan
+capsule_words:
+- image: /images/t47_tokipona/kamasona/syllables/nimilon.jpg
+  text: "nimi 'lon'"
+- image: /images/t47_tokipona/kamasona/syllables/nimisewi.jpg
+  text: "nimi 'sewi'"
+syllable_names:
+- image: /images/t47_tokipona/kamasona/syllables/sonja_tall.jpg
+  text: sonja
+- image: /images/t47_tokipona/kamasona/syllables/tosi.jpg
+  text: tosi
+- image: /images/t47_tokipona/kamasona/syllables/apolo.jpg
+  text: apolo
+- image: /images/t47_tokipona/kamasona/syllables/kowala.jpg
+  text: kowala
+cartouche_names:
+- image: /images/t47_tokipona/kamasona/syllables/csonja_tall.jpg
+  text: Sonja
+- image: /images/t47_tokipona/kamasona/syllables/ctosi.jpg
+  text: Tosi
+- image: /images/t47_tokipona/kamasona/syllables/capolo.jpg
+  text: Apolo
+- image: /images/t47_tokipona/kamasona/syllables/ckowala.jpg
+  text: Kowala
+head_names:
+- image: /images/t47_tokipona/kamasona/syllables/jansonja_tall.jpg
+  text: jan Sonja
+- image: /images/t47_tokipona/kamasona/syllables/matosi.jpg
+  text: ma Tosi
+- image: /images/t47_tokipona/kamasona/syllables/sewiapolo.jpg
+  text: sewi Apolo
+- image: /images/t47_tokipona/kamasona/syllables/sowelikowala.jpg
+  text: soweli Kowala
 toki_pona_tests:
 - image: /images/t47_tokipona/kamasona/syllables/mipona.jpg
   text: mi pona
 - image: /images/t47_tokipona/kamasona/syllables/niminimi.jpg
-  text: nimi 'nimi' - (the word 'nimi')
-- image: /images/t47_tokipona/kamasona/syllables/janote.jpg
-  text: jan Ote
+  text: nimi 'nimi'
+- image: /images/t47_tokipona/kamasona/syllables/janjosan.jpg
+  text: jan Josan
 ---
 
 {% include image_dictionary.html definitions=page.vocabulary %}
@@ -90,42 +122,30 @@ It comes in most handy if you ever want to use a toki pona words outside of pu,
 
 It is also useful if you want to talk _about_ a word. In toki pona we might put the word in quotes or italics: _mi toki e nimi 'lon'_. Here we can use the capsule with _nimi_ to emphasize that we are talking about the word:
 
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/syllables/nimilon.jpg" caption="nimi 'lon'" %}
-
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/syllables/nimisewi.jpg" caption="nimi 'sewi'" %}
+{% include image_dictionary.html definitions=page.capsule_words %}
 
 ### unofficial words with a head noun
 
 The most common use of syllables is when we need to create unofficial loan words and proper names.
 
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/syllables/sonja.jpg" caption="sonja" %}
-
-tosi
-apolo
-kowala
+{% include image_dictionary.html definitions=page.syllable_names %}
 
 #### cartouche
 
 toki pona uses capital letters to distinguish these foreign words, here we infix the glyphs in a cartouche. It is similar to the capsule above, but it used for foreign words only.
 
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/syllables/c_sonja.jpg" caption="Sonja" %}
-
-Tosi
-Apolo
-Kowala
+{% include image_dictionary.html definitions=page.cartouche_names %}
 
 #### head noun
 
 Since all unofficial words need to modify a noun, this will often rest on top of the cartouche.
 
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/syllables/jansonja.jpg" caption="jan Sonja" %}
-
-ma Tosi
-sewi Apolo
-soweli Kowala
+{% include image_dictionary.html definitions=page.head_names %}
 
 ### test your comprehension
 
 #### translate into toki pona (hover or tab through to reveal the answer)
 
 {% include image_dictionary.html definitions=page.toki_pona_tests reveal_text='true' %}
+
+That last one is my toki pona name, if you are looking for me on any social sites.

_pages/toki-pona/lesson-03-basic-sentences.md

@@ -35,8 +35,8 @@ vocabulary:
 - image: "/images/t47_tokipona/nimi/t47_nmpi_exclamation2.jpg"
   text: exclamation
 toki_pona_tests:
-- image: /images/t47_tokipona/kamasona/basic/onlipona.jpg
-  text: ona li pona.
+- image: /images/t47_tokipona/kamasona/basic/onalipona.jpg
+  text: ona li pona!
 - image: /images/t47_tokipona/kamasona/basic/nilisuli.jpg
   text: ni li suli.
 - image: /images/t47_tokipona/kamasona/basic/janlimoku.jpg

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

@@ -33,13 +33,13 @@ vocabulary_row_2:
   text: sitelen
 toki_pona_tests:
 - image: /images/t47_tokipona/kamasona/direct_objects/misoneijo.jpg
-  text: mi sona e ijo. - I know the thing, I know something
+  text: mi sona e ijo.
 - image: /images/t47_tokipona/kamasona/direct_objects/x.jpg
-  text: telo li suli li pona. - Water is important and good.
+  text: telo li suli li pona.
 - image: /images/t47_tokipona/kamasona/direct_objects/x.jpg
-  text: sewi li pana e sona. - The gods gives knowledge.
+  text: sewi li pana e sona.
 - image: /images/t47_tokipona/kamasona/direct_objects/x.jpg
-  text: ma li jo e telo e suno. - The land has water and sunshine.
+  text: ma li jo e telo e suno.
 english_tests:
 - image: /images/t47_tokipona/kamasona/direct_objects/misoneijo.jpg
   text: I know the thing, I know something
@@ -122,8 +122,6 @@ Now that our sentences are getting longer, we’ve started to talk about block s
 
 ### test your comprehension
 
-### test your comprehension
-
 #### translate into toki pona (hover or tab through to reveal the answer):
 
 {% include image_dictionary.html definitions=page.toki_pona_tests reveal_text='true' %}

_pages/toki-pona/lesson-12-syllables-3.md

@@ -6,26 +6,64 @@ permalink: /toki-pona/syllables-3
 
 url_previous: /toki-pona/la
 # url_next: /toki-pona/conjunctions
+
+syllable_names:
+- image: /images/t47_tokipona/kamasona/syllables/sonja.jpg
+  text: sonja
+- image: /images/t47_tokipona/kamasona/syllables/akanisa.jpg
+  text: akanisa
+- image: /images/t47_tokipona/kamasona/syllables/intenasijonale.jpg
+  text: intenasijonale
+- image: /images/t47_tokipona/kamasona/syllables/nujoka.jpg
+  text: nujoka
+cartouche_names:
+- image: /images/t47_tokipona/kamasona/syllables/csonja.jpg
+  text: Sonja
+- image: /images/t47_tokipona/kamasona/syllables/cakanisa.jpg
+  text: Akanisa
+- image: /images/t47_tokipona/kamasona/syllables/cintenasijonale.jpg
+  text: Intenasijonale
+- image: /images/t47_tokipona/kamasona/syllables/cnujoka.jpg
+  text: Nujoka
+head_names:
+- image: /images/t47_tokipona/kamasona/syllables/jansonja.jpg
+  text: jan Sonja
+- image: /images/t47_tokipona/kamasona/syllables/maakanisa.jpg
+  text: ma Akanisa
+- image: /images/t47_tokipona/kamasona/syllables/tokisuliintenasijonale.jpg
+  text: toki suli Intenasijonale
+- image: /images/t47_tokipona/kamasona/syllables/matomonujoka.jpg
+  text: ma tomo Nujoka
+jan_cartouche:
+- image: /images/t47_tokipona/kamasona/syllables/jcansonja.jpg
+  text: jan Sonja
+- image: /images/t47_tokipona/kamasona/syllables/jcanote.jpg
+  text: jan Ote
+- image: /images/t47_tokipona/kamasona/syllables/jcantoni.jpg
+  text: jan Toni
 ---
 
 ### unofficial words
 
-In [Combining Syllables](/toki-pona/syllables-2) we learned how to write out the syllable glyphs. Take a look at this lesson again is you need a refresher.  These are the glyphs we use to spell out unofficial words that have been "tokiponized".
+Right at the beginning of the course in Syllables [part 1](/toki-pona/syllables-1) and [part 2](/toki-pona/syllables-2) we learned how to write out the syllable glyphs. Take a look at this lesson again is you need a refresher.
+
+Now that we know more about block order, let's review proper names with longer syllable strings:
 
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/t47_kaso09_02.jpg" caption="akanisa" %}
+{% include image_dictionary.html definitions=page.syllable_names %}
 
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/t47_kaso09_04.jpg" caption="intenasijonale" %}
+infixed in a cartouche:
 
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/t47_kaso09_03.jpg" caption="nujoka" %}
+{% include image_dictionary.html definitions=page.cartouche_names %}
 
-They are infixed in a cartouche with a head noun:
+and complete with a head noun:
 
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/t47_kaso09_10.jpg" caption="ma Akanisa" %}
+{% include image_dictionary.html definitions=page.head_names %}
 
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/t47_kaso09_12.jpg" caption="toki suli Intenasijonale" %}
+#### jan as a container
 
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/t47_kaso09_11.jpg" caption="ma tomo Nujoka" %}
+By far the most common head noun is _jan_, as everyone's proper name is presented this way.  Luckily we have one simplification available to us, as _jan_ can combine with the cartouche and act as a container in itself:
 
+{% include image_dictionary.html definitions=page.jan_cartouche %}
 
 ### organizing syllable glyphs