From 9ef41d7a64cc5c3482f05c418e01347c21de8138 Mon Sep 17 00:00:00 2001
From: Christine Dodrill <me@christine.website>
Date: Fri, 22 May 2020 21:21:38 -0400
Subject: [PATCH] merge post 6

---
 book/src/01_phonology/index.md      |   2 +-
 book/src/05_lexicon/distinctions.md |  46 +++++++
 book/src/05_lexicon/family.md       |  25 ++++
 book/src/05_lexicon/idioms.md       |  14 ++
 book/src/05_lexicon/index.md        |   1 +
 book/src/SUMMARY.md                 |   4 +
 book/src/build.sh                   |   5 +
 book/src/dictionary.md              | 200 +++++++++++++++++++++++++++-
 shell.nix                           |   3 +
 words/dictionary.dhall              |  14 ++
 words/particles/ke_a.dhall          |   8 ++
 words/roots/brota.dhall             |   7 +
 words/roots/firgu.dhall             |   7 +
 words/roots/flawo.dhall             |   7 +
 words/roots/grafa.dhall             |   7 +
 words/roots/grama.dhall             |   7 +
 words/roots/kirta.dhall             |   8 ++
 words/roots/madsa.dhall             |   2 +-
 words/roots/mamta.dhall             |   7 +
 words/roots/n_ixu.dhall             |   7 +
 words/roots/patfu.dhall             |   7 +
 words/roots/qanro.dhall             |   7 +
 words/roots/sistu.dhall             |   7 +
 words/roots/spiro.dhall             |   7 +
 words/roots/tunke.dhall             |   7 +
 words/roots/wanto.dhall             |   7 +
 26 files changed, 420 insertions(+), 3 deletions(-)
 create mode 100644 book/src/05_lexicon/distinctions.md
 create mode 100644 book/src/05_lexicon/family.md
 create mode 100644 book/src/05_lexicon/idioms.md
 create mode 100644 book/src/05_lexicon/index.md
 create mode 100644 words/particles/ke_a.dhall
 create mode 100644 words/roots/brota.dhall
 create mode 100644 words/roots/firgu.dhall
 create mode 100644 words/roots/flawo.dhall
 create mode 100644 words/roots/grafa.dhall
 create mode 100644 words/roots/grama.dhall
 create mode 100644 words/roots/kirta.dhall
 create mode 100644 words/roots/mamta.dhall
 create mode 100644 words/roots/n_ixu.dhall
 create mode 100644 words/roots/patfu.dhall
 create mode 100644 words/roots/qanro.dhall
 create mode 100644 words/roots/sistu.dhall
 create mode 100644 words/roots/spiro.dhall
 create mode 100644 words/roots/tunke.dhall
 create mode 100644 words/roots/wanto.dhall

diff --git a/book/src/01_phonology/index.md b/book/src/01_phonology/index.md
index 152a563..ea4c6da 100644
--- a/book/src/01_phonology/index.md
+++ b/book/src/01_phonology/index.md
@@ -62,7 +62,7 @@ Particles will mostly fall into the following forms:
 Proper names _should_ end with consonants, but there is no hard requirement.
 
 L'ewa is a stressed language, with stress on the second-to-last (penultimate)
-syllable. For example, the word "[zh]asko" would be pronounced "[ZH]Asko".
+syllable. For example, the word "zasko" would be pronounced "ZAsko".
 
 Syllables end on stop consonants if one is present in a consonant cluster. Two
 stop consonants cannot follow eachother in a row. 
diff --git a/book/src/05_lexicon/distinctions.md b/book/src/05_lexicon/distinctions.md
new file mode 100644
index 0000000..022c10e
--- /dev/null
+++ b/book/src/05_lexicon/distinctions.md
@@ -0,0 +1,46 @@
+## Word Distinctions
+
+L'ewa is intended to be a logical language. One of the side effects of L'ewa
+being a logical language is that each word should have as minimal and exact of a
+meaning/function as possible. English has lots of words that cover large
+semantic spaces (like go, set, run, take, get, turn, good, etc.) without much of a
+pattern to it. I don't want this in L'ewa. 
+
+Let's take the word "good" as an example. Off the top of my head, good can mean
+any of the following things:
+
+- beneficial
+- aesthetically pleasing
+- favorful taste
+- saintly (coincidentally this is the source of the idiom "God is good")
+- healthy
+
+I'm fairly sure there are more "senses" of the word good, but let's break these
+into their own words:
+
+| L'ewa | Definition                         |
+|-------|------------------------------------|
+| firgu | is beneficial/nice to              |
+| n'ixu | is aesthetically pleasing to       |
+| flawo | is tasty/has a pleasant flavor to  |
+| spiro | is saintly/holy/morally good to    |
+| qanro | is healthy/fit/well/in good health |
+
+Each of these words has a very distinct and fine-grained meaning, even though
+the range is a bit larger than it would be in English. These words also differ
+from a lot of the other words in the L'ewa dictionary so far because they can
+take an object. Most of the words so far are adjective-like because it doesn't
+make sense for there to be an object attached to the color blue.
+
+By default, if a word that can take an object doesn't have one, it's assumed to
+be obvious from context. For example, consider the following set of sentences:
+
+```
+mi qa madsa lo spalo. ti flawo!
+
+I am eating an apple. It's delicious!
+```
+
+I am working at creating more words using a [Swaedish list][swaedish207].
+
+[swaedish207]: https://tulpa.dev/cadey/lewa/src/branch/master/words/swaedish207.csv
diff --git a/book/src/05_lexicon/family.md b/book/src/05_lexicon/family.md
new file mode 100644
index 0000000..8b733ae
--- /dev/null
+++ b/book/src/05_lexicon/family.md
@@ -0,0 +1,25 @@
+## Family Words
+
+Family words are a huge part of a language because it encodes a lot about the
+culture behind that language. L'ewa isn't really intended to have much of a
+culture behind it, but the one place I want to take a cultural stance is here.
+The major kinship word is kirta, or "is an infinite slice of an even greater
+infinite". This is one of the few literal words in L'ewa that is defined using a
+metaphor, as there is really no good analog for this in English.
+
+There are also words for other major family terms in English:
+
+| L'ewa | Definition              |
+|-------|-------------------------|
+| brota | is the/a brother of     |
+| sistu | is the/a sister of      |
+| mamta | is the/a mother of      |
+| patfu | is the/a father of      |
+| grafa | is the/a grandfather of |
+| grama | is the/a grandmother of |
+| wanto | is the/a aunt of        |
+| tunke | is the/a uncle of       |
+
+Cousins are all called brother/sister. None of these words are inherently
+gendered and `brota` can refer to a female or nonbinary person. The words are
+separate because I feel it flows better, for now at least.
diff --git a/book/src/05_lexicon/idioms.md b/book/src/05_lexicon/idioms.md
new file mode 100644
index 0000000..1df8d02
--- /dev/null
+++ b/book/src/05_lexicon/idioms.md
@@ -0,0 +1,14 @@
+## Idioms
+
+L'ewa strives to have as few idioms as possible. If something is meant
+non-literally (or as a [conceptual metaphor][cmet]), the particle ke'a can be used:
+
+[cmet]: https://en.wikipedia.org/wiki/Conceptual_metaphor
+
+```
+ti firgu
+This is beneificial
+
+ti ke'a firgu
+This is metaphorically/non-literally beneficial
+```
diff --git a/book/src/05_lexicon/index.md b/book/src/05_lexicon/index.md
new file mode 100644
index 0000000..80d86bd
--- /dev/null
+++ b/book/src/05_lexicon/index.md
@@ -0,0 +1 @@
+# Lexicon
diff --git a/book/src/SUMMARY.md b/book/src/SUMMARY.md
index 8743c32..c64deb9 100644
--- a/book/src/SUMMARY.md
+++ b/book/src/SUMMARY.md
@@ -11,4 +11,8 @@
 - [Fun with Nouns and Verbs](./03_nouns_verbs/index.md)
   - [Color Words](./03_nouns_verbs/colors.md)
 - [Sentence Structure Semantics](./04_sentence/index.md)
+- [Lexicon](./05_lexicon/index.md)
+  - [Word Distinctions](./05_lexicon/distinctions.md)
+  - [Family Terms](./05_lexicon/family.md)
+  - [Idioms](05_lexicon/idioms.md)
 - [Dictionary](./dictionary.md)
diff --git a/book/src/build.sh b/book/src/build.sh
index 19171df..3b2f1b1 100755
--- a/book/src/build.sh
+++ b/book/src/build.sh
@@ -18,6 +18,11 @@ intro/index.md
 
 04_sentence/index.md
 
+05_lexicon/index.md
+  05_lexicon/distinctions.md
+  05_lexicon/family.md
+  05_lexicon/idioms.md
+
 dictionary.md
 '
 
diff --git a/book/src/dictionary.md b/book/src/dictionary.md
index b83c909..4241799 100644
--- a/book/src/dictionary.md
+++ b/book/src/dictionary.md
@@ -4,6 +4,84 @@ This chapter of the book will hold a list of all of the words in L'ewa as the ti
 
 ## Root Words
 
+### blanu
+
+*blue*
+
+is blue (color)
+
+### brado
+
+*big*
+
+is big/large/great in size
+
+### brota
+
+*brother*
+
+is the/a brother of
+
+### delja
+
+*red*
+
+is red (color)
+
+### firgu
+
+*beneficial*
+
+is beneficial/nice to
+
+### flawo
+
+*tasty*
+
+is tasty/has a pleasant flavor to
+
+### flego
+
+*gray*
+
+is 50% gray (color)
+
+### glowa
+
+*grow*
+
+to grow/get larger/increase in size
+
+### grafa
+
+*grandfather*
+
+is the/a grandfather of
+
+### grama
+
+*grandmother*
+
+is the/a grandmother of
+
+### hetlo
+
+*pink*
+
+is pink (color)
+
+### kirta
+
+*Creator*
+
+is an infinite slice of an even greater infinite/our Creator/a Creator
+
+### mamta
+
+*mother*
+
+is the/a mother of
+
 ### l'ewa
 
 *language*
@@ -14,7 +92,37 @@ is a language
 
 *eat*
 
-eats/is eating/to eat
+eats/consumes/is eating/to eat
+
+### n'ixu
+
+*pleasant*
+
+is aesthetically pleasing to
+
+### patfu
+
+*father*
+
+is the/a father of
+
+### pu'ro
+
+*white*
+
+is white (color)
+
+### qalno
+
+*green*
+
+is green (color)
+
+### qanro
+
+*healthy*
+
+is healthy/fit/well/in good health
 
 ### qa'te
 
@@ -22,12 +130,54 @@ eats/is eating/to eat
 
 is fast/rapid in rate
 
+### sistu
+
+*sister*
+
+is the/a sister of
+
 ### spalo
 
 *apple*
 
 is an apple
 
+### spiro
+
+*holy*
+
+is saintly/holy/morally good to
+
+### te'ra
+
+*teal*
+
+is teal (color)
+
+### tunke
+
+*uncle*
+
+is the/a uncle of
+
+### wufra
+
+*dog*
+
+is a dog
+
+### xekri
+
+*black*
+
+is black (color)
+
+### yeplo
+
+*yellow*
+
+is yellow (color)
+
 ### zasko
 
 *plant*
@@ -277,3 +427,51 @@ family: QA
 
 marks noun phrase / verb as perfective, or completed
 
+### xi
+
+family: XI
+
+*subject-verb separator*
+
+the optional separator between the subject and the verb, sometimes needed when it is otherwise grammatically vague
+
+### hoi
+
+family: HOI
+
+*relative clause*
+
+creates a relative/descriptive clause giving more context to a given noun phrase, arguments should be verbs
+
+### joi
+
+family: HOI
+
+*incidental relative clause*
+
+creates a relative/descriptive clause giving more incidental context to a given noun phrase, arguments should be verbs
+
+### ma
+
+family: MA
+
+*what/which*
+
+used to fill a missing noun-phrase
+
+### no
+
+family: NO
+
+*verb question*
+
+verb question, used to fill a missing/unknown verb
+
+### ke'a
+
+family: KE'A
+
+*metaphor*
+
+metaphorically/non-literally
+
diff --git a/shell.nix b/shell.nix
index b7e7e4a..050f884 100644
--- a/shell.nix
+++ b/shell.nix
@@ -40,5 +40,8 @@ in pkgs.mkShell {
     rls
     rustc
     rustfmt
+
+    # other tools
+    visidata
   ];
 }
diff --git a/words/dictionary.dhall b/words/dictionary.dhall
index 78ca4fc..bd85f5a 100644
--- a/words/dictionary.dhall
+++ b/words/dictionary.dhall
@@ -5,17 +5,30 @@ let ParticleWord = ./types/ParticleWord.dhall
 in  { rootWords =
       [ ./roots/blanu.dhall
       , ./roots/brado.dhall
+      , ./roots/brota.dhall
       , ./roots/delja.dhall
+      , ./roots/firgu.dhall
+      , ./roots/flawo.dhall
       , ./roots/flego.dhall
       , ./roots/glowa.dhall
+      , ./roots/grafa.dhall
+      , ./roots/grama.dhall
       , ./roots/hetlo.dhall
+      , ./roots/kirta.dhall
+      , ./roots/mamta.dhall
       , ./roots/l_ewa.dhall
       , ./roots/madsa.dhall
+      , ./roots/n_ixu.dhall
+      , ./roots/patfu.dhall
       , ./roots/pu_ro.dhall
       , ./roots/qalno.dhall
+      , ./roots/qanro.dhall
       , ./roots/qa_te.dhall
+      , ./roots/sistu.dhall
       , ./roots/spalo.dhall
+      , ./roots/spiro.dhall
       , ./roots/te_ra.dhall
+      , ./roots/tunke.dhall
       , ./roots/wufra.dhall
       , ./roots/xekri.dhall
       , ./roots/yeplo.dhall
@@ -57,5 +70,6 @@ in  { rootWords =
       , ./particles/joi.dhall
       , ./particles/ma.dhall
       , ./particles/no.dhall
+      , ./particles/ke_a.dhall
       ]
     }
diff --git a/words/particles/ke_a.dhall b/words/particles/ke_a.dhall
new file mode 100644
index 0000000..ff2cf82
--- /dev/null
+++ b/words/particles/ke_a.dhall
@@ -0,0 +1,8 @@
+let ParticleWord = ../types/ParticleWord.dhall
+
+in  ParticleWord::{
+    , word = "ke'a"
+    , gloss = "metaphor"
+    , definition = "metaphorically/non-literally"
+    , family = "KE'A"
+    }
diff --git a/words/roots/brota.dhall b/words/roots/brota.dhall
new file mode 100644
index 0000000..11d6840
--- /dev/null
+++ b/words/roots/brota.dhall
@@ -0,0 +1,7 @@
+let ContentWord = ../types/ContentWord.dhall
+
+in  ContentWord::{
+    , word = "brota"
+    , gloss = "brother"
+    , definition = "is the/a brother of"
+    }
diff --git a/words/roots/firgu.dhall b/words/roots/firgu.dhall
new file mode 100644
index 0000000..1108672
--- /dev/null
+++ b/words/roots/firgu.dhall
@@ -0,0 +1,7 @@
+let ContentWord = ../types/ContentWord.dhall
+
+in  ContentWord::{
+    , word = "firgu"
+    , gloss = "beneficial"
+    , definition = "is beneficial/nice to"
+    }
diff --git a/words/roots/flawo.dhall b/words/roots/flawo.dhall
new file mode 100644
index 0000000..a987746
--- /dev/null
+++ b/words/roots/flawo.dhall
@@ -0,0 +1,7 @@
+let ContentWord = ../types/ContentWord.dhall
+
+in  ContentWord::{
+    , word = "flawo"
+    , gloss = "tasty"
+    , definition = "is tasty/has a pleasant flavor to"
+    }
diff --git a/words/roots/grafa.dhall b/words/roots/grafa.dhall
new file mode 100644
index 0000000..e5da100
--- /dev/null
+++ b/words/roots/grafa.dhall
@@ -0,0 +1,7 @@
+let ContentWord = ../types/ContentWord.dhall
+
+in  ContentWord::{
+    , word = "grafa"
+    , gloss = "grandfather"
+    , definition = "is the/a grandfather of"
+    }
diff --git a/words/roots/grama.dhall b/words/roots/grama.dhall
new file mode 100644
index 0000000..bf898c4
--- /dev/null
+++ b/words/roots/grama.dhall
@@ -0,0 +1,7 @@
+let ContentWord = ../types/ContentWord.dhall
+
+in  ContentWord::{
+    , word = "grama"
+    , gloss = "grandmother"
+    , definition = "is the/a grandmother of"
+    }
diff --git a/words/roots/kirta.dhall b/words/roots/kirta.dhall
new file mode 100644
index 0000000..d4fd9e5
--- /dev/null
+++ b/words/roots/kirta.dhall
@@ -0,0 +1,8 @@
+let ContentWord = ../types/ContentWord.dhall
+
+in  ContentWord::{
+    , word = "kirta"
+    , gloss = "Creator"
+    , definition =
+        "is an infinite slice of an even greater infinite/our Creator/a Creator"
+    }
diff --git a/words/roots/madsa.dhall b/words/roots/madsa.dhall
index 047d102..d74db3e 100644
--- a/words/roots/madsa.dhall
+++ b/words/roots/madsa.dhall
@@ -3,5 +3,5 @@ let ContentWord = ../types/ContentWord.dhall
 in  ContentWord::{
     , word = "madsa"
     , gloss = "eat"
-    , definition = "eats/is eating/to eat"
+    , definition = "eats/consumes/is eating/to eat"
     }
diff --git a/words/roots/mamta.dhall b/words/roots/mamta.dhall
new file mode 100644
index 0000000..4d1b9f8
--- /dev/null
+++ b/words/roots/mamta.dhall
@@ -0,0 +1,7 @@
+let ContentWord = ../types/ContentWord.dhall
+
+in  ContentWord::{
+    , word = "mamta"
+    , gloss = "mother"
+    , definition = "is the/a mother of"
+    }
diff --git a/words/roots/n_ixu.dhall b/words/roots/n_ixu.dhall
new file mode 100644
index 0000000..2584aa5
--- /dev/null
+++ b/words/roots/n_ixu.dhall
@@ -0,0 +1,7 @@
+let ContentWord = ../types/ContentWord.dhall
+
+in  ContentWord::{
+    , word = "n'ixu"
+    , gloss = "pleasant"
+    , definition = "is aesthetically pleasing to"
+    }
diff --git a/words/roots/patfu.dhall b/words/roots/patfu.dhall
new file mode 100644
index 0000000..a6eee6c
--- /dev/null
+++ b/words/roots/patfu.dhall
@@ -0,0 +1,7 @@
+let ContentWord = ../types/ContentWord.dhall
+
+in  ContentWord::{
+    , word = "patfu"
+    , gloss = "father"
+    , definition = "is the/a father of"
+    }
diff --git a/words/roots/qanro.dhall b/words/roots/qanro.dhall
new file mode 100644
index 0000000..723b1e6
--- /dev/null
+++ b/words/roots/qanro.dhall
@@ -0,0 +1,7 @@
+let ContentWord = ../types/ContentWord.dhall
+
+in  ContentWord::{
+    , word = "qanro"
+    , gloss = "healthy"
+    , definition = "is healthy/fit/well/in good health"
+    }
diff --git a/words/roots/sistu.dhall b/words/roots/sistu.dhall
new file mode 100644
index 0000000..9d513b7
--- /dev/null
+++ b/words/roots/sistu.dhall
@@ -0,0 +1,7 @@
+let ContentWord = ../types/ContentWord.dhall
+
+in  ContentWord::{
+    , word = "sistu"
+    , gloss = "sister"
+    , definition = "is the/a sister of"
+    }
diff --git a/words/roots/spiro.dhall b/words/roots/spiro.dhall
new file mode 100644
index 0000000..28aeffb
--- /dev/null
+++ b/words/roots/spiro.dhall
@@ -0,0 +1,7 @@
+let ContentWord = ../types/ContentWord.dhall
+
+in  ContentWord::{
+    , word = "spiro"
+    , gloss = "holy"
+    , definition = "is saintly/holy/morally good to"
+    }
diff --git a/words/roots/tunke.dhall b/words/roots/tunke.dhall
new file mode 100644
index 0000000..4836989
--- /dev/null
+++ b/words/roots/tunke.dhall
@@ -0,0 +1,7 @@
+let ContentWord = ../types/ContentWord.dhall
+
+in  ContentWord::{
+    , word = "tunke"
+    , gloss = "uncle"
+    , definition = "is the/a uncle of"
+    }
diff --git a/words/roots/wanto.dhall b/words/roots/wanto.dhall
new file mode 100644
index 0000000..06d5e9b
--- /dev/null
+++ b/words/roots/wanto.dhall
@@ -0,0 +1,7 @@
+let ContentWord = ../types/ContentWord.dhall
+
+in  ContentWord::{
+    , word = "wanto"
+    , gloss = "aunt"
+    , definition = "is the/a aunt of"
+    }