stable 2003.03.09

1 files changed, 110 insertions, 28 deletions

diff --git a/tex/context/base/page-flt.tex b/tex/context/base/page-flt.tex
index 289eaf13b..2178d4b26 100644
--- a/tex/context/base/page-flt.tex
+++ b/tex/context/base/page-flt.tex
@@ -272,11 +272,13 @@
        [\getvalue{\??fl#1\c!zijuitlijnen}]
        [\v!hoogte=>\global\chardef\sidefloatalign\plusone,%
          \v!regel=>\global\chardef\sidefloatalign\plustwo,% (***)
-        \v!diepte=>\global\chardef\sidefloatalign\plusthree]%
+        \v!diepte=>\global\chardef\sidefloatalign\plusthree,%
+          \v!grid=>\global\chardef\sidefloatalign4]%
      \ifcase\sidefloatalign\relax
        \doifinset\v!hoogte{#2}{\global\chardef\sidefloatalign\plusone}%
        \doifinset\v!regel {#2}{\global\chardef\sidefloatalign\plustwo}%
        \doifinset\v!diepte{#2}{\global\chardef\sidefloatalign\plusthree}%
+       \doifinset\v!grid  {#2}{\global\chardef\sidefloatalign4}%
      \fi
      \doifinset\v!hoog{#2}{\global\sidefloattopskip   \zeropoint}%
      \doifinset\v!laag{#2}{\global\sidefloatbottomskip\zeropoint}%
@@ -302,6 +304,7 @@
      \global\nofloatcaptiontrue
    \fi \fi}
 
+
 % documenteren in details 
 
 \def\presetmorefloatvariables#1%
@@ -563,6 +566,7 @@
       \c!wijze=\@@kjwijze,
       \c!blokwijze=\@@kjblokwijze,
       \c!sectienummer=\@@kjsectienummer,
+      \c!afstand=\@@kjafstand,
       \c!scheider=\@@kjscheider,
       \c!conversie=\@@kjconversie]%
    \definieernummer % \doorlabelen
@@ -620,7 +624,7 @@
       \c!breedte,\c!kopletter,\c!kopkleur,\c!letter,\c!kleur,
       \c!tekstletter,\c!tekstkleur,
       \c!uitlijnen,\c!nummer,\c!wijze,\c!blokwijze,
-      \c!sectienummer,\c!scheider,\c!conversie]%
+      \c!sectienummer,\c!scheider,\c!afstand,\c!conversie]%
    \definieernummer[#1][#3]%
    \presetlabeltext[#1=\labeltext{#3}]%
    \dodefinefloatcommands[#1][#2]}
@@ -1141,7 +1145,7 @@
           {\doattributes{\??kj#1}\c!kopletter\c!kopkleur
              {\labeltexts{#1}{\preparednumber}}%
            \doattributes{\??kj#1}\c!tekstletter\c!tekstkleur
-             {\tfskip#3}}}%
+             {\dotfskip\@@kjkjafstand#3}}}%
     \fi}
 
 \def\placefloatcaptiontext     [#1]{\getvalue{@fl@t@#1}}
@@ -1173,7 +1177,8 @@
        \hbox{\doattributes{\??kj#1}\c!kopletter\c!kopkleur{\strut#2\floatcaptionsuffix}}%
        \ifnofloatcaption \else \ifemptyfloatcaption \else
          \ifcase#4\relax
-           \tfskip\emergencystretch.5em
+           \scratchskip\@@kjkjafstand\relax
+           \dotfskip\scratchskip\emergencystretch.5\scratchskip
          \else
            \ifx\@@kjkjtussen\empty\else\unskip\@@kjkjtussen\fi
          \fi
@@ -1194,6 +1199,38 @@
 %\stelblokkopjesin[\c!uitlijnen=\v!links]
 %\stelblokkopjesin[\c!uitlijnen=\v!rechts]
 
+% \def\dosetpagfloat#1#2#3#4% \copy wegwerken
+%   {\bgroup
+% \setlocalfloathsize
+%    \forgetall
+%    \postponefootnotes
+%    \mindermeldingen
+%    \setbox\tempfloatbox\vbox{\borderedfloatbox{#4}}%
+%    \def\locatefloat{\doregelplaats\@@flflplaats}%
+%    \ifnofloatcaption
+%      \dopreparenocaption{#1}{#2}{#3}{#4}
+%      \edef\width{\the\wd\floatbox}%
+%    \else
+%      \setbox\tempcaptionbox\hbox
+%        {\footnotesenabledfalse\putcompletecaption{#4}{#2}{#3}{0}}%
+%      \doifinsetelse\@@kjkjplaats{\v!hoog,\v!midden,\v!laag}
+%        {\dopreparesidecaption{#1}{#2}{#3}{#4}}
+%        {\doifelse\@@kjkjbreedte\v!max
+%           {\dopreparestackcaptionmax{#1}{#2}{#3}{#4}}
+%           {\ifdim\wd\tempcaptionbox>\wd\tempfloatbox % wider caption
+%              \doifelse\@@kjkjbreedte\v!passend
+%                {\dopreparestackcaptionaut{#1}{#2}{#3}{#4}}
+%                {\dopreparestackcaptionwid{#1}{#2}{#3}{#4}}%
+%            \else
+%              \dopreparestackcaptionmin{#1}{#2}{#3}{#4}%
+%            \fi}}%
+%      \edef\width{\the\wd\tempfloatbox}%
+%      \buildfloatbox
+%    \fi
+%    \doglobal\addlocalbackgroundtobox\floatbox
+%    \postcenterfloatbox\width
+%    \egroup}
+
 \def\dosetpagfloat#1#2#3#4% \copy wegwerken
   {\bgroup
 \setlocalfloathsize
@@ -1205,6 +1242,7 @@
    \ifnofloatcaption
      \dopreparenocaption{#1}{#2}{#3}{#4}
      \edef\width{\the\wd\floatbox}%
+\doglobal\addlocalbackgroundtobox\floatbox
    \else
      \setbox\tempcaptionbox\hbox
        {\footnotesenabledfalse\putcompletecaption{#4}{#2}{#3}{0}}%
@@ -1220,9 +1258,11 @@
              \dopreparestackcaptionmin{#1}{#2}{#3}{#4}%
            \fi}}%
      \edef\width{\the\wd\tempfloatbox}%
-     \buildfloatbox
+\doglobal\addlocalbackgroundtobox\tempfloatbox
+\doglobal\addlocalbackgroundtobox\tempcaptionbox
+      \buildfloatbox
    \fi
-   \doglobal\addlocalbackgroundtobox\floatbox
+%   \doglobal\addlocalbackgroundtobox\floatbox
    \postcenterfloatbox\width
    \egroup}
 
@@ -1349,7 +1389,7 @@
            \v!hoog=>\locatefloat
                       {\doifelse\@@flflplaats\v!links
                          {\box\tempfloatbox
-                          \tfskip
+                          \dotfskip\@@kjkjafstand
                           \vbox to\ht\tempfloatbox{\@@kjkjtussen\box\tempcaptionbox\vfill}}
                          {\vbox to\ht\tempfloatbox{\@@kjkjtussen\box\tempcaptionbox\vfill}%
                           \tfskip
@@ -1357,20 +1397,20 @@
            \v!laag=>\locatefloat
                       {\doifelse\@@flflplaats\v!links
                          {\box\tempfloatbox
-                          \tfskip
+                          \dotfskip\@@kjkjafstand
                           \vbox to\ht\tempfloatbox
                             {\vfill\box\tempcaptionbox\@@kjkjtussen}}
                          {\vbox to\ht\tempfloatbox
                             {\vfill\box\tempcaptionbox\@@kjkjtussen}%
-                          \tfskip
+                          \dotfskip\@@kjkjafstand
                           \box\tempfloatbox}},
          \v!midden=>\locatefloat
                       {\doifelse\@@flflplaats\v!links
                          {\box\tempfloatbox
-                          \tfskip
+                          \dotfskip\@@kjkjafstand
                           \vbox to\ht\tempfloatbox{\vfill\box\tempcaptionbox\vfill}}
                          {\vbox to\ht\tempfloatbox{\vfill\box\tempcaptionbox\vfill}%
-                          \tfskip
+                          \dotfskip\@@kjkjafstand
                           \box\tempfloatbox}},
         \s!unknown=>\locatefloat{\box\tempfloatbox},
            \v!geen=>\locatefloat{\box\tempfloatbox}]}}
@@ -1459,42 +1499,82 @@
       \box\floatbox
       \ifdone\hskip\effectiverightskip\fi\hss}}
 
+% \def\dosetparfloat#1#2#3#4%
+%   {\bgroup
+%    \forgetall
+%    \postponefootnotes
+%    \mindermeldingen
+%    %\showcomposition
+%    \setbox4\vbox{\borderedfloatbox{#4}}%
+%    \ifnofloatcaption
+%      \global\setbox\floatbox\vbox{\box4}%
+%    \else
+%      \setbox2\hbox
+%        {\forgetall\putcompletecaption{#4}{#2}{#3}{0}}%
+%      \doifelse\@@kjkjbreedte\v!max
+%        {\dosetraggedvbox\@@kjkjuitlijnen
+%         \setbox2\raggedbox
+%           {\hsize\wd4\putcompletecaption{#4}{#2}{#3}{0}}}%
+%        {\doifelse\@@kjkjbreedte\v!passend
+%           {\ifdim\wd2>\wd4\relax
+%              \setbox2\vbox
+%                {\forgetall\hsize\wd4\putcompletecaption{#4}{#2}{#3}{0}}%
+%            \else
+%              \setbox2\hbox to \wd4
+%                {\hss\box2\hss}%
+%            \fi}
+%           {\dosetraggedvbox\@@kjkjuitlijnen
+%            \setbox2\raggedbox
+%              {\hsize\wd4\putcompletecaption{#4}{#2}{#3}{0}}}}%
+%      \global\setbox\floatbox\vbox
+%        {\processaction
+%           [\@@kjkjplaats]
+%           [ \v!boven=>\box2\endgraf\@@kjkjtussen\box4,
+%             \v!onder=>\box4\endgraf\@@kjkjtussen\box2,
+%              \v!geen=>\box4,
+%           \s!unknown=>\box4\endgraf\@@kjkjtussen\box2]}%
+%    \fi
+%    \doglobal\addlocalbackgroundtobox\floatbox
+%    \egroup}
+
 \def\dosetparfloat#1#2#3#4%
   {\bgroup
    \forgetall
    \postponefootnotes
    \mindermeldingen
    %\showcomposition
-   \setbox4\vbox{\borderedfloatbox{#4}}%
+   \setbox\tempfloatbox\vbox{\borderedfloatbox{#4}}%
+\doglobal\addlocalbackgroundtobox\tempfloatbox
    \ifnofloatcaption
-     \global\setbox\floatbox\vbox{\box4}%
+     \global\setbox\floatbox\vbox{\box\tempfloatbox}%
    \else
-     \setbox2\hbox
+     \setbox\tempcaptionbox\hbox
        {\forgetall\putcompletecaption{#4}{#2}{#3}{0}}%
      \doifelse\@@kjkjbreedte\v!max
        {\dosetraggedvbox\@@kjkjuitlijnen
-        \setbox2\raggedbox
-          {\hsize\wd4\putcompletecaption{#4}{#2}{#3}{0}}}%
+        \setbox\tempcaptionbox\raggedbox
+          {\hsize\wd\tempfloatbox\putcompletecaption{#4}{#2}{#3}{0}}}%
        {\doifelse\@@kjkjbreedte\v!passend
-          {\ifdim\wd2>\wd4\relax
-             \setbox2\vbox
-               {\forgetall\hsize\wd4\putcompletecaption{#4}{#2}{#3}{0}}%
+          {\ifdim\wd\tempcaptionbox>\wd\tempfloatbox\relax
+             \setbox\tempcaptionbox\vbox
+               {\forgetall\hsize\wd\tempfloatbox\putcompletecaption{#4}{#2}{#3}{0}}%
            \else
-             \setbox2\hbox to \wd4
-               {\hss\box2\hss}%
+             \setbox\tempcaptionbox\hbox to \wd\tempfloatbox
+               {\hss\box\tempcaptionbox\hss}%
            \fi}
           {\dosetraggedvbox\@@kjkjuitlijnen
-           \setbox2\raggedbox
-             {\hsize\wd4\putcompletecaption{#4}{#2}{#3}{0}}}}%
+           \setbox\tempcaptionbox\raggedbox
+             {\hsize\wd\tempfloatbox\putcompletecaption{#4}{#2}{#3}{0}}}}%
+\doglobal\addlocalbackgroundtobox\tempcaptionbox
      \global\setbox\floatbox\vbox
        {\processaction
           [\@@kjkjplaats]
-          [ \v!boven=>\box2\endgraf\@@kjkjtussen\box4,
-            \v!onder=>\box4\endgraf\@@kjkjtussen\box2,
-             \v!geen=>\box4,
-          \s!unknown=>\box4\endgraf\@@kjkjtussen\box2]}%
+          [ \v!boven=>\box\tempcaptionbox\endgraf\@@kjkjtussen\box\tempfloatbox,
+            \v!onder=>\box\tempfloatbox\endgraf\@@kjkjtussen\box\tempcaptionbox,
+             \v!geen=>\box\tempfloatbox,
+          \s!unknown=>\box\tempfloatbox\endgraf\@@kjkjtussen\box\tempcaptionbox]}%
    \fi
-   \doglobal\addlocalbackgroundtobox\floatbox
+%   \doglobal\addlocalbackgroundtobox\floatbox
    \egroup}
 
 \newif\ifparfloat
@@ -1504,6 +1584,7 @@
      \par
      \edef\@@kjkjbreedte  {\getvalue{\??kj#4\c!breedte  }}%
       \def\@@kjkjtussen   {\getvalue{\??kj#4\c!tussen   }}%  no \edef
+     \edef\@@kjkjafstand  {\getvalue{\??kj#4\c!afstand  }}%
      \edef\@@kjkjplaats   {\getvalue{\??kj#4\c!plaats   }}%
      \edef\@@kjkjuitlijnen{\getvalue{\??kj#4\c!uitlijnen}}%
      \edef\@@flflplaats   {\getvalue{\??fl#4\c!plaats   }}%
@@ -2030,6 +2111,7 @@
    \c!blokwijze=\@@nrblokwijze,
    \c!sectienummer=\@@nrsectienummer,
    \c!scheider=\@@koscheider,
+   \c!afstand=1em,
    \c!conversie=\v!cijfers]
 
 \stelplaatsblokkenin