diff options
Diffstat (limited to 'Master/texmf-dist/tex/context/base/pack-lyr.mkiv')
-rw-r--r-- | Master/texmf-dist/tex/context/base/pack-lyr.mkiv | 152 |
1 files changed, 6 insertions, 146 deletions
diff --git a/Master/texmf-dist/tex/context/base/pack-lyr.mkiv b/Master/texmf-dist/tex/context/base/pack-lyr.mkiv index 0cb3ee24456..5242b56de21 100644 --- a/Master/texmf-dist/tex/context/base/pack-lyr.mkiv +++ b/Master/texmf-dist/tex/context/base/pack-lyr.mkiv @@ -140,15 +140,6 @@ \def\setlayer {\dotripleempty\dosetlayer} -% \def\dosetlayer[#1][#2][#3]% #4 == box do \fi is ok -% {\doifelsevalue{\??ll#1\c!state}\v!stop -% {\dowithnextbox\donothing\hbox} -% {\ifthirdargument -% \dodosetlayer[#1][#2][#3]% -% \else -% \dodosetlayer[#1][][#2]% -% \fi}} - \def\dosetlayer[#1][#2][#3]% #4 == box do \fi is ok {\doifelsevalue{\??ll#1\c!state}\v!stop {\dowithnextbox\donothing\hbox} @@ -237,8 +228,6 @@ \newdimen\layerwidth \newdimen\layerheight -\chardef\@@lacome=1 % LAyerCOnstructionMEthod / temp, will be default - \def\dododosetlayer[#1][#2][#3]% will be sped up {% we use the global width, never change this \def\currentlayer{#1}% @@ -343,20 +332,16 @@ \ifdim\scratchdimen<\getboxllx\layerpagebox \gsetboxllx\layerpagebox\scratchdimen \fi - \ifcase\@@lacome\or % this test will become obsolete - \advance\scratchdimen\nextboxwd - \nextboxwd\ifdim\scratchdimen>\lastlayerwidth \scratchdimen \else \lastlayerwidth \fi - \fi + \advance\scratchdimen\nextboxwd + \nextboxwd\ifdim\scratchdimen>\lastlayerwidth \scratchdimen \else \lastlayerwidth \fi \scratchdimen\dimexpr\@@layerypos+\@@layeryoff\relax \ifdim\scratchdimen<\getboxlly\layerpagebox \gsetboxlly\layerpagebox\scratchdimen \fi % ll compensation - \ifcase\@@lacome\or % this test will become obsolete - \advance\scratchdimen\dimexpr\nextboxht+\nextboxdp\relax - \nextboxht\ifdim\scratchdimen>\lastlayerheight \scratchdimen \else \lastlayerheight \fi - \nextboxdp\zeropoint - \fi + \advance\scratchdimen\dimexpr\nextboxht+\nextboxdp\relax + \nextboxht\ifdim\scratchdimen>\lastlayerheight \scratchdimen \else \lastlayerheight \fi + \nextboxdp\zeropoint % placement \hsize\layerparameter\c!width % new, keep box small \vbox to \layerparameter\c!height \bgroup @@ -430,20 +415,6 @@ % todo: setups before flush, handy hook -% \unexpanded\def\flushlayer[#1]% -% {\doifelsevalue{\??ll#1\c!state}\v!next -% {\global\letvalue{\??ll#1\c!state}\v!start} % dangerous, stack-built-up -% {\doifelsevalue{\??ll#1\c!state}\v!continue -% {\global\letvalue{\??ll#1\c!state}\v!repeat} % dangerous, stack-built-up -% {\doifelsevalue{\??ll#1\c!doublesided}\v!yes -% {\doifundefinedelse{\@@layerbox#1}% -% {\dodoflushlayerA[#1]} -% {\doifbothsidesoverruled -% {\dodoflushlayerB\v!left [#1]}% left -% {\dodoflushlayerB\v!right[#1]}% right -% {\dodoflushlayerB\v!left [#1]}}}% left -% {\dodoflushlayerA[#1]}}}} - \unexpanded\def\flushlayer[#1]% quite core, so optimized {\begingroup \forgetall @@ -645,121 +616,10 @@ [\c!background={\v!foreground,#1}, \c!frame=\v!off, \c!offset=\v!overlay,#2]} - -% The next mechanism is obsolete and will be removed in \MKIV\ (or move to -% the compatibility module. - -\newskip\xposition \newskip\yposition -\newskip\xdimension \newskip\ydimension -\newskip\xoffset \newskip\yoffset - -% already defined \newbox\positionbox - -\unexpanded\def\startpositioning - {\bgroup - \xposition \zeropoint \yposition \zeropoint - \xdimension\zeropoint \ydimension\zeropoint - \xoffset \zeropoint \yoffset \zeropoint - \hfuzz \paperwidth \vfuzz \paperheight - \setbox\positionbox\hbox\bgroup} - -\unexpanded\def\stoppositioning - {\doifnot\@@psoffset\v!yes - {\global\xoffset\zeropoint - \global\yoffset\zeropoint}% - \global\advance\xdimension \xoffset - \global\advance\ydimension \yoffset - \egroup - \vbox to \ydimension - {\vskip\yoffset - \hbox to \xdimension - {\hskip\xoffset - \box\positionbox - \hfill} - \vfill}% - \egroup} - -\def\resetpositioning - {\getparameters[\??ps] - [\c!state=\v!start,% - \c!unit=\s!cm,% - \c!factor=1,% - \c!scale=1,% - \c!xfactor=\@@psfactor,% - \c!yfactor=\@@psfactor,% - \c!xscale=\@@psscale,% - \c!yscale=\@@psscale,% - \c!xstep=\v!absolute,% - \c!ystep=\v!absolute,% - \c!xoffset=\!!zeropoint,% - \c!yoffset=\!!zeropoint]} - -\unexpanded\def\setuppositioning - {\resetpositioning - \dodoubleargument\getparameters[\??ps]} - -\def\calculateposition#1#2#3#4#5#6#7#8#9% - {\setdimensionwithunit\scratchskip{#1}\@@psunit - \scratchskip#8\scratchskip - \scratchskip#9\scratchskip - \advance\scratchskip #4\relax - \doif{#2}\v!relative - {\advance\scratchskip #3% - \let#4\!!zeropoint}% - #3\scratchskip\relax - \doifnot\@@psstate\v!overlay - {\scratchskip#5\relax - \advance\scratchskip #3\relax - \ifdim#3<-#7\relax \global#7-#3\relax \fi - \ifdim\scratchskip>#6\relax \global#6\scratchskip\relax \fi}} - -\def\position - {\dosingleempty\doposition} - -\def\doposition[#1]#2(#3,#4)% - {\dowithnextbox - {\bgroup - \getparameters[\??ps][#1]% - \dontcomplain - \calculateposition{#3}\@@psxstep\xposition - \@@psxoffset{\nextboxwd}\xdimension\xoffset - \@@psxscale\@@psxfactor - \scratchdimen\nextboxht \advance\scratchdimen \nextboxdp - \calculateposition{#4}\@@psystep\yposition - \@@psyoffset\scratchdimen\ydimension\yoffset - \@@psyscale\@@psyfactor - \vbox to \zeropoint % kan beter. - {\vskip\yposition - \hbox to \zeropoint - {\hskip\xposition - \flushnextbox - \hss} - \vss}% - \xdef\dopoppositioning - {\xposition\the\xposition - \yposition\the\yposition - \noexpand\def\noexpand\@@psxoffset{\@@psxoffset}% - \noexpand\def\noexpand\@@psyoffset{\@@psyoffset}}% - \egroup - \dopoppositioning - \ignorespaces} - \hbox} - -\resetpositioning - -\setuppositioning - [\c!unit=\s!cm, - \c!factor=1, - \c!scale=1, - \c!xstep=\v!absolute, - \c!ystep=\v!absolute, - \c!offset=\v!yes, - \c!xoffset=\!!zeropoint, - \c!yoffset=\!!zeropoint] %D Watch out, a redefinition: -\ifx\settextpagecontent\undefined \writestatus\m!systems{error in page-lyr.tex} \wait \fi +\ifx\settextpagecontent\undefined \writestatus\m!system{error in page-lyr.tex} \wait \fi \let\normalsettextpagecontent\settextpagecontent |