texlive[61493] Master/texmf-dist: swfigure (4jan22)
commits+karl at tug.org
commits+karl at tug.org
Tue Jan 4 23:28:55 CET 2022
Revision: 61493
http://tug.org/svn/texlive?view=revision&revision=61493
Author: karl
Date: 2022-01-04 23:28:55 +0100 (Tue, 04 Jan 2022)
Log Message:
-----------
swfigure (4jan22)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/swfigure/README.txt
trunk/Master/texmf-dist/doc/latex/swfigure/swfigure.pdf
trunk/Master/texmf-dist/source/latex/swfigure/swfigure.dtx
trunk/Master/texmf-dist/tex/latex/swfigure/swfigure.sty
Modified: trunk/Master/texmf-dist/doc/latex/swfigure/README.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/swfigure/README.txt 2022-01-04 22:28:38 UTC (rev 61492)
+++ trunk/Master/texmf-dist/doc/latex/swfigure/README.txt 2022-01-04 22:28:55 UTC (rev 61493)
@@ -1,12 +1,12 @@
%%
%% This is file `README.txt',
%%
-%% Copyright (C) 2020 Claudio Beccari all rights reserved.
+%% Copyright (C) 2020-2022 Claudio Beccari all rights reserved.
%% License information appended
%%
File README.txt for package swfigure
- [2020-12-23 v.0.9.18 Managing large and spread wide figures]
+ [2022-01-04 v.0.9.19 Managing large and spread wide figures]
This bundle contains the swfigure.dtx, swfigure-examples.tex,
and README.txt files plus eight fake figures with extension .jpg
or .pdf and a screenshot with extension .pdf.
Modified: trunk/Master/texmf-dist/doc/latex/swfigure/swfigure.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/swfigure/swfigure.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/swfigure/swfigure.dtx 2022-01-04 22:28:38 UTC (rev 61492)
+++ trunk/Master/texmf-dist/source/latex/swfigure/swfigure.dtx 2022-01-04 22:28:55 UTC (rev 61493)
@@ -7,7 +7,7 @@
\keepsilent
\preamble
- Copyright (C) 2020 Claudio Beccari all rights reserved.
+ Copyright (C) 2020-2022 Claudio Beccari all rights reserved.
License information appended
\endpreamble
@@ -43,7 +43,7 @@
%</driver>
%<+package>\ProvidesPackage{swfigure}%
%<*package>
- [2020-12-23 v.0.9.18 Managing large and spread wide figures]
+ [2022-01-04 v.0.9.19 Managing large and spread wide figures]
%</package>
%<*driver>
\documentclass[a4paper]{ltxdoc}\errorcontextlines=9
@@ -107,7 +107,7 @@
%</driver>
% \fi
%
-% \CheckSum{1040}
+% \CheckSum{1042}
%
% \begin{abstract}
% This package defines a single command that with different options can
@@ -169,11 +169,13 @@
% lines of both text blocks are aligned.
%\item
% The slim tall image is set to the side of the text block with text
-% wrapping it. Recurse is made to the |wrapfig| package, therefore the
+% wrapping it. Recurse is made either to the |wrapfig| package
+% or the newer |wrapfig2| one if the latter exists, therefore the
% software might sometimes hick-up a little bit, because of the
-% idiosyncrasies of |wrapfig| that performs very well in most but not
-% all circumstances; see that package documentation for such |wrapfig|
-% limitations. With this |wsfigure| package we limit the use of this
+% idiosyncrasies of both |wrapfig| and |wrapfig2| that perform
+% very well in most but not all circumstances; see that package
+% documentation for such |wrapfig| and |wrapfig2|
+% limitations. With one of these packages we limit the use of this
% display mode to images that have a “height over width” aspect ratio
% not lower than~2; we provide also some option arguments so as to correct
% small imperfections in the sizing of the text indention
@@ -316,7 +318,11 @@
% little vertical space around the image and its caption; by examining
% the document draft it is possible to correct the predetermined
% number of indented lines by increasing or decreasing the vertical
-% space by any (integer) number of lines.
+% space by any (integer) number of lines. With |wrapfig2| it is
+% possible to use a final optional asterisk that changes the
+% information relative to the number of indented lines into a
+% correction of such number; its easier to count the missing or
+% the extra indented lines, that the whole number of such lines.
%
%\item[\meta{width test}] this further vertical bar-delimited argument
% is used only when dealing with vertical slim images; when they are
@@ -369,14 +375,14 @@
% not lower than~2; but for obvious reasons, it should not be too
% large, let's say, not larger than about~3 or~4. As always this depends
% on the page design and the caption size. The limitations of the
-% underlying |wrapfig| package forbid its usage too close to
-% explicit lists and texts typeset in special modes with a different
-% measure from normal text. Again it is up to the user to chose
+% underlying |wrapfig| or |wrapfig2| packages forbid their usage too
+% close to explicit lists and texts typeset in special modes with a
+% different measure from normal text. Again it is up to the user to chose
% where to insert the |DFfigure| environment or the |\DFimage| command.
-% The |wrapfig| package documentation and our experience, show that the
-% best position is just before a new paragraph; the environment end
-% should be placed after a suitable number of full paragraphs, even
-% if not all of them are involved with wrapping.
+% The |wrapfig| or |wrapfig2| package documentation, and our experience,
+% show that the best position is just before a new paragraph; the
+% environment end should be placed after a suitable number of full
+% paragraphs, even if not all of them are involved with wrapping.
%
% If the aspect ratio of the image to include is lower than~2, the
% following message is printed in the document where the image
@@ -517,6 +523,8 @@
%\bibitem{bib:lscape} D.P. Carlisle, \emph{The \texttt{lscape} package}. Version 3.02 released on 2020-05-28. PDF document readable with \texttt{texdoc lscape}.
%\bibitem{bib:afterpage} D.P. Carlisle, \emph{The \texttt{afterpage} package}. Version 1.08 released on 2014-10-28. PDF document readable with \texttt{texdoc afterpage}.
%\bibitem{bib:wrapfig} D. Arseneau, \emph{The \texttt{wrapfig} package}. Version 3.6 released on 2003-01-31.
+%\bibitem{bib:wrapfig2} C. Beccari, \emph{The \texttt{wrapfig2} package}.
+% Versione 4.0.4 released on 2022-01-04.
%\bibitem{bib:memman} P. Wilson, \emph{The Memoir Class for Configurable Typesetting} ---User guide. Version 3.7m released 2020-09-10. PDF document readable with \texttt{texdoc memman}.
%\end{thebibliography}
%
@@ -577,13 +585,20 @@
% to be executed if the test is true or false; the test is true if
% \meta{string} is listed into the \meta{named list}.
%
-% Packages |graphicx|, |afterpage|, and |wrapfig| are functional
-% for this package. In order to avoid “Option Clash” error messages,
-% such packages are loaded without any option; should the user load
-% some or all of them with options, the user should load them
+% Packages |graphicx|, |afterpage|, and |wrapfig| or |wrapfig2| are
+% functional for this package. In order to avoid “Option Clash” error
+% messages, such packages are loaded without any option; should the user
+% load some or all of them with options, the user should load them
% \emph{before} loading this package. This particular documentation
% does not require the |graphicx| package, because it is already
% loaded by |swfigure|.
+% Notice that |wrapfig2|, is loaded only if the \TeX\ system
+% installation is sufficiently recent; if the package si not part
+% of the installation the older |wrapfig| gets loaded. Moreover
+% if |wrapfig| is implicitly loaded by other packages, such as
+% |caption| or |subcaption|, that redefine some |wrapfig| internals,
+% the newer package |wrapfig2| aborts its own loading, because those
+% redefined internals are incompatible with it.
% \begin{macrocode}
\RequirePackage{etoolbox}
\RequirePackage{xfp}
@@ -606,7 +621,8 @@
\RequirePackage{graphicx}
\RequirePackage{afterpage}
-\RequirePackage{wrapfig}
+\IfFileExists{wrapfig2.sty}{%
+ \RequirePackage{wrapfig2}}{\RequirePackage{wrapfig}}
% \end{macrocode}
% We define some dimension and some counter registers; to some dimensions
Modified: trunk/Master/texmf-dist/tex/latex/swfigure/swfigure.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/swfigure/swfigure.sty 2022-01-04 22:28:38 UTC (rev 61492)
+++ trunk/Master/texmf-dist/tex/latex/swfigure/swfigure.sty 2022-01-04 22:28:55 UTC (rev 61493)
@@ -6,12 +6,12 @@
%%
%% swfigure.dtx (with options: `package')
%%
-%% Copyright (C) 2020 Claudio Beccari all rights reserved.
+%% Copyright (C) 2020-2022 Claudio Beccari all rights reserved.
%% License information appended
%%
\NeedsTeXFormat{LaTeX2e}[2020/01/01]
\ProvidesPackage{swfigure}%
- [2020-12-23 v.0.9.18 Managing large and spread wide figures]
+ [2022-01-04 v.0.9.19 Managing large and spread wide figures]
\RequirePackage{etoolbox}
\RequirePackage{xfp}
@@ -33,7 +33,8 @@
\RequirePackage{graphicx}
\RequirePackage{afterpage}
-\RequirePackage{wrapfig}
+\IfFileExists{wrapfig2.sty}{%
+ \RequirePackage{wrapfig2}}{\RequirePackage{wrapfig}}
\newdimen\internalmargin
\internalmargin=\dimexpr\oddsidemargin+1in+1bp\relax
More information about the tex-live-commits
mailing list.