stable 2003.04.29

16 files changed, 114 insertions, 41 deletions

diff --git a/context/data/cont-cz.tws b/context/data/cont-cz.tws
index 25a7b3bd6..065266a61 100644
--- a/context/data/cont-cz.tws
+++ b/context/data/cont-cz.tws
@@ -2342,6 +2342,9 @@ val:*sekce::
 var:pismeno:normalni,tucne,sklonene,tucnesklonene,opis,kap,male...,*prikaz::
 var:styltextu:normalni,tucne,sklonene,tucnesklonene,opis,kap,male...,*prikaz::
 var:stylcisla:normalni,tucne,sklonene,tucnesklonene,opis,kap,male...,*prikaz::
+var:barva:*jmeno::
+var:barvatextu:*jmeno::
+var:barvacisla:*jmeno::
 var:cislo:ano,ne::
 var:vlastnicislo:ano,ne::
 var:stranka:vlevo,vpravo,ano::
diff --git a/context/data/cont-de.tws b/context/data/cont-de.tws
index 82a2fdef7..8070dc8b5 100644
--- a/context/data/cont-de.tws
+++ b/context/data/cont-de.tws
@@ -2342,6 +2342,9 @@ val:*Abschnitt::
 var:stil:normal,fett,geneigt,fettgeneigt,tippen,kap,klein...,*Befehl::
 var:textstil:normal,fett,geneigt,fettgeneigt,tippen,kap,klein...,*Befehl::
 var:nummernstil:normal,fett,geneigt,fettgeneigt,tippen,kap,klein...,*Befehl::
+var:farbe:*Name::
+var:textfarbe:*Name::
+var:nummernfarbe:*Name::
 var:nummer:ja,nein::
 var:eigenenummer:ja,nein::
 var:seite:links,rechts,ja::
diff --git a/context/data/cont-en.tws b/context/data/cont-en.tws
index 9d52f404b..c79b870d0 100644
--- a/context/data/cont-en.tws
+++ b/context/data/cont-en.tws
@@ -2342,6 +2342,9 @@ val:*section::
 var:style:normal,bold,slanted,boldslanted,type,cap,small...,*command::
 var:textstyle:normal,bold,slanted,boldslanted,type,cap,small...,*command::
 var:numberstyle:normal,bold,slanted,boldslanted,type,cap,small...,*command::
+var:color:*name::
+var:textcolor:*name::
+var:numbercolor:*name::
 var:number:yes,no::
 var:ownnumber:yes,no::
 var:page:left,right,yes::
diff --git a/context/data/cont-it.tws b/context/data/cont-it.tws
index 82557b66d..8ac988b91 100644
--- a/context/data/cont-it.tws
+++ b/context/data/cont-it.tws
@@ -2342,6 +2342,9 @@ val:*sezione::
 var:stile:normale,grassetto,inclinato,grassettoinclinato,type,cap,piccolo...,*comando::
 var:stiletesto:normale,grassetto,inclinato,grassettoinclinato,type,cap,piccolo...,*comando::
 var:stilenumero:normale,grassetto,inclinato,grassettoinclinato,type,cap,piccolo...,*comando::
+var:colore:*nome::
+var:coloretesto:*nome::
+var:colorenumero:*nome::
 var:numero:si,no::
 var:numeroproprio:si,no::
 var:pagina:sinistra,destra,si::
diff --git a/context/data/cont-nl.tws b/context/data/cont-nl.tws
index 1c1235847..199311e96 100644
--- a/context/data/cont-nl.tws
+++ b/context/data/cont-nl.tws
@@ -2342,6 +2342,9 @@ val:*sectie::
 var:letter:normaal,vet,schuin,vetschuin,type,kap,klein...,*commando::
 var:tekstletter:normaal,vet,schuin,vetschuin,type,kap,klein...,*commando::
 var:nummerletter:normaal,vet,schuin,vetschuin,type,kap,klein...,*commando::
+var:kleur:*naam::
+var:tekstkleur:*naam::
+var:nummerkleur:*naam::
 var:nummer:ja,nee::
 var:eigennummer:ja,nee::
 var:pagina:links,rechts,ja::
diff --git a/context/data/cont-ro.tws b/context/data/cont-ro.tws
index 888640a17..1e0fb8dd7 100644
--- a/context/data/cont-ro.tws
+++ b/context/data/cont-ro.tws
@@ -2342,6 +2342,9 @@ val:*sectiune::
 var:stil:normal,aldin,inclinat,aldininclinat,type,cap,mic...,*comanda::
 var:stiltext:normal,aldin,inclinat,aldininclinat,type,cap,mic...,*comanda::
 var:stilnumar:normal,aldin,inclinat,aldininclinat,type,cap,mic...,*comanda::
+var:culoare:*nume::
+var:culoaretext:*nume::
+var:culoarenumar:*nume::
 var:numar:da,nu::
 var:numarpropriu:da,nu::
 var:pagina:stanga,dreapta,da::
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index 627a4f6d3..540bb32de 100644
--- a/tex/context/base/cont-new.tex
+++ b/tex/context/base/cont-new.tex
@@ -21,8 +21,45 @@
 
 \writestatus{\m!systems}{beware: some patches loaded from cont-new.tex!}
 
+\long\def\preservePSpar#1\to#2%
+  {\bgroup
+   \def\par{\rawcharacter{12}\rawcharacter{12}}%
+   \expanded{\egroup\noexpand\def\noexpand#2{#1}}}
+
 \appendtoks\optimizeverbatimfalse\to\everytabulate
 
+\def\processlinetableXMLfile#1%
+  {\bgroup 
+   \let\startlinetable\donothing
+   \let\stoplinetable \donothing
+   \startlinetableanalysis\processXMLfile{#1}\stoplinetableanalysis
+   \startlinetablerun     \processXMLfile{#1}\stoplinetablerun
+   \egroup}
+
+\def\startlinetablepart
+  {\global\linetablesubcol\zerocount
+   \setbox\scratchbox\hbox\bgroup
+   \doconvertfont{\linetablerparameter\c!letter}%
+   \startcolor[\linetablerparameter\c!kleur]%
+   \ignorespaces}
+
+\def\stoplinetablepart
+  {\ifnum\linetablepart>\zerocount 
+     \unskip \unskip % remove last intercolumn skip (distance+fill)
+   \fi
+   \stopcolor
+   \egroup
+   \iflinetablepreroll \else
+     \ifcase\linetablepart
+       % we're collecting the repeater 
+     \else
+       \scratchdimen\hsize \advance\scratchdimen-\wd\scratchbox\relax
+       \ifdim\scratchdimen>\linetableparameter\c!rek\else
+         \setbox\scratchbox\hbox to \hsize{\unhbox\scratchbox}%
+       \fi 
+     \fi
+   \fi}
+
 \def\centertogrid % meant for special situations 
   {\ifgridsnapping
      \dowithnextboxcontent
diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index a168370ae..d4bdaa905 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -15,7 +15,7 @@
 
 \catcode`\{=1 \catcode`\}=2 
 
-\def\contextversion{2003.4.22}
+\def\contextversion{2003.4.29}
 
 %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-fld.tex b/tex/context/base/core-fld.tex
index 9bdc263a1..d27ad4e47 100644
--- a/tex/context/base/core-fld.tex
+++ b/tex/context/base/core-fld.tex
@@ -642,7 +642,7 @@
      \egroup
    \fi}
 
-\def\typesetfield%
+\def\typesetfield
   {\useJSscripts[fld]%
    \ifx\@@FieldRoot\empty \else
      \let\@@SavedFieldName\@@FieldName
@@ -747,6 +747,9 @@
 \newif\ifVerticalField
 \newif\ifHorizontalField
 
+% way to slow/complicated, we need some simple alternative 
+% as well 
+
 \def\dohandlefield[#1][#2][#3][#4][#5]%
   {\presetlocalframed[\??fd]%
    \processallactionsinset
diff --git a/tex/context/base/core-ltb.tex b/tex/context/base/core-ltb.tex
index bdb81d4f5..1e5353669 100644
--- a/tex/context/base/core-ltb.tex
+++ b/tex/context/base/core-ltb.tex
@@ -332,7 +332,7 @@
      \ifcase\linetablepart
        % we're collecting the repeater 
      \else
-       \scratchdimen\hsize \advance\scratchdimen-\wd\scratchbox
+       \scratchdimen\hsize \advance\scratchdimen-\wd\scratchbox\relax
        \ifdim\scratchdimen>\linetableparameter\c!rek\else
          \setbox\scratchbox\hbox to \hsize{\unhbox\scratchbox}%
        \fi 
@@ -446,8 +446,8 @@
      {\setuplinetable[\c!maxbreedte=\zeropoint]}%
    \processaction
      [\linetableparameter\c!rek]
-     [\v!nee=>{\setuplinetable[\c!rek=\maxdimen]}% no stretch
-       \v!ja=>{\setuplinetable[\c!rek=\zerocount]}]% max stretch 
+     [\v!nee=>{\setuplinetable[\c!rek=\maxdimen]},% no stretch
+       \v!ja=>{\setuplinetable[\c!rek=\zeropoint]}]% max stretch 
    \chardef\linetablerepeat\linetableparameter\c!nlinks
    \chardef\linetablesplitstatus % = 
      \ifdim\linetableparameter\c!maxbreedte>\zeropoint
@@ -503,31 +503,31 @@
    \globallet\noflinetableparts\!!zerocount
    \egroup}
 
-\def\checklinecolumnwidth
-  {\ifundefined{\??lew\number\linetablecolumn}%
-     \donetrue
-   \else\ifdim\getvalue{\??lew\number\linetablecolumn}<\wd\linetablecell
-     \donetrue
-   \else
-     \donefalse
-   \fi\fi
-   \ifdone
-     \setxvalue{\??lew\number\linetablecolumn}{\the\wd\linetablecell}%
-   \fi}
-
-\def\checklinecolumnwidth
-  {\ifcsname\??lew\number\linetablecolumn\endcsname
-     \ifdim\csname\??lew\number\linetablecolumn\endcsname<\wd\linetablecell
-       \donetrue
-     \else
-       \donefalse
-     \fi
-   \else
-     \donetrue
-   \fi
-   \ifdone
-     \setxvalue{\??lew\number\linetablecolumn}{\the\wd\linetablecell}%
-   \fi}
+% \def\checklinecolumnwidth
+%   {\ifundefined{\??lew\number\linetablecolumn}%
+%      \donetrue
+%    \else\ifdim\getvalue{\??lew\number\linetablecolumn}<\wd\linetablecell
+%      \donetrue
+%    \else
+%      \donefalse
+%    \fi\fi
+%    \ifdone
+%      \setxvalue{\??lew\number\linetablecolumn}{\the\wd\linetablecell}%
+%    \fi}
+%
+% \def\checklinecolumnwidth
+%   {\ifcsname\??lew\number\linetablecolumn\endcsname
+%      \ifdim\csname\??lew\number\linetablecolumn\endcsname<\wd\linetablecell
+%        \donetrue
+%      \else
+%        \donefalse
+%      \fi
+%    \else
+%      \donetrue
+%    \fi
+%    \ifdone
+%      \setxvalue{\??lew\number\linetablecolumn}{\the\wd\linetablecell}%
+%    \fi}
 
 \def\checklinecolumnwidth
   {\expandafter\xdef\csname\??lew\number\linetablecolumn\endcsname
@@ -661,6 +661,8 @@
       \setevalue{\??lec\recurselevel\c!breedte}{\getvalue{\??lew\recurselevel}}%
       \letgvalue{\??lew\recurselevel}\!!zeropoint}} % init next table 
 
+% todo: store in box instead of macro 
+
 \newtoks \@@linetablehead
 
 \long\def\startlinetablehead#1\stoplinetablehead
diff --git a/tex/context/base/core-mat.tex b/tex/context/base/core-mat.tex
index 5ecf38206..a75b56a96 100644
--- a/tex/context/base/core-mat.tex
+++ b/tex/context/base/core-mat.tex
@@ -166,7 +166,7 @@
 \setvalue{\e!start\v!formule}{\dostartformula{}}
 \setvalue{\e!stop \v!formule}{\dostopformula}
 
-\def\definieerformule%
+\def\definieerformule
   {\dodoubleempty\dodefinieerformule}
 
 \def\dodefinieerformule[#1][#2]%
diff --git a/tex/context/base/core-sec.tex b/tex/context/base/core-sec.tex
index 8c479714e..982179bf9 100644
--- a/tex/context/base/core-sec.tex
+++ b/tex/context/base/core-sec.tex
@@ -1925,8 +1925,8 @@
                \c!nummer,\c!eigennummer,\c!plaatskop,\c!verhoognummer,
                \c!letter,\c!kleur,\c!afstand,\c!variant,\c!springvolgendein,
                % new per 20/03/3002 (o-pbu-l) / was too confusing 
-               \c!nummerletter,\c!tekstletter,\c!expansie, 
-               %
+               % \c!nummerletter,\c!tekstletter,\c!expansie, 
+               % again too confusing 
                \c!uitlijnen,\c!titeluitlijnen,\c!tolerantie,\c!grid,
                \c!nummercommando,\c!tekstcommando,\c!margetekst]}}%
       \getparameters[\??ko#1][#2]%
@@ -1951,8 +1951,8 @@
             \c!nummer,\c!eigennummer,\c!plaatskop,\c!verhoognummer,
             \c!letter,\c!kleur,\c!afstand,\c!variant,\c!springvolgendein,
             % new per 20/03/3002 (o-pbu-l) / was too confusing 
-            \c!nummerletter,\c!tekstletter,\c!expansie, 
-            %
+            % \c!nummerletter,\c!tekstletter,\c!expansie, 
+            % again too confusing 
             \c!uitlijnen,\c!titeluitlijnen,\c!tolerantie,\c!grid,
             \c!nummercommando,\c!tekstcommando,\c!margetekst]%
 \getparameters[\??ko#1][\c!expansie=]% iig een value, rather fuzzy
diff --git a/tex/context/base/page-set.tex b/tex/context/base/page-set.tex
index c712d51af..90a455e8b 100644
--- a/tex/context/base/page-set.tex
+++ b/tex/context/base/page-set.tex
@@ -1466,7 +1466,7 @@
    \splitstring#1\at*\to\column\and\row
    \bgroup
      \ifx\column\empty\else\expanded{\doOTRSETgotoCOLUMN{\column}}\fi
-   \egroup
+   \egroup                           
    \bgroup
      \ifx\row   \empty\else\expanded{\doOTRSETgotoROW   {\row   }}\fi
    \egroup
@@ -1545,10 +1545,10 @@
 %    \fi
 %    \OTRSETsetvsize}
 
-\def\OTRSETgotocell#1#2%
+\def\OTRSETgotocell#1#2% obsolete: now \column[#1*#2]
   {\endgraf
-   \doOTRSETgotocolumnCOLUMN{#1}%
-   \doOTRSETgotocolumnROW   {#2}}
+   \doOTRSETgotoCOLUMN{#1}%
+   \doOTRSETgotoROW   {#2}}
 
 \def\OTRSETdummycolumn
   {\verticalstrut
diff --git a/tex/context/base/setupb.tex b/tex/context/base/setupb.tex
index 8ebbfccb4..4f528a13a 100644
--- a/tex/context/base/setupb.tex
+++ b/tex/context/base/setupb.tex
@@ -4989,6 +4989,18 @@
     [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
     []
   \variable
+    [\c!kleur]
+    [\c!identifier!]
+    []
+  \variable
+    [\c!tekstkleur]
+    [\c!identifier!]
+    []
+  \variable
+    [\c!nummerkleur]
+    [\c!identifier!]
+    []
+  \variable
     [\c!nummer]
     [\v!ja,\v!nee]
     [\v!ja]
diff --git a/tex/context/base/spec-dvi.tex b/tex/context/base/spec-dvi.tex
index 2748fa512..78fb734f4 100644
--- a/tex/context/base/spec-dvi.tex
+++ b/tex/context/base/spec-dvi.tex
@@ -113,7 +113,7 @@
 \definespecial\dosetpositionpapersize#1#2%
   {\xdef\flushDVIpositionpapersize%
      {\special{pos:papersize #1 #2}%
-      \noexpand\installprogram{dvipos \jobname}%
+      \noexpand\installprogram{dvipos --outfile=\jobname.tuo}%
       \global\noexpand\let\noexpand\flushDVIpositionpapersize\relax}}
 
 \prependtoksonce \flushDVIpositionpapersize \to \everyshipout
diff --git a/tex/context/base/xtag-ini.tex b/tex/context/base/xtag-ini.tex
index 2e258de99..4c5d5d2e0 100644
--- a/tex/context/base/xtag-ini.tex
+++ b/tex/context/base/xtag-ini.tex
@@ -245,7 +245,8 @@
    .catcode`./=.@@other  
    .catcode`.'=.@@other
    .catcode`.~=.@@other  
-   .catcode`.#=.@@active 
+*  .catcode`.#=.@@active .def#B&hash;E*
+   .catcode`.#=.@@other 
    .ifcase.XMLtokensreduction
      .entitleXMLescapetokens
    .or