support {underline braces} in glosses

langfilter/Glosses.hs

@@ -2,7 +2,8 @@ module Glosses (glosses) where
 
 import Lang
 import LaantasImage
-import Spans
+import Spans (abbrs)
+import qualified Spans
 
 import Text.Pandoc.Definition
 import Text.Pandoc.Builder
@@ -39,7 +40,7 @@ glossTable = \case
   make l p s g t = do
     let n = length $ splitInlines s
     let colspecs = replicate n (AlignDefault, ColWidthDefault)
-    let l' = cell1 n l; p' = cell1 n <$> p
+    let l' = cell1 n $ underlines l; p' = cell1 n <$> p
     let ss = cells s; gs = cells g; t' = cell1 n t
     img <- case ?lang of
       Just Lántas ->
@@ -74,3 +75,8 @@ splitInlines is = filter (not . null) $ go is where
   go is =
     let (is1, is') = break (== Space) is in
     fromList is1 : splitInlines (dropWhile (== Space) is')
+
+underlines :: [Inline] -> [Inline]
+underlines = concatMap \case
+  Str txt -> Spans.underlines txt
+  i       -> [i]

langfilter/Spans.hs

@@ -1,4 +1,4 @@
-module Spans (spans, ipaB, ipaN, abbr, abbrs) where
+module Spans (spans, ipaB, ipaN, abbr, abbrs, underlines) where
 
 import LaantasImage hiding (text)
 import Lang

pages/laantas/verbs.md

@@ -36,21 +36,21 @@ Stories are narrated in the present tense.
 
 ---
 
-- Ƶasim kalńḿt jaƶísi.
+- Ƶasim kalńḿt jaƶí{si}.
 - ƶasim   kalńḿt  jaƶí-si
 - the:dog the:cat love-RPST
 - The dog loved the cat.
 
 ---
 
-- Ƶasim kalńḿt jaƶísai.
+- Ƶasim kalńḿt jaƶí{sai}.
 - ƶasim   kalńḿt  jaƶí-sai
 - the:dog the:cat love-DPST
 - The dog had loved the cat (until …).
 
 ---
 
-- Ƶasim kalńḿt jaƶímá.
+- Ƶasim kalńḿt jaƶí{má}.
 - ƶasim kalńḿt jaƶí-má
 - the:dog the:cat love-FUT
 - The dog will love the cat.
@@ -78,22 +78,22 @@ is expressed by using conjunctions of pronouns instead of suffixes.
 :::
 
 :::glosses
-- Bairunagu.
+- Bairu{nagu}.
-- bairu-**na**-**gu**
+- bairu-na-gu
 - see-1SG;SBJ-2SG;OBJ
 - I see you.
 
 ---
 
-- Ƶasim bairunáš.
+- Ƶasim bairu{náš}.
-- ƶasi-m bairu-**náš**
+- ƶasi-m bairu-náš
 - dog-DEF see-1PL;SBJ
 - We see the dog.
 
 ---
 
-- Ƶasim bairudúš.
+- Ƶasim bairu{dúš}.
-- ƶasi-m bairu-**dúš**
+- ƶasi-m bairu-dúš
 - dog-DEF see-1PL;OBJ
 - The dog sees us.
 :::
@@ -127,22 +127,22 @@ There is a four way voice distinction. The voice markers are placed between the
 
 ---
 
-- Ƶasim tassálú.
+- Ƶasim tassá{lú}.
-- ƶasim tassá-**lú**
+- ƶasim tassá-lú
 - the:dog wash-PSV
 - The dog is washed.
 
 ---
 
-- Tassásiduna.
+- Tassá{sidu}na.
-- tassá-**sidu**-na
+- tassá-sidu-na
 - wash-RFL-1SG
 - I wash myself.
 
 ---
 
-- Tassálƶináš.
+- Tassá{lƶi}náš.
-- tassá-**lƶi**-náš
+- tassá-lƶi-náš
 - wash-RCP-1PL
 - We wash each other.
 :::
@@ -152,7 +152,7 @@ There is a four way voice distinction. The voice markers are placed between the
 
 __TODO__
 
-`{--tul}`
+`{–tul}`
 
 
 # Nominal forms
@@ -164,21 +164,21 @@ clauses, for example indirect quotations, and with auxiliary verbs such as
 modals.
 
 :::glosses
-- hipsamł
+- hipsa{mł}
 - hipsa-m-ł
 - solve_problem-DEF-PL
 - logic (the general act of problem solving)
 
 ---
 
-- Fíra fuham suasifa.
+- Fíra fuha{m} suasifa.
 - fíra fuha-m   sua-si-fa
 - air  blow-DEF say-RPST-3SG
 - He said it was windy.
 
 ---
 
-- Šikkúnamat     ušminatul.
+- Šikkúna{mat} ušminatul.
 - šikkú-na-m-at  ušmi-na-tul
 - go-1SG-DEF-GEN want-1SG-NEG
 - I don't want to go.
@@ -191,14 +191,14 @@ A verb form can be suffixed with `{–ja}` to turn it into a noun modifier. This
 is used to make relative clauses.
 
 :::glosses
-- ƶasim bairuja ausut kášńḿ
+- ƶasim bairu{ja} ausut kášńḿ
 - ƶasi-m bairu-ja ausu-t kášń-ḿ
 - dog-DEF see-REL size-GEN lizard-DEF
 - the big lizard that the dog sees
 
 ---
 
-- ƶasimat bairuja ausut kášńḿ
+- ƶasimat bairu{ja} ausut kášńḿ
 - ƶasim-at bairu-ja ausut kášńḿ
 - the:dog-GEN see-REL big the:lizard
 - the lizard that sees the dog
@@ -208,7 +208,7 @@ A relative clause can be made into a noun phrase of its own with `{–ƶ}`,
 meaning 'the one who \_\_\_\_'.
 
 :::glosses
-- kášńł bairujaƶ
+- kášńł bairuja{ƶ}
 - kášń-ł bairu-ja-ƶ
 - lizard-PL see-REL-NOM
 - the one who sees lizards
@@ -233,16 +233,16 @@ options.
 
 ---
 
-- *Laim* iš *ƶaim* ušmiha?
+- {Laim} iš {ƶaim} ušmiha?
 - lai-m       iš ƶai-m       ušmi-ha
 - do_this-DEF or do_that-DEF want-2SG
 - Which do you want to do?
 
 ---
 
-- Ƶaim ušmina.
+- {Ƶaim} ušmina.
 - ƶai-m ušmi-na
-- do_this-DEF want-1SG
+- do_that-DEF want-1SG
 - I want to take the bus.
 :::
 
@@ -257,21 +257,21 @@ no particular focus for the question, it is attached to the final word of the
 sentence.
 
 :::glosses
-- Inlantimsasǧi šikkúmáha?
+- Inlantimsas{ǧi} šikkúmáha?
 - inlanti-m-sa-s-ǧi     šikkú-má-ha
 - england-DEF-AD-LAT-QU go-FUT-2SG
 - Are you going to england (vs going somewhere else)?
 
 ---
 
-- Surǧi inlantimsas šikkúmá?
+- Sur{ǧi} inlantimsas šikkúmá?
 - sur-ǧi inlantimsas šikkúmá
 - 2SG-QU to:england  will:go
 - Is it you (vs someone else) who is going to england?
 
 ---
 
-- Inlantimsas šikkúmáhaǧi?
+- Inlantimsas šikkúmáha{ǧi}?
 - inlantimsas šikkúmáha-ǧi
 - to:england  you:will:go-QU
 - Are you going to england (vs coming from it)?

style/page.css

@@ -131,6 +131,8 @@ pre {
   /* ss01 to use modern Þþð design, others to make juniusx go brrr
    * maybe i can just turn loca off but idk what other regional forms
    * it does that i actually want */
+
+  text-underline-offset: 0.125em;
 }
 
 .ipa {