diff options
Diffstat (limited to 'Master/texmf-dist/tex/context/base/page-lyr.tex')
-rw-r--r-- | Master/texmf-dist/tex/context/base/page-lyr.tex | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/context/base/page-lyr.tex b/Master/texmf-dist/tex/context/base/page-lyr.tex index b0fabc3f7c5..a1af3adc9d3 100644 --- a/Master/texmf-dist/tex/context/base/page-lyr.tex +++ b/Master/texmf-dist/tex/context/base/page-lyr.tex @@ -125,7 +125,7 @@ %D \setlayer [identifier] [optional parameters] {data} %D \stoptyping -\def\currentlayerdata{0} +\newcount\currentlayerdata \let\currentlayerwidth \!!zeropoint \let\currentlayerheight\!!zeropoint @@ -156,7 +156,7 @@ {\bgroup \recalculatebackgrounds \recalculatelogos - \doglobal\increment\currentlayerdata + \global\advance\currentlayerdata\plusone \forgetall \dontcomplain \doifvalue{\??ll#1\c!option}\v!test\tracelayerstrue @@ -199,20 +199,10 @@ % todo left/right -% \def\setlastlayerpos#1% -% {\edef\layerpage{\MPp{lyr:\currentlayerdata}}% -% \scratchdimen\MPx{lyr:#1:\layerpage}% -% \scratchdimen-\scratchdimen -% \advance\scratchdimen\MPx{lyr:\currentlayerdata}% -% \xdef\lastlayerxpos{\the\scratchdimen}% -% \scratchdimen\MPy{lyr:#1:\layerpage}% -% \advance\scratchdimen-\MPy{lyr:\currentlayerdata}% -% \xdef\lastlayerypos{\the\scratchdimen}} - \def\setlastlayerpos#1% - {\edef\layerpage{\MPp{lyr:\currentlayerdata}}% - \xdef\lastlayerxpos{\the\dimexpr-\MPx{lyr:#1:\layerpage}+\MPx{lyr:\currentlayerdata}\relax}% - \xdef\lastlayerypos{\the\dimexpr \MPy{lyr:#1:\layerpage}-\MPy{lyr:\currentlayerdata}\relax}} + {\edef\layerpage{\MPp{lyr:\the\currentlayerdata}}% + \xdef\lastlayerxpos{\the\dimexpr-\MPx{lyr:#1:\layerpage}+\MPx{lyr:\the\currentlayerdata}\relax}% + \xdef\lastlayerypos{\the\dimexpr \MPy{lyr:#1:\layerpage}-\MPy{lyr:\the\currentlayerdata}\relax}} \def\definelayerpreset {\dodoubleargument\dodefinelayerpreset} @@ -249,6 +239,14 @@ % preroll \getparameters[\??ll\currentlayer][#3]% % presets and real roll +% maybe todo: +% \doif{\layerparameter\c!method}\v!fit +% {\@@layerxsiz\thelayerwidth \currentlayer +% \@@layerysiz\thelayerheight\currentlayer +% \layerwidth \@@layerxsiz +% \layerheight\@@layerysiz +% }% + % etc \executeifdefined{\??ll\??ll\layerparameter\c!preset}\gobbletwoarguments\currentlayer{#3}% % that was real slow \doif{\layerparameter\c!position}\v!overlay % slow @@ -282,7 +280,7 @@ \letgvalue{\??ll\currentlayer\layerpage\c!position}\v!yes \letgvalue{\??ll\currentlayer\c!state}\v!start % needed ? \setbox\layerbox\vbox to \@@layerysiz - {\hbox to \@@layerxsiz{\xypos{lyr:\currentlayerdata}\hss}\vss}} + {\hbox to \@@layerxsiz{\xypos{lyr:\the\currentlayerdata}\hss}\vss}} {\setbox\layerbox\emptybox \globallet\lastlayerxpos\!!zeropoint \globallet\lastlayerypos\!!zeropoint |