beta 2011.05.09 16:28

1 files changed, 137 insertions, 141 deletions

diff --git a/tex/context/base/lang-def.mkiv b/tex/context/base/lang-def.mkiv
index cf2ab9730..359006fef 100644
--- a/tex/context/base/lang-def.mkiv
+++ b/tex/context/base/lang-def.mkiv
@@ -24,28 +24,28 @@
 \installlanguage
   [\s!nl]
   [\c!spacing=\v!packed,
-   \c!leftsentence=---,
-   \c!rightsentence=---,
-   \c!leftsubsentence=---,
-   \c!rightsubsentence=---,
+   \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,\ ,\v!month,\ ,\v!year}]
+   \c!date={\v!day,\space,\v!month,\space,\v!year}]
 
 \installlanguage
   [\s!en]
   [\c!spacing=\v!broad,
-   \c!leftsentence=---,
-   \c!rightsentence=---,
-   \c!leftsubsentence=---,
-   \c!rightsubsentence=---,
+   \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!month,\ ,\v!day,{,\ },\v!year},
+   \c!date={\v!month,\space,\v!day,{,\space},\v!year},
    \s!patterns=\s!us,
    \s!lefthyphenmin=2,
    \s!righthyphenmin=3]
@@ -55,84 +55,84 @@
   [\c!spacing=\v!packed,
    \s!lefthyphenmin=3,
    \s!righthyphenmin=3,
-   \c!leftsentence={\hbox{--~}},
-   \c!rightsentence={\hbox{~--}},
-   \c!leftsubsentence={--},
-   \c!rightsubsentence={--},
+   \c!leftsentence=\hbox{\endash\space},
+   \c!rightsentence=\hbox{\space\endash},
+   \c!leftsubsentence=\endash,
+   \c!rightsubsentence=\endash,
    \c!leftquote=\lowerleftsingleninequote,
    \c!rightquote=\upperrightsinglesixquote,
    \c!leftquotation=\lowerleftdoubleninequote,
    \c!rightquotation=\upperrightdoublesixquote,
-   \c!date={\v!day,{.},\ ,\v!month,\ ,\v!year}]
+   \c!date={\v!day,{.\space},\v!month,\space,\v!year}]
 
 \installlanguage
   [\s!da]
   [\c!spacing=\v!packed,
-   \c!leftsentence={\hbox{--\hskip.5em}},
-   \c!rightsentence={\hbox{\hskip.5em--}},
-   \c!leftsubsentence={--},
-   \c!rightsubsentence={--},
+   \c!leftsentence={\hbox{\endash\enskip}},
+   \c!rightsentence={\hbox{\enskip\endash}},
+   \c!leftsubsentence=\endash,
+   \c!rightsubsentence=\endash,
    \c!leftquote=\lowerleftsingleninequote,
    \c!rightquote=\upperrightsinglesixquote,
    \c!leftquotation=\lowerleftdoubleninequote,
    \c!rightquotation=\upperrightdoublesixquote,
-   \c!date={\v!day,{.},\ ,\v!month,\ ,\v!year}]
+   \c!date={\v!day,{.\space},\v!month,\space,\v!year}]
 
 \installlanguage
   [\s!sv]
   [\c!spacing=\v!packed,
-   \c!leftsentence={\hbox{--~}},
-   \c!rightsentence={\hbox{~--}},
-   \c!leftsubsentence={--},
-   \c!rightsubsentence={--},
+   \c!leftsentence=\hbox{\endash\space},
+   \c!rightsentence=\hbox{\space\endash},
+   \c!leftsubsentence=\endash,
+   \c!rightsubsentence=\endash,
    \c!leftquote=\upperrightsingleninequote,
    \c!rightquote=\upperrightsingleninequote,
    \c!leftquotation=\upperrightdoubleninequote,
    \c!rightquotation=\upperrightdoubleninequote,
-   \c!date={\v!day,\ ,\v!month,\ ,\v!year}]
+   \c!date={\v!day,\space,\v!month,\space,\v!year}]
 
 \installlanguage
   [\s!af]
   [\c!spacing=\v!packed,
-   \c!leftsentence=---,
-   \c!rightsentence=---,
-   \c!leftsubsentence=---,
-   \c!rightsubsentence=---,
+   \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!year,\ ,\v!month,\ ,\v!day}]
+   \c!date={\v!year,\space,\v!month,\space,\v!day}]
 
 \installlanguage
   [\s!nb]
   [spacing=packed,
    lefthyphenmin=2,
    righthyphenmin=2,
-   leftsentence=---,
-   rightsentence=---,
-   leftsubsentence=---,
-   rightsubsentence=---,
+   leftsentence=\emdash,
+   rightsentence=\emdash,
+   leftsubsentence=\emdash,
+   rightsubsentence=\emdash,
    leftquote=\upperleftsinglesixquote,
    rightquote=\upperrightsingleninequote,
    leftquotation=\leftguillemot,
    rightquotation=\rightguillemot,
-   date={day,{.},\ ,month,\ ,year}]
+   date={day,{.},\space,month,\space,year}]
 
 \installlanguage
   [\s!nn]
   [spacing=packed,
    lefthyphenmin=2,
    righthyphenmin=2,
-   leftsentence=---,
-   rightsentence=---,
-   leftsubsentence=---,
-   rightsubsentence=---,
+   leftsentence=\emdash,
+   rightsentence=\emdash,
+   leftsubsentence=\emdash,
+   rightsubsentence=\emdash,
    leftquote=\upperleftsinglesixquote,
    rightquote=\upperrightsingleninequote,
    leftquotation=\leftguillemot,
    rightquotation=\rightguillemot,
-   date={day,{.},\ ,month,\ ,year}]
+   date={day,{.},\space,month,\space,year}]
 
 
 \installlanguage [\s!no]        [\s!nb]
@@ -198,71 +198,67 @@
 \installlanguage
   [\s!pl]
   [\c!spacing=\v!packed,
-   \c!leftsentence=---,
-   \c!rightsentence=---,
-   \c!leftsubsentence=---,
-   \c!rightsubsentence=---,
+   \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,{.},\ ,\v!month,\ ,\v!year}]
+   \c!date={\v!day,{.\space},\v!month,\space,\v!year}]
 
 \installlanguage
   [\s!cs]
   [\c!spacing=\v!packed,
-   \c!leftsentence=\thickglue--\thickglue\penalty-20\relax, % hh, \relax added
-   \c!rightsentence=\thickglue--\thickglue\penalty-20\relax,
-   \c!leftsubsentence=~---~\penalty-20\relax,
-   \c!rightsubsentence=~---~\penalty-20\relax,
+   \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!leftquote=\lowerleftsingleninequote,
    \c!rightquote=\upperrightsinglesixquote,
    \c!leftquotation=\lowerleftdoubleninequote,
    \c!rightquotation=\upperrightdoublesixquote,
-   \c!date={\v!day,{.\,},\v!month,\ ,\v!year}]
+   \c!date={\v!day,{.\thinspace},\v!month,\space,\v!year}]
 
 \installlanguage
   [\s!sk]
   [\c!spacing=\v!packed,
-   \c!leftsentence=---,
-   \c!rightsentence=---,
-   \c!leftsubsentence=---,
-   \c!rightsubsentence=---,
+   \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,{.\,},\v!month,\ ,\v!year}]
+   \c!date={\v!day,{.\thinspace},\v!month,\space,\v!year}]
 
 \installlanguage
   [\s!hr]
   [\c!spacing=\v!packed,
-   \c!leftsentence=---,
-   \c!rightsentence=---,
-   \c!leftsubsentence=---,
-   \c!rightsubsentence=---,
+   \c!leftsentence=\hbox{\endash\space},
+   \c!rightsentence=\hbox{\space\endash},
+   \c!leftsubsentence=\endash,
+   \c!rightsubsentence=\endash,
    \c!leftquote=\lowerleftsingleninequote,
    \c!rightquote=\upperrightsingleninequote,
    \c!leftquotation=\lowerleftdoubleninequote,
    \c!rightquotation=\upperrightdoubleninequote,
-   \c!date={\v!day,{.},\ ,\v!month,\ ,\v!year}]
+   \c!date={\v!day,{.},\space,\v!month,\space,\v!year}]
 
 \installlanguage
  [\s!sl]
  [\c!spacing=\v!packed,
-  \c!leftsentence={\hbox{--~}},
-  \c!rightsentence={\hbox{~--}},
-  \c!leftsubsentence={--},
-  \c!rightsubsentence={--},
-  %\c!leftquote=\lowerleftsingleninequote,
-  %\c!rightquote=\upperrightsinglesixquote,
-  %\c!leftquotation=\lowerleftdoubleninequote,
-  %\c!rightquotation=\upperrightdoublesixquote,
+  \c!leftsentence=\hbox{\endash\space},
+  \c!rightsentence=\hbox{\space\endash},
+  \c!leftsubsentence=\endash,
+  \c!rightsubsentence=\endash,
   \c!leftquote=\guilsingleright,
   \c!rightquote=\guilsingleleft,
   \c!leftquotation=\rightguillemot,
   \c!rightquotation=\leftguillemot,
-  \c!date={\v!day,{.},\ ,\v!month,\ ,\v!year}]
+  \c!date={\v!day,{.},\space,\v!month,\space,\v!year}]
 
 \installlanguage [polish]    [\s!pl]
 \installlanguage [czech]     [\s!cs]
@@ -319,7 +315,7 @@
    \c!rightquote=\upperrightdoubleninequote,
    \c!leftquotation=\leftguillemot,
    \c!rightquotation=\rightguillemot,
-   \c!date={\v!day,\ ,\v!month,\ ,\v!year}]
+   \c!date={\v!day,\space,\v!month,\space,\v!year}]
 
 \installlanguage
   [\s!ua]
@@ -334,7 +330,7 @@
    \c!rightquote=\upperrightdoubleninequote,
    \c!leftquotation=\leftguillemot,
    \c!rightquotation=\rightguillemot,
-   \c!date={\v!day,\ ,\v!month,\ ,\v!year},
+   \c!date={\v!day,\space,\v!month,\space,\v!year},
    \s!patterns=\s!uk]
 
 \installlanguage [russian]   [\s!ru]
@@ -346,28 +342,28 @@
 \installlanguage
   [\s!fi]
   [\c!spacing=\v!packed,
-   \c!leftsentence=---,
-   \c!rightsentence=---,
-   \c!leftsubsentence=---,
-   \c!rightsubsentence=---,
+   \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!year,\ ,\v!month,\ ,\v!day}]
+   \c!date={\v!year,\space,\v!month,\space,\v!day}]
 
 \installlanguage
   [\s!hu]
   [\c!spacing=\v!packed,
-   \c!leftsentence=---,
-   \c!rightsentence=---,
-   \c!leftsubsentence=---,
-   \c!rightsubsentence=---,
+   \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!year,.,\ ,\v!month,\ ,\v!day,.}]
+   \c!date={\v!year,.,\space,\v!month,\space,\v!day,.}]
 
 \installlanguage [finish]    [\s!fi]
 \installlanguage [hungarian] [\s!hu]
@@ -379,28 +375,28 @@
 \installlanguage
   [\s!tr]
   [\c!spacing=\v!packed,
-   \c!leftsentence=---,
-   \c!rightsentence=---,
-   \c!leftsubsentence=---,
-   \c!rightsubsentence=---,
+   \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!year,\ ,\v!month,\ ,\v!day}]
+   \c!date={\v!year,\space,\v!month,\space,\v!day}]
 
 \installlanguage
   [\s!tk]
   [\c!spacing=\v!broad,
-   \c!leftsentence=---,
-   \c!rightsentence=---,
-   \c!leftsubsentence=---,
-   \c!rightsubsentence=---,
+   \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!year,\ ,\v!month,\ ,\v!day}
+   \c!date={\v!year,\space,\v!month,\space,\v!day}
    \s!patterns=\s!tk,
    \s!lefthyphenmin=1,
    \s!righthyphenmin=2]
@@ -418,15 +414,15 @@
 \installlanguage
   [\s!ar]
   [\c!spacing=\v!broad,
-   \c!leftsentence=---,
-   \c!rightsentence=---,
-   \c!leftsubsentence=---,
-   \c!rightsubsentence=---,
+   \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,\ ,\v!month,{،\ },\v!year}]
+   \c!date={\v!day,\space,\v!month,{،\space},\v!year}]
 
 \installlanguage [\s!arabic] [\s!ar]
 
@@ -464,15 +460,15 @@
 \installlanguage
   [\s!lt]
   [\c!spacing=\v!packed,
-   \c!leftsentence=---,
-   \c!rightsentence=---,
-   \c!leftsubsentence=---,
-   \c!rightsubsentence=---,
+   \c!leftsentence=\emdash,
+   \c!rightsentence=\emdash,
+   \c!leftsubsentence=\emdash,
+   \c!rightsubsentence=\emdash,
    \c!leftquote=\lowerleftdoubleninequote,
    \c!rightquote=\upperrightdoublesixquote,
    \c!leftquotation=\lowerleftdoubleninequote,
    \c!rightquotation=\upperrightdoublesixquote,
-   \c!date={\v!year,~m.,\ ,\v!month,\ ,\v!day,~d.},
+   \c!date={\v!year,~m.,\space,\v!month,\space,\v!day,~d.},
    \s!patterns=\s!lt,
    \s!lefthyphenmin=2,
    \s!righthyphenmin=2]
@@ -497,7 +493,7 @@
    \c!rightquote=’,
    \c!leftquotation=“,
    \c!rightquotation=”,
-   \c!date={\v!year,年,\ ,\v!month,\v!day,日}]
+   \c!date={\v!year,年,\space,\v!month,\v!day,日}]
 
 \installlanguage
   [\s!ja]
@@ -528,15 +524,15 @@
 \installlanguage
   [\s!gr]
   [\c!spacing=\v!packed,
-   \c!leftsentence=---,
-   \c!rightsentence=---,
-   \c!leftsubsentence=---,
-   \c!rightsubsentence=---,
+   \c!leftsentence=\emdash,
+   \c!rightsentence=\emdash,
+   \c!leftsubsentence=\emdash,
+   \c!rightsubsentence=\emdash,
    \c!leftquote=\greekleftquot,
    \c!rightquote=\greekrightquot,
    \c!leftquotation=\greekleftquot,
    \c!rightquotation=\greekrightquot,
-   \c!date={\v!day\ \v!month\ \v!year},
+   \c!date={\v!day\space\v!month\space\v!year},
    \s!patterns=\s!agr] % ok?
 
 \installlanguage [greek] [\s!gr]
@@ -577,40 +573,40 @@
 \installlanguage
   [\s!es]
   [\c!spacing=\v!packed,
-   \c!leftsentence=---,
-   \c!rightsentence=---,
-   \c!leftsubsentence=---,
-   \c!rightsubsentence=---,
+   \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,\ ,\v!month,\ ,\v!year}]
+   \c!date={\v!day,\space,\v!month,\space,\v!year}]
 
 \installlanguage [sp] [\s!es] % old times context
 
 \installlanguage
   [\s!ca]
   [\c!spacing=\v!packed,
-   \c!leftsentence=---,
-   \c!rightsentence=---,
-   \c!leftsubsentence=---,
-   \c!rightsubsentence=---,
+   \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,\ ,\v!month,\ ,\v!year}]
+   \c!date={\v!day,\space,\v!month,\space,\v!year}]
 
 % Note GB left|/|right (sub)sentences are for \quote {incisi}.
 
 \installlanguage
   [\s!it]
   [\c!spacing=\v!packed,
-   \c!leftsentence=---,
-   \c!rightsentence=---,
-   \c!leftsubsentence=--,
-   \c!rightsubsentence=--,
+   \c!leftsentence=\emdash,
+   \c!rightsentence=\emdash,
+   \c!leftsubsentence=\endash,
+   \c!rightsubsentence=\endash,
    \c!leftquote=\upperleftsinglesixquote,
    \c!rightquote=\upperrightsingleninequote,
    \c!leftquotation=\upperleftdoublesixquote,
@@ -618,46 +614,46 @@
    \c!leftspeech=\leftguillemot,
    \c!middlespeech=\leftguillemot,
    \c!rightspeech=\rightguillemot,
-   \c!date={\v!day,\ ,\v!month,\ ,\v!year}]
+   \c!date={\v!day,\space,\v!month,\space,\v!year}]
 
 \installlanguage % the same as italian
   [\s!la]
   [\c!spacing=\v!packed,
-   \c!leftsentence=---,
-   \c!rightsentence=---,
-   \c!leftsubsentence=---,
-   \c!rightsubsentence=---,
+   \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,\ ,\v!month,\ ,\v!year}]
+   \c!date={\v!day,\space,\v!month,\space,\v!year}]
 
 \installlanguage
   [\s!pt]
   [\c!spacing=\v!packed,
-   \c!leftsentence=---,
-   \c!rightsentence=---,
-   \c!leftsubsentence=---,
-   \c!rightsubsentence=---,
+   \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!year,\ ,\v!month,\ ,\v!day}]
+   \c!date={\v!year,\space,\v!month,\space,\v!day}]
 
 \installlanguage
   [\s!ro]
   [\c!spacing=\v!packed,
-   \c!leftsentence=---,
-   \c!rightsentence=---,
-   \c!leftsubsentence=---,
-   \c!rightsubsentence=---,
+   \c!leftsentence=\emdash,
+   \c!rightsentence=\emdash,
+   \c!leftsubsentence=\emdash,
+   \c!rightsubsentence=\emdash,
    \c!leftquote=\leftguillemot,
    \c!rightquote=\rightguillemot,
    \c!leftquotation=\lowerrightdoubleninequote,
    \c!rightquotation=\upperleftdoublesixquote,
-   \c!date={\v!day,\ ,\v!month,\ ,\v!year}]
+   \c!date={\v!day,\space,\v!month,\space,\v!year}]
 
 %D For compatibility reasons we also define:
 
@@ -678,10 +674,10 @@
 \installlanguage
   [\s!vi]
   [\c!spacing=\v!packed,
-   \c!leftsentence=---,
-   \c!rightsentence=---,
-   \c!leftsubsentence=---,
-   \c!rightsubsentence=---,
+   \c!leftsentence=\emdash,
+   \c!rightsentence=\emdash,
+   \c!leftsubsentence=\emdash,
+   \c!rightsubsentence=\emdash,
    \c!leftquote=\quoteleft,
    \c!rightquote=\quoteright,
    \c!leftquotation=\quotedblleft,