diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r-- | Master/texmf-dist/tex/latex/overpic/overpic.sty | 54 |
1 files changed, 26 insertions, 28 deletions
diff --git a/Master/texmf-dist/tex/latex/overpic/overpic.sty b/Master/texmf-dist/tex/latex/overpic/overpic.sty index 361b0efe08d..65579d1f977 100644 --- a/Master/texmf-dist/tex/latex/overpic/overpic.sty +++ b/Master/texmf-dist/tex/latex/overpic/overpic.sty @@ -19,10 +19,10 @@ %% version 2005/12/01 or later. %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{overpic}[2020/02/22 1.3 picture overlays (RN)] -\RequirePackage{graphicx,epic} +\ProvidesPackage{overpic}[2024/01/04 2.0 picture overlays (RN)] +\RequirePackage{keyval,graphicx,epic} \newcommand*\OVP@scale{\z@} -\define@key{Gin}{rel}{% +\define@key{OVP}{rel}{% \def\OVP@scale{#1}% \ifnum\OVP@scale>\z@ \let\OVP@calc\OVP@calc@rel @@ -30,19 +30,21 @@ \PackageError{overpic}{Invalid number for option `rel'}\@ehc \fi } -\define@key{Gin}{percent}[]{% - \setkeys{Gin}{rel=100}% +\define@key{OVP}{percent}[]{% + \setkeys{OVP}{rel=100}% } -\define@key{Gin}{permil}[]{% - \setkeys{Gin}{rel=\@m}% +\define@key{OVP}{permil}[]{% + \setkeys{OVP}{rel=\@m}% } -\define@key{Gin}{abs}[]{% +\define@key{OVP}{abs}[]{% \let\OVP@calc\OVP@calc@abs } -\newif\ifGin@grid -\define@key{Gin}{grid}[true]{\lowercase{\Gin@boolkey{#1}}{grid}} -\define@key{Gin}{tics}{\count@=#1} -\define@key{Gin}{unit}{\unitlength=\dimexpr#1\relax} +\def\OVP@boolkey#1#2{% + \csname OVP@#2\ifx\relax#1\relax true\else#1\fi\endcsname} +\newif\ifOVP@grid +\define@key{OVP}{grid}[true]{\lowercase{\OVP@boolkey{#1}}{grid}} +\define@key{OVP}{tics}{\count@=#1} +\define@key{OVP}{unit}{\unitlength=\dimexpr#1\relax} \newcommand*\OVP@calc@abs{% \divide\@tempcnta by \unitlength \divide\@tempcntb by \unitlength @@ -65,30 +67,26 @@ \divide\count@ by 10 % \fi } -\DeclareOption{percent}{\setkeys{Gin}{rel=100}} -\DeclareOption{permil}{\setkeys{Gin}{rel=\@m}} -\DeclareOption{abs}{\setkeys{Gin}{abs}} +\DeclareOption{percent}{\setkeys{OVP}{rel=100}} +\DeclareOption{permil}{\setkeys{OVP}{rel=\@m}} +\DeclareOption{abs}{\setkeys{OVP}{abs}} \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{graphicx}} \ExecuteOptions{percent} \ProcessOptions \newsavebox\OVP@box \newenvironment{overpic}[2][]{% + \let\OVP@temp=\KV@errx + \let\KV@errx\@gobble \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@exclamation - \def\Gin@scalex{1}% - \let\Gin@scaley\Gin@exclamation + \count@=\z@ \OVP@gridfalse + \setkeys{OVP}{#1}% + \let\KV@errx\OVP@temp \OVP@picture{#1}% }{\endpicture} \newenvironment{Overpic}[2][]{% \sbox\OVP@box{#2}% - \count@=\z@ \Gin@gridfalse - \setkeys{Gin}{#1}% + \count@=\z@ \OVP@gridfalse + \setkeys{OVP}{#1}% \OVP@picture{#1}% }{\endpicture} \newcommand*\OVP@picture[1]{% @@ -99,13 +97,13 @@ \OVP@calc \picture(\@tempcnta,\@tempcntb)% \put(0,0){\makebox(0,0)[bl]{\usebox\OVP@box}}% - \ifGin@grid + \ifOVP@grid \put(0,0){\normalfont\fontsize\@viipt\@viiipt\selectfont \grid(\@tempcnta,\@tempcntb)(\count@,\count@)[0,0]}% \fi } \newcommand*\setOverpic[1]{% - \setkeys{Gin}{#1}% + \setkeys{OVP}{#1}% } \endinput %% |