From 96017976c095713d2013168eeb9d3c2ad8c1c7dc Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 14 Oct 2020 21:43:27 +0000 Subject: eso-pic (14oct20) git-svn-id: svn://tug.org/texlive/trunk@56658 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/eso-pic/README | 11 -- Master/texmf-dist/doc/latex/eso-pic/README.md | 11 ++ Master/texmf-dist/doc/latex/eso-pic/eso-ex1.tex | 30 +++--- Master/texmf-dist/doc/latex/eso-pic/eso-ex2.tex | 25 +++-- Master/texmf-dist/doc/latex/eso-pic/eso-ex3.tex | 42 -------- Master/texmf-dist/doc/latex/eso-pic/eso-ex4.tex | 38 +++++-- Master/texmf-dist/doc/latex/eso-pic/eso-ex5.tex | 1 - .../doc/latex/eso-pic/eso-memoir-test.tex | 3 +- Master/texmf-dist/doc/latex/eso-pic/eso-pic.pdf | Bin 250230 -> 250019 bytes Master/texmf-dist/source/latex/eso-pic/eso-pic.dtx | 120 ++++++++++----------- Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty | 93 ++++++++-------- Master/texmf-dist/tex/latex/eso-pic/showframe.sty | 23 ++-- 12 files changed, 182 insertions(+), 215 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/eso-pic/README create mode 100644 Master/texmf-dist/doc/latex/eso-pic/README.md delete mode 100644 Master/texmf-dist/doc/latex/eso-pic/eso-ex3.tex (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/eso-pic/README b/Master/texmf-dist/doc/latex/eso-pic/README deleted file mode 100644 index 2633b5dc54c..00000000000 --- a/Master/texmf-dist/doc/latex/eso-pic/README +++ /dev/null @@ -1,11 +0,0 @@ -eso-pic -======= - -LaTeX package to add pic­ture com­mands (or back­grounds) to ev­ery page. - -The pack­age adds one or more user com­mands to LaTeX’s shipout rou­tine, which -may be used to place the out­put at fixed po­si­tions. The grid op­tion may be -used to find the cor­rect places. - -Rolf Niepraschk - diff --git a/Master/texmf-dist/doc/latex/eso-pic/README.md b/Master/texmf-dist/doc/latex/eso-pic/README.md new file mode 100644 index 00000000000..2633b5dc54c --- /dev/null +++ b/Master/texmf-dist/doc/latex/eso-pic/README.md @@ -0,0 +1,11 @@ +eso-pic +======= + +LaTeX package to add pic­ture com­mands (or back­grounds) to ev­ery page. + +The pack­age adds one or more user com­mands to LaTeX’s shipout rou­tine, which +may be used to place the out­put at fixed po­si­tions. The grid op­tion may be +used to find the cor­rect places. + +Rolf Niepraschk + diff --git a/Master/texmf-dist/doc/latex/eso-pic/eso-ex1.tex b/Master/texmf-dist/doc/latex/eso-pic/eso-ex1.tex index c9a43c24f97..c780356975a 100644 --- a/Master/texmf-dist/doc/latex/eso-pic/eso-ex1.tex +++ b/Master/texmf-dist/doc/latex/eso-pic/eso-ex1.tex @@ -1,22 +1,22 @@ % file `eso-ex1.tex'; a framed background example -% Rolf Niepraschk, 2020-09-27, Rolf.Niepraschk@gmx.de \documentclass[a4paper]{article} \usepackage{eso-pic} \listfiles -\newdimen\myTempdima -\newdimen\myTempdimb -\newdimen\myTempdimc - -\AddToShipoutPicture{% - \setlength{\myTempdima}{15mm}% - \setlength{\myTempdimb}{\dimexpr\paperwidth-2\myTempdima}% - \setlength{\myTempdimc}{\dimexpr\paperheight-2\myTempdima}% - \thicklines% - \put(\LenToUnit{\myTempdima},\LenToUnit{\myTempdima}){% - \framebox(\LenToUnit{\myTempdimb},\LenToUnit{\myTempdimc}){}}% +\newdimen\myLenA +\newdimen\myLenB +\newdimen\myLenC + +\AddToShipoutPictureBG{% + \begingroup + \setlength\myLenA{15mm}% + \setlength\myLenB{\dimexpr\paperwidth-2\myLenA}% + \setlength\myLenC{\dimexpr\paperheight-2\myLenA}% + \thicklines% + \put(\myLenA,\myLenA){\framebox(\myLenB,\myLenC){}}% + \endgroup } \begin{document} @@ -24,11 +24,13 @@ \section*{First page} This page and all the following have a frame with 15~mm - distance from the paper edges.\newpage + distance from the paper edges. + + \newpage \section*{Second page} - \AddToShipoutPicture*{\put(100,100){\circle{40}}} + \AddToShipoutPictureBG*{\put(100,100){\circle{40}}} Only this page has a circle on the lower left side. diff --git a/Master/texmf-dist/doc/latex/eso-pic/eso-ex2.tex b/Master/texmf-dist/doc/latex/eso-pic/eso-ex2.tex index 37012a958e1..affe690bd71 100644 --- a/Master/texmf-dist/doc/latex/eso-pic/eso-ex2.tex +++ b/Master/texmf-dist/doc/latex/eso-pic/eso-ex2.tex @@ -1,24 +1,23 @@ % file `eso-ex2.tex'; an example for background pictures -% Rolf Niepraschk, 2015-07-14, Rolf.Niepraschk@gmx.de -\listfiles\setcounter{errorcontextlines}{100} + \documentclass{article} \usepackage{eso-pic} \usepackage{graphicx} -\usepackage[dvips]{geometry} -% Tells `dvips' and `pdfTeX' the papersize. % `rose.eps' from CTAN: macros/generic/boxedeps/ \newcommand\BackgroundPicture{% - \put(0,0){% - \parbox[b][\paperheight]{\paperwidth}{% - \vfill - \centering - \includegraphics[width=\paperwidth,height=\paperheight,% - keepaspectratio]{rose}% - \vfill - }}} + \put(0,0){% + \parbox[b][\paperheight]{\paperwidth}{% + \vfill + \centering + \includegraphics[width=\paperwidth,height=\paperheight,% + keepaspectratio]{rose}% + \vfill + } + } +} % The picture is centered on the page background \AddToShipoutPicture{\BackgroundPicture} @@ -34,7 +33,7 @@ \newpage -\AddToShipoutPicture{\BackgroundPicture} +\AddToShipoutPictureBG{\BackgroundPicture} \section{\LaTeX} \end{document} diff --git a/Master/texmf-dist/doc/latex/eso-pic/eso-ex3.tex b/Master/texmf-dist/doc/latex/eso-pic/eso-ex3.tex deleted file mode 100644 index 4465d3e3f89..00000000000 --- a/Master/texmf-dist/doc/latex/eso-pic/eso-ex3.tex +++ /dev/null @@ -1,42 +0,0 @@ - -% file `eso-ex3.tex'; an example for import pages of another (pdf) document. -% This works only with `pdfTeX' (maybe `VTeX'?). -% Based on an article from Andreas Matthias in d.c.t.t -% -% A much better solution is Andreas' package `pdfpages'. -% -% Rolf Niepraschk, 2015-07-14, Rolf.Niepraschk@gmx.de - -\documentclass[a4paper]{article} -\usepackage[pdftex]{graphicx}% -% `pdftex.def' >= 2000/05/12 v0.02u and `pdftex' >= v0.14 are needed. -\usepackage{ifthen,calc,eso-pic} - -\newcounter{thispdfpage}\newcounter{afterlastpdfpage} -\newcommand{\includepdfpages}[3] -{% - \setcounter{thispdfpage}{#2}\setcounter{afterlastpdfpage}{#3+1}% - \newpage - \whiledo{\value{thispdfpage} < \value{afterlastpdfpage}}% - {% - \AddToShipoutPicture* - {% - \put(0,0){% - \includegraphics[width=\paperwidth,height=\paperheight,% - keepaspectratio,page=\arabic{thispdfpage}]{#1}}% - } - \thispagestyle{empty}\mbox{}\newpage - \stepcounter{thispdfpage}% - } -} - -\begin{document} - -\section{First page of the main document} - -% import pages 1 to 3 of an external document. -\includepdfpages{ltx3info.pdf}{1}{3} - -\section{First page after the imported pages of the external document} - -\end{document} diff --git a/Master/texmf-dist/doc/latex/eso-pic/eso-ex4.tex b/Master/texmf-dist/doc/latex/eso-pic/eso-ex4.tex index eb617a7bbd6..46a66c5774c 100644 --- a/Master/texmf-dist/doc/latex/eso-pic/eso-ex4.tex +++ b/Master/texmf-dist/doc/latex/eso-pic/eso-ex4.tex @@ -1,32 +1,54 @@ % file `eso-ex4.tex'; a framed text area example -% Rolf Niepraschk, 2015-07-14, Rolf.Niepraschk@gmx.de \listfiles\setcounter{errorcontextlines}{100} \documentclass[a4paper,twoside]{article} -\usepackage{graphicx,color} +\usepackage{graphicx,pict2e} \usepackage{eso-pic} -\definecolor{lightgray}{gray}{.75} -\AddToShipoutPicture{% - \AtTextLowerLeft{% - \framebox(\LenToUnit{\textwidth},\LenToUnit{\textheight}){}}} +\AddToShipoutPictureBG{% + \AtTextLowerLeft{\framebox(\textwidth,\textheight){}}} \setlength\parindent{0pt} \begin{document} \section*{First page} + + \AddToShipoutPictureBG*{% on the background, only this page + \AtTextUpperLeft{% + \put(30mm,-25mm){\color{lightgray}\circle*{50}} + } + } + \AddToShipoutPictureFG*{% on the foreground, only this page + \AtTextUpperLeft{% + \put(60mm,-25mm){\color{lightgray}\circle*{50}} + } + } This page and all the following have a frame around the - text area. + text area. \par + This page and all the following have a frame around the + text area. \par + This page and all the following have a frame around the + text area. \par + This page and all the following have a frame around the + text area. \par + This page and all the following have a frame around the + text area. \par + This page and all the following have a frame around the + text area. \par + This page and all the following have a frame around the + text area. \par + This page and all the following have a frame around the + text area. \par \vfill X \hfill X\newpage \section*{Second page} - \AddToShipoutPicture*{% + \AddToShipoutPictureBG*{% \AtTextCenter{% \makebox(0,0)[c]{\resizebox{\textwidth}{!}{% \rotatebox{45}{\textsf{\textbf{\color{lightgray}DRAFT}}}}} diff --git a/Master/texmf-dist/doc/latex/eso-pic/eso-ex5.tex b/Master/texmf-dist/doc/latex/eso-pic/eso-ex5.tex index 6c6e1e9ea5e..78d0ee5ef79 100644 --- a/Master/texmf-dist/doc/latex/eso-pic/eso-ex5.tex +++ b/Master/texmf-dist/doc/latex/eso-pic/eso-ex5.tex @@ -1,6 +1,5 @@ % file `eso-ex5.tex'; background grid example -% Rolf Niepraschk, 2015-07-14, Rolf.Niepraschk@gmx.de \listfiles\setcounter{errorcontextlines}{100} \documentclass[a4paper,twoside]{article} diff --git a/Master/texmf-dist/doc/latex/eso-pic/eso-memoir-test.tex b/Master/texmf-dist/doc/latex/eso-pic/eso-memoir-test.tex index 5df69f737e4..ad88f57fcdf 100644 --- a/Master/texmf-dist/doc/latex/eso-pic/eso-memoir-test.tex +++ b/Master/texmf-dist/doc/latex/eso-pic/eso-memoir-test.tex @@ -1,5 +1,3 @@ -% Rolf Niepraschk, 2015-07-14, Rolf.Niepraschk@gmx.de - \setcounter{errorcontextlines}{100} \listfiles \documentclass[twoside,a4paper,showtrims]{memoir} @@ -19,6 +17,7 @@ \AddToShipoutPicture{% \AtPageLowerLeft{\circle*{40}}% \AtPageUpperLeft{\circle*{40}}% + \AtPageCenter{\circle*{40}}% \AtTextLowerLeft{\circle*{15}}% \AtTextUpperLeft{\circle*{15}}% \AtStockLowerLeft{\circle*{40}}% diff --git a/Master/texmf-dist/doc/latex/eso-pic/eso-pic.pdf b/Master/texmf-dist/doc/latex/eso-pic/eso-pic.pdf index c1b4fe471b3..961f29e1504 100644 Binary files a/Master/texmf-dist/doc/latex/eso-pic/eso-pic.pdf and b/Master/texmf-dist/doc/latex/eso-pic/eso-pic.pdf differ diff --git a/Master/texmf-dist/source/latex/eso-pic/eso-pic.dtx b/Master/texmf-dist/source/latex/eso-pic/eso-pic.dtx index 74060e560e6..5cdf9141cd7 100644 --- a/Master/texmf-dist/source/latex/eso-pic/eso-pic.dtx +++ b/Master/texmf-dist/source/latex/eso-pic/eso-pic.dtx @@ -23,9 +23,9 @@ % \fi % % \iffalse -%\NeedsTeXFormat{LaTeX2e}[1999/12/01] +%\NeedsTeXFormat{LaTeX2e}[2020-10-01] %\ProvidesPackage{eso-pic} -% [2020/09/27 v2.0i eso-pic (RN)] +% [2020/10/14 v3.0a eso-pic (RN)] % %<*driver> \documentclass[a4paper]{ltxdoc} @@ -37,7 +37,7 @@ % % \fi % -% \CheckSum{782} +% \CheckSum{750} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -151,9 +151,10 @@ % \cs{ClearShipoutPictureFG} % clears the contents of \cs{ESO@HookIFG}. % -% \DescribeMacro{\LenToUnit} Allows a length as parameter to a picture -% command. Note that this macro is no more necessary when using -% |\usepackage{picture}|. +% \DescribeMacro{\LenToUnit} [Allows a length as parameter to a picture +% command.] Note that this macro exist only for compatibility to older +% versions of this package. A recent \LaTeX\ version allows dimensions +% in picture commands. % % \DescribeMacro{\gridSetup} % \cmd{\gridSetup}\oarg{gridunitname}\marg{gridunit}\marg{labelfactor}^^A @@ -208,28 +209,21 @@ % % \subsection{The main functionality} % -% \begin{macrocode} -\RequirePackage{atbegshi} -% \end{macrocode} % \begin{macro}{\LenToUnit} % \changes{v1.0d}{2006/07/14}{Using \cmd{\providecommand} instead of % \cmd{\newcommand} for \cmd{\LenToUnit}} % \changes{v2.0f}{2015/07/14}{Changed definition for better compatibility % with package \pkgname{curve2e} suggested by Claudio Beccari.} +% Only for compatibility +% \changes{v3.0a}{2020/10/14}{No more used. (RN).} % \begin{macrocode} -\providecommand*\LenToUnit[1]{\strip@pt\dimexpr#1*\p@/\unitlength} +\providecommand*\LenToUnit[1]{#1} % \end{macrocode} % \end{macro} -% \changes{v2.0i}{2020/09/27}{no more system dimension registers} -% \begin{macro}{\ESO@tempdima} -% \begin{macro}{\ESO@tempdimb} -% Some auxiliary dimension registers % \begin{macrocode} \newdimen\ESO@tempdima \newdimen\ESO@tempdimb % \end{macrocode} -% \end{macro} -% \end{macro} % \begin{macro}{\ESO@isMEMOIR} % Support for the \clsname{memoir} class. % \begin{macrocode} @@ -240,20 +234,20 @@ % \begin{macro}{\AtPageUpperLeft} % \begin{macrocode} \newcommand\AtPageUpperLeft[1]{% - \put(0,\LenToUnit{-\ESO@yoffsetI}){#1}% + \put(0,-\ESO@yoffsetI){#1}% } % \end{macrocode} % \end{macro} % \begin{macro}{\AtPageLowerLeft} % \begin{macrocode} \newcommand\AtPageLowerLeft[1]{\AtPageUpperLeft{% - \put(0,\LenToUnit{-\paperheight}){#1}}} + \put(0,-\paperheight){#1}}} % \end{macrocode} % \end{macro} % \begin{macro}{\AtPageCenter} % \begin{macrocode} \newcommand\AtPageCenter[1]{\AtPageUpperLeft{% - \put(\LenToUnit{.5\paperwidth},\LenToUnit{-.5\paperheight}){#1}}% + \put(.5\paperwidth,-.5\paperheight){#1}}% } % \end{macrocode} % \end{macro} @@ -274,7 +268,7 @@ \advance\ESO@tempdimb\paperheight \advance\ESO@tempdimb\trimtop \AtPageLowerLeft{% - \put(\LenToUnit{\ESO@tempdima},\LenToUnit{\ESO@tempdimb}){#1}% + \put(\ESO@tempdima,\ESO@tempdimb){#1}% }% \endgroup } @@ -290,7 +284,7 @@ \ESO@isMEMOIR{% \renewcommand\AtStockUpperLeft[1]{% \AtStockLowerLeft{% - \put(0,\LenToUnit{\stockheight}){#1}% + \put(0,\stockheight){#1}% }% }% }{% @@ -305,7 +299,7 @@ \ESO@isMEMOIR{% \renewcommand\AtStockCenter[1]{% \AtStockLowerLeft{% - \put(\LenToUnit{.5\stockwidth},\LenToUnit{.5\stockheight}){#1}% + \put(.5\stockwidth,.5\stockheight){#1}% }% }% }{% @@ -329,7 +323,7 @@ \fi \ESO@tempdimb=-\uppermargin \AtPageUpperLeft{% - \put(\LenToUnit{\ESO@tempdima},\LenToUnit{\ESO@tempdimb}){#1}% + \put(\ESO@tempdima,\ESO@tempdimb){#1}% }% \endgroup } @@ -351,7 +345,7 @@ \advance\ESO@tempdimb-\headheight \advance\ESO@tempdimb-\headsep \AtPageUpperLeft{% - \put(\LenToUnit{\ESO@tempdima},\LenToUnit{\ESO@tempdimb}){#1}% + \put(\ESO@tempdima,\ESO@tempdimb){#1}% }% \endgroup } @@ -361,13 +355,13 @@ % \begin{macro}{\AtTextLowerLeft} % \begin{macrocode} \newcommand\AtTextLowerLeft[1]{\AtTextUpperLeft{% - \put(0,\LenToUnit{-\textheight}){#1}}} + \put(0,-\textheight){#1}}} % \end{macrocode} % \end{macro} % \begin{macro}{\AtTextCenter} % \begin{macrocode} \newcommand\AtTextCenter[1]{\AtTextUpperLeft{% - \put(\LenToUnit{.5\textwidth},\LenToUnit{-.5\textheight}){#1}}} + \put(.5\textwidth,-.5\textheight){#1}}} % \end{macrocode} % \end{macro} % \DescribeMacro{\ESO@HookIBG}\DescribeMacro{\ESO@HookIIBG} @@ -405,6 +399,7 @@ \@ifstar{\g@addto@macro\ESO@HookIIFG}{\g@addto@macro\ESO@HookIFG}} % \end{macrocode} % \end{macro} +% \changes{v3.0a}{2020/10/14}{LaTeX's shipout hooks instead of `atbegshi' (RN).} % \begin{macro}{\ClearShipoutPictureBG} % \begin{macro}{\ClearShipoutPicture} % \begin{macro}{\ClearShipoutPictureFG} @@ -419,15 +414,11 @@ % \end{macro} % \end{macro} % \end{macro} -% \begin{macro}{\AtBeginShipout} -% \begin{macro}{\AtBeginShipoutUpperLeft} -% \begin{macro}{\AtBeginShipoutUpperLeftForeground} -% (see package \pkgname{atbegshi}) % \changes{v2.0c}{2010/10/06}{bugfix for memoir class % (reported by YI Hoze)} % \begin{macrocode} \ESO@isMEMOIR{% - \AtBeginShipout{% + \newcommand*\ESO@MEMOIR@corr{% \ESO@tempdima=-\trimedge \advance\ESO@tempdima-\paperwidth \advance\ESO@tempdima\stockwidth @@ -438,41 +429,38 @@ \fi\fi \ESO@tempdimb=\ESO@yoffsetI \advance\ESO@tempdimb-\trimtop - \nointerlineskip - \AtBeginShipoutUpperLeft{% - \put(\LenToUnit{\ESO@tempdima},\LenToUnit{\ESO@tempdimb}){% - \ESO@HookIIIBG\ESO@HookIBG\ESO@HookIIBG - \global\let\ESO@HookIIBG\@empty - }% + } + \nointerlineskip + \AddToHook{shipout/background}{% + \ESO@MEMOIR@corr + \put(\ESO@tempdima,\ESO@tempdimb){% + \ESO@HookIIIBG\ESO@HookIBG\ESO@HookIIBG + \global\let\ESO@HookIIBG\@empty }% - \AtBeginShipoutUpperLeftForeground{% - \put(\LenToUnit{\ESO@tempdima},\LenToUnit{\ESO@tempdimb}){% - \ESO@HookIFG\ESO@HookIIFG\ESO@HookIIIFG - \global\let\ESO@HookIIFG\@empty - }% + }% + \AddToHook{shipout/foreground}{% + \ESO@MEMOIR@corr + \put(\ESO@tempdima,\ESO@tempdimb){% + \ESO@HookIFG\ESO@HookIIFG\ESO@HookIIIFG + \global\let\ESO@HookIIFG\@empty }% - } + }% }{% - \AtBeginShipout{% - \nointerlineskip - \AtBeginShipoutUpperLeft{% - \put(0,\LenToUnit{\ESO@yoffsetI}){% - \ESO@HookIIIBG\ESO@HookIBG\ESO@HookIIBG - \global\let\ESO@HookIIBG\@empty - }% + \nointerlineskip + \AddToHook{shipout/background}{% + \put(0,\ESO@yoffsetI){% + \ESO@HookIIIBG\ESO@HookIBG\ESO@HookIIBG + \global\let\ESO@HookIIBG\@empty }% - \AtBeginShipoutUpperLeftForeground{% - \put(0,\LenToUnit{\ESO@yoffsetI}){% - \ESO@HookIFG\ESO@HookIIFG\ESO@HookIIIFG - \global\let\ESO@HookIIFG\@empty - }% + }% + \AddToHook{shipout/foreground}{% + \put(0,\ESO@yoffsetI){% + \ESO@HookIFG\ESO@HookIIFG\ESO@HookIIIFG + \global\let\ESO@HookIIFG\@empty }% - } + }% } % \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} % \subsection{The background grid} % \begin{macrocode} \RequirePackage{keyval} @@ -613,7 +601,7 @@ \fi }% \ifESO@dvips\def\@tempb{eepic}\else\def\@tempb{epic}\fi - \def\@tempa{dotted}%\def\ESO@gap{\LenToUnit{6\@wholewidth}}% + \def\@tempa{dotted}%\def\ESO@gap{6\@wholewidth}% \ifx\@tempa\ESO@subgridstyle \IfFileExists{\@tempb.sty}% {% @@ -648,26 +636,26 @@ % \begin{macrocode} \ESO@div{\paperheight}{\ESO@griddelta}% \multiput(0,0)(0,\ESO@griddeltaY){\@tempcnta}% - {\ESO@hline{\LenToUnit{\paperwidth}}}% + {\ESO@hline{\paperwidth}}% % \end{macrocode} % --- vertical subgrid lines --- % \begin{macrocode} \ESO@div{\paperwidth}{\ESO@griddelta}% - \multiput(0,\LenToUnit{\ESO@yoffsetII})(\ESO@griddelta,0){\@tempcnta}% - {\ESO@vline{\LenToUnit{\paperheight}}}% + \multiput(0,\ESO@yoffsetII)(\ESO@griddelta,0){\@tempcnta}% + {\ESO@vline{\paperheight}}% \ESO@color{\ESO@gridcolor}% % \end{macrocode} % --- horizontal grid lines --- % \begin{macrocode} \ESO@div{\paperheight}{\ESO@gridDelta}% \multiput(0,0)(0,\ESO@gridDeltaY){\@tempcnta}% - {\ESO@Hline{\LenToUnit{\paperwidth}}}% + {\ESO@Hline{\paperwidth}}% % \end{macrocode} % --- vertical grid lines --- % \begin{macrocode} \ESO@div{\paperwidth}{\ESO@gridDelta}% - \multiput(0,\LenToUnit{\ESO@yoffsetII})(\ESO@gridDelta,0){\@tempcnta}% - {\ESO@Vline{\LenToUnit{\paperheight}}}% + \multiput(0,\ESO@yoffsetII)(\ESO@gridDelta,0){\@tempcnta}% + {\ESO@Vline{\paperheight}}% % \end{macrocode} % --- horizontal numbers --- % \changes{v1.1a}{2002/11/09}{Font setting added.} diff --git a/Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty b/Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty index 58edf6fd1ff..db8758b998d 100644 --- a/Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty +++ b/Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty @@ -21,22 +21,21 @@ %% %% This work has the LPPL maintenance status "author-maintained". %% -\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesPackage{eso-pic} - [2020/09/27 v2.0i eso-pic (RN)] -\RequirePackage{atbegshi} -\providecommand*\LenToUnit[1]{\strip@pt\dimexpr#1*\p@/\unitlength} + [2020/10/14 v3.0a eso-pic (RN)] +\providecommand*\LenToUnit[1]{#1} \newdimen\ESO@tempdima \newdimen\ESO@tempdimb \newcommand\ESO@isMEMOIR[2]{#2} \@ifclassloaded{memoir}{\renewcommand\ESO@isMEMOIR[2]{#1}}{} \newcommand\AtPageUpperLeft[1]{% - \put(0,\LenToUnit{-\ESO@yoffsetI}){#1}% + \put(0,-\ESO@yoffsetI){#1}% } \newcommand\AtPageLowerLeft[1]{\AtPageUpperLeft{% - \put(0,\LenToUnit{-\paperheight}){#1}}} + \put(0,-\paperheight){#1}}} \newcommand\AtPageCenter[1]{\AtPageUpperLeft{% - \put(\LenToUnit{.5\paperwidth},\LenToUnit{-.5\paperheight}){#1}}% + \put(.5\paperwidth,-.5\paperheight){#1}}% } \newcommand\AtStockLowerLeft{} \ESO@isMEMOIR{% @@ -52,7 +51,7 @@ \advance\ESO@tempdimb\paperheight \advance\ESO@tempdimb\trimtop \AtPageLowerLeft{% - \put(\LenToUnit{\ESO@tempdima},\LenToUnit{\ESO@tempdimb}){#1}% + \put(\ESO@tempdima,\ESO@tempdimb){#1}% }% \endgroup } @@ -63,7 +62,7 @@ \ESO@isMEMOIR{% \renewcommand\AtStockUpperLeft[1]{% \AtStockLowerLeft{% - \put(0,\LenToUnit{\stockheight}){#1}% + \put(0,\stockheight){#1}% }% }% }{% @@ -73,7 +72,7 @@ \ESO@isMEMOIR{% \renewcommand\AtStockCenter[1]{% \AtStockLowerLeft{% - \put(\LenToUnit{.5\stockwidth},\LenToUnit{.5\stockheight}){#1}% + \put(.5\stockwidth,.5\stockheight){#1}% }% }% }{% @@ -91,7 +90,7 @@ \fi \ESO@tempdimb=-\uppermargin \AtPageUpperLeft{% - \put(\LenToUnit{\ESO@tempdima},\LenToUnit{\ESO@tempdimb}){#1}% + \put(\ESO@tempdima,\ESO@tempdimb){#1}% }% \endgroup } @@ -113,15 +112,15 @@ \advance\ESO@tempdimb-\headheight \advance\ESO@tempdimb-\headsep \AtPageUpperLeft{% - \put(\LenToUnit{\ESO@tempdima},\LenToUnit{\ESO@tempdimb}){#1}% + \put(\ESO@tempdima,\ESO@tempdimb){#1}% }% \endgroup } } \newcommand\AtTextLowerLeft[1]{\AtTextUpperLeft{% - \put(0,\LenToUnit{-\textheight}){#1}}} + \put(0,-\textheight){#1}}} \newcommand\AtTextCenter[1]{\AtTextUpperLeft{% - \put(\LenToUnit{.5\textwidth},\LenToUnit{-.5\textheight}){#1}}} + \put(.5\textwidth,-.5\textheight){#1}}} \newcommand{\ESO@HookIBG}{} \newcommand{\ESO@HookIIBG}{} \newcommand{\ESO@HookIIIBG}{} @@ -145,7 +144,7 @@ \let\ClearShipoutPicture=\ClearShipoutPictureBG \newcommand{\ClearShipoutPictureFG}{\global\let\ESO@HookIFG\@empty} \ESO@isMEMOIR{% - \AtBeginShipout{% + \newcommand*\ESO@MEMOIR@corr{% \ESO@tempdima=-\trimedge \advance\ESO@tempdima-\paperwidth \advance\ESO@tempdima\stockwidth @@ -156,36 +155,36 @@ \fi\fi \ESO@tempdimb=\ESO@yoffsetI \advance\ESO@tempdimb-\trimtop - \nointerlineskip - \AtBeginShipoutUpperLeft{% - \put(\LenToUnit{\ESO@tempdima},\LenToUnit{\ESO@tempdimb}){% - \ESO@HookIIIBG\ESO@HookIBG\ESO@HookIIBG - \global\let\ESO@HookIIBG\@empty - }% + } + \nointerlineskip + \AddToHook{shipout/background}{% + \ESO@MEMOIR@corr + \put(\ESO@tempdima,\ESO@tempdimb){% + \ESO@HookIIIBG\ESO@HookIBG\ESO@HookIIBG + \global\let\ESO@HookIIBG\@empty }% - \AtBeginShipoutUpperLeftForeground{% - \put(\LenToUnit{\ESO@tempdima},\LenToUnit{\ESO@tempdimb}){% - \ESO@HookIFG\ESO@HookIIFG\ESO@HookIIIFG - \global\let\ESO@HookIIFG\@empty - }% + }% + \AddToHook{shipout/foreground}{% + \ESO@MEMOIR@corr + \put(\ESO@tempdima,\ESO@tempdimb){% + \ESO@HookIFG\ESO@HookIIFG\ESO@HookIIIFG + \global\let\ESO@HookIIFG\@empty }% - } + }% }{% - \AtBeginShipout{% - \nointerlineskip - \AtBeginShipoutUpperLeft{% - \put(0,\LenToUnit{\ESO@yoffsetI}){% - \ESO@HookIIIBG\ESO@HookIBG\ESO@HookIIBG - \global\let\ESO@HookIIBG\@empty - }% + \nointerlineskip + \AddToHook{shipout/background}{% + \put(0,\ESO@yoffsetI){% + \ESO@HookIIIBG\ESO@HookIBG\ESO@HookIIBG + \global\let\ESO@HookIIBG\@empty }% - \AtBeginShipoutUpperLeftForeground{% - \put(0,\LenToUnit{\ESO@yoffsetI}){% - \ESO@HookIFG\ESO@HookIIFG\ESO@HookIIIFG - \global\let\ESO@HookIIFG\@empty - }% + }% + \AddToHook{shipout/foreground}{% + \put(0,\ESO@yoffsetI){% + \ESO@HookIFG\ESO@HookIIFG\ESO@HookIIIFG + \global\let\ESO@HookIIFG\@empty }% - } + }% } \RequirePackage{keyval} \newif\ifESO@dvips\ESO@dvipsfalse \newif\ifESO@grid\ESO@gridfalse @@ -291,7 +290,7 @@ \fi }% \ifESO@dvips\def\@tempb{eepic}\else\def\@tempb{epic}\fi - \def\@tempa{dotted}%\def\ESO@gap{\LenToUnit{6\@wholewidth}}% + \def\@tempa{dotted}%\def\ESO@gap{6\@wholewidth}% \ifx\@tempa\ESO@subgridstyle \IfFileExists{\@tempb.sty}% {% @@ -320,17 +319,17 @@ \ESO@color{\ESO@subgridcolor}% \ESO@div{\paperheight}{\ESO@griddelta}% \multiput(0,0)(0,\ESO@griddeltaY){\@tempcnta}% - {\ESO@hline{\LenToUnit{\paperwidth}}}% + {\ESO@hline{\paperwidth}}% \ESO@div{\paperwidth}{\ESO@griddelta}% - \multiput(0,\LenToUnit{\ESO@yoffsetII})(\ESO@griddelta,0){\@tempcnta}% - {\ESO@vline{\LenToUnit{\paperheight}}}% + \multiput(0,\ESO@yoffsetII)(\ESO@griddelta,0){\@tempcnta}% + {\ESO@vline{\paperheight}}% \ESO@color{\ESO@gridcolor}% \ESO@div{\paperheight}{\ESO@gridDelta}% \multiput(0,0)(0,\ESO@gridDeltaY){\@tempcnta}% - {\ESO@Hline{\LenToUnit{\paperwidth}}}% + {\ESO@Hline{\paperwidth}}% \ESO@div{\paperwidth}{\ESO@gridDelta}% - \multiput(0,\LenToUnit{\ESO@yoffsetII})(\ESO@gridDelta,0){\@tempcnta}% - {\ESO@Vline{\LenToUnit{\paperheight}}}% + \multiput(0,\ESO@yoffsetII)(\ESO@gridDelta,0){\@tempcnta}% + {\ESO@Vline{\paperheight}}% \fontsize{10}{12}\normalfont% \ESO@div{\paperwidth}{\ESO@gridDelta}% \multiput(0,\ESO@gridDeltaY)(\ESO@gridDelta,0){\@tempcnta}{% diff --git a/Master/texmf-dist/tex/latex/eso-pic/showframe.sty b/Master/texmf-dist/tex/latex/eso-pic/showframe.sty index 5bc0366f104..9d746d87acf 100644 --- a/Master/texmf-dist/tex/latex/eso-pic/showframe.sty +++ b/Master/texmf-dist/tex/latex/eso-pic/showframe.sty @@ -22,7 +22,7 @@ % \ShowFrameColor and \ShowFrameLinethickness can be used to change % the frames. -\ProvidesPackage{showframe}[2011/02/24 v0.1i showframe (new impl., RN)] +\ProvidesPackage{showframe}[2020/10/14 v0.1j showframe (new impl., RN)] \newif\ifSF@frame\SF@frametrue @@ -34,31 +34,32 @@ \newcommand*\ShowFrameColor{\normalcolor} \newcommand*\ShowFrameLinethickness{.8pt} +\newdimen\SF@tempdima \newcommand\ShowFramePicture{% \begingroup \ShowFrameColor\linethickness{\ShowFrameLinethickness}% \AtPageLowerLeft{% - \framebox(\LenToUnit{\paperwidth},\LenToUnit{\paperheight}){}}% + \framebox(\paperwidth,\paperheight){}}% \AtTextLowerLeft{% - \framebox(\LenToUnit{\textwidth},\LenToUnit{\textheight}){}}% + \framebox(\textwidth,\textheight){}}% \AtTextUpperLeft{% - \put(0,\LenToUnit{\headsep}){% - \framebox(\LenToUnit{\textwidth},\LenToUnit{\headheight}){}}}% + \put(0,\headsep){% + \framebox(\textwidth,\headheight){}}}% \AtTextLowerLeft{% - \put(0,\LenToUnit{-\footskip}){% - \line(1,0){\LenToUnit{\textwidth}}}}% + \put(0,-\footskip){% + \line(1,0){\textwidth}}}% \AtTextLowerLeft{% - \@tempdima=\textwidth\advance\@tempdima\marginparsep% + \SF@tempdima=\textwidth\advance\SF@tempdima\marginparsep% \if@twoside \ifodd\c@page\else \if@mparswitch - \@tempdima=-\marginparsep\advance\@tempdima-\marginparwidth + \SF@tempdima=-\marginparsep\advance\SF@tempdima-\marginparwidth \fi \fi \fi - \put(\LenToUnit{\@tempdima},0)% - {\framebox(\LenToUnit{\marginparwidth},\LenToUnit{\textheight}){}}% + \put(\SF@tempdima,0)% + {\framebox(\marginparwidth,\textheight){}}% }% \endgroup } -- cgit v1.2.3