summaryrefslogtreecommitdiff
path: root/tex/context/base/page-mul.tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex/context/base/page-mul.tex')
-rw-r--r--tex/context/base/page-mul.tex254
1 files changed, 127 insertions, 127 deletions
diff --git a/tex/context/base/page-mul.tex b/tex/context/base/page-mul.tex
index ca85bc6d4..81d35ef42 100644
--- a/tex/context/base/page-mul.tex
+++ b/tex/context/base/page-mul.tex
@@ -1,5 +1,5 @@
%D \module
-%D [ file=page-mul, % was: core-mul
+%D [ filefile=page-mul, % was: core-mul
%D version=1998.03.15,
%D title=\CONTEXT\ OTR Macros,
%D subtitle=Multi Column Output,
@@ -68,16 +68,16 @@
%D perfect. While at the moment the routine doesn't support
%D all kind of floats, it does support:
%D
-%D \startopsomming[opelkaar]
-%D \som an unlimitted number of columns
-%D \som ragged or not ragged bottoms
-%D \som optional balancing without \type{\balancingerrors}
-%D \som different \type{\baselineskips}, \type{\spacing},
+%D \startitemize[packed]
+%D \item an unlimitted number of columns
+%D \item ragged or not ragged bottoms
+%D \item optional balancing without \type{\balancingerrors}
+%D \item different \type{\baselineskips}, \type{\spacing},
%D \type{\topskip} and \type{\maxdepth}
-%D \som left- and right indentation, e.g. within lists
-%D \som moving columns floats to the next column or page
-%D \som handling of floats that are to wide for a columns
-%D \stopopsomming
+%D \item left- and right indentation, e.g. within lists
+%D \item moving columns floats to the next column or page
+%D \item handling of floats that are to wide for a columns
+%D \stopitemize
%D
%D One could wonder why single and multi||columns modes are
%D still separated. One reason for this is that \TeX\ is not
@@ -86,7 +86,7 @@
%D column as a special case of multi||columns is posible but at
%D the cost of worse float handling, worse page breaking,
%D worse etc. Complicated multi||column page handling should
-%D be done in \kap{DTP}||systems anyway.
+%D be done in \cap{DTP}||systems anyway.
%D
%D There are three commands provided for entering and leaving
%D multi||column mode and for going to the next column:
@@ -177,14 +177,14 @@
%D A lot of footnote stuff added!
-\def\finalcolumntextwidth {\zetbreedte}
-\def\finalcolumntextheight {\teksthoogte}
-\def\columntextwidth {\zetbreedte}
-\def\columntextheight {\teksthoogte}
-\def\usercolumnwidth {\tekstbreedte}
+\def\finalcolumntextwidth {\makeupwidth}
+\def\finalcolumntextheight {\textheight}
+\def\columntextwidth {\makeupwidth}
+\def\columntextheight {\textheight}
+\def\usercolumnwidth {\textwidth}
\def\columntextoffset {\!!zeropoint}
-\def\fixedcolumnheight {\teksthoogte}
+\def\fixedcolumnheight {\textheight}
\def\betweencolumns {\hskip\bodyfontsize}
\let\setcolumnfloats \relax % in CONTEXT used for floats
@@ -290,61 +290,61 @@
%D \input tufte
%D \stopcolumns
%D \stopbuffer
-%D \typebuffer[b] \haalbuffer[b]
+%D \typebuffer[b] \getbuffer[b]
%D
%D \startbuffer[b]
-%D \startsmaller
+%D \startnarrower
%D \input tufte
-%D \stopsmaller
+%D \stopnarrower
%D \stopbuffer
-%D \typebuffer[b] \haalbuffer[b]
+%D \typebuffer[b] \getbuffer[b]
%D
%D \startbuffer[b]
-%D \startcolumns \startsmaller
+%D \startcolumns \startnarrower
%D \input tufte
-%D \stopsmaller \stopcolumns
+%D \stopnarrower \stopcolumns
%D \stopbuffer
-%D \typebuffer[b] \haalbuffer[b]
+%D \typebuffer[b] \getbuffer[b]
%D
%D \startbuffer[b]
-%D \startsmaller \startcolumns
+%D \startnarrower \startcolumns
%D \input tufte
-%D \stopcolumns \stopsmaller
+%D \stopcolumns \stopnarrower
%D \stopbuffer
-%D \typebuffer[b] \haalbuffer[b]
+%D \typebuffer[b] \getbuffer[b]
%D
%D \startbuffer[b]
-%D \startcolumns \startsmaller[left]
+%D \startcolumns \startnarrower[left]
%D \input tufte
-%D \stopsmaller \stopcolumns
+%D \stopnarrower \stopcolumns
%D \stopbuffer
-%D \typebuffer[b] \haalbuffer[b]
+%D \typebuffer[b] \getbuffer[b]
%D
%D \startbuffer[b]
-%D \startsmaller[left] \startcolumns
+%D \startnarrower[left] \startcolumns
%D \input tufte
-%D \stopcolumns \stopsmaller
+%D \stopcolumns \stopnarrower
%D \stopbuffer
-%D \typebuffer[b] \haalbuffer[b]
+%D \typebuffer[b] \getbuffer[b]
%D
%D \startbuffer[b]
-%D \startsmaller \startcolumns \startsmaller
+%D \startnarrower \startcolumns \startnarrower
%D \input tufte
-%D \stopsmaller\stopcolumns \stopsmaller
+%D \stopnarrower\stopcolumns \stopnarrower
%D \stopbuffer
-%D \typebuffer[b] \haalbuffer[b]
+%D \typebuffer[b] \getbuffer[b]
%D
%D \startbuffer[b]
-%D \startsmaller[left] \startcolumns \startsmaller
+%D \startnarrower[left] \startcolumns \startnarrower
%D \input tufte
-%D \stopsmaller\stopcolumns \stopsmaller
+%D \stopnarrower\stopcolumns \stopnarrower
%D \stopbuffer
-%D \typebuffer[b] \haalbuffer[b]
+%D \typebuffer[b] \getbuffer[b]
%D \stopbuffer
%D
%D \start
%D \def\postprocesscolumnline#1{\ruledhbox{\strut\box#1}\hss}
-%D \haalbuffer
+%D \getbuffer
%D \stop
%D One should be aware that when font related dimensions are
@@ -710,7 +710,7 @@
%D
%D Here we show the natural width of the lines:
%D
-%D {\haalbuffer}
+%D {\getbuffer}
%D
%D The next example does a bit more advanced manipulation:
%D
@@ -731,7 +731,7 @@
%D
%D Here we also see an application of \type{\currentcolumn}:
%D
-%D {\haalbuffer}
+%D {\getbuffer}
%D
%D This feature is implemented using the reshape macros
%D presented in \type{supp-box}.
@@ -1155,20 +1155,20 @@
%D The multicolumn mechanism is incorporated in a \CONTEXT\
%D interface, which acts like:
%D
-%D \starttypen
+%D \starttyping
%D \startcolumns[n=4,balance=no]
%D some text
%D \stopcolumns
-%D \stoptypen
+%D \stoptyping
%D
%D The setup is optional. The default behaviour of columns
%D can be set up with:
%D
-%D \starttypen
+%D \starttyping
%D \setupcolumns
%D [n=2,
%D balance=yes]
-%D \stoptypen
+%D \stoptyping
%D
%D In this case, stretching is according to the way it's
%D done outside columns (\type{\inheritcolumnstrue}). Also
@@ -1292,7 +1292,7 @@
% \advance\dimen0 \insertionheight
%\fi
\setbox\scratchbox\vbox % tricky met objecten ?
- {\blanko[\@@bkvoorwit]
+ {\blank[\@@bkspacebefore]
\snaptogrid\vbox{\copy\floatbox}}%
\advance\dimen0 \ht\scratchbox
\advance\dimen0 .5\lineheight % needed because goal a bit higher
@@ -1385,11 +1385,11 @@
\doresavefloat
\else
%\setbox2=\vbox
- % {\blanko[\@@bkvoorwit]
+ % {\blank[\@@bkspacebefore]
% \snaptogrid\vbox{\copy\floatbox}%
- % \blanko[\@@bknawit]
+ % \blank[\@@bkspaceafter]
\setbox2=\vbox
- {\blanko[\@@bkvoorwit]
+ {\blank[\@@bkspacebefore]
\snaptogrid\vbox{\copy\floatbox}}%
\advance\dimen0 \ht2
\ifdim\dimen0>\dimen2
@@ -1399,8 +1399,8 @@
\ifdim\ht\currenttopcolumnbox=\zeropoint
\global\setbox\currenttopcolumnbox\vbox
{\snaptogrid\vbox{\copy\floatbox}
- \witruimte % nodig ?
- \blanko[\@@bknawit]}%
+ \whitespace % nodig ?
+ \blank[\@@bkspaceafter]}%
\dimen4=\ht\currenttopcolumnbox
\advance\dimen4 \dp\currenttopcolumnbox
\global\advance\vsize -\dimen4
@@ -1420,11 +1420,11 @@
\par
\ifdim\prevdepth<\zeropoint \else % anders bovenaan kolom witruimte
\nobreak
- \blanko[\@@bkvoorwit]
+ \blank[\@@bkspacebefore]
\nobreak
\fi
\flushfloatbox
- \blanko[\@@bknawit]
+ \blank[\@@bkspaceafter]
\fi
\fi
\fi
@@ -1435,12 +1435,12 @@
%D are placed, taking the width of a float into account. This
%D routine can be improved on different ways:
%D
-%D \startopsomming[intro,opelkaar]
-%D \som taking into account some imaginary baseline, just to
+%D \startitemize[intro,packed]
+%D \item taking into account some imaginary baseline, just to
%D get the captions in line
-%D \som multipass flushing until as many floats are displaced
+%D \item multipass flushing until as many floats are displaced
%D as possible
-%D \stopopsomming
+%D \stopitemize
%D
%D When handling lots of (small) floats spacing can get worse
%D because of lining out the columns.
@@ -1460,8 +1460,8 @@
{\snaptogrid\vbox
{\copy\currenttopcolumnbox
\hbox{\vphantom{\copy\floatbox}}}
- \witruimte % nodig ?
- \blanko[\@@bknawit]}%
+ \whitespace % nodig ?
+ \blank[\@@bkspaceafter]}%
\else
\dogetfloat
\ifdim\wd\floatbox>\finalcolumntextwidth % better somewhere else too
@@ -1486,9 +1486,9 @@
\advance\dimen0 -\intercolumnwidth
\global\setbox\floatbox\hbox to \dimen0
%{\hss\hbox{\copy\floatbox}\hss}%
- {\processaction[\@@bkplaats] % how easy to forget
- [ \v!links=>\copy\floatbox\hss,
- \v!rechts=>\hss\copy\floatbox,
+ {\processaction[\@@bklocation] % how easy to forget
+ [ \v!left=>\copy\floatbox\hss,
+ \v!right=>\hss\copy\floatbox,
\s!default=>\hss\copy\floatbox\hss,
\s!unknown=>\hss\copy\floatbox\hss]}%
\fi
@@ -1501,8 +1501,8 @@
{\snaptogrid\vbox
{\copy\currenttopcolumnbox
\copy\floatbox}
- \witruimte % nodig ?
- \blanko[\@@bknawit]}%
+ \whitespace % nodig ?
+ \blank[\@@bkspaceafter]}%
\fi
\dimen6\ht\currenttopcolumnbox
\advance\dimen6 \dp\currenttopcolumnbox
@@ -1528,9 +1528,9 @@
%D One inprovement can be to normalize the height of floats
%D to $n\times$\type{\lineheight} with a macro like:
%D
-%D \starttypen
+%D \starttyping
%D \normalizevbox{...}
-%D \stoptypen
+%D \stoptyping
% border case, should fit on one page
%
@@ -1542,11 +1542,11 @@
%
% \stopcolumns
-\newif\ifbinnenkolommen
+\newif\ifinsidecolumns
\newif\if@@klbalanceren
\newif\if@@kluitlijnen
-\binnenkolommenfalse
+\insidecolumnsfalse
\def\setupcolumns
{\dosingleempty\dosetupcolumns}
@@ -1555,17 +1555,17 @@
{\getparameters[\??kl][#1]%
\nofcolumns\@@kln\relax
\processaction
- [\@@kllijn]
- [ \v!aan=>\let\betweencolumns\linebetweencolumns,
- \v!uit=>\let\betweencolumns\spacebetweencolumns,
+ [\@@klrule]
+ [ \v!on=>\let\betweencolumns\linebetweencolumns,
+ \v!off=>\let\betweencolumns\spacebetweencolumns,
\s!default=>\let\betweencolumns\spacebetweencolumns,
- \s!unknown=>\let\betweencolumns\@@kllijn]}
+ \s!unknown=>\let\betweencolumns\@@klrule]}
\def\linebetweencolumns
{\bgroup
\starttextproperties
- \ifdim\@@klafstand>\zeropoint
- \dimen0=\@@klafstand
+ \ifdim\@@kldistance>\zeropoint
+ \dimen0=\@@kldistance
\else
\dimen0=\linewidth
\fi
@@ -1579,22 +1579,22 @@
\egroup}
\def\spacebetweencolumns
- {\hskip\@@klafstand}
+ {\hskip\@@kldistance}
\presetlocalframed[\??kl]
\def\backgroundfinishcolumnbox
- {\doifinsetelse\@@kloffset{\v!geen,\v!overlay}
+ {\doifinsetelse\@@kloffset{\v!none,\v!overlay}
{\let\@@kloffset\!!zeropoint}
{\scratchdimen\@@kloffset
- \advance\scratchdimen -\@@kllijndikte
+ \advance\scratchdimen -\@@klrulethickness
\edef\@@kloffset{\the\scratchdimen}}%
\localframed
[\??kl]
- [\c!strut=\v!nee,
- \c!breedte=\v!passend,
- \c!hoogte=\v!passend,
- \c!uitlijnen=]}
+ [\c!strut=\v!no,
+ \c!width=\v!fit,
+ \c!height=\v!fit,
+ \c!align=]}
\let\restorecolumnsettings\relax
@@ -1603,87 +1603,87 @@
\def\complexstartcolumns[#1]% %% \startcolumns
{\bgroup
\let\stopcolumns\egroup
- \ifbinnenkolommen
+ \ifinsidecolumns
\else
\setupcolumns[#1]%
\ifnum\@@kln>1\relax
- \witruimte
+ \whitespace
\begingroup
- \doif\@@kloptie\v!achtergrond
+ \doif\@@kloption\v!background
{\let\finishcolumnbox\backgroundfinishcolumnbox
\let\columntextoffset\@@kloffset}%
- \ifx\@@klcommando\empty\else
- \let\postprocesscolumnline\@@klcommando
+ \ifx\@@klcommand\empty\else
+ \let\postprocesscolumnline\@@klcommand
\fi
- \doifelsenothing\@@klhoogte
+ \doifelsenothing\@@klheight
\heightencolumnsfalse
\heightencolumnstrue
- \doifelse\@@klrichting\v!rechts
+ \doifelse\@@kldirection\v!right
\reversecolumnsfalse
\reversecolumnstrue
- \doifelse\@@klbalanceren\v!ja
+ \doifelse\@@klbalance\v!yes
\balancecolumnstrue
\balancecolumnsfalse
\processaction % ook nog: laatsteuitlijnen
- [\@@kluitlijnen]
- [ \v!ja=>\stretchcolumnstrue
+ [\@@klalign]
+ [ \v!yes=>\stretchcolumnstrue
\inheritcolumnsfalse,
- \v!nee=>\stretchcolumnsfalse
+ \v!no=>\stretchcolumnsfalse
\inheritcolumnsfalse,
- \v!tekst=>\stretchcolumnsfalse
+ \v!text=>\stretchcolumnsfalse
\inheritcolumnstrue]%
\nofcolumns=\@@kln
%
% probably more is needed, and how about nesting save's
%
\savecurrentblanko
- \savecurrentwitruimte
+ \savecurrentwhitespace
\def\restorecolumnsettings
{\boxmaxdepth\maxdimen % done elsewhere
\restorecurrentblanko
- \restorecurrentwitruimte}%
+ \restorecurrentwhitespace}%
%
- \edef\fixedcolumnheight{\@@klhoogte}%
- \edef\minbalancetoplines{\@@klnboven}%
- \setuptolerance[\@@kltolerantie]% %% \startcolumns
- \setupblank[\@@klblanko]%
- \ifdim\tussenwit>\zeropoint\relax
- \setupwhitespace[\@@klblanko]%
+ \edef\fixedcolumnheight{\@@klheight}%
+ \edef\minbalancetoplines{\@@klntop}%
+ \setuptolerance[\@@kltolerance]% %% \startcolumns
+ \setupblank[\@@klblank]%
+ \ifdim\ctxparskip>\zeropoint\relax
+ \setupwhitespace[\@@klblank]%
\fi
\def\stopcolumns
{\endmulticolumns
- \global\binnenkolommenfalse
+ \global\insidecolumnsfalse
\endgroup
\egroup}%
- \global\binnenkolommentrue
+ \global\insidecolumnstrue
\beginmulticolumns
\fi
\fi}
-\installcolumnbreakhandler {MUL} \v!voorkeur
+\installcolumnbreakhandler {MUL} \v!preference
{\goodbreak}
-\installcolumnbreakhandler {MUL} \v!ja
+\installcolumnbreakhandler {MUL} \v!yes
{\par % todo: since
- {\testrulewidth\zeropoint\ruledvskip\teksthoogte} % we misuse a
+ {\testrulewidth\zeropoint\ruledvskip\textheight} % we misuse a
\penalty-200 % side effect
- \vskip-\teksthoogte
- \prevdepth-\thousandpoint} % signals top of column to \blanko
+ \vskip-\textheight
+ \prevdepth-\thousandpoint} % signals top of column to \blank
\setupcolumns
[\c!n=2,
- \c!nboven=1,
- \c!commando=,
- \c!richting=\v!rechts,
- \c!lijn=\v!uit,
- \c!tolerantie=\v!soepel,
- \c!afstand=1.5\korpsgrootte, % influenced by switching
- \c!hoogte=,
- \c!balanceren=\v!ja,
- \c!uitlijnen=\v!tekst,
- \c!blanko={\v!regel,\v!vast},
- \c!optie=,
- \c!lijndikte=\linewidth,
+ \c!ntop=1,
+ \c!command=,
+ \c!direction=\v!right,
+ \c!rule=\v!off,
+ \c!tolerance=\v!tolerant,
+ \c!distance=1.5\korpsgrootte, % influenced by switching
+ \c!height=,
+ \c!balance=\v!yes,
+ \c!align=\v!text,
+ \c!blank={\v!line,\v!fixed},
+ \c!option=,
+ \c!rulethickness=\linewidth,
\c!offset=.5\korpsgrootte]
%D Undocumented and still under development.
@@ -1695,12 +1695,12 @@
{\bgroup
\nopenalties
\getparameters[\??kl]
- [\c!breedte=\hsize,\c!afstand=1.5\korpsgrootte,%
- \c!n=2,\c!regels=0,#1]%
- \let\rigidcolumnlines\@@klregels
- \setrigidcolumnhsize\@@klbreedte\@@klafstand\@@kln
+ [\c!width=\hsize,\c!distance=1.5\korpsgrootte,%
+ \c!n=2,\c!lines=0,#1]%
+ \let\rigidcolumnlines\@@kllines
+ \setrigidcolumnhsize\@@klwidth\@@kldistance\@@kln
\setbox\scratchbox\vbox\bgroup
- \forgetall} % \blanko[\v!blokkeer]
+ \forgetall} % \blank[\v!disable]
\def\stopsimplecolumns
{\removebottomthings
@@ -1708,4 +1708,4 @@
\rigidcolumnbalance\scratchbox
\egroup}
-\protect \endinput \ No newline at end of file
+\protect \endinput