texlive[48815] Master/texmf-dist: tableof (2oct18)
commits+karl at tug.org
commits+karl at tug.org
Tue Oct 2 23:38:29 CEST 2018
Revision: 48815
http://tug.org/svn/texlive?view=revision&revision=48815
Author: karl
Date: 2018-10-02 23:38:29 +0200 (Tue, 02 Oct 2018)
Log Message:
-----------
tableof (2oct18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/tableof/README.md
trunk/Master/texmf-dist/doc/latex/tableof/tableof.pdf
trunk/Master/texmf-dist/source/latex/tableof/tableof.dtx
trunk/Master/texmf-dist/source/latex/tableof/tableof.ins
trunk/Master/texmf-dist/tex/latex/tableof/tableof.sty
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/latex/tableof/README
Deleted: trunk/Master/texmf-dist/doc/latex/tableof/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/tableof/README 2018-10-02 21:38:14 UTC (rev 48814)
+++ trunk/Master/texmf-dist/doc/latex/tableof/README 2018-10-02 21:38:29 UTC (rev 48815)
@@ -1,91 +0,0 @@
-
-
-ABSTRACT
-
-
-- Package: tableof (Tables of tagged contents)
-- Version: 1.4a (2015/03/10)
-- License: LPPL 1.3c
-- Copyright (C) 2012-2015 Jean-Francois Burnol
-
-The commands \toftagstart, \toftagstop, \toftagthis, \tofuntagthis are
-used to tag chapters, sections or any other sectioning units destined to
-end up in the table(s) of contents. Then:
-
- \nexttocwithtags{req. 1, req. 2, ... }{excl. 1, excl. 2, ... }
- \tableofcontents % or equivalent command
-
-
-specifies which tags are to be required and which ones are to be
-excluded from the typeset TOC.
-
-For documents with classes where \tableofcontents is only single-use,
-the package provides:
-
- \tableoftaggedcontents{req. 1, req. 2, ... }{excl. 1, excl. 2, ... }
-
-which does not have this restriction.
-
-
-
-INSTALLATION
-
-
-For extracting the style file:
-
- latex tableof.dtx
-
-Files tableof.sty, tableof.ins and tableoftest.tex are generated on the
-first latex run. Move tableof.sty to a suitable location within the TeX
-installation:
-
- tableof.sty -> <TDS>/tex/latex/tableof/
-
-To produce the documentation:
-
- latex tableof.dtx (a second time)
- dvipdfmx tableof.dvi
-
-tableof.ins is for TeX distributions expecting it.
-
-tableoftest.tex is an example of use of the package commands. Run latex
-twice on it to see examples of tagged tables of contents.
-
-
-
-CHANGE HISTORY
-
-
-- v1.4a (2015/03/10) changes for enhanced compatibility with etoc.
-
-- v1.4 (2015/02/20) under the hood code improvements.
-
-- v1.3 (2015/02/11) comma separated lists of tags now allow spaces.
-
-- v1.2 (2013/03/04) added command \tableoftaggedcontents.
-
-- v1.1 (2012/12/13) added command \nexttocwithtags.
-
-- v1.0 (2012/12/06) first release.
-
-
-
-LICENSE
-
-
- 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
-
-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.
-
- The Author of this Work is:
- Jean-Francois Burnol <jfbu at free dot fr>
Modified: trunk/Master/texmf-dist/doc/latex/tableof/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/tableof/README.md 2018-10-02 21:38:14 UTC (rev 48814)
+++ trunk/Master/texmf-dist/doc/latex/tableof/README.md 2018-10-02 21:38:29 UTC (rev 48815)
@@ -2,9 +2,9 @@
========
- Package: tableof (Tables of tagged contents)
-- 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>
The commands `\toftagstart`, `\toftagstop`, `\toftagthis`, `\tofuntagthis`
are used to tag chapters, sections or any other sectioning units destined
@@ -51,8 +51,11 @@
Change History
==============
-* v1.4a (2015/03/10) changes for enhanced compatibility with etoc.
+* v1.4b (2018/10/02) fix to bug when a document ended with `\clearpage`
+ before the `\end{document}`. `tableof` now requires `atveryend` package.
+* v1.4a (2015/03/10) changes for enhanced compatibility with `etoc`.
+
* v1.4 (2015/02/20) under the hood code improvements.
* v1.3 (2015/02/11) comma separated lists of tags now allow spaces.
@@ -68,19 +71,11 @@
=======
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
+ conditions of the LaTeX Project Public License,
+ version 1.3c. 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.
-
The Author of this Work is:
Jean-Francois Burnol <jfbu at free dot fr>
Modified: trunk/Master/texmf-dist/doc/latex/tableof/tableof.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/tableof/tableof.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/tableof/tableof.dtx 2018-10-02 21:38:14 UTC (rev 48814)
+++ trunk/Master/texmf-dist/source/latex/tableof/tableof.dtx 2018-10-02 21:38:29 UTC (rev 48815)
@@ -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 @@
\hangafter1 }
\makeatother
+|2018/10/02 v1.4b: |fix for situations when a |\clearpage| before
+the |\end{document}| resulted in the loss of the |\tof at 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 at begin|, |\tof at finish| are set up, new |\tof at global| which
@@ -636,13 +639,13 @@
|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 at filesw} test to \csa{tofOpenTocFileForWrite}.
+| ii. |added \csa{if at 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 @@
%<*package>
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
+\RequirePackage{atveryend}
\DeclareOption*{\PackageWarning{tableof}{Option `\CurrentOption' is unknown.}}
\ProcessOptions\relax
\newtoks\tof at toctoks
@@ -777,8 +781,22 @@
{\def\tof at gobblethree@orfour#1#2#3#4{}%
\ifx\hyper at last\@undefined\tof at toctoks{}\fi}
{\def\tof at gobblethree@orfour#1#2#3{}}}
-\AtEndDocument{\addtocontents{toc}{\string\tof at finish}}
% \end{macrocode}
+% |1.4b| (belatedly) fixes issue with |\tof at finish| getting lost due
+% to a final |\clearpage| before |\end{document}|. Indeed, formerly
+% code did:
+%
+% {\centering|\AtEndDocument{\addtocontents{toc}{\string\tof at 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 at finish}}}
+% \end{macrocode}
% |1.4a| makes the things more easily patchable by other packages, especially
% I have \etoc in mind.
%
@@ -982,7 +1000,7 @@
Grave accent \` Left brace \{ Vertical bar \|
Right brace \} Tilde \~}
-\CheckSum{552}
+\CheckSum{557}
\Finale
%%
Modified: trunk/Master/texmf-dist/source/latex/tableof/tableof.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/tableof/tableof.ins 2018-10-02 21:38:14 UTC (rev 48814)
+++ trunk/Master/texmf-dist/source/latex/tableof/tableof.ins 2018-10-02 21:38:29 UTC (rev 48815)
@@ -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'.
%%
Modified: trunk/Master/texmf-dist/tex/latex/tableof/tableof.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tableof/tableof.sty 2018-10-02 21:38:14 UTC (rev 48814)
+++ trunk/Master/texmf-dist/tex/latex/tableof/tableof.sty 2018-10-02 21:38:29 UTC (rev 48815)
@@ -22,14 +22,15 @@
%% in the same archive or directory.)
%%
\ProvidesPackage{tableof}
- [2015/03/10 v1.4a Tables of tagged contents (jfB)]
+ [2018/10/02 v1.4b Tables of tagged contents (JFB)]
%%
%% 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>
%%
\NeedsTeXFormat{LaTeX2e}
+\RequirePackage{atveryend}
\DeclareOption*{\PackageWarning{tableof}{Option `\CurrentOption' is unknown.}}
\ProcessOptions\relax
\newtoks\tof at toctoks
@@ -62,7 +63,8 @@
{\def\tof at gobblethree@orfour#1#2#3#4{}%
\ifx\hyper at last\@undefined\tof at toctoks{}\fi}
{\def\tof at gobblethree@orfour#1#2#3{}}}
-\AtEndDocument{\addtocontents{toc}{\string\tof at finish}}
+\AfterLastShipout
+ {\immediate\write\@auxout{\string\@writefile{toc}{\string\tof at finish}}}
\let\tof at global \@empty
\let\tof at begingroup \begingroup
\let\tof at endgroup \endgroup
More information about the tex-live-commits
mailing list