texlive[74389] Master/texmf-dist: wrapfig2 (2mar25)
commits+karl at tug.org
commits+karl at tug.org
Sun Mar 2 22:33:44 CET 2025
Revision: 74389
https://tug.org/svn/texlive?view=revision&revision=74389
Author: karl
Date: 2025-03-02 22:33:43 +0100 (Sun, 02 Mar 2025)
Log Message:
-----------
wrapfig2 (2mar25)
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 2025-03-02 17:08:25 UTC (rev 74388)
+++ trunk/Master/texmf-dist/doc/latex/wrapfig2/README.txt 2025-03-02 21:33:43 UTC (rev 74389)
@@ -1,5 +1,5 @@
%%%% README.txt file
-This README.txt for package wrapfig2 [2024-01-18 v.7.0.0]
+This README.txt for package wrapfig2 [2025-03-01 v.7.0.2]
This work is author maintained
@@ -40,10 +40,10 @@
other packages) was discovered, but with version
6.2.2 this incompatibility was corrected.
-For the user version 7 does not appear different
-from version 6; the inner workings are different
-because the wraptext environment does not use
-anymore the functionalities of package curve2e,
+Notice to the user: version 7 does not appear
+different from version 6; the inner workings are
+different because the wraptext environment does not
+use anymore the functionalities of package curve2e,
but uses directly those of package pict2e,
therefore avoiding some conflicts that have been
reported the the maintainer.
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 2025-03-02 17:08:25 UTC (rev 74388)
+++ trunk/Master/texmf-dist/source/latex/wrapfig2/wrapfig2.dtx 2025-03-02 21:33:43 UTC (rev 74389)
@@ -8,7 +8,7 @@
\preamble
Copyright (C) 1991-2004 by Donald Arseneau (asnd at triumf.ca)
-Copyright (C) 2021-2024 by Claudio Beccari (claudio.beccari at gmail.com)
+Copyright (C) 2021-2025 by Claudio Beccari (claudio.beccari at gmail.com)
License information appended
\endpreamble
@@ -45,7 +45,7 @@
%<+package>\ProvidesPackage{wrapfig2}%
%^^A<+readme>File README.txt for package wrapfig2
%<*package|readme>
- [2024-01-18 v.7.0.0 Wrap text around figures, tables, framed text blocks]
+ [2025-03-01 v.7.0.2 Wrap text around figures, tables, framed text blocks]
%</package|readme>
%<*driver>
%
@@ -243,7 +243,7 @@
% argument so that the \meta{number of indented lines} argument
% does not mean the total number, but the correction number to
% add-to or subtract-from the value computed by the default
-% algorythm devised by Arseneau.
+% algorhythm devised by Arseneau.
%
% We assume that most users first use the software to insert an
% object to be wrapped by the surrounding text without
@@ -346,7 +346,6 @@
%\cs{includeframedtext}\oarg{insertion measure}\marg{text to frame}\oarg{key=value settings}\oarg{radius}
%\Eambiente{wraptext}
% \end{ttsintassi}
-%
% \noindent
%\textcolor{red}{Please notice that the \Env{wraptext}
% environment does not require any optional star, because the
@@ -443,11 +442,11 @@
% Third & Fourth\\
% \hline
%\end{tabular}
-%\caption{A small table}\label{tab;small-table}
+%\caption{A small table}\label{tab:small-table}
%\end{wraptable}
%{\itshape \kant[2]}
%
-% The wrapped small table~\ref{tab;small-table} has been typeset
+% The wrapped small table~\ref{tab:small-table} has been typeset
% by means of the following code.
%\begin{flushleft}\ttfamily\obeylines
%\Bambiente{wraptable}\Oarg{-1}\Marg{l}*
@@ -533,7 +532,7 @@
% framed box, while versions~5,~6, and~7 print a visible warning
% message and in the \texttt{.log} file.
%
-% \begin{wraptext}{r}
+% \begin{wraptext}{r}{0.5\linewidth}\centering
% \includeframedtext{Text, text, text, text, text, text, text, text, text, text, text.}
%\caption{A wrapped text}%
% \end{wraptext}
@@ -831,7 +830,7 @@
% the above environment automatically resets the insertion width
% $y$ to the nearest bound. Of course authors have the
% possibility to change the preset $x$ value, if they redefine
-% the \cs{WFscalefactor} macro, but such resetting is strongly
+% the \cs{WF } macro, but such resetting is strongly
% discouraged; the default value is~$0.8$.
%
%\begin{wraptext}{l}
@@ -980,13 +979,19 @@
% but also by other packages such as, for example,
% by \pack{siunitx}.
%
-% Many thanks to Ulrike Fisher who found a loading order problem
-% reported on \texttt{tex.stackexchange} because a conflict with
-% package \pack{circledsteps}, that should be loaded bifore
-% \pack{wrapfig2}. Thanks a lot Ulrike.
+% Many thanks to Ulrike Fisher who found a loading
+% order problem reported on
+% \texttt{tex.stackexchange} because a conflict with
+% package \pack{circledsteps}, that should be loaded
+% before \pack{wrapfig2}. Thanks a lot Ulrike.
%
+% Thanks to Marei, who spotted a sneaky error that I
+% never found in my tests; he even pointed out the
+% line number where such error was present. Thanks a
+% lot Marei.
+%
%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% \CheckSum{1382}
+% \CheckSum{1381}
% \StopEventually{}
%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
@@ -1216,8 +1221,8 @@
\def\WFscalefactor{0.8}%
\newcommand*\WFscalewidth{%
- \WFinsertwidthL=\fpeval{\WFscalefactor*0.5\columnwidth}\p@
- \WFinsertwidthH=\fpeval{0.5\columnwidth/\WFscalefactor}\p@
+ \WFinsertwidthL=\fpeval{\WFscalefactor*0.5\linewidth}\p@
+ \WFinsertwidthH=\fpeval{0.5\linewidth/\WFscalefactor}\p@
\ifdim\insertwidth<\WFinsertwidthL
\insertwidth=\WFinsertwidthL
\else
@@ -1249,7 +1254,7 @@
\DeclareOptionX<wraptext>{textcolor}[WFtext]{\SetWFtxt{#1}}
\DeclareOptionX<wraptext>{fontstyle}[\normalfont]{#1}
\DeclareOptionX<wraptext>{radius}[\fboxsep]{\radius=#1}
-\DeclareOptionX<wraptext>{insertionwidth}[0.5\columnwidth]{\insertwidth=#1}
+\DeclareOptionX<wraptext>{insertionwidth}[0.5\linewidth]{\insertwidth=#1}
\DeclareOptionX*{\PackageWarning{wrapfig2}%
{`\CurrentOption' ignored}}
@@ -1332,7 +1337,8 @@
% \begin{macrocode}
\ifboolexpr{ bool{WFfive} or bool{WFnew} }%
{\NewDocumentCommand\includeframedtext{%
- O{\insertwidth} m O{} o}{\bgroup%
+ O{\insertwidth} m O{} o}{%
+ \bgroup
\ExecuteOptionsX<wraptext>{#3}% executes possible options
\insertwidth=#1\WFscalewidth
\framedbox{\insertwidth}{\fboxrule}{\fboxsep}[\radius]{#2}\egroup}
@@ -1365,7 +1371,7 @@
% its default value is going to be set to \cs{fboxsep}: in this
% version its value is specified with the setting
% \texttt{radius=\meta{dimension}} among the other
-% \meta{ket=value settings}; the default value is certainly the
+% \meta{key=value settings}; the default value is certainly the
% best one, but users can specify a different value, of course
% not too different from the default one. See some examples in
% figure~\ref{fig:framed text}.
@@ -1589,10 +1595,12 @@
% while it is optional for version~4.
% \begin{macrocode}
\ifboolexpr{bool{WFnew} or bool{WFfive}}{% definition for versions 5 to 7
-\NewDocumentEnvironment{wraptext}{O{0} m O{0pt} G{0.5\columnwidth} s}{%
+\NewDocumentEnvironment{wraptext}%
+ {O{0} m O{0pt} G{0.5\linewidth} s}%
+ {%
\insertwidth=#4\WFscalewidth
+ \def\textcorrection{#1}%
\def\textplacement{#2}%
- \def\textcorrection{#1}%
\def\textoverhang{#3}%
\IfBooleanT{#5}{\PackageWarning{wrapfig2}{%
*********************************************\MessageBreak
@@ -1611,7 +1619,7 @@
\fi
\@dblarg{\@caption\@captype}%
}%
-}{\endwrapfloat\ignorespaces}%
+}{\endwrapfloat\ignorespaces}}%
% \end{macrocode}
%
% For the fallback to version~4 definition of this
@@ -1645,7 +1653,7 @@
% settings, is confined within a group delimited, for example,
% by the \cs{begingroup} and \cs{endgroup} commands.
% \begin{macrocode}
-}{% definition for version 4 fall back
+{% definition for version 4 fall back
%
\NewDocumentEnvironment{wraptext}%
{O{l} D||{0.5\columnwidth} D<>{0} D(){text}}%
@@ -1822,7 +1830,7 @@
\global\WF at floattrue
\fi
\ifx\parshape\WF at fudgeparshape
- \unless\ifWF at float\\WF at collision\fi
+ \unless\ifWF at float\WF at collision\fi
\else
\ifx\par\@@par
\ifnum\@@parshape>\z@\WF at conflict\fi
Modified: trunk/Master/texmf-dist/tex/latex/wrapfig2/wrapfig2.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/wrapfig2/wrapfig2.sty 2025-03-02 17:08:25 UTC (rev 74388)
+++ trunk/Master/texmf-dist/tex/latex/wrapfig2/wrapfig2.sty 2025-03-02 21:33:43 UTC (rev 74389)
@@ -7,12 +7,12 @@
%% wrapfig2.dtx (with options: `package')
%%
%% Copyright (C) 1991-2004 by Donald Arseneau (asnd at triumf.ca)
-%% Copyright (C) 2021-2024 by Claudio Beccari (claudio.beccari at gmail.com)
+%% Copyright (C) 2021-2025 by Claudio Beccari (claudio.beccari at gmail.com)
%% License information appended
%%
\NeedsTeXFormat{LaTeX2e}[2019/01/01]
\ProvidesPackage{wrapfig2}%
- [2024-01-18 v.7.0.0 Wrap text around figures, tables, framed text blocks]
+ [2025-03-01 v.7.0.2 Wrap text around figures, tables, framed text blocks]
\ifcsname c at WF@wrappedlines\endcsname
\PackageError{wrapfig2}{
\MessageBreak
@@ -98,8 +98,8 @@
\def\WFscalefactor{0.8}%
\newcommand*\WFscalewidth{%
- \WFinsertwidthL=\fpeval{\WFscalefactor*0.5\columnwidth}\p@
- \WFinsertwidthH=\fpeval{0.5\columnwidth/\WFscalefactor}\p@
+ \WFinsertwidthL=\fpeval{\WFscalefactor*0.5\linewidth}\p@
+ \WFinsertwidthH=\fpeval{0.5\linewidth/\WFscalefactor}\p@
\ifdim\insertwidth<\WFinsertwidthL
\insertwidth=\WFinsertwidthL
\else
@@ -117,7 +117,7 @@
\DeclareOptionX<wraptext>{textcolor}[WFtext]{\SetWFtxt{#1}}
\DeclareOptionX<wraptext>{fontstyle}[\normalfont]{#1}
\DeclareOptionX<wraptext>{radius}[\fboxsep]{\radius=#1}
-\DeclareOptionX<wraptext>{insertionwidth}[0.5\columnwidth]{\insertwidth=#1}
+\DeclareOptionX<wraptext>{insertionwidth}[0.5\linewidth]{\insertwidth=#1}
\DeclareOptionX*{\PackageWarning{wrapfig2}%
{`\CurrentOption' ignored}}
@@ -137,7 +137,8 @@
\ifboolexpr{ bool{WFfive} or bool{WFnew} }%
{\NewDocumentCommand\includeframedtext{%
- O{\insertwidth} m O{} o}{\bgroup%
+ O{\insertwidth} m O{} o}{%
+ \bgroup
\ExecuteOptionsX<wraptext>{#3}% executes possible options
\insertwidth=#1\WFscalewidth
\framedbox{\insertwidth}{\fboxrule}{\fboxsep}[\radius]{#2}\egroup}
@@ -174,10 +175,12 @@
\egroup\ignorespaces}
\ifboolexpr{bool{WFnew} or bool{WFfive}}{% definition for versions 5 to 7
-\NewDocumentEnvironment{wraptext}{O{0} m O{0pt} G{0.5\columnwidth} s}{%
+\NewDocumentEnvironment{wraptext}%
+ {O{0} m O{0pt} G{0.5\linewidth} s}%
+ {%
\insertwidth=#4\WFscalewidth
+ \def\textcorrection{#1}%
\def\textplacement{#2}%
- \def\textcorrection{#1}%
\def\textoverhang{#3}%
\IfBooleanT{#5}{\PackageWarning{wrapfig2}{%
*********************************************\MessageBreak
@@ -196,8 +199,8 @@
\fi
\@dblarg{\@caption\@captype}%
}%
-}{\endwrapfloat\ignorespaces}%
-}{% definition for version 4 fall back
+}{\endwrapfloat\ignorespaces}}%
+{% definition for version 4 fall back
\NewDocumentEnvironment{wraptext}%
{O{l} D||{0.5\columnwidth} D<>{0} D(){text}}%
{% Open environment
@@ -269,7 +272,7 @@
\global\WF at floattrue
\fi
\ifx\parshape\WF at fudgeparshape
- \unless\ifWF at float\\WF at collision\fi
+ \unless\ifWF at float\WF at collision\fi
\else
\ifx\par\@@par
\ifnum\@@parshape>\z@\WF at conflict\fi
More information about the tex-live-commits
mailing list.