summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/endfloat
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/endfloat')
-rw-r--r--Master/texmf-dist/tex/latex/endfloat/efxmpl.cfg10
-rw-r--r--Master/texmf-dist/tex/latex/endfloat/endfloat.sty88
2 files changed, 63 insertions, 35 deletions
diff --git a/Master/texmf-dist/tex/latex/endfloat/efxmpl.cfg b/Master/texmf-dist/tex/latex/endfloat/efxmpl.cfg
index 7210866c4d7..770c7ace06b 100644
--- a/Master/texmf-dist/tex/latex/endfloat/efxmpl.cfg
+++ b/Master/texmf-dist/tex/latex/endfloat/efxmpl.cfg
@@ -19,9 +19,9 @@
%% the blame; if you pass it on, pass on all present condiditions;
%%
\def\filename{endfloat}
-\def\fileversion{v2.5d}
-\def\filedate{2011/12/25}
-\def\docdate{2011/12/05}
+\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
@@ -43,8 +43,8 @@
%% Authors: James Darrell McCauley <jdm5548@diamond.tamu.edu>,
%% Jeff Goldberg <jeffrey@goldmark.org>,
%% Axel Sommerfeldt <axel.sommerfeldt@f-m.fm>
-%% Maintainer: Jeff Goldberg <jeffrey@goldmark.org>
-%% Latest Version: Version 2.5 <November 2011>
+%% Maintainer: Axel Sommerfeldt <axel.sommerfeldt@f-m.fm>
+%% Latest Version: Version 2.6 <March 2018>
\RequirePackage{rotating}
\DeclareDelayedFloatFlavor{sidewaysfigure}{figure}
\DeclareDelayedFloatFlavor{sidewaystable}{table}
diff --git a/Master/texmf-dist/tex/latex/endfloat/endfloat.sty b/Master/texmf-dist/tex/latex/endfloat/endfloat.sty
index 559cec7c14a..b5ebaeb7cfd 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.5d}
-\def\filedate{2011/12/25}
-\def\docdate{2011/12/05}
+\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
@@ -43,8 +43,8 @@
%% Authors: James Darrell McCauley <jdm5548@diamond.tamu.edu>,
%% Jeff Goldberg <jeffrey@goldmark.org>,
%% Axel Sommerfeldt <axel.sommerfeldt@f-m.fm>
-%% Maintainer: Jeff Goldberg <jeffrey@goldmark.org>
-%% Latest Version: Version 2.5 <November 2011>
+%% Maintainer: Axel Sommerfeldt <axel.sommerfeldt@f-m.fm>
+%% Latest Version: Version 2.6 <March 2018>
\NeedsTeXFormat{LaTeX2e}[1994/06/01]
\ProvidesPackage{endfloat}[\filedate\space\fileversion\space
LaTeX2e package puts figures and tables at end (jdm)]
@@ -105,8 +105,11 @@
\csname efloat@post#1\endcsname =\jobname.#1\relax
\ef@setct{#1}{1}%
\message{(\jobname.#1)}}
+\newcommand*\efloat@closepost[1]{%
+ \expandafter\immediate\expandafter\closeout\csname efloat@post#1\endcsname
+ \ef@setct{#1}{0}}
\newcommand*\ef@newct[1]{%
- \expandafter \newcount \csname @ef@#1open\endcsname}
+ \expandafter \newcount \csname @ef@#1open\endcsname}
\newcommand*\ef@setct[2]{%
\expandafter\global\csname @ef@#1open\endcsname=#2\relax}
\newcommand*\ef@ifct[1]{%
@@ -118,8 +121,11 @@
\newcommand*\efloat@condopen[1]{%
\ef@ifct{#1}{}{\efloat@openpost{#1}}}
\newcommand\efloat@iwrite[1]{%
- \expandafter\immediate\expandafter\write\csname efloat@post#1\endcsname}
-\newcommand{\efloatseparator}{\clearpage}
+ \immediate\expandafter\protected@write\csname efloat@post#1\endcsname{}}
+\providecommand\efloatheading[1]{\markboth{\uppercase{#1}}{\uppercase{#1}}}
+\providecommand\efloatpreamble{}
+\providecommand{\efloatseparator}{\clearpage}
+\providecommand\efloatpostamble{\efloatseparator}
\newcommand*{\ef@makeinnocent}[1]{\catcode`#1=12 }
\providecommand{\figurename}{Figure}
\providecommand{\tablename}{Table}
@@ -214,7 +220,8 @@
\efloat@list
\let\@elt\relax}
\newcommand\efloat@Setup[2]{%
- \g@addto@macro\efloat@ProcessOptions{\SetupDelayedFloat{#1}{#2}}}
+ \g@addto@macro\efloat@ProcessOptions{%
+ \SetupDelayedFloat{#1}{#2}}}
\newcommand\efloat@ProcessOptions{%
\let\efloat@SetOption\@undefined
\let\efloat@Setup\@undefined
@@ -247,6 +254,8 @@
\DeclareOption{figuresfirst}{\@tablesfirstfalse}
\DeclareOption{tablesonly}{\efloat@figuresfalse \efloat@tablestrue}
\DeclareOption{figuresonly}{\efloat@figurestrue \efloat@tablesfalse}
+\DeclareOption{notables}{\efloat@tablesfalse}
+\DeclareOption{nofigures}{\efloat@figuresfalse}
\DeclareOption*{%
\PackageWarning{endfloat}{Unknown option `\CurrentOption'}}
\ProcessOptions*
@@ -277,6 +286,7 @@
\expandafter\@@efloat\expandafter{\csname ef@ext@#1\endcsname}{#1}}
\newcommand*\@@efloat[3]{%
\efloat@condopen{#1}%
+ \@nameuse{efloat@separator@#1}%
\if@domarkers
\stepcounter{post#2}% % bj
\@nameuse{#2place}% % bj
@@ -288,6 +298,8 @@
\endlinechar`\^^M \catcode`\^^M=12 %
\efloat@patch\efloat@endtest{#3}% as
\efloat@patch\efloat@enddbltest{#3}% as
+ \efloat@patch\efloat@endtestX{#3}% as
+ \efloat@patch\efloat@enddbltestX{#3}% as
\def\next{\efloat@xfloat{#1}}%
\next\string\begin{#3}}%
\newcommand*\efloat@foundend[2]{%
@@ -295,21 +307,31 @@
\efloat@found@end{#1}}
\newcommand*\efloat@found@end[1]{%
\efloat@iwrite{#1}{\efloat@enddbltest}%
- \def\next{\endgroup\end{efloat@float}%
+ \global\@namedef{efloat@separator@#1}{%
\efloat@iwrite{#1}{\string\efloatseparator}%
- \efloat@iwrite{#1}{ }}}%
+ \efloat@iwrite{#1}{ }}%
+ \def\next{\endgroup\end{efloat@float}}}
{\catcode`\^^M=12 \endlinechar=-1 %
- \long\gdef\efloat@xfloat#1#2^^M{\def\test{#2}%
+ \long\gdef\efloat@xfloat#1#2^^M{%
+ \efloat@if@end{#2}{\efloat@found@end{#1}}{\efloat@iwrite{#1}{#2}}%
+ \next}}
+\newcommand\efloat@if@end[1]{%
+ \def\test{#1}%
+ \let\efloat@next\@firstoftwo
\ifx\test\efloat@endtest
- \efloat@found@end{#1}%
\else\ifx\test\efloat@enddbltest
- \efloat@found@end{#1}%
+ \else\ifx\test\efloat@endtestX
+ \else\ifx\test\efloat@enddbltestX
\else
- \efloat@iwrite{#1}{#2}%
- \fi \fi \next}}
+ \let\efloat@next\@secondoftwo
+ \fi\fi\fi\fi \efloat@next}
{\escapechar=-1%
+ \catcode`\#=14 % hash mark is comment character
+ \catcode`\%=12 # percent sign is other character
\xdef\efloat@endtest{\string\\end\string\{X\string\}}
\xdef\efloat@enddbltest{\string\\end\string\{X\string\}}
+ \xdef\efloat@endtestX{\string\\end\string\{X\string\}%}
+ \xdef\efloat@enddbltestX{\string\\end\string\{X\string\}%}
}
\newcommand*\efloat@patch[2]{%
\def\x##1X##2\@nil{\def#1{##1#2##2}}%
@@ -319,6 +341,8 @@
\newcommand*\ef@xfloat[2]{%
\efloat@patch\efloat@endtest{#2}%
\efloat@patch\efloat@enddbltest{#2*}%
+ \efloat@patch\efloat@endtestX{#2}%
+ \efloat@patch\efloat@enddbltestX{#2*}%
\def\next{\efloat@xfloat{#1}}%
\next}
\newcommand*\processdelayedfloats@hook{}
@@ -327,25 +351,29 @@
\newcommand*\processotherdelayedfloats{}
\newcommand*\efloat@process[2]{%
\ef@ifct{#1}{%
- \expandafter\immediate\expandafter\closeout\csname efloat@post#1\endcsname
- \ef@setct{#1}{0}%
- \clearpage % bj
- \efloat@ifflag{#2list}{% % bj
- {\normalsize\efloat@listof{#2}}% % bj
- \clearpage % bj
+ \efloat@closepost{#1}%
+ \def\efloattype{#2}% % as
+ \clearpage % bj
+ \efloat@ifflag{#2list}{% % bj
+ {\normalsize\efloat@listof{#2}}% % bj
+ \clearpage % bj
}{}%
\efloat@ifflag{#2head}{%
- \section*{\@nameuse{#2section}}% % bj
- \suppressfloats[t]% % jpg
+ \section*{\@nameuse{#2section}}% % bj
+ \suppressfloats[t]% % jpg
}{}%
- \markboth % bj
- {\expandafter\uppercase\expandafter{\csname #2section\endcsname}}% bj
- {\expandafter\uppercase\expandafter{\csname #2section\endcsname}}% bj
- \def\efloat@type{#2}%
+ \expandafter\expandafter\expandafter\efloatheading % bj
+ \expandafter\csname #2section\endcsname % bj
\processdelayedfloat@hook
\@nameuse{process#2s@hook}%
- \@input{\jobname.#1}%
+ \efloatpreamble
+ \efloat@input{\jobname.#1}%
+ \efloatpostamble
}{}}
+\newcommand*\efloat@input[1]{%
+ \makeatletter
+ \@input{#1}%
+ \makeatother}
\newcommand*\processdelayedfloat@hook{}
\newcommand*\efloat@listof[1]{%
\expandafter\providecommand\csname list#1name\endcsname
@@ -372,7 +400,7 @@
\efloat@list
\let\@elt\relax
\@tempa}
-\AtEndDocument{% % jpg
+\AtEndDocument{% % jpg
\message{AED endfloat: Processing end Figures and Tables}% % jpg
\onecolumn
\processdelayedfloats }
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-31 19:13:55 +0000