stable 2001.07.04

9 files changed, 241 insertions, 110 deletions

diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index 4cbd091d8..7b2610074 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -13,7 +13,7 @@
 
 \catcode`\{=1 \catcode`\}=2 
 
-\def\contextversion{2001.7.2}
+\def\contextversion{2001.7.4}
 
 %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-ver.tex b/tex/context/base/core-ver.tex
index 95c817805..428dbf6ef 100644
--- a/tex/context/base/core-ver.tex
+++ b/tex/context/base/core-ver.tex
@@ -562,6 +562,7 @@
 
 \def\obeybreakpoints%
   {\def\obeyedspace{ }%
+   \spaceskip.5em
    \veryraggedright}
 
 %\unexpanded\def\typ%
@@ -775,7 +776,7 @@
       \c!onevenmarge=\!!zeropoint,
            \c!blanko=\v!regel,
            \c!escape=/,
-           \c!regels=\v!ja]
+           \c!regels=]
 
 %D \macros
 %D   {definetype}
diff --git a/tex/context/base/lang-ini.tex b/tex/context/base/lang-ini.tex
index f582af230..f34e38340 100644
--- a/tex/context/base/lang-ini.tex
+++ b/tex/context/base/lang-ini.tex
@@ -258,19 +258,19 @@
                   \s!encoding=\languagedefault{#1}\s!encoding,
                   #2]}}}%
       \doifvalue{\??la#1\c!default}{#1}{\letvalue{\??la#1\c!default}\empty}%
-% loop in deo
-% \doifvalue{\??la#1\s!patterns}{#1}{\letvalue{\??la#1\c!default}\empty}%
-%
+       % loop in deo
+       % \doifvalue{\??la#1\s!patterns}{#1}{\letvalue{\??la#1\c!default}\empty}%
+       %
       \doifelsevalue{\??la#1\c!status}{\v!start}
         {\doifelsevaluenothing{\??la#1\s!patterns}
            {\edef\languagesuffix{#1}}
            {\edef\languagesuffix{\getvalue{\??la#1\s!patterns}}}%
-%         \doifundefinedelse{\??la\??la\languagesuffix}
-\doifundefinedelse{\??la\??la:\currentencoding:\currentmapping:\languagesuffix}
+        %\doifundefinedelse{\??la\??la\languagesuffix}
+         \doifundefinedelse{\??la\??la:\currentencoding:\currentmapping:\languagesuffix}
            {\doloadpatterns{#1}{\languagesuffix}}
            {\bgroup
-%            \edef\loadedlanguage{\getvalue{\??la\??la\languagesuffix}}%
-\edef\loadedlanguage{\getvalue{\??la\??la:\currentencoding:\currentmapping:\languagesuffix}}%
+           %\edef\loadedlanguage{\getvalue{\??la\??la\languagesuffix}}%
+            \edef\loadedlanguage{\getvalue{\??la\??la:\currentencoding:\currentmapping:\languagesuffix}}%
             \showmessage{\m!linguals}{1}{\languagesuffix,#1,\loadedlanguage}%
             \showmessage{\m!linguals}{3}{\languagesuffix,#1,\loadedlanguage}%
             \egroup}}
diff --git a/tex/context/base/math-ini.tex b/tex/context/base/math-ini.tex
index 82349b446..3a2b17d14 100644
--- a/tex/context/base/math-ini.tex
+++ b/tex/context/base/math-ini.tex
@@ -132,7 +132,7 @@
      \ifmmode
        \@EA\ifx\csname\@mt@\mathcollection#1\endcsname\relax
          \@EA\ifx\csname\@mt@\nomathcollection#1\endcsname\relax 
-           \@EA\ifcsname\characterencoding#1\endcsname
+           \@EA\ifx\csname\characterencoding#1\endcsname
              \nocharacterencoding
            \else
              \characterencoding
@@ -142,9 +142,9 @@
          \fi
        \else
          \@mt@\mathcollection
-       \fi\fi\fi
+       \fi
      \else
-       \@EA\ifcsname\characterencoding#1\endcsname
+       \@EA\ifx\csname\characterencoding#1\endcsname
          \nocharacterencoding
        \else
          \characterencoding
diff --git a/tex/context/base/page-imp.tex b/tex/context/base/page-imp.tex
index 2225e31f9..bc08ad440 100644
--- a/tex/context/base/page-imp.tex
+++ b/tex/context/base/page-imp.tex
@@ -174,7 +174,14 @@
                          \global\chardef\arrangedpageT=2
                          \global\chardef\horizontalcutmarks=3
                          \global\chardef\verticalcutmarks=2
-                         \global\let\pusharrangedpage=\pusharrangedpageFOUR
+                         \global\let\pusharrangedpage=\pusharrangedpageFOURA
+                         \global\let\poparrangedpages=\poparrangedpagesAB,
+                   2**2=>\global\chardef\arrangedpageX=2
+                         \global\chardef\arrangedpageY=1
+                         \global\chardef\arrangedpageT=2
+                         \global\chardef\horizontalcutmarks=3
+                         \global\chardef\verticalcutmarks=2
+                         \global\let\pusharrangedpage=\pusharrangedpageFOURB
                          \global\let\poparrangedpages=\poparrangedpagesAB,
                   2SIDE=>\global\chardef\arrangedpageX=2
                          \global\chardef\arrangedpageY=1
@@ -262,6 +269,10 @@
 %                            \pusharrangedpageFOUR     
 %                            \poparrangedpagesAB
 %                            \relax,
+%                    2**2=>\dosetuparrangingXY{2}{1}{2}{3}{2}
+%                            \pusharrangedpageFOURPLUS     
+%                            \poparrangedpagesAB
+%                            \relax,
 %                   2SIDE=>\dosetuparrangingXY{2}{1}{2}{3}{2}
 %                            \pusharrangedpageSIDE
 %                            \poparrangedpagesAB
@@ -428,14 +439,17 @@
      \poparrangedpages
    \fi}
 
-\def\pusharrangedpageFOUR#1%
+\def\pusharrangedpageFOURA{\pusharrangedpageFOURdo01}
+\def\pusharrangedpageFOURB{\pusharrangedpageFOURdo10}
+
+\def\pusharrangedpageFOURdo#1#2#3%
   {\doglobal\increment\arrangedpageN
    \reportarrangedpage\arrangedpageN
    \ifcase\arrangedpageN
-   \or \handlearrangedpageXY{#1}  {0}{1}{0}\arrangedpageA %  1
-   \or \handlearrangedpageXY{#1}{180}{0}{0}\arrangedpageB %  2
-   \or \handlearrangedpageXY{#1}{180}{1}{0}\arrangedpageB %  3
-   \or \handlearrangedpageXY{#1}  {0}{0}{0}\arrangedpageA %  4
+   \or \handlearrangedpageXY{#3}  {0} {1}{0}\arrangedpageA %  1
+   \or \handlearrangedpageXY{#3}{180}{#1}{0}\arrangedpageB %  2/3
+   \or \handlearrangedpageXY{#3}{180}{#2}{0}\arrangedpageB %  3/2
+   \or \handlearrangedpageXY{#3}  {0} {0}{0}\arrangedpageA %  4
      \poparrangedpages
    \fi}
 
diff --git a/tex/context/base/s-abr-01.tex b/tex/context/base/s-abr-01.tex
index 0721b23d7..33ae62647 100644
--- a/tex/context/base/s-abr-01.tex
+++ b/tex/context/base/s-abr-01.tex
@@ -7,79 +7,194 @@
 %D           date=\currentdate,
 %D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
 %C
-%C This module is part of the C
-%C This moK This moK Thof eCmlgeiul0 is used elmDOaeCmlgeiul0 iaul0 iow
-     {\hbHUarrow%
-  {\d Ton Ott
-  emarrow%
-  {\dlemi{aLBParrow%
-  {marroeslmDOaeCmlgeiuhWBRsmJssrN   carroesls        vehp\currentdafhp\currentdafhMcurrento/sd-Mp\currr=bSdentdafhMcuifdrtISErNhaCONtuGtdafhMcurrentOsubmAEPa afhMcurreSwD/ Hans Hans HaAEPa afhMxdwOl Abbrevns Hans HkBbbrevns Luleat\at\at\atwOl Ml=E5nO   {\lower.5\ht0\vbox
-        o\vbox
-    wer.5\ht0\veiul0 is uCSPO wer.5\ht0{eiul0 iaulCSietar    {\hbHUyx to \dimen2Sietar  rowfill}}}}
-ppppppppppptMt.dr  rowfillGpyright={PapllGpyright{lXt\t.df\def\chebuc{oicalstack}{iaA  \setevalEIWfhp\currentghtslXt\t.df\def Gpyris Luleat\at\smat\atwOl Mrd
-        Shat\f Gpyris LulDhtarrowfiW Shat\f GpAIlTOMLSEOarrowfiW ShAts LulDhtarrMLSEOarrowfiEufiWe]lDht pE
-\def\chemicaloute -
-     {\lower.HkbAt.df\def\cheafiWe]lDht pPDl -
-     {\lofiWe]lDht WEBl -
-     {webfiWe]lDhtDISTILLErowf{distilleDht pE
-\deDTt\f Gpyris dtdht pE
-\deDTK\f Gpyris dt
-     {\loDVIPSONEsetevdvipsone     {\loDVIPSat\f GpAdvips     {\loDVISCrowfiEuAdviscr     {\loDVIWINDOsetevdviwindo     {\loDVI\f Gpyris dvyris LuleaECW ShAts Lulecris LuleaEIFFEiaulCSi{Eiffelris LuleaEMACSat\f GpAep\csris LuleaEMt\smat\atpAepMrd
-        SEPght={PapllGeps     {\loEt\smat\atpf\derd
-        SEU ShATHsetevEuroMath        SFAQht={PapllGfaq}
-%     SFGAht={PapllGfga        SFDFht={PapllGfdf        SFGBBSat\f GpAfgbbs     {\loFPt\smat\atpAfpMrd
-        SFREEhat\f Gp{Freehat        SFTPht={PapllGftp        SGHOSTSCrIPT]{Ghost\-Script        SGHOSTVIEWowf{Ghost\-View        SGIFht={PapllGgif        SGNUht={PapllGgnu        SGSW ShAts LulGhost\-Script        SGUSTmat\atpf\Gust        SHTMLmat\atpf\htmlris LuleaIBMht={PapllGibMLSEOarrowINRppppppppp{inrsMrd
-        SIRCNETmat\at{IRCnet}        SJAVASCrIPT] {Java\-Script        SJAVAmat\atpf\Java        SJPEGmat\atpf\jpeg        SJPGht={PapllGjpg        SLppppppppppp{\Ladr  rowfillGpy \dimTEppppp{\La  r2eowfillGpy \dimTNppppp{\La  r2.09owfillGpy \dimmat\atpA\  rowfill}}}}
-LINUmmat\atpAlinuxfill}}}}
-LISPht={Papl{Lisp        SMAKEMPYppppp{MakeMPY        SMAPght={Papl{Maps     {\lohATHMLmat\at{MathM  {\hbHUyxMETAFer.en2SieMs HFont {\hbHUyxMETAPOS.en2SieMs HPost        SMIKt\smat\atwMikMrd
-        SMLdimmat\atpAmlMrd
-        SMODULAmat\atwMdafha        SMOVht={PapllGmov        SMPght={PapllGmps     {\lohSDOSat\f GpAmsdos     {\lohSWINDOWSat\{MS~Windows     {\loNETPBMht={Pa{NetPBM     {\loNTGht={PapllGntg     {\loNTSht={PapllGnts     {\loOMEGAht={Pap{Omega        SPASCALmat\at{Pf Galris LuleaPDFEt\smat\a{SwD-derd
-        SPDFt\smat\atwSwD\rd
-        SPDFtOPght={PwSwDtops     {\loPDFht={PapllGpdf        SPERLTK\f Gpy{Perl/Tk        SPERLht={Papl{Perl        SPICpppppppptMtPiCrd
-        SPLAIDl -
-   {PlaiofiWe]lDhtPNGht={PapllGpng     {\loPOSImmat\atpAposix     {\loPOSTSCrIPT] {Post\-Script        SPPCHpppppppp{\PPCHpd
-        SPOsubm\f Gpy{Pragma ADE        SPOESSat\f GpApress     {\loPRIFILmat\at{prigen     {\loPSCHECKht={PwSscheck        SPStOPAGEsetevpstopent        SPStRICKSsetevpstricks     {\loPSW ShAts LulPost\-Script        SRGBht={PapllGrgbfiWe]lDhtSGMLmat\atpf\sgmlris Luleadf\def\chepf\syris LuleaSQLht={PapllGsqlris LuleaTABLEmat\atpA\TaBlE        STDSht={PapllGtds}  % no sc te        STEt\smat\atp{te\rd
-   % no sc te        STEXADOESen2Sierd
- adress     {\loTEXBASEppppp{\rd
- base     {\loTEXEDITppppp{\rd
- edit     {\loTEXEXECW ShA{\rd
- execris LuleaTEXFORMW ShA{\rd
-  Hamris LuleaTEXMFmat\atp{texmfris LuleaTEXNiaulCSietTEX-NLris LuleaTEXSHOWW ShA{\rd
- showris LuleaTEXSPELLen2Sierd
- spellris LuleaTEXUTILmat\aierd
- utilris LuleaTEXWORKmat\aierd
- workris LuleaTEXht={PapllG\rd
-        STFMht={PapllGtfmris LuleaTIFFINFOsetevtiffinforis LuleaTIFFTAGSW Shvtifftagsris LuleaTIFFmat\atpf\tiffris LuleaTIFht={PapllGtif        STPICmat\atpf\tpicris LuleaTUGBOiul0 is Tug\-Boer.5\ht0{eiTUGNEWSl0 is Tug\-News     {\loTUGht={PapllGtug     {\loUNICODEppppp{Uni\-code}        SUNIsmat\atpf\unix         SURI\f Gpyris uryris LuleaURL\f Gpyris urlris LuleaUSAht={PapllGusaris LuleaUSENETmat\at{usenet}        SWDTht={PapllGwdr.5\ht0{eiWEBCmat\atpf\web2c.5\ht0{eiWEBht={PapllGwebfiWe]lDhtWINNTht={Pap{WinNTfiWe]lDhtWINNXht={Pap{Win9x     {\loWWWht={PapllGwwwris LuleaWYSIWYGht={P{wysiwyg     {\loXDVI\f Gpyri{Xdvyris LuleaXINDYht={Pap{Xindyris LuleaXML\f Gpyris xmlris LuleaXSLTmat\atpf\xsltris LuleaXSL\f Gpyris xslris LuleaYandYht={Pap{y\&yri
-\def\METAFUN={PapllG\Ms HFunri
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for 
+%C details. 
+
+\unprotect
+
+\stelsorterenin[logo][\c!letter=\v!kapitaal]
+
+\setupcapitals[\c!titel=\v!nee]
+
+\protect
+
+\logo [ACROBAT]    {Acro\-bat}
+\logo [ALGOL]      {ALGOL}
+\logo [AMSLATEX]   {\AmSLaTeX}
+\logo [AMSTEX]     {\AmSTeX}
+\logo [AMS]        {ams}
+\logo [ANSI]       {ansi}
+\logo [ASCIITEX]   {ascii\TeX}
+\logo [ASCII]      {ascii}
+\logo [BIBTEX]     {bib\TeX}
+\logo [BSD]        {bsd}
+\logo [CDROM]      {cdrom}
+\logo [CD]         {cd}
+\logo [CMR]        {cmr}
+\logo [CMYK]       {cmyk}
+\logo [CONTEXT]    {\ConTeXt}
+\logo [CTAN]       {ctan}
+\logo [CWEB]       {cweb}
+\logo [DISTILLER]  {distiller}
+\logo [DTD]        {dtd}
+\logo [DTK]        {dtk}
+\logo [DVIPSONE]   {dvipsone}
+\logo [DVIPS]      {dvips}
+\logo [DVISCR]     {dviscr}
+\logo [DVIWINDO]   {dviwindo}
+\logo [DVI]        {dvi}
+\logo [EC]         {ec}
+\logo [EIFFEL]     {Eiffel}
+\logo [EMACS]      {emacs}
+\logo [EMTEX]      {em\TeX}
+\logo [EPS]        {eps}
+\logo [ETEX]       {\eTeX}
+\logo [EUROMATH]   {EuroMath}
+\logo [FAQ]        {faq}
+%logo [FGA]        {fga}
+\logo [FDF]        {fdf}
+\logo [FGBBS]      {fgbbs}
+\logo [FPTEX]      {fp\TeX}
+\logo [FREEBSD]    {FreeBSD}
+\logo [FTP]        {ftp}
+\logo [GHOSTSCRIPT]{Ghost\-Script}
+\logo [GHOSTVIEW]  {Ghost\-View}
+\logo [GIF]        {gif}
+\logo [GNU]        {gnu}
+\logo [GS]         {Ghost\-Script}
+\logo [GUST]       {Gust}
+\logo [HTML]       {html}
+\logo [IBM]        {ibm}
+\logo [INRSTEX]    {inrs\TeX}
+\logo [IRCNET]     {IRCnet} 
+\logo [JAVASCRIPT] {Java\-Script}
+\logo [JAVA]       {Java}
+\logo [JPEG]       {jpeg}
+\logo [JPG]        {jpg}
+\logo [LAMSTEX]    {\LamSTeX}
+\logo [LATEXTE]    {\LaTeX2e}
+\logo [LATEXTN]    {\LaTeX2.09}
+\logo [LATEX]      {\LaTeX}
+\logo [LINUX]      {linux}
+\logo [LISP]       {Lisp}
+\logo [MAKEMPY]    {MakeMPY}
+\logo [MAPS]       {Maps}
+\logo [MATHML]     {MathML}
+\logo [METAFONT]   {\MetaFont}
+\logo [METAPOST]   {\MetaPost}
+\logo [MIKTEX]     {Mik\TeX}
+\logo [MLTEX]      {ml\TeX}
+\logo [MODULA]     {Modula}
+\logo [MOV]        {mov}
+\logo [MPS]        {mps}
+\logo [MSDOS]      {msdos}
+\logo [MSWINDOWS]  {MS~Windows}
+\logo [NETPBM]     {NetPBM}
+\logo [NTG]        {ntg}
+\logo [NTS]        {nts}
+\logo [OMEGA]      {Omega}
+\logo [PASCAL]     {Pascal}
+\logo [PDFETEX]    {pdf-\eTeX}
+\logo [PDFTEX]     {pdf\TeX}
+\logo [PDFTOPS]    {pdftops}
+\logo [PDF]        {pdf}
+\logo [PERLTK]     {Perl/Tk}
+\logo [PERL]       {Perl}
+\logo [PICTEX]     {\PiCTeX}
+\logo [PLAIN]      {Plain}
+\logo [PNG]        {png}
+\logo [POSIX]      {posix}
+\logo [POSTSCRIPT] {Post\-Script}
+\logo [PPCHTEX]    {\PPCHTeX}
+\logo [PRAGMA]     {Pragma ADE}
+\logo [PRESS]      {press}
+\logo [PRIFIL]     {prifil}
+\logo [PSCHECK]    {pscheck}
+\logo [PSTOPAGE]   {pstopage}
+\logo [PSTRICKS]   {pstricks}
+\logo [PS]         {Post\-Script}
+\logo [RGB]        {rgb}
+\logo [SGML]       {sgml}
+\logo [SI]         {si}
+\logo [SQL]        {sql}
+\logo [TABLE]      {\TaBlE}
+\logo [TDS]        {tds}  % no sc te 
+\logo [TETEX]      {te\TeX}  % no sc te 
+\logo [TEXADRES]   {\TeX adress}
+\logo [TEXBASE]    {\TeX base}
+\logo [TEXEDIT]    {\TeX edit}
+\logo [TEXEXEC]    {\TeX exec}
+\logo [TEXFORM]    {\TeX form}
+\logo [TEXMF]      {texmf}
+\logo [TEXNL]      {TEX-NL}
+\logo [TEXSHOW]    {\TeX show}
+\logo [TEXSPELL]   {\TeX spell}
+\logo [TEXUTIL]    {\TeX util}
+\logo [TEXWORK]    {\TeX work}
+\logo [TEX]        {\TeX}
+\logo [TFM]        {tfm}
+\logo [TIFFINFO]   {tiffinfo}
+\logo [TIFFTAGS]   {tifftags}
+\logo [TIFF]       {tiff}
+\logo [TIF]        {tif}
+\logo [TPIC]       {tpic}
+\logo [TUGBOAT]    {Tug\-Boat}
+\logo [TUGNEWS]    {Tug\-News}
+\logo [TUG]        {tug}
+\logo [UNICODE]    {Uni\-code} 
+\logo [UNIX]       {unix} 
+\logo [URI]        {uri}
+\logo [URL]        {url}
+\logo [USA]        {usa}
+\logo [USENET]     {usenet} 
+\logo [WDT]        {wdt}
+\logo [WEBC]       {web2c}
+\logo [WEB]        {web}
+\logo [WINNT]      {WinNT}
+\logo [WINNX]      {Win9x}
+\logo [WWW]        {www}
+\logo [WYSIWYG]    {wysiwyg}
+\logo [XDVI]       {Xdvi}
+\logo [XINDY]      {Xindy}
+\logo [XML]        {xml}
+\logo [XSLT]       {xslt}
+\logo [XSL]        {xsl}
+\logo [YandY]      {y\&y}
+
+\def\METAFUN       {\MetaFun}
+
 \def\SystemSpecialA#1{$\langle\it#1\rangle$}
-\def\SystemSpecialB#1{{\tttf<#1>}ri
-\def\CATCODEPapllG\SystemSpecialA{catcode}}
-\def\CATCODESapllG\SystemSpecialA{catcodes}}
-\def\DIME.dfONpllG\SystemSpecialA{dimens mo}}
-\def\DIME.dfONSllG\SystemSpecialA{dimens mos}}
-\def\COUr.HRPapllG\SystemSpecialA{counteDh}
-\def\COUr.HRSapllG\SystemSpecialA{counteDs}}
-\def\HBOXt={PapllG\SystemSpecialA{hbox}}
-\def\HBOXESapllllG\SystemSpecialA{hboxes}}
-\def\VBOXt={PapllG\SystemSpecialA{vbox}}
-\def\VBOXESapllllG\SystemSpecialA{vboxes}}
-\def\BOXt={PaplllG\SystemSpecialA{box}}
-\def\BOXESaplllllG\SystemSpecialA{boxes}}
-\def\TOKENLISTlllG\SystemSpecialA{token list }
-\def\TOKENLISTSllG\SystemSpecialA{token lists}}
-\def\NEWLINEPapllG\SystemSpecialA{newline}}
-\def\SKIP={PaplllG\SystemSpecialA{skip}}
-\def\SKIPS{PaplllG\SystemSpecialA{skips}}
-\def\MUSKIP={PaplG\SystemSpecialA{muskip}}
-\def\MUSKIPS{PaplG\SystemSpecialA{muskips}}
-\def\MARK={PaplllG\SystemSpecialA{markr}
-\def\MARKS{PaplllG\SystemSpecialA{marks}ri
-\def\SPACE{PaplllG\SystemSpecialB{space}}
-\def\EOFt={PaplllG\SystemSpecialB{eof }
-\def\TABt={PaplllG\SystemSpecialB{tab}}
-\def\NEWPAGEaplllG\SystemSpecialB{newpent }
-\def\NEWLINEPapllG\SystemSpecialB{newline}}
+\def\SystemSpecialB#1{{\tttf<#1>}}
+
+\def\CATCODE     {\SystemSpecialA{catcode}}
+\def\CATCODES    {\SystemSpecialA{catcodes}}
+\def\DIMENSION   {\SystemSpecialA{dimension}}
+\def\DIMENSIONS  {\SystemSpecialA{dimensions}}
+\def\COUNTER     {\SystemSpecialA{counter}}
+\def\COUNTERS    {\SystemSpecialA{counters}}
+\def\HBOX        {\SystemSpecialA{hbox}}
+\def\HBOXES      {\SystemSpecialA{hboxes}}
+\def\VBOX        {\SystemSpecialA{vbox}}
+\def\VBOXES      {\SystemSpecialA{vboxes}}
+\def\BOX         {\SystemSpecialA{box}}
+\def\BOXES       {\SystemSpecialA{boxes}}
+\def\TOKENLIST   {\SystemSpecialA{token list}}
+\def\TOKENLISTS  {\SystemSpecialA{token lists}}
+\def\NEWLINE     {\SystemSpecialA{newline}}
+\def\SKIP        {\SystemSpecialA{skip}}
+\def\SKIPS       {\SystemSpecialA{skips}}
+\def\MUSKIP      {\SystemSpecialA{muskip}}
+\def\MUSKIPS     {\SystemSpecialA{muskips}}
+\def\MARK        {\SystemSpecialA{mark}}
+\def\MARKS       {\SystemSpecialA{marks}}
+
+\def\SPACE       {\SystemSpecialB{space}}
+\def\EOF         {\SystemSpecialB{eof}}
+\def\TAB         {\SystemSpecialB{tab}}
+\def\NEWPAGE     {\SystemSpecialB{newpage}}
+\def\NEWLINE     {\SystemSpecialB{newline}}
 
-\def\THANH{PaplllGH\`an Th\^e\llap{\raise 0.5ex\hbox{\'{}}} Th\`anh}
+\def\THANH       {H\`an Th\^e\llap{\raise 0.5ex\hbox{\'{}}} Th\`anh}
 
 \endinput
diff --git a/tex/context/base/s-map-01.tex b/tex/context/base/s-map-01.tex
index 0249f395d..e137445d4 100644
--- a/tex/context/base/s-map-01.tex
+++ b/tex/context/base/s-map-01.tex
@@ -63,13 +63,13 @@
 %D \type{groot} meegeven. Met \type{x} geven we de maat aan van
 %D de pseudo klein||kapitalen. De \MAPS\ wordt gezet in 9pt.
 
-\setupbodyfont[map,9pt]
-
-\startnotmode[localfonts]
-
-  \setupbodyfont[mty]
-
-\stopnotmode
+%\setupbodyfont[map,9pt]
+%
+%\startnotmode[localfonts]
+%
+%  \setupbodyfont[mty]
+%
+%\stopnotmode
 
 %D We gebruiken echte small caps: 
 
@@ -84,14 +84,14 @@
 %D minder hoog. We definieren daarom een wat afwijkend
 %D papierformaat en projecteren dat op A4.
 
-\definieerpapierformaat % \definepapersize
+\definepapersize
   [maps]
   [\c!breedte=21cm,
    \c!hoogte=26.4cm]
 
-\stelpapierformaatin % \setuppapersize
+\setuppapersize
   [maps]
-  [a4]
+  [A4]
 
 %D Artikelen in de \MAPS\ worden breed danwel in twee kolommen
 %D gezet. Vooralsnog beperken we de definitie van de layout tot
@@ -99,6 +99,7 @@
 
 \stellayoutin
   [\c!breedte=28pc,
+   \c!hoogte=\v!midden,
    \c!marge=9pc,
    \c!margeafstand=1pc,
    \c!rugwit=1in,
diff --git a/tex/context/base/setupb.tex b/tex/context/base/setupb.tex
index d633b4c08..53d0777cd 100644
--- a/tex/context/base/setupb.tex
+++ b/tex/context/base/setupb.tex
@@ -4595,7 +4595,7 @@
     [\c!vals!]
   \value
     [\v!blokkeer,
-     2*16,2*8,2*4,2*2,2UP,2DOWN,
+     2*16,2*8,2*4,2*2,2**2,2UP,2DOWN,
      \v!gespiegeld,\v!geroteerd,\v!dubbelzijdig,\v!negatief,90,180,270]
     []
 \stopsetup
diff --git a/tex/context/extra/setup-qr.tex b/tex/context/extra/setup-qr.tex
index 27dd501a8..31f40f6ca 100644
--- a/tex/context/extra/setup-qr.tex
+++ b/tex/context/extra/setup-qr.tex
@@ -99,11 +99,11 @@
 
 \starttekst
 
-\stelachtergrondenin
+\setupbackgrounds
   [\v!rechterpagina]
   [\c!achtergrond=cover]
 
-\startopmaak[\v!standaard]
+\startmakeup[\v!standaard]
   \definefont[test][RegularBold at 100pt]\test\setstrut
   \steluitlijnenin[\v!midden]
   \strut Con\TeX t \par
@@ -122,13 +122,13 @@
   \startinterface czech    \strut CZ \stopinterface
   \startinterface italian  \strut IT \stopinterface
   \startinterface romanian \strut RO \stopinterface
-\stopopmaak
+\stopmakeup
 
-\stelachtergrondenin
+\setupbackgrounds
   [\v!rechterpagina]
   [\c!achtergrond=]
 
-\startopmaak[\v!standaard]
+\startmakeup[\v!standaard]
   \definefont[test][RegularBold at 60pt]\test\setstrut
   \steluitlijnenin[\v!midden]
   \strut Con\TeX t \par
@@ -149,7 +149,7 @@
   \startinterface italian  \strut italiano       \par \stopinterface
   \startinterface romanian \strut rom\^{a}n\u{a} \par \stopinterface
 
-\stopopmaak
+\stopmakeup
 
 \stellayoutin
   [\c!kopwit=1.5cm]
@@ -158,20 +158,20 @@
 
 \pagina[\v!ja,\v!blanko,\v!rechts,\v!links]
 
-\stelachtergrondenin
+\setupbackgrounds
   [\v!linkerpagina]
   [\c!achtergrond=cover]
 
 \stellayoutin
   [\c!kopwit=2cm]
 
-\startopmaak[\v!standaard][\c!pagina=]
+\startmakeup[\v!standaard][\c!pagina=]
   \definefont[test][RegularBold at 24pt]\test\stelinterliniein
   \steluitlijnenin[\v!midden]
   \vfill
   PRAGMA ADE \par
   Ridderstraat 27, 8061GH Hasselt NL 
-\stopopmaak
+\stopmakeup
 
 \protect