diff options
author | Norbert Preining <norbert@preining.info> | 2023-09-04 03:04:17 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2023-09-04 03:04:17 +0000 |
commit | 6cc1e9947e6e547a181fd0510d399af947c7bbc9 (patch) | |
tree | f10ff1c91dcd60c85ba8e881b24b09911827a28a /macros/latex/contrib/wrapfig2/wrapfig2.dtx | |
parent | 59b528f442538943e1d34291a905464d987035ee (diff) |
CTAN sync 202309040304
Diffstat (limited to 'macros/latex/contrib/wrapfig2/wrapfig2.dtx')
-rw-r--r-- | macros/latex/contrib/wrapfig2/wrapfig2.dtx | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/macros/latex/contrib/wrapfig2/wrapfig2.dtx b/macros/latex/contrib/wrapfig2/wrapfig2.dtx index c7a30fa316..32cb07b20c 100644 --- a/macros/latex/contrib/wrapfig2/wrapfig2.dtx +++ b/macros/latex/contrib/wrapfig2/wrapfig2.dtx @@ -45,7 +45,7 @@ wrapfig2.sty and wrapfig2.pdf, plus this file README.txt. %<+package>\ProvidesPackage{wrapfig2}% %^^A<+readme>File README.txt for package wrapfig2 %<*package|readme> - [2023-09-01 v.6.2.0 Wrap text around figures, tables, framed text blocks] + [2023-09-03 v.6.2.1 Wrap text around figures, tables, framed text blocks] %</package|readme> %<*driver> % @@ -852,12 +852,17 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi % needs to be used; he was so kind to send me a % bug notice together with a minimum working % example. -% Thanks to Bruno Pagani whos pinpointed the exact +% Thanks to Bruno Pagani who pinpointed the exact % point that conflicts with \pack{wrapfig2} so -% that I could fix this conflict. +% that I could fix this conflict. Bruno Pagani +% discovered also that package \pack{amstext} is +% the source of this conflict and that this +% package is loaded not only by \pack{amsmath} +% but also by other packages such as, for example, +% by \pack{siunitx}. % %^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% \CheckSum{1428} +% \CheckSum{1427} % \StopEventually{} %^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % @@ -985,14 +990,14 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi % redefines some \pack{color} internal commands; everything is % explained in the \pack{xcolor} documentation.} % -% Here we have a little trick for avoiding -% conflicts with \pack{amsmath} and its|\text| -% command- +%In ordet to avoid conflicts with \pack{amstext} +% and its|\text| command, we have to save its +% definition before actually execution any part of +% this package, and restore ita value at the end +% of this package; see the second part of this +% procedure at the very end of this package. % \begin{macrocode} -\@ifpackageloaded{amsmath}{% -\let\amsmathtext\text -\AtEndPreamble{\let\text\amsmathtext}% -}{\relax} +\ifcsdef{text}{\let\amsTextText\text}{} % \end{macrocode} % % In order to define the new floating object \texttt{text} we have @@ -2081,6 +2086,8 @@ backgroundcolor, textcolor, fontstyle, radius, insertionwidth} \@tempa \fi +\ifcsdef{amsTextText}{\let\text\amsTextText}{} + % \end{macrocode} % %\iffalse |