stable 2004.06.10

1 files changed, 39 insertions, 46 deletions

diff --git a/tex/context/base/core-vis.tex b/tex/context/base/core-vis.tex
index 81299a8b7..44a3eb37a 100644
--- a/tex/context/base/core-vis.tex
+++ b/tex/context/base/core-vis.tex
@@ -61,13 +61,13 @@
    \dontcomplain
    \boxrulewidth5\testrulewidth
    #3#4\relax
-   \setbox0\normalhbox to \scratchdimen
+   \setbox\scratchbox\normalhbox to \scratchdimen
      {#2{\ruledhbox to \scratchdimen
            {\vrule #5 20\testrulewidth \!!width \zeropoint
             \normalhss}}}%
-   \smashbox0
+   \smashbox\scratchbox
    \normalpenalty\!!tenthousand
-   \box0
+   \box\scratchbox
    \egroup}
 
 \def\ruledhanging
@@ -75,7 +75,7 @@
      \ifnum\hangafter<\zerocount
        \normalhbox
          {\boxrulewidth5\testrulewidth
-          \setbox0\ruledhbox to \hangindent
+          \setbox\scratchbox\ruledhbox to \hangindent
             {\scratchdimen\strutht
              \advance\scratchdimen \strutdp
              \vrule
@@ -83,8 +83,8 @@
                \!!height \zeropoint
                \!!depth -\hangafter\scratchdimen}%
           \normalhskip-\hangindent
-          \smashbox0
-          \raise\strutht\box0}%
+          \smashbox\scratchbox
+          \raise\strutht\box\scratchbox}%
      \fi
    \fi}
 
@@ -178,11 +178,11 @@
 %D \voorbeeld \noindent
 %D \voorbeeld \leavevmode
 %D
-%D \startsmaller
+%D \startnarrower
 %D \voorbeeld \indent
 %D \voorbeeld \noindent
 %D \voorbeeld \leavevmode
-%D \stopsmaller
+%D \stopnarrower
 %D \egroup
 %D
 %D These examples also demonstrate the visualization of
@@ -214,14 +214,14 @@
            \vrule
              \!!height \testrulewidth
              \!!depth \testrulewidth
-             \!!width 120pt}
+             \!!width 120\points}
       \normalvfill}%
    \smashbox\scratchbox
    \advance\scratchdimen \strutheightfactor\baselineskip
    \setbox\scratchbox\normalhbox
-     {\normalhskip -48pt
-      \normalhbox to 24pt
-        {\normalhss\debuggertext\ruledbaselines\normalhskip6pt}%
+     {\normalhskip -48\points
+      \normalhbox to 24\points
+        {\normalhss\debuggertext\ruledbaselines\normalhskip6\points}%
       \raise\scratchdimen\box\scratchbox}%
    \smashbox\scratchbox
    \box\scratchbox
@@ -260,9 +260,9 @@
 %D
 %D This marked \type{\vbox} shows up as:
 %D
-%D \startregelcorrectie
-%D \haalbuffer
-%D \stopregelcorrectie
+%D \startlinecorrection
+%D \getbuffer
+%D \stoplinecorrection
 %D
 %D The alternative macros are used as:
 %D
@@ -274,9 +274,9 @@
 %D
 %D This is typeset as:
 %D
-%D \startregelcorrectie
-%D \haalbuffer
-%D \stopregelcorrectie
+%D \startlinecorrection
+%D \getbuffer
+%D \stoplinecorrection
 %D
 %D By setting the next macros one can influence the length of
 %D the marks as well as the horizontal and vertical divisions.
@@ -414,7 +414,7 @@
       \boxmaxdepth\maxdimen
       \offinterlineskip
       \scratchdimen\cutmarklength
-      \divide\scratchdimen 2
+      \divide\scratchdimen \plustwo
       \hsize\ruledwidth
       \setbox\scratchbox\normalvbox
         {\setbox\scratchbox\normalhbox{\horizontalcuts}%
@@ -479,9 +479,9 @@
 %D This macro is used in the pagebody routine. No other use
 %D is advocated here.
 %D
-%D \starttypen
+%D \starttyping
 %D \colormarkbox0
-%D \stoptypen
+%D \stoptyping
 
 \def\colormarkoffset{\cutmarkoffset}
 \def\colormarklength{\cutmarklength}
@@ -514,7 +514,7 @@
                 {\vss
                  \hbox to 3em
                    {\hss
-                    \localstartcolor[white]%
+                    \localstartcolor[\s!white]%
                     \ifdim##1\points=\zeropoint#1\else##1\fi
                     \localstopcolor
                     \hss}%
@@ -526,7 +526,7 @@
 \def\colorrangeB
   {\hbox
      {\scratchdimen-\colormarklength
-      \multiply\scratchdimen 2
+      \multiply\scratchdimen \plustwo
       \advance\scratchdimen \ruledwidth
       \divide\scratchdimen 11
       \def\docommando ##1 ##2 ##3##4##5##6%
@@ -548,7 +548,7 @@
              {\vss
               \hbox to \scratchdimen
                 {\hss
-                 \localstartcolor[white]%
+                 \localstartcolor[\s!white]%
                  \ifdim##2\points=.5\points##2~\fi##1%
                  \localstopcolor
                  \hss}
@@ -585,14 +585,12 @@
            \hskip-\scratchdimen
            \vbox to \colormarklength
              {\vss
-              \localstartcolor[white]%
+              \localstartcolor[\s!white]%
               \hbox to \scratchdimen{\hss##1\hss}
               \localstopcolor
              \vss}%
          \fi}%
-      \processcommalist
-        [1.00,0.95,0.90,0.85,0.80,0.75,0.70,%
-         0.60,0.50,0.40,0.30,0.20,0.10,0.00]\docommando}}
+      \processcommalist[1,.95,.9,.85,.8,.75,.7,.6,.5,.4,.3,.2,.1,0]\docommando}}
 
 \def\docolormarkbox#1#2%
   {\edef\ruledheight{\the\ht#2}%
@@ -600,7 +598,7 @@
    \edef\ruledwidth {\the\wd#2}%
    \setbox#2\hbox
      {\scratchdimen\colormarklength
-      \divide\scratchdimen 2
+      \divide\scratchdimen \plustwo
       \forgetall
       \ssxx
       \setbox\scratchbox\vbox
@@ -660,10 +658,10 @@
 %D especially \type {\write} is often used in conjunction with
 %D \type {\edef}, we can only savely support that one in \ETEX.
 %D
-%D \bgroup \showwhatsits \stelkleurenin[status=start]
+%D \bgroup \showwhatsits \setupcolors[state=start]
 %D
 %D Whatsits show up \color[blue]{in color} and are
-%D characterized bij their first character.\voetnoot [some note]
+%D characterized bij their first character.\footnote [some note]
 %D {So we may encounter \type {w}, \type {m} and \type{s}.}
 %D They are \writestatus{dummy}{demo}\color[yellow]{stacked}.
 %D
@@ -673,7 +671,7 @@
 
 \ifx\eTeXversion\undefined
 
-  \let\showwhatsits\relax
+  \let\showwhatsits    \relax
   \let\dontshowwhatsits\relax
 
 \else
@@ -722,13 +720,8 @@
         \vrule\!!width\wd\scratchbox\dostopcolormode
         \hskip-\wd\scratchbox\box\scratchbox}%
      \scratchdimen1ex
-     \ifdone
-       \setbox\scratchbox\hbox
-         {\hskip#4\scratchdimen\box\scratchbox}%
-     \else
-       \setbox\scratchbox\hbox
-         {\raise#4\scratchdimen\box\scratchbox}%
-     \fi
+     \setbox\scratchbox\hbox
+       {\ifdone\hskip\else\raise#4\fi\scratchdimen\box\scratchbox}%
      \smashbox\scratchbox
      \ifdone\nointerlineskip\fi
      \box\scratchbox
@@ -753,7 +746,7 @@
            \ifhmode
              \edef\popwhatsit{\kern\the\lastkern}\unkern
            \else
-             \edef\popwhatsit{\kern\the\lastkern\prevdepth\the\prevdepth}
+             \edef\popwhatsit{\kern\the\lastkern\prevdepth\the\prevdepth}%
              \kern-\lastkern
            \fi
          \fi
@@ -770,7 +763,7 @@
        \ifhmode
          \edef\popwhatsit{\hskip\the\lastskip}\unskip
        \else
-         \edef\popwhatsit{\vskip\the\lastskip\prevdepth\the\prevdepth}
+         \edef\popwhatsit{\vskip\the\lastskip\prevdepth\the\prevdepth}%
          \vskip-\lastskip
        \fi
      \fi}
@@ -809,7 +802,7 @@
           \startoverlay
             {\copy\scratchbox}
             {\dodotagbox{#1}\scratchbox{\framed
-               [\c!achtergrond=\v!raster,\c!achtergrondraster=1]{#2}}}
+               [\c!background=\v!screen,\c!backgroundscreen=1]{#2}}}
           \stopoverlay
         \egroup
       \nextboxwd\the\wd\scratchbox
@@ -834,9 +827,9 @@
 
 \def\coloredbox#1%
   {\dowithnextbox{#1{\hbox
-     {\blackrule[\c!breedte=\nextboxwd,\c!hoogte=\nextboxht,\c!diepte=\zeropoint,\c!kleur=boxcolor:ht]%
+     {\blackrule[\c!width=\nextboxwd,\c!height=\nextboxht,\c!depth=\zeropoint,\c!color=boxcolor:ht]%
       \hskip-\nextboxwd
-      \blackrule[\c!breedte=\nextboxwd,\c!hoogte=\zeropoint,\c!diepte=\nextboxdp,\c!kleur=boxcolor:dp]%
+      \blackrule[\c!width=\nextboxwd,\c!height=\zeropoint,\c!depth=\nextboxdp,\c!color=boxcolor:dp]%
       \hskip-\nextboxwd
       \box\nextbox}}}#1}
 
@@ -845,6 +838,6 @@
 \def\coloredvtop{\coloredbox\vtop}
 
 \def\coloredstrut
-  {\color[strutcolor]{\def\strutwidth{2pt}\setstrut\strut}}
+  {\color[strutcolor]{\def\strutwidth{2\points}\setstrut\strut}}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput