texlive[51003] Master: endfloat (15apr19)
commits+karl at tug.org
commits+karl at tug.org
Sun May 5 19:43:13 CEST 2019
Revision: 51003
http://tug.org/svn/texlive?view=revision&revision=51003
Author: karl
Date: 2019-05-05 19:43:13 +0200 (Sun, 05 May 2019)
Log Message:
-----------
endfloat (15apr19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/endfloat/README
trunk/Master/texmf-dist/doc/latex/endfloat/endfloat.pdf
trunk/Master/texmf-dist/source/latex/endfloat/endfloat.dtx
trunk/Master/texmf-dist/tex/latex/endfloat/endfloat.sty
trunk/Master/tlpkg/bin/tlpkginfo
trunk/Master/tlpkg/libexec/ctan2tds
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/endfloat/efxmpl.cfg
trunk/Master/texmf-dist/source/latex/endfloat/endfloat.drv
Removed Paths:
-------------
trunk/Master/texmf-dist/tex/latex/endfloat/efxmpl.cfg
Modified: trunk/Master/texmf-dist/doc/latex/endfloat/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/endfloat/README 2019-05-05 17:39:49 UTC (rev 51002)
+++ trunk/Master/texmf-dist/doc/latex/endfloat/README 2019-05-05 17:43:13 UTC (rev 51003)
@@ -1,4 +1,4 @@
-This is the readme file for the endfloat package v2.6
+This is the readme file for the endfloat package v2.7
This readme was modified on October 2, 1997 but without
updated endfloat itself, instead to fix errors in this file
@@ -15,6 +15,10 @@
<axel.sommerfeldt at f-m.fm> to reflect the changes introduced
with version 2.6 of the endfloat package.
+It was again modified on April 15, 2019, by Axel Sommerfeldt
+<axel.sommerfeldt at f-m.fm> to reflect the changes introduced
+with version 2.7 of the endfloat package.
+
Endfloat is a LaTeX package. Versions 2.1 and above require
LaTeX2e.
@@ -55,6 +59,14 @@
of contents.
===============================================================================
+Major changes in version 2.7 since 2.6:
+ New package option 'disable' has been added.
+ New command \addtodelayedfloat has beed added.
+ New macros \efloatbegin, \efloatend, \efloatbeginlist,
+ and \efloatendlist for customization have been added.
+ The bugfix regarding the usage of UTF-8 characters in floating environments
+ has been revised.
+
Major changes in version 2.6 since 2.5:
New package options 'notables' and 'nofigures' have been added.
New macros \efloattype, \efloatheading, \efloatpreamble, and \efloatpostamble
@@ -79,17 +91,15 @@
generally.
===============================================================================
-Maintainer: Axel Sommerfeldt <axel.sommerfeldt at f-m.fm>
-Original authors: James Darrell McCauley and Jeff Goldberg (jeffrey at goldmark.org)
+Maintainer: -none-
+Original authors: James Darrell McCauley, Jeff Goldberg (jeffrey at goldmark.org),
+ and Axel Sommerfeldt <axel.sommerfeldt at f-m.fm>
Obtaining endfloat: The necessary files are kept on the Comprehensive
-TeX Archive Network (CTAN). Current CTAN sites are ftp.tex.ac.uk,
-ftp.shsu.edu, and ftp.dante.de. They are also mirrored at other locations.
-Once on CTAN, type the command "quote site index endfloat" to
-find where endfloat lives. It is probably in
-macros/latex/contrib/supported/endfloat .
-Get the whole directory.
+TeX Archive Network (CTAN): http://mirror.ctan.org/macros/latex/contrib/endfloat
+Code repository: https://gitlab.com/axelsommerfeldt/endfloat
+Bug tracker: https://gitlab.com/axelsommerfeldt/endfloat/issues
===============================================================================
License and copying:
@@ -96,7 +106,7 @@
endfloat for LaTeX
Copyright (C) 1992 Darrel McCauley
Copyright (C) 1994-2011 Jeffrey Goldberg <jeffrey at goldmark.org>
- Copyright (C) 2011-2018 Axel Sommerfeldt <axel.sommerfeldt at f-m.fm>
+ Copyright (C) 2011-2019 Axel Sommerfeldt <axel.sommerfeldt at f-m.fm>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Added: trunk/Master/texmf-dist/doc/latex/endfloat/efxmpl.cfg
===================================================================
--- trunk/Master/texmf-dist/doc/latex/endfloat/efxmpl.cfg (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/endfloat/efxmpl.cfg 2019-05-05 17:43:13 UTC (rev 51003)
@@ -0,0 +1,53 @@
+%%
+%% This is file `efxmpl.cfg',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% endfloat.dtx (with options: `config')
+%%
+%% IMPORTANT NOTICE:
+%% This is part of a set of tools (or better yet, experiments) written
+%% by Jeff Goldberg (jeffrey at goldmark.org), who is writting this
+%% not only for it utility value, but as part of the process of learning
+%% LaTeX. These tools are far from perfect, and comments are welcome.
+%%
+%% The usual disclaimers apply: If it doesn't work right that's your
+%% problem (but do let me know).
+%%
+%% The usual GNU-style conditions apply: If you change it, you take
+%% the blame; if you pass it on, pass on all present condiditions;
+%%
+\def\filename{endfloat}
+\def\fileversion{v2.7}
+\def\filedate{2019/04/15}
+\def\docdate{2019/04/15}
+%% \CharacterTable
+%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+%%
+%% Description: LaTeX style to put figures and tables at end of article
+%% Keywords: LaTeX, style-option, float, figure, table
+%% Authors: James Darrell McCauley <jdm5548 at diamond.tamu.edu>,
+%% Jeff Goldberg <jeffrey at goldmark.org>,
+%% Axel Sommerfeldt <axel.sommerfeldt at f-m.fm>
+%% Maintainer: -none-
+%% Latest Version: Version 2.7 <April 2019>
+\RequirePackage{rotating}
+\DeclareDelayedFloatFlavor{sidewaysfigure}{figure}
+\DeclareDelayedFloatFlavor{sidewaystable}{table}
+\endinput
+%%
+%% End of file `efxmpl.cfg'.
Property changes on: trunk/Master/texmf-dist/doc/latex/endfloat/efxmpl.cfg
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/endfloat/endfloat.pdf
===================================================================
(Binary files differ)
Added: trunk/Master/texmf-dist/source/latex/endfloat/endfloat.drv
===================================================================
--- trunk/Master/texmf-dist/source/latex/endfloat/endfloat.drv (rev 0)
+++ trunk/Master/texmf-dist/source/latex/endfloat/endfloat.drv 2019-05-05 17:43:13 UTC (rev 51003)
@@ -0,0 +1,70 @@
+%%
+%% This is file `endfloat.drv',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% endfloat.dtx (with options: `driver')
+%%
+%% IMPORTANT NOTICE:
+%% This is part of a set of tools (or better yet, experiments) written
+%% by Jeff Goldberg (jeffrey at goldmark.org), who is writting this
+%% not only for it utility value, but as part of the process of learning
+%% LaTeX. These tools are far from perfect, and comments are welcome.
+%%
+%% The usual disclaimers apply: If it doesn't work right that's your
+%% problem (but do let me know).
+%%
+%% The usual GNU-style conditions apply: If you change it, you take
+%% the blame; if you pass it on, pass on all present condiditions;
+%%
+\def\filename{endfloat}
+\def\fileversion{v2.7}
+\def\filedate{2019/04/15}
+\def\docdate{2019/04/15}
+%% \CharacterTable
+%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+%%
+%% Description: LaTeX style to put figures and tables at end of article
+%% Keywords: LaTeX, style-option, float, figure, table
+%% Authors: James Darrell McCauley <jdm5548 at diamond.tamu.edu>,
+%% Jeff Goldberg <jeffrey at goldmark.org>,
+%% Axel Sommerfeldt <axel.sommerfeldt at f-m.fm>
+%% Maintainer: -none-
+%% Latest Version: Version 2.7 <April 2019>
+\documentclass{ltxdoc}
+\setlength\hfuzz{2pt} % ignore small overfulls
+\usepackage{ifpdf}
+\ifpdf
+ \usepackage{mathptmx,courier}
+ \usepackage[scaled=0.90]{helvet}
+\fi
+\usepackage{hypdoc}
+\ifpdf\usepackage{hypdestopt}\fi
+\hypersetup{pdfkeywords={LaTeX, package, endfloat},pdfstartpage={},pdfstartview={}}
+\CodelineIndex
+\EnableCrossrefs
+ %\DisableCrossrefs % Say \DisableCrossrefs if index is ready
+ %\RecordChanges % Gather update information
+ \OnlyDescription % comment out for implementation details
+\begin{document}
+ \let\subsectionautorefname\sectionautorefname
+ \let\subsubsectionautorefname\sectionautorefname
+ \DocInput{endfloat.dtx}
+\end{document}
+\endinput
+%%
+%% End of file `endfloat.drv'.
Property changes on: trunk/Master/texmf-dist/source/latex/endfloat/endfloat.drv
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/source/latex/endfloat/endfloat.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/endfloat/endfloat.dtx 2019-05-05 17:39:49 UTC (rev 51002)
+++ trunk/Master/texmf-dist/source/latex/endfloat/endfloat.dtx 2019-05-05 17:43:13 UTC (rev 51003)
@@ -1,9 +1,9 @@
\def\filename{endfloat}
-\def\fileversion{v2.6}
-\def\filedate{2018/03/24}
-\def\docdate{2018/03/24}
+\def\fileversion{v2.7}
+\def\filedate{2019/04/15}
+\def\docdate{2019/04/15}
%
-% \CheckSum{801}
+% \CheckSum{872}
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -25,10 +25,10 @@
%% Description: LaTeX style to put figures and tables at end of article
%% Keywords: LaTeX, style-option, float, figure, table
%% Authors: James Darrell McCauley <jdm5548 at diamond.tamu.edu>,
-%% Jeff Goldberg <jeffrey at goldmark.org>,
-%% Axel Sommerfeldt <axel.sommerfeldt at f-m.fm>
-%% Maintainer: Axel Sommerfeldt <axel.sommerfeldt at f-m.fm>
-%% Latest Version: Version 2.6 <March 2018>
+%% Jeff Goldberg <jeffrey at goldmark.org>,
+%% Axel Sommerfeldt <axel.sommerfeldt at f-m.fm>
+%% Maintainer: -none-
+%% Latest Version: Version 2.7 <April 2019>
% \fi
%
% \DoNotIndex{\documentclass,\usepackage,\hfuzz,\small,\tt,\begin,\end}
@@ -71,9 +71,7 @@
% from version 2.1 upwards. Since there is almost no original code
% left, he has claimed co-authorship from version 2.4.}
% \and Axel Sommerfeldt\thanks{Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
-% is responsible for all modifications
-% from version 2.5 upwards. He is
-% also the current maintainer.}
+% is responsible for all modifications from version 2.5 to 2.7.}
% }
%
% \date{\docdate}
@@ -115,9 +113,9 @@
% Axel Sommerfeldt has added a section about dealing with
% other floating environments than |figure| and |table|, and
% made adaptions to other sections affected by the
-% changes of version 2.5. Furthermore he has added paragraphs
-% about his \pkg{caption} package in section \ref{sec:removingcaptions}
-% ``Removing captions''.
+% changes of version 2.5, 2.6, and 2.7.
+% Furthermore he has added paragraphs about his \pkg{caption}
+% package in section \ref{sec:removingcaptions} ``Removing captions''.
%
% This documentation is long. Most users won't need to read beyond
% the first few pages, but there are a number of ways to customize
@@ -205,11 +203,6 @@
% version.\footnote{I (jpg) very stupidly introduced a bug in version 2.2
% which wrecked |figure*|. It has been brought to my attention and
% fixed. I offer my thanks and my apologies.}
-% \iffalse % commented out by Axel Sommerfeldt since not true for version >= 2.4
-% However, it must be noted that what actually gets processed at the
-% end is always with the star, since in single column mode the
-% |*| is harmless.
-% \fi
%
% \subsection{Options} \label{sec:options}
%
@@ -249,6 +242,7 @@
% |figuresonly| & off & & Handle figures only \\
% |notables| & off & & Disregard tables \\
% |nofigures| & off & & Disregard figures \\
+% |disable| & & & Disables the package \\
% \hline
% \end{tabular}
% \end{table}
@@ -276,12 +270,6 @@
% Normally the figures at the end appear before the tables.
% This can be changed by using the option \texttt{tablesfirst}.
% The default is \texttt{figuresfirst}.
-% \iffalse % Commented out by Axel Sommerfeldt
-% \footnote{It is hoped that
-% future versions will allow new kinds of float or environment
-% to be delayed, in which case an entirely new mechanism will
-% need to be introduced for ordering their appearance.}
-% \fi
%
% If nothing else if specified, both figures and tables will be handled
% by the \pkg{endfloat} package.
@@ -310,14 +298,6 @@
% can be overruled by explicitly stating the |nofighead| option.
%
% \begin{enumerate}
-% \iffalse % commented out by Axel Sommerfeldt
-% \item \label{rule:default}
-% When two entirely conflicting options are both specified
-% the one corresponding to the default wins.
-% (e.g., if both |markers| and |nomarkers| are specified then
-% |markers| will be in effect). Here the notion of default is
-% determined by inspecting the second column of table~\ref{tab:options}.
-% \fi
% \item \label{rule:elsewhere}
% When one option is more specific than the other the more specific
% one holds true, and the more general will only partially hold.
@@ -324,11 +304,7 @@
% So specifying \texttt{fighead} and \texttt{noheads} will be the
% same as saying \texttt{fighead} and \texttt{notabhead}.
% \item
-% \iffalse % changed by Axel Sommerfeldt
-% The order in which the options appear is not relevant.
-% \else
% The order in which the options appear is relevant.
-% \fi
% \item
% If some of the obsolete commands for these options are used
% all bets are off on these interactions.
@@ -432,6 +408,30 @@
% These commands can be used either in the preamble of your document,
% or in the \file{endfloat.cfg} file (see \autoref{sec:extra}).
%
+% \section{Insert own code into the delayed material} \label{sec:addto}
+%
+% \DescribeMacro{\addtodelayedfloat}
+% |\addtodelayedfloat| will add own code to delayed floats.
+% For example
+% \begin{quote}
+% |\addtodelayedfloat{figure}{\clearpage}|
+% \end{quote}
+% will add |\clear|\x|page| to the delayed figures.
+%
+% Note: The argument will be stored detokenized to the intermediate
+% file.
+% If this is not what you want, use the starred variant
+% |\add|\x|to|\x|delayed|\x|float*| instead, for example
+% \begin{quote}
+% |\addtodelayedfloat{figure}{\sometext}|
+% \end{quote}
+% will add |\some|\x|text| to the delayed figures while
+% \begin{quote}
+% |\addtodelayedfloat*{figure}{\sometext}|
+% \end{quote}
+% will add the current content of |\some|\x|text| to the delayed
+% figures.
+%
% \section{Processing delayed floats before the end}
%
% \DescribeMacro{\processdelayedfloats}
@@ -484,10 +484,11 @@
% You may change this by using
% |\re|\x|new|\x|command| to redefine |\efloat|\x|postamble| as you wish.
%
+% \iffalse
% \medskip
-%
% It makes most sense to place such redefinitions in the configuration
% file (see \autoref{sec:extra}).
+% \fi
%
% \medskip
%
@@ -496,6 +497,24 @@
% |\efloat|\x|type| which is set to the environment type currently processed,
% for example |figure| or |table|.
%
+% \section{Other customizations}\label{sec:customizations}
+%
+% \DescribeMacro{\efloatbegin}
+% \DescribeMacro{\efloatend}
+% |\efloat|\x|begin| will be typeset before the processing of each delayed
+% float while |\efloat|\x|end| will be typeset after each processing.
+% By default the first is defined to be |\clear|\x|page|, the second is
+% defined to do nothing.
+%
+% \medskip
+%
+% \DescribeMacro{\efloatbeginlist}
+% \DescribeMacro{\efloatendlist}
+% |\efloat|\x|begin|\x|list| will be typeset before each list of delayed floats
+% while |\efloat|\x|end|\x|list| will be typeset after each list.
+% By default the first is defined to be |\normal|\x|size|, the second is
+% defined to be |\clear|\x|page|.
+%
% \section{Configuration file and other end environments}\label{sec:extra}
%
% Many users have suggested options to the package which are
@@ -530,14 +549,6 @@
% so that the user could specify environments other
% than |figure| and |table| (and their |*|-ed counterparts) which can
% be delayed until the end of the document.
-% \iffalse % commented out by Axel Sommerfeldt
-% At the moment that would
-% be very difficult to do with environments which are not processed with
-% tables of figures (ie, those environments that should have a different
-% ``list-of'', different counters, and different temporary files from
-% those used by tables and figures); but the plan is to make even that
-% ever more easier.
-% \fi
%
% \subsection{Modified figures and tables}
%
@@ -551,14 +562,6 @@
% like mode and look for the literal string |\end{table}|, which it
% will not see in |\end{foo}|.
%
-% \iffalse
-% However, for those who know \LaTeX\ internals fairly well, it is
-% not impossible to tell \pkg{endfloat} to also treat the |foo| environment
-% as a delayed table. It is however, not easy, although my goal
-% is to make this easier in subsequent versions. It will take
-% a fair amount of understanding of the implementation to see how to
-% do this. And the best thing to do is to follow an example.
-% \else
% However, inserting the following code into the document preamble
% may be worth a try:
% \begin{quote}
@@ -567,9 +570,8 @@
% This tells the \pkg{endfloat} package that |foo| should be treated as |table|,
% at least from \pkg{endfloat}'s point of view.
% If you keep your fingers crossed this may actually work.
-% \fi
%
-% \subsection{Environments based on figures and tables}
+% \subsection{Environments based on figures and tables}\label{sec:flavor}
%
% The \pkg{rotating} package\cite{RahBar:rotating}
% contains definitions of environments
@@ -577,15 +579,7 @@
% require support from the dvi driver, such as \texttt{dvips}.},
% and it would be nice to have these work in documents which also
% use \pkg{endfloat}.
-% \iffalse % changed by Axel Sommerfeldt
-% \par
-% Appropriate redefinitions of these so that they work with \pkg{endfloat}
-% are given in the file \file{efxmpl.cfg}. If you wish to use
-% that file, you should include it as a package (possibly renamed)
-% \emph{after} you include \pkg{endfloat}. Or you could simple rename
-% it to \file{endfloat.cfg} and \pkg{endfloat} will include it automatically.\par
-% For a description of those commands see \autoref{sec:config}.
-% \else
+%
% This can be archived with
% \begin{quote}
% |\DeclareDelayedFloatFlavor{sidewaysfigure}{figure}|\\
@@ -592,6 +586,7 @@
% |\DeclareDelayedFloatFlavor{sidewaystable}{table}|
% \end{quote}
% after loading both, the \pkg{endfloat} and \pkg{rotating} package.
+%
% The general syntax of |\Declare|\x|Delayed|\x|Float|\x|Flavor| is
% \begin{quote}
% |\DeclareDelayedFloatFlavo|(|u|)|r|\marg{environment}\marg{is a variant of}
@@ -609,13 +604,46 @@
% |\usepackage{endfloat,longtable}|\\
% |\DeclareDelayedFloatFlavour*{longtable}{table}|
% \end{quote}
-% Note that we use the starred variant of |\Declare|\x|Delayed|\x|Float|\x|Flavor|
-% here which only redefines |long|\x|table| but leaves the unnumbered
-% |long|\x|table*| intact.
-% \fi
+% Note that we use the starred variant |\Declare|\x|Delayed|\x|Float|\x|Flavor*|
+% here which only redefines |long|\x|table| to be delayed, but leaves the unnumbered
+% |long|\x|table*| environment (provided by the \pkg{caption} resp.~\pkg{ltcaption} package)
+% unchanged.
%
-% \subsection{Other floating environments}
+% \subsubsection{The ctable package}\label{sec:ctable}
%
+% Since |\ctable| offered by the \pkg{ctable} package\cite{Dekker:ctable}
+% is a command and not an environment, it cannot be declared as delayed
+% environment straight-ahead, i.e.
+% \begin{quote}
+% |\DeclareDelayedFloatFlavor{ctable}{table}|
+% \end{quote}
+% is not sufficient here since the \pkg{endfloat} package is only
+% capable of delaying environments.
+% A dirty (but working) solution is using |ctable| as environment
+% and not as command. An example document:
+% \begin{quote}
+% |\documentclass{book}|\\
+% |\usepackage{ctable}|\\
+% |\usepackage{endfloat}|\\
+% |\DeclareDelayedFloatFlavor{ctable}{table}|\\
+% |\begin{document}|\\
+% ||\\
+% |\begin{ctable}[|\\
+% | cap=Test,|\\
+% | caption=Test,|\\
+% | ]{cc}{|\\
+% | \tnote[]{}|\\
+% | }{\FL|\\
+% | A & B \ML|\\
+% | 1 & 2 \NN|\\
+% | 3 & 4 \LL}|\\
+% |\end{ctable}|\\
+% ||\\
+% |\end{document}|
+% \end{quote}
+%
+% \subsection{Other floating environments}\label{sec:other}
+%
% By using |\new|\x|float| offered by the \pkg{float} package\cite{Lingnau:float},
% or |\Declare|\x|New|\x|Float|\x|Type| offered by the \pkg{floatrow} package\cite{Lapko:floatrow},
% or |\Declare|\x|Floating|\x|Environment| offered by the \pkg{newfloat}
@@ -746,9 +774,6 @@
%
% If the \pkg{caption} package is not used,
% the following code should be used instead:
-% \iffalse
-% First save the original definition of |\caption|
-% \fi
% \begin{quote}
% |\let\OrigCaption\caption|\\
% |\renewcommand{\caption}[2][X]{\OrigCaption[#2]{}}|
@@ -792,7 +817,7 @@
% \end{macro}
% \end{macro}
%
-% \section{Obsolete commands}
+% \section{Obsolete commands}\label{sec:obsolete}
%
% Versions of the package prior to 2.2 had some commands which the
% user could specify in the preamble to do what \emph{some} of the
@@ -853,22 +878,6 @@
% what I have done for \verb"\sidewaystable" in the sample configuration
% file (\autoref{sec:extra}).
%
-% \iffalse % commented out by Axel Sommerfeldt
-% Steps are slowly being taken to allow for new delayed environments
-% to be added. That will be version~3, but I (jpg) still have
-% a long way to go to get there. Each new minor release of
-% the package includes few changes visible to the user, but may
-% contain substantial internal changes to move the package in the desired
-% direction. Version~2.4 now contains a configuration file in which
-% various things can be defined. See \autoref{sec:extra} for
-% more information.
-%
-% Once it does become easier to delay other environments, the
-% word ``float'' may not be the best expression, since there will
-% be no reason to expect that only floating environments are
-% delayed.
-% \fi
-%
% \subsection{The Environment's environment}\label{sec:envenv}
% \changes{v2.1b}{1994/07/03}{Modify documentation -jpg}
%
@@ -1079,11 +1088,6 @@
% no purpose.
%
% \item The \pkg{float} package appears to work in my limited tests.
-% \iffalse % commented out by Axel Sommerfeldt
-% Although, only tables and figures get moved to end.
-% The success is due to the robustness with which \pkg{float}
-% is written.
-% \fi
%
% \item The \pkg{floatrow} package appears to work in my limited tests.
% But please note that the \pkg{endfloat} package needs to be loaded
@@ -1100,9 +1104,12 @@
% I may very well fail at that. If you
% need a feature added, see whether the hooks will allow you to
% do what you want. If something goes wrong look over
-% \autoref{sec:caveats}. But if you need to get in touch
+% \autoref{sec:caveats}.
+% \iffalse % Currently this package has no active maintainer
+% But if you need to get in touch
% with the maintainer, you should send email at
% \texttt{axel.sommerfeldt at f-m.fm}.
+% \fi
%
% \section{History}\label{sec:history}
% \changes{v2.1}{1994/06/25}{Use LaTeX2e documentation form. jpg}
@@ -1129,12 +1136,41 @@
% in February and March 1992. He acknowledges that much of the
% guts are adapted from
% \texttt{comment.sty} by Victor Eijkhout (eijkhout at csrd.uiuc.edu).
-% So, although Jeff
-% Goldberg (jeffrey at goldmark.org) now maintains this, he should not
-% be credited with writing the package, but only with extending and
-% maintaining it. He has contributed enough so that by version~2.4
-% he claimed co-authorship.
-%
+% So, although Jeff Goldberg (jeffrey at goldmark.org) has maintained
+% this afterwards, he should not be credited with writing the package,
+% but only with extending and maintaining it.
+% He has contributed enough so that by version~2.4 he claimed
+% co-authorship.
+% The same applies to Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+% who build version 2.5 with permission of Jeff Goldberg and has
+% maintained this package from version 2.6 to version 2.7.
+%
+% \subsection{Version 2.7}
+%
+% Version 2.7 was build by Axel Sommerfeldt (axel.sommerfeldt at f-m.fm),
+% and introduces the following changes:
+% \begin{itemize}
+% \item
+% A new package option |disable| has been added which disables the
+% functionality of the \pkg{endfloat} package
+% (\autoref{sec:options}).
+% \item
+% A new command |\add|\x|to|\x|delayed|\x|float| has beed added
+% which adds code to a specific delayed float type
+% (\autoref{sec:addto}).
+% \item
+% More customization was introduced with the new macros
+% |\efloat|\x|begin|, |\efloat|\x|end|, |\efloat|\x|begin|\x|list|,
+% and |\efloat|\x|end|\x|list|.
+% They can be re-defined by the user to influence the process
+% of delayed floats and the typesetting of lists of delayed floats
+% (\autoref{sec:customizations}).
+% \item
+% Unfortunately the bugfix regarding the usage of UTF-8 characters
+% in floating environments introduced in version 2.6 was flawed,
+% this has been fixed.
+% \end{itemize}
+%
% \subsection{Version 2.6}
%
% Version 2.6 was build by Axel Sommerfeldt (axel.sommerfeldt at f-m.fm),
@@ -1143,11 +1179,11 @@
% \item
% New package options |no|\x|tables| and |no|\x|figures| have been added
% to allow better control over which floating environments
-% will be handled by the \pkg{endfloat} package.
+% will be handled by the \pkg{endfloat} package (\autoref{sec:options}).
% \item
% New macros called |\efloat|\x|type|, |\efloat|\x|heading|, |\efloat|\x|preamble|,
-% and |efloat|\x|postamble| have been added which allow the user more control
-% over how the delayed floats are typeset.
+% and |\efloat|\x|postamble| have been added which allow the user more control
+% over how the delayed floats are typeset (\autoref{sec:separator}).
% \item
% A percent sign (|%|) is now allowed at the end of |\end|\marg{environment}, too, e.g.:
% \begin{quote}
@@ -1168,7 +1204,8 @@
% New commands
% |\Declare|\x|Delayed|\x|Float| and |\Declare|\x|Delayed|\x|Float|\x|Flavor|
% for handling floating environments other than |figure| and |table|,
-% and |\Setup|\x|Delayed|\x|Float| for setting options.
+% and |\Setup|\x|Delayed|\x|Float| for setting options
+% (\autoref{sec:flavor} and \autoref{sec:other}).
% To make this possible a lot of internal code had to be reorganized,
% but by trying to keep original versions of macros and trying to leave the
% operational sequence itself as original as possible this hopefully won't break
@@ -1178,7 +1215,7 @@
% \item
% New package options |tables|\x|only| and |figures|\x|only| have been added
% to allow better control over which floating environments
-% will be handled by the \pkg{endfloat} package.
+% will be handled by the \pkg{endfloat} package (\autoref{sec:options}).
%
% \item
% The \pkg{endfloat} package should cooperate with
@@ -1379,15 +1416,6 @@
% |verbatim| standard packages, and the |moreverb| package.
% Since they provide more generalized an cleaner verbatim code
% then this which dates back to the earliest days of \LaTeX.
-% \iffalse % commented out by Axel Sommerfeldt
-% \item
-% Integrate with the |float| package which (among other things)
-% enables the user to define new floating environments.
-% \pkg{endfloat} v2.2 only allows figures and tables to be placed at
-% the end, not all types of potential floats. Nor does it allow
-% the user to specify which of the two types it does recognize
-% to be placed at the end.
-% \fi
% \end{itemize}
%
% \begin{thebibliography}{1}
@@ -1399,13 +1427,13 @@
%
% \bibitem{A-W:GMS94}
% Michel Goossens, Frank Mittelbach, and Alexander Samarin.
-% \newblock {\em The {\LaTeX} Companion}.
+% \newblock {\em The {\LaTeX} Companion}
% \newblock Addison-Wesley, Reading, Massachusetts, 1994.
%
% \bibitem{LT3:ClassGuide}
% The \LaTeX3 Project.
% \newblock \emph{\LaTeXe\ for class and package writers}
-% \newblock (Preliminary draft) June 1994.
+% \newblock (Preliminary draft) June 1994
% \newblock Electronic Documentation
%
% \bibitem{Lingnau:float}
@@ -1429,11 +1457,17 @@
% \bibitem{RahBar:rotating}
% Sebastian Rahtz and Leonor Barroca.
% \newblock A style option for rotated objects in \LaTeX{}
-% \newblock April 1994. (version~2)
+% \newblock April 1994 (version~2)
% \newblock Electronic Documentation
+%
+% \bibitem{Dekker:ctable}
+% Wybo Dekker.
+% \newblock The ctable package
+% \newblock October 2015 (version~1.31)
+% \newblock Electronic Documentation
% \end{thebibliography}
-%
-%\StopEventually{\PrintIndex\PrintChanges}
+%
+% \StopEventually{\PrintIndex\PrintChanges}
% \clearpage
%
% \section{The documentation driver file}
@@ -1575,10 +1609,11 @@
% \end{macrocode}
%
% \begin{macro}{\SetupDelayedFloat}
+% While global flags will be set using package options,
+% environment specific flags will be set with |\Setup|\x|Delayed|\x|Float|.
% \changes{v2.5}{2011/11/26}{This command added. as}
% \changes{v2.5c}{2011/12/22}{Usage of \cs{efloat at syncobsoleteflags} added. as}
-% While global flags will be set using package options,
-% environment specific flags will be set with |\Setup|\x|Delayed|\x|Float|.
+% \changes{v2.7}{2019/04/14}{Text of error message changed. as}
% \begin{macrocode}
\RequirePackage{keyval}
% \end{macrocode}
@@ -1597,12 +1632,24 @@
\newcommand*\efloat at setkey{%
\@expandtwoargs\efloat@@setkey\efloat at type}
\newcommand*\efloat@@setkey[3]{%
+ \efloat at ifdelayed{#1}{%
+ \efloat at setflag{#1#2}{#3}%
+ \efloat at syncobsoleteflags}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\efloat at ifdelayed}
+% Check if the given environment is a delayed float type.
+% If yes, execute the given code.
+% If not, issue an error message.
+% \changes{v2.7}{2019/04/14}{This macro added. as}
+% \begin{macrocode}
+\newcommand\efloat at ifdelayed[2]{%
\@ifundefined{ef at ext@#1}%
{\PackageError{endfloat}%
- {Unknown environment `#1'}%
+ {`#1' is not a delayed float type}%
{Only environments known to the `endfloat' package are allowed here.}}%
- {\efloat at setflag{#1#2}{#3}%
- \efloat at syncobsoleteflags}}
+ {#2}}%
% \end{macrocode}
% \end{macro}
%
@@ -1717,13 +1764,46 @@
%
% \begin{macro}{\efloat at iwrite}
% Immediate write to one of these files.
+% |\protected at iwrite| was taken from https://tex.stackexchange.com/questions/75951/
% \changes{v2.6}{2018/03/18}{Bugfix: Uses \cs{protected at write} now. as}
+% \changes{v2.7}{2019/04/14}{Bugfix: Uses \cs{protected at iwrite} now. as}
% \begin{macrocode}
+\providecommand\protected at iwrite[3]{%
+ \begingroup
+ \let\thepage\relax
+ #2%
+ \let\protect\@unexpandable at protect
+ \edef\reserved at a{\immediate\write #1{#3}}%
+ \reserved at a
+ \endgroup
+ \if at nobreak\ifvmode\nobreak\fi\fi}
+% \end{macrocode}
+% \begin{macrocode}
\newcommand\efloat at iwrite[1]{%
- \immediate\expandafter\protected at write\csname efloat at post#1\endcsname{}}
+ \expandafter\protected at iwrite\csname efloat at post#1\endcsname{}}
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\addtodelayedfloat}
+% Immediate write to one of these files.
+% While |\efloat at iwrite| is for internal use, this one if for usage in end-user documents.
+% \changes{v2.7}{2019/04/14}{This macro added. as}
+% \changes{v2.7}{2019/04/15}{Starred variant added. as}
+% \begin{macrocode}
+\newcommand\addtodelayedfloat{%
+ \@ifstar{\efloat at addto\@firstofone}{\efloat at addto\detokenize}}
+% \end{macrocode}
+% \begin{macrocode}
+\newcommand\efloat at addto[3]{%
+ \efloat at ifdelayed{#2}{%
+ \expandafter\efloat@@addto\expandafter{\csname ef at ext@#2\endcsname}{#1{#3}}}}
+% \end{macrocode}
+% \begin{macrocode}
+\newcommand\efloat@@addto[1]{%
+ \efloat at condopen{#1}\efloat at iwrite{#1}}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\efloatheading}
% This macro changes the page headings.
% By default it is defined to use |\markboth| for this purpose,
@@ -1730,7 +1810,8 @@
% but you may redefine this command in the configuration file or preamble.
% \changes{v2.6}{2018/03/18}{This macro added. as}
% \begin{macrocode}
-\providecommand\efloatheading[1]{\markboth{\uppercase{#1}}{\uppercase{#1}}}
+\providecommand\efloatheading[1]{%
+ \markboth{\uppercase{#1}}{\uppercase{#1}}}
% \end{macrocode}
% \end{macro}
%
@@ -1752,7 +1833,7 @@
% you may redefine this command in the configuration file or preamble.
% \changes{v2.6}{2018/03/24}{Use \cs{providecommand} instead of \cs{newcommand} to define this macro. as}
% \begin{macrocode}
-\providecommand{\efloatseparator}{\clearpage}
+\providecommand\efloatseparator{\clearpage}
% \end{macrocode}
% \end{macro}
%
@@ -1767,6 +1848,38 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\efloatbegin}
+% |\efloatbegin| will be typeset when the processing of the delayed float begins.
+% \changes{v2.7}{2019/04/15}{This macro added. as}
+% \begin{macrocode}
+\providecommand\efloatbegin{\clearpage}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\efloatend}
+% |\efloatend| will be typeset when the processing of the delayed float ends.
+% \changes{v2.7}{2019/04/15}{This macro added. as}
+% \begin{macrocode}
+\providecommand\efloatend{}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\efloatbeginlist}
+% |\efloatbeginlist| will be typeset before the list of a delayed float.
+% \changes{v2.7}{2019/04/15}{This macro added. as}
+% \begin{macrocode}
+\providecommand\efloatbeginlist{\normalsize}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\efloatendlist}
+% |\efloatendlist| will be typeset after the list of a delayed float.
+% \changes{v2.7}{2019/04/15}{This macro added. as}
+% \begin{macrocode}
+\providecommand\efloatendlist{\clearpage}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\ef at makeinnocent}
% \changes{v2.1}{1994/06/25}{Modify documentation text. jpg}
% \changes{v2.1b}{1994/07/03}{Modify documentation -jpg}
@@ -1915,6 +2028,7 @@
% environment as the very last package.
% (Otherwise \pkg{endfloat} would not work with \pkg{floatrow}.)
% \changes{v2.5b}{2011/12/05}{This command added. as}
+% \changes{v2.7}{2019/04/14}{Text of error message changed. as}
% \begin{macrocode}
\newcommand*\DeclareDelayedFloatFlavor{%
\@ifstar{\efloat at declareflavor\@gobble}%
@@ -1925,13 +2039,10 @@
% \end{macrocode}
% \begin{macrocode}
\newcommand*\efloat at declareflavor[3]{%
- \@ifundefined{ef at ext@#3}%
- {\PackageError{endfloat}%
- {Unknown environment `#3'}%
- {Only environments known to the `endfloat' package are allowed here.}}%
- {\efloat at AtBeginDocument{%
- \efloat@@declareflavor{#2}{#3}%
- #1{\efloat@@declareflavor{#2*}{#3}}}}}
+ \efloat at ifdelayed{#3}{%
+ \efloat at AtBeginDocument{%
+ \efloat@@declareflavor{#2}{#3}%
+ #1{\efloat@@declareflavor{#2*}{#3}}}}}
\@onlypreamble\efloat at declareflavor
% \end{macrocode}
% \begin{macrocode}
@@ -2137,9 +2248,22 @@
\DeclareOption{nofigures}{\efloat at figuresfalse}
% \end{macrocode}
% Other option stuff
+% \changes{v2.7}{2019/01/10}{Option `disable' added. as}
% \begin{macrocode}
+\newcommand*\efloat at AtEndDocument{\AtEndDocument}
+\DeclareOption{disable}{%
+ \def\efloat@@declare#1#2[#3]#4{%
+ \PackageInfo{endfloat}{`#2' is not delayed since option `disable' was specified}}%
+ \renewcommand*\efloat at declareflavor[3]{}%
+ \renewcommand*\efloat@@setkey[3]{}%
+ \renewcommand*\efloat at AtEndDocument{\@gobble}%
+ \AtBeginDocument{\renewcommand*\processdelayedfloats{}}}
+% \end{macrocode}
+% \begin{macrocode}
\DeclareOption*{%
- \PackageWarning{endfloat}{Unknown option `\CurrentOption'}}
+ \PackageError{endfloat}%
+ {Unknown option `\CurrentOption'}%
+ {Please take a look at the documentation of the `endfloat' package.}}
% \end{macrocode}
% Process (global) options
% \begin{macrocode}
@@ -2467,6 +2591,7 @@
% \changes{v2.6}{2018/03/24}{\cs{efloat at type} replaced by \cs{efloattype}. as}
% \changes{v2.6}{2018/03/24}{Usage of \cs{@input} replaced by \cs{efloat at input}. as}
% \changes{v2.6}{2018/03/24}{Usage of \cs{efloatpreamble} and \cs{efloatpostamble} added. as}
+% \changes{v2.7}{2019/04/15}{Usage of \cs{efloatbegin}, \cs{efloatend}, \cs{efloatbeginlist}, and \cs{efloatendlist} added. as}
% \begin{macrocode}
\newcommand*\efloat at process[2]{%
% \end{macrocode}
@@ -2484,12 +2609,17 @@
% \begin{macrocode}
\def\efloattype{#2}% % as
% \end{macrocode}
+% \begin{macrocode}
+ \efloatbegin % bj
+% \end{macrocode}
% Deal with headers and list of figures if necessary
% \begin{macrocode}
- \clearpage % bj
\efloat at ifflag{#2list}{% % bj
- {\normalsize\efloat at listof{#2}}% % bj
- \clearpage % bj
+ \begingroup
+ \efloatbeginlist % bj
+ \efloat at listof{#2}% % bj
+ \efloatendlist % bj
+ \endgroup
}{}%
\efloat at ifflag{#2head}{%
\section*{\@nameuse{#2section}}% % bj
@@ -2514,6 +2644,9 @@
\efloatpreamble
\efloat at input{\jobname.#1}%
\efloatpostamble
+% \end{macrocode}
+% \begin{macrocode}
+ \efloatend % as
}{}}
% \end{macrocode}
% \end{macro}
@@ -2602,7 +2735,7 @@
% \end{quote}
% \changes{v2.5}{2011/11/26}{Process float list instead of |figure| and |table|. as}
% \begin{macrocode}
-\newcommand{\processdelayedfloats}{{%
+\newcommand*\processdelayedfloats{{%
% \end{macrocode}
% Here we reset stuff to apply while end stuff is being processed.
% Prior to version 2.4, these were in |\processtables| and |\processfigures|.
@@ -2631,7 +2764,7 @@
% \changes{v2.1}{1994/06/25}{Modify documentation text. jpg}
% \changes{v2.1}{1994/06/25}{Use AtEndDocument. jpg}
% \begin{macrocode}
-\AtEndDocument{% % jpg
+\efloat at AtEndDocument{% % jpg
\message{AED endfloat: Processing end Figures and Tables}% % jpg
\onecolumn
\processdelayedfloats }
@@ -2652,18 +2785,6 @@
%
% \subsection{Getting new delayed environments}
%
-% \iffalse % changed by Axel Sommerfeldt
-% I have been promising to make it easy to define new sorts
-% of environments which can be delayed. I don't expect to deliver
-% on that promise any time soon; so until I do, I will provide a
-% couple of useful extra macros in a configuration fill which
-% the user may experiment with. The two that I have needed are
-% used in conjunction with the
-% \textsf{rotating} package\cite{RahBar:rotating}, which
-% among other things provides environments |sidewaystable| and
-% |sidewaysfigure|. With the following definitions, these should
-% also work properly with \pkg{endfloat}.
-% \else
% This section used to offer a configuration file which was able
% to integrate the environments |side|ways|figure| and |side|ways|table|
% offered by the \pkg{rotating} package\cite{RahBar:rotating}
@@ -2678,7 +2799,6 @@
% |\makeatother|\\
% \ldots
% \end{quote}
-% \fi
%
% \begin{macrocode}
%<*config>
Deleted: trunk/Master/texmf-dist/tex/latex/endfloat/efxmpl.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/endfloat/efxmpl.cfg 2019-05-05 17:39:49 UTC (rev 51002)
+++ trunk/Master/texmf-dist/tex/latex/endfloat/efxmpl.cfg 2019-05-05 17:43:13 UTC (rev 51003)
@@ -1,53 +0,0 @@
-%%
-%% This is file `efxmpl.cfg',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% endfloat.dtx (with options: `config')
-%%
-%% IMPORTANT NOTICE:
-%% This is part of a set of tools (or better yet, experiments) written
-%% by Jeff Goldberg (jeffrey at goldmark.org), who is writting this
-%% not only for it utility value, but as part of the process of learning
-%% LaTeX. These tools are far from perfect, and comments are welcome.
-%%
-%% The usual disclaimers apply: If it doesn't work right that's your
-%% problem (but do let me know).
-%%
-%% The usual GNU-style conditions apply: If you change it, you take
-%% the blame; if you pass it on, pass on all present condiditions;
-%%
-\def\filename{endfloat}
-\def\fileversion{v2.6}
-\def\filedate{2018/03/24}
-\def\docdate{2018/03/24}
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
-%% Description: LaTeX style to put figures and tables at end of article
-%% Keywords: LaTeX, style-option, float, figure, table
-%% Authors: James Darrell McCauley <jdm5548 at diamond.tamu.edu>,
-%% Jeff Goldberg <jeffrey at goldmark.org>,
-%% Axel Sommerfeldt <axel.sommerfeldt at f-m.fm>
-%% Maintainer: Axel Sommerfeldt <axel.sommerfeldt at f-m.fm>
-%% Latest Version: Version 2.6 <March 2018>
-\RequirePackage{rotating}
-\DeclareDelayedFloatFlavor{sidewaysfigure}{figure}
-\DeclareDelayedFloatFlavor{sidewaystable}{table}
-\endinput
-%%
-%% End of file `efxmpl.cfg'.
Modified: trunk/Master/texmf-dist/tex/latex/endfloat/endfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/endfloat/endfloat.sty 2019-05-05 17:39:49 UTC (rev 51002)
+++ trunk/Master/texmf-dist/tex/latex/endfloat/endfloat.sty 2019-05-05 17:43:13 UTC (rev 51003)
@@ -19,9 +19,9 @@
%% the blame; if you pass it on, pass on all present condiditions;
%%
\def\filename{endfloat}
-\def\fileversion{v2.6}
-\def\filedate{2018/03/24}
-\def\docdate{2018/03/24}
+\def\fileversion{v2.7}
+\def\filedate{2019/04/15}
+\def\docdate{2019/04/15}
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -41,10 +41,10 @@
%% Description: LaTeX style to put figures and tables at end of article
%% Keywords: LaTeX, style-option, float, figure, table
%% Authors: James Darrell McCauley <jdm5548 at diamond.tamu.edu>,
-%% Jeff Goldberg <jeffrey at goldmark.org>,
-%% Axel Sommerfeldt <axel.sommerfeldt at f-m.fm>
-%% Maintainer: Axel Sommerfeldt <axel.sommerfeldt at f-m.fm>
-%% Latest Version: Version 2.6 <March 2018>
+%% Jeff Goldberg <jeffrey at goldmark.org>,
+%% Axel Sommerfeldt <axel.sommerfeldt at f-m.fm>
+%% Maintainer: -none-
+%% Latest Version: Version 2.7 <April 2019>
\NeedsTeXFormat{LaTeX2e}[1994/06/01]
\ProvidesPackage{endfloat}[\filedate\space\fileversion\space
LaTeX2e package puts figures and tables at end (jdm)]
@@ -84,12 +84,15 @@
\newcommand*\efloat at setkey{%
\@expandtwoargs\efloat@@setkey\efloat at type}
\newcommand*\efloat@@setkey[3]{%
+ \efloat at ifdelayed{#1}{%
+ \efloat at setflag{#1#2}{#3}%
+ \efloat at syncobsoleteflags}}
+\newcommand\efloat at ifdelayed[2]{%
\@ifundefined{ef at ext@#1}%
{\PackageError{endfloat}%
- {Unknown environment `#1'}%
+ {`#1' is not a delayed float type}%
{Only environments known to the `endfloat' package are allowed here.}}%
- {\efloat at setflag{#1#2}{#3}%
- \efloat at syncobsoleteflags}}
+ {#2}}%
\newcommand*\efloat at ifflag[1]{%
\@nameuse{ef at if@#1}}
\newcommand*\efloat at setflag[2]{%
@@ -120,12 +123,33 @@
\fi}
\newcommand*\efloat at condopen[1]{%
\ef at ifct{#1}{}{\efloat at openpost{#1}}}
+\providecommand\protected at iwrite[3]{%
+ \begingroup
+ \let\thepage\relax
+ #2%
+ \let\protect\@unexpandable at protect
+ \edef\reserved at a{\immediate\write #1{#3}}%
+ \reserved at a
+ \endgroup
+ \if at nobreak\ifvmode\nobreak\fi\fi}
\newcommand\efloat at iwrite[1]{%
- \immediate\expandafter\protected at write\csname efloat at post#1\endcsname{}}
-\providecommand\efloatheading[1]{\markboth{\uppercase{#1}}{\uppercase{#1}}}
+ \expandafter\protected at iwrite\csname efloat at post#1\endcsname{}}
+\newcommand\addtodelayedfloat{%
+ \@ifstar{\efloat at addto\@firstofone}{\efloat at addto\detokenize}}
+\newcommand\efloat at addto[3]{%
+ \efloat at ifdelayed{#2}{%
+ \expandafter\efloat@@addto\expandafter{\csname ef at ext@#2\endcsname}{#1{#3}}}}
+\newcommand\efloat@@addto[1]{%
+ \efloat at condopen{#1}\efloat at iwrite{#1}}
+\providecommand\efloatheading[1]{%
+ \markboth{\uppercase{#1}}{\uppercase{#1}}}
\providecommand\efloatpreamble{}
-\providecommand{\efloatseparator}{\clearpage}
+\providecommand\efloatseparator{\clearpage}
\providecommand\efloatpostamble{\efloatseparator}
+\providecommand\efloatbegin{\clearpage}
+\providecommand\efloatend{}
+\providecommand\efloatbeginlist{\normalsize}
+\providecommand\efloatendlist{\clearpage}
\newcommand*{\ef at makeinnocent}[1]{\catcode`#1=12 }
\providecommand{\figurename}{Figure}
\providecommand{\tablename}{Table}
@@ -183,13 +207,10 @@
\let\DeclareDelayedFloatFlavour\DeclareDelayedFloatFlavor
\@onlypreamble\DeclareDelayedFloatFlavour
\newcommand*\efloat at declareflavor[3]{%
- \@ifundefined{ef at ext@#3}%
- {\PackageError{endfloat}%
- {Unknown environment `#3'}%
- {Only environments known to the `endfloat' package are allowed here.}}%
- {\efloat at AtBeginDocument{%
- \efloat@@declareflavor{#2}{#3}%
- #1{\efloat@@declareflavor{#2*}{#3}}}}}
+ \efloat at ifdelayed{#3}{%
+ \efloat at AtBeginDocument{%
+ \efloat@@declareflavor{#2}{#3}%
+ #1{\efloat@@declareflavor{#2*}{#3}}}}}
\@onlypreamble\efloat at declareflavor
\newcommand*\efloat@@declareflavor[2]{%
\def\@tempa{\@efloat{#2}{#1}}%
@@ -256,8 +277,18 @@
\DeclareOption{figuresonly}{\efloat at figurestrue \efloat at tablesfalse}
\DeclareOption{notables}{\efloat at tablesfalse}
\DeclareOption{nofigures}{\efloat at figuresfalse}
+\newcommand*\efloat at AtEndDocument{\AtEndDocument}
+\DeclareOption{disable}{%
+ \def\efloat@@declare#1#2[#3]#4{%
+ \PackageInfo{endfloat}{`#2' is not delayed since option `disable' was specified}}%
+ \renewcommand*\efloat at declareflavor[3]{}%
+ \renewcommand*\efloat@@setkey[3]{}%
+ \renewcommand*\efloat at AtEndDocument{\@gobble}%
+ \AtBeginDocument{\renewcommand*\processdelayedfloats{}}}
\DeclareOption*{%
- \PackageWarning{endfloat}{Unknown option `\CurrentOption'}}
+ \PackageError{endfloat}%
+ {Unknown option `\CurrentOption'}%
+ {Please take a look at the documentation of the `endfloat' package.}}
\ProcessOptions*
\let\@bfig\figure % bj
\let\@btab\table % bj
@@ -353,10 +384,13 @@
\ef at ifct{#1}{%
\efloat at closepost{#1}%
\def\efloattype{#2}% % as
- \clearpage % bj
+ \efloatbegin % bj
\efloat at ifflag{#2list}{% % bj
- {\normalsize\efloat at listof{#2}}% % bj
- \clearpage % bj
+ \begingroup
+ \efloatbeginlist % bj
+ \efloat at listof{#2}% % bj
+ \efloatendlist % bj
+ \endgroup
}{}%
\efloat at ifflag{#2head}{%
\section*{\@nameuse{#2section}}% % bj
@@ -369,6 +403,7 @@
\efloatpreamble
\efloat at input{\jobname.#1}%
\efloatpostamble
+ \efloatend % as
}{}}
\newcommand*\efloat at input[1]{%
\makeatletter
@@ -388,7 +423,7 @@
\renewcommand{\bottomfraction}{1.0}
\renewcommand{\topfraction}{1.0}
\renewcommand{\textfraction}{0.0}
-\newcommand{\processdelayedfloats}{{%
+\newcommand*\processdelayedfloats{{%
\def\baselinestretch{1}\normalsize
\efloat at restorefloats
\processdelayedfloats at hook
@@ -400,7 +435,7 @@
\efloat at list
\let\@elt\relax
\@tempa}
-\AtEndDocument{% % jpg
+\efloat at AtEndDocument{% % jpg
\message{AED endfloat: Processing end Figures and Tables}% % jpg
\onecolumn
\processdelayedfloats }
Modified: trunk/Master/tlpkg/bin/tlpkginfo
===================================================================
--- trunk/Master/tlpkg/bin/tlpkginfo 2019-05-05 17:39:49 UTC (rev 51002)
+++ trunk/Master/tlpkg/bin/tlpkginfo 2019-05-05 17:43:13 UTC (rev 51003)
@@ -70,7 +70,7 @@
# erroneous or problematic tds files (when new, tell CTAN and author)
$erroneous_tds = join ("|",
- qw(alertmessage amstex countriesofeurope dad ebproof engpron gost
+ qw(alertmessage amstex countriesofeurope dad ebproof endfloat engpron gost
hacm inriafonts imtekda mathdesign tufte-latex xassoccnt),
);
Modified: trunk/Master/tlpkg/libexec/ctan2tds
===================================================================
--- trunk/Master/tlpkg/libexec/ctan2tds 2019-05-05 17:39:49 UTC (rev 51002)
+++ trunk/Master/tlpkg/libexec/ctan2tds 2019-05-05 17:43:13 UTC (rev 51003)
@@ -1715,6 +1715,7 @@
'edmac', 'edmac.tex|edstanza.tex|\.sty',
'enctex', '(1250-|852-|csfmacro|enc-u|encmacro|il2-|kam-'
. '|mixcodes|noprefnt|plain-|polyset|t1macro|utf8).*\.tex',
+ 'endfloat', '\.sty', # not *.cfg
'epsf-dvipdfmx', 'epsf-dvipdfmx\.tex',
'esami', '\.sty|\.lng', # no example .cfg
'euflag', 'euflag.sty', # not classpack.sty
More information about the tex-live-commits
mailing list