tableof (2oct18)

git-svn-id: svn://tug.org/texlive/trunk@48815 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 40 insertions, 22 deletions

diff --git a/Master/texmf-dist/source/latex/tableof/tableof.dtx b/Master/texmf-dist/source/latex/tableof/tableof.dtx
index b31b42a18c8..34a881d1e8a 100644
--- a/Master/texmf-dist/source/latex/tableof/tableof.dtx
+++ b/Master/texmf-dist/source/latex/tableof/tableof.dtx
@@ -1,23 +1,20 @@
 % -*- coding: iso-latin-1; -*-
 %<*none>
-{\def\doctimestamp {Time-stamp: <10-03-2015 22:22:48 CET>}% 
+{\def\doctimestamp {Time-stamp: <02-10-2018 11:43:43 CEST>}% 
  \def\getdtxtimestamp #1 <#2 #3 #4>{#2 at #3 #4}%
  \xdef\tofdtxtimestamp {\expandafter\getdtxtimestamp\doctimestamp }}%
-\def\docdate{2015/03/10}
+\def\docdate{2018/10/02}
 %</none>
 %%
 %% Package: tableof
-%% Version: 1.4a (2015/03/10)
+%% Version: 1.4b (2018/10/02)
 %% License: LPPL 1.3c
-%% Copyright (C) 2012-2015 Jean-Francois Burnol <jfbu at free dot fr>
+%% Copyright (C) 2012-2018 Jean-Francois Burnol <jfbu at free dot fr>
 %%
 %     This Work may be distributed and/or modified under the
 %     conditions of the LaTeX Project Public License, either
-%     version 1.3c of this license or (at your option) any later
-%     version. This version of this license is in 
+%     version 1.3c of this license. This version of this license is in 
 %          http://www.latex-project.org/lppl/lppl-1-3c.txt
-%     and the latest version of this license is in
-%          http://www.latex-project.org/lppl.txt
 %     and version 1.3 or later is part of all distributions of
 %     LaTeX version 2005/12/01 or later. 
 %
@@ -44,9 +41,9 @@
 %
 %<*ins>
 \def\pkgname        {tableof}
-\def\pkgdate        {2015/03/10}
-\def\pkgversion     {v1.4a}
-\def\pkgdescription {Tables of tagged contents (jfB)}
+\def\pkgdate        {2018/10/02}
+\def\pkgversion     {v1.4b}
+\def\pkgdescription {Tables of tagged contents (JFB)}
 %</ins>
 %<*none>
 \ProvidesFile{\pkgname.dtx}%
@@ -609,6 +606,12 @@ tables of contents, apart from
                                   \hangafter1 }
 \makeatother
 
+|2018/10/02 v1.4b:    |fix for situations when a |\clearpage| before
+the |\end{document}| resulted in the loss of the |\tof@finish| token from |.toc|
+file, causing the package to misbehave (cf.
+\url{https://tex.stackexchange.com/q/358014/4686}). The package
+|atveryend| is now required.\footnote{\url{http://www.ctan.org/pkg/atveryend}}
+
 |2015/03/10 v1.4a: i. |changes in the code to make it more easily patchable by
 other packages (I have especially the next release of \etoc in mind): changes
 to the way |\tof@begin|, |\tof@finish| are set up, new |\tof@global| which
@@ -636,13 +639,13 @@ document uses standard |\tableofcontents| or like commands.
 |2013/03/04 v1.2:  i. |added \csa{tableoftaggedcontents} as a wrapper for using
 \csa{nexttocwithtags} followed with |tableof|'s private copy of the |.toc| data.
 
-|                ii. |added \csa{if@filesw} test to \csa{tofOpenTocFileForWrite}.
+|                ii.  |added \csa{if@filesw} test to \csa{tofOpenTocFileForWrite}.
 
-|2012/12/13 v1.1: i. |new command \csa{nexttocwithtags}.
+|2012/12/13 v1.1: i.  |new command \csa{nexttocwithtags}.
 
-|                ii. ||.toc| may be input in another document not loading \tableof.
+|                ii.  ||.toc| may be input in another document not loading \tableof.
 
-|2012/12/06 v1.0:    |initial version.\par
+|2012/12/06 v1.0:     |initial version.\par
 
 \endgroup
 
@@ -713,6 +716,7 @@ produce the pdf documentation.
 %<*package>
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
+\RequirePackage{atveryend}
 \DeclareOption*{\PackageWarning{tableof}{Option `\CurrentOption' is unknown.}}
 \ProcessOptions\relax
 \newtoks\tof@toctoks
@@ -777,7 +781,21 @@ produce the pdf documentation.
        {\def\tof@gobblethree@orfour#1#2#3#4{}%
         \ifx\hyper@last\@undefined\tof@toctoks{}\fi}
        {\def\tof@gobblethree@orfour#1#2#3{}}}
-\AtEndDocument{\addtocontents{toc}{\string\tof@finish}}
+%    \end{macrocode}
+% |1.4b| (belatedly) fixes issue with |\tof@finish| getting lost due
+% to a final |\clearpage| before |\end{document}|. Indeed, formerly
+% code did:
+%
+% {\centering|\AtEndDocument{\addtocontents{toc}{\string\tof@finish}}|\par}
+%
+% But we can't replace this by some |\immediate\write\@auxout| at end
+% document, because it would act \emph{before} the writes triggered by
+% the |\clearpage| from inside |\end{document}|, if no such
+% |\clearpage| ended the document body. Thus |\AfterLastShipout| comes
+% to the rescue, from package |atveryend|.
+%    \begin{macrocode}
+\AfterLastShipout
+    {\immediate\write\@auxout{\string\@writefile{toc}{\string\tof@finish}}}
 %    \end{macrocode}
 % |1.4a| makes the things more easily patchable by other packages, especially
 % I have \etoc in mind.
@@ -982,7 +1000,7 @@ produce the pdf documentation.
   Grave accent  \`     Left brace    \{     Vertical bar  \|
   Right brace   \}     Tilde         \~}
 
-\CheckSum{552}
+\CheckSum{557}
 
 \Finale
 %%
diff --git a/Master/texmf-dist/source/latex/tableof/tableof.ins b/Master/texmf-dist/source/latex/tableof/tableof.ins
index 183a5e8ca3d..0b0f091b8de 100644
--- a/Master/texmf-dist/source/latex/tableof/tableof.ins
+++ b/Master/texmf-dist/source/latex/tableof/tableof.ins
@@ -1,13 +1,13 @@
 %%
 %% Package: tableof
-%% Version: 1.4a (2015/03/10)
+%% Version: 1.4b (2018/10/02)
 %% License: LPPL 1.3c
-%% Copyright (C) 2012-2015 Jean-Francois Burnol <jfbu at free dot fr>
+%% Copyright (C) 2012-2018 Jean-Francois Burnol <jfbu at free dot fr>
 %%
 \def\pkgname        {tableof}
-\def\pkgdate        {2015/03/10}
-\def\pkgversion     {v1.4a}
-\def\pkgdescription {Tables of tagged contents (jfB)}
+\def\pkgdate        {2018/10/02}
+\def\pkgversion     {v1.4b}
+\def\pkgdescription {Tables of tagged contents (JFB)}
 %% This file `tableof.ins' is provided for compatibility with TeX
 %% distributions expecting to find it for installation of `tableof.sty'.
 %%