stable 2004.06.10

1 files changed, 26 insertions, 26 deletions

diff --git a/tex/context/base/m-cweb.tex b/tex/context/base/m-cweb.tex
index 57b1ab8b9..65184ddae 100644
--- a/tex/context/base/m-cweb.tex
+++ b/tex/context/base/m-cweb.tex
@@ -71,10 +71,10 @@
 %D Instead of using \type{\def} and \type{\let} for defining
 %D macros, we use:
 %D
-%D \starttypen
+%D \starttyping
 %D \defCEBmacro arguments {meaning}
 %D \letCEBmacro arguments {meaning}
-%D \stoptypen
+%D \stoptyping
 %D
 %D \CWEB files contain implicit calls to macros that generate
 %D the table of contents, the lists of sections and the index.
@@ -83,9 +83,9 @@
 %D ones. The next macro is used for defining these obsolete
 %D \CWEB\ macros. The dummies take care of arguments.
 %D
-%D \starttypen
+%D \starttyping
 %D \defCEBdummy arguments {meaning}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The list of \CWEB\ specific macro names is saved in a
 %D \TOKENLIST. This serves two purposes. First it enables us to
@@ -98,10 +98,10 @@
 
 %D Activating and deactivating is done by means of:
 %D
-%D \starttypen
+%D \starttyping
 %D \activateCWEB
 %D \deactivateCWEB
-%D \stoptypen
+%D \stoptyping
 %D
 %D Which are implemented as:
 
@@ -300,7 +300,7 @@
 %D \CWEBquote at sign for control text (not needed in versions
 %D $>=$ 2.9).
 
-\defCWEBmacro\AT{@} 
+\defCWEBmacro\AT{@}
 
 %D \macros{ATL,postATL,NOATL}{}
 %D
@@ -638,10 +638,10 @@
 
 \unprotect
 
-\def\theCWEByskip {\blanko[\v!klein]}
-\def\theCWEBvskip {\blanko[\v!groot]}
+\def\theCWEByskip {\blank[\v!small]}
+\def\theCWEBvskip {\blank[\v!big]}
 
-\protect 
+\protect
 
 \defCWEBmacro\Y%
   {\par
@@ -1043,7 +1043,7 @@
       \def\[####1]{####1}%
       \xdef\CWEBreference{##1}%
       \egroup
-      \CWEBcomma{\localcolortrue\naar{\donottest{##1}}[web:\CWEBreference]}}%
+      \CWEBcomma{\localcolortrue\goto{\donottest{##1}}[web:\CWEBreference]}}%
    \processlist{(}{)}{,}\docommando(#1)
    \egroup}
 
@@ -1056,13 +1056,13 @@
      \def\next##1\ET##2##3.%
        {\processCWEBsectionnumbers[##1]%
         \if##2s%
-          {, and~\naar{##3}[web:##3]}%
+          {, and~\goto{##3}[web:##3]}%
         \else
-          { and~\naar{##2##3}[web:##2##3]}%
+          { and~\goto{##2##3}[web:##2##3]}%
         \fi}%
       \next#1.%
    \else
-     \naar{#1}[web:#1]%
+     \goto{#1}[web:#1]%
    \fi
    \afterCWEBnote % inside group!
    \egroup}
@@ -1101,10 +1101,10 @@
 \defCWEBmacro\X#1:#2\X%
   {\newCWEBmacroX#1:#2\X}
 
-\definieermarkering[CWEBfilename]
-\definieermarkering[CWEBsectiontitle]
-\definieermarkering[CWEBsectionnumber]
-\definieermarkering[CWEBsectiondepth]
+\definemarking[CWEBfilename]
+\definemarking[CWEBsectiontitle]
+\definemarking[CWEBsectionnumber]
+\definemarking[CWEBsectiondepth]
 
 \defCWEBmacro\M#1%
   {\MN{#1}%
@@ -1167,21 +1167,21 @@
   {\linktoCWEBfiletrue
    \def\otherCWEBfile{#1}}
 
-\unprotect 
+\unprotect
 
 \def\gotoCWEBsection#1[#2]%
   {\iflinktoCWEBfile
      \bgroup
-       \setupinteraction[\c!kleur=,\c!letter=]%
+       \setupinteraction[\c!color=,\c!style=]%
        \let\savedreferenceprefix=\referenceprefix
        \localcolortrue
-       \naar{#1}[\otherCWEBfile::\savedreferenceprefix web:#2]%
+       \goto{#1}[\otherCWEBfile::\savedreferenceprefix web:#2]%
      \egroup
    \else
      #1%
    \fi}
 
-\protect 
+\protect
 
 \defCWEBmacro\startsection%
   {\rightskip=0pt % get out of C mode (cf. \B)
@@ -1259,8 +1259,8 @@
          \showCWEBindexentry{\currentCWEBindexentry}}}%
    \egroup}
 
-\def\theCWEBbeforeindex {\startkolommen}
-\def\theCWEBafterindex  {\stopkolommen}
+\def\theCWEBbeforeindex {\startcolumns}
+\def\theCWEBafterindex  {\stopcolumns}
 
 \def\processCWEBindex #1 %
   {\bgroup
@@ -1355,11 +1355,11 @@
    \line{\consetup{#2}#1
    \rm
    \leaders\hbox to .5em{.\hfil}\hfil\
-   {\localcolortrue\naar{#3}[web:#3]}%  below: \gotorealpage ? should be changed
+   {\localcolortrue\goto{#3}[web:#3]}%  below: \gotorealpage ? should be changed
    \hbox to3em{\localcolortrue\hss\gotorealpage{}{}{#5}{\translatednumber[#4]\presetgoto}}}}
 
 %D A last hack, needed because a file can overload of the
-%D above. (Some day: a check like \ifx#1\CWEBdefined.)
+%D above. (Some day: a check like \type{\ifx#1\CWEBdefined}.)
 
 \def\outer#1#2%
   {\ifx#2\undefined