add CABAL_FLAGS

wasal: animal

Makefile

@@ -26,6 +26,8 @@ LANGFILTER = $(TMPDIR)/langfilter
 LAANTAS_SCRIPT = $(TMPDIR)/laantas-script
 EXECS = $(LANGFILTER)
 
+CABAL_FLAGS ?= -O
+
 .PHONY: all
 all: build
 
@@ -48,13 +50,13 @@ $(BUILDDIR)/%: %
 	cp $< $@
 
 $(LANGFILTER): langfilter/*.hs langfilter/langfilter.cabal
-	cabal build langfilter
+	cabal build langfilter $(CABAL_FLAGS)
 	mkdir -p $(dir $@)
 	find dist-newstyle -name $(notdir $@) \
 	  -print -type f -exec cp {} $(TMPDIR) \;
 
 $(LAANTAS_SCRIPT): laantas-script/*.hs laantas-script/laantas-script.cabal
-	cabal build laantas-script
+	cabal build laantas-script $(CABAL_FLAGS)
 	mkdir -p $(dir $@)
 	find dist-newstyle -name $(notdir $@) \
 	  -type f -exec cp {} $(TMPDIR) \;

langfilter/Main.hs

@@ -12,7 +12,7 @@ import qualified Data.Map as Map
 main :: IO ()
 main = toJSONFilter filter where
   filter p@(Pandoc (Meta m) _) = do
-    lang' <- toLang $ Map.lookup "lang" m
+    lang' <- toLang $ Map.lookup "conlang" m
     let ?lang = lang'
     fmap (walk makeEbnf .
           walk (concatMap makeFigures) .

pages/laantas/abbrevs.md

@@ -3,7 +3,7 @@ title: List of abbreviations
 hidetoc: true
 backname: Lántas
 backlink: ../laantas
-lang: lántas
+conlang: lántas
 ...
 
 :::threecol

pages/laantas/examples.md

@@ -2,10 +2,10 @@
 title: Lántas examples
 backname: Lántas
 backlink: .
-lang: lántas
+conlang: lántas
 ...
 
-# The North Wind and the Sun
+# The North Wind and the Sun {#nwas}
 
 > The North Wind and the Sun were disputing which was the stronger, when
 > a traveller came along wrapped in a warm cloak. They agreed that the one who
@@ -19,13 +19,13 @@ lang: lántas
 
 :::example
 `{!
-  Ruakul naipa bahútlit aimlis Laksit Fuhamkas Guwanḿ asumsas ba sua. Gimimli
+  Ruakul naipa bahútlit aimlis Laksimat Fuhamkas Guwanḿ asumsas ba sua. Gimimli
-  ufat kukkit ippauja šikkúƶł ruamiril nara. Šikkúƶłm kukkimat rumin júlim natta
+  ufat kukkit ippauja šikkúƶł ruamiril nara. Šikkúƶłm kukkimat rumin júlim
-  abudajaƶ bahútlit aimat laimitta šikkúbu. Gimimli Laksit Fuham rut bássatlit
+  natta abudajaƶ bahútlit aimat laimitta šikkúbu. Gimimli Laksimat Fuham rut
-  fuha, ŕminu hakkatta fuhafamat gimimli kubutta šikkúƶłm kukkimat rumi ńgua.
+  bássatlit fuha, ŕminu hakkatta fuhafamat gimimli kubutta šikkúƶłm kukkimat
-  Mulin Laksit Fuham čaubam bulla. Gimimli Guwanḿ ufatta tílju, ŕ šikkúƶłm
+  rumi ńgua. Mulin Laksimat Fuham čaubam bulla. Gimimli Guwanḿ ufatta tílju,
-  kukkimat šutta rumin júli. Mulin Guwanḿ bahútlit aimat Laksit Fuham suam
+  ŕ šikkúƶłm kukkimat šutta rumin júli. Mulin Guwanḿ bahútlit aimat Laksimat
-  bulla.
+  Fuham suam bulla.
 | file = northwind ; size = 50 ; stroke = 2
 }`
 :::
@@ -39,10 +39,10 @@ lang: lántas
 
 ---
 
-- Laksit Fuhamkas Guwanḿ asumsas ba sua.
+- Laksimat Fuhamkas Guwanḿ asumsas ba sua.
-- ˌlaksɪt ˈfuxɑmkɑs ˈɡɔwɑnm̩ ˌasʊmsɐs bɐ ˌsuə̯
+- ˌlaksɪmɐt ˈfuxɑmkɑs ˈɡɔwɑnm̩ ˌasʊmsɐs bɐ ˌsuə̯
-- laksi-t   fuha-m-kas   guwan-ḿ asu-m-sa-s        ba      sua
+- laksi-m-at    fuha-m-kas   guwan-ḿ asu-m-sa-s        ba      sua
-- north-GEN blow-DEF-COM sun-DEF others-DEF-AD-LAT against say
+- north-DEF-GEN blow-DEF-COM sun-DEF others-DEF-AD-LAT against say
 - the North Wind and the Sun were arguing.
 
 ---
@@ -71,9 +71,9 @@ lang: lántas
 
 ---
 
-- Gimimli Laksit Fuham rut bássatlitta fuha,
+- Gimimli Laksimat Fuham rut bássatlitta fuha,
-- ˌɡɛmɪmlɪ ˈlaksɪt ˈfuxɑm ɾʊt ˌbaːsːɐtɬɪtːɐ ˈfuxɑ
+- ˌɡɛmɪmlɪ ˈlaksɪmɐt ˈfuxɑm ɾʊt ˌbaːsːɐtɬɪtːɐ ˈfuxɑ
-- gimimli Laksit_Fuham   rut     bássa-t-lit-ta    fuha
+- gimimli Laksimat_Fuham   rut     bássa-t-lit-ta    fuha
 - then    the:North:Wind 3SG;GEN force-GEN-SUP-ADV blow
 - Then the North Wind blew his hardest,
 
@@ -95,9 +95,9 @@ lang: lántas
 
 ---
 
-- Mulin Laksit Fuham čaubam bulla.
+- Mulin Laksimat Fuham čaubam bulla.
-- ˌmulɪn ˈlaksɪt ˈfuhɑm ˈtʃɑʊ̯vɐm ˌbuɫːɑ
+- ˌmulɪn ˈlaksɪmɐt ˈfuhɑm ˈtʃɑʊ̯vɐm ˌbuɫːɑ
-- mu-li-n     Laksit_Fuham   čauba-m     bulla
+- mu-li-n     Laksimat_Fuham   čauba-m     bulla
 - that-AD-ABL the:North:Wind give_up-DEF must
 - So the North Wind had to give up.
 
@@ -119,9 +119,9 @@ lang: lántas
 
 ---
 
-- Mulin Guwanḿ bahútlit aimat Laksit Fuham suam bulla.
+- Mulin Guwanḿ bahútlit aimat Laksimat Fuham suam bulla.
-- ˌmulɪn ˈɡɔwɑnm̩ bɐˌxoːtɬɪt æɪ̯mɐt ˈlaksɪt ˈfuxɑm suɐ̯m ˌbuɫːɐ
+- ˌmulɪn ˈɡɔwɑnm̩ bɐˌxoːtɬɪt æɪ̯mɐt ˈlaksɪmɐt ˈfuxɑm suɐ̯m ˌbuɫːɐ
-- mulin Guwanḿ  bahútlit  ai-m-at    Laksit_Fuham   sua-m   bulla
+- mulin Guwanḿ  bahútlit  ai-m-at    Laksimat_Fuham   sua-m   bulla
 - so    the:Sun strongest be-DEF-GEN the:North:Wind say-DEF must
 - So the North Wind had to say that the Sun was the stronger.
 :::

pages/laantas/index.md

@@ -1,7 +1,7 @@
 ---
 title: Lántas
 toc: false
-lang: lántas
+conlang: lántas
 ...
 
 :::splash

pages/laantas/nouns.md

@@ -2,7 +2,7 @@
 title: Lántas nouns
 backname: Lántas
 backlink: .
-lang: lántas
+conlang: lántas
 ...
 
 Lántas is unusual (as far as I know) in that words which are often considered
@@ -231,8 +231,7 @@ affirmative statements.)
 The most common use of the _instrumental_ case is the "[theme]" of ditransitive
 sentences (while the recipient is in the genitive). It is also used for 'with'
 as in 'using', in distributive phrases such as `{!kallila}` 'in threes, in sets
-of three, three each', for quantity expressions such as units, and quantifiers
+of three, three each', and quantifiers like 'every'.
-like 'every'.
 
 [theme]: https://en.wikipedia.org/wiki/Secundative_language
 
@@ -278,10 +277,19 @@ like 'every'.
 - some of the people
 :::
 
-The _essive_ case indicates a state, while the _translative_ and _exessive_
+The basic meaning of the _essive_ case is a state. It is used:
-cases indicate a change of state. The translative marks the new state, and the
+
-exessive the old. The essive and exessive are most commonly used with
+- when a noun modifies another, but with a descriptive meaning\
-comparatives (see [below](#adjectivals)).
+  `{!wasalgu fadau}` "animal friend" (i.e. a friend who is an animal);
+- as the object of certain verbs like __TODO what?__;
+- with [comparatives](#adjectivals).
+
+The _translative_ and _exessive_ cases indicate a change of state:
+
+- with state-change verbs, the translative marks the new state, and the
+  exessive the old;
+- the exessive is also used with [comparatives](#adjectivals);
+- __TODO what else is the translative used with otherwise why does it exist__
 
 __TODO: examples__
 

pages/laantas/numbers.md

@@ -3,7 +3,7 @@ title: Lántas numbers
 hidetoc: true
 backname: Lántas
 backlink: .
-lang: lántas
+conlang: lántas
 ...
 
 ---- ------------------ ------ ------------------

pages/laantas/phono.md

@@ -2,7 +2,7 @@
 title: Lántas phonology
 backname: Lántas
 backlink: .
-lang: lántas
+conlang: lántas
 ...
 
 # Vowels

pages/laantas/prons.md

@@ -2,7 +2,7 @@
 title: Lántas pronouns, demonstratives, etc
 backname: Lántas
 backlink: .
-lang: lántas
+conlang: lántas
 ...
 
 Pronouns are inflected for the same cases as other nouns, though their forms

pages/laantas/verbs.md

@@ -2,7 +2,7 @@
 title: Lántas verbs
 backname: Lántas
 backlink: ../laantas
-lang: lántas
+conlang: lántas
 ...
 
 

pages/laantas/words.yaml

@@ -1944,3 +1944,8 @@ fas:
   t: n
   d: [oven, bakery]
   see: [ǧisa, ǧima]
+
+wasal:
+  p: ˈwa.sal
+  t: n
+  d: animal

pages/laantas/writing.md

@@ -2,23 +2,23 @@
 title: Lántas writing
 backname: Lántas
 backlink: .
-lang: lántas
+conlang: lántas
 ...
 
 Lántas is written with a simple alphasyllabary, where most glyphs consist of
 a consonant or cluster with a descender marking the vowel following it. There
 are full-sized letters for vowels, used when they start a word or follow
 a syllabic consonant. As a quick example, here's the first sentence of
-*the North Wind and the Sun*:
+[*the North Wind and the Sun*](examples.html#nwas):
 
 :::example
-`{!Ruakul naipa bahútlit aimlis Laksit Fuhamkas Guwanḿ asumsas ba sua.
+`{!Ruakul naipa bahútlit aimlis Laksimat Fuhamkas Guwanḿ asumsas ba sua.
   | file = northwind0 ; size = 60 ; stroke = 2 }`
 :::
 
 # Vowels
 
-At the start of a word, or after a syllabic consonant, these 'independent'
+At the start of a word, or after a syllabic consonant, these independent
 vowel letters are used.
 
 :::letter-list