summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/context.tex2
-rw-r--r--tex/context/base/core-con.tex6
-rw-r--r--tex/context/base/lang-alt.tex6
-rw-r--r--tex/context/base/lang-cyr.tex4
-rw-r--r--tex/context/base/lang-ger.tex14
-rw-r--r--tex/context/base/lang-grk.tex2
-rw-r--r--tex/context/base/lang-ind.tex4
-rw-r--r--tex/context/base/lang-ita.tex14
-rw-r--r--tex/context/base/lang-sla.tex10
-rw-r--r--tex/context/base/lang-ura.tex4
-rw-r--r--tex/context/base/lang-vn.tex58
-rw-r--r--tex/context/base/page-set.tex60
-rw-r--r--tex/context/base/s-mod-00.tex18
-rw-r--r--tex/context/base/spec-xtx.tex86
-rw-r--r--tex/context/interface/keys-cz.xml2
-rw-r--r--tex/context/interface/keys-de.xml2
-rw-r--r--tex/context/interface/keys-en.xml2
-rw-r--r--tex/context/interface/keys-it.xml2
-rw-r--r--tex/context/interface/keys-nl.xml2
-rw-r--r--tex/context/interface/keys-ro.xml2
20 files changed, 194 insertions, 106 deletions
diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index 7938ebe07..e774c83a8 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -31,7 +31,7 @@
%D 2004.8.30 the low level interface is english. Watch out and adapt
%D your styles an modules.
-\def\contextversion{2004.11.22}
+\def\contextversion{2004.11.23}
%D Welcome to the main module. When this module is ran through
%D \type{initex} or \type {tex -i} or \type {whatevertex} using
diff --git a/tex/context/base/core-con.tex b/tex/context/base/core-con.tex
index 42dd5ac40..a8d8f9fc5 100644
--- a/tex/context/base/core-con.tex
+++ b/tex/context/base/core-con.tex
@@ -219,7 +219,7 @@
\def\defineconversionvector#1#2% name base
{\bgroup
% dirty trick
- \uccode`\!=`\1
+ \uccode`\*=`\1
% plain:
% \uccode`\0=\numexpr#2+0\relax \uccode`\1=\numexpr#2+1\relax
% \uccode`\2=\numexpr#2+2\relax \uccode`\3=\numexpr#2+3\relax
@@ -229,8 +229,8 @@
% context:
\dostepwiserecurse091{\expandafter\uccode\expandafter`\recurselevel=\numexpr#2+\recurselevel}%
% prepared macro
- \uppercase\expandafter{\expandafter\gdef\csname::cvn::#1::\endcsname##!%
- {\ifcase##! 0\or1\or2\or3\or4\or5\or6\or7\or8\or9\fi}}%
+ \uppercase\expandafter{\expandafter\gdef\csname::cvn::#1::\endcsname##*%
+ {\ifcase##* 0\or1\or2\or3\or4\or5\or6\or7\or8\or9\fi}}%
\egroup}
\def\conversionnumber#1#2%
diff --git a/tex/context/base/lang-alt.tex b/tex/context/base/lang-alt.tex
index 3dff97407..d59df78bd 100644
--- a/tex/context/base/lang-alt.tex
+++ b/tex/context/base/lang-alt.tex
@@ -87,8 +87,6 @@
\setuplabeltext [\s!tr] [\v!friday=cuma]
\setuplabeltext [\s!tr] [\v!saturday=cumartesi]
-%D \ShowAllLanguageValues [\s!tr] [turkish] turks fruit
+%D \ShowAllLanguageValues [\s!tr] [turkish] {Turkish} {delight} % turks fruit
-\protect
-
-\endinput
+\protect \endinput
diff --git a/tex/context/base/lang-cyr.tex b/tex/context/base/lang-cyr.tex
index 37156e706..34b5e78c3 100644
--- a/tex/context/base/lang-cyr.tex
+++ b/tex/context/base/lang-cyr.tex
@@ -362,4 +362,8 @@
\setuplabeltext [\s!ua] [\v!saturday=\cyrillics \cyrillicu \cyrillicb
\cyrillico \cyrillict \cyrillica]
+
+%D \ShowAllLanguageValues [\s!ru] [russian] {Russian} {doll}
+%D \ShowAllLanguageValues [\s!ua] [ukranian] {Ukranian} {dance}
+
\protect \endinput
diff --git a/tex/context/base/lang-ger.tex b/tex/context/base/lang-ger.tex
index 03ff0c123..509dbafd5 100644
--- a/tex/context/base/lang-ger.tex
+++ b/tex/context/base/lang-ger.tex
@@ -685,12 +685,12 @@
\def\nlordinaldaynumber#1%
{#1\highordinalstr{e}}
-%D \ShowAllLanguageValues [\s!en] [english] engelse humor
-%D \ShowAllLanguageValues [\s!nl] [dutch] nederlandse zuinigheid
-%D \ShowAllLanguageValues [\s!de] [german] duitse degelijkheid
-%D \ShowAllLanguageValues [\s!da] [danish] deense ...
-%D \ShowAllLanguageValues [\s!sv] [swedish] zweedse ...
-%D \ShowAllLanguageValues [\s!af] [afrikaans] afrikaanse gasvryheid
-%D \ShowAllLanguageValues [\s!no] [norwegian] noorse ...
+%D \ShowAllLanguageValues [\s!en] [english] {English} {horn} % engelse humor
+%D \ShowAllLanguageValues [\s!nl] [dutch] {Dutch} {treat} % nederlandse zuinigheid
+%D \ShowAllLanguageValues [\s!de] [german] {German} {beer} % duitse degelijkheid
+%D \ShowAllLanguageValues [\s!da] [danish] {Danish} {pastry}
+%D \ShowAllLanguageValues [\s!sv] [swedish] {Swedish} {design}
+%D \ShowAllLanguageValues [\s!af] [afrikaans] {Afrikaaner} {boer} % afrikaanse gasvryheid
+%D \ShowAllLanguageValues [\s!no] [norwegian] {Norwegian} {wood}
\protect \endinput
diff --git a/tex/context/base/lang-grk.tex b/tex/context/base/lang-grk.tex
index 9e9223adc..fe968be17 100644
--- a/tex/context/base/lang-grk.tex
+++ b/tex/context/base/lang-grk.tex
@@ -81,6 +81,6 @@
\setuplabeltext [\s!gr] [\v!friday=\GreekPi\Greekalpha\Greekrho\Greekalpha\Greeksigma\Greekkappa\Greekepsilon\Greekupsilon\Greeketatonos]
\setuplabeltext [\s!gr] [\v!saturday=\GreekSigma\Greekalphatonos\Greekbeta\Greekbeta\Greekalpha\Greektau\Greekomicron]
-%D % \ShowAllLanguageValues [\s!gr] [\GreekEpsilon\Greeklamda\Greeklamda\Greeketa\Greeknu\Greekiota\Greekkappa\Greekalphatonos] Greek ...
+%D % \ShowAllLanguageValues [\s!gr] [\GreekEpsilon\Greeklamda\Greeklamda\Greeketa\Greeknu\Greekiota\Greekkappa\Greekalphatonos] {Greek} {love}
\protect \endinput
diff --git a/tex/context/base/lang-ind.tex b/tex/context/base/lang-ind.tex
index 7796bcb2a..9cc6623cf 100644
--- a/tex/context/base/lang-ind.tex
+++ b/tex/context/base/lang-ind.tex
@@ -23,6 +23,4 @@
\unprotect
-\protect
-
-\endinput
+\protect \endinput
diff --git a/tex/context/base/lang-ita.tex b/tex/context/base/lang-ita.tex
index 6db5bf54c..69c01a3da 100644
--- a/tex/context/base/lang-ita.tex
+++ b/tex/context/base/lang-ita.tex
@@ -509,12 +509,12 @@
\defineconversion [\s!fr] [\v!day+] [\frordinaldaynumber]
-%D \ShowAllLanguageValues [\s!fr] [french] franse slag
-%D \ShowAllLanguageValues [\s!es] [spanish] spaans benauwd
-%D \ShowAllLanguageValues [\s!ca] [catalan] catalaans ...
-%D \ShowAllLanguageValues [\s!it] [italian] italiaanse ...
-%D \ShowAllLanguageValues [\s!la] [latin] latijnse missen
-%D \ShowAllLanguageValues [\s!pt] [portuguese] portugese ...
-%D \ShowAllLanguageValues [\s!ro] [romanian] romanian ...
+%D \ShowAllLanguageValues [\s!fr] [french] {French} {kiss} % franse slag
+%D \ShowAllLanguageValues [\s!es] [spanish] {Spanish} {guitar} % spaans benauwd
+%D \ShowAllLanguageValues [\s!ca] [catalan] {Catalan} {cream}
+%D \ShowAllLanguageValues [\s!it] [italian] {Italian} {aria}
+%D \ShowAllLanguageValues [\s!la] [latin] {Latin} {lover} % latijnse missen
+%D \ShowAllLanguageValues [\s!pt] [portuguese] {Portuguese} {fisherman}
+%D \ShowAllLanguageValues [\s!ro] [romanian] {Romanian} {traveller}
\protect \endinput
diff --git a/tex/context/base/lang-sla.tex b/tex/context/base/lang-sla.tex
index 77b6e879b..41a91763d 100644
--- a/tex/context/base/lang-sla.tex
+++ b/tex/context/base/lang-sla.tex
@@ -439,10 +439,10 @@
\setuplabeltext [\s!sl] [\v!hereafter=glej spodaj]
\setuplabeltext [\s!sl] [\v!see=glej ]
-%D \ShowAllLanguageValues [\s!pl] [polish] poolse ...
-%D \ShowAllLanguageValues [\s!cz] [czech] tsjechische ...
-%D \ShowAllLanguageValues [\s!sk] [slovak] slovaakse ...
-%D \ShowAllLanguageValues [\s!hr] [croatian] croatian ...
-%D \ShowAllLanguageValues [\s!sl] [slovenian] slovenian ...
+%D \ShowAllLanguageValues [\s!pl] [polish] {Polish} {furniture}
+%D \ShowAllLanguageValues [\s!cz] [czech] {Czech} {mate}
+%D \ShowAllLanguageValues [\s!sk] [slovak] {Slovakian} {face}
+%D \ShowAllLanguageValues [\s!hr] [croatian] {Croatian} {heartthrob}
+%D \ShowAllLanguageValues [\s!sl] [slovenian] {Slovenian} {mountains}
\protect \endinput
diff --git a/tex/context/base/lang-ura.tex b/tex/context/base/lang-ura.tex
index 3e77c7a22..2ecb31e6b 100644
--- a/tex/context/base/lang-ura.tex
+++ b/tex/context/base/lang-ura.tex
@@ -154,7 +154,7 @@
\setuplabeltext [\s!hu] [\v!friday=p\'entek]
\setuplabeltext [\s!hu] [\v!saturday=szombat]
-%D \ShowAllLanguageValues [\s!fi] [finnish] finse ...
-%D \ShowAllLanguageValues [\s!hu] [hungarian] magyar ...
+%D \ShowAllLanguageValues [\s!fi] [finnish] {Finnish} {phone}
+%D \ShowAllLanguageValues [\s!hu] [hungarian] {Hungarian} {rhapsody}
\protect \endinput
diff --git a/tex/context/base/lang-vn.tex b/tex/context/base/lang-vn.tex
index c01e56d82..cf8536e70 100644
--- a/tex/context/base/lang-vn.tex
+++ b/tex/context/base/lang-vn.tex
@@ -38,7 +38,7 @@
\c!rightquote=\upperrightsingleninequote,
\c!leftquotation=\lowerleftdoubleninequote,
\c!rightquotation=\upperrightdoubleninequote,
- \c!date={{Ng\agrave y },dd,{ th\aacute ng },\v!month,{ n\abreve m },yy},
+ \c!date={{Ng\agrave y },dd,{ th\aacute ng },\v!month,{ n\abreve m },yy},
\c!state=\v!stop]
\installlanguage [vietnamese] [\s!vn]
@@ -46,46 +46,48 @@
\setupheadtext [\s!vn] [\v!content=M\udotbelow c l\udotbelow c]
\setupheadtext [\s!vn] [\v!tables=Danh s\aacute ch b\ahook ng]
\setupheadtext [\s!vn] [\v!figures=Danh s\aacute ch h\igrave nh v\etilde]
-\setupheadtext [\s!vn] [\v!graphics=Graphics]
+\setupheadtext [\s!vn] [\v!graphics=\Dstroke\ocircumflexgrave\ th\idotbelow] % D
\setupheadtext [\s!vn] [\v!intermezzi=Intermezzos]
\setupheadtext [\s!vn] [\v!index=Ch\ihook\ s\ocircumflexacute]
-\setupheadtext [\s!vn] [\v!abbreviations=Abbreviations]
-\setupheadtext [\s!vn] [\v!logos=Logos]
-\setupheadtext [\s!vn] [\v!units=Units]
+\setupheadtext [\s!vn] [\v!abbreviations=Ch\uhorntilde\ vi\ecircumflexacute t t\abreveacute t]
+\setupheadtext [\s!vn] [\v!logos=Bi\ecircumflexhook u t\uhorn \ohorndotbelow ng]
+\setupheadtext [\s!vn] [\v!units=\Dstroke\ohorn n v\idotbelow] % D
\setuplabeltext [\s!vn] [\v!table=B\ahook ng]
\setuplabeltext [\s!vn] [\v!figure=H\igrave nh]
\setuplabeltext [\s!vn] [\v!intermezzo=intermezzo]
-\setuplabeltext [\s!vn] [\v!graphic=graphic]
-\setuplabeltext [\s!vn] [\v!chapter=chapter]
+\setuplabeltext [\s!vn] [\v!graphic=\Dstroke\ocircumflexgrave\ th\idotbelow] % D
+\setuplabeltext [\s!vn] [\v!chapter=Ch\uhorn \ohorn ng]
\setuplabeltext [\s!vn] [\v!section=] % not set
\setuplabeltext [\s!vn] [\v!subsection=] % not set
\setuplabeltext [\s!vn] [\v!subsubsection=] % not set
\setuplabeltext [\s!vn] [\v!subsubsubsection=] % not set
\setuplabeltext [\s!vn] [\v!appendix=] % not set
\setuplabeltext [\s!vn] [\v!part=Ph\acircumflexgrave n ]
-\setuplabeltext [\s!vn] [\v!line=line ]
-\setuplabeltext [\s!vn] [\v!lines=lines ]
+\setuplabeltext [\s!vn] [\v!line=d\ograve ng ]
+\setuplabeltext [\s!vn] [\v!lines=d\ograve ng ]
-\setuplabeltext [\s!vn] [\v!sunday=Sunday]
-\setuplabeltext [\s!vn] [\v!monday=Monday]
-\setuplabeltext [\s!vn] [\v!tuesday=Tuesday]
-\setuplabeltext [\s!vn] [\v!wednesday=Wednesday]
-\setuplabeltext [\s!vn] [\v!thursday=Thursday]
-\setuplabeltext [\s!vn] [\v!friday=Friday]
-\setuplabeltext [\s!vn] [\v!saturday=Saturday]
+\setuplabeltext [\s!vn] [\v!sunday=ch\uhook\ nh\acircumflexdotbelow t]
+\setuplabeltext [\s!vn] [\v!monday=th\uhornacute\ hai]
+\setuplabeltext [\s!vn] [\v!tuesday=th\uhornacute\ ba]
+\setuplabeltext [\s!vn] [\v!wednesday=th\uhornacute\ t\uhorn]
+\setuplabeltext [\s!vn] [\v!thursday=th\uhornacute\ n\abreve m]
+\setuplabeltext [\s!vn] [\v!friday=th\uhornacute\ s\aacute u]
+\setuplabeltext [\s!vn] [\v!saturday=th\uhornacute\ b\ahook y]
-\setuplabeltext [\s!vn] [\v!january=gi\ecircumflex ng]
-\setuplabeltext [\s!vn] [\v!february=hai]
-\setuplabeltext [\s!vn] [\v!march=ba]
-\setuplabeltext [\s!vn] [\v!april=t\uhorn]
-\setuplabeltext [\s!vn] [\v!may=n\abreve m]
-\setuplabeltext [\s!vn] [\v!june=s\aacute u]
-\setuplabeltext [\s!vn] [\v!july=b\ahook y]
-\setuplabeltext [\s!vn] [\v!august=t\aacute m]
-\setuplabeltext [\s!vn] [\v!september=ch\iacute n]
-\setuplabeltext [\s!vn] [\v!october=m\uhorn\ohorngrave i]
-\setuplabeltext [\s!vn] [\v!november=m\uhorn\ohorngrave i m\ocircumflexdotbelow t]
-\setuplabeltext [\s!vn] [\v!december=m\uhorn\ohorngrave i hai]
+\setuplabeltext [\s!vn] [\v!january=th\aacute ng gi\ecircumflex ng]
+\setuplabeltext [\s!vn] [\v!february=th\aacute ng hai]
+\setuplabeltext [\s!vn] [\v!march=th\aacute ng ba]
+\setuplabeltext [\s!vn] [\v!april=th\aacute ng t\uhorn]
+\setuplabeltext [\s!vn] [\v!may=th\aacute ng n\abreve m]
+\setuplabeltext [\s!vn] [\v!june=th\aacute ng s\aacute u]
+\setuplabeltext [\s!vn] [\v!july=th\aacute ng b\ahook y]
+\setuplabeltext [\s!vn] [\v!august=th\aacute ng t\aacute m]
+\setuplabeltext [\s!vn] [\v!september=th\aacute ng ch\iacute n]
+\setuplabeltext [\s!vn] [\v!october=th\aacute ng m\uhorn\ohorngrave i]
+\setuplabeltext [\s!vn] [\v!november=th\aacute ng m\uhorn\ohorngrave i m\ocircumflexdotbelow t]
+\setuplabeltext [\s!vn] [\v!december=th\aacute ng m\uhorn\ohorngrave i hai]
+
+%D \ShowAllLanguageValues [\s!vn] [vietnamese] {Vietnamese} {water||puppets}
\protect \endinput
diff --git a/tex/context/base/page-set.tex b/tex/context/base/page-set.tex
index cdf95cb7a..fda87f691 100644
--- a/tex/context/base/page-set.tex
+++ b/tex/context/base/page-set.tex
@@ -67,11 +67,11 @@
% The following two macros are used to compensate for a switch in body fonts
% as in:
%
-% \definecolumnset [twee] [n=2,balanceren=ja]
-% \definecolumnset [three] [n=3,balanceren=ja]
+% \definecolumnset [two] [n=2,balancing=yes]
+% \definecolumnset [three] [n=3,balancing=yes]
%
-% \setupcolumnsetlines[twee][1][1][7]
-% \setupcolumnsetlines[twee][1][2][10]
+% \setupcolumnsetlines[two][1][1][7]
+% \setupcolumnsetlines[two][1][2][10]
%
% \setupcolumnsetlines[three][1][1][40]
% \setupcolumnsetlines[three][1][2][40]
@@ -82,8 +82,8 @@
% \setupcolumnsetstart[three][1][3][20]
%
% \starttext
-% \startcolumnset [twee] \dorecurse {1}{\input tufte \par} \stopcolumnset
-% \switchnaarkorps[klein]
+% \startcolumnset [two] \dorecurse {1}{\input tufte \par} \stopcolumnset
+% \switchtobodyfont[small]
% \startcolumnset [three] \dorecurse {1}{\input tufte \par} \stopcolumnset
% \stoptext
@@ -1618,11 +1618,11 @@
\def\doOTRSETgotocolumn[#1]% yes|force|first|last|<number>|<number>*<number>
{\processallactionsinset
[#1]
- [ \v!yes=>\OTRSETdummycolumn,
- \v!no=>,% not supported
- \v!force=>\OTRSETdummycolumn,
- \v!first=>\expanded{\doOTRSETgotoCOLUMN{1}},
- \v!last=>\expanded{\doOTRSETgotoCOLUMN{\the\nofcolumns}},
+ [ \v!yes=>\OTRSETdummycolumn,
+ \v!no=>,% not supported
+ \v!force=>\OTRSETdummycolumn,
+ \v!first=>\expanded{\doOTRSETgotoCOLUMN{1}},
+ \v!last=>\expanded{\doOTRSETgotoCOLUMN{\the\nofcolumns}},
\s!default=>\OTRSETdummycolumn,
\s!unknown=>\expanded{\doOTRSETgotoCOLROW{\commalistelement}}]}
@@ -1909,7 +1909,7 @@
\processaction
[\getvalue{\??mc\OTRSETidentifier\c!balance}]
[ \v!yes=>\chardef\OTRSETbalancemethod\plusone,
- \v!top=>\chardef\OTRSETbalancemethod\plustwo,
+ \v!top=>\chardef\OTRSETbalancemethod\plustwo,
\v!bottom=>\chardef\OTRSETbalancemethod\plusthree]}
% keep 'm for a while
@@ -2415,7 +2415,7 @@
\processaction
[\getvalue{\??mt##1#2\c!state}]
[ \v!start=>\donetrue\doglobal\removefromcommalist{##1}#1,
- \v!repeat=>\donetrue,
+ \v!repeat=>\donetrue,
\s!unknown=>\doperformtest\commalistelement\donetrue\donefalse]%
\ifdone
\dodoplacecolumntextareas{##1}{#2}
@@ -2454,7 +2454,7 @@
{\donetrue\localframed
[\??mt\currentcolumntestarea]
[\c!location=,% new (*)
- \c!width=\!!widtha,\c!height=\!!heighta,\c!lines=]
+ \c!width=\!!widtha,\c!height=\!!heighta,\c!lines=]
{\columntextareaparameter\empty}}%
\!!counta\columntextareaparameter\c!x
\!!countb\columntextareaparameter\c!y
@@ -2471,13 +2471,13 @@
\copy\scratchbox % \box
\else
\clip
- [%\c!topoffset=\columntextareaparameter\c!clipoffset,%
+ [ %\c!topoffset=\columntextareaparameter\c!clipoffset,%
%\c!bottomoffset=\columntextareaparameter\c!clipoffset,%
- %\c!leftoffset=\columntextareaparameter\c!clipoffset,%
- \c!offset=\columntextareaparameter\c!clipoffset,%
- \c!rightoffset=\zeropoint,%
- \c!width=\!!widthb,%
- \c!height=\!!heighta]%
+ %\c!leftoffset=\columntextareaparameter\c!clipoffset,%
+ \c!offset=\columntextareaparameter\c!clipoffset,%
+ \c!rightoffset=\zeropoint,%
+ \c!width=\!!widthb,%
+ \c!height=\!!heighta]%
{\copy\scratchbox}%
\fi}%
\OTRSETsetgridcell\!!counta\!!countb\box0
@@ -2488,14 +2488,14 @@
\setbox0\hbox
{\hskip-\namedlayoutparameter\v!odd\c!backspace
\clip
- [%\c!topoffset=\columntextareaparameter\c!clipoffset,%
+ [ %\c!topoffset=\columntextareaparameter\c!clipoffset,%
%\c!bottomoffset=\columntextareaparameter\c!clipoffset,%
- %\c!rightoffset=\columntextareaparameter\c!clipoffset,%
- \c!offset=\columntextareaparameter\c!clipoffset,%
- \c!leftoffset=\zeropoint,%
- \c!width=\!!widtha,%
- \c!height=\!!heighta,%
- \c!hoffset=\!!widthb]%
+ %\c!rightoffset=\columntextareaparameter\c!clipoffset,%
+ \c!offset=\columntextareaparameter\c!clipoffset,%
+ \c!leftoffset=\zeropoint,%
+ \c!width=\!!widtha,%
+ \c!height=\!!heighta,%
+ \c!hoffset=\!!widthb]%
{\copy\scratchbox}}%
\OTRSETsetgridcell\!!counta\!!countb\box0%
\fi}
@@ -2541,9 +2541,9 @@
\ifodd\realpageno \else % tricky, assumes that we keep there
\ifcase\!!countc\else
% nog niet ok voor enkel/dubbelzijdig
- \advance\!!widtha \namedlayoutparameter\v!even \c!backspace
- \advance\!!widtha \namedlayoutparameter\v!odd\c!backspace
- \advance\!!widthb \namedlayoutparameter\v!even \c!backspace
+ \advance\!!widtha \namedlayoutparameter\v!even\c!backspace
+ \advance\!!widtha \namedlayoutparameter\v!odd \c!backspace
+ \advance\!!widthb \namedlayoutparameter\v!even\c!backspace
\dorecurse\!!countc
{\advance\!!widtha\OTRSETgetparameter\c!distance\recurselevel}%
\fi
diff --git a/tex/context/base/s-mod-00.tex b/tex/context/base/s-mod-00.tex
index f584a23b6..ee6b23504 100644
--- a/tex/context/base/s-mod-00.tex
+++ b/tex/context/base/s-mod-00.tex
@@ -437,7 +437,7 @@
\stoptable
\stopbuffer
-\gdef\ShowTextsValues [#1] [#2]
+\gdef\ShowTextsValues[#1][#2]%
{\vbox\bgroup
\language[#1]%
\setbox\scratchbox\hbox to \hsize{\hss\bfb#2 language defaults\hss}
@@ -453,7 +453,7 @@
$\vcenter{\getbuffer[lang-c]}$&&$\vcenter{\getbuffer[lang-d]}$\cr}%
\egroup}
-\gdef\ShowLanguageValues [#1] [#2] #3 #4
+\gdef\ShowLanguageValues[#1][#2]#3#4%
{\hbox to \hsize
{\hss
\vbox
@@ -464,25 +464,25 @@
\HL
\VL \THREE{\bf subsentence symbol and quotes} \VL\SR
\HL
- \VL \quotation{#3 #4} \VL \quote{#2} \VL \let|=\normalbar |<||<|#3|>|#4|>| \VL\SR
- \VL \quotation{#3 #4} \VL \quote{#2} \VL |<||<|#3|>|#4|>| \VL\SR
+ \VL \quotation{#3 #4} \VL \quote{#2} \VL \let|=\normalbar |<||<|#3|>|#4|>| \VL\FR
+ \VL \quotation{#3 #4} \VL \quote{#2} \VL |<||<|#3|>|#4|>| \VL\LR
\HL
\stoptable
\egroup
\hss}}
-\gdef\doShowAllLanguageValues [#1] [#2] #3 #4
+\gdef\doShowAllLanguageValues[#1][#2]#3#4%
{\vbox
- {\ShowTextsValues [#1] [#2]
+ {\ShowTextsValues[#1][#2]
\vskip2em
- \ShowLanguageValues [#1] [#2] #3 #4 }
+ \ShowLanguageValues[#1][#2]{#3}{#4}}
\protect
\page}
-\gdef\ShowAllLanguageValues%
+\gdef\ShowAllLanguageValues
{\page
\unprotect
- \doShowAllLanguageValues}
+ \dodoubleargument\doShowAllLanguageValues}
\protect
diff --git a/tex/context/base/spec-xtx.tex b/tex/context/base/spec-xtx.tex
index a8f0c0d48..576560203 100644
--- a/tex/context/base/spec-xtx.tex
+++ b/tex/context/base/spec-xtx.tex
@@ -149,4 +149,90 @@
\stopspecials
+\protect
+
+%\endinput
+
+% FOR THE MOMENT HERE
+
+\ifx\dqfontquote\undefined \else \endinput \fi
+
+\unprotect
+
+% actually, we can use "" in pdftex> 1.20 as well
+
+\def\parsefontspec#1%
+ {\xdef\somefontspec{#1\space}%
+ \@EA\doparsefontspec\somefontspec\relax]% =>#1 \empty]
+ \donoparsefontspec}
+
+\def\doparsefontspec#1%
+ {\ifx"#1%
+ \@EA\dodqparsefontspec
+ \else\ifx'#1%
+ \@EAEAEA\dosqparsefontspec
+ \else
+ \@EAEAEA\dodoparsefontspec
+ \fi\fi#1}
+
+\def\dqfontquote{"}
+\def\sqfontquote{'}
+
+\def\dodqparsefontspec"#1"#2%
+ {\def\somefontname{#1}%
+ \let\somefontquote\dqfontquote
+ \ifx#2\relax\@EA\setnaturalfontspec\else\@EA\setforcedfontspec\fi#2}
+
+\def\dosqparsefontspec'#1'#2%
+ {\def\somefontname{#1}%
+ \let\somefontquote\sqfontquote
+ \ifx#2\relax\@EA\setnaturalfontspec\else\@EA\setforcedfontspec\fi#2}
+
+\def\dodoparsefontspec#1 #2%
+ {\def\somefontname{#1}%
+ \let\somefontquote\empty
+ \ifx\somefontname\empty % space before fontname
+ \@EA\doparsefontspec
+ \else\ifx#2\relax
+ \@EAEAEA\setnaturalfontspec
+ \else
+ \@EAEAEA\setforcedfontspec
+ \fi\fi
+ #2}
+
+\def\setnaturalfontspec#1]%
+ {\@fs@scaled\plusthousand\relax}
+
+\def\setforcedfontspec#1 #2\relax]%
+ {\csname\@fs@#1\endcsname#2\relax}
+
+\beginXETEX \font
+
+\def\donoparsefontspec % #1 == \cs
+ {\edef\fontfile{\somefontquote\truefontname\somefontname\somefontquote}%
+ \ifx\fontfile\s!unknown \let\fontfile\defaultfontfile \fi
+ \edef\lastfontname{\fontfile\somefontspec}%
+ \ifx\fontclass\empty
+ \expandafter\definefontlocal
+ \else
+ \expandafter\definefontglobal
+ \fi} % #1 == \cs
+
+\endXETEX
+
\protect \endinput
+
+\starttext
+
+\definedfont[{cmr10} at 40pt] test
+\definedfont['cmss10' at 40pt] test
+\definedfont["cmtt10" at 40pt] test
+
+\definedfont[{cmr10} at 40pt] test
+\definedfont['cmss10' at 40pt] test
+\definedfont["cmtt10" at 40pt] test
+
+% \definedfont["Gentium" at 40pt] test
+
+\stoptext
+
diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml
index b29c2e64e..904c6147b 100644
--- a/tex/context/interface/keys-cz.xml
+++ b/tex/context/interface/keys-cz.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2004.11.22">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2004.11.23">
<cd:variables>
<cd:variable name="one" value="jedna"/>
diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml
index b3f772a1a..e3d111047 100644
--- a/tex/context/interface/keys-de.xml
+++ b/tex/context/interface/keys-de.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2004.11.22">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2004.11.23">
<cd:variables>
<cd:variable name="one" value="eins"/>
diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml
index a736cfceb..98243d440 100644
--- a/tex/context/interface/keys-en.xml
+++ b/tex/context/interface/keys-en.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2004.11.22">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2004.11.23">
<cd:variables>
<cd:variable name="one" value="one"/>
diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml
index 3827e7126..74ba49bc9 100644
--- a/tex/context/interface/keys-it.xml
+++ b/tex/context/interface/keys-it.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2004.11.22">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2004.11.23">
<cd:variables>
<cd:variable name="one" value="uno"/>
diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml
index 851c11888..ef36320a2 100644
--- a/tex/context/interface/keys-nl.xml
+++ b/tex/context/interface/keys-nl.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2004.11.22">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2004.11.23">
<cd:variables>
<cd:variable name="one" value="een"/>
diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml
index 90d7c10ba..7b46a9642 100644
--- a/tex/context/interface/keys-ro.xml
+++ b/tex/context/interface/keys-ro.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2004.11.22">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2004.11.23">
<cd:variables>
<cd:variable name="one" value="unu"/>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 12:05:08 +0000