update dependencies

Makefile

@@ -4,7 +4,7 @@ IDFILE ?= ~/.ssh/xyz
 REMOTE_DIR ?= lang
 
 TMPDIR   ?= _tmp
-BUILDDIR ?= _build
+BUILDDIR ?= /srv/www/lang
 PAGESDIR ?= pages
 DATADIR  ?= data
 TEMPLATE ?= $(DATADIR)/template.html

cabal.project

@@ -5,4 +5,7 @@ packages:
 source-repository-package
   type: git
   location: https://git.rhiannon.website/rhi/svg-builder
-  tag: 39bb6a4e04ec2caccc23576b062ebfa0566bfb96
+  tag: 9c09fcea4ac316dd5e0709b40f85952047070bf1
+
+shared: False
+executable-dynamic: False

laantas-script/laantas-script.cabal

@@ -30,9 +30,9 @@ executable laantas-script
     RecordWildCards,
     ViewPatterns
   build-depends:
-    base >= 4.14.0.0 && < 4.20,
-    containers ^>= 0.6.2.1,
-    mtl ^>= 2.2.2,
+    base >= 4.14.0.0 && < 4.21,
+    containers >= 0.6 && < 0.8,
+    mtl >= 2.2 && < 2.4,
     svg-builder ^>= 0.1.1,
     optparse-applicative ^>= 0.16.0.0,
     text ^>= 2.1,

langfilter/langfilter.cabal

@@ -33,8 +33,8 @@ executable langfilter
     RecordWildCards,
     ViewPatterns
   build-depends:
-    base >= 4.14.0.0 && < 4.20,
-    containers ^>= 0.6.2.1,
+    base >= 4.14.0.0 && < 4.21,
+    containers >= 0.6 && < 0.8,
     filepath ^>= 1.4.2.1,
     megaparsec ^>= 9.6.1,
     process ^>= 1.6.11.0,

pages/laantas/words.yaml

@@ -159,11 +159,12 @@ tiallántas:
   see: lántas
 
 líbis:
-  - p: ˈliː.bis
-    t: n
-    d: happiness
-  - t: interj
-    d: hi!
+  p: ˈliː.bis
+  ds:
+    - t: n
+      d: happiness
+    - t: interj
+      d: hi!
 
 línai:
   p: ˈliː.naj
@@ -192,12 +193,13 @@ parai:
 
 ustai:
   p: ˈus.tai
-  - t: {v: i}
-    d: sing
-  - t: n
-    d:
-      - song
-      - ustail: (also) magic
+  ds:
+    - t: {v: i}
+      d: sing
+    - t: n
+      d:
+        - song
+        - ustail: (also) magic
 
 purai:
   p: ˈpu.ɾaj
@@ -226,23 +228,24 @@ raban:
   d: book
 
 ran:
-  - p: ˈɾan
-    t: n
-    d:
-      - thing
-      - of them (after quantity)
-      - ranł: mood (coll)
-      - ranla:
-          d: of
-          n: an exact countable subquantity
-          e:
-            o: pas ranla rabanḿł
-            t: two of the books
-  - t: {suf: [{v: a}, n]}
-    d: result
-    e:
-      o: nassúran
-      t: gift
+  p: ˈɾan
+  ds:
+    - t: n
+      d:
+        - thing
+        - of them (after quantity)
+        - ranł: mood (coll)
+        - ranla:
+            d: of
+            n: an exact countable subquantity
+            e:
+              o: pas ranla rabanḿł
+              t: two of the books
+    - t: {suf: [{v: a}, n]}
+      d: result
+      e:
+        o: nassúran
+        t: gift
 
 sida:
   p: ˈsi.da
@@ -303,12 +306,13 @@ naigimi:
   d: sometime
 
 gimimli:
-  - p: gi.ˈmim.li
-    t: adv
-    d: then
-    n: at a time clear from context
-  - t: {pp: GEN}
-    d: at the same time as
+  p: gi.ˈmim.li
+  ds:
+    - t: adv
+      d: then
+      n: at a time clear from context
+    - t: {pp: GEN}
+      d: at the same time as
 
 sá:
   p: ˈsaː
@@ -609,17 +613,18 @@ mikru:
   d: micro
 
 nai:
-  - p: ˈnaj
-    t: num
-    d:
-      - one
-      - nat: first
-      - natta: only
-      - nala: any
-  - t: dem
-    d:
-      - anyone
-      - anything
+  p: ˈnaj
+  ds:
+    - t: num
+      d:
+        - one
+        - nat: first
+        - natta: only
+        - nala: any
+    - t: dem
+      d:
+        - anyone
+        - anything
 
 pas:
   p: ˈpas
@@ -961,12 +966,17 @@ rauš:
 nakasnai:
   p: ˈna.kas.naj
   t: prn
+  n: also násna
   d:
     - everyone
     - everything
     - nakasnala:
         d: [every, all]
-        n: used with plural
+        n: - used with plural
+           - also násná
+    - nakasnanua:
+        d: [always]
+        n: also násnua
 
 sufa:
   p: ˈsu.fa
@@ -978,15 +988,16 @@ sufa:
     - choose
 
 fuha:
-  - p: ˈfu.xa
-    t: {v: i}
-    d:
-      - blow
-      - whistle
-  - t: n
-    d:
-      - wind
-      - breath
+  p: ˈfu.xa
+  ds:
+    - t: {v: i}
+      d:
+        - blow
+        - whistle
+    - t: n
+      d:
+        - wind
+        - breath
 
 bássa:
   p: ˈbaːs.sa
@@ -1055,11 +1066,11 @@ abjas:
 
 ƶuna:
   p: ˈθu.na
-  - t: adv
-    d:
-      - exactly
-      - "ƶuna gimimli": just now
-      - ƶunat: exact
+  t: adv
+  d:
+    - exactly
+    - "ƶuna gimimli": just now
+    - ƶunat: exact
 
 daš:
   p: ˈdaʃ
@@ -1070,11 +1081,12 @@ daš:
     # see: galtúm # this word no longer exists??????
 
 lisma:
-  - p: ˈlis.ma
-    t: {pp: GEN}
-    d: regardless of
-  - t: conj
-    d: regardless of whether or not
+  p: ˈlis.ma
+  ds:
+    - t: {pp: GEN}
+      d: regardless of
+    - t: conj
+      d: regardless of whether or not
 
 miašša:
   p: ˈmiəʃ.ʃa
@@ -1181,16 +1193,17 @@ nuabia:
     - "rút čauba": give up (coll)
 
 tílju:
-  - p: ˈtiːl.ju
-    t: n
-    d:
-      - light
-      - energy
-  - t: {v: i}
-    d:
-      - glow
-      - shine (of the sun)
-      - smile
+  p: ˈtiːl.ju
+  ds:
+    - t: n
+      d:
+        - light
+        - energy
+    - t: {v: i}
+      d:
+        - glow
+        - shine (of the sun)
+        - smile
 
 waračča:
   p: wa.ˈɾat.tʃa
@@ -1449,6 +1462,7 @@ ličča:
   d:
     - multitude
     - liččala: many
+    - liččali: usually
 
 dagu:
   p: ˈda.ɡu
@@ -1811,10 +1825,11 @@ lau:
 
 kalsu:
   p: ˈkal.su
-  - t: {v: t}
-    d: [strike, hit]
-  - t: n
-    d: [beat, drum]
+  ds:
+    - t: {v: t}
+      d: [strike, hit]
+    - t: n
+      d: [beat, drum]
 
 asurai:
   p: ˈa.su.ɾaj
@@ -1857,13 +1872,14 @@ giba:
     t: to ride a vehicle (e.g. a bus)
 
 saunu:
-  - p: ˈsau.nu
-    t: n
-    d:
-      - wheel
-      - vehicle
-  - t: {v: i}
-    d: turn
+  p: ˈsau.nu
+  ds:
+    - t: n
+      d:
+        - wheel
+        - vehicle
+    - t: {v: i}
+      d: turn
 
 šámsaunu:
   p: ˈʃaːm.sau.nu
@@ -1892,11 +1908,12 @@ gifu:
 
 
 niba:
-  - p: ˈni.ba
-    t: n
-    d: spider
-  - t: {v: i}
-    d: spin a web
+  p: ˈni.ba
+  ds:
+    - t: n
+      d: spider
+    - t: {v: i}
+      d: spin a web
 
 nibaran:
   p: ˈni.ba.ɾan
@@ -1979,6 +1996,11 @@ gipa:
   t: n
   d: neck
 
+gunnu:
+  p: ˈɡun.nu
+  t: n
+  d: belly
+
 jaisi:
   p: ˈjai.si
   t: n
@@ -2006,7 +2028,10 @@ fas:
 ǧiššima:
   p: ˈdʒiʃ.ʃima
   t: n
-  d: [oven, bakery]
+  d:
+    - oven
+    - bakery
+    - dawinǧiššima: forge
   see: [ǧisa, ǧima]
 
 wasal:
@@ -2117,3 +2142,42 @@ kus:
   p: kus
   t: n
   d: [stone, rock]
+
+pasaga:
+  p: ˈpa.sa.ɡa
+  t: n
+  d: taur
+  see: [pas, aga]
+
+lagan:
+  p: ˈla.ɡan
+  t: {pp: INS}
+  d: belonging to
+  n: used to disambiguate ownership from other meanings of the genitive
+
+kið:
+  t: n
+  d: ring
+
+álitkið:
+  t: n
+  d: collar
+  see: [álit, kið]
+
+dulwa:
+  t: n
+  d: leg
+
+dilwi:
+  t: n
+  d: sock
+  see: dulwa
+  n: '"leggy"'
+
+talas:
+  t: n
+  d: [head, tip, point]
+
+usu:
+  t: n
+  d: mind

style/fonts/junicode/junicode.css

@@ -0,0 +1,473 @@
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-Regular.ttf) format('ttf'),
+       url(woff2/Junicode-Regular.woff2) format('woff2');
+  font-weight: 400;
+  font-style: normal;
+  font-stretch: normal;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-Italic.ttf) format('ttf'),
+       url(woff2/Junicode-Italic.woff2) format('woff2');
+  font-weight: 400;
+  font-style: italic;
+  font-stretch: normal;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-Medium.ttf) format('ttf'),
+       url(woff2/Junicode-Medium.woff2) format('woff2');
+  font-weight: 500;
+  font-style: normal;
+  font-stretch: normal;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-MediumItalic.ttf) format('ttf'),
+       url(woff2/Junicode-MediumItalic.woff2) format('woff2');
+  font-weight: 500;
+  font-style: italic;
+  font-stretch: normal;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-Medium.ttf) format('ttf'),
+       url(woff2/Junicode-Medium.woff2) format('woff2');
+  font-weight: 500;
+  font-style: normal;
+  font-stretch: normal;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-MediumItalic.ttf) format('ttf'),
+       url(woff2/Junicode-MediumItalic.woff2) format('woff2');
+  font-weight: 500;
+  font-style: italic;
+  font-stretch: normal;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-SmBold.ttf) format('ttf'),
+       url(woff2/Junicode-SmBold.woff2) format('woff2');
+  font-weight: 600;
+  font-style: normal;
+  font-stretch: normal;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-SmBoldItalic.ttf) format('ttf'),
+       url(woff2/Junicode-SmBoldItalic.woff2) format('woff2');
+  font-weight: 600;
+  font-style: italic;
+  font-stretch: normal;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-Bold.ttf) format('ttf'),
+       url(woff2/Junicode-Bold.woff2) format('woff2');
+  font-weight: 700;
+  font-style: normal;
+  font-stretch: normal;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-BoldItalic.ttf) format('ttf'),
+       url(woff2/Junicode-BoldItalic.woff2) format('woff2');
+  font-weight: 700;
+  font-style: italic;
+  font-stretch: normal;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-Light.ttf) format('ttf'),
+       url(woff2/Junicode-Light.woff2) format('woff2');
+  font-weight: 200;
+  font-style: normal;
+  font-stretch: normal;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-LightItalic.ttf) format('ttf'),
+       url(woff2/Junicode-LightItalic.woff2) format('woff2');
+  font-weight: 200;
+  font-style: italic;
+  font-stretch: normal;
+}
+
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-SmExp.ttf) format('ttf'),
+       url(woff2/Junicode-SmExp.woff2) format('woff2');
+  font-weight: 400;
+  font-style: normal;
+  font-stretch: semi-expanded;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-SmExpItalic.ttf) format('ttf'),
+       url(woff2/Junicode-SmExpItalic.woff2) format('woff2');
+  font-weight: 400;
+  font-style: italic;
+  font-stretch: semi-expanded;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-SmExpMedium.ttf) format('ttf'),
+       url(woff2/Junicode-SmExpMedium.woff2) format('woff2');
+  font-weight: 500;
+  font-style: normal;
+  font-stretch: semi-expanded;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-SmExpMediumItalic.ttf) format('ttf'),
+       url(woff2/Junicode-SmExpMediumItalic.woff2) format('woff2');
+  font-weight: 500;
+  font-style: italic;
+  font-stretch: semi-expanded;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-SmExpMedium.ttf) format('ttf'),
+       url(woff2/Junicode-SmExpMedium.woff2) format('woff2');
+  font-weight: 500;
+  font-style: normal;
+  font-stretch: semi-expanded;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-SmExpMediumItalic.ttf) format('ttf'),
+       url(woff2/Junicode-SmExpMediumItalic.woff2) format('woff2');
+  font-weight: 500;
+  font-style: italic;
+  font-stretch: semi-expanded;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-SmExpSmBold.ttf) format('ttf'),
+       url(woff2/Junicode-SmExpSmBold.woff2) format('woff2');
+  font-weight: 600;
+  font-style: normal;
+  font-stretch: semi-expanded;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-SmExpSmBoldItalic.ttf) format('ttf'),
+       url(woff2/Junicode-SmExpSmBoldItalic.woff2) format('woff2');
+  font-weight: 600;
+  font-style: italic;
+  font-stretch: semi-expanded;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-SmExpBold.ttf) format('ttf'),
+       url(woff2/Junicode-SmExpBold.woff2) format('woff2');
+  font-weight: 700;
+  font-style: normal;
+  font-stretch: semi-expanded;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-SmExpBoldItalic.ttf) format('ttf'),
+       url(woff2/Junicode-SmExpBoldItalic.woff2) format('woff2');
+  font-weight: 700;
+  font-style: italic;
+  font-stretch: semi-expanded;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-SmExpLight.ttf) format('ttf'),
+       url(woff2/Junicode-SmExpLight.woff2) format('woff2');
+  font-weight: 200;
+  font-style: normal;
+  font-stretch: semi-expanded;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-SmExpLightItalic.ttf) format('ttf'),
+       url(woff2/Junicode-SmExpLightItalic.woff2) format('woff2');
+  font-weight: 200;
+  font-style: italic;
+  font-stretch: semi-expanded;
+}
+
+
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-Exp.ttf) format('ttf'),
+       url(woff2/Junicode-Exp.woff2) format('woff2');
+  font-weight: 400;
+  font-style: normal;
+  font-stretch: expanded;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-ExpItalic.ttf) format('ttf'),
+       url(woff2/Junicode-ExpItalic.woff2) format('woff2');
+  font-weight: 400;
+  font-style: italic;
+  font-stretch: expanded;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-ExpMedium.ttf) format('ttf'),
+       url(woff2/Junicode-ExpMedium.woff2) format('woff2');
+  font-weight: 500;
+  font-style: normal;
+  font-stretch: expanded;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-ExpMediumItalic.ttf) format('ttf'),
+       url(woff2/Junicode-ExpMediumItalic.woff2) format('woff2');
+  font-weight: 500;
+  font-style: italic;
+  font-stretch: expanded;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-ExpMedium.ttf) format('ttf'),
+       url(woff2/Junicode-ExpMedium.woff2) format('woff2');
+  font-weight: 500;
+  font-style: normal;
+  font-stretch: expanded;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-ExpMediumItalic.ttf) format('ttf'),
+       url(woff2/Junicode-ExpMediumItalic.woff2) format('woff2');
+  font-weight: 500;
+  font-style: italic;
+  font-stretch: expanded;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-ExpSmBold.ttf) format('ttf'),
+       url(woff2/Junicode-ExpSmBold.woff2) format('woff2');
+  font-weight: 600;
+  font-style: normal;
+  font-stretch: expanded;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-ExpSmBoldItalic.ttf) format('ttf'),
+       url(woff2/Junicode-ExpSmBoldItalic.woff2) format('woff2');
+  font-weight: 600;
+  font-style: italic;
+  font-stretch: expanded;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-ExpBold.ttf) format('ttf'),
+       url(woff2/Junicode-ExpBold.woff2) format('woff2');
+  font-weight: 700;
+  font-style: normal;
+  font-stretch: expanded;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-ExpBoldItalic.ttf) format('ttf'),
+       url(woff2/Junicode-ExpBoldItalic.woff2) format('woff2');
+  font-weight: 700;
+  font-style: italic;
+  font-stretch: expanded;
+}
+
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-SmCond.ttf) format('ttf'),
+       url(woff2/Junicode-SmCond.woff2) format('woff2');
+  font-weight: 400;
+  font-style: normal;
+  font-stretch: semi-condensed;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-SmCondItalic.ttf) format('ttf'),
+       url(woff2/Junicode-SmCondItalic.woff2) format('woff2');
+  font-weight: 400;
+  font-style: italic;
+  font-stretch: semi-condensed;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-SmCondMedium.ttf) format('ttf'),
+       url(woff2/Junicode-SmCondMedium.woff2) format('woff2');
+  font-weight: 600;
+  font-style: normal;
+  font-stretch: semi-condensed;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-SmCondMediumItalic.ttf) format('ttf'),
+       url(woff2/Junicode-SmCondMediumItalic.woff2) format('woff2');
+  font-weight: 600;
+  font-style: italic;
+  font-stretch: semi-condensed;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-SmCondBold.ttf) format('ttf'),
+       url(woff2/Junicode-SmCondBold.woff2) format('woff2');
+  font-weight: 700;
+  font-style: normal;
+  font-stretch: semi-condensed;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-SmCondBoldItalic.ttf) format('ttf'),
+       url(woff2/Junicode-SmCondBoldItalic.woff2) format('woff2');
+  font-weight: 700;
+  font-style: italic;
+  font-stretch: semi-condensed;
+}
+
+
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-Cond.ttf) format('ttf'),
+       url(woff2/Junicode-Cond.woff2) format('woff2');
+  font-weight: 400;
+  font-style: normal;
+  font-stretch: condensed;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-CondItalic.ttf) format('ttf'),
+       url(woff2/Junicode-CondItalic.woff2) format('woff2');
+  font-weight: 400;
+  font-style: italic;
+  font-stretch: condensed;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-CondMedium.ttf) format('ttf'),
+       url(woff2/Junicode-CondMedium.woff2) format('woff2');
+  font-weight: 500;
+  font-style: normal;
+  font-stretch: condensed;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-CondMediumItalic.ttf) format('ttf'),
+       url(woff2/Junicode-CondMediumItalic.woff2) format('woff2');
+  font-weight: 500;
+  font-style: italic;
+  font-stretch: condensed;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-CondMedium.ttf) format('ttf'),
+       url(woff2/Junicode-CondMedium.woff2) format('woff2');
+  font-weight: 500;
+  font-style: normal;
+  font-stretch: condensed;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-CondMediumItalic.ttf) format('ttf'),
+       url(woff2/Junicode-CondMediumItalic.woff2) format('woff2');
+  font-weight: 500;
+  font-style: italic;
+  font-stretch: condensed;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-CondSmBold.ttf) format('ttf'),
+       url(woff2/Junicode-CondSmBold.woff2) format('woff2');
+  font-weight: 600;
+  font-style: normal;
+  font-stretch: condensed;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-CondSmBoldItalic.ttf) format('ttf'),
+       url(woff2/Junicode-CondSmBoldItalic.woff2) format('woff2');
+  font-weight: 600;
+  font-style: italic;
+  font-stretch: condensed;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-CondBold.ttf) format('ttf'),
+       url(woff2/Junicode-CondBold.woff2) format('woff2');
+  font-weight: 700;
+  font-style: normal;
+  font-stretch: condensed;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-CondBoldItalic.ttf) format('ttf'),
+       url(woff2/Junicode-CondBoldItalic.woff2) format('woff2');
+  font-weight: 700;
+  font-style: italic;
+  font-stretch: condensed;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-ExpLight.ttf) format('ttf'),
+       url(woff2/Junicode-ExpLight.woff2) format('woff2');
+  font-weight: 200;
+  font-style: normal;
+  font-stretch: expanded;
+}
+
+@font-face {
+  font-family: Junicode;
+  src: url(ttf/Junicode-ExpLightItalic.ttf) format('ttf'),
+       url(woff2/Junicode-ExpLightItalic.woff2) format('woff2');
+  font-weight: 200;
+  font-style: italic;
+  font-stretch: expanded;
+}

style/fonts/junius/junius.css

@@ -1,138 +0,0 @@
-@font-face {
-  font-family: JuniusX;
-  font-weight: 300;
-  font-stretch: normal;
-  src:
-    url(ttf/JuniusX-Light.ttf) format('ttf'),
-    url(woff2/JuniusX-Light.woff2) format('woff2');
-}
-
-@font-face {
-  font-family: JuniusX;
-  font-weight: 400;
-  font-stretch: normal;
-  src:
-    url(ttf/JuniusX-Regular.ttf) format('ttf'),
-    url(woff2/JuniusX-Regular.woff2) format('woff2');
-}
-
-@font-face {
-  font-family: JuniusX;
-  font-weight: 500;
-  font-stretch: normal;
-  src:
-    url(ttf/JuniusX-Medium.ttf) format('ttf'),
-    url(woff2/JuniusX-Medium.woff2) format('woff2');
-}
-
-@font-face {
-  font-family: JuniusX;
-  font-weight: 600;
-  font-stretch: normal;
-  src:
-    url(ttf/JuniusX-Semibold.ttf) format('ttf'),
-    url(woff2/JuniusX-Semibold.woff2) format('woff2');
-}
-
-@font-face {
-  font-family: JuniusX;
-  font-weight: 700;
-  font-stretch: normal;
-  src:
-    url(ttf/JuniusX-Bold.ttf) format('ttf'),
-    url(woff2/JuniusX-Bold.woff2) format('woff2');
-}
-
-
-@font-face {
-  font-family: JuniusX;
-  font-weight: 300;
-  font-stretch: semi-condensed;
-  src:
-    url(ttf/JuniusX-SemiCondensedLight.ttf) format('ttf'),
-    url(woff2/JuniusX-SemiCondensedLight.woff2) format('woff2');
-}
-
-@font-face {
-  font-family: JuniusX;
-  font-weight: 400;
-  font-stretch: semi-condensed;
-  src:
-    url(ttf/JuniusX-SemiCondensed.ttf) format('ttf'),
-    url(woff2/JuniusX-SemiCondensed.woff2) format('woff2');
-}
-
-@font-face {
-  font-family: JuniusX;
-  font-weight: 500;
-  font-stretch: semi-condensed;
-  src:
-    url(ttf/JuniusX-SemiCondensedMedium.ttf) format('ttf'),
-    url(woff2/JuniusX-SemiCondensedMedium.woff2) format('woff2');
-}
-
-@font-face {
-  font-family: JuniusX;
-  font-weight: 600;
-  font-stretch: semi-condensed;
-  src:
-    url(ttf/JuniusX-SemiCondensedSemibold.ttf) format('ttf'),
-    url(woff2/JuniusX-SemiCondensedSemibold.woff2) format('woff2');
-}
-
-@font-face {
-  font-family: JuniusX;
-  font-weight: 700;
-  font-stretch: semi-condensed;
-  src:
-    url(ttf/JuniusX-SemiCondensedBold.ttf) format('ttf'),
-    url(woff2/JuniusX-SemiCondensedBold.woff2) format('woff2');
-}
-
-
-@font-face {
-  font-family: JuniusX;
-  font-weight: 300;
-  font-stretch: condensed;
-  src:
-    url(ttf/JuniusX-CondensedLight.ttf) format('ttf'),
-    url(woff2/JuniusX-CondensedLight.woff2) format('woff2');
-}
-
-@font-face {
-  font-family: JuniusX;
-  font-weight: 400;
-  font-stretch: condensed;
-  src:
-    url(ttf/JuniusX-Condensed.ttf) format('ttf'),
-    url(woff2/JuniusX-Condensed.woff2) format('woff2');
-}
-
-@font-face {
-  font-family: JuniusX;
-  font-weight: 500;
-  font-stretch: condensed;
-  src:
-    url(ttf/JuniusX-CondensedMedium.ttf) format('ttf'),
-    url(woff2/JuniusX-CondensedMedium.woff2) format('woff2');
-}
-
-@font-face {
-  font-family: JuniusX;
-  font-weight: 600;
-  font-stretch: condensed;
-  src:
-    url(ttf/JuniusX-CondensedSemibold.ttf) format('ttf'),
-    url(woff2/JuniusX-CondensedSemibold.woff2) format('woff2');
-}
-
-@font-face {
-  font-family: JuniusX;
-  font-weight: 700;
-  font-stretch: condensed;
-  src:
-    url(ttf/JuniusX-CondensedBold.ttf) format('ttf'),
-    url(woff2/JuniusX-CondensedBold.woff2) format('woff2');
-}
-
-/* idk what "JuniusVF" is */

style/fonts/junius/woff2/.directory

@@ -1,6 +0,0 @@
-[Dolphin]
-PreviewsShown=false
-SortFoldersFirst=false
-Timestamp=2021,4,3,1,1,24
-Version=4
-ViewMode=2