1 files changed, 31 insertions, 13 deletions
diff --git a/tex/context/base/mkiv/lang-def.mkiv b/tex/context/base/mkiv/lang-def.mkiv
index 28245e591..7f3e85f08 100644
--- a/tex/context/base/mkiv/lang-def.mkiv
+++ b/tex/context/base/mkiv/lang-def.mkiv
@@ -22,19 +22,6 @@
 % Frisian, Plattdeutsch
 
 \installlanguage
-  [\s!nl]
-  [\c!spacing=\v!packed,
-   \c!leftsentence=\emdash,
-   \c!rightsentence=\emdash,
-   \c!leftsubsentence=\emdash,
-   \c!rightsubsentence=\emdash,
-   \c!leftquote=\lowerleftsingleninequote,
-   \c!rightquote=\upperrightsingleninequote,
-   \c!leftquotation=\lowerleftdoubleninequote,
-   \c!rightquotation=\upperrightdoubleninequote,
-   \c!date={\v!day,\space,\v!month,\space,\v!year}]
-
-\installlanguage
   [\s!en]
   [\c!spacing=\v!broad,
    \c!leftsentence=\emdash,
@@ -51,6 +38,19 @@
    \s!righthyphenmin=3]
 
 \installlanguage
+  [\s!nl]
+  [\c!spacing=\v!packed,
+   \c!leftsentence=\emdash,
+   \c!rightsentence=\emdash,
+   \c!leftsubsentence=\emdash,
+   \c!rightsubsentence=\emdash,
+   \c!leftquote=\lowerleftsingleninequote,
+   \c!rightquote=\upperrightsingleninequote,
+   \c!leftquotation=\lowerleftdoubleninequote,
+   \c!rightquotation=\upperrightdoubleninequote,
+   \c!date={\v!day,\space,\v!month,\space,\v!year}]
+
+\installlanguage
   [\s!de]
   [\c!spacing=\v!packed,
    \s!lefthyphenmin=3,
@@ -328,6 +328,22 @@
    \c!date={\v!year,\space,\v!month,\space,\v!day}]
 
 \installlanguage
+  [\s!et]
+  [\c!default=\s!en,
+   \c!spacing=\v!packed,
+   \c!leftsentence=\emdash,
+   \c!rightsentence=\emdash,
+   \c!leftsubsentence=\emdash,
+   \c!rightsubsentence=\emdash,
+   \c!leftquote=\leftguillemot,
+   \c!rightquote=\rightguillemot,
+   \c!leftquotation=\lowerrightdoubleninequote,
+   \c!rightquotation=\upperrightdoublesixquote,
+   \c!time={h,{.},m},
+   \c!date={\v!day,.,\space,\v!month,\space,\v!year},
+   \s!patterns=\s!et]
+
+\installlanguage
   [\s!hu]
   [\c!spacing=\v!packed,
    \c!leftsentence=\emdash,
@@ -341,6 +357,7 @@
    \c!date={\v!year,.,\space,\v!month,\space,\v!day,.}]
 
 \installlanguage [\s!finnish]   [\s!fi]
+\installlanguage [\s!estonian]  [\s!et]
 \installlanguage [\s!hungarian] [\s!hu]
 
 % Altaic Languages: Uigur, Uzbek, Azeri/Azerbaijani, Chuvash,
@@ -580,6 +597,7 @@
    \c!rightquote=\rightguillemot,
    \c!leftquotation=\leftguillemot,
    \c!rightquotation=\rightguillemot,
+   \c!time={h,{\Uchar104 },m},% we need to cheat in order to get the h
    \c!date={\v!day:mnem,\v!space,\v!month,\v!space,\v!year}]
 
 \installlanguage