diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/overpic/overpic.pdf | bin | 347040 -> 347489 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/overpic/overpic.dtx | 35 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/overpic/overpic.sty | 21 |
3 files changed, 30 insertions, 26 deletions
diff --git a/Master/texmf-dist/doc/latex/overpic/overpic.pdf b/Master/texmf-dist/doc/latex/overpic/overpic.pdf Binary files differindex 6593d88554e..312a4f54820 100644 --- a/Master/texmf-dist/doc/latex/overpic/overpic.pdf +++ b/Master/texmf-dist/doc/latex/overpic/overpic.pdf diff --git a/Master/texmf-dist/source/latex/overpic/overpic.dtx b/Master/texmf-dist/source/latex/overpic/overpic.dtx index aaa2ffde7a0..72bb795dbe2 100644 --- a/Master/texmf-dist/source/latex/overpic/overpic.dtx +++ b/Master/texmf-dist/source/latex/overpic/overpic.dtx @@ -19,7 +19,7 @@ % %<*package> \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{overpic}[2017/10/06 1.0 picture overlays] +\ProvidesPackage{overpic}[2018/09/02 1.2 picture overlays (RN)] %</package> % %<*driver> @@ -58,7 +58,7 @@ %</driver> % \fi % -% \CheckSum{174} +% \CheckSum{176} % % \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 @@ -244,12 +244,12 @@ % \end{macrocode} % % \begin{macro}{\OVP@scale} -% Reference value for rel mode, "100" (percent) and "1000" (permil) +% Reference value for rel mode (percent: 100, permil: 1000) % \begin{macrocode} \newcommand*\OVP@scale{\z@} % \end{macrocode} % \end{macro} -% All the keys. +% All the keys: % \begin{macrocode} \define@key{Gin}{rel}{% \def\OVP@scale{#1}% @@ -309,7 +309,7 @@ } % \end{macrocode} % \end{macro} -% The package options set the defaults. +% The package options set the defaults: % \begin{macrocode} \DeclareOption{percent}{\setkeys{Gin}{rel=100}} \DeclareOption{permil}{\setkeys{Gin}{rel=\@m}} @@ -317,21 +317,26 @@ \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{graphicx}} \ExecuteOptions{percent} \ProcessOptions +\newsavebox\OVP@box % \end{macrocode} % % \begin{environment}{overpic} % Box 0 gets a graphic. +% \changes{1.2}{2018/09/02}{Wrong place of \cmd\setkeys +% (bug report from 'aminophen')} % \begin{macrocode} \newenvironment{overpic}[2][]{% - \sbox\z@{\includegraphics[#1]{#2}}% + \sbox\OVP@box{\includegraphics[#1]{#2}}% + \count@=\z@ \Gin@gridfalse + \setkeys{Gin}{#1}% % \end{macrocode} -% reset the graphics parameter +% Reset the graphics parameter: % \begin{macrocode} \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}% @@ -343,25 +348,23 @@ % Box 0 gets any \TeX\ code. % \begin{macrocode} \newenvironment{Overpic}[2][]{% - \sbox\z@{#2}% + \sbox\OVP@box{#2}% \OVP@picture{#1}% }{\endpicture} % \end{macrocode} % \end{environment} % \begin{macro}{\OVP@picture} -% Put box 0 and an optionally grid at the lower left corner of a +% Put box 0 and and optionally grid at the lower left corner of a % picture environment. % \begin{macrocode} \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]}% 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]}% |