stable 2004.08.30

1 files changed, 30 insertions, 17 deletions

diff --git a/tex/context/base/colo-run.tex b/tex/context/base/colo-run.tex
index 8cd9f62dd..386b67108 100644
--- a/tex/context/base/colo-run.tex
+++ b/tex/context/base/colo-run.tex
@@ -1,3 +1,16 @@
+%D \module
+%D   [       filefile=colo-run,
+%D        version=1997.04.01,
+%D          title=\CONTEXT\ Color Macros,
+%D       subtitle=Runtime loaded commands,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
 \unprotect
 
 \gdef\showpalet
@@ -5,7 +18,7 @@
 
 \gdef\doshowpalet[#1][#2]%
   {\doifdefined{\??pa#1}
-     {\doifinsetelse\v!vertikaal{#2}
+     {\doifinsetelse\v!vertical{#2}
         {\showverticalpalet[#1][#2]}
         {\showhorizontalpalet[#1][#2]}}}
 
@@ -17,12 +30,12 @@
         {\vrule\!!width3em\!!height\strutht\!!depth\strutdp}
       \tabskip\zeropoint
       \def\doshowpalet##1%
-        {\doifinsetelse\v!nummer{#2}{##1\hskip.5em}{}&
+        {\doifinsetelse\v!number{#2}{##1\hskip.5em}{}&
          \color[##1]{\rule}\graycolor[##1]{\rule}&
-         \doifinset\v!waarde{#2}{\hskip.5em\colorvalue{##1}}\crcr}
+         \doifinset\v!value{#2}{\hskip.5em\colorvalue{##1}}\crcr}
       \halign
         {\hss##&\hss##\hss&##\cr
-         &\doifinset{\v!naam}{#2}{\strut#1}&\cr%
+         &\doifinset{\v!name}{#2}{\strut#1}&\cr%
          \processpalet[#1]\doshowpalet\crcr}}}
 
 \gdef\showhorizontalpalet[#1][#2]%
@@ -31,7 +44,7 @@
       \setuppalet[#1]
       \tabskip\zeropoint
       \!!widtha\zeropoint
-      \doifinset\v!nummer{#2}
+      \doifinset\v!number{#2}
         {\def\doshowpalet##1%
            {\setbox0\hbox{##1}%
             \ifdim\!!widtha<\wd0\!!widtha\wd0\fi}%
@@ -42,17 +55,17 @@
       \fi
       \halign
         {##&&\hbox to \!!widtha{\hss##\hss}\cr
-         \doifinset\v!nummer{#2}
+         \doifinset\v!number{#2}
            {\def\doshowpalet##1{&\strut##1}%
             \processpalet[#1]\doshowpalet}\cr
-         \doifinset\v!naam{#2}{#1\hskip.5em}%
+         \doifinset\v!name{#2}{#1\hskip.5em}%
          \def\doshowpalet##1%
            {&\color[##1]{\vrule\!!width\!!widtha\!!height\strutht\!!depth\zeropoint}}%
          \processpalet[#1]\doshowpalet\crcr
          \def\doshowpalet##1%
            {&\graycolor[##1]{\vrule\!!width\!!widtha\!!height\zeropoint\!!depth\strutdp}}%
          \processpalet[#1]\doshowpalet\crcr
-         \doifinset\v!waarde{#2}
+         \doifinset\v!value{#2}
            {\def\doshowpalet##1%
              {&\vbox
                 {\hsize\!!widtha
@@ -72,7 +85,7 @@
 
 \gdef\doshowcolorgroup[#1][#2]%
   {\doifdefined{\??cr#1:1}
-     {\doifinsetelse\v!vertikaal{#2}
+     {\doifinsetelse\v!vertical{#2}
         {\showverticalcolorgroup[#1][#2]}
         {\showhorizontalcolorgroup[#1][#2]}}}
 
@@ -87,17 +100,17 @@
       \def\dodoshowgroup##1%
         {\halign
            {\hss####\hss\cr
-            \doifinset\v!nummer{#2}{\strut##1}\cr
+            \doifinset\v!number{#2}{\strut##1}\cr
             \color[#1:##1]{\vrule\!!width4em\!!height\strutht\!!depth\zeropoint}\cr
             \graycolor[#1:##1]{\vrule\!!width4em\!!height\zeropoint\!!depth\strutdp}\cr
-            \doifinset\v!waarde{#2}{\colorvalue{#1:##1}\strut}\crcr}}
+            \doifinset\v!value{#2}{\colorvalue{#1:##1}\strut}\crcr}}
       \def\doshowgroup##1%
         {\doifdefined{\??cr#1:##1}
            {\vbox{\dodoshowgroup{##1}}}}
       \hbox
-        {\doifinset\v!naam{#2}
+        {\doifinset\v!name{#2}
            {\strut
-            \doifinsetelse\v!waarde{#2}
+            \doifinsetelse\v!value{#2}
               {\raise3\lineheight\hbox{#1\hskip.5em}}
               {#1}%
             \hskip.5em}%
@@ -113,12 +126,12 @@
         {\vrule\!!width2.5em\!!height\strutht\!!depth\strutdp}
       \def\doshowgroup##1%
         {\doifdefined{\??cr#1:##1}
-           {\doifinset\v!nummer{#2}{##1\hskip.5em}&
+           {\doifinset\v!number{#2}{##1\hskip.5em}&
             \color[#1:##1]{\rule}\graycolor[#1:##1]{\rule}&
-            \doifinset\v!waarde{#2}{\hskip.5em\colorvalue{#1:##1}}\crcr}}
+            \doifinset\v!value{#2}{\hskip.5em\colorvalue{#1:##1}}\crcr}}
       \halign
         {\hss##&\hss##\hss&##\hss\cr
-         &\doifinset\v!naam{#2}{\strut#1}&\crcr
+         &\doifinset\v!name{#2}{\strut#1}&\crcr
          \doshowgroup1\doshowgroup2\doshowgroup3\doshowgroup4%
          \doshowgroup5\doshowgroup6\doshowgroup7\doshowgroup8}}}
 
@@ -132,7 +145,7 @@
        \let\colorstyle\empty
        \setupcolor[#1]%
      \fi
-     \setupwhitespace[\v!geen]
+     \setupwhitespace[\v!none]
      \def\rule
        {\vrule\!!width4em\!!height\strutht\!!depth\strutdp}
      \def\docommand##1%