texlive[56463] Master/texmf-dist: eso-pic (28sep20)
commits+karl at tug.org
commits+karl at tug.org
Mon Sep 28 22:57:56 CEST 2020
Revision: 56463
http://tug.org/svn/texlive?view=revision&revision=56463
Author: karl
Date: 2020-09-28 22:57:56 +0200 (Mon, 28 Sep 2020)
Log Message:
-----------
eso-pic (28sep20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/eso-pic/README
trunk/Master/texmf-dist/doc/latex/eso-pic/eso-ex1.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
Modified: trunk/Master/texmf-dist/doc/latex/eso-pic/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/eso-pic/README 2020-09-28 20:57:36 UTC (rev 56462)
+++ trunk/Master/texmf-dist/doc/latex/eso-pic/README 2020-09-28 20:57:56 UTC (rev 56463)
@@ -7,5 +7,5 @@
may be used to place the output at fixed positions. The grid option may be
used to find the correct places.
-Rolf Niepraschk (Rolf.Niepraschk at gmx.de)
+Rolf Niepraschk
Modified: trunk/Master/texmf-dist/doc/latex/eso-pic/eso-ex1.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/eso-pic/eso-ex1.tex 2020-09-28 20:57:36 UTC (rev 56462)
+++ trunk/Master/texmf-dist/doc/latex/eso-pic/eso-ex1.tex 2020-09-28 20:57:56 UTC (rev 56463)
@@ -1,23 +1,23 @@
% file `eso-ex1.tex'; a framed background example
-% Rolf Niepraschk, 2015-07-14, Rolf.Niepraschk at gmx.de
+% Rolf Niepraschk, 2020-09-27, Rolf.Niepraschk at 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}
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-09-28 20:57:36 UTC (rev 56462)
+++ trunk/Master/texmf-dist/source/latex/eso-pic/eso-pic.dtx 2020-09-28 20:57:56 UTC (rev 56463)
@@ -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 at pt\dimexpr#1*\p@/\unitlength}
% \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}
@@ -254,17 +264,17 @@
\ESO at isMEMOIR{%
\renewcommand\AtStockLowerLeft[1]{%
\begingroup
- \@tempdima=-\stockwidth
- \advance\@tempdima\trimedge
- \advance\@tempdima\paperwidth
+ \ESO at tempdima=-\stockwidth
+ \advance\ESO at tempdima\trimedge
+ \advance\ESO at tempdima\paperwidth
\if at twoside\ifodd\c at page\else
- \@tempdima=-\trimedge
+ \ESO at tempdima=-\trimedge
\fi\fi
- \@tempdimb=-\stockheight
- \advance\@tempdimb\paperheight
- \advance\@tempdimb\trimtop
+ \ESO at tempdimb=-\stockheight
+ \advance\ESO at tempdimb\paperheight
+ \advance\ESO at tempdimb\trimtop
\AtPageLowerLeft{%
- \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){#1}%
+ \put(\LenToUnit{\ESO at tempdima},\LenToUnit{\ESO at tempdimb}){#1}%
}%
\endgroup
}
@@ -311,15 +321,15 @@
\newcommand\AtTextUpperLeft[1]{%
\begingroup
\ifodd\c at page
- \@tempdima=\spinemargin
+ \ESO at tempdima=\spinemargin
\else
- \@tempdima=\paperwidth
- \advance\@tempdima-\textwidth
- \advance\@tempdima-\spinemargin
+ \ESO at tempdima=\paperwidth
+ \advance\ESO at tempdima-\textwidth
+ \advance\ESO at tempdima-\spinemargin
\fi
- \@tempdimb=-\uppermargin
+ \ESO at tempdimb=-\uppermargin
\AtPageUpperLeft{%
- \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){#1}%
+ \put(\LenToUnit{\ESO at tempdima},\LenToUnit{\ESO at tempdimb}){#1}%
}%
\endgroup
}
@@ -326,22 +336,22 @@
}{%
\newcommand\AtTextUpperLeft[1]{%
\begingroup
- \@tempdima=1in\relax
+ \ESO at tempdima=1in\relax
\if at twoside
\ifodd\c at page
- \advance\@tempdima\oddsidemargin
+ \advance\ESO at tempdima\oddsidemargin
\else
- \advance\@tempdima\evensidemargin
+ \advance\ESO at tempdima\evensidemargin
\fi
\else
- \advance\@tempdima\oddsidemargin
+ \advance\ESO at tempdima\oddsidemargin
\fi
- \@tempdimb=-1in\relax
- \advance\@tempdimb-\topmargin
- \advance\@tempdimb-\headheight
- \advance\@tempdimb-\headsep
+ \ESO at tempdimb=-1in\relax
+ \advance\ESO at tempdimb-\topmargin
+ \advance\ESO at tempdimb-\headheight
+ \advance\ESO at tempdimb-\headsep
\AtPageUpperLeft{%
- \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){#1}%
+ \put(\LenToUnit{\ESO at tempdima},\LenToUnit{\ESO at tempdimb}){#1}%
}%
\endgroup
}
@@ -418,25 +428,25 @@
% \begin{macrocode}
\ESO at isMEMOIR{%
\AtBeginShipout{%
- \@tempdima=-\trimedge
- \advance\@tempdima-\paperwidth
- \advance\@tempdima\stockwidth
+ \ESO at tempdima=-\trimedge
+ \advance\ESO at tempdima-\paperwidth
+ \advance\ESO at tempdima\stockwidth
\if at twoside\ifodd\c at page\else
- \advance\@tempdima2\trimedge
- \advance\@tempdima\paperwidth
- \advance\@tempdima-\stockwidth
+ \advance\ESO at tempdima2\trimedge
+ \advance\ESO at tempdima\paperwidth
+ \advance\ESO at tempdima-\stockwidth
\fi\fi
- \@tempdimb=\ESO at yoffsetI
- \advance\@tempdimb-\trimtop
+ \ESO at tempdimb=\ESO at yoffsetI
+ \advance\ESO at tempdimb-\trimtop
\nointerlineskip
\AtBeginShipoutUpperLeft{%
- \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){%
+ \put(\LenToUnit{\ESO at tempdima},\LenToUnit{\ESO at tempdimb}){%
\ESO at HookIIIBG\ESO at HookIBG\ESO at HookIIBG
\global\let\ESO at HookIIBG\@empty
}%
}%
\AtBeginShipoutUpperLeftForeground{%
- \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){%
+ \put(\LenToUnit{\ESO at tempdima},\LenToUnit{\ESO at tempdimb}){%
\ESO at HookIFG\ESO at HookIIFG\ESO at HookIIIFG
\global\let\ESO at HookIIFG\@empty
}%
@@ -566,9 +576,9 @@
% Result is in \cmd{\@tempcnta}.
% \begin{macrocode}
\newcommand\ESO at div[2]{%
- \@tempdima=#1\relax\@tempdimb=\ESO at gridunit\relax
- \@tempdimb=#2\@tempdimb\divide\@tempdima by \@tempdimb
- \@tempcnta\@tempdima\advance\@tempcnta\@ne}
+ \ESO at tempdima=#1\relax\ESO at tempdimb=\ESO at gridunit\relax
+ \ESO at tempdimb=#2\ESO at tempdimb\divide\ESO at tempdima by \ESO at tempdimb
+ \@tempcnta\ESO at 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 at gridDelta\relax
- \@tempdima=\@tempcntb sp\@tempdima=\ESO at labelfactor\@tempdima
- \@tempcntb=\@tempdima%
+ \ESO at tempdima=\@tempcntb sp\ESO at tempdima=\ESO at labelfactor\ESO at tempdima
+ \@tempcntb=\ESO at tempdima%
\makebox(0,0)[c]{\ESO at colorbox{white}{\the\@tempcntb}}%
\fi}%
% \end{macrocode}
@@ -681,8 +691,8 @@
\@tempcntb=\@tempcnta\advance\@tempcntb-\@multicnt%
\ifnum\@tempcntb>\@tempa\relax
\multiply\@tempcntb by \ESO at gridDelta\relax%
- \@tempdima=\@tempcntb sp\@tempdima=\ESO at labelfactor\@tempdima
- \@tempcntb=\@tempdima
+ \ESO at tempdima=\@tempcntb sp\ESO at tempdima=\ESO at labelfactor\ESO at tempdima
+ \@tempcntb=\ESO at tempdima
\makebox(0,0)[c]{\ESO at colorbox{white}{\the\@tempcntb}}%
\fi
}%
Modified: trunk/Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty 2020-09-28 20:57:36 UTC (rev 56462)
+++ trunk/Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty 2020-09-28 20:57:56 UTC (rev 56463)
@@ -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 at pt\dimexpr#1*\p@/\unitlength}
+\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]{%
@@ -40,17 +42,17 @@
\ESO at isMEMOIR{%
\renewcommand\AtStockLowerLeft[1]{%
\begingroup
- \@tempdima=-\stockwidth
- \advance\@tempdima\trimedge
- \advance\@tempdima\paperwidth
+ \ESO at tempdima=-\stockwidth
+ \advance\ESO at tempdima\trimedge
+ \advance\ESO at tempdima\paperwidth
\if at twoside\ifodd\c at page\else
- \@tempdima=-\trimedge
+ \ESO at tempdima=-\trimedge
\fi\fi
- \@tempdimb=-\stockheight
- \advance\@tempdimb\paperheight
- \advance\@tempdimb\trimtop
+ \ESO at tempdimb=-\stockheight
+ \advance\ESO at tempdimb\paperheight
+ \advance\ESO at tempdimb\trimtop
\AtPageLowerLeft{%
- \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){#1}%
+ \put(\LenToUnit{\ESO at tempdima},\LenToUnit{\ESO at tempdimb}){#1}%
}%
\endgroup
}
@@ -81,15 +83,15 @@
\newcommand\AtTextUpperLeft[1]{%
\begingroup
\ifodd\c at page
- \@tempdima=\spinemargin
+ \ESO at tempdima=\spinemargin
\else
- \@tempdima=\paperwidth
- \advance\@tempdima-\textwidth
- \advance\@tempdima-\spinemargin
+ \ESO at tempdima=\paperwidth
+ \advance\ESO at tempdima-\textwidth
+ \advance\ESO at tempdima-\spinemargin
\fi
- \@tempdimb=-\uppermargin
+ \ESO at tempdimb=-\uppermargin
\AtPageUpperLeft{%
- \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){#1}%
+ \put(\LenToUnit{\ESO at tempdima},\LenToUnit{\ESO at tempdimb}){#1}%
}%
\endgroup
}
@@ -96,22 +98,22 @@
}{%
\newcommand\AtTextUpperLeft[1]{%
\begingroup
- \@tempdima=1in\relax
+ \ESO at tempdima=1in\relax
\if at twoside
\ifodd\c at page
- \advance\@tempdima\oddsidemargin
+ \advance\ESO at tempdima\oddsidemargin
\else
- \advance\@tempdima\evensidemargin
+ \advance\ESO at tempdima\evensidemargin
\fi
\else
- \advance\@tempdima\oddsidemargin
+ \advance\ESO at tempdima\oddsidemargin
\fi
- \@tempdimb=-1in\relax
- \advance\@tempdimb-\topmargin
- \advance\@tempdimb-\headheight
- \advance\@tempdimb-\headsep
+ \ESO at tempdimb=-1in\relax
+ \advance\ESO at tempdimb-\topmargin
+ \advance\ESO at tempdimb-\headheight
+ \advance\ESO at tempdimb-\headsep
\AtPageUpperLeft{%
- \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){#1}%
+ \put(\LenToUnit{\ESO at tempdima},\LenToUnit{\ESO at tempdimb}){#1}%
}%
\endgroup
}
@@ -144,25 +146,25 @@
\newcommand{\ClearShipoutPictureFG}{\global\let\ESO at HookIFG\@empty}
\ESO at isMEMOIR{%
\AtBeginShipout{%
- \@tempdima=-\trimedge
- \advance\@tempdima-\paperwidth
- \advance\@tempdima\stockwidth
+ \ESO at tempdima=-\trimedge
+ \advance\ESO at tempdima-\paperwidth
+ \advance\ESO at tempdima\stockwidth
\if at twoside\ifodd\c at page\else
- \advance\@tempdima2\trimedge
- \advance\@tempdima\paperwidth
- \advance\@tempdima-\stockwidth
+ \advance\ESO at tempdima2\trimedge
+ \advance\ESO at tempdima\paperwidth
+ \advance\ESO at tempdima-\stockwidth
\fi\fi
- \@tempdimb=\ESO at yoffsetI
- \advance\@tempdimb-\trimtop
+ \ESO at tempdimb=\ESO at yoffsetI
+ \advance\ESO at tempdimb-\trimtop
\nointerlineskip
\AtBeginShipoutUpperLeft{%
- \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){%
+ \put(\LenToUnit{\ESO at tempdima},\LenToUnit{\ESO at tempdimb}){%
\ESO at HookIIIBG\ESO at HookIBG\ESO at HookIIBG
\global\let\ESO at HookIIBG\@empty
}%
}%
\AtBeginShipoutUpperLeftForeground{%
- \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){%
+ \put(\LenToUnit{\ESO at tempdima},\LenToUnit{\ESO at tempdimb}){%
\ESO at HookIFG\ESO at HookIIFG\ESO at HookIIIFG
\global\let\ESO at HookIIFG\@empty
}%
@@ -259,9 +261,9 @@
\AtEndOfPackage{\let\@unprocessedoptions\relax}}%
\ProcessOptionsWithKV{ESO}%
\newcommand\ESO at div[2]{%
- \@tempdima=#1\relax\@tempdimb=\ESO at gridunit\relax
- \@tempdimb=#2\@tempdimb\divide\@tempdima by \@tempdimb
- \@tempcnta\@tempdima\advance\@tempcnta\@ne}
+ \ESO at tempdima=#1\relax\ESO at tempdimb=\ESO at gridunit\relax
+ \ESO at tempdimb=#2\ESO at tempdimb\divide\ESO at tempdima by \ESO at tempdimb
+ \@tempcnta\ESO at 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 at gridDelta\relax
- \@tempdima=\@tempcntb sp\@tempdima=\ESO at labelfactor\@tempdima
- \@tempcntb=\@tempdima%
+ \ESO at tempdima=\@tempcntb sp\ESO at tempdima=\ESO at labelfactor\ESO at tempdima
+ \@tempcntb=\ESO at tempdima%
\makebox(0,0)[c]{\ESO at colorbox{white}{\the\@tempcntb}}%
\fi}%
\ifx\ESO at 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 at gridDelta\relax%
- \@tempdima=\@tempcntb sp\@tempdima=\ESO at labelfactor\@tempdima
- \@tempcntb=\@tempdima
+ \ESO at tempdima=\@tempcntb sp\ESO at tempdima=\ESO at labelfactor\ESO at tempdima
+ \@tempcntb=\ESO at tempdima
\makebox(0,0)[c]{\ESO at colorbox{white}{\the\@tempcntb}}%
\fi
}%
More information about the tex-live-commits
mailing list.