texlive[68164] Master/texmf-dist: wrapfig2 (3sep23)

[commits+karl at tug.org]

Revision: 68164
          http://tug.org/svn/texlive?view=revision&revision=68164
Author:   karl
Date:     2023-09-03 22:12:28 +0200 (Sun, 03 Sep 2023)
Log Message:
-----------
wrapfig2 (3sep23)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/wrapfig2/README.txt
    trunk/Master/texmf-dist/doc/latex/wrapfig2/wrapfig2.pdf
    trunk/Master/texmf-dist/source/latex/wrapfig2/wrapfig2.dtx
    trunk/Master/texmf-dist/tex/latex/wrapfig2/wrapfig2.sty

Modified: trunk/Master/texmf-dist/doc/latex/wrapfig2/README.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/wrapfig2/README.txt	2023-09-03 20:12:19 UTC (rev 68163)
+++ trunk/Master/texmf-dist/doc/latex/wrapfig2/README.txt	2023-09-03 20:12:28 UTC (rev 68164)
@@ -1,5 +1,5 @@
 %%%% README.txt file
-This README.txt for package wrapfig2[2023-09-01 v.6.2.0 ...]
+This README.txt is for package wrapfig2[2023-09-03 v.6.2.1]
 
 This work is author maintained
 
@@ -25,7 +25,7 @@
 with Arseneau's original environments. Future 
 experience may confirm this statement.
 
-The user commands are defined by means of the 
+Some user commands are defined by means of the 
 LaTeX3 functionalities. Therefore this package does 
 not work with LaTeX2e kernels older than about 
 2018, although a warning is issued if the LaTeX 
@@ -40,8 +40,9 @@
 back to version 5 and version 4.
 
 IMPORTANT NOTICE: An incompatibility with the 
-amsmath package but with version 6.2.0  this 
-incompatibility was corrected.
+amstext package (loaded by amsmath, siunitx, and 
+other packages) was discovered, but with version
+6.2.1  this incompatibility was corrected.
 
 Claudio Beccari
 

Modified: trunk/Master/texmf-dist/doc/latex/wrapfig2/wrapfig2.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/source/latex/wrapfig2/wrapfig2.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/wrapfig2/wrapfig2.dtx	2023-09-03 20:12:19 UTC (rev 68163)
+++ trunk/Master/texmf-dist/source/latex/wrapfig2/wrapfig2.dtx	2023-09-03 20:12:28 UTC (rev 68164)
@@ -45,7 +45,7 @@
 %<+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 @@
 % 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 @@
 % 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 @@
   \@tempa
 \fi
 
+\ifcsdef{amsTextText}{\let\text\amsTextText}{}
+
 %    \end{macrocode}
 %
 %\iffalse

Modified: trunk/Master/texmf-dist/tex/latex/wrapfig2/wrapfig2.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/wrapfig2/wrapfig2.sty	2023-09-03 20:12:19 UTC (rev 68163)
+++ trunk/Master/texmf-dist/tex/latex/wrapfig2/wrapfig2.sty	2023-09-03 20:12:28 UTC (rev 68164)
@@ -12,7 +12,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2019/01/01]
 \ProvidesPackage{wrapfig2}%
- [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]
 \ifcsname c at WF@wrappedlines\endcsname
 \PackageError{wrapfig2}{
 \MessageBreak
@@ -47,10 +47,7 @@
 \@ifpackageloaded{curve2e}{}{\RequirePackage{curve2e}}
 \@ifpackageloaded{xkeyval}{}{\RequirePackage{xkeyval}}
 
-\@ifpackageloaded{amsmath}{%
-\let\amsmathtext\text
-\AtEndPreamble{\let\text\amsmathtext}%
-}{\relax}
+\ifcsdef{text}{\let\amsTextText\text}{}
 \ifboolexpr{ bool{WFfive} or bool{WFnew} }%
    {\floatstyle{plain}%
   \ifcsname chapter\endcsname
@@ -631,6 +628,8 @@
   \@tempa
 \fi
 
+\ifcsdef{amsTextText}{\let\text\amsTextText}{}
+
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of