diff options
Diffstat (limited to 'Master/texmf-dist/tex/context/base/page-one.mkiv')
-rw-r--r-- | Master/texmf-dist/tex/context/base/page-one.mkiv | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/context/base/page-one.mkiv b/Master/texmf-dist/tex/context/base/page-one.mkiv index bbd35181e7b..babaf4f5ddb 100644 --- a/Master/texmf-dist/tex/context/base/page-one.mkiv +++ b/Master/texmf-dist/tex/context/base/page-one.mkiv @@ -59,8 +59,6 @@ \fi \fi} -\chardef\kindofpagetextareas=2 % whole page (public variable! never change) - % can we avoind the extra vboxing here? \def\OTRONEregisteredtextarea#1% @@ -72,15 +70,13 @@ #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\dimexpr\MPy{pbd:\realfolio:b}-\MPy{pbd:\realfolio:e}\relax - \setbox\scratchbox\null + \setbox\scratchbox\emptyhbox \wd\scratchbox\makeupwidth \ht\scratchbox\scratchdimen \vsmash{\registeredtextarea00\scratchbox}% @@ -104,6 +100,10 @@ \let\OTRONEregisteredtextareaA\firstofoneargument \let\OTRONEregisteredtextareaB\firstofoneargument +% 1 = partial page, 2 = whole page, 3 = partial page + +\setnewconstant\kindofpagetextareas\plustwo + \def\OTRONEdopagecontents#1#2% \box<n> \unvbox<n> {\bgroup % niet breedte zetten, kan fractie zijn! \ifcase\kindofpagetextareas @@ -285,7 +285,7 @@ \fi \fi} -\chardef\topinserttopskipmode=0 % 1 no topskip +\newconstant\topinserttopskipmode % 1 = no topskip \def\OTRONEdotopinsertions {\ifvoid\topins\else @@ -343,15 +343,15 @@ {\ifsomefloatwaiting \ifpackflushedfloats \centerfloatboxfalse % not needed as we do call directly - \dofloatscollect{text}{\hsize}{1em}% + \dofloatscollect\s!text{\hsize}{1em}% \OTRONEsetvsize \global\setbox\floatbox\hbox to \hsize {\hfil \dorecurse\nofcollectedfloats {\ifcase\columndirection % nog document wide - \dofloatsflush{text}{1}% + \dofloatsflush\s!text{1}% \else - \dofloatsflushn{text}{\the\numexpr\nofcollectedfloats-\recurselevel+1\relax}% + \dofloatsflushn\s!text{\the\numexpr\nofcollectedfloats-\recurselevel+1\relax}% \fi \ifdim\wd\floatbox>\makeupwidth % \hsize \hbox to \makeupwidth{\hss\box\floatbox\hss}% @@ -433,7 +433,7 @@ % [before force] \input thuan % \placefigure[force]{force}{\framed[height=8cm,width=8cm]{}}} -\chardef\fixedfloatmethod=3 +\setnewconstant\fixedfloatmethod\plusthree % \def\OTRONEsomefixdfloat % [#1] % {\docheckiffloatfits @@ -490,9 +490,11 @@ \doifinset\v!tall{#1}\flushsidefloatsafterpar \fi} -\def\OTRONEsomepagefloat [#1]{\dofloatssavepagefloat{page} {#1}} -\def\OTRONEsomeleftpagefloat [#1]{\dofloatssavepagefloat{leftpage} {#1}} -\def\OTRONEsomerightpagefloat[#1]{\dofloatssavepagefloat{rightpage}{#1}} +\def\OTRONEsomepagefloat [#1]{\dofloatssavepagefloat {\s!page} {#1}} +\def\OTRONEsomeleftpagefloat [#1]{\dofloatssavepagefloat {\s!leftpage} {#1}} +\def\OTRONEsomerightpagefloat[#1]{\dofloatssavepagefloat {\s!rightpage}{#1}} + +%def\OTRONEsomesoemwherefloat[#1]{\dofloatssavesomewherefloat{\s!somewhere}{#1}} \def\OTRONEsometopsfloat[#1]% {\ifdim\topinserted=\zeropoint |