texlive[56658] Master/texmf-dist: eso-pic (14oct20)
commits+karl at tug.org
commits+karl at tug.org
Wed Oct 14 23:43:28 CEST 2020
Revision: 56658
http://tug.org/svn/texlive?view=revision&revision=56658
Author: karl
Date: 2020-10-14 23:43:27 +0200 (Wed, 14 Oct 2020)
Log Message:
-----------
eso-pic (14oct20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/eso-pic/eso-ex1.tex
trunk/Master/texmf-dist/doc/latex/eso-pic/eso-ex2.tex
trunk/Master/texmf-dist/doc/latex/eso-pic/eso-ex4.tex
trunk/Master/texmf-dist/doc/latex/eso-pic/eso-ex5.tex
trunk/Master/texmf-dist/doc/latex/eso-pic/eso-memoir-test.tex
trunk/Master/texmf-dist/doc/latex/eso-pic/eso-pic.pdf
trunk/Master/texmf-dist/source/latex/eso-pic/eso-pic.dtx
trunk/Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty
trunk/Master/texmf-dist/tex/latex/eso-pic/showframe.sty
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/eso-pic/README.md
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/latex/eso-pic/README
trunk/Master/texmf-dist/doc/latex/eso-pic/eso-ex3.tex
Deleted: trunk/Master/texmf-dist/doc/latex/eso-pic/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/eso-pic/README 2020-10-14 21:43:07 UTC (rev 56657)
+++ trunk/Master/texmf-dist/doc/latex/eso-pic/README 2020-10-14 21:43:27 UTC (rev 56658)
@@ -1,11 +0,0 @@
-eso-pic
-=======
-
-LaTeX package to add picture commands (or backgrounds) to every page.
-
-The package adds one or more user commands to LaTeX’s shipout routine, which
-may be used to place the output at fixed positions. The grid option may be
-used to find the correct places.
-
-Rolf Niepraschk
-
Added: trunk/Master/texmf-dist/doc/latex/eso-pic/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/eso-pic/README.md (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/eso-pic/README.md 2020-10-14 21:43:27 UTC (rev 56658)
@@ -0,0 +1,11 @@
+eso-pic
+=======
+
+LaTeX package to add picture commands (or backgrounds) to every page.
+
+The package adds one or more user commands to LaTeX’s shipout routine, which
+may be used to place the output at fixed positions. The grid option may be
+used to find the correct places.
+
+Rolf Niepraschk
+
Property changes on: trunk/Master/texmf-dist/doc/latex/eso-pic/README.md
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/eso-pic/eso-ex1.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/eso-pic/eso-ex1.tex 2020-10-14 21:43:07 UTC (rev 56657)
+++ trunk/Master/texmf-dist/doc/latex/eso-pic/eso-ex1.tex 2020-10-14 21:43:27 UTC (rev 56658)
@@ -1,22 +1,22 @@
% file `eso-ex1.tex'; a framed background example
-% Rolf Niepraschk, 2020-09-27, Rolf.Niepraschk at gmx.de
\documentclass[a4paper]{article}
\usepackage{eso-pic}
\listfiles
-\newdimen\myTempdima
-\newdimen\myTempdimb
-\newdimen\myTempdimc
+\newdimen\myLenA
+\newdimen\myLenB
+\newdimen\myLenC
-\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}){}}%
+\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.
Modified: trunk/Master/texmf-dist/doc/latex/eso-pic/eso-ex2.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/eso-pic/eso-ex2.tex 2020-10-14 21:43:07 UTC (rev 56657)
+++ trunk/Master/texmf-dist/doc/latex/eso-pic/eso-ex2.tex 2020-10-14 21:43:27 UTC (rev 56658)
@@ -1,24 +1,23 @@
% file `eso-ex2.tex'; an example for background pictures
-% Rolf Niepraschk, 2015-07-14, Rolf.Niepraschk at 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}
Deleted: trunk/Master/texmf-dist/doc/latex/eso-pic/eso-ex3.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/eso-pic/eso-ex3.tex 2020-10-14 21:43:07 UTC (rev 56657)
+++ trunk/Master/texmf-dist/doc/latex/eso-pic/eso-ex3.tex 2020-10-14 21:43:27 UTC (rev 56658)
@@ -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 <amat at kabsi.at> in d.c.t.t
-%
-% A much better solution is Andreas' package `pdfpages'.
-%
-% Rolf Niepraschk, 2015-07-14, Rolf.Niepraschk at 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}
Modified: trunk/Master/texmf-dist/doc/latex/eso-pic/eso-ex4.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/eso-pic/eso-ex4.tex 2020-10-14 21:43:07 UTC (rev 56657)
+++ trunk/Master/texmf-dist/doc/latex/eso-pic/eso-ex4.tex 2020-10-14 21:43:27 UTC (rev 56658)
@@ -1,16 +1,13 @@
% file `eso-ex4.tex'; a framed text area example
-% Rolf Niepraschk, 2015-07-14, Rolf.Niepraschk at 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}
@@ -17,9 +14,34 @@
\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
@@ -26,7 +48,7 @@
\section*{Second page}
- \AddToShipoutPicture*{%
+ \AddToShipoutPictureBG*{%
\AtTextCenter{%
\makebox(0,0)[c]{\resizebox{\textwidth}{!}{%
\rotatebox{45}{\textsf{\textbf{\color{lightgray}DRAFT}}}}}
Modified: trunk/Master/texmf-dist/doc/latex/eso-pic/eso-ex5.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/eso-pic/eso-ex5.tex 2020-10-14 21:43:07 UTC (rev 56657)
+++ trunk/Master/texmf-dist/doc/latex/eso-pic/eso-ex5.tex 2020-10-14 21:43:27 UTC (rev 56658)
@@ -1,6 +1,5 @@
% file `eso-ex5.tex'; background grid example
-% Rolf Niepraschk, 2015-07-14, Rolf.Niepraschk at gmx.de
\listfiles\setcounter{errorcontextlines}{100}
\documentclass[a4paper,twoside]{article}
Modified: trunk/Master/texmf-dist/doc/latex/eso-pic/eso-memoir-test.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/eso-pic/eso-memoir-test.tex 2020-10-14 21:43:07 UTC (rev 56657)
+++ trunk/Master/texmf-dist/doc/latex/eso-pic/eso-memoir-test.tex 2020-10-14 21:43:27 UTC (rev 56658)
@@ -1,5 +1,3 @@
-% Rolf Niepraschk, 2015-07-14, Rolf.Niepraschk at 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}}%
Modified: trunk/Master/texmf-dist/doc/latex/eso-pic/eso-pic.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/eso-pic/eso-pic.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/eso-pic/eso-pic.dtx 2020-10-14 21:43:07 UTC (rev 56657)
+++ trunk/Master/texmf-dist/source/latex/eso-pic/eso-pic.dtx 2020-10-14 21:43:27 UTC (rev 56658)
@@ -23,9 +23,9 @@
% \fi
%
% \iffalse
-%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+%<package>\NeedsTeXFormat{LaTeX2e}[2020-10-01]
%<package>\ProvidesPackage{eso-pic}
-%<package> [2020/09/27 v2.0i eso-pic (RN)]
+%<package> [2020/10/14 v3.0a eso-pic (RN)]
%
%<*driver>
\documentclass[a4paper]{ltxdoc}
@@ -37,7 +37,7 @@
%</driver>
% \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 at 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 at 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 at tempdima}
-% \begin{macro}{\ESO at tempdimb}
-% Some auxiliary dimension registers
% \begin{macrocode}
\newdimen\ESO at tempdima
\newdimen\ESO at tempdimb
% \end{macrocode}
-% \end{macro}
-% \end{macro}
% \begin{macro}{\ESO at isMEMOIR}
% Support for the \clsname{memoir} class.
% \begin{macrocode}
@@ -240,7 +234,7 @@
% \begin{macro}{\AtPageUpperLeft}
% \begin{macrocode}
\newcommand\AtPageUpperLeft[1]{%
- \put(0,\LenToUnit{-\ESO at yoffsetI}){#1}%
+ \put(0,-\ESO at yoffsetI){#1}%
}
% \end{macrocode}
% \end{macro}
@@ -247,13 +241,13 @@
% \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 at tempdimb\paperheight
\advance\ESO at tempdimb\trimtop
\AtPageLowerLeft{%
- \put(\LenToUnit{\ESO at tempdima},\LenToUnit{\ESO at tempdimb}){#1}%
+ \put(\ESO at tempdima,\ESO at tempdimb){#1}%
}%
\endgroup
}
@@ -290,7 +284,7 @@
\ESO at isMEMOIR{%
\renewcommand\AtStockUpperLeft[1]{%
\AtStockLowerLeft{%
- \put(0,\LenToUnit{\stockheight}){#1}%
+ \put(0,\stockheight){#1}%
}%
}%
}{%
@@ -305,7 +299,7 @@
\ESO at 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 at tempdimb=-\uppermargin
\AtPageUpperLeft{%
- \put(\LenToUnit{\ESO at tempdima},\LenToUnit{\ESO at tempdimb}){#1}%
+ \put(\ESO at tempdima,\ESO at tempdimb){#1}%
}%
\endgroup
}
@@ -351,7 +345,7 @@
\advance\ESO at tempdimb-\headheight
\advance\ESO at tempdimb-\headsep
\AtPageUpperLeft{%
- \put(\LenToUnit{\ESO at tempdima},\LenToUnit{\ESO at tempdimb}){#1}%
+ \put(\ESO at tempdima,\ESO at 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 at HookIBG}\DescribeMacro{\ESO at HookIIBG}
@@ -405,6 +399,7 @@
\@ifstar{\g at addto@macro\ESO at HookIIFG}{\g at addto@macro\ESO at 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 at isMEMOIR{%
- \AtBeginShipout{%
+ \newcommand*\ESO at MEMOIR@corr{%
\ESO at tempdima=-\trimedge
\advance\ESO at tempdima-\paperwidth
\advance\ESO at tempdima\stockwidth
@@ -438,41 +429,38 @@
\fi\fi
\ESO at tempdimb=\ESO at yoffsetI
\advance\ESO at tempdimb-\trimtop
- \nointerlineskip
- \AtBeginShipoutUpperLeft{%
- \put(\LenToUnit{\ESO at tempdima},\LenToUnit{\ESO at tempdimb}){%
- \ESO at HookIIIBG\ESO at HookIBG\ESO at HookIIBG
- \global\let\ESO at HookIIBG\@empty
- }%
+ }
+ \nointerlineskip
+ \AddToHook{shipout/background}{%
+ \ESO at MEMOIR@corr
+ \put(\ESO at tempdima,\ESO at tempdimb){%
+ \ESO at HookIIIBG\ESO at HookIBG\ESO at HookIIBG
+ \global\let\ESO at HookIIBG\@empty
}%
- \AtBeginShipoutUpperLeftForeground{%
- \put(\LenToUnit{\ESO at tempdima},\LenToUnit{\ESO at tempdimb}){%
- \ESO at HookIFG\ESO at HookIIFG\ESO at HookIIIFG
- \global\let\ESO at HookIIFG\@empty
- }%
+ }%
+ \AddToHook{shipout/foreground}{%
+ \ESO at MEMOIR@corr
+ \put(\ESO at tempdima,\ESO at tempdimb){%
+ \ESO at HookIFG\ESO at HookIIFG\ESO at HookIIIFG
+ \global\let\ESO at HookIIFG\@empty
}%
- }
+ }%
}{%
- \AtBeginShipout{%
- \nointerlineskip
- \AtBeginShipoutUpperLeft{%
- \put(0,\LenToUnit{\ESO at yoffsetI}){%
- \ESO at HookIIIBG\ESO at HookIBG\ESO at HookIIBG
- \global\let\ESO at HookIIBG\@empty
- }%
+ \nointerlineskip
+ \AddToHook{shipout/background}{%
+ \put(0,\ESO at yoffsetI){%
+ \ESO at HookIIIBG\ESO at HookIBG\ESO at HookIIBG
+ \global\let\ESO at HookIIBG\@empty
}%
- \AtBeginShipoutUpperLeftForeground{%
- \put(0,\LenToUnit{\ESO at yoffsetI}){%
- \ESO at HookIFG\ESO at HookIIFG\ESO at HookIIIFG
- \global\let\ESO at HookIIFG\@empty
- }%
+ }%
+ \AddToHook{shipout/foreground}{%
+ \put(0,\ESO at yoffsetI){%
+ \ESO at HookIFG\ESO at HookIIFG\ESO at HookIIIFG
+ \global\let\ESO at HookIIFG\@empty
}%
- }
+ }%
}
% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
% \subsection{The background grid}
% \begin{macrocode}
\RequirePackage{keyval}
@@ -613,7 +601,7 @@
\fi
}%
\ifESO at dvips\def\@tempb{eepic}\else\def\@tempb{epic}\fi
- \def\@tempa{dotted}%\def\ESO at gap{\LenToUnit{6\@wholewidth}}%
+ \def\@tempa{dotted}%\def\ESO at gap{6\@wholewidth}%
\ifx\@tempa\ESO at subgridstyle
\IfFileExists{\@tempb.sty}%
{%
@@ -648,13 +636,13 @@
% \begin{macrocode}
\ESO at div{\paperheight}{\ESO at griddelta}%
\multiput(0,0)(0,\ESO at griddeltaY){\@tempcnta}%
- {\ESO at hline{\LenToUnit{\paperwidth}}}%
+ {\ESO at hline{\paperwidth}}%
% \end{macrocode}
% --- vertical subgrid lines ---
% \begin{macrocode}
\ESO at div{\paperwidth}{\ESO at griddelta}%
- \multiput(0,\LenToUnit{\ESO at yoffsetII})(\ESO at griddelta,0){\@tempcnta}%
- {\ESO at vline{\LenToUnit{\paperheight}}}%
+ \multiput(0,\ESO at yoffsetII)(\ESO at griddelta,0){\@tempcnta}%
+ {\ESO at vline{\paperheight}}%
\ESO at color{\ESO at gridcolor}%
% \end{macrocode}
% --- horizontal grid lines ---
@@ -661,13 +649,13 @@
% \begin{macrocode}
\ESO at div{\paperheight}{\ESO at gridDelta}%
\multiput(0,0)(0,\ESO at gridDeltaY){\@tempcnta}%
- {\ESO at Hline{\LenToUnit{\paperwidth}}}%
+ {\ESO at Hline{\paperwidth}}%
% \end{macrocode}
% --- vertical grid lines ---
% \begin{macrocode}
\ESO at div{\paperwidth}{\ESO at gridDelta}%
- \multiput(0,\LenToUnit{\ESO at yoffsetII})(\ESO at gridDelta,0){\@tempcnta}%
- {\ESO at Vline{\LenToUnit{\paperheight}}}%
+ \multiput(0,\ESO at yoffsetII)(\ESO at gridDelta,0){\@tempcnta}%
+ {\ESO at Vline{\paperheight}}%
% \end{macrocode}
% --- horizontal numbers ---
% \changes{v1.1a}{2002/11/09}{Font setting added.}
Modified: trunk/Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty 2020-10-14 21:43:07 UTC (rev 56657)
+++ trunk/Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty 2020-10-14 21:43:27 UTC (rev 56658)
@@ -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 at pt\dimexpr#1*\p@/\unitlength}
+ [2020/10/14 v3.0a eso-pic (RN)]
+\providecommand*\LenToUnit[1]{#1}
\newdimen\ESO at tempdima
\newdimen\ESO at tempdimb
\newcommand\ESO at isMEMOIR[2]{#2}
\@ifclassloaded{memoir}{\renewcommand\ESO at isMEMOIR[2]{#1}}{}
\newcommand\AtPageUpperLeft[1]{%
- \put(0,\LenToUnit{-\ESO at yoffsetI}){#1}%
+ \put(0,-\ESO at 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 at isMEMOIR{%
@@ -52,7 +51,7 @@
\advance\ESO at tempdimb\paperheight
\advance\ESO at tempdimb\trimtop
\AtPageLowerLeft{%
- \put(\LenToUnit{\ESO at tempdima},\LenToUnit{\ESO at tempdimb}){#1}%
+ \put(\ESO at tempdima,\ESO at tempdimb){#1}%
}%
\endgroup
}
@@ -63,7 +62,7 @@
\ESO at isMEMOIR{%
\renewcommand\AtStockUpperLeft[1]{%
\AtStockLowerLeft{%
- \put(0,\LenToUnit{\stockheight}){#1}%
+ \put(0,\stockheight){#1}%
}%
}%
}{%
@@ -73,7 +72,7 @@
\ESO at 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 at tempdimb=-\uppermargin
\AtPageUpperLeft{%
- \put(\LenToUnit{\ESO at tempdima},\LenToUnit{\ESO at tempdimb}){#1}%
+ \put(\ESO at tempdima,\ESO at tempdimb){#1}%
}%
\endgroup
}
@@ -113,15 +112,15 @@
\advance\ESO at tempdimb-\headheight
\advance\ESO at tempdimb-\headsep
\AtPageUpperLeft{%
- \put(\LenToUnit{\ESO at tempdima},\LenToUnit{\ESO at tempdimb}){#1}%
+ \put(\ESO at tempdima,\ESO at 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 at HookIBG}{}
\newcommand{\ESO at HookIIBG}{}
\newcommand{\ESO at HookIIIBG}{}
@@ -145,7 +144,7 @@
\let\ClearShipoutPicture=\ClearShipoutPictureBG
\newcommand{\ClearShipoutPictureFG}{\global\let\ESO at HookIFG\@empty}
\ESO at isMEMOIR{%
- \AtBeginShipout{%
+ \newcommand*\ESO at MEMOIR@corr{%
\ESO at tempdima=-\trimedge
\advance\ESO at tempdima-\paperwidth
\advance\ESO at tempdima\stockwidth
@@ -156,36 +155,36 @@
\fi\fi
\ESO at tempdimb=\ESO at yoffsetI
\advance\ESO at tempdimb-\trimtop
- \nointerlineskip
- \AtBeginShipoutUpperLeft{%
- \put(\LenToUnit{\ESO at tempdima},\LenToUnit{\ESO at tempdimb}){%
- \ESO at HookIIIBG\ESO at HookIBG\ESO at HookIIBG
- \global\let\ESO at HookIIBG\@empty
- }%
+ }
+ \nointerlineskip
+ \AddToHook{shipout/background}{%
+ \ESO at MEMOIR@corr
+ \put(\ESO at tempdima,\ESO at tempdimb){%
+ \ESO at HookIIIBG\ESO at HookIBG\ESO at HookIIBG
+ \global\let\ESO at HookIIBG\@empty
}%
- \AtBeginShipoutUpperLeftForeground{%
- \put(\LenToUnit{\ESO at tempdima},\LenToUnit{\ESO at tempdimb}){%
- \ESO at HookIFG\ESO at HookIIFG\ESO at HookIIIFG
- \global\let\ESO at HookIIFG\@empty
- }%
+ }%
+ \AddToHook{shipout/foreground}{%
+ \ESO at MEMOIR@corr
+ \put(\ESO at tempdima,\ESO at tempdimb){%
+ \ESO at HookIFG\ESO at HookIIFG\ESO at HookIIIFG
+ \global\let\ESO at HookIIFG\@empty
}%
- }
+ }%
}{%
- \AtBeginShipout{%
- \nointerlineskip
- \AtBeginShipoutUpperLeft{%
- \put(0,\LenToUnit{\ESO at yoffsetI}){%
- \ESO at HookIIIBG\ESO at HookIBG\ESO at HookIIBG
- \global\let\ESO at HookIIBG\@empty
- }%
+ \nointerlineskip
+ \AddToHook{shipout/background}{%
+ \put(0,\ESO at yoffsetI){%
+ \ESO at HookIIIBG\ESO at HookIBG\ESO at HookIIBG
+ \global\let\ESO at HookIIBG\@empty
}%
- \AtBeginShipoutUpperLeftForeground{%
- \put(0,\LenToUnit{\ESO at yoffsetI}){%
- \ESO at HookIFG\ESO at HookIIFG\ESO at HookIIIFG
- \global\let\ESO at HookIIFG\@empty
- }%
+ }%
+ \AddToHook{shipout/foreground}{%
+ \put(0,\ESO at yoffsetI){%
+ \ESO at HookIFG\ESO at HookIIFG\ESO at HookIIIFG
+ \global\let\ESO at HookIIFG\@empty
}%
- }
+ }%
}
\RequirePackage{keyval}
\newif\ifESO at dvips\ESO at dvipsfalse \newif\ifESO at grid\ESO at gridfalse
@@ -291,7 +290,7 @@
\fi
}%
\ifESO at dvips\def\@tempb{eepic}\else\def\@tempb{epic}\fi
- \def\@tempa{dotted}%\def\ESO at gap{\LenToUnit{6\@wholewidth}}%
+ \def\@tempa{dotted}%\def\ESO at gap{6\@wholewidth}%
\ifx\@tempa\ESO at subgridstyle
\IfFileExists{\@tempb.sty}%
{%
@@ -320,17 +319,17 @@
\ESO at color{\ESO at subgridcolor}%
\ESO at div{\paperheight}{\ESO at griddelta}%
\multiput(0,0)(0,\ESO at griddeltaY){\@tempcnta}%
- {\ESO at hline{\LenToUnit{\paperwidth}}}%
+ {\ESO at hline{\paperwidth}}%
\ESO at div{\paperwidth}{\ESO at griddelta}%
- \multiput(0,\LenToUnit{\ESO at yoffsetII})(\ESO at griddelta,0){\@tempcnta}%
- {\ESO at vline{\LenToUnit{\paperheight}}}%
+ \multiput(0,\ESO at yoffsetII)(\ESO at griddelta,0){\@tempcnta}%
+ {\ESO at vline{\paperheight}}%
\ESO at color{\ESO at gridcolor}%
\ESO at div{\paperheight}{\ESO at gridDelta}%
\multiput(0,0)(0,\ESO at gridDeltaY){\@tempcnta}%
- {\ESO at Hline{\LenToUnit{\paperwidth}}}%
+ {\ESO at Hline{\paperwidth}}%
\ESO at div{\paperwidth}{\ESO at gridDelta}%
- \multiput(0,\LenToUnit{\ESO at yoffsetII})(\ESO at gridDelta,0){\@tempcnta}%
- {\ESO at Vline{\LenToUnit{\paperheight}}}%
+ \multiput(0,\ESO at yoffsetII)(\ESO at gridDelta,0){\@tempcnta}%
+ {\ESO at Vline{\paperheight}}%
\fontsize{10}{12}\normalfont%
\ESO at div{\paperwidth}{\ESO at gridDelta}%
\multiput(0,\ESO at gridDeltaY)(\ESO at gridDelta,0){\@tempcnta}{%
Modified: trunk/Master/texmf-dist/tex/latex/eso-pic/showframe.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/eso-pic/showframe.sty 2020-10-14 21:43:07 UTC (rev 56657)
+++ trunk/Master/texmf-dist/tex/latex/eso-pic/showframe.sty 2020-10-14 21:43:27 UTC (rev 56658)
@@ -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 at frame\SF at frametrue
@@ -34,31 +34,32 @@
\newcommand*\ShowFrameColor{\normalcolor}
\newcommand*\ShowFrameLinethickness{.8pt}
+\newdimen\SF at 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 at tempdima=\textwidth\advance\SF at tempdima\marginparsep%
\if at twoside
\ifodd\c at page\else
\if at mparswitch
- \@tempdima=-\marginparsep\advance\@tempdima-\marginparwidth
+ \SF at tempdima=-\marginparsep\advance\SF at tempdima-\marginparwidth
\fi
\fi
\fi
- \put(\LenToUnit{\@tempdima},0)%
- {\framebox(\LenToUnit{\marginparwidth},\LenToUnit{\textheight}){}}%
+ \put(\SF at tempdima,0)%
+ {\framebox(\marginparwidth,\textheight){}}%
}%
\endgroup
}
More information about the tex-live-commits
mailing list.