diff options
author | Karl Berry <karl@freefriends.org> | 2023-02-23 21:26:20 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-02-23 21:26:20 +0000 |
commit | 995776a464feea0e68df51382dff5719cfc6b1ee (patch) | |
tree | e950628a28fa7d6443fe455b594a6fa3990d1af6 /Master/texmf-dist/tex/latex | |
parent | e9600298c460ca15456c5ec10317b032d5bd57a4 (diff) |
wrapfig2 (23feb23) (branch)
git-svn-id: svn://tug.org/texlive/branches/branch2022.final@66098 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r-- | Master/texmf-dist/tex/latex/wrapfig2/wrapfig2.sty | 23 |
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 |