summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-02-23 21:10:15 +0000
committerKarl Berry <karl@freefriends.org>2023-02-23 21:10:15 +0000
commitaf3daade8258fda5c0065d43952c4db91fd1edce (patch)
tree97464b2cf4ec9251c47a50da47a17acd4c39a3ea /Master/texmf-dist/tex
parent475e83fff3141e2a85e09558f86e0ff1b62bd96a (diff)
wrapfig2 (23feb23)
git-svn-id: svn://tug.org/texlive/trunk@66095 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/wrapfig2/wrapfig2.sty23
1 files changed, 19 insertions, 4 deletions
diff --git a/Master/texmf-dist/tex/latex/wrapfig2/wrapfig2.sty b/Master/texmf-dist/tex/latex/wrapfig2/wrapfig2.sty
index 508e88fc576..5c87db5f5c5 100644
--- a/Master/texmf-dist/tex/latex/wrapfig2/wrapfig2.sty
+++ b/Master/texmf-dist/tex/latex/wrapfig2/wrapfig2.sty
@@ -7,12 +7,12 @@
%% wrapfig2.dtx (with options: `package')
%%
%% Copyright (C) 1991-2003 by Donald Arseneau (asnd@triumf.ca)
-%% Copyright (C) 2021-2022 by Claudio Beccari (claudio.beccari@gmail.com)
+%% Copyright (C) 2021-2023 by Claudio Beccari (claudio.beccari@gmail.com)
%% License information appended
%%
\NeedsTeXFormat{LaTeX2e}[2019/01/01]
\ProvidesPackage{wrapfig2}%
- [2022-02-16 v.6.0.0 Wrap text around figures, tables, framed text blocks]
+ [2023-02-23 v.6.1.1 Wrap text around figures, tables, framed text blocks]
\ifcsname c@WF@wrappedlines\endcsname
\PackageError{wrapfig2}{ \MessageBreak
****************************************************\MessageBreak
@@ -28,6 +28,15 @@
you must kill your job!}
\expandafter\endinput\fi
+\@ifpackageloaded{amsmath}{%
+ \PackageError{wrapfig2}{ \MessageBreak
+ +++++++++++++++++++++++++++++++++++++++++++\MessageBreak
+ Package amsmath already loaded \MessageBreak
+ If you need amsmath, load it after wrapfig2\MessageBreak
+ Expect error messages \MessageBreak
+ +++++++++++++++++++++++++++++++++++++++++++\MessageBreak
+ \MessageBreak
+ }{Abort the job}}{\relax}
\def\WF@warning{\PackageWarning{wrapfig2}}
\DeclareOption{verbose}{\def\WF@info{\PackageInfo{wrapfig2}}}
\newif\ifWFnew \let\ifWFnew\iftrue
@@ -179,11 +188,17 @@ backgroundcolor, textcolor, fontstyle, radius, insertionwidth}
\egroup}
\ifboolexpr{bool{WFnew} or bool{WFfive}}{% definition for versions 5 and 6
-\NewDocumentEnvironment{wraptext}{O{0} m O{0pt} G{0.5\columnwidth}}{%
+\NewDocumentEnvironment{wraptext}{O{0} m O{0pt} G{0.5\columnwidth} s}{%
\insertwidth=#4\WFscalewidth
\def\textplacement{#2}%
\def\textcorrection{#1}%
\def\textoverhang{#3}%
+ \IfBooleanTF{#5}{\PackageWarning{wrapfig2}{%
+ *********************************************\MessageBreak
+ With wraptext the optional star is useless \MessageBreak
+ because the first optional argument always \MessageBreak
+ means the "lines number CORRECTION" \MessageBreak
+ *********************************************\MessageBreak}}{}%%%<------------------
\bgroup\edef\x{\egroup\noexpand\wrapfloat{text}%
[\textcorrection]{\textplacement}[\textoverhang]{\insertwidth}*}\x%
\def\caption{\unskip
@@ -584,7 +599,7 @@ backgroundcolor, textcolor, fontstyle, radius, insertionwidth}
\@ifundefined{float@restyle}%
{% older float.sty
- \toks@=\expandafter{\restylefloat{##1}% env. might be undefined
+ \toks@=\expandafter{\restylefloat{##1}% env. might be undefined
\@namedef{wrap#1}{%
\def\@captype{#1}\@nameuse{fst@#1}%
\def\WF@floatstyhook{\let\@currbox\WF@box \columnwidth\wd\WF@box