texlive[69335] Master/texmf-dist: overpic (6jan24)
commits+karl at tug.org
commits+karl at tug.org
Sun Jan 7 22:26:42 CET 2024
Revision: 69335
https://tug.org/svn/texlive?view=revision&revision=69335
Author: karl
Date: 2024-01-07 22:26:42 +0100 (Sun, 07 Jan 2024)
Log Message:
-----------
overpic (6jan24)
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 2024-01-07 21:26:34 UTC (rev 69334)
+++ trunk/Master/texmf-dist/source/latex/overpic/overpic.dtx 2024-01-07 21:26:42 UTC (rev 69335)
@@ -19,7 +19,7 @@
%
%<*package>
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{overpic}[2024/01/04 2.0 picture overlays (RN)]
+\ProvidesPackage{overpic}[2024/01/06 2.1 picture overlays (RN)]
%</package>
%
%<*driver>
@@ -58,7 +58,7 @@
%</driver>
% \fi
%
-% \CheckSum{178}
+% \CheckSum{199}
%
% \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
@@ -289,7 +289,7 @@
}
% \end{macrocode}
% \end{macro}
-% \changes{2.0}{2024/01/01}{Use a separate namespace for the keys to avoid
+% \changes{2.0}{2024/01/04}{Use a separate namespace for the keys to avoid
% unfavorable influence on \cmd\includegraphics.}
% \begin{macro}{\OVP at calc@rel}
% Some calculations in rel mode. The bigger value of width or height
@@ -323,6 +323,25 @@
\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{graphicx}}
\ExecuteOptions{percent}
\ProcessOptions
+\AtBeginDocument{%
+ \@ifpackageloaded{xkeyval}{%
+ \def\OVP at setkeys@relaxed{%
+ \let\OVP at setkeys\setkeys
+ \def\setkeys{\OVP at setkeys*}
+ }
+ \def\OVP at setkeys@strict{%
+ \let\setkeys\OVP at setkeys
+ }
+ }{%
+ \def\OVP at setkeys@relaxed{%
+ \let\OVP at KV@errx\KV at errx
+ \let\KV at errx\@gobble
+ }
+ \def\OVP at setkeys@strict{%
+ \let\KV at errx\OVP at KV@errx
+ }
+ }
+}
\newsavebox\OVP at box
% \end{macrocode}
%
@@ -331,20 +350,20 @@
% \changes{1.2}{2018/09/02}{Wrong place of \cmd\setkeys
% (bug report from 'aminophen')}
% \changes{2.0}{2024/01/04}{Better key handling}
+% \changes{2.1}{2024/01/06}{Consideration of xkeyval's \cmd\setkeys}
% \begin{macrocode}
\newenvironment{overpic}[2][]{%
- \let\OVP at temp=\KV at errx
% \end{macrocode}
% Silently ignore unknown keys.
% \begin{macrocode}
- \let\KV at errx\@gobble
+ \OVP at setkeys@relaxed
\sbox\OVP at box{\includegraphics[#1]{#2}}%
\count@=\z@ \OVP at gridfalse
\setkeys{OVP}{#1}%
% \end{macrocode}
-% Reset to previous state.
+% Stop ignoring unknown keys.
% \begin{macrocode}
- \let\KV at errx\OVP at temp
+ \OVP at setkeys@strict
\OVP at picture{#1}%
}{\endpicture}
% \end{macrocode}
Modified: trunk/Master/texmf-dist/tex/latex/overpic/overpic.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/overpic/overpic.sty 2024-01-07 21:26:34 UTC (rev 69334)
+++ trunk/Master/texmf-dist/tex/latex/overpic/overpic.sty 2024-01-07 21:26:42 UTC (rev 69335)
@@ -19,7 +19,7 @@
%% version 2005/12/01 or later.
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{overpic}[2024/01/04 2.0 picture overlays (RN)]
+\ProvidesPackage{overpic}[2024/01/06 2.1 picture overlays (RN)]
\RequirePackage{keyval,graphicx,epic}
\newcommand*\OVP at scale{\z@}
\define at key{OVP}{rel}{%
@@ -73,14 +73,32 @@
\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{graphicx}}
\ExecuteOptions{percent}
\ProcessOptions
+\AtBeginDocument{%
+ \@ifpackageloaded{xkeyval}{%
+ \def\OVP at setkeys@relaxed{%
+ \let\OVP at setkeys\setkeys
+ \def\setkeys{\OVP at setkeys*}
+ }
+ \def\OVP at setkeys@strict{%
+ \let\setkeys\OVP at setkeys
+ }
+ }{%
+ \def\OVP at setkeys@relaxed{%
+ \let\OVP at KV@errx\KV at errx
+ \let\KV at errx\@gobble
+ }
+ \def\OVP at setkeys@strict{%
+ \let\KV at errx\OVP at KV@errx
+ }
+ }
+}
\newsavebox\OVP at box
\newenvironment{overpic}[2][]{%
- \let\OVP at temp=\KV at errx
- \let\KV at errx\@gobble
+ \OVP at setkeys@relaxed
\sbox\OVP at box{\includegraphics[#1]{#2}}%
\count@=\z@ \OVP at gridfalse
\setkeys{OVP}{#1}%
- \let\KV at errx\OVP at temp
+ \OVP at setkeys@strict
\OVP at picture{#1}%
}{\endpicture}
\newenvironment{Overpic}[2][]{%
More information about the tex-live-commits
mailing list.