summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/endfloat
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-05-05 17:43:13 +0000
committerKarl Berry <karl@freefriends.org>2019-05-05 17:43:13 +0000
commitc2a544ec428c552ba203547c34489525dfb4a7bf (patch)
treea8f37283985925269e173bce52f226993cdb7f8b /Master/texmf-dist/tex/latex/endfloat
parent43c8ffeda0f732ffbf41e0cfd74547b319469670 (diff)
endfloat (15apr19)
git-svn-id: svn://tug.org/texlive/trunk@51003 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/endfloat')
-rw-r--r--Master/texmf-dist/tex/latex/endfloat/efxmpl.cfg53
-rw-r--r--Master/texmf-dist/tex/latex/endfloat/endfloat.sty87
2 files changed, 61 insertions, 79 deletions
diff --git a/Master/texmf-dist/tex/latex/endfloat/efxmpl.cfg b/Master/texmf-dist/tex/latex/endfloat/efxmpl.cfg
deleted file mode 100644
index 770c7ace06b..00000000000
--- a/Master/texmf-dist/tex/latex/endfloat/efxmpl.cfg
+++ /dev/null
@@ -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@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@diamond.tamu.edu>,
-%% Jeff Goldberg <jeffrey@goldmark.org>,
-%% Axel Sommerfeldt <axel.sommerfeldt@f-m.fm>
-%% Maintainer: Axel Sommerfeldt <axel.sommerfeldt@f-m.fm>
-%% Latest Version: Version 2.6 <March 2018>
-\RequirePackage{rotating}
-\DeclareDelayedFloatFlavor{sidewaysfigure}{figure}
-\DeclareDelayedFloatFlavor{sidewaystable}{table}
-\endinput
-%%
-%% End of file `efxmpl.cfg'.
diff --git a/Master/texmf-dist/tex/latex/endfloat/endfloat.sty b/Master/texmf-dist/tex/latex/endfloat/endfloat.sty
index b5ebaeb7cfd..a4292cd42ce 100644
--- a/Master/texmf-dist/tex/latex/endfloat/endfloat.sty
+++ b/Master/texmf-dist/tex/latex/endfloat/endfloat.sty
@@ -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@diamond.tamu.edu>,
-%% Jeff Goldberg <jeffrey@goldmark.org>,
-%% Axel Sommerfeldt <axel.sommerfeldt@f-m.fm>
-%% Maintainer: Axel Sommerfeldt <axel.sommerfeldt@f-m.fm>
-%% Latest Version: Version 2.6 <March 2018>
+%% Jeff Goldberg <jeffrey@goldmark.org>,
+%% Axel Sommerfeldt <axel.sommerfeldt@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@setkey{%
\@expandtwoargs\efloat@@setkey\efloat@type}
\newcommand*\efloat@@setkey[3]{%
+ \efloat@ifdelayed{#1}{%
+ \efloat@setflag{#1#2}{#3}%
+ \efloat@syncobsoleteflags}}
+\newcommand\efloat@ifdelayed[2]{%
\@ifundefined{ef@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@setflag{#1#2}{#3}%
- \efloat@syncobsoleteflags}}
+ {#2}}%
\newcommand*\efloat@ifflag[1]{%
\@nameuse{ef@if@#1}}
\newcommand*\efloat@setflag[2]{%
@@ -120,12 +123,33 @@
\fi}
\newcommand*\efloat@condopen[1]{%
\ef@ifct{#1}{}{\efloat@openpost{#1}}}
+\providecommand\protected@iwrite[3]{%
+ \begingroup
+ \let\thepage\relax
+ #2%
+ \let\protect\@unexpandable@protect
+ \edef\reserved@a{\immediate\write #1{#3}}%
+ \reserved@a
+ \endgroup
+ \if@nobreak\ifvmode\nobreak\fi\fi}
\newcommand\efloat@iwrite[1]{%
- \immediate\expandafter\protected@write\csname efloat@post#1\endcsname{}}
-\providecommand\efloatheading[1]{\markboth{\uppercase{#1}}{\uppercase{#1}}}
+ \expandafter\protected@iwrite\csname efloat@post#1\endcsname{}}
+\newcommand\addtodelayedfloat{%
+ \@ifstar{\efloat@addto\@firstofone}{\efloat@addto\detokenize}}
+\newcommand\efloat@addto[3]{%
+ \efloat@ifdelayed{#2}{%
+ \expandafter\efloat@@addto\expandafter{\csname ef@ext@#2\endcsname}{#1{#3}}}}
+\newcommand\efloat@@addto[1]{%
+ \efloat@condopen{#1}\efloat@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@makeinnocent}[1]{\catcode`#1=12 }
\providecommand{\figurename}{Figure}
\providecommand{\tablename}{Table}
@@ -183,13 +207,10 @@
\let\DeclareDelayedFloatFlavour\DeclareDelayedFloatFlavor
\@onlypreamble\DeclareDelayedFloatFlavour
\newcommand*\efloat@declareflavor[3]{%
- \@ifundefined{ef@ext@#3}%
- {\PackageError{endfloat}%
- {Unknown environment `#3'}%
- {Only environments known to the `endfloat' package are allowed here.}}%
- {\efloat@AtBeginDocument{%
- \efloat@@declareflavor{#2}{#3}%
- #1{\efloat@@declareflavor{#2*}{#3}}}}}
+ \efloat@ifdelayed{#3}{%
+ \efloat@AtBeginDocument{%
+ \efloat@@declareflavor{#2}{#3}%
+ #1{\efloat@@declareflavor{#2*}{#3}}}}}
\@onlypreamble\efloat@declareflavor
\newcommand*\efloat@@declareflavor[2]{%
\def\@tempa{\@efloat{#2}{#1}}%
@@ -256,8 +277,18 @@
\DeclareOption{figuresonly}{\efloat@figurestrue \efloat@tablesfalse}
\DeclareOption{notables}{\efloat@tablesfalse}
\DeclareOption{nofigures}{\efloat@figuresfalse}
+\newcommand*\efloat@AtEndDocument{\AtEndDocument}
+\DeclareOption{disable}{%
+ \def\efloat@@declare#1#2[#3]#4{%
+ \PackageInfo{endfloat}{`#2' is not delayed since option `disable' was specified}}%
+ \renewcommand*\efloat@declareflavor[3]{}%
+ \renewcommand*\efloat@@setkey[3]{}%
+ \renewcommand*\efloat@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@ifct{#1}{%
\efloat@closepost{#1}%
\def\efloattype{#2}% % as
- \clearpage % bj
+ \efloatbegin % bj
\efloat@ifflag{#2list}{% % bj
- {\normalsize\efloat@listof{#2}}% % bj
- \clearpage % bj
+ \begingroup
+ \efloatbeginlist % bj
+ \efloat@listof{#2}% % bj
+ \efloatendlist % bj
+ \endgroup
}{}%
\efloat@ifflag{#2head}{%
\section*{\@nameuse{#2section}}% % bj
@@ -369,6 +403,7 @@
\efloatpreamble
\efloat@input{\jobname.#1}%
\efloatpostamble
+ \efloatend % as
}{}}
\newcommand*\efloat@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@restorefloats
\processdelayedfloats@hook
@@ -400,7 +435,7 @@
\efloat@list
\let\@elt\relax
\@tempa}
-\AtEndDocument{% % jpg
+\efloat@AtEndDocument{% % jpg
\message{AED endfloat: Processing end Figures and Tables}% % jpg
\onecolumn
\processdelayedfloats }