1 files changed, 20 insertions, 14 deletions
diff --git a/tex/context/base/lang-def.mkiv b/tex/context/base/lang-def.mkiv
index e838f60e1..d4e40dad1 100644
--- a/tex/context/base/lang-def.mkiv
+++ b/tex/context/base/lang-def.mkiv
@@ -211,28 +211,34 @@
 \installlanguage
   [\s!cs]
   [\c!spacing=\v!packed,
-   \c!leftsentence={\thickglue\endash\thickglue\penalty-20\relax},
-   \c!rightsentence={\thickglue\endash\thickglue\penalty-20\relax},
-   \c!leftsubsentence={\nobreakspace\emdash\nobreakspace\penalty-20\relax},
-   \c!rightsubsentence={\nobreakspace\emdash\nobreakspace\penalty-20\relax},
+   \c!leftsentence={\nobreakspace\endash\thickglue\penalty\zerocount\relax},
+   \c!rightsentence=\c!leftsentence,
+   \c!leftsubsentence=\c!leftsentence,
+   \c!rightsubsentence=\c!rightsentence,
    \c!leftquote=\lowerleftsingleninequote,
    \c!rightquote=\upperrightsinglesixquote,
    \c!leftquotation=\lowerleftdoubleninequote,
    \c!rightquotation=\upperrightdoublesixquote,
-   \c!date={\v!day,{.\thinspace},\v!month,\space,\v!year}]
+   \c!date={\v!day,\fourperemspace,\v!month,\space,\v!year}
+   \s!lefthyphenmin=2,
+   \s!righthyphenmin=3
+]
 
 \installlanguage
   [\s!sk]
   [\c!spacing=\v!packed,
-   \c!leftsentence=\emdash,
-   \c!rightsentence=\emdash,
-   \c!leftsubsentence=\emdash,
-   \c!rightsubsentence=\emdash,
-   \c!leftquote=\upperleftsinglesixquote,
-   \c!rightquote=\upperrightsingleninequote,
-   \c!leftquotation=\upperleftdoublesixquote,
-   \c!rightquotation=\upperrightdoubleninequote,
-   \c!date={\v!day,{.\thinspace},\v!month,\space,\v!year}]
+   \c!leftsentence={\nobreakspace\endash\thickglue\penalty\zerocount\relax},
+   \c!rightsentence=\c!leftsentence,
+   \c!leftsubsentence=\c!leftsentence,
+   \c!rightsubsentence=\c!rightsentence,
+   \c!leftquote=\lowerleftsingleninequote,
+   \c!rightquote=\upperrightsinglesixquote,
+   \c!leftquotation=\lowerleftdoubleninequote,
+   \c!rightquotation=\upperrightdoublesixquote,
+   \c!date={\v!day,\fourperemspace,\v!month,\space,\v!year}
+   \s!lefthyphenmin=2,
+   \s!righthyphenmin=3
+]
 
 \installlanguage
   [\s!hr]