texlive[48550] Master/texmf-dist: overpic (2sep18)
commits+karl at tug.org
commits+karl at tug.org
Sun Sep 2 23:16:00 CEST 2018
Revision: 48550
http://tug.org/svn/texlive?view=revision&revision=48550
Author: karl
Date: 2018-09-02 23:15:59 +0200 (Sun, 02 Sep 2018)
Log Message:
-----------
overpic (2sep18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/overpic/overpic.pdf
trunk/Master/texmf-dist/source/latex/overpic/overpic.dtx
trunk/Master/texmf-dist/tex/latex/overpic/overpic.sty
Modified: trunk/Master/texmf-dist/doc/latex/overpic/overpic.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/overpic/overpic.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/overpic/overpic.dtx 2018-09-02 21:15:41 UTC (rev 48549)
+++ trunk/Master/texmf-dist/source/latex/overpic/overpic.dtx 2018-09-02 21:15:59 UTC (rev 48550)
@@ -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 at scale}
-% Reference value for rel mode, "100" (percent) and "1000" (permil)
+% Reference value for rel mode (percent: 100, permil: 1000)
% \begin{macrocode}
\newcommand*\OVP at scale{\z@}
% \end{macrocode}
% \end{macro}
-% All the keys.
+% All the keys:
% \begin{macrocode}
\define at key{Gin}{rel}{%
\def\OVP at 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 at 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 at box{\includegraphics[#1]{#2}}%
+ \count@=\z@ \Gin at gridfalse
+ \setkeys{Gin}{#1}%
% \end{macrocode}
-% reset the graphics parameter
+% Reset the graphics parameter:
% \begin{macrocode}
\let\Gin at outer@scalex\relax
\let\Gin at outer@scaley\relax
\let\Gin at angle\relax
\let\Gin at ewidth\Gin at exclamation
- \let\Gin at eheight\Gin at ewidth
+ \let\Gin at eheight\Gin at exclamation
\def\Gin at scalex{1}%
\let\Gin at scaley\Gin at exclamation
\OVP at picture{#1}%
@@ -343,25 +348,23 @@
% Box 0 gets any \TeX\ code.
% \begin{macrocode}
\newenvironment{Overpic}[2][]{%
- \sbox\z@{#2}%
+ \sbox\OVP at box{#2}%
\OVP at picture{#1}%
}{\endpicture}
% \end{macrocode}
% \end{environment}
% \begin{macro}{\OVP at 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 at picture[1]{%
- \settodepth{\@tempcnta}{\usebox\z@}%
- \settoheight{\@tempcntb}{\usebox\z@}%
+ \settodepth{\@tempcnta}{\usebox\OVP at box}%
+ \settoheight{\@tempcntb}{\usebox\OVP at box}%
\advance\@tempcntb\@tempcnta
- \settowidth{\@tempcnta}{\usebox\z@}%
- \count@=\z@ \Gin at gridfalse
- \setkeys{Gin}{#1}%
+ \settowidth{\@tempcnta}{\usebox\OVP at box}%
\OVP at calc
\picture(\@tempcnta,\@tempcntb)%
- \put(0,0){\makebox(0,0)[bl]{\usebox\z@}}%
+ \put(0,0){\makebox(0,0)[bl]{\usebox\OVP at box}}%
\ifGin at grid
\put(0,0){\normalfont\fontsize\@viipt\@viiipt\selectfont
\grid(\@tempcnta,\@tempcntb)(\count@,\count@)[0,0]}%
Modified: trunk/Master/texmf-dist/tex/latex/overpic/overpic.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/overpic/overpic.sty 2018-09-02 21:15:41 UTC (rev 48549)
+++ trunk/Master/texmf-dist/tex/latex/overpic/overpic.sty 2018-09-02 21:15:59 UTC (rev 48550)
@@ -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 at scale{\z@}
\define at key{Gin}{rel}{%
@@ -71,31 +71,32 @@
\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{graphicx}}
\ExecuteOptions{percent}
\ProcessOptions
+\newsavebox\OVP at box
\newenvironment{overpic}[2][]{%
- \sbox\z@{\includegraphics[#1]{#2}}%
+ \sbox\OVP at box{\includegraphics[#1]{#2}}%
+ \count@=\z@ \Gin at gridfalse
+ \setkeys{Gin}{#1}%
\let\Gin at outer@scalex\relax
\let\Gin at outer@scaley\relax
\let\Gin at angle\relax
\let\Gin at ewidth\Gin at exclamation
- \let\Gin at eheight\Gin at ewidth
+ \let\Gin at eheight\Gin at exclamation
\def\Gin at scalex{1}%
\let\Gin at scaley\Gin at exclamation
\OVP at picture{#1}%
}{\endpicture}
\newenvironment{Overpic}[2][]{%
- \sbox\z@{#2}%
+ \sbox\OVP at box{#2}%
\OVP at picture{#1}%
}{\endpicture}
\newcommand*\OVP at picture[1]{%
- \settodepth{\@tempcnta}{\usebox\z@}%
- \settoheight{\@tempcntb}{\usebox\z@}%
+ \settodepth{\@tempcnta}{\usebox\OVP at box}%
+ \settoheight{\@tempcntb}{\usebox\OVP at box}%
\advance\@tempcntb\@tempcnta
- \settowidth{\@tempcnta}{\usebox\z@}%
- \count@=\z@ \Gin at gridfalse
- \setkeys{Gin}{#1}%
+ \settowidth{\@tempcnta}{\usebox\OVP at box}%
\OVP at calc
\picture(\@tempcnta,\@tempcntb)%
- \put(0,0){\makebox(0,0)[bl]{\usebox\z@}}%
+ \put(0,0){\makebox(0,0)[bl]{\usebox\OVP at box}}%
\ifGin at grid
\put(0,0){\normalfont\fontsize\@viipt\@viiipt\selectfont
\grid(\@tempcnta,\@tempcntb)(\count@,\count@)[0,0]}%
More information about the tex-live-commits
mailing list