summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/context/base/page-one.tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2006-11-16 01:02:47 +0000
committerKarl Berry <karl@freefriends.org>2006-11-16 01:02:47 +0000
commit3c85b55e2f245fb7edac7e445f107e6d0bb423ae (patch)
treec62b7f80edafe0455310d08e09f4218127bf9e87 /Master/texmf-dist/tex/context/base/page-one.tex
parente5ecff27a26ef59e1dbe9702677687fd7107be3a (diff)
context update
git-svn-id: svn://tug.org/texlive/trunk@2444 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context/base/page-one.tex')
-rw-r--r--Master/texmf-dist/tex/context/base/page-one.tex138
1 files changed, 54 insertions, 84 deletions
diff --git a/Master/texmf-dist/tex/context/base/page-one.tex b/Master/texmf-dist/tex/context/base/page-one.tex
index 124232868cd..b1931dd1e98 100644
--- a/Master/texmf-dist/tex/context/base/page-one.tex
+++ b/Master/texmf-dist/tex/context/base/page-one.tex
@@ -125,16 +125,48 @@
#1%
\fi}
+% \chardef\kindofpagetextareas\plusone
+
+\def\doOTRONEregisteredtextareaA#1%
+ {\ifregistertextareas
+ \xypos{pbd:\realfolio:b}% we could save bytes by only saving the y
+ \endgraf
+ \begingroup
+ \scratchdimen\MPy{pbd:\realfolio:b}%
+ \advance\scratchdimen-\MPy{pbd:\realfolio:e}%
+ \setbox\scratchbox\null
+ \wd\scratchbox\makeupwidth
+ \ht\scratchbox\scratchdimen
+ \vsmash{\registeredtextarea00\scratchbox}%
+ \endgroup
+ #1%
+ \endgraf
+ \xypos{pbd:\realfolio:e}%
+ \else
+ #1%
+ \fi}
+
+\def\doOTRONEregisteredtextareaB#1%
+ {\ifregistertextareas
+ \setbox0\vbox{#1}%
+ \wd0\makeupwidth % somehow a space creeps in
+ \vbox{\registeredtextarea000}%
+ \else
+ #1%
+ \fi}
+
\let\OTRONEregisteredtextareaA\firstofoneargument
\let\OTRONEregisteredtextareaB\firstofoneargument
\def\OTRONEdopagecontents#1#2% \box<n> \unvbox<n>
{\bgroup % niet breedte zetten, kan fractie zijn!
\ifcase\kindofpagetextareas
- \or % partial page
- \let\OTRONEregisteredtextareaA\OTRONEregisteredtextarea
- \or % whole page
- \let\OTRONEregisteredtextareaB\OTRONEregisteredtextarea
+ \or % partial page (experimental)
+ \let\OTRONEregisteredtextareaA\doOTRONEregisteredtextareaA
+ \or % whole page (default)
+ \let\OTRONEregisteredtextareaB\doOTRONEregisteredtextareaB
+ \or % partial page (only works well with no stretch!)
+ \let\OTRONEregisteredtextareaA\doOTRONEregisteredtextareaB
\fi
\setbox0\vbox \ifbottomnotes to \textheight \fi
{\edef\currentpagedepth{\the\dp#2}% still to be derived from #1
@@ -309,16 +341,6 @@
\OTRONEdosetbotinserts
\fi}
-% \def\OTRONEdotopinsertions
-% {\ifvoid\topins\else
-% \ifgridsnapping
-% \box\topins % not \topsnaptogrid{\box\topins}%
-% \else
-% \unvbox\topins
-% \fi
-% \fi
-% \global\topinserted\zeropoint}
-
\def\OTRONEdotopinsertions
{\ifvoid\topins\else
\ifgridsnapping
@@ -359,16 +381,6 @@
\fi \fi
\snaptogrid\hbox{\iftestfloatbox\ruledhbox\fi{\copy\floatbox}}}
-% \def\OTRONEdodoflushfloats % moet nog beter: als precies passend, niet onder baseline
-% {\ifsomefloatwaiting
-% \bgroup % \box\floatbox can be in use!
-% \dogetfloat
-% \doplacefloatbox
-% \egroup
-% \dofloatflushedinfo
-% \expandafter\OTRONEdodoflushfloats
-% \fi}
-
\def\OTRONEdodoflushfloats % much in common with OTRSET
{\ifsomefloatwaiting
\ifpackflushedfloats
@@ -424,52 +436,6 @@
\expandafter\OTRONEdodoflushfloats
\fi}
-% \def\OTRONEdocheckiffloatfits % vervangen ivm downward comp
-% {\ifnofloatpermitted
-% \global\roomforfloatfalse
-% \else
-% \dimen0 \pagetotal
-% \advance\dimen0 \ht\floatbox
-% \advance\dimen0 \dp\floatbox
-% \advance\dimen0 \floattopskip
-% % \advance\dimen0 -\pageshrink % toegevoegd
-% %\message{c:\the\mofcolumns,t:\the\pagetotal,g:\the\pagegoal}%\wait
-% \ifdim\dimen0>\pagegoal
-% \global\roomforfloatfalse
-% \else
-% \global\roomforfloattrue
-% \fi
-% \fi}
-
-% \def\OTRONEdocheckiffloatfits % vervangen ivm downward comp
-% {\ifnofloatpermitted
-% \global\roomforfloatfalse
-% \else
-% \dimen0 \pagetotal
-% \advance\dimen0 \ht\floatbox
-% \advance\dimen0 \dp\floatbox
-% \advance\dimen0 \floattopskip
-% \advance\dimen0 -\pageshrink % toegevoegd
-% %\message{c:\the\mofcolumns,t:\the\pagetotal,g:\the\pagegoal}%\wait
-% \dimen2\pagegoal
-% \relax % needed
-% \ifcase\textfloatmethod
-% % method 0 : raw
-% \or
-% % method 1 : safe
-% \dimen2 .99\pagegoal
-% \or
-% % method 2 : tight
-% \advance\dimen0 -\onepoint
-% \fi
-% \relax % really needed ! ! ! !
-% \ifdim\dimen0>\dimen2
-% \global\roomforfloatfalse
-% \else
-% \global\roomforfloattrue
-% \fi
-% \fi}
-
\def\OTRONEdocheckiffloatfits % vervangen ivm downward comp
{\ifnofloatpermitted
\global\roomforfloatfalse
@@ -518,7 +484,8 @@
%\ifgridsnapping \else \baselinecorrection \fi % ! ! ! test test test ! ! ! !
\doplacefloatbox
\doinsertfloatinfo
- \dochecknextindentation\??bk}
+ \dochecknextindentation\??bk
+ \dorechecknextindentation}
% \def\OTRONEsomefixdfloat % [#1]
% {\docheckiffloatfits
@@ -573,30 +540,33 @@
[#1]
[ \v!left=>\leftfloat {\box\floatbox},
\v!right=>\rightfloat {\box\floatbox},
- \v!inleft=>\leftmarginfloat {\box\floatbox},
- \v!inright=>\rightmarginfloat{\box\floatbox},
+ \v!inleft=>\leftmarginfloat {\box\floatbox},
+ \v!inright=>\rightmarginfloat{\box\floatbox},
\v!leftmargin=>\leftmarginfloat {\box\floatbox},
\v!rightmargin=>\rightmarginfloat{\box\floatbox},
- \v!leftedge=>\leftedgefloat {\box\floatbox},
- \v!rightedge=>\rightedgefloat {\box\floatbox},
- \v!backspace=>\backspacefloat {\box\floatbox},
- \v!cutspace=>\cutspacefloat {\box\floatbox},
- \v!inmargin=>{\doinmargenormal\leftmarginfloat
- \rightmarginfloat{\box\floatbox}}]%
+ \v!leftedge=>\leftedgefloat {\box\floatbox},
+ \v!rightedge=>\rightedgefloat {\box\floatbox},
+ \v!backspace=>\backspacefloat {\box\floatbox},
+ \v!cutspace=>\cutspacefloat {\box\floatbox},
+ \v!inmargin=>\cutspacefloat {\box\floatbox}]%
\doifinset\v!tall{#1}\flushsidefloatsafterpar
\fi}
-\def\OTRONEsomepagefloat[#1]%
+\def\OTRONEdosomepagefloat#1[#2]%
{%\checkwaitingfloats{#1}%
- \global\setbox\collectedpagefloats\vbox
- {\unvbox\collectedpagefloats
+ \global\setbox#1\vbox
+ {\unvbox#1%
\vbox to \textheight
- {\doifnotinset\v!high{#1}\vfill
+ {\doifnotinset\v!high{#2}\vfill
\box\floatbox
- \doifnotinset\v!low{#1}\vfill}%
+ \doifnotinset\v!low{#2}\vfill}%
\goodbreak}%
\doinsertfloatinfo}
+\def\OTRONEsomepagefloat {\OTRONEdosomepagefloat\collectedpagefloats}
+\def\OTRONEsomeleftpagefloat {\OTRONEdosomepagefloat\collectedleftpagefloats}
+\def\OTRONEsomerightpagefloat{\OTRONEdosomepagefloat\collectedrightpagefloats}
+
\def\OTRONEsometopsfloat[#1]%
{\ifdim\topinserted=\zeropoint
\topofinserttrue