overpic (2sep18)

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

1 files changed, 11 insertions, 10 deletions

diff --git a/Master/texmf-dist/tex/latex/overpic/overpic.sty b/Master/texmf-dist/tex/latex/overpic/overpic.sty
index 7be39328b51..5a002c3de0c 100644
--- a/Master/texmf-dist/tex/latex/overpic/overpic.sty
+++ b/Master/texmf-dist/tex/latex/overpic/overpic.sty
@@ -19,7 +19,7 @@
 %% version 2005/12/01 or later.
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{overpic}[2017/10/06 1.0 picture overlays]
+\ProvidesPackage{overpic}[2018/09/02 1.2 picture overlays (RN)]
 \RequirePackage{graphicx,epic}
 \newcommand*\OVP@scale{\z@}
 \define@key{Gin}{rel}{%
@@ -71,31 +71,32 @@
 \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{graphicx}}
 \ExecuteOptions{percent}
 \ProcessOptions
+\newsavebox\OVP@box
 \newenvironment{overpic}[2][]{%
-  \sbox\z@{\includegraphics[#1]{#2}}%
+  \sbox\OVP@box{\includegraphics[#1]{#2}}%
+  \count@=\z@ \Gin@gridfalse
+  \setkeys{Gin}{#1}%
   \let\Gin@outer@scalex\relax
   \let\Gin@outer@scaley\relax
   \let\Gin@angle\relax
   \let\Gin@ewidth\Gin@exclamation
-  \let\Gin@eheight\Gin@ewidth
+  \let\Gin@eheight\Gin@exclamation
   \def\Gin@scalex{1}%
   \let\Gin@scaley\Gin@exclamation
   \OVP@picture{#1}%
 }{\endpicture}
 \newenvironment{Overpic}[2][]{%
-  \sbox\z@{#2}%
+  \sbox\OVP@box{#2}%
   \OVP@picture{#1}%
 }{\endpicture}
 \newcommand*\OVP@picture[1]{%
-  \settodepth{\@tempcnta}{\usebox\z@}%
-  \settoheight{\@tempcntb}{\usebox\z@}%
+  \settodepth{\@tempcnta}{\usebox\OVP@box}%
+  \settoheight{\@tempcntb}{\usebox\OVP@box}%
   \advance\@tempcntb\@tempcnta
-  \settowidth{\@tempcnta}{\usebox\z@}%
-  \count@=\z@ \Gin@gridfalse
-  \setkeys{Gin}{#1}%
+  \settowidth{\@tempcnta}{\usebox\OVP@box}%
   \OVP@calc
   \picture(\@tempcnta,\@tempcntb)%
-    \put(0,0){\makebox(0,0)[bl]{\usebox\z@}}%
+    \put(0,0){\makebox(0,0)[bl]{\usebox\OVP@box}}%
     \ifGin@grid
       \put(0,0){\normalfont\fontsize\@viipt\@viiipt\selectfont
         \grid(\@tempcnta,\@tempcntb)(\count@,\count@)[0,0]}%