eso-pic (28sep20)

git-svn-id: svn://tug.org/texlive/trunk@56463 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 108 insertions, 96 deletions

diff --git a/Master/texmf-dist/doc/latex/eso-pic/README b/Master/texmf-dist/doc/latex/eso-pic/README
index 57772f89098..2633b5dc54c 100644
--- a/Master/texmf-dist/doc/latex/eso-pic/README
+++ b/Master/texmf-dist/doc/latex/eso-pic/README
@@ -7,5 +7,5 @@ The pack­age adds one or more user com­mands to LaTeX’s shipout rou­tine, w
 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 (Rolf.Niepraschk@gmx.de)
+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 6241e37d3fc..c9a43c24f97 100644
--- a/Master/texmf-dist/doc/latex/eso-pic/eso-ex1.tex
+++ b/Master/texmf-dist/doc/latex/eso-pic/eso-ex1.tex
@@ -1,23 +1,23 @@
 
 % file `eso-ex1.tex'; a framed background example
-% Rolf Niepraschk, 2015-07-14, Rolf.Niepraschk@gmx.de
+% Rolf Niepraschk, 2020-09-27, Rolf.Niepraschk@gmx.de
 
 \documentclass[a4paper]{article}
-\usepackage{eso-pic,calc}
+\usepackage{eso-pic}
 \listfiles
 
-\makeatletter
+\newdimen\myTempdima
+\newdimen\myTempdimb
+\newdimen\myTempdimc
+
 \AddToShipoutPicture{%
-  \begingroup
-    \setlength{\@tempdima}{15mm}%
-    \setlength{\@tempdimb}{\paperwidth-2\@tempdima}%
-    \setlength{\@tempdimc}{\paperheight-2\@tempdima}%
-    \thicklines%
-    \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdima}){%
-      \framebox(\LenToUnit{\@tempdimb},\LenToUnit{\@tempdimc}){}}%
-  \endgroup
+  \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}){}}%
 }
-\makeatother
 
 \begin{document}
 
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 53c9ba100b9..c1b4fe471b3 100644
--- a/Master/texmf-dist/doc/latex/eso-pic/eso-pic.pdf
+++ b/Master/texmf-dist/doc/latex/eso-pic/eso-pic.pdf
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 5c7ec360c54..74060e560e6 100644
--- a/Master/texmf-dist/source/latex/eso-pic/eso-pic.dtx
+++ b/Master/texmf-dist/source/latex/eso-pic/eso-pic.dtx
@@ -25,7 +25,7 @@
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{eso-pic}
-%<package>   [2018/04/12 v2.0h eso-pic (RN)]
+%<package>   [2020/09/27 v2.0i eso-pic (RN)]
 %
 %<*driver>
 \documentclass[a4paper]{ltxdoc}
@@ -37,7 +37,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{778}
+% \CheckSum{782}
 %
 % \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
@@ -220,6 +220,16 @@
 \providecommand*\LenToUnit[1]{\strip@pt\dimexpr#1*\p@/\unitlength}
 %    \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}
@@ -254,17 +264,17 @@
 \ESO@isMEMOIR{%
   \renewcommand\AtStockLowerLeft[1]{%
     \begingroup
-      \@tempdima=-\stockwidth
-      \advance\@tempdima\trimedge
-      \advance\@tempdima\paperwidth
+      \ESO@tempdima=-\stockwidth
+      \advance\ESO@tempdima\trimedge
+      \advance\ESO@tempdima\paperwidth
       \if@twoside\ifodd\c@page\else
-        \@tempdima=-\trimedge
+        \ESO@tempdima=-\trimedge
       \fi\fi
-      \@tempdimb=-\stockheight
-      \advance\@tempdimb\paperheight
-      \advance\@tempdimb\trimtop
+      \ESO@tempdimb=-\stockheight
+      \advance\ESO@tempdimb\paperheight
+      \advance\ESO@tempdimb\trimtop
       \AtPageLowerLeft{%
-        \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){#1}%
+        \put(\LenToUnit{\ESO@tempdima},\LenToUnit{\ESO@tempdimb}){#1}%
       }%
     \endgroup
   }
@@ -311,37 +321,37 @@
   \newcommand\AtTextUpperLeft[1]{%
     \begingroup
       \ifodd\c@page
-        \@tempdima=\spinemargin
+        \ESO@tempdima=\spinemargin
       \else
-        \@tempdima=\paperwidth
-        \advance\@tempdima-\textwidth
-        \advance\@tempdima-\spinemargin
+        \ESO@tempdima=\paperwidth
+        \advance\ESO@tempdima-\textwidth
+        \advance\ESO@tempdima-\spinemargin
       \fi
-      \@tempdimb=-\uppermargin
+      \ESO@tempdimb=-\uppermargin
       \AtPageUpperLeft{%
-        \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){#1}%
+        \put(\LenToUnit{\ESO@tempdima},\LenToUnit{\ESO@tempdimb}){#1}%
       }%
     \endgroup
   }
 }{%
   \newcommand\AtTextUpperLeft[1]{%
     \begingroup
-      \@tempdima=1in\relax
+      \ESO@tempdima=1in\relax
       \if@twoside
         \ifodd\c@page
-          \advance\@tempdima\oddsidemargin
+          \advance\ESO@tempdima\oddsidemargin
         \else
-          \advance\@tempdima\evensidemargin
+          \advance\ESO@tempdima\evensidemargin
         \fi
       \else
-        \advance\@tempdima\oddsidemargin
+        \advance\ESO@tempdima\oddsidemargin
       \fi
-      \@tempdimb=-1in\relax
-      \advance\@tempdimb-\topmargin
-      \advance\@tempdimb-\headheight
-      \advance\@tempdimb-\headsep
+      \ESO@tempdimb=-1in\relax
+      \advance\ESO@tempdimb-\topmargin
+      \advance\ESO@tempdimb-\headheight
+      \advance\ESO@tempdimb-\headsep
       \AtPageUpperLeft{%
-        \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){#1}%
+        \put(\LenToUnit{\ESO@tempdima},\LenToUnit{\ESO@tempdimb}){#1}%
       }%
     \endgroup
   }
@@ -418,25 +428,25 @@
 %    \begin{macrocode}
 \ESO@isMEMOIR{%
   \AtBeginShipout{%
-    \@tempdima=-\trimedge
-    \advance\@tempdima-\paperwidth
-    \advance\@tempdima\stockwidth
+    \ESO@tempdima=-\trimedge
+    \advance\ESO@tempdima-\paperwidth
+    \advance\ESO@tempdima\stockwidth
     \if@twoside\ifodd\c@page\else
-      \advance\@tempdima2\trimedge
-      \advance\@tempdima\paperwidth
-      \advance\@tempdima-\stockwidth
+      \advance\ESO@tempdima2\trimedge
+      \advance\ESO@tempdima\paperwidth
+      \advance\ESO@tempdima-\stockwidth
     \fi\fi
-    \@tempdimb=\ESO@yoffsetI
-    \advance\@tempdimb-\trimtop
+    \ESO@tempdimb=\ESO@yoffsetI
+    \advance\ESO@tempdimb-\trimtop
     \nointerlineskip
     \AtBeginShipoutUpperLeft{%
-      \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){%
+      \put(\LenToUnit{\ESO@tempdima},\LenToUnit{\ESO@tempdimb}){%
         \ESO@HookIIIBG\ESO@HookIBG\ESO@HookIIBG
         \global\let\ESO@HookIIBG\@empty
       }%
     }%
     \AtBeginShipoutUpperLeftForeground{%
-      \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){%
+      \put(\LenToUnit{\ESO@tempdima},\LenToUnit{\ESO@tempdimb}){%
         \ESO@HookIFG\ESO@HookIIFG\ESO@HookIIIFG
         \global\let\ESO@HookIIFG\@empty
       }%
@@ -566,9 +576,9 @@
 %  Result is in \cmd{\@tempcnta}.
 %    \begin{macrocode}
 \newcommand\ESO@div[2]{%
-  \@tempdima=#1\relax\@tempdimb=\ESO@gridunit\relax
-  \@tempdimb=#2\@tempdimb\divide\@tempdima by \@tempdimb
-  \@tempcnta\@tempdima\advance\@tempcnta\@ne}
+  \ESO@tempdima=#1\relax\ESO@tempdimb=\ESO@gridunit\relax
+  \ESO@tempdimb=#2\ESO@tempdimb\divide\ESO@tempdima by \ESO@tempdimb
+  \@tempcnta\ESO@tempdima\advance\@tempcnta\@ne}
 %    \end{macrocode}
 %    \end{macro}
 %  \changes{v1.1c}{2005/12/24}{Remove the disadvantageous check of
@@ -668,8 +678,8 @@
       \@tempcntb=\@tempcnta\advance\@tempcntb-\@multicnt
       \ifnum\@tempcntb>1\relax
         \multiply\@tempcntb by \ESO@gridDelta\relax
-        \@tempdima=\@tempcntb sp\@tempdima=\ESO@labelfactor\@tempdima
-        \@tempcntb=\@tempdima%
+        \ESO@tempdima=\@tempcntb sp\ESO@tempdima=\ESO@labelfactor\ESO@tempdima
+        \@tempcntb=\ESO@tempdima%
         \makebox(0,0)[c]{\ESO@colorbox{white}{\the\@tempcntb}}%
       \fi}%
 %    \end{macrocode}
@@ -681,8 +691,8 @@
       \@tempcntb=\@tempcnta\advance\@tempcntb-\@multicnt%
       \ifnum\@tempcntb>\@tempa\relax
         \multiply\@tempcntb by \ESO@gridDelta\relax%
-        \@tempdima=\@tempcntb sp\@tempdima=\ESO@labelfactor\@tempdima
-        \@tempcntb=\@tempdima
+        \ESO@tempdima=\@tempcntb sp\ESO@tempdima=\ESO@labelfactor\ESO@tempdima
+        \@tempcntb=\ESO@tempdima
         \makebox(0,0)[c]{\ESO@colorbox{white}{\the\@tempcntb}}%
       \fi
     }%
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 8a3484c1347..58edf6fd1ff 100644
--- a/Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty
+++ b/Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty
@@ -23,9 +23,11 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{eso-pic}
-   [2018/04/12 v2.0h eso-pic (RN)]
+   [2020/09/27 v2.0i eso-pic (RN)]
 \RequirePackage{atbegshi}
 \providecommand*\LenToUnit[1]{\strip@pt\dimexpr#1*\p@/\unitlength}
+\newdimen\ESO@tempdima
+\newdimen\ESO@tempdimb
 \newcommand\ESO@isMEMOIR[2]{#2}
 \@ifclassloaded{memoir}{\renewcommand\ESO@isMEMOIR[2]{#1}}{}
 \newcommand\AtPageUpperLeft[1]{%
@@ -40,17 +42,17 @@
 \ESO@isMEMOIR{%
   \renewcommand\AtStockLowerLeft[1]{%
     \begingroup
-      \@tempdima=-\stockwidth
-      \advance\@tempdima\trimedge
-      \advance\@tempdima\paperwidth
+      \ESO@tempdima=-\stockwidth
+      \advance\ESO@tempdima\trimedge
+      \advance\ESO@tempdima\paperwidth
       \if@twoside\ifodd\c@page\else
-        \@tempdima=-\trimedge
+        \ESO@tempdima=-\trimedge
       \fi\fi
-      \@tempdimb=-\stockheight
-      \advance\@tempdimb\paperheight
-      \advance\@tempdimb\trimtop
+      \ESO@tempdimb=-\stockheight
+      \advance\ESO@tempdimb\paperheight
+      \advance\ESO@tempdimb\trimtop
       \AtPageLowerLeft{%
-        \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){#1}%
+        \put(\LenToUnit{\ESO@tempdima},\LenToUnit{\ESO@tempdimb}){#1}%
       }%
     \endgroup
   }
@@ -81,37 +83,37 @@
   \newcommand\AtTextUpperLeft[1]{%
     \begingroup
       \ifodd\c@page
-        \@tempdima=\spinemargin
+        \ESO@tempdima=\spinemargin
       \else
-        \@tempdima=\paperwidth
-        \advance\@tempdima-\textwidth
-        \advance\@tempdima-\spinemargin
+        \ESO@tempdima=\paperwidth
+        \advance\ESO@tempdima-\textwidth
+        \advance\ESO@tempdima-\spinemargin
       \fi
-      \@tempdimb=-\uppermargin
+      \ESO@tempdimb=-\uppermargin
       \AtPageUpperLeft{%
-        \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){#1}%
+        \put(\LenToUnit{\ESO@tempdima},\LenToUnit{\ESO@tempdimb}){#1}%
       }%
     \endgroup
   }
 }{%
   \newcommand\AtTextUpperLeft[1]{%
     \begingroup
-      \@tempdima=1in\relax
+      \ESO@tempdima=1in\relax
       \if@twoside
         \ifodd\c@page
-          \advance\@tempdima\oddsidemargin
+          \advance\ESO@tempdima\oddsidemargin
         \else
-          \advance\@tempdima\evensidemargin
+          \advance\ESO@tempdima\evensidemargin
         \fi
       \else
-        \advance\@tempdima\oddsidemargin
+        \advance\ESO@tempdima\oddsidemargin
       \fi
-      \@tempdimb=-1in\relax
-      \advance\@tempdimb-\topmargin
-      \advance\@tempdimb-\headheight
-      \advance\@tempdimb-\headsep
+      \ESO@tempdimb=-1in\relax
+      \advance\ESO@tempdimb-\topmargin
+      \advance\ESO@tempdimb-\headheight
+      \advance\ESO@tempdimb-\headsep
       \AtPageUpperLeft{%
-        \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){#1}%
+        \put(\LenToUnit{\ESO@tempdima},\LenToUnit{\ESO@tempdimb}){#1}%
       }%
     \endgroup
   }
@@ -144,25 +146,25 @@
 \newcommand{\ClearShipoutPictureFG}{\global\let\ESO@HookIFG\@empty}
 \ESO@isMEMOIR{%
   \AtBeginShipout{%
-    \@tempdima=-\trimedge
-    \advance\@tempdima-\paperwidth
-    \advance\@tempdima\stockwidth
+    \ESO@tempdima=-\trimedge
+    \advance\ESO@tempdima-\paperwidth
+    \advance\ESO@tempdima\stockwidth
     \if@twoside\ifodd\c@page\else
-      \advance\@tempdima2\trimedge
-      \advance\@tempdima\paperwidth
-      \advance\@tempdima-\stockwidth
+      \advance\ESO@tempdima2\trimedge
+      \advance\ESO@tempdima\paperwidth
+      \advance\ESO@tempdima-\stockwidth
     \fi\fi
-    \@tempdimb=\ESO@yoffsetI
-    \advance\@tempdimb-\trimtop
+    \ESO@tempdimb=\ESO@yoffsetI
+    \advance\ESO@tempdimb-\trimtop
     \nointerlineskip
     \AtBeginShipoutUpperLeft{%
-      \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){%
+      \put(\LenToUnit{\ESO@tempdima},\LenToUnit{\ESO@tempdimb}){%
         \ESO@HookIIIBG\ESO@HookIBG\ESO@HookIIBG
         \global\let\ESO@HookIIBG\@empty
       }%
     }%
     \AtBeginShipoutUpperLeftForeground{%
-      \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){%
+      \put(\LenToUnit{\ESO@tempdima},\LenToUnit{\ESO@tempdimb}){%
         \ESO@HookIFG\ESO@HookIIFG\ESO@HookIIIFG
         \global\let\ESO@HookIIFG\@empty
       }%
@@ -259,9 +261,9 @@
   \AtEndOfPackage{\let\@unprocessedoptions\relax}}%
 \ProcessOptionsWithKV{ESO}%
 \newcommand\ESO@div[2]{%
-  \@tempdima=#1\relax\@tempdimb=\ESO@gridunit\relax
-  \@tempdimb=#2\@tempdimb\divide\@tempdima by \@tempdimb
-  \@tempcnta\@tempdima\advance\@tempcnta\@ne}
+  \ESO@tempdima=#1\relax\ESO@tempdimb=\ESO@gridunit\relax
+  \ESO@tempdimb=#2\ESO@tempdimb\divide\ESO@tempdima by \ESO@tempdimb
+  \@tempcnta\ESO@tempdima\advance\@tempcnta\@ne}
 \@ifundefined{colorbox}{%
   \IfFileExists{xcolor.sty}{\RequirePackage{xcolor}}%
     {\RequirePackage{color}}%
@@ -335,8 +337,8 @@
       \@tempcntb=\@tempcnta\advance\@tempcntb-\@multicnt
       \ifnum\@tempcntb>1\relax
         \multiply\@tempcntb by \ESO@gridDelta\relax
-        \@tempdima=\@tempcntb sp\@tempdima=\ESO@labelfactor\@tempdima
-        \@tempcntb=\@tempdima%
+        \ESO@tempdima=\@tempcntb sp\ESO@tempdima=\ESO@labelfactor\ESO@tempdima
+        \@tempcntb=\ESO@tempdima%
         \makebox(0,0)[c]{\ESO@colorbox{white}{\the\@tempcntb}}%
       \fi}%
     \ifx\ESO@gridunitname\@empty\def\@tempa{0}\else\def\@tempa{1}\fi
@@ -345,8 +347,8 @@
       \@tempcntb=\@tempcnta\advance\@tempcntb-\@multicnt%
       \ifnum\@tempcntb>\@tempa\relax
         \multiply\@tempcntb by \ESO@gridDelta\relax%
-        \@tempdima=\@tempcntb sp\@tempdima=\ESO@labelfactor\@tempdima
-        \@tempcntb=\@tempdima
+        \ESO@tempdima=\@tempcntb sp\ESO@tempdima=\ESO@labelfactor\ESO@tempdima
+        \@tempcntb=\ESO@tempdima
         \makebox(0,0)[c]{\ESO@colorbox{white}{\the\@tempcntb}}%
       \fi
     }%