summaryrefslogtreecommitdiff
path: root/macros/latex/required
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-02-03 03:02:01 +0000
committerNorbert Preining <norbert@preining.info>2020-02-03 03:02:01 +0000
commit34897eebd22c3de968b64f09bb4a371d96cb0b89 (patch)
tree19a50e54fca63f1f6482d6cb4c2fdee676fd97b1 /macros/latex/required
parente05dc0bb38b16bfb9ba35591285e40af0adaadc4 (diff)
CTAN sync 202002030302
Diffstat (limited to 'macros/latex/required')
-rw-r--r--macros/latex/required/amsmath/README.md4
-rw-r--r--macros/latex/required/amsmath/amsbsy.dtx6
-rw-r--r--macros/latex/required/amsmath/amsbsy.ins8
-rw-r--r--macros/latex/required/amsmath/amsbsy.pdfbin161335 -> 161330 bytes
-rw-r--r--macros/latex/required/amsmath/amscd.dtx6
-rw-r--r--macros/latex/required/amsmath/amscd.ins8
-rw-r--r--macros/latex/required/amsmath/amscd.pdfbin165753 -> 165748 bytes
-rw-r--r--macros/latex/required/amsmath/amsgen.dtx6
-rw-r--r--macros/latex/required/amsmath/amsgen.ins8
-rw-r--r--macros/latex/required/amsmath/amsgen.pdfbin164353 -> 164347 bytes
-rw-r--r--macros/latex/required/amsmath/amsldoc.pdfbin475103 -> 480725 bytes
-rw-r--r--macros/latex/required/amsmath/amsldoc.tex8
-rw-r--r--macros/latex/required/amsmath/amsmath-2018-12-01.sty12
-rw-r--r--macros/latex/required/amsmath/amsmath.dtx51
-rw-r--r--macros/latex/required/amsmath/amsmath.ins8
-rw-r--r--macros/latex/required/amsmath/amsmath.pdfbin379046 -> 378955 bytes
-rw-r--r--macros/latex/required/amsmath/amsopn.dtx6
-rw-r--r--macros/latex/required/amsmath/amsopn.ins8
-rw-r--r--macros/latex/required/amsmath/amsopn.pdfbin129171 -> 129165 bytes
-rw-r--r--macros/latex/required/amsmath/amstex.sty4
-rw-r--r--macros/latex/required/amsmath/amstext.dtx6
-rw-r--r--macros/latex/required/amsmath/amstext.ins9
-rw-r--r--macros/latex/required/amsmath/amstext.pdfbin193904 -> 200043 bytes
-rw-r--r--macros/latex/required/amsmath/amsxtra.dtx6
-rw-r--r--macros/latex/required/amsmath/amsxtra.ins9
-rw-r--r--macros/latex/required/amsmath/amsxtra.pdfbin104549 -> 104544 bytes
-rw-r--r--macros/latex/required/amsmath/changes.txt14
-rw-r--r--macros/latex/required/amsmath/subeqn.pdfbin101296 -> 101297 bytes
-rw-r--r--macros/latex/required/amsmath/technote.pdfbin130486 -> 135744 bytes
-rw-r--r--macros/latex/required/amsmath/testmath.pdfbin428708 -> 430478 bytes
-rw-r--r--macros/latex/required/graphics/README.md4
-rw-r--r--macros/latex/required/graphics/cat-eps-converted-to.pdf84
-rw-r--r--macros/latex/required/graphics/changes.txt25
-rw-r--r--macros/latex/required/graphics/color.dtx38
-rw-r--r--macros/latex/required/graphics/color.pdfbin201496 -> 201521 bytes
-rw-r--r--macros/latex/required/graphics/drivers.dtx2
-rw-r--r--macros/latex/required/graphics/drivers.pdfbin263534 -> 268843 bytes
-rw-r--r--macros/latex/required/graphics/epsfig.dtx2
-rw-r--r--macros/latex/required/graphics/epsfig.pdfbin154483 -> 154491 bytes
-rw-r--r--macros/latex/required/graphics/graphics-2017-06-25.sty6
-rw-r--r--macros/latex/required/graphics/graphics.dtx21
-rw-r--r--macros/latex/required/graphics/graphics.pdfbin284134 -> 289788 bytes
-rw-r--r--macros/latex/required/graphics/graphicx.dtx9
-rw-r--r--macros/latex/required/graphics/graphicx.pdfbin232381 -> 232502 bytes
-rw-r--r--macros/latex/required/graphics/grfguide.pdfbin310537 -> 310569 bytes
-rw-r--r--macros/latex/required/graphics/grfguide.tex44
-rw-r--r--macros/latex/required/graphics/keyval.dtx2
-rw-r--r--macros/latex/required/graphics/keyval.pdfbin222662 -> 222531 bytes
-rw-r--r--macros/latex/required/graphics/lscape.dtx2
-rw-r--r--macros/latex/required/graphics/lscape.pdfbin150107 -> 150110 bytes
-rw-r--r--macros/latex/required/graphics/rotating.dtx58
-rw-r--r--macros/latex/required/graphics/rotating.pdfbin246267 -> 250716 bytes
-rw-r--r--macros/latex/required/graphics/rotex.pdfbin162245 -> 162253 bytes
-rw-r--r--macros/latex/required/graphics/rotex.tex30
-rw-r--r--macros/latex/required/graphics/trig.dtx2
-rw-r--r--macros/latex/required/graphics/trig.pdfbin191693 -> 191699 bytes
-rw-r--r--macros/latex/required/tools/README.md4
-rw-r--r--macros/latex/required/tools/afterpage.dtx2
-rw-r--r--macros/latex/required/tools/afterpage.ins22
-rw-r--r--macros/latex/required/tools/afterpage.pdfbin189858 -> 189855 bytes
-rw-r--r--macros/latex/required/tools/array-2016-10-06.sty10
-rw-r--r--macros/latex/required/tools/array.dtx31
-rw-r--r--macros/latex/required/tools/array.pdfbin481305 -> 486044 bytes
-rw-r--r--macros/latex/required/tools/bm.dtx4
-rw-r--r--macros/latex/required/tools/bm.ins22
-rw-r--r--macros/latex/required/tools/bm.pdfbin306795 -> 306787 bytes
-rw-r--r--macros/latex/required/tools/calc.dtx2
-rw-r--r--macros/latex/required/tools/calc.pdfbin340611 -> 346065 bytes
-rw-r--r--macros/latex/required/tools/changes.txt35
-rw-r--r--macros/latex/required/tools/dcolumn.dtx2
-rw-r--r--macros/latex/required/tools/dcolumn.pdfbin199056 -> 204376 bytes
-rw-r--r--macros/latex/required/tools/delarray.dtx2
-rw-r--r--macros/latex/required/tools/delarray.pdfbin183440 -> 183440 bytes
-rw-r--r--macros/latex/required/tools/enumerate.dtx2
-rw-r--r--macros/latex/required/tools/enumerate.pdfbin199057 -> 199056 bytes
-rw-r--r--macros/latex/required/tools/fileerr.dtx2
-rw-r--r--macros/latex/required/tools/fileerr.pdfbin180388 -> 179543 bytes
-rw-r--r--macros/latex/required/tools/fontsmpl.dtx2
-rw-r--r--macros/latex/required/tools/fontsmpl.pdfbin144831 -> 143176 bytes
-rw-r--r--macros/latex/required/tools/ftnright.dtx2
-rw-r--r--macros/latex/required/tools/ftnright.pdfbin347222 -> 346382 bytes
-rw-r--r--macros/latex/required/tools/hhline.dtx19
-rw-r--r--macros/latex/required/tools/hhline.pdfbin175731 -> 175685 bytes
-rw-r--r--macros/latex/required/tools/indentfirst.dtx2
-rw-r--r--macros/latex/required/tools/indentfirst.pdfbin144791 -> 144786 bytes
-rw-r--r--macros/latex/required/tools/layout.dtx2
-rw-r--r--macros/latex/required/tools/layout.pdfbin246971 -> 246939 bytes
-rw-r--r--macros/latex/required/tools/longtable.dtx22
-rw-r--r--macros/latex/required/tools/longtable.ins22
-rw-r--r--macros/latex/required/tools/longtable.pdfbin350087 -> 355032 bytes
-rw-r--r--macros/latex/required/tools/manifest.txt20
-rw-r--r--macros/latex/required/tools/multicol-2017-04-11.sty12
-rw-r--r--macros/latex/required/tools/multicol.dtx124
-rw-r--r--macros/latex/required/tools/multicol.ins22
-rw-r--r--macros/latex/required/tools/multicol.pdfbin490376 -> 490908 bytes
-rw-r--r--macros/latex/required/tools/rawfonts.dtx2
-rw-r--r--macros/latex/required/tools/rawfonts.pdfbin135698 -> 135695 bytes
-rw-r--r--macros/latex/required/tools/shellesc.dtx10
-rw-r--r--macros/latex/required/tools/shellesc.pdfbin169769 -> 169764 bytes
-rw-r--r--macros/latex/required/tools/showkeys.dtx2
-rw-r--r--macros/latex/required/tools/showkeys.pdfbin242796 -> 242793 bytes
-rw-r--r--macros/latex/required/tools/somedefs.dtx2
-rw-r--r--macros/latex/required/tools/somedefs.pdfbin156472 -> 161657 bytes
-rw-r--r--macros/latex/required/tools/tabularx.dtx15
-rw-r--r--macros/latex/required/tools/tabularx.ins22
-rw-r--r--macros/latex/required/tools/tabularx.pdfbin254096 -> 259323 bytes
-rw-r--r--macros/latex/required/tools/theorem.dtx2
-rw-r--r--macros/latex/required/tools/theorem.pdfbin323329 -> 328039 bytes
-rw-r--r--macros/latex/required/tools/tools-overview.pdfbin68299 -> 68295 bytes
-rw-r--r--macros/latex/required/tools/tools-overview.tex2
-rw-r--r--macros/latex/required/tools/tools.ins24
-rw-r--r--macros/latex/required/tools/trace.dtx10
-rw-r--r--macros/latex/required/tools/trace.pdfbin212742 -> 212737 bytes
-rw-r--r--macros/latex/required/tools/varioref-2016-02-16.sty16
-rw-r--r--macros/latex/required/tools/varioref.dtx37
-rw-r--r--macros/latex/required/tools/varioref.ins22
-rw-r--r--macros/latex/required/tools/varioref.pdfbin355230 -> 354745 bytes
-rw-r--r--macros/latex/required/tools/verbatim.dtx8
-rw-r--r--macros/latex/required/tools/verbatim.pdfbin308887 -> 308832 bytes
-rw-r--r--macros/latex/required/tools/xr.dtx5
-rw-r--r--macros/latex/required/tools/xr.pdfbin163803 -> 163793 bytes
-rw-r--r--macros/latex/required/tools/xspace.dtx2
-rw-r--r--macros/latex/required/tools/xspace.pdfbin238021 -> 238011 bytes
123 files changed, 568 insertions, 518 deletions
diff --git a/macros/latex/required/amsmath/README.md b/macros/latex/required/amsmath/README.md
index c08ef1b2ab..86a7b2f9df 100644
--- a/macros/latex/required/amsmath/README.md
+++ b/macros/latex/required/amsmath/README.md
@@ -1,7 +1,7 @@
The amsmath bundle for LaTeX
============================
-Release 2019-11-17
+Release 2020-02-02
Overview
--------
@@ -77,5 +77,5 @@ version 1.3c or later.
-----
<p>Copyright (C) 2001-2004, 2007, 2008, 2010, 2011, 2013 American Mathematical Society. <br />
-<p>Copyright (C) 2016-2019 The LaTeX Project and American Mathematical Society. <br />
+<p>Copyright (C) 2016-2020 The LaTeX Project and American Mathematical Society. <br />
diff --git a/macros/latex/required/amsmath/amsbsy.dtx b/macros/latex/required/amsmath/amsbsy.dtx
index 890fbd0d82..1174784278 100644
--- a/macros/latex/required/amsmath/amsbsy.dtx
+++ b/macros/latex/required/amsmath/amsbsy.dtx
@@ -2,7 +2,7 @@
% \iffalse meta-comment
%
% Copyright (C) 1995, 1999 American Mathematical Society.
-% Copyright (C) 2016-2019 LaTeX3 Project and American Mathematical Society.
+% Copyright (C) 2016-2020 LaTeX3 Project and American Mathematical Society.
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -11,9 +11,9 @@
% https://www.latex-project.org/lppl.txt
% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% This work has the LPPL maintenance status `maintained'.
-%
+%
% The Current Maintainer of this work is the LaTeX3 Project.
%
% \fi
diff --git a/macros/latex/required/amsmath/amsbsy.ins b/macros/latex/required/amsmath/amsbsy.ins
index fe1cd5413d..07707907e9 100644
--- a/macros/latex/required/amsmath/amsbsy.ins
+++ b/macros/latex/required/amsmath/amsbsy.ins
@@ -1,7 +1,7 @@
-%%
+%%
%% Copyright 2010 American Mathematical Society.
%% Copyright 2016 LaTeX3 Project and American Mathematical Society.
-%%
+%%
%% 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.
@@ -9,9 +9,9 @@
%% https://www.latex-project.org/lppl.txt
%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
+%%
%% This work has the LPPL maintenance status `maintained'.
-%%
+%%
%% The Current Maintainer of this work is the LaTeX3 Project.
%%
%% ====================================================================
diff --git a/macros/latex/required/amsmath/amsbsy.pdf b/macros/latex/required/amsmath/amsbsy.pdf
index 3260fb10a7..ea99b7c38b 100644
--- a/macros/latex/required/amsmath/amsbsy.pdf
+++ b/macros/latex/required/amsmath/amsbsy.pdf
Binary files differ
diff --git a/macros/latex/required/amsmath/amscd.dtx b/macros/latex/required/amsmath/amscd.dtx
index 2d0a35d685..12e94a11dc 100644
--- a/macros/latex/required/amsmath/amscd.dtx
+++ b/macros/latex/required/amsmath/amscd.dtx
@@ -2,7 +2,7 @@
% \iffalse meta-comment
%
% Copyright (C) 1995, 1999 American Mathematical Society.
-% Copyright (C) 2016-2019 LaTeX3 Project and American Mathematical Society.
+% Copyright (C) 2016-2020 LaTeX3 Project and American Mathematical Society.
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -11,9 +11,9 @@
% https://www.latex-project.org/lppl.txt
% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% This work has the LPPL maintenance status `maintained'.
-%
+%
% The Current Maintainer of this work is the LaTeX3 Project.
%
% \fi
diff --git a/macros/latex/required/amsmath/amscd.ins b/macros/latex/required/amsmath/amscd.ins
index 148c4cb32e..5890ca06c1 100644
--- a/macros/latex/required/amsmath/amscd.ins
+++ b/macros/latex/required/amsmath/amscd.ins
@@ -1,7 +1,7 @@
-%%
+%%
%% Copyright 2010 American Mathematical Society.
%% Copyright 2016 LaTeX3 Project and American Mathematical Society.
-%%
+%%
%% 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.
@@ -9,9 +9,9 @@
%% https://www.latex-project.org/lppl.txt
%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
+%%
%% This work has the LPPL maintenance status `maintained'.
-%%
+%%
%% The Current Maintainer of this work is the LaTeX3 Project.
%%
%% ====================================================================
diff --git a/macros/latex/required/amsmath/amscd.pdf b/macros/latex/required/amsmath/amscd.pdf
index 6094e56e41..d0ded9a061 100644
--- a/macros/latex/required/amsmath/amscd.pdf
+++ b/macros/latex/required/amsmath/amscd.pdf
Binary files differ
diff --git a/macros/latex/required/amsmath/amsgen.dtx b/macros/latex/required/amsmath/amsgen.dtx
index 5edc26b9cc..92df548f12 100644
--- a/macros/latex/required/amsmath/amsgen.dtx
+++ b/macros/latex/required/amsmath/amsgen.dtx
@@ -2,7 +2,7 @@
% \iffalse meta-comment
%
% Copyright (C) 1995, 1999 American Mathematical Society.
-% Copyright (C) 2016-2019 LaTeX3 Project and American Mathematical Society.
+% Copyright (C) 2016-2020 LaTeX3 Project and American Mathematical Society.
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -11,9 +11,9 @@
% https://www.latex-project.org/lppl.txt
% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% This work has the LPPL maintenance status `maintained'.
-%
+%
% The Current Maintainer of this work is the LaTeX3 Project.
%
% \fi
diff --git a/macros/latex/required/amsmath/amsgen.ins b/macros/latex/required/amsmath/amsgen.ins
index 8c5683cb5a..be7720bc89 100644
--- a/macros/latex/required/amsmath/amsgen.ins
+++ b/macros/latex/required/amsmath/amsgen.ins
@@ -1,7 +1,7 @@
-%%
+%%
%% Copyright 2010 American Mathematical Society.
%% Copyright 2016 LaTeX3 Project and American Mathematical Society.
-%%
+%%
%% 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.
@@ -9,9 +9,9 @@
%% https://www.latex-project.org/lppl.txt
%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
+%%
%% This work has the LPPL maintenance status `maintained'.
-%%
+%%
%% The Current Maintainer of this work is the LaTeX3 Project.
%%
%% ====================================================================
diff --git a/macros/latex/required/amsmath/amsgen.pdf b/macros/latex/required/amsmath/amsgen.pdf
index d81a3e9c4c..c1282031c5 100644
--- a/macros/latex/required/amsmath/amsgen.pdf
+++ b/macros/latex/required/amsmath/amsgen.pdf
Binary files differ
diff --git a/macros/latex/required/amsmath/amsldoc.pdf b/macros/latex/required/amsmath/amsldoc.pdf
index 747bd6b264..104066c062 100644
--- a/macros/latex/required/amsmath/amsldoc.pdf
+++ b/macros/latex/required/amsmath/amsldoc.pdf
Binary files differ
diff --git a/macros/latex/required/amsmath/amsldoc.tex b/macros/latex/required/amsmath/amsldoc.tex
index 8573682a66..1c2bfbdd8b 100644
--- a/macros/latex/required/amsmath/amsldoc.tex
+++ b/macros/latex/required/amsmath/amsldoc.tex
@@ -1,6 +1,6 @@
%
% Copyright (C) 1995, 2000, 2013 American Mathematical Society.
-% Copyright (C) 2016-2019 LaTeX3 Project and American Mathematical Society.
+% Copyright (C) 2016-2020 LaTeX3 Project and American Mathematical Society.
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -9,9 +9,9 @@
% https://www.latex-project.org/lppl.txt
% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% This work has the LPPL maintenance status `maintained'.
-%
+%
% The Current Maintainer of this work is the LaTeX3 Project.
%
\documentclass[leqno,titlepage,openany]{amsldoc}[1999/12/13]
@@ -1032,7 +1032,7 @@ C.8.4]{lamport}:
This works pretty well, except that the equation counter won't be reset
to zero at the beginning of a new section or chapter, unless you do it
yourself using \cn{setcounter}. To make this a little more convenient,
-the \nipkg{amsmath} package provides a
+the \nipkg{amsmath} package provides a
command\index{equationn@equation numbers!hierarchy} \cn{numberwithin}.
To have equation numbering tied to section numbering, with automatic
reset of the equation counter, write
diff --git a/macros/latex/required/amsmath/amsmath-2018-12-01.sty b/macros/latex/required/amsmath/amsmath-2018-12-01.sty
index f684834649..6bcb03e217 100644
--- a/macros/latex/required/amsmath/amsmath-2018-12-01.sty
+++ b/macros/latex/required/amsmath/amsmath-2018-12-01.sty
@@ -4,11 +4,11 @@
%%
%% The original source files were:
%%
-%% amsmath.dtx
-%%
+%% amsmath.dtx
+%%
%% Copyright 1995, 1999, 2000, 2013 American Mathematical Society.
%% Copyright 2016 LaTeX3 Project and American Mathematical Society.
-%%
+%%
%% 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.
@@ -16,11 +16,11 @@
%% https://www.latex-project.org/lppl.txt
%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
+%%
%% This work has the LPPL maintenance status `maintained'.
-%%
+%%
%% The Current Maintainer of this work is the LaTeX3 project.
-%%
+%%
\NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX)
[1994/12/01]% LaTeX date must be December 1994 or later
\ProvidesPackage{amsmath}[2018/12/01 v2.17b AMS math features]
diff --git a/macros/latex/required/amsmath/amsmath.dtx b/macros/latex/required/amsmath/amsmath.dtx
index 11b7545c26..42f3088867 100644
--- a/macros/latex/required/amsmath/amsmath.dtx
+++ b/macros/latex/required/amsmath/amsmath.dtx
@@ -2,7 +2,7 @@
% \iffalse meta-comment
%
% Copyright (C) 1995, 2000, 2013 American Mathematical Society.
-% Copyright (C) 2016-2019 LaTeX3 Project and American Mathematical Society.
+% Copyright (C) 2016-2020 LaTeX3 Project and American Mathematical Society.
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -11,9 +11,9 @@
% https://www.latex-project.org/lppl.txt
% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% This work has the LPPL maintenance status `maintained'.
-%
+%
% The Current Maintainer of this work is the LaTeX3 Project.
%
% \fi
@@ -86,7 +86,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesPackage{amsmath}[2019/11/16 v2.17d AMS math features]
+\ProvidesPackage{amsmath}[2020/01/20 v2.17e AMS math features]
% \end{macrocode}
%
% \section{Catcode defenses}
@@ -302,10 +302,13 @@ For additional information on amsmath, use the \lq ?\rq\space option.%
% \end{macrocode}
%
% Processing to handle the \opt{cmex10} option is a little tricky
-% because of different possible loading orders for \pkg{amsmath} and
-% \pkg{amsfonts}. The package \pkg{amsmath} sets the \cs{cmex@opt}
-% flag to 7 or 10, and the package \pkg{amsfonts} sets the flag to 1
-% or 0.
+% because of different possible loading orders for \pkg{amsmath}
+% and \pkg{amsfonts}. The package \pkg{amsmath} sets the
+% \cs{cmex@opt} flag to 0, 7 or 10, and in the past the package
+% \pkg{amsfonts} did set the flag to 1 or 0. These days it always
+% sets it to 10. The situation is a bit unsettled but we don't own
+% \pkg{amsfonts}.
+% \changes{v2.17d}{2019/12/01}{docu update, no code change (gh/200)}
% \begin{macrocode}
\ifnum\cmex@opt=7 \relax
\DeclareFontShape{OMX}{cmex}{m}{n}{%
@@ -517,9 +520,13 @@ For additional information on amsmath, use the \lq ?\rq\space option.%
\@xp\@tempa\vert\@empty\@nil
\ifnum\@tempcnta>\z@
\advance\@tempcnta "4000000
- \xdef\lvert{\delimiter\number\@tempcnta\space }
+% \end{macrocode}
+% Use \cs{protected} on the new delimiters.
+% \changes{v2.17e}{2020/01/20}{Make delimiters robust (gh/251))}
+% \begin{macrocode}
+ \protected\xdef\lvert{\delimiter\number\@tempcnta\space }
\advance\@tempcnta "1000000
- \xdef\rvert{\delimiter\number\@tempcnta\space }
+ \protected\xdef\rvert{\delimiter\number\@tempcnta\space }
\else
\ifx\@@undefined\lvert
% Fall back to cmex encoding since we don't know what else to do.
@@ -532,9 +539,9 @@ For additional information on amsmath, use the \lq ?\rq\space option.%
\@xp\@tempa\Vert\@empty\@nil
\ifnum\@tempcnta>\z@
\advance\@tempcnta "4000000
- \xdef\lVert{\delimiter\number\@tempcnta\space }
+ \protected\xdef\lVert{\delimiter\number\@tempcnta\space }
\advance\@tempcnta "1000000
- \xdef\rVert{\delimiter\number\@tempcnta\space }
+ \protected\xdef\rVert{\delimiter\number\@tempcnta\space }
\else
\ifx\@@undefined\lVert
\DeclareMathDelimiter{\lVert}
@@ -645,13 +652,13 @@ Foreign command \@backslashchar#1;\MessageBreak
% \end{macrocode}
%
% \begin{macrocode}
-\else
+\else
% \end{macrocode}
% XeTeX version
% \begin{macrocode}
\def\genfrac@rule#1#2#3#4{%
\hbox{$\left#1\vcenter{\hrule \@width\z@
- \@height
+ \@height
\ifdim\fontdimen#2#3\tw@=\z@
#4\fontdimen6#3\tw@
\else
@@ -697,7 +704,7 @@ Foreign command \@backslashchar#1;\MessageBreak
% \begin{macrocode}
\def\genfrac@rule#1#2#3{%
\hbox{$\left#1\vcenter{\hrule \@width\z@
- \@height
+ \@height
\ifdim\Umathfractiondelsize#2=\z@
#3\fontdimen6#3\tw@
\else
@@ -1093,7 +1100,7 @@ Foreign command \@backslashchar#1;\MessageBreak
% \changes{v2.15}{2016/02/20}{Indent \cs{mdots@@} for readability and add additional tests}
% \begin{macrocode}
\def\mdots@@{\gdef\thedots@{\dotso@}%
- \ifx\@let@token\boldsymbol
+ \ifx\@let@token\boldsymbol
\gdef\thedots@\boldsymbol{\boldsymboldots@}%
\else
\ifx,\@let@token \gdef\thedots@{\dotsc}%
@@ -1167,7 +1174,7 @@ Foreign command \@backslashchar#1;\MessageBreak
% \begin{macrocode}
\fi % end macro \ifgtest@ test (no else)
\fi % end if \Umathchar test
- \fi % end \math@ \ifgtest@
+ \fi % end \math@ \ifgtest@
\fi % end \keybin@ \ifgtest@ test (no else)
\fi % end if \not (no else)
\fi % end if comma (no else)
@@ -3190,9 +3197,10 @@ ill-advised in LaTeX.%
% \end{macro}
%
% \begin{macro}{\ifst@rred}
-% The switch |st@rred| is set to true by all starred
-% environments
-% and set to false by the unstarred versions.
+% The switch |st@rred| is set to true by all starred environments
+% and set to false by the unstarred versions.
+% One exception is the \env{xxalignat} environment where this is set
+% to true.
% \begin{macrocode}
\newif\ifst@rred
% \end{macrocode}
@@ -3443,7 +3451,8 @@ and fix things up.}
\nointerlineskip
\vskip-\ht\strutbox@
\vskip-\dp\strutbox@
- \vbox{\noindent\hbox to\displaywidth{\hbox to#1{\strut@\hfill}}}%
+ \vbox{\noindent\hbox to\displaywidth{%
+ \hbox to#1{\strut@\hfill}}}%
\prevdepth\dimen@
\fi
}%
diff --git a/macros/latex/required/amsmath/amsmath.ins b/macros/latex/required/amsmath/amsmath.ins
index 7a6a087359..55e4089804 100644
--- a/macros/latex/required/amsmath/amsmath.ins
+++ b/macros/latex/required/amsmath/amsmath.ins
@@ -1,7 +1,7 @@
-%%
+%%
%% Copyright 2010 American Mathematical Society.
%% Copyright 2016 LaTeX3 Project and American Mathematical Society.
-%%
+%%
%% 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.
@@ -9,9 +9,9 @@
%% https://www.latex-project.org/lppl.txt
%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
+%%
%% This work has the LPPL maintenance status `maintained'.
-%%
+%%
%% The Current Maintainer of this work is the LaTeX3 Project.
%%
%% ====================================================================
diff --git a/macros/latex/required/amsmath/amsmath.pdf b/macros/latex/required/amsmath/amsmath.pdf
index df541ceec9..19f1ab151a 100644
--- a/macros/latex/required/amsmath/amsmath.pdf
+++ b/macros/latex/required/amsmath/amsmath.pdf
Binary files differ
diff --git a/macros/latex/required/amsmath/amsopn.dtx b/macros/latex/required/amsmath/amsopn.dtx
index b7047377f3..35c3b1605b 100644
--- a/macros/latex/required/amsmath/amsopn.dtx
+++ b/macros/latex/required/amsmath/amsopn.dtx
@@ -2,7 +2,7 @@
% \iffalse meta-comment
%
% Copyright (C) 1995, 1999 American Mathematical Society.
-% Copyright (C) 2016-2019 LaTeX3 Project and American Mathematical Society.
+% Copyright (C) 2016-2020 LaTeX3 Project and American Mathematical Society.
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -11,9 +11,9 @@
% https://www.latex-project.org/lppl.txt
% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% This work has the LPPL maintenance status `maintained'.
-%
+%
% The Current Maintainer of this work is the LaTeX3 Project.
%
% \fi
diff --git a/macros/latex/required/amsmath/amsopn.ins b/macros/latex/required/amsmath/amsopn.ins
index 8c977446cc..84aff6243b 100644
--- a/macros/latex/required/amsmath/amsopn.ins
+++ b/macros/latex/required/amsmath/amsopn.ins
@@ -1,7 +1,7 @@
-%%
+%%
%% Copyright 2010 American Mathematical Society.
%% Copyright 2016 LaTeX3 Project and American Mathematical Society.
-%%
+%%
%% 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.
@@ -9,9 +9,9 @@
%% https://www.latex-project.org/lppl.txt
%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
+%%
%% This work has the LPPL maintenance status `maintained'.
-%%
+%%
%% The Current Maintainer of this work is the LaTeX3 Project.
%%
%% ====================================================================
diff --git a/macros/latex/required/amsmath/amsopn.pdf b/macros/latex/required/amsmath/amsopn.pdf
index 9e2fe3336d..d54d81f1e7 100644
--- a/macros/latex/required/amsmath/amsopn.pdf
+++ b/macros/latex/required/amsmath/amsopn.pdf
Binary files differ
diff --git a/macros/latex/required/amsmath/amstex.sty b/macros/latex/required/amsmath/amstex.sty
index edb57c1214..6ce36f52c9 100644
--- a/macros/latex/required/amsmath/amstex.sty
+++ b/macros/latex/required/amsmath/amstex.sty
@@ -11,9 +11,9 @@
% https://www.latex-project.org/lppl.txt
% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% This work has the LPPL maintenance status `maintained'.
-%
+%
% The Current Maintainer of this work is the LaTeX3 Project.
%
% \fi
diff --git a/macros/latex/required/amsmath/amstext.dtx b/macros/latex/required/amsmath/amstext.dtx
index a4c9aeb5d9..a5e8491dc2 100644
--- a/macros/latex/required/amsmath/amstext.dtx
+++ b/macros/latex/required/amsmath/amstext.dtx
@@ -2,7 +2,7 @@
% \iffalse meta-comment
%
% Copyright (C) 1995, 1999 American Mathematical Society.
-% Copyright (C) 2016-2019 LaTeX3 Project and American Mathematical Society.
+% Copyright (C) 2016-2020 LaTeX3 Project and American Mathematical Society.
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -11,9 +11,9 @@
% https://www.latex-project.org/lppl.txt
% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% This work has the LPPL maintenance status `maintained'.
-%
+%
% The Current Maintainer of this work is the LaTeX3 Project.
%
% \fi
diff --git a/macros/latex/required/amsmath/amstext.ins b/macros/latex/required/amsmath/amstext.ins
index 84fcb0cb95..5f9a5c4076 100644
--- a/macros/latex/required/amsmath/amstext.ins
+++ b/macros/latex/required/amsmath/amstext.ins
@@ -1,7 +1,7 @@
-%%
+%%
%% Copyright 2010 American Mathematical Society.
%% Copyright 2016 LaTeX3 Project and American Mathematical Society.
-%%
+%%
%% 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.
@@ -9,9 +9,9 @@
%% https://www.latex-project.org/lppl.txt
%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
+%%
%% This work has the LPPL maintenance status `maintained'.
-%%
+%%
%% The Current Maintainer of this work is the LaTeX3 Project.
%%
%% ====================================================================
@@ -48,4 +48,3 @@ The Current Maintainer of this work is the LaTeX3 project.
}
\endbatchfile
-
diff --git a/macros/latex/required/amsmath/amstext.pdf b/macros/latex/required/amsmath/amstext.pdf
index 2a2001b640..bd2380c3fb 100644
--- a/macros/latex/required/amsmath/amstext.pdf
+++ b/macros/latex/required/amsmath/amstext.pdf
Binary files differ
diff --git a/macros/latex/required/amsmath/amsxtra.dtx b/macros/latex/required/amsmath/amsxtra.dtx
index 2165dde41a..9cc0b71027 100644
--- a/macros/latex/required/amsmath/amsxtra.dtx
+++ b/macros/latex/required/amsmath/amsxtra.dtx
@@ -2,7 +2,7 @@
% \iffalse meta-comment
%
% Copyright (C) 1995, 1999 American Mathematical Society.
-% Copyright (C) 2016-2019 LaTeX3 Project and American Mathematical Society.
+% Copyright (C) 2016-2020 LaTeX3 Project and American Mathematical Society.
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -11,9 +11,9 @@
% https://www.latex-project.org/lppl.txt
% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% This work has the LPPL maintenance status `maintained'.
-%
+%
% The Current Maintainer of this work is the LaTeX3 Project.
%
% \fi
diff --git a/macros/latex/required/amsmath/amsxtra.ins b/macros/latex/required/amsmath/amsxtra.ins
index 9e739c3d4b..bbcd08e3f7 100644
--- a/macros/latex/required/amsmath/amsxtra.ins
+++ b/macros/latex/required/amsmath/amsxtra.ins
@@ -1,7 +1,7 @@
-%%
+%%
%% Copyright 2010 American Mathematical Society.
%% Copyright 2016 LaTeX3 Project and American Mathematical Society.
-%%
+%%
%% 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.
@@ -9,9 +9,9 @@
%% https://www.latex-project.org/lppl.txt
%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
+%%
%% This work has the LPPL maintenance status `maintained'.
-%%
+%%
%% The Current Maintainer of this work is the LaTeX3 Project.
%%
%% ====================================================================
@@ -48,4 +48,3 @@ The Current Maintainer of this work is the LaTeX3 project.
}
\endbatchfile
-
diff --git a/macros/latex/required/amsmath/amsxtra.pdf b/macros/latex/required/amsmath/amsxtra.pdf
index 651c9db0da..4ef6bc62d3 100644
--- a/macros/latex/required/amsmath/amsxtra.pdf
+++ b/macros/latex/required/amsmath/amsxtra.pdf
Binary files differ
diff --git a/macros/latex/required/amsmath/changes.txt b/macros/latex/required/amsmath/changes.txt
index e5e234cea2..9581bb6606 100644
--- a/macros/latex/required/amsmath/changes.txt
+++ b/macros/latex/required/amsmath/changes.txt
@@ -1,4 +1,18 @@
#########################
+# 2020-02-02 Release
+#########################
+
+2020-01-20 Frank Mittelbach <Frank.Mittelbach@latex-project.org>
+
+ * amsmath.dtx (subsection{Vertical bar symbols}):
+ Make \lvert, \rvert, \lVert and \rVert robust to match kernel
+ correction (gh/251)
+
+2019-12-01 Frank Mittelbach <Frank.Mittelbach@latex-project.org>
+
+ * amsmath.dtx: docu update for gh/200 no code change.
+
+#########################
# 2019-11-17 Release
#########################
diff --git a/macros/latex/required/amsmath/subeqn.pdf b/macros/latex/required/amsmath/subeqn.pdf
index 9e6e072673..c175feb386 100644
--- a/macros/latex/required/amsmath/subeqn.pdf
+++ b/macros/latex/required/amsmath/subeqn.pdf
Binary files differ
diff --git a/macros/latex/required/amsmath/technote.pdf b/macros/latex/required/amsmath/technote.pdf
index 5457ffe15f..657f930f89 100644
--- a/macros/latex/required/amsmath/technote.pdf
+++ b/macros/latex/required/amsmath/technote.pdf
Binary files differ
diff --git a/macros/latex/required/amsmath/testmath.pdf b/macros/latex/required/amsmath/testmath.pdf
index 91012a919d..5583fa35cf 100644
--- a/macros/latex/required/amsmath/testmath.pdf
+++ b/macros/latex/required/amsmath/testmath.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/README.md b/macros/latex/required/graphics/README.md
index 6567a09f2f..f319461c36 100644
--- a/macros/latex/required/graphics/README.md
+++ b/macros/latex/required/graphics/README.md
@@ -1,7 +1,7 @@
The LaTeX `graphics` bundle
===========================
-Release 2019-10-01 patch level 2
+Release 2020-02-02
Overview
--------
@@ -61,4 +61,4 @@ of the package.
-----
-<p>Copyright (C) 1993-2019 The LaTeX Project <br />
+<p>Copyright (C) 1993-2020 The LaTeX Project <br />
diff --git a/macros/latex/required/graphics/cat-eps-converted-to.pdf b/macros/latex/required/graphics/cat-eps-converted-to.pdf
deleted file mode 100644
index 7da1b3dcd5..0000000000
--- a/macros/latex/required/graphics/cat-eps-converted-to.pdf
+++ /dev/null
@@ -1,84 +0,0 @@
-%PDF-1.5
-%쏢
-5 0 obj
-<</Length 6 0 R/Filter /FlateDecode>>
-stream
-xUUKU! U$,@'=}[ sIFGWmџsn_0khRn@{݈/`v6:+uhr1N{=tDOE,tڜitn,}b0ζ=PxBE|-rϚ9HI뵛l9fn^n/;{Ǯ˸:ȋAɍbƕJӈ,P۷BS`<)h(LHĔqN*Xq‽?;9_W(l#ܜCfj sBUCcWu~cyV$(1WH]7+/mA"znYRU1j1GKV{2, V!YB.R%]>Kج,)gxkT(iRښ(ٷwи'Qk{T
-*Bd5d[<h7N @YݚdξջiMg`i[d k B0I-3
-yVD'1۫_+(x5"<Y?AE5f'gρ tYic5R8t`>3b|!e}!Q I։φTceu9yy=?/ F\endstream
-endobj
-6 0 obj
-686
-endobj
-4 0 obj
-<</Type/Page/MediaBox [0 0 36 32]
-/Parent 3 0 R
-/Resources<</ProcSet[/PDF]
-/ExtGState 8 0 R
->>
-/Contents 5 0 R
->>
-endobj
-3 0 obj
-<< /Type /Pages /Kids [
-4 0 R
-] /Count 1
->>
-endobj
-1 0 obj
-<</Type /Catalog /Pages 3 0 R
-/Metadata 9 0 R
->>
-endobj
-7 0 obj
-<</Type/ExtGState
-/OPM 1>>endobj
-8 0 obj
-<</R7
-7 0 R>>
-endobj
-9 0 obj
-<</Type/Metadata
-/Subtype/XML/Length 1335>>stream
-<?xpacket begin='' id='W5M0MpCehiHzreSzNTczkc9d'?>
-<?adobe-xap-filters esc="CRLF"?>
-<x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='XMP toolkit 2.9.1-13, framework 1.6'>
-<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:iX='http://ns.adobe.com/iX/1.0/'>
-<rdf:Description rdf:about='uuid:5f138aac-e2eb-11f4-0000-b0069176419e' xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 9.27'/>
-<rdf:Description rdf:about='uuid:5f138aac-e2eb-11f4-0000-b0069176419e' xmlns:xmp='http://ns.adobe.com/xap/1.0/'><xmp:ModifyDate>2019-07-20T10:14:48+01:00</xmp:ModifyDate>
-<xmp:CreateDate>2019-07-20T10:14:48+01:00</xmp:CreateDate>
-<xmp:CreatorTool>COREL DRAW</xmp:CreatorTool></rdf:Description>
-<rdf:Description rdf:about='uuid:5f138aac-e2eb-11f4-0000-b0069176419e' xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='uuid:5f138aac-e2eb-11f4-0000-b0069176419e'/>
-<rdf:Description rdf:about='uuid:5f138aac-e2eb-11f4-0000-b0069176419e' xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>CAT.TMP</rdf:li></rdf:Alt></dc:title></rdf:Description>
-</rdf:RDF>
-</x:xmpmeta>
-
-
-<?xpacket end='w'?>
-endstream
-endobj
-2 0 obj
-<</Producer(GPL Ghostscript 9.27)
-/CreationDate(D:20190720101448+01'00')
-/ModDate(D:20190720101448+01'00')
-/Creator(COREL DRAW)
-/Title(CAT.TMP)>>endobj
-xref
-0 10
-0000000000 65535 f
-0000000978 00000 n
-0000002523 00000 n
-0000000919 00000 n
-0000000790 00000 n
-0000000015 00000 n
-0000000771 00000 n
-0000001042 00000 n
-0000001083 00000 n
-0000001112 00000 n
-trailer
-<< /Size 10 /Root 1 0 R /Info 2 0 R
-/ID [<A1B9BB71BF53A8513F7E1A14881A66CA><A1B9BB71BF53A8513F7E1A14881A66CA>]
->>
-startxref
-2683
-%%EOF
diff --git a/macros/latex/required/graphics/changes.txt b/macros/latex/required/graphics/changes.txt
index f4343bc2c3..108723ddb4 100644
--- a/macros/latex/required/graphics/changes.txt
+++ b/macros/latex/required/graphics/changes.txt
@@ -5,6 +5,20 @@ are not part of the distribution.
=======================================================================
#########################
+# 2020-02-02 Release
+#########################
+
+2019-11-30 David Carlisle <David.Carlisle@latex-project.org>
+
+ * graphics.dtx: proteced definitions gh/208
+ * graphicx.dtx: proteced definitions gh/208
+
+2019-11-23 David Carlisle <David.Carlisle@latex-project.org>
+
+ * color.dtx: Made commands robust gh/208
+
+
+#########################
# 2019-10-01 PL 2 Release
#########################
@@ -77,7 +91,7 @@ are not part of the distribution.
2016-06-17 David Carlisle <latex-bugs@latex-project.org>
* drivers.dtx: guards for contributed packages and plain TeX.
-
+
2016-06-02 David Carlisle <latex-bugs@latex-project.org>
* graphics.dtx, color.dtx, drivers.dtx: add pagesize special support to dvips
@@ -960,12 +974,11 @@ are not part of the distribution.
1994-03-09 David Carlisle <latex-bugs@latex-project.org>
* \reflectbox added.
-
+
* \rotatebox* removed
-
+
* The order of the arguments of \includegraphics corrected
-
+
* \includegraphics[lower-l,lower-r][upper-l,upper-r]{file}
-
+
* \definecolor not \newcolor to define colours
-
diff --git a/macros/latex/required/graphics/color.dtx b/macros/latex/required/graphics/color.dtx
index 8de7d013a3..ad5df89a7e 100644
--- a/macros/latex/required/graphics/color.dtx
+++ b/macros/latex/required/graphics/color.dtx
@@ -2,7 +2,7 @@
% \iffalse
%
%% color.dtx Copyright (C) 1994--1999 David Carlisle
-%% Copyright (C) 2005-2019 David Carlisle, LaTeX3 Project
+%% Copyright (C) 2005-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
@@ -19,7 +19,7 @@
%<driver> \ProvidesFile{color.drv}
% \fi
% \ProvidesFile{color.dtx}
- [2016/07/10 v1.1e Standard LaTeX Color (DPC)]
+ [2019/11/23 v1.2a Standard LaTeX Color (DPC)]
%
% \iffalse
%<*driver>
@@ -462,10 +462,10 @@
% correctly.
% \changes{v0.3a}{1994/07/20}
% {Stop command being \cs{long}, and make robust.}
-% \changes{v0.3l}{1995/12/07}
-% {Add \cs{leavevmode}}
+% \changes{v1.2a}{2019/11/23}
+% {Add \cs{protected} gh/208}
% \begin{macrocode}
-\def\textcolor#1#{\@textcolor{#1}}
+\protected\def\textcolor#1#{\@textcolor{#1}}
\def\@textcolor#1#2#3{\protect\leavevmode{\color#1{#2}#3}}
% \end{macrocode}
% \end{macro}
@@ -481,8 +481,10 @@
% {end the group even if the colour command generates an error}
% \changes{v0.3c}{1994/09/19}
% {Use \cs{color} to parse arguments}
+% \changes{v1.2a}{2019/11/23}
+% {Add \cs{protected} gh/208}
% \begin{macrocode}
-\def\pagecolor{%
+\protected\def\pagecolor{%
\begingroup
\let\ignorespaces\endgroup
\let\set@color\set@page@color
@@ -497,8 +499,10 @@
%
% \changes{v1.1a}{2014/04/23}
% {add \cs{nopagecolor} graphics/3873}
+% \changes{v1.2a}{2019/11/23}
+% {Add \cs{protected} gh/208}
% \begin{macrocode}
-\def\nopagecolor{%
+\protected\def\nopagecolor{%
\@ifundefined{no@page@color}{%
\PackageInfo{color}{\string\nopagecolor\space is not supported}%
}{%
@@ -533,8 +537,10 @@
% {New internal implementation of colour commands}
% \changes{v0.3f}{1994/10/04}
% {Give info about redefinitions}
+% \changes{v1.2a}{2019/11/23}
+% {Add \cs{protected} gh/208}
% \begin{macrocode}
-\def\definecolor#1#2#3{%
+\protected\def\definecolor#1#2#3{%
\@ifundefined{color@#2}%
{\c@lor@error{model `#2'}}%
{\@ifundefined{\string\color @#1}{}%
@@ -589,8 +595,10 @@
% |[named]| all the time, just give the package option |usenames|, which
% will redefine |\DefineNamedColor|, so that the colour name is declared
% as a user-colour as well as a name in the `named' model.
+% \changes{v1.2a}{2019/11/23}
+% {Add \cs{protected} gh/208}
% \begin{macrocode}
-\def\DefineNamedColor#1#2#3#4{%
+\protected\def\DefineNamedColor#1#2#3#4{%
\@ifundefined{define@color@#1}%
{\c@lor@error{model `#1'}}%
{\@ifundefined{color@#3}%
@@ -684,8 +692,10 @@
% \changes{v0.2d}{1994/05/13}
% {Stop changing \cs{reset@font}. Use the new \cs{normalfont}
% instead.}
+% \changes{v1.2a}{2019/11/23}
+% {Add \cs{protected} gh/208}
% \begin{macrocode}
-\def\normalcolor{\let\current@color\default@color\set@color}
+\protected\def\normalcolor{\let\current@color\default@color\set@color}
% \end{macrocode}
% \end{macro}
%
@@ -751,8 +761,10 @@
% colour specifies the \emph{background} colour of the box.
% \changes{v0.3b}{1994/09/14}
% {New implementation}
+% \changes{v1.2a}{2019/11/23}
+% {Add \cs{protected} gh/208}
% \begin{macrocode}
-\def\colorbox#1#{\color@box{#1}}
+\protected\def\colorbox#1#{\color@box{#1}}
% \end{macrocode}
% \end{macro}
%
@@ -771,9 +783,11 @@
% colour model for both colours.
% \changes{v0.3b}{1994/09/14}
% {New implementation}
+% \changes{v1.2a}{2019/11/23}
+% {Add \cs{protected} gh/208}
% \begin{macro}{\fcolorbox}
% \begin{macrocode}
-\def\fcolorbox#1#{\color@fbox{#1}}
+\protected\def\fcolorbox#1#{\color@fbox{#1}}
% \end{macrocode}
%
% \begin{macrocode}
diff --git a/macros/latex/required/graphics/color.pdf b/macros/latex/required/graphics/color.pdf
index c7360251f1..4953d86459 100644
--- a/macros/latex/required/graphics/color.pdf
+++ b/macros/latex/required/graphics/color.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/drivers.dtx b/macros/latex/required/graphics/drivers.dtx
index d693ebd27b..9bf32f78a1 100644
--- a/macros/latex/required/graphics/drivers.dtx
+++ b/macros/latex/required/graphics/drivers.dtx
@@ -3,7 +3,7 @@
%
%% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
%% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle
-%% Copyright (C) 2000-2019 David Carlisle, LaTeX3 Project
+%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
diff --git a/macros/latex/required/graphics/drivers.pdf b/macros/latex/required/graphics/drivers.pdf
index 9d9ac44a91..7d424d4d95 100644
--- a/macros/latex/required/graphics/drivers.pdf
+++ b/macros/latex/required/graphics/drivers.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/epsfig.dtx b/macros/latex/required/graphics/epsfig.dtx
index f9197c7b1c..8e883bd8df 100644
--- a/macros/latex/required/graphics/epsfig.dtx
+++ b/macros/latex/required/graphics/epsfig.dtx
@@ -2,7 +2,7 @@
% \iffalse
%
%% epsfig.dtx Copyright (C) 1994-1996 1999 Sebastian Rahtz
-%% Copyright (C) 2000-2019 David Carlisle, LaTeX3 Project
+%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
diff --git a/macros/latex/required/graphics/epsfig.pdf b/macros/latex/required/graphics/epsfig.pdf
index 953af25b5f..25a6c13821 100644
--- a/macros/latex/required/graphics/epsfig.pdf
+++ b/macros/latex/required/graphics/epsfig.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/graphics-2017-06-25.sty b/macros/latex/required/graphics/graphics-2017-06-25.sty
index 361193cf32..5cfa5df450 100644
--- a/macros/latex/required/graphics/graphics-2017-06-25.sty
+++ b/macros/latex/required/graphics/graphics-2017-06-25.sty
@@ -5,12 +5,12 @@
%% The original source files were:
%%
%% graphics.dtx (with options: `package')
-%%
+%%
%% The source is maintained by the LaTeX Project team and bug
%% reports for it can be opened at https://latex-project.org/bugs/
%% (but please observe conditions on bug reports sent to that address!)
-%%
-%%
+%%
+%%
%% graphics.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
%% Copyright (C) 1995--2017 David Carlisle, LaTeX3 Project
%%
diff --git a/macros/latex/required/graphics/graphics.dtx b/macros/latex/required/graphics/graphics.dtx
index ac570c0227..b88ef1e066 100644
--- a/macros/latex/required/graphics/graphics.dtx
+++ b/macros/latex/required/graphics/graphics.dtx
@@ -2,7 +2,7 @@
% \iffalse
%
%% graphics.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
-%% Copyright (C) 1995-2019 David Carlisle, LaTeX3 Project
+%% Copyright (C) 1995-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
@@ -25,7 +25,7 @@
%<driver> \ProvidesFile{graphics.drv}
% \fi
% \ProvidesFile{graphics.dtx}
- [2019/11/01 v1.3d Standard LaTeX Graphics (DPC,SPQR)]
+ [2019/11/30 v1.4a Standard LaTeX Graphics (DPC,SPQR)]
%
% \iffalse
%<*driver>
@@ -870,9 +870,10 @@
% \changes{v1.1a}{2017/03/17}
% {\cs{leavevmode} added before the group in \cs{Gin@iii} so that
% settings in \cs{everypar} are cleared}
+% \changes{v1.4a}{2019/11/30}{Add \cs{protected} gh/208}
% Top level command for the standard interface, just look for a |*|.
% \begin{macrocode}
-\def\includegraphics{%
+\protected\def\includegraphics{%
% \end{macrocode}
% Clear |\everypar| before starting a group.
% \begin{macrocode}
@@ -1081,7 +1082,7 @@
% \end{macrocode}
% \end{macro}
% \end{macro}
-%
+%
% \begin{macro}{\Ginclude@graphics}
% The main internal function implementing graphics file inclusion.
% |#1| is the file name.
@@ -1651,8 +1652,9 @@
% \changes{v0.7a}{1995/04/11}{\cs{leavevmode} added graphics/1521}
% \changes{v1.0n}{2001/07/07}
% {Made long (CAR) graphics/2908 and 3345}
+% \changes{v1.4a}{2019/11/30}{Add \cs{protected} gh/208}
% \begin{macrocode}
-\long\def\rotatebox#1#2{%
+\protected\long\def\rotatebox#1#2{%
\leavevmode
\Grot@setangle{#1}%
\setbox\z@\hbox{{#2}}%
@@ -1866,8 +1868,9 @@
% The top level |\scalebox|. If the vertical scale factor is omitted it
% defaults to the horizontal scale factor, |#1|.
% \changes{v0.3d}{1994/03/06}{Better support for negative arguments.}
+% \changes{v1.4a}{2019/11/30}{Add \cs{protected} gh/208}
% \begin{macrocode}
-\def\scalebox#1{%
+\protected\def\scalebox#1{%
\@ifnextchar[{\Gscale@box{#1}}{\Gscale@box{#1}[#1]}}
% \end{macrocode}
% \end{macro}
@@ -1905,8 +1908,9 @@
% \begin{macro}{\reflectbox}
% Just an abbreviation for the appropriate scale to get reflection.
% \changes{v0.3e}{1994/03/09}{Macro added}
+% \changes{v1.4a}{2019/11/30}{Add \cs{protected} gh/208}
% \begin{macrocode}
-\def\reflectbox{\Gscale@box-1[1]}
+\protected\def\reflectbox{\Gscale@box-1[1]}
% \end{macrocode}
% \end{macro}
%
@@ -1915,10 +1919,11 @@
% \changes{v0.3b}{1994/03/01}{Recode \cmd\resizebox.}
% \changes{v0.7b}{1995/04/27}
% {Add \cs{leavevmode} for graphics/1512}
+% \changes{v1.4a}{2019/11/30}{Add \cs{protected} gh/208}
% Look for a |*|, which specifies that a final vertical size refers to
% `height + depth' not just `height'.
% \begin{macrocode}
-\def\resizebox{%
+\protected\def\resizebox{%
\leavevmode
\@ifstar{\Gscale@@box\totalheight}{\Gscale@@box\height}}
% \end{macrocode}
diff --git a/macros/latex/required/graphics/graphics.pdf b/macros/latex/required/graphics/graphics.pdf
index 918a377b0c..ccf7a574dc 100644
--- a/macros/latex/required/graphics/graphics.pdf
+++ b/macros/latex/required/graphics/graphics.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/graphicx.dtx b/macros/latex/required/graphics/graphicx.dtx
index 4134c4eed1..3cf15925d3 100644
--- a/macros/latex/required/graphics/graphicx.dtx
+++ b/macros/latex/required/graphics/graphicx.dtx
@@ -2,7 +2,7 @@
% \iffalse
%
%% graphicx.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
-%% Copyright (C) 1995-2019 David Carlisle, LaTeX3 Project
+%% Copyright (C) 1995-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
@@ -17,7 +17,7 @@
%<driver> \ProvidesFile{graphicx.drv}
% \fi
% \ProvidesFile{graphicx.dtx}
- [2017/06/01 v1.1a Enhanced LaTeX Graphics (DPC,SPQR)]
+ [2019/11/30 v1.2a Enhanced LaTeX Graphics (DPC,SPQR)]
%
% \iffalse
%<*driver>
@@ -167,7 +167,7 @@
% \item[quiet] Turns off writing information about graphics to the |.log|.
% \item[page] The page of a multi-page PDF graphic to be used.
% \item[interpolate] Enables interpolation of bitmap images by viewers.
-% \item[pagebox] Specifies which PDF box should be used for the natural image size, one of
+% \item[pagebox] Specifies which PDF box should be used for the natural image size, one of
% mediabox, cropbox, bleedbox, trimbox, artbox. The default is driver-specific.
% \end{description}
%
@@ -845,8 +845,9 @@
% Look for an optional argument.
% \changes{v0.3b}{1994/03/11}{Remove star form}
% \changes{v1.0g}{2014/04/25}{\cs{leavevmode} added graphics/1521}
+% \changes{v1.2a}{2019/11/30}{Add \cs{protected} gh/208}
% \begin{macrocode}
-\def\rotatebox{%
+\protected\def\rotatebox{%
\leavevmode
\@ifnextchar[\Grot@box@kv\Grot@box@std}
% \end{macrocode}
diff --git a/macros/latex/required/graphics/graphicx.pdf b/macros/latex/required/graphics/graphicx.pdf
index 8e2772f5b5..243ca19074 100644
--- a/macros/latex/required/graphics/graphicx.pdf
+++ b/macros/latex/required/graphics/graphicx.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/grfguide.pdf b/macros/latex/required/graphics/grfguide.pdf
index 80aebf496f..144513d883 100644
--- a/macros/latex/required/graphics/grfguide.pdf
+++ b/macros/latex/required/graphics/grfguide.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/grfguide.tex b/macros/latex/required/graphics/grfguide.tex
index 19888db741..d25bcac27b 100644
--- a/macros/latex/required/graphics/grfguide.tex
+++ b/macros/latex/required/graphics/grfguide.tex
@@ -1,5 +1,5 @@
%% grfguide.tex Copyright (C) 1994 1995 1996 1998 1999 David Carlisle
-%% Copyright (C) 2005-2019 David Carlisle, LaTeX3 Project
+%% Copyright (C) 2005-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
@@ -261,7 +261,7 @@ The final driver option is an alias for |dvipsone|.
\begin{quote}\raggedright
|dviwindo|
\end{quote}
-
+
\section[Colour]{Colour\footnote{%
The basic \package{color} package functionality described here
@@ -294,7 +294,7 @@ models, eg \textbf{pantone} (An industry standard set of colours),
\textbf{x11} (Colour names from the X Window System), etc. The
standard distribution does not currently have such models, but the
\textbf{named} model could be used as an example of how to define a new
-colour model. The names used in the \textbf{named} model are those
+colour model. The names used in the \textbf{named} model are those
suggested by Jim Hafner in his \textsf{colordvi} and \textsf{foiltex}
packages, and implemented originally in the |color.pro| header file for
the \texttt{dvips} driver.
@@ -303,7 +303,7 @@ the \texttt{dvips} driver.
Most of the options to the \package{color} package just specify a
driver, e.g., \ |dvips|, as discussed in section~\ref{drivers}.
-One special option for the \package{color} package
+One special option for the \package{color} package
that is of interest is |monochrome.|
If this option is selected the colour commands are all
disabled so that they do not generate errors, but do not generate colour
@@ -404,7 +404,7 @@ model, thus allowing |\color{WildStrawberry}| in addition to
\subsection{Named Colours}
Using the \textbf{named} colour model has certain advantages over
-using other colour models.
+using other colour models.
Firstly as the |dvi| file contains a request
for a colour by \emph{name}, the actual mix of primary colours used to
@@ -493,7 +493,7 @@ There are two graphics packages:
\begin{description}
\item[\package{graphics}] The `standard' graphics package.
\item[\package{graphicx}] The `extended' or `enhanced' graphics
- package.
+ package.
\end{description}
The two differ only in the format of optional arguments for the
commands defined. The command names, and the mandatory arguments are
@@ -594,15 +594,15 @@ An abbreviation for |\scalebox{-1}[1]|\arg{text}.
If |!| is used as either length argument, the other argument is used
to determine a scale factor that is used in both directions.
Normally \emph{v-length} refers to the height of the box, but in the
- star form, it refers to the `height + depth'.
+ star form, it refers to the `height + depth'.
As normal for \LaTeXe\ box length arguments, |\height|,
|\width|, |\totalheight|, |\depth| may be used to refer to the
original size of the box.
-|\resizebox{1in}{\height}{Some text}|:
+|\resizebox{1in}{\height}{Some text}|:
\resizebox{1in}{\height}{Some text}
-|\resizebox{1in}{!}{Some text}|:
+|\resizebox{1in}{!}{Some text}|:
\resizebox{1in}{!}{Some text}
\subsection{Including Graphics Files}
@@ -656,7 +656,7 @@ The allowed keys are listed below.
compatibility with older packages.
Specifying |bbllx=a,bblly=b,bburx=c,bbury=d|
is equivalent to specifying |bb = a b c d|.
-\item[natwidth,natheight] Again an alternative to |bb|.
+\item[natwidth,natheight] Again an alternative to |bb|.
|natheight=h,natwidth=w| is equivalent to |bb = 0 0 h w|.
\item[hiresbb]\NEWfeature{1996/10/29}
Boolean valued key. If set to |true| (just specifying |hiresbb|
@@ -705,7 +705,7 @@ The value should be one of
\item[totalheight]\NEWfeature{1995/06/01}
Specify the total height (height $+$ depth) of the figure.
This will differ from the `height' if rotation has occurred.
- In particular if the figure has been rotated by $-90^\circ$
+ In particular if the figure has been rotated by $-90^\circ$
then it will have zero height but large depth.
\item[keepaspectratio]\NEWfeature{1995/09/27}
Boolean valued key like `clip'.
@@ -721,7 +721,7 @@ The value should be one of
\item[ext] Specify the file extension. This should \emph{only} be
used in conjunction with |type|.
\item[read] Specify the file extension of the `read file'. This
- should \emph{only} be used in conjunction with |type|.
+ should \emph{only} be used in conjunction with |type|.
\item[command] Specify any command to be applied to the file. This
should \emph{only} be used in conjunction with |type|.
\item[quiet]\NEWfeature{2017/06/01}
@@ -756,16 +756,16 @@ image. To get these effects using the standard package, the
|\rotatebox| or |\scalebox| command.
The keys are read left-to-right, so |[angle=90, height=1in]| means
-rotate by 90 degrees, and then scale to a height of 1in.
+rotate by 90 degrees, and then scale to a height of 1in.
|[height=1in, angle=90]| would result in a final \emph{width} of 1in.
-If the \textsf{calc} package is also loaded the lengths may use
-\textsf{calc} syntax, for instance to specify a width of 2\,cm
+If the \textsf{calc} package is also loaded the lengths may use
+\textsf{calc} syntax, for instance to specify a width of 2\,cm
less than the text width: |[width=\textwidth-2cm]|.
\TeX\ leaves the space specified either in the file, or in
the optional arguments. If any part of the image is actually outside
-this area, it will by default overprint the surrounding text.
+this area, it will by default overprint the surrounding text.
If the star form is used, or |clip| specified, any part of the image
outside this area will not be printed.
@@ -858,9 +858,9 @@ must exist at the time \LaTeX\ is used.
system behaves when a file with extension \emph{ext} is specified.
(The extension may be specified explicitly or, if the argument to
|\includegraphics| does not have an extension, it may be a default
- extension from the \emph{ext-list} specified with
+ extension from the \emph{ext-list} specified with
|\DeclareGraphicsExtensions|.)
-
+
\emph{ext} the file extension for which this rule applies. As a special
case, \emph{ext} may be given as |*| to denote the default behaviour for
all undeclared extensions (see the example below).
@@ -878,7 +878,7 @@ a separate file with extension |.ps.bb|. If \emph{read-file} is empty,
|{}|, then the system will not try to locate an external file for size
info, and the size must be specified in the arguments of
|\includegraphics|. If the driver file specifies a procedure for
-reading size files for \emph{type}, that will be used, otherwise the
+reading size files for \emph{type}, that will be used, otherwise the
procedure for reading |eps| files will be used. Thus the size of
bitmap files may be specified in a file with a PostScript style
|%%BoundingBox| line, if no other specific format is available.
@@ -914,7 +914,7 @@ above command so that the last argument is:\\
which incantation causes the |kpsewhich| program to find the
file, by searching along \LaTeX's path, and then pass the full path
name to the |zcat| program so that it can uncompress the file.
-Any such uses are very system dependent, and would best be placed in
+Any such uses are very system dependent, and would best be placed in
a |graphics.cfg| file, thus keeping the document itself portable.
\subsection{Global setting of keys}
@@ -953,13 +953,13 @@ print a company logo as part of the letterhead.
As the author of the class you may want to give the users the
possibility of using either interface in their letters (should they
-need to include any further graphics into the letter body).
+need to include any further graphics into the letter body).
In this case the class should load the \package{graphics} package (not
\package{graphicx}, as this would commit any users of the class to the
\package{keyval} interface). The logo should be included with
|\includegraphics| either with \emph{no} optional argument (if the
correct size information is in the file) or \emph{both} optional
-arguments otherwise.
+arguments otherwise.
Do not use the \emph{one} optional argument form, as the meaning of this
argument would change (and generate errors) if the user were to load
\package{graphicx} as well as your class.
diff --git a/macros/latex/required/graphics/keyval.dtx b/macros/latex/required/graphics/keyval.dtx
index 1e1581eee3..dd1f542832 100644
--- a/macros/latex/required/graphics/keyval.dtx
+++ b/macros/latex/required/graphics/keyval.dtx
@@ -1,7 +1,7 @@
%
% \iffalse
%% keyval.dtx Copyright (C) 1993 1994 1995 1997 1998 1999 David Carlisle
-%% Copyright (C) 2000-2019 David Carlisle, LaTeX3 Project
+%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
diff --git a/macros/latex/required/graphics/keyval.pdf b/macros/latex/required/graphics/keyval.pdf
index 375ae88b39..3096eb4614 100644
--- a/macros/latex/required/graphics/keyval.pdf
+++ b/macros/latex/required/graphics/keyval.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/lscape.dtx b/macros/latex/required/graphics/lscape.dtx
index a5a3dc3220..e14462c9d4 100644
--- a/macros/latex/required/graphics/lscape.dtx
+++ b/macros/latex/required/graphics/lscape.dtx
@@ -2,7 +2,7 @@
% \iffalse
%
%% lscape.dtx Copyright (C) 1994 1999-2000 David Carlisle
-%% Copyright (C) 2000-2019 David Carlisle, LaTeX3 Project
+%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
diff --git a/macros/latex/required/graphics/lscape.pdf b/macros/latex/required/graphics/lscape.pdf
index 69cab578f1..3b425736bf 100644
--- a/macros/latex/required/graphics/lscape.pdf
+++ b/macros/latex/required/graphics/lscape.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/rotating.dtx b/macros/latex/required/graphics/rotating.dtx
index 149c19d049..535f115594 100644
--- a/macros/latex/required/graphics/rotating.dtx
+++ b/macros/latex/required/graphics/rotating.dtx
@@ -5,7 +5,7 @@
% File: rotating.dtx
%% Copyright (C) 1995--1999 Sebastian Rahtz and Leonor Barroca
%% Copyright (C) 2001--2003,2007--2009 Robin Fairbairns
-%% Copyright (C) 2016-2019 LaTeX3 Project
+%% Copyright (C) 2016-2020 LaTeX3 Project
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -21,7 +21,7 @@
% This work consists of the file rotating.dtx
% and the derived file rotating.sty, and testing material
% rotex.tex and cat.eps
-%
+%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
%<*dtx>
@@ -75,7 +75,7 @@
% note that rotation is typically \emph{not} visible in a DVI viewer:
% conversion to, and viewing, PostScript or PDF is necessary.
%
-% \section{Usage}
+% \section{Usage}
%
% \subsection{Package options}
%
@@ -114,7 +114,7 @@
% area of the document.)
%
% New rotated environments may be declared using the combined
-% facilities of the float and rotfloat packages.
+% facilities of the float and rotfloat packages.
%
% \subsection{Other environments and commands}
% The package provides other \LaTeX\ environments:
@@ -146,7 +146,7 @@
% \begin{tabular}{@{}llp{3in}@{}}
% \cs{rotFPtop} & \cs{rotFPbot} & Effect \\
% \hline
-% 0pt plus 1fil & 0pt plus 1fil & figure/table appears in middle
+% 0pt plus 1fil & 0pt plus 1fil & figure/table appears in middle
% (default value) \\
% 0pt & 0pt plus 1fil & figure/table appears with its top
% nearest the edge of the page \\
@@ -175,11 +175,11 @@
% Control figure orientation
% \begin{macrocode}
\DeclareOption{figuresleft}{%
- \@rot@twosidefalse
+ \@rot@twosidefalse
\def\rot@LR{0}%
}
\DeclareOption{figuresright}{%
- \@rot@twosidefalse
+ \@rot@twosidefalse
\def\rot@LR{-1}%
}
% \end{macrocode}
@@ -206,7 +206,7 @@
% A couple of commands for passing rotation direction around
% \begin{macrocode}
\newif\if@rot@twoside
-\if@twoside
+\if@twoside
\@rot@twosidetrue
\else
\@rot@twosidefalse
@@ -238,7 +238,7 @@
\def\rotdriver#1{\makeatletter\input{#1.def}\makeatother}
% \end{macrocode}
% \end{macro}
-%
+%
% The \texttt{r@tfl@t} counter is used when generating `labels' for
% determining what side of the page the float is on, in twoside mode.
% \begin{macrocode}
@@ -298,7 +298,7 @@
% \end{macrocode}
% \end{macro}
% \begin{macro}{\turnbox}
-% A macro version of the `rotate' environment.
+% A macro version of the `rotate' environment.
% \begin{macrocode}
\def\turnbox#1#2{%
\Grot@setangle{#1}%
@@ -315,13 +315,13 @@
% \section{Sideways figures and tables}
% Now for the macros to provide a complete
% environment for sideways figures and tables.
-% We define two environments |sidewaysfigure| and
+% We define two environments |sidewaysfigure| and
% |sidewaystable| that
% fit in with the normal table and figure floats. These are `fixed'
% environments that just do 90 degree rotation, but it would be easy
% to parameterize this to do other rotations if needed (the mind
% boggles\ldots)
-%
+%
% \begin{macro}{\@rotfloat}
% \begin{macro}{\@xrotfloat}
% \begin{macro}{\rot@float@box}
@@ -347,7 +347,7 @@
\@float{#1}[#2]%
% \end{macrocode}
% Set the float contents in
-% a box of width \cs{textheight} instead of \cs{columnwidth}.
+% a box of width \cs{textheight} instead of \cs{columnwidth}.
% \begin{macrocode}
\begin{lrbox}\rot@float@box
\begin{minipage}\textheight
@@ -366,7 +366,7 @@
% \begin{macrocode}
\def\end@rotfloat{%
% \end{macrocode}
-% If we are going to know whether pages are odd or even,
+% If we are going to know whether pages are odd or even,
% we need to use the a variant \cs{pageref} mechanism and our own
% specialised labels.
% \begin{macrocode}
@@ -388,18 +388,18 @@
\if@rot@twoside
\else
\let\R@@page\rot@LR
- \fi
- \ifthenelse{\isodd{\R@@page}}{%
+ \fi
+ \ifthenelse{\isodd{\R@@page}}{%
\if@rot@twoside
\rot@mess@toks\expandafter{\the\rot@mess@toks (right hand page)}%
\fi
- \vfill
+ \vfill
\@@line{%
\hskip\rotFPtop
\rotatebox{90}{\box\rot@float@box}%
\hskip\rotFPbot
}%
- }{%
+ }{%
\if@rot@twoside
\rot@mess@toks\expandafter{\the\rot@mess@toks (left hand page)}%
\fi
@@ -409,9 +409,9 @@
\hskip\rotFPtop
}%
\vfill
- }%
+ }%
\rot@message{\the\rot@mess@toks}
- }%
+ }%
\end@float
}
% \end{macrocode}
@@ -421,7 +421,7 @@
% \begin{macro}{\endsidewaysfigure}
% \begin{macro}{\sidewaystable}
% \begin{macro}{\endsidewaystable}
-% The following definitions set up two environments,
+% The following definitions set up two environments,
% \texttt{sidewaystable} and \texttt{sidewaysfigure}, which uses this
% type of float. Naturally, users may need to change these to suit
% their local style. Both contribute to the normal lists of figures
@@ -455,7 +455,7 @@
}
\def\end@rotdblfloat{%
% \end{macrocode}
-% If we are going to know whether pages are odd or even,
+% If we are going to know whether pages are odd or even,
% we need to use the \cs{pageref} mechanism, and labels. But
% Labels won't work \emph{unless} the user has put in a
% caption. Beware!
@@ -485,34 +485,34 @@
\if@rot@twoside
\else
\let\R@@page\rot@LR
- \fi
- \ifthenelse{\isodd{\R@@page}}{%
+ \fi
+ \ifthenelse{\isodd{\R@@page}}{%
\ifrot@messages
\if@rot@twoside
\rot@mess@toks\expandafter{\the\rot@mess@toks (right hand page)}%
\fi
\fi
- \vfill
+ \vfill
\@@line{%
\hskip\rotFPtop
\rotatebox{90}{\box\rot@float@box}%
\hskip\rotFPbot
}%
- }{%
+ }{%
\ifrot@messages
\if@rot@twoside
\rot@mess@toks\expandafter{\the\rot@mess@toks (left hand page)}%
\fi
- \fi%
+ \fi%
\@@line{%
\hskip\rotFPbot
\rotatebox{-90}{\box\rot@float@box}%
\hskip\rotFPtop
}%
\vfill
- }%
+ }%
\rot@message{\the\rot@mess@toks}%
- }%
+ }%
\end@dblfloat
}
% \end{macrocode}
diff --git a/macros/latex/required/graphics/rotating.pdf b/macros/latex/required/graphics/rotating.pdf
index 704c4e11e5..f893e672ae 100644
--- a/macros/latex/required/graphics/rotating.pdf
+++ b/macros/latex/required/graphics/rotating.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/rotex.pdf b/macros/latex/required/graphics/rotex.pdf
index 12ff8587b1..ac8f0d43cb 100644
--- a/macros/latex/required/graphics/rotex.pdf
+++ b/macros/latex/required/graphics/rotex.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/rotex.tex b/macros/latex/required/graphics/rotex.tex
index 9dabfd37f7..0ba5948998 100644
--- a/macros/latex/required/graphics/rotex.tex
+++ b/macros/latex/required/graphics/rotex.tex
@@ -75,7 +75,7 @@ written at 10 degree intervals round the compass. We use
`rlap' to ensure that all the texts are printed at the same point.
Just to show that \TeX\ can handle PostScript muckings-about
properly\ldots
-\begin{example}
+\begin{example}
\newcount\wang
\newsavebox{\wangtext}
\newdimen\wangspace
@@ -100,7 +100,7 @@ desires \LaTeX\ to leave space for the rotated box, then `turn' is used:
\end{turn} end here
\end{example}
The environment `Sideways' is a special case, setting the rotation to $-90$,
-and leaving the correct space for the rotated box.
+and leaving the correct space for the rotated box.
\begin{example}
Start here
\begin{sideways}%
@@ -120,18 +120,18 @@ the \TeX\ box,
you have to adjust the box in the normal \LaTeX\ way:
\begin{example}
\newsavebox{\foo}
-\savebox{\foo}{\parbox{1in}{Save
-the whales Save the whale
-Save the whale
+\savebox{\foo}{\parbox{1in}{Save
+the whales Save the whale
+Save the whale
Save the whale}}%
Start
\begin{turn}{45}\usebox{\foo}\end{turn}
End
\end{example}
\begin{example}
-\savebox{\foo}{\parbox[b]{1in}{Save
-the whales Save the whale
-Save the whale
+\savebox{\foo}{\parbox[b]{1in}{Save
+the whales Save the whale
+Save the whale
Save the whale}}%
Start
\begin{turn}{45}\usebox{\foo}\end{turn}
@@ -139,7 +139,7 @@ End
\end{example}
\def\testrot#1{%
-\savebox{\foo}{\parbox{1in}{Save
+\savebox{\foo}{\parbox{1in}{Save
the whales Save the whale Save the whale Save the whale}}%
\framebox{---\begin{turn}{#1}\framebox{\usebox{\foo}}\end{turn}---}}%
@@ -272,9 +272,9 @@ figures, this presents no problem. Figure \ref{fig1} shows how
PostScript files which are being incorporated using can be
rotated at will, while Figure \ref{fig2} shows, in contrast, how
`includegraphics' itself handles rotation. It is also possible to rotate the
-whole of the figure environment, including caption,
+whole of the figure environment, including caption,
by using the `sidewaysfigure' ands `sidewaystable' environments
-in place of `figure' and `table'.
+in place of `figure' and `table'.
Sideways figures and tables always take up the whole page. They can be
rotated so that the bottom ot the figures is on the left or the right;
@@ -315,7 +315,7 @@ on the final page.\label{rotfloat1}}
\begin{tabular}{|llllllllp{1in}lp{1in}|}
\hline
Context &Length &Breadth/ &Depth &Profile &Pottery &Flint &Animal &Stone &Other &C14 Dates \\
- & &Diameter & & & & &
+ & &Diameter & & & & &
Bones&&&\\
\hline
&&&&&&&&&&\\
@@ -331,7 +331,7 @@ Bones&&&\\
794 &2.89m &0.75m &0.25m &Irreg. &P16 &$\times$3 & --- & --- &--- &---\\
\hline
\end{tabular}
-
+
\caption[Grooved Ware and Beaker Features, their Finds and
Radiocarbon Dates]{Grooved Ware and Beaker Features, their
Finds and Radiocarbon Dates; For a breakdown of the Pottery
@@ -425,7 +425,7 @@ on the final page.\label{rotfloat1}}
\begin{tabular}{|llllllllp{1in}lp{1in}|}
\hline
Context &Length &Breadth/ &Depth &Profile &Pottery &Flint &Animal &Stone &Other &C14 Dates \\
- & &Diameter & & & & &
+ & &Diameter & & & & &
Bones&&&\\
\hline
&&&&&&&&&&\\
@@ -441,7 +441,7 @@ Bones&&&\\
794 &2.89m &0.75m &0.25m &Irreg. &P16 &$\times$3 & --- & --- &--- &---\\
\hline
\end{tabular}
-
+
\caption[Grooved Ware and Beaker Features, their Finds and
Radiocarbon Dates]{Grooved Ware and Beaker Features, their
Finds and Radiocarbon Dates; For a breakdown of the Pottery
diff --git a/macros/latex/required/graphics/trig.dtx b/macros/latex/required/graphics/trig.dtx
index 2b152578ad..67f6c6a970 100644
--- a/macros/latex/required/graphics/trig.dtx
+++ b/macros/latex/required/graphics/trig.dtx
@@ -1,6 +1,6 @@
% \iffalse
%% File: trig.dtx Copyright (C) 1993 1994 1995 1996 1997 1999 David Carlisle
-%% Copyright (C) 2000-2019 David Carlisle, LaTeX3 Project
+%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
diff --git a/macros/latex/required/graphics/trig.pdf b/macros/latex/required/graphics/trig.pdf
index f8af90699c..0273a683d6 100644
--- a/macros/latex/required/graphics/trig.pdf
+++ b/macros/latex/required/graphics/trig.pdf
Binary files differ
diff --git a/macros/latex/required/tools/README.md b/macros/latex/required/tools/README.md
index 85af33dcd5..18d7ab768c 100644
--- a/macros/latex/required/tools/README.md
+++ b/macros/latex/required/tools/README.md
@@ -1,7 +1,7 @@
The LaTeX `tools` bundle
========================
-Release 2019-11-08
+Release 2020-02-02
Overview
--------
@@ -51,4 +51,4 @@ of the package.
-----
-<p>Copyright (C) 1993-2019 The LaTeX Project <br />
+<p>Copyright (C) 1993-2020 The LaTeX Project <br />
diff --git a/macros/latex/required/tools/afterpage.dtx b/macros/latex/required/tools/afterpage.dtx
index 3fa341aa53..600d221cb6 100644
--- a/macros/latex/required/tools/afterpage.dtx
+++ b/macros/latex/required/tools/afterpage.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
diff --git a/macros/latex/required/tools/afterpage.ins b/macros/latex/required/tools/afterpage.ins
index 9764bdac6d..96cba1ed0c 100644
--- a/macros/latex/required/tools/afterpage.ins
+++ b/macros/latex/required/tools/afterpage.ins
@@ -3,31 +3,31 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright (C) 1993-2019
+%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the Standard LaTeX `Tools Bundle'.
%% -------------------------------------------------------
-%%
+%%
%% It 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.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the `Tools Bundle' is
%% given in the file `manifest.txt'.
-%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -45,9 +45,9 @@ The source is maintained by the LaTeX Project team and bug
reports for it can be opened at https://latex-project.org/bugs/
(but please observe conditions on bug reports sent to that address!)
-Copyright (C) 1993-2019
+Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
--------------------------------------------------------------------------
@@ -57,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2005/12/01 or later.
This file may only be distributed together with a copy of the LaTeX
diff --git a/macros/latex/required/tools/afterpage.pdf b/macros/latex/required/tools/afterpage.pdf
index df9a52997f..b4228f13b5 100644
--- a/macros/latex/required/tools/afterpage.pdf
+++ b/macros/latex/required/tools/afterpage.pdf
Binary files differ
diff --git a/macros/latex/required/tools/array-2016-10-06.sty b/macros/latex/required/tools/array-2016-10-06.sty
index 0b619362d4..10fd5e8d17 100644
--- a/macros/latex/required/tools/array-2016-10-06.sty
+++ b/macros/latex/required/tools/array-2016-10-06.sty
@@ -1,13 +1,13 @@
%%
%% This is an old release of `array.sty',
-%%
+%%
%% Copyright 1993-2016
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
-%%
+%%
%% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
%% --------------------------------------------------------------------------
-%%
+%%
%% It 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.
@@ -15,8 +15,8 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
-%%
+%%
+%%
%% Package `array' to use with LaTeX 2e
%% Copyright (C) 1989-1998 Frank Mittelbach, all rights reserved.
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
diff --git a/macros/latex/required/tools/array.dtx b/macros/latex/required/tools/array.dtx
index 5590b0a136..acfa560937 100644
--- a/macros/latex/required/tools/array.dtx
+++ b/macros/latex/required/tools/array.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
@@ -284,7 +284,7 @@
% \hline\hline
% w\{align\}\{width\} & Sets the cell content in a box of the
% specified \texttt{width} aligned according to
-% the \texttt{align} parameter which could be
+% the \texttt{align} parameter which could be
% either \texttt{l}, \texttt{c} or
% \texttt{r}. Works essentially like
% =\makebox[=width=][=align=]{=cell=}= so
@@ -633,10 +633,10 @@
% \texttt{m}. As a result that cell was vertically centered with that
% space inside, resulting in a strange offset. Since 2.4f, this space
% is now added after centering the cell.
-%
+%
% A similar problem happened when "\extrarowheight" was used. For that
% reason m-cells now manually position the cell content which
-% allows to ignore this extra space request during the vertical aligment.
+% allows to ignore this extra space request during the vertical aligment.
%
%
% \subsection{Bugs and Features}
@@ -1323,7 +1323,7 @@
% \changes{v2.4f}{2017/11/04}{Managing m-cells without \cs{vcenter}}
% \begin{macrocode}
% \let\do@row@strut\relax
-% \let\ar@align@mcell\relax
+% \let\ar@align@mcell\relax
% \end{macrocode}
% Now we remove possible $*$-forms in the user preamble with the
% command =\@xexpast=. As we already know, this command saves
@@ -1551,7 +1551,7 @@
\hfil
% \end{macrocode}
% We also add a space of 1sp just in case the first thing in the
-% cell is a command doing an =\unskip=.
+% cell is a command doing an =\unskip=.
% \changes{v2.4k}{2018/12/30}{Add extra \cs{hskip} to guard against an
% \cs{unskip} at the start of a c-column cell (gh/102)}
% \begin{macrocode}
@@ -1604,7 +1604,7 @@
% mode. Therefore we start with a~=$=.
% \changes{v2.4f}{2017/11/04}{Managing m-cells without \cs{vcenter}}
% \begin{macrocode}
- \setbox\ar@mcellbox\vbox
+ \setbox\ar@mcellbox\vbox
% \end{macrocode}
% The part of the templates which is the same in all three cases
% (\texttt{p}, \texttt{m} and \texttt{b})
@@ -1618,7 +1618,7 @@
% \changes{v2.4e}{2016/10/07}{Fixing SX68732}
% \changes{v2.4f}{2017/11/04}{Managing m-cells without \cs{vcenter}}
% \begin{macrocode}
- \@startpbox{\@nextchar}\insert@column \@endpbox
+ \@startpbox{\@nextchar}\insert@column \@endpbox
\ar@align@mcell
\do@row@strut \or
% \end{macrocode}
@@ -2296,7 +2296,7 @@
% environments (via =\multicolumn=) are impossible.
% For 25 years or so =\@halignto= was set globally (to save space on the
% save stack, but that was a mistake: if there is a tabular in the
-% output routine (e.g., in the running header) then that tabular is
+% output routine (e.g., in the running header) then that tabular is
% able overwrite the =\@halignto=
% setting of a tabular in the main text resulting in a very weird error.
% \changes{v2.4d}{2016/10/06}{\cs{@halignto} set locally (pr/4488)}
@@ -2613,7 +2613,7 @@
% it is the equivalent of the primitive "\show" command for macro
% definitions. All we need to do is locally redefine "\NC@do" to take
% its argument (say `C') and then "\show" the (slightly modified)
-% definition of "\NC@rewrite@C". Actually as the the list always
+% definition of "\NC@rewrite@C". Actually as the list always
% starts off with "\NC@do *" and we do not want to print the
% definition of the $*$-form, define "\NC@do" to throw away the first
% item in the list, and then redefine itself to print the rest of the
@@ -2729,9 +2729,9 @@
% \changes{v2.4f}{2017/11/04}{Managing m-cells without \cs{vcenter}}
% \begin{macrocode}
\def\@mkpream#1{\gdef\@preamble{}\@lastchclass 4 \@firstamptrue
- \let\@sharp\relax
+ \let\@sharp\relax
% \end{macrocode}
-%
+%
% \changes{v2.4j}{2018/11/13}{Do not expand argument of
% \cs{@startpbox} while building the tabular preamble (sx/459285)}
% The "\@startpbox" (which is called for "p", "m" or "b" columns)
@@ -2747,7 +2747,7 @@
\def\@startpbox##1{\unexpanded\expandafter{\expandafter
\@startpbox\expandafter{##1}}}\let\@endpbox\relax
\let\do@row@strut\relax
- \let\ar@align@mcell\relax
+ \let\ar@align@mcell\relax
% \end{macrocode}
% Now we remove possible $*$-forms and user-defined column
% specifiers in the user preamble by repeatedly executing the list
@@ -2953,7 +2953,7 @@
%
% The problem in this case is that if the optional argument "[b]"
% is used we do want the reference point of the tabular be at the
-% baseline of the last row but at the same time do want the the
+% baseline of the last row but at the same time do want the
% depth of this last line increased by "\extratabsurround" without
% changing the placement "\hline".
%
@@ -3076,7 +3076,7 @@
<{\end{lrbox}%
\let\hss\hfil
\makebox[#2][#1]{\unhbox\ar@cellbox}}}
-% \end{macrocode}
+% \end{macrocode}
% This is a bit sneaky, as it temporarily disables "\hss", but
% given that we know what goes into that box it should be
% sufficient.
@@ -3089,4 +3089,3 @@
% \Finale
%
\endinput
-
diff --git a/macros/latex/required/tools/array.pdf b/macros/latex/required/tools/array.pdf
index 4c9f030435..e308c14d2b 100644
--- a/macros/latex/required/tools/array.pdf
+++ b/macros/latex/required/tools/array.pdf
Binary files differ
diff --git a/macros/latex/required/tools/bm.dtx b/macros/latex/required/tools/bm.dtx
index 2216dcea07..096f6c4bc2 100644
--- a/macros/latex/required/tools/bm.dtx
+++ b/macros/latex/required/tools/bm.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
@@ -837,7 +837,7 @@
\let\ifmmode\iftrue
% \end{macrocode}
% We have to ensure that the math alphabets have definitions that
-% correspond the the ``bold'' math version we are going to switch
+% correspond the ``bold'' math version we are going to switch
% to. As these definitions are globally assigned when a math
% version is changed it is likely that right now we have those of
% the normal math version active. Argument |#3| holds either
diff --git a/macros/latex/required/tools/bm.ins b/macros/latex/required/tools/bm.ins
index a148cb93ef..e963d1d88e 100644
--- a/macros/latex/required/tools/bm.ins
+++ b/macros/latex/required/tools/bm.ins
@@ -3,31 +3,31 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright (C) 1993-2019
+%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the Standard LaTeX `Tools Bundle'.
%% -------------------------------------------------------
-%%
+%%
%% It 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.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the `Tools Bundle' is
%% given in the file `manifest.txt'.
-%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -45,9 +45,9 @@ The source is maintained by the LaTeX Project team and bug
reports for it can be opened at https://latex-project.org/bugs/
(but please observe conditions on bug reports sent to that address!)
-Copyright (C) 1993-2019
+Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
--------------------------------------------------------------------------
@@ -57,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2005/12/01 or later.
This file may only be distributed together with a copy of the LaTeX
diff --git a/macros/latex/required/tools/bm.pdf b/macros/latex/required/tools/bm.pdf
index ce581aa9a2..4e988b3dd4 100644
--- a/macros/latex/required/tools/bm.pdf
+++ b/macros/latex/required/tools/bm.pdf
Binary files differ
diff --git a/macros/latex/required/tools/calc.dtx b/macros/latex/required/tools/calc.dtx
index 0bc90f736b..62fe27489b 100644
--- a/macros/latex/required/tools/calc.dtx
+++ b/macros/latex/required/tools/calc.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
diff --git a/macros/latex/required/tools/calc.pdf b/macros/latex/required/tools/calc.pdf
index cb53c0963d..0f5d289efc 100644
--- a/macros/latex/required/tools/calc.pdf
+++ b/macros/latex/required/tools/calc.pdf
Binary files differ
diff --git a/macros/latex/required/tools/changes.txt b/macros/latex/required/tools/changes.txt
index 5b9aed15f2..bc35e02d1a 100644
--- a/macros/latex/required/tools/changes.txt
+++ b/macros/latex/required/tools/changes.txt
@@ -6,6 +6,33 @@ are not part of the distribution.
=======================================================================
#########################
+# 2020-02-02 Release
+#########################
+
+2020-01-15 David Carlisle <David.Carlisle@latex-project.org>
+
+ * tabularx.dtx: Avoid .. at end of the Target width debug message.
+
+2020-01-07 David Carlisle <David.Carlisle@latex-project.org>
+
+ * longtable.dtx: additional \endgraf for
+ https://github.com/davidcarlisle/dpctex/issues/8
+
+2020-01-04 David Carlisle <David.Carlisle@latex-project.org>
+
+ * hhline.dtx: Allow and ignore spaces in the \hhline argument.
+
+2019-12-09 Frank Mittelbach <Frank.Mittelbach@latex-project.org>
+
+ * multicol.dtx:
+ Support up to 20 columns instead of 10; also ensure that
+ the insert boxes are not clobbered (gh/237)
+
+2019-10-15 Frank Mittelbach <Frank.Mittelbach@latex-project.org>
+
+ * multicol.dtx: Use \@maxdepth not \maxdepth (gh/190)
+
+#########################
# 2019-11-10 PL 3 Release
#########################
@@ -18,6 +45,14 @@ are not part of the distribution.
* (shellesc): restore the original catcode of _ to _ not to "
#########################
+# 2019-11-08 Release
+#########################
+
+2019-11-08 David Carlisle <David.Carlisle@latex-project.org>
+
+ * (shellesc): restore the original catcode of _ to _ not to "
+
+#########################
# 2019-10-01 PL 2 Release
#########################
diff --git a/macros/latex/required/tools/dcolumn.dtx b/macros/latex/required/tools/dcolumn.dtx
index 38a4ab0da2..1899cce556 100644
--- a/macros/latex/required/tools/dcolumn.dtx
+++ b/macros/latex/required/tools/dcolumn.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
diff --git a/macros/latex/required/tools/dcolumn.pdf b/macros/latex/required/tools/dcolumn.pdf
index 7d22951d27..bdef8b616f 100644
--- a/macros/latex/required/tools/dcolumn.pdf
+++ b/macros/latex/required/tools/dcolumn.pdf
Binary files differ
diff --git a/macros/latex/required/tools/delarray.dtx b/macros/latex/required/tools/delarray.dtx
index 8814fc2a58..17cac2052c 100644
--- a/macros/latex/required/tools/delarray.dtx
+++ b/macros/latex/required/tools/delarray.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
diff --git a/macros/latex/required/tools/delarray.pdf b/macros/latex/required/tools/delarray.pdf
index 1b023b1ad4..cb0d378fc0 100644
--- a/macros/latex/required/tools/delarray.pdf
+++ b/macros/latex/required/tools/delarray.pdf
Binary files differ
diff --git a/macros/latex/required/tools/enumerate.dtx b/macros/latex/required/tools/enumerate.dtx
index 984d36d415..3ce463e601 100644
--- a/macros/latex/required/tools/enumerate.dtx
+++ b/macros/latex/required/tools/enumerate.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
diff --git a/macros/latex/required/tools/enumerate.pdf b/macros/latex/required/tools/enumerate.pdf
index 045ff45d0d..595b850bb7 100644
--- a/macros/latex/required/tools/enumerate.pdf
+++ b/macros/latex/required/tools/enumerate.pdf
Binary files differ
diff --git a/macros/latex/required/tools/fileerr.dtx b/macros/latex/required/tools/fileerr.dtx
index 3b5895a5f6..16a95e2820 100644
--- a/macros/latex/required/tools/fileerr.dtx
+++ b/macros/latex/required/tools/fileerr.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
diff --git a/macros/latex/required/tools/fileerr.pdf b/macros/latex/required/tools/fileerr.pdf
index 610a5312b4..46f7e76603 100644
--- a/macros/latex/required/tools/fileerr.pdf
+++ b/macros/latex/required/tools/fileerr.pdf
Binary files differ
diff --git a/macros/latex/required/tools/fontsmpl.dtx b/macros/latex/required/tools/fontsmpl.dtx
index 961bdda71f..a5fb2964a9 100644
--- a/macros/latex/required/tools/fontsmpl.dtx
+++ b/macros/latex/required/tools/fontsmpl.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
diff --git a/macros/latex/required/tools/fontsmpl.pdf b/macros/latex/required/tools/fontsmpl.pdf
index f6020ea486..e930726bb1 100644
--- a/macros/latex/required/tools/fontsmpl.pdf
+++ b/macros/latex/required/tools/fontsmpl.pdf
Binary files differ
diff --git a/macros/latex/required/tools/ftnright.dtx b/macros/latex/required/tools/ftnright.dtx
index 5739172f85..e5fffdfcd9 100644
--- a/macros/latex/required/tools/ftnright.dtx
+++ b/macros/latex/required/tools/ftnright.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
diff --git a/macros/latex/required/tools/ftnright.pdf b/macros/latex/required/tools/ftnright.pdf
index eeddcc4800..ca4fbdd831 100644
--- a/macros/latex/required/tools/ftnright.pdf
+++ b/macros/latex/required/tools/ftnright.pdf
Binary files differ
diff --git a/macros/latex/required/tools/hhline.dtx b/macros/latex/required/tools/hhline.dtx
index 1da01d757b..b9234b5aa2 100644
--- a/macros/latex/required/tools/hhline.dtx
+++ b/macros/latex/required/tools/hhline.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
@@ -25,7 +25,7 @@
%
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\ProvidesPackage{hhline}
-%<package> [2014/10/28 v2.03 Table rule package (DPC)]
+%<package> [2020/01/04 v2.04 Table rule package (DPC)]
%
%<*driver>
\documentclass{ltxdoc}
@@ -55,6 +55,8 @@
% {Update for LaTeX2e.}
% \changes{v2.03}{1994/05/23}
% {New style warning.}
+% \changes{v2.04}{2020/01/04}
+% {Ignore spaces.}
%
%
%
@@ -301,12 +303,16 @@
% \begin{macrocode}
\ifx\@tempb b\HH@add{\rlap{\HH@box\z@\doublerulesep}}\else
% \end{macrocode}
+% "space", Gobble the space and loop again.
+% \begin{macrocode}
+ \ifx\@tempb\@sptoken\let\next\HH@spacelet\else
+% \end{macrocode}
% Otherwise ignore the token, with a warning.
% \begin{macrocode}
\PackageWarning{hhline}%
{\meaning\@tempb\space ignored in \noexpand\hhline argument%
\MessageBreak}%
- \fi\fi\fi\fi\fi\fi\fi\fi\fi
+ \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
% \end{macrocode}
% Go around the loop again.
% \begin{macrocode}
@@ -314,6 +320,13 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\HH@spacelet}
+% Helper macro to gobble a space token and continue the loop.
+% \begin{macrocode}
+\lowercase{\def\HH@spacelet} {\futurelet\@tempb \HH@loop}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macrocode}
%</package>
% \end{macrocode}
diff --git a/macros/latex/required/tools/hhline.pdf b/macros/latex/required/tools/hhline.pdf
index e09bea6312..5c2a81ef88 100644
--- a/macros/latex/required/tools/hhline.pdf
+++ b/macros/latex/required/tools/hhline.pdf
Binary files differ
diff --git a/macros/latex/required/tools/indentfirst.dtx b/macros/latex/required/tools/indentfirst.dtx
index 16b99653cd..7123be04c5 100644
--- a/macros/latex/required/tools/indentfirst.dtx
+++ b/macros/latex/required/tools/indentfirst.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
diff --git a/macros/latex/required/tools/indentfirst.pdf b/macros/latex/required/tools/indentfirst.pdf
index 8b7e227344..75987d3cb3 100644
--- a/macros/latex/required/tools/indentfirst.pdf
+++ b/macros/latex/required/tools/indentfirst.pdf
Binary files differ
diff --git a/macros/latex/required/tools/layout.dtx b/macros/latex/required/tools/layout.dtx
index 848eb54fb2..8918ffdca4 100644
--- a/macros/latex/required/tools/layout.dtx
+++ b/macros/latex/required/tools/layout.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
diff --git a/macros/latex/required/tools/layout.pdf b/macros/latex/required/tools/layout.pdf
index da5ea65a9c..64d086cb1e 100644
--- a/macros/latex/required/tools/layout.pdf
+++ b/macros/latex/required/tools/layout.pdf
Binary files differ
diff --git a/macros/latex/required/tools/longtable.dtx b/macros/latex/required/tools/longtable.dtx
index 9a3b5c03b8..004d630fce 100644
--- a/macros/latex/required/tools/longtable.dtx
+++ b/macros/latex/required/tools/longtable.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
@@ -21,7 +21,7 @@
%
% \fi
% \iffalse
-%% File: longtable.dtx Copyright (C) 1990-2019 David Carlisle
+%% File: longtable.dtx Copyright (C) 1990-2020 David Carlisle
%
%<*dtx>
\ProvidesFile{longtable.dtx}
@@ -31,7 +31,7 @@
%<driver> \ProvidesFile{longtable.drv}
% \fi
% \ProvidesFile{longtable.dtx}
- [2019/02/06 v4.12 Multi-page Table package (DPC)]
+ [2020/01/07 v4.13 Multi-page Table package (DPC)]
%
% \iffalse
%<*driver>
@@ -635,9 +635,9 @@
% "\LTright"&
% Glue to the right of the table. \hfill("\fill")\\
% "\LTpre"&
-% Glue before the the table. \hfill("\bigskipamount")\\
+% Glue before the table. \hfill("\bigskipamount")\\
% "\LTpost"&
-% Glue after the the table. \hfill("\bigskipamount")\\
+% Glue after the table. \hfill("\bigskipamount")\\
% "\LTcapwidth"&
% The width of a parbox containing the caption.\hfill(4in)\\
% "LTchunksize"&
@@ -1212,6 +1212,8 @@
% \end{macro}
%
% \begin{macro}{\LT@start}
+% % \changes{v4.13}{2020/01/07}
+% {fix issue https://github.com/davidcarlisle/dpctex/issues/8}
% This macro starts the process of putting the table on the current
% page. It is not called until either a "\\" or "\endlongtable" command
% ends a chunk, as we do not know until that point which of the four
@@ -1219,11 +1221,12 @@
%
% It begins by redefining itself, so that the table is only started
% once! Until V3.04, was redefined to "\relax", now use "\endgraf" to
-% force the page-breaker to wake up.
+% force the page-breaker to wake up. The second "\endgraf" is there so
+% that "\pagetotal" is updated and so takes "\LTpre" into account.
% \begin{macrocode}
\def\LT@start{%
\let\LT@start\endgraf
- \endgraf\penalty\z@\vskip\LTpre
+ \endgraf\penalty\z@\vskip\LTpre\endgraf
% \end{macrocode}
% Start a new page if there is not enough room for the table head, foot,
% and one extra line.
@@ -2031,7 +2034,7 @@
% \end{macrocode}
% \end{macro}
%
-% \subsection{Commands for the the table head and foot}
+% \subsection{Commands for the table head and foot}
%
% \begin{macro}{\LT@end@hd@ft}
% The core of "\endhead" and friends. Store the current chunk in the
@@ -2127,7 +2130,7 @@
% \end{macrocode}
% \changes{v4.12}{2019/02/06}{Color group to match array package}
% \begin{macrocode}
- \color@endgroup
+ \color@endgroup
\egroup
\the\LT@p@ftn
\global\LT@p@ftn{}%
@@ -2151,4 +2154,3 @@
%
% \Finale
\endinput
-
diff --git a/macros/latex/required/tools/longtable.ins b/macros/latex/required/tools/longtable.ins
index 1fc3c12dfa..7ada121ea9 100644
--- a/macros/latex/required/tools/longtable.ins
+++ b/macros/latex/required/tools/longtable.ins
@@ -3,31 +3,31 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright (C) 1993-2019
+%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the Standard LaTeX `Tools Bundle'.
%% -------------------------------------------------------
-%%
+%%
%% It 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.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the `Tools Bundle' is
%% given in the file `manifest.txt'.
-%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -45,9 +45,9 @@ The source is maintained by the LaTeX Project team and bug
reports for it can be opened at https://latex-project.org/bugs/
(but please observe conditions on bug reports sent to that address!)
-Copyright (C) 1993-2019
+Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
--------------------------------------------------------------------------
@@ -57,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2005/12/01 or later.
This file may only be distributed together with a copy of the LaTeX
diff --git a/macros/latex/required/tools/longtable.pdf b/macros/latex/required/tools/longtable.pdf
index 72a1221135..67b21c5b23 100644
--- a/macros/latex/required/tools/longtable.pdf
+++ b/macros/latex/required/tools/longtable.pdf
Binary files differ
diff --git a/macros/latex/required/tools/manifest.txt b/macros/latex/required/tools/manifest.txt
index 8b0f9e32d0..12cd1b909c 100644
--- a/macros/latex/required/tools/manifest.txt
+++ b/macros/latex/required/tools/manifest.txt
@@ -2,22 +2,22 @@
%
% Copyright 1993-2016
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Tools Bundle'.
% -------------------------------------------------------
-%
+%
% It 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.
% The latest version of this license is in
% https://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
%
% CONTENTS OF THE TOOLS BUNDLE
@@ -36,7 +36,7 @@ hhline.dtx
Finer control over horizontal rules in tables. Requires array.
longtable.dtx
Multipage tables. (Does not require array, but uses the extended
- features if both are loaded.)
+ features if both are loaded.)
tabularx.dtx
Defines tabularx environment (similar to tabular*) but modifies
column widths, not inter-column space, to achieve a desired
@@ -49,14 +49,14 @@ bm.dtx
Access bold math symbols.
calc.dtx
- Infix arithmetic expresions. Contributed to the distribution by
+ Infix arithmetic expresions. Contributed to the distribution by
Kresten Krab Thorup and Frank Jensen.
enumerate.dtx
Extended version of the enumerate environment.
fileerr.dtx
- Suite of small files which may be used to control TeX's
+ Suite of small files which may be used to control TeX's
missing file error loop.
fontsmpl.dtx
@@ -82,7 +82,7 @@ rawfonts.dtx
shellesc.dtx
Unified interface for accessing system commands.
-
+
showkeys.dtx
Draft mode showing the `keys' used by \label, \ref, \cite etc.
diff --git a/macros/latex/required/tools/multicol-2017-04-11.sty b/macros/latex/required/tools/multicol-2017-04-11.sty
index e8558e4ce0..c708ae6c48 100644
--- a/macros/latex/required/tools/multicol-2017-04-11.sty
+++ b/macros/latex/required/tools/multicol-2017-04-11.sty
@@ -1,17 +1,17 @@
%%
%% This is an old release of `multicol.sty',
-%%
+%%
%% The source is maintained by the LaTeX Project team and bug
%% reports for it can be opened at http://latex-project.org/bugs.html
%% (but please observe conditions on bug reports sent to that address!)
-%%
+%%
%% Copyright 1993-2016
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
-%%
+%%
%% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
%% --------------------------------------------------------------------------
-%%
+%%
%% It 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.
@@ -19,8 +19,8 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
-%%
+%%
+%%
%% Package `multicol' to use with LaTeX2e
%% Copyright 1989-2016 Frank Mittelbach
%%
diff --git a/macros/latex/required/tools/multicol.dtx b/macros/latex/required/tools/multicol.dtx
index d68f471fcd..39bccef2d7 100644
--- a/macros/latex/required/tools/multicol.dtx
+++ b/macros/latex/required/tools/multicol.dtx
@@ -98,7 +98,7 @@
%<driver> \ProvidesFile{multicol.drv}
% \fi
% \ProvidesFile{multicol.dtx}
- [2019/03/01 v1.8w multicolumn formatting (FMi)]
+ [2019/12/09 v1.8y multicolumn formatting (FMi)]
%
%
%%
@@ -134,7 +134,7 @@
% \DoNotIndex{\hbox,\hfil,\hrule,\ht,\hss}
% \DoNotIndex{\ifdim,\ifnum,\ifvoid,\ignorespaces,\insert,\immediate}
% \DoNotIndex{\let,\loop}
-% \DoNotIndex{\maxdepth,\message,\multiply}
+% \DoNotIndex{\@maxdepth,\message,\multiply}
% \DoNotIndex{\newbox,\newcount,\newdimen,\newskip,\number,\newpage}
% \DoNotIndex{\outputpenalty,\p@,\penalty}
% \DoNotIndex{\relax,\repeat,\setbox,\skip,\space,\splitmaxdepth}
@@ -470,7 +470,7 @@
% `\textsf{minrows}' (default 1). If set to a higher value then the
% balancing will have at least that many rows in the first column (and
% also all further columns until it runs outs of material).
-%
+%
% Additionally you can set another counter, the `\textsf{unbalance}'
% counter, to some positive \meta{number}. This will make all but the
% right-most column \meta{number} of lines longer than they would
@@ -978,9 +978,10 @@
% grid. Right now it doesn't do anything other than warning if it
% thinks that the grid got lost.
% \changes{v1.6a}{2003/03/15}{New option grid}
+% \changes{v1.8x}{2019/10/15}{Use \cs{@maxdepth} not \cs{maxdepth} (gh/190)}
% \begin{macrocode}
\let\mc@gridwarn\maxdimen
-\DeclareOption{grid}{\def\mc@gridwarn{\maxdepth}}
+\DeclareOption{grid}{\def\mc@gridwarn{\@maxdepth}}
% \end{macrocode}
%
% \changes{v1.8e}{2014/04/23}{Support \cs{docolaction}}
@@ -1033,19 +1034,20 @@
I therefore use two columns instead}%
\col@number\tw@ \fi
% \end{macrocode}
-% We have only enough box registers for ten columns, so we need to
+% We have only enough box registers for twenty columns, so we need to
% check that the user hasn't asked for more.
% \changes{v1.4k}{1992/06/27}{Maximum of 5 columns (temp)}
% \changes{v1.5a}{1992/11/04}{Allow 10 columns again}
+% \changes{v1.8y}{2019/12/09}{Allow for 20 columns (gh/237)}
% \begin{macrocode}
- \ifnum\col@number>10
+ \ifnum\col@number>20
\PackageError{multicol}%
{Too many columns}%
{Current implementation doesn't
- support more than 10 columns.%
+ support more than 20 columns.%
\MessageBreak
- I therefore use 10 columns instead}%
- \col@number10 \fi
+ I therefore use 20 columns instead}%
+ \col@number20 \fi
% \end{macrocode}
% Within the environment we need a special version of the
% kernel |\@footnotetext| command since the original sets the
@@ -1337,7 +1339,7 @@
% resetting the |\parshape| in case we are inside some list
% environment. The correct indentation for the \mc{} environment in
% such a case will be produced by moving the result to the right by
-% |\multicol@leftmargin| later on. If we would use the value of of
+% |\multicol@leftmargin| later on. If we would use the value of
% |\@totalleftmargin| directly then lists inside the \mc{}
% environment could cause a shift of the output.
% \changes{v1.4l}{1992/08/17}{saved \cs{@totalleftmargin}}
@@ -1718,7 +1720,7 @@
% remove any space at the end of the box as we don't want to use
% this in balancing. Because of the |\color@endgroup| this can't be
% done later in |\balance@columns| as the color command will hide
-% it.
+% it.
% \changes{v1.8c}{2013/11/03}{Add \cs{color@endgroup} to prevent color leak}
% \changes{v1.8f}{2014/06/19}{Discard spaces before adding \cs{color@endgroup}}
% \begin{macrocode}
@@ -1760,7 +1762,7 @@
\else
% \end{macrocode}
% If there was a |\columnbreak| on the very last line all material
-% will have been moved to the |\colbreak@box|. Thus the the galley
+% will have been moved to the |\colbreak@box|. Thus the galley
% will be empty and no output routine gets called so that the text
% is lost. To avoid this problem (though unlikely) we check if the
% current galley is empty and the |\colbreak@box| contains text and
@@ -1957,10 +1959,10 @@
% \end{macrocode}
% To allow checking whether some macro is used within the \mc{}
% environment the counter |\col@number| gets a default of |1|
-% outside the the environment.
+% outside the environment.
% \changes{v1.3d}{1991/10/23}{\cs{col@number} set to one}
-% \changes{v1.8o}{2016/02/08}{\cs{col@number} already initialized in the
-% kernel, so not initializing it in the package
+% \changes{v1.8o}{2016/02/08}{\cs{col@number} already initialized in the
+% kernel, so not initializing it in the package
% in case the document is in two-column (pr/4435)}
% \begin{macrocode}
%\col@number = 1
@@ -2143,7 +2145,7 @@
% However, in case one of the columns was unusually deep \TeX{} may
% have tried some corrective actions in which case backing up by
% the saved value will not bring us back to the baseline. A good
-% indication for this is a depth of |\maxdepth| though it is not an
+% indication for this is a depth of |\@maxdepth| though it is not an
% absolute proof. If the option \texttt{grid} is used
% |\mc@gridwarn| will expand to this, otherwise to |\maxdimen| in
% which case this warning will not show up.
@@ -2192,15 +2194,16 @@
% |\vfill| in that case but this is actually wrong for columns that
% are more or less full: by adding a glue at the bottom such a
% column doesn't have any depth any more but without it the material
-% would be allowed a depth of |\maxdepth|. So we allow shrinking by
+% would be allowed a depth of |\@maxdepth|. So we allow shrinking by
% that amount. This only makes a difference if the box would
% otherwise become overfull and shrinking never exceeds the
-% specified value, so we should be fine.
+% specified value, so we should be fine.
% \changes{v1.8h}{2014/09/12}{Macro added (pr/4395)}
% \changes{v1.8j}{2015/03/07}{Use only `0.0001fil' for stretching}
+% \changes{v1.8x}{2019/10/15}{Use \cs{@maxdepth} not \cs{maxdepth} (gh/190)}
% \begin{macrocode}
-\def\vfilmaxdepth{\vskip \z@ \@plus .0001fil
- \@minus \maxdepth}
+\def\vfilmaxdepth{\vskip \z@ \@plus .0001fil
+ \@minus \@maxdepth}
% \end{macrocode}
% \end{macro}
%
@@ -2246,13 +2249,13 @@
% appropriate values to |\splittopskip| and |\splitmaxdepth|.
% \begin{macrocode}
\splittopskip\topskip
- \splitmaxdepth\maxdepth
+ \splitmaxdepth\@maxdepth
% \end{macrocode}
% We also need to restrict |\boxmaxdepth| so that re-boxing is not
-% generating boxes with arbitrary depth.
+% generating boxes with arbitrary depth.
% \changes{v1.8j}{2015/03/07}{Set \cs{boxmaxdepth}}
% \begin{macrocode}
- \boxmaxdepth\maxdepth
+ \boxmaxdepth\@maxdepth
% \end{macrocode}
% Then we calculate the current column height (in |\dimen@|).
% Note that the height of |\partial@page| is already
@@ -2284,7 +2287,7 @@
% reestablished. However, in theory there is a possibility to sneak
% in a whole multicols environment into the running header
% definition. If that happens then it will also be affected by this
-% change---too bad I think.
+% change---too bad I think.
% \changes{v1.8a}{2011/12/20}{Support for \cs{enlargethispage}}
% \changes{v1.8v}{2018/12/27}{Removed dead code, the case where this
% can go wrong is too obscure to worry about it (gh/101)}
@@ -2443,7 +2446,7 @@
%
% Within the OR |\boxmaxdepth| needs to be unrestricted so we set it back
% now as it was changed above.
-% \changes{v1.8p}{2016/04/07}{Reset \cs{boxmaxdepth}}
+% \changes{v1.8p}{2016/04/07}{Reset \cs{boxmaxdepth}}
% \begin{macrocode}
\boxmaxdepth\maxdimen
\setbox\@cclv\vbox{\unvbox\partial@page
@@ -2477,7 +2480,7 @@
% Now we reset |\@colroom| to |\@colht| which is \LaTeX's
% saved value of |\textheight|.
% We also have to reset the recorded position of the last
-% |\marginpar| as well as the recorded size of in-text floats
+% |\marginpar| as well as the recorded size of in-text floats
% as we are now on a new page.
% \changes{v1.8d}{2014/04/23}{Reset \cs{@mparbottom} after page finishes}
% \changes{v1.8n}{2015/08/19}{Reset \cs{@textfloatsheight} after page finishes}
@@ -2585,7 +2588,7 @@
% e.g., after a display environment (if LaTeX would break here by
% its own it would break before the space following the display).
%
-% Thus we rebox box 255 once (using |\maxdepth| and calling
+% Thus we rebox box 255 once (using |\@maxdepth| and calling
% |\remove@discardable@items| inside). The depth of 255 will then
% give us the depth the box would have had if it would have been a
% natural break. We then unbox 255 to get it into the
@@ -2594,8 +2597,9 @@
% balancing later on.
% \changes{v1.8k}{2015/03/21}{Remove discardable items just before a
% forced break}
+% \changes{v1.8x}{2019/10/15}{Use \cs{@maxdepth} not \cs{maxdepth} (gh/190)}
% \begin{macrocode}
- \boxmaxdepth\maxdepth
+ \boxmaxdepth\@maxdepth
\setbox\@cclv\vbox{%
\unvbox\@cclv
\remove@discardable@items}%
@@ -2613,7 +2617,7 @@
\ifnum\outputpenalty = -\@Mvi
\mult@info\@ne{End penalty of multicols seen}%
% \end{macrocode}
-% If we are at this point then have have to run the balancing code
+% If we are at this point then we have to run the balancing code
% (which was previously its own output routine). First we pretend
% that we had a normal forced breakpoint and then call
% |\balance@column@out|. The latter may be let to |\multi@column@out|
@@ -2879,12 +2883,13 @@
% |\splittopskip| and allow for a bit of undershoot and overshoot
% by adding some stretch and shrink.
% \changes{v1.5?}{1994/?/?}{Allow columns to come out a bit long or short}
+% \changes{v1.8x}{2019/10/15}{Use \cs{@maxdepth} not \cs{maxdepth} (gh/190)}
% \begin{macrocode}
\@tempdima\topskip
\splittopskip\@tempdima
\@plus\multicolundershoot
\@minus\multicolovershoot
- \splitmaxdepth\maxdepth
+ \splitmaxdepth\@maxdepth
% \end{macrocode}
% We also have to set |\boxmaxdepth| which normally allows to
% build boxes with arbitrary depth, but as we are building text
@@ -2893,8 +2898,9 @@
% restriction posed by |\splitmaxdepth| gets lost.
% \changes{v1.8h}{2014/09/12}{All column boxes should obey
% \cs{maxdepth} (pr/4395)}
+% \changes{v1.8x}{2019/10/15}{Use \cs{@maxdepth} not \cs{maxdepth} (gh/190)}
% \begin{macrocode}
- \boxmaxdepth\maxdepth
+ \boxmaxdepth\@maxdepth
% \end{macrocode}
% The next step is a bit tricky: when \TeX{} assembles material in
% a box, the first line isn't preceded by interline glue, i.e.
@@ -3000,7 +3006,7 @@
\vbadness\@M
% \end{macrocode}
% We also allow for overfull boxes while we trying to split the
-% columns. They can easily happen if we have objects with unusual depth.
+% columns. They can easily happen if we have objects with unusual depth.
% \changes{v1.8h}{2014/09/12}{Do not report overfull}
% \begin{macrocode}
\vfuzz \maxdimen
@@ -3252,7 +3258,7 @@
% If we have unprocessed forced breaks we normally reiterate with a
% larger column size to fit them in eventually. However, if there
% are simply too many of them (e.g., 3 forced breaks but only 2
-% columns to balance) then this will never succeed and and we would
+% columns to balance) then this will never succeed and we would
% continue growing the columns until we hit the largest possible
% column size. So in addition we check how big the column size is
% compared to available room and if we exceed this by
@@ -3309,7 +3315,7 @@
%</badness>
\advance\dimen@\p@
\repeat
-% \end{macrocode}
+% \end{macrocode}
% If we come out of the loop with the switch |forcedbreak@leftover|
% set to true then balancing has failed and we should cut a normal
% page. We indicate this below with |\too@badtrue| when any of the
@@ -3446,7 +3452,25 @@
% of this setup in the documentation, sigh.) This produced a problem
% at the moment we had more than 5 columns because then officially
% allocated boxes were overwritten by the algorithm.
-% The new release now uses private box registers
+% The new release now uses private box registers.
+%
+% There was in fact a bug in the new implementation because at one
+% point \LaTeX{} started to use the extended registers and so
+% jumped from below 255 to above omitting the boxes allocated for
+% inserts and the output page box.
+%
+% So nowadays we really have to check if we get the full sequence
+% of boxes allocated without holes (i.e., $2\times\textit{max
+% cols}+1$) and if not alter the allocation registers to start
+% allocating after 255. This is all done quite low-level by looking
+% directly at the values of the allocation counters.
+% \changes{v1.8y}{2019/12/09}{Allow for 20 columns (gh/237)}
+% \begin{macrocode}
+\ifnum\numexpr \count20-\count14-1<41 % = 2 * 20 + 1
+ \count14=\@cclv
+\fi
+% \end{macrocode}
+%
% \begin{macrocode}
\newbox\mult@rightbox
\newbox\mult@grightbox
@@ -3460,6 +3484,16 @@
\newbox\@tempa\newbox\@tempa
\newbox\@tempa\newbox\@tempa
\newbox\@tempa\newbox\@tempa
+\newbox\@tempa\newbox\@tempa
+\newbox\@tempa\newbox\@tempa
+\newbox\@tempa\newbox\@tempa
+\newbox\@tempa\newbox\@tempa
+\newbox\@tempa\newbox\@tempa
+\newbox\@tempa\newbox\@tempa
+\newbox\@tempa\newbox\@tempa
+\newbox\@tempa\newbox\@tempa
+\newbox\@tempa\newbox\@tempa
+\newbox\@tempa\newbox\@tempa
\newbox\@tempa
\let\@tempa\relax
% \end{macrocode}
@@ -3751,7 +3785,7 @@
%
% Special care is needed with handling |\vspace*| as that
% corresponds to |\penalty10000|, |\vskip <skip>|, followed by
-% |\vskip 0pt|. If we see this sequence going backwards in the the
+% |\vskip 0pt|. If we see this sequence going backwards in the
% vertical list we assume that this is a ``desired'' space. We
% therefore stop the recursion and reinsert the spaces.
%
@@ -3798,7 +3832,7 @@
% recurse.
% \begin{macrocode}
\vskip\@tempb\vskip\@tempa\relax
- \else
+ \else
\remove@discardable@items
\fi
\fi
@@ -3818,7 +3852,7 @@
\def\too@badtrue{\global\let\iftoo@bad\iftrue}
\def\too@badfalse{\global\let\iftoo@bad\iffalse}
% \end{macrocode}
-%
+%
% \changes{v1.8k}{2015/03/21}{The new switch}
% \begin{macrocode}
\newif\ifforcedbreak@leftover
@@ -3962,7 +3996,7 @@
% When ending the environment we simply end the inner
% \texttt{multicols} environment, except that we better also stick
% in some stretchable vertical glue so that the last column still
-% containing text is not vertically stretched out.
+% containing text is not vertically stretched out.
%
% We do this as follows: first we ensure that we are back in vertical mode
% and then we cancel out |\lastskip| if it was
@@ -3992,7 +4026,7 @@
\par
\ifdim\lastskip>\z@ \vskip-\lastskip \fi
\ifdim \prevdepth>\z@
- \vskip-\ifdim\prevdepth>\boxmaxdepth
+ \vskip-\ifdim\prevdepth>\boxmaxdepth
\boxmaxdepth
\else \prevdepth \fi
\fi
@@ -4309,9 +4343,9 @@
% \begin{macrocode}
\newcommand\@docolaction[4][1]{%
% \end{macrocode}
-%
-% How does the column number get associated with our label? We
-% do do this by writing another line into the aux file. Here are the
+%
+% How does the column number get associated with our label? We
+% do this by writing another line into the aux file. Here are the
% preparations.
% \begin{macrocode}
\edef\@docolactioncheck{\write\@auxout
@@ -4360,7 +4394,7 @@
% \begin{macrocode}
\newif\if@docolactionstar
% \end{macrocode}
-%
+%
% Because of extra data writing to the aux file the aux file will
% now contain something like the following after the document is
% processed the first time:
@@ -4446,5 +4480,3 @@
% \Finale
%
\endinput
-
-
diff --git a/macros/latex/required/tools/multicol.ins b/macros/latex/required/tools/multicol.ins
index 9fd6cbe6e9..f872b83cde 100644
--- a/macros/latex/required/tools/multicol.ins
+++ b/macros/latex/required/tools/multicol.ins
@@ -3,31 +3,31 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright (C) 1993-2019
+%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the Standard LaTeX `Tools Bundle'.
%% -------------------------------------------------------
-%%
+%%
%% It 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.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the `Tools Bundle' is
%% given in the file `manifest.txt'.
-%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -45,9 +45,9 @@ The source is maintained by the LaTeX Project team and bug
reports for it can be opened at https://latex-project.org/bugs/
(but please observe conditions on bug reports sent to that address!)
-Copyright (C) 1993-2019
+Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
--------------------------------------------------------------------------
@@ -57,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2005/12/01 or later.
This file may only be distributed together with a copy of the LaTeX
diff --git a/macros/latex/required/tools/multicol.pdf b/macros/latex/required/tools/multicol.pdf
index 8a0833f824..7ac6dec0ef 100644
--- a/macros/latex/required/tools/multicol.pdf
+++ b/macros/latex/required/tools/multicol.pdf
Binary files differ
diff --git a/macros/latex/required/tools/rawfonts.dtx b/macros/latex/required/tools/rawfonts.dtx
index 0fd7dd5006..9c5daa57a5 100644
--- a/macros/latex/required/tools/rawfonts.dtx
+++ b/macros/latex/required/tools/rawfonts.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
diff --git a/macros/latex/required/tools/rawfonts.pdf b/macros/latex/required/tools/rawfonts.pdf
index a9aebc3c1c..d431dcd213 100644
--- a/macros/latex/required/tools/rawfonts.pdf
+++ b/macros/latex/required/tools/rawfonts.pdf
Binary files differ
diff --git a/macros/latex/required/tools/shellesc.dtx b/macros/latex/required/tools/shellesc.dtx
index 9706c5aa03..3b96c3e9ee 100644
--- a/macros/latex/required/tools/shellesc.dtx
+++ b/macros/latex/required/tools/shellesc.dtx
@@ -1,6 +1,6 @@
% \iffalse
%% Source File: shellesc.dtx
-%% Copyright (C) 2015-2019
+%% Copyright (C) 2015-2020
%%
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
@@ -49,7 +49,7 @@
% \changes{v0.2a}{2016/06/07}{Improve use with plain TeX}
% \section{Introduction}
%
-%
+%
% For many years web2c based \TeX\ implementations have used the syntax
% of the \verb|\write| command to access system commands by using a
% special stream 18 (streams above 15 can not be allocated to files in
@@ -96,7 +96,7 @@
% non-immediate \verb|\write18| in a document being ported to current
% Lua\TeX, you will need to change to use the
% \verb|\DelayedShellEscape| command.
-%
+%
% \section{Implementation}
%
% \begin{macrocode}
@@ -153,7 +153,7 @@
%
% \begin{macro}{\ShellEscape}
% \changes{v1.0a}{2019/10/13}{Lua logging for gh/195}
-% Execute the supplied tokens as a system dependent command, assuming
+% Execute the supplied tokens as a system dependent command, assuming
% such execution is allowed.
% \begin{macrocode}
\ifx\lastsavedimageresourcepages\@undefined
@@ -171,7 +171,7 @@
% \changes{v0.1c}{2016/04/29}{Define \cs{DelayedShellEscape} not \cs{ShellEscape}(UF)}
% \changes{v1.0a}{2019/10/13}{Lua logging for gh/195}
% Execute the supplied tokens as a system dependent command, when this
-% node is shipped out with the completed page, assuming
+% node is shipped out with the completed page, assuming
% such execution is allowed.
% \begin{macrocode}
\ifx\lastsavedimageresourcepages\@undefined
diff --git a/macros/latex/required/tools/shellesc.pdf b/macros/latex/required/tools/shellesc.pdf
index dedff31177..a2c9b5ece8 100644
--- a/macros/latex/required/tools/shellesc.pdf
+++ b/macros/latex/required/tools/shellesc.pdf
Binary files differ
diff --git a/macros/latex/required/tools/showkeys.dtx b/macros/latex/required/tools/showkeys.dtx
index 6e2516856d..59eb699ae8 100644
--- a/macros/latex/required/tools/showkeys.dtx
+++ b/macros/latex/required/tools/showkeys.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
diff --git a/macros/latex/required/tools/showkeys.pdf b/macros/latex/required/tools/showkeys.pdf
index ea3589841c..12c5faab68 100644
--- a/macros/latex/required/tools/showkeys.pdf
+++ b/macros/latex/required/tools/showkeys.pdf
Binary files differ
diff --git a/macros/latex/required/tools/somedefs.dtx b/macros/latex/required/tools/somedefs.dtx
index f73a45b787..120ad98078 100644
--- a/macros/latex/required/tools/somedefs.dtx
+++ b/macros/latex/required/tools/somedefs.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
diff --git a/macros/latex/required/tools/somedefs.pdf b/macros/latex/required/tools/somedefs.pdf
index 9230f72a36..594989d675 100644
--- a/macros/latex/required/tools/somedefs.pdf
+++ b/macros/latex/required/tools/somedefs.pdf
Binary files differ
diff --git a/macros/latex/required/tools/tabularx.dtx b/macros/latex/required/tools/tabularx.dtx
index ff8f3cec9a..577730e665 100644
--- a/macros/latex/required/tools/tabularx.dtx
+++ b/macros/latex/required/tools/tabularx.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
@@ -31,7 +31,7 @@
%<driver> \ProvidesFile{tabularx.drv}
% \fi
% \ProvidesFile{tabularx.dtx}
- [2016/02/03 v2.11b `tabularx' package (DPC)]
+ [2020/01/15 v2.11c `tabularx' package (DPC)]
% \iffalse
%<*driver>
\documentclass{ltxdoc}
@@ -231,7 +231,7 @@
% Normally all {\ttfamily X} columns in a single table are set to the
% same width, however it is possible to make {\ttfamily tabularx} set
% them to different widths.
-% A preamble argument of
+% A preamble argument of
% "{>{\hsize=.5\hsize\linewidth=\hsize}X"\\
% " >{\hsize=1.5\hsize\linewidth=\hsize}X}"\\
% specifies two columns, the second will be three times as wide as the
@@ -341,8 +341,9 @@
% \end{macrocode}
% \changes{v2.02}{1995/03/20}
% {New local setting of \cs{TX@}}
-% \changes{v4.09}{1998/05/13}
+% \changes{v2.09}{1998/05/13}
% {Use \cs{setlength}, so that calc extensions apply. tools/2793}
+% \changes{v2.11c}{2020/01/15}{Delete duplicated . at end of message}
% Allow "\tabularx" "\endtabularx" (but not "\begin{tabularx}"
% "\end{tabularx}") to be used in "\newenvironment" definitions.
% \begin{macrocode}
@@ -351,11 +352,11 @@
% \end{macrocode}
% "\relax" added at v1.05 so that non-expandable length tokens, like
% "\textwidth" do not generate an extra space, and an overfull box.
-% "\relax" removed again at v4.09 in favour of "\setlength" so if you
+% "\relax" removed again at v2.09 in favour of "\setlength" so if you
% use the calc package you can use a width of "(\textwidth-12pt)/2".
% \begin{macrocode}
\setlength\TX@target{#1}%
- \TX@typeout{Target width: #1 = \the\TX@target.}%
+ \TX@typeout{Target width: #1 = \the\TX@target}%
\toks@{}\TX@get@body}
% \end{macrocode}
% \end{macro}
@@ -883,7 +884,7 @@
%
% Originally I followed Knuth, and had "\def\@tempa{##1}", however this
% did not allow "#" to appear in the argument. So in v1.04, I changed
-% this to to use a token register, and "\edef". This allows "#" appear,
+% this to use a token register, and "\edef". This allows "#" appear,
% but makes each one appear twice!, so later we loop through, replacing
% "##" by "#".
% \begin{macrocode}
diff --git a/macros/latex/required/tools/tabularx.ins b/macros/latex/required/tools/tabularx.ins
index 06308d7735..05effd3342 100644
--- a/macros/latex/required/tools/tabularx.ins
+++ b/macros/latex/required/tools/tabularx.ins
@@ -3,31 +3,31 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright (C) 1993-2019
+%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the Standard LaTeX `Tools Bundle'.
%% -------------------------------------------------------
-%%
+%%
%% It 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.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the `Tools Bundle' is
%% given in the file `manifest.txt'.
-%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -45,9 +45,9 @@ The source is maintained by the LaTeX Project team and bug
reports for it can be opened at https://latex-project.org/bugs/
(but please observe conditions on bug reports sent to that address!)
-Copyright (C) 1993-2019
+Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
--------------------------------------------------------------------------
@@ -57,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2005/12/01 or later.
This file may only be distributed together with a copy of the LaTeX
diff --git a/macros/latex/required/tools/tabularx.pdf b/macros/latex/required/tools/tabularx.pdf
index efb1b9ffa3..c1a4e54b0b 100644
--- a/macros/latex/required/tools/tabularx.pdf
+++ b/macros/latex/required/tools/tabularx.pdf
Binary files differ
diff --git a/macros/latex/required/tools/theorem.dtx b/macros/latex/required/tools/theorem.dtx
index 6f745d016e..0df7dbb764 100644
--- a/macros/latex/required/tools/theorem.dtx
+++ b/macros/latex/required/tools/theorem.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
diff --git a/macros/latex/required/tools/theorem.pdf b/macros/latex/required/tools/theorem.pdf
index 5e411cf879..dea392de68 100644
--- a/macros/latex/required/tools/theorem.pdf
+++ b/macros/latex/required/tools/theorem.pdf
Binary files differ
diff --git a/macros/latex/required/tools/tools-overview.pdf b/macros/latex/required/tools/tools-overview.pdf
index 745679a77b..7bf771f6c3 100644
--- a/macros/latex/required/tools/tools-overview.pdf
+++ b/macros/latex/required/tools/tools-overview.pdf
Binary files differ
diff --git a/macros/latex/required/tools/tools-overview.tex b/macros/latex/required/tools/tools-overview.tex
index 6a00580302..a0b3285db9 100644
--- a/macros/latex/required/tools/tools-overview.tex
+++ b/macros/latex/required/tools/tools-overview.tex
@@ -1,7 +1,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{tools-overview.tex}[2015/03/31 v1.0 Tools overview]
-% Copyright (C) 2006-2019
+% Copyright (C) 2006-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
diff --git a/macros/latex/required/tools/tools.ins b/macros/latex/required/tools/tools.ins
index 12625e8166..5e97871221 100644
--- a/macros/latex/required/tools/tools.ins
+++ b/macros/latex/required/tools/tools.ins
@@ -3,31 +3,31 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright (C) 1993-2019
+%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the Standard LaTeX `Tools Bundle'.
%% -------------------------------------------------------
-%%
+%%
%% It 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.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the `Tools Bundle' is
%% given in the file `manifest.txt'.
-%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -49,9 +49,9 @@ reports for it can be opened at https://latex-project.org/bugs/
(but please observe conditions on bug reports sent to that address!)
-Copyright (C) 1993-2019
+Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
--------------------------------------------------------------------------
@@ -61,7 +61,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2005/12/01 or later.
This file may only be distributed together with a copy of the LaTeX
@@ -166,7 +166,7 @@ given in the file `manifest.txt'.
\SimplePackage{layout}
-% Infix Arithmetic
+% Infix Arithmetic
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\SimplePackage{calc}
diff --git a/macros/latex/required/tools/trace.dtx b/macros/latex/required/tools/trace.dtx
index e808fdd431..4a08f569bb 100644
--- a/macros/latex/required/tools/trace.dtx
+++ b/macros/latex/required/tools/trace.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
@@ -493,7 +493,7 @@
% turns on tracing of assignments and tracing of
% grouping.\footnote{These are my personal preference settings;
% \eTeX{} does in fact offer some more tracing switches and perhaps
-% one or or more of them should be added here as well.}
+% one or more of them should be added here as well.}
% To keep tracing at a minimum |\tracingassigns| should be turned
% on last (in fact like before we disassemble |\tracingall|
% and reorder it partially).
@@ -508,7 +508,7 @@
% \end{macrocode}
% We only change |\tracingoutput| if it hasn't already been enabled by
% |\showoutput|. If that's not the case, we set it to 2 so that we
-% can distingush the two cases.
+% can distingush the two cases.
% \changes{v1.1e}{2018/10/13}{Only reset \cs{tracingoutput} if not
% set by \cs{showoutput} earlier}
% \begin{macrocode}
@@ -519,7 +519,7 @@
\showboxdepth\maxdimen
\fi
% \end{macrocode}
-%
+%
% \begin{macrocode}
\errorstopmode
\tracingmacros\tw@
@@ -563,7 +563,7 @@
\showboxdepth\m@ne
\fi
% \end{macrocode}
-%
+%
% \begin{macrocode}
\tracingstats\@ne
\tracingparagraphs\z@
diff --git a/macros/latex/required/tools/trace.pdf b/macros/latex/required/tools/trace.pdf
index 34be8f8afe..a989f84d2b 100644
--- a/macros/latex/required/tools/trace.pdf
+++ b/macros/latex/required/tools/trace.pdf
Binary files differ
diff --git a/macros/latex/required/tools/varioref-2016-02-16.sty b/macros/latex/required/tools/varioref-2016-02-16.sty
index 78aa06db6b..054157117e 100644
--- a/macros/latex/required/tools/varioref-2016-02-16.sty
+++ b/macros/latex/required/tools/varioref-2016-02-16.sty
@@ -5,20 +5,20 @@
%% The original source files were:
%%
%% varioref.dtx (with options: `package')
-%%
+%%
%% This is a generated file.
-%%
+%%
%% The source is maintained by the LaTeX Project team and bug
%% reports for it can be opened at https://latex-project.org/bugs/
%% (but please observe conditions on bug reports sent to that address!)
-%%
+%%
%% Copyright 1993-2017
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
-%%
+%%
%% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
%% --------------------------------------------------------------------------
-%%
+%%
%% It 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.
@@ -26,14 +26,14 @@
%% https://www.latex-project.org/lppl.txt
%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
+%%
%% This file may only be distributed together with a copy of the LaTeX
%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
%% without such generated files.
-%%
+%%
%% The list of all files belonging to the LaTeX `Tools Bundle' is
%% given in the file `manifest.txt'.
-%%
+%%
%% Package varioref to use with LaTeX2e
%% Copyright (C) 1992-2016 Frank Mittelbach, all rights reserved.
%%
diff --git a/macros/latex/required/tools/varioref.dtx b/macros/latex/required/tools/varioref.dtx
index b8392c76f2..077103eb97 100644
--- a/macros/latex/required/tools/varioref.dtx
+++ b/macros/latex/required/tools/varioref.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
@@ -22,7 +22,7 @@
% \fi
% \iffalse
%% Package varioref to use with LaTeX2e
-%% Copyright (C) 1992-2019 Frank Mittelbach, all rights reserved.
+%% Copyright (C) 1992-2020 Frank Mittelbach, all rights reserved.
%%
%% For additions or updates to the language options please contact
%% the author at
@@ -40,7 +40,7 @@
%<package>\DeclareCurrentRelease{}{2019-10-01}
%<package>
%<package>\ProvidesPackage{varioref}
-%<package> [2019/11/05 v1.6c package for extended references (FMi)]
+%<package> [2020/01/23 v1.6c package for extended references (FMi)]
% \fi
%
%%
@@ -207,7 +207,7 @@
% to achieve the desired effect.
%
%
-% \DescribeMacro\vrefrange
+% \DescribeMacro\vrefrange
% This command is similar to |\vref| but it
% takes two mandatory arguments denoting a range to refer to (e.g., a
% sequences of figures or a sequence of equations, etc.). So if
@@ -497,7 +497,7 @@
% As mentioned above the package supports all standard options offered
% by the Babel system to customize the strings produced, it may also
% have a few not supported by babel, for a full list look
-% in section\vref{sec:impoptions}. In addition it offers the option
+% in section~\vref{sec:impoptions}. In addition it offers the option
% \texttt{draft} to turn error messages into warnings during
% development. The default \texttt{final} produces error message when
% a generated string falls onto a page boundary (see next section).
@@ -531,7 +531,7 @@
% \begin{quote}
% table 5 on the current \meta{page break} page
% \end{quote}
-% would would result in an error, which needs to be resolved by the
+% would result in an error, which needs to be resolved by the
% user by replacing the |\vref| command with an ordinary |\ref| just
% before the final run. This is not
% completely satisfactory but in such case no solution really is.
@@ -731,7 +731,7 @@
% easily, so you will see missing glyphs below. To see the real
% letters you have to look at the source or package file.
% \changes{v1.6b}{2019/09/08}{Option arabic added}
-% \begin{allowtofu}
+% \begin{allowtofu}
% \begin{macrocode}
\DeclareOption{arabic}
{\vref@addto\extrasarabic{%
@@ -745,7 +745,7 @@
\def\reftextlabelrange#1#2{\ref{#1} حتى~\ref{#2}}%
}}
% \end{macrocode}
-% \end{allowtofu}
+% \end{allowtofu}
% \changes{v1.2a}{1998/11/27}{Added austrian defaults (identical to german)}
% The austrian defaults are the same as the german ones.
% \begin{macrocode}
@@ -1803,7 +1803,7 @@
% user explicitly requested an empty text string using the optional
% argument we cancel any preceding space since in this case we are
% otherwise likely to end up with spaces one before and one after
-% |\vpageref|.
+% |\vpageref|.
% \changes{v1.2f}{2000/07/07}{Don't output space if optional argument
% empty (pr/3230)}
% \begin{macrocode}
@@ -1819,7 +1819,7 @@
% a space.
% \begin{macrocode}
\def\@tempc{#2}%
- \ifx\@tempc\@empty \else
+ \ifx\@tempc\@empty \else
#2\vref@space
\fi
% \end{macrocode}
@@ -1972,7 +1972,7 @@
% The \pkg{hyperref} package can then change the meaning of this
% command to suppress a hyperlink.
%
-% It is is also a good way to check if we are running with a new
+% It is also a good way to check if we are running with a new
% \pkg{varioref} by testing
%\begin{verbatim}
% \ifdefined\vp@gerefstar
@@ -2079,7 +2079,7 @@
% \end{macrocode}
% If option \texttt{space} is used then we remove a preceding space
% and add our own unbreakable space instead. Otherwise we don't do
-% any space-handling.
+% any space-handling.
% \begin{macrocode}
\if@vrefhandlespace
\unskip \nobreakspace
@@ -2100,7 +2100,7 @@
% After having handled (or not handled) the spacing we call
% |\vref@star| to scan the optional arguments and do the rest.
% If that command has been altered by \pkg{hyperref} then the
-% current one needs altering too and does the argument scanning explicitly.
+% current one needs altering too and does the argument scanning explicitly.
% \begin{macrocode}
\vref@star % in hyperref this needs to be explicit
}
@@ -2305,7 +2305,7 @@
{\Vr@f}}
% \end{macrocode}
% \end{macro}
-%
+%
% \begin{macro}{\Vref@star}
% \changes{v1.6a}{2019/08/25}{Command added to support hyperref better}
% \begin{macrocode}
@@ -2314,7 +2314,7 @@
\vpageref[#1]{#2}}
% \end{macrocode}
% \end{macro}
-%
+%
% \begin{macro}{\Vr@f}
% \changes{v1.4a}{2002/02/24}{Macro added}
% \changes{v1.4x}{2010/08/04}{Correct spacing -- same mistake as in \cs{vref}
@@ -2332,7 +2332,7 @@
% \begin{macro}{\vpagerefcompare}
-%
+%
% \changes{v1.6a}{2019/08/25}{Macro added}
% \begin{macrocode}
\DeclareRobustCommand\vpagerefcompare[2]{% label1, label2, TRUE, FALSE
@@ -2343,7 +2343,7 @@
\else
\expandafter\@secondoftwo
\fi
-}
+}
% \end{macrocode}
% \end{macro}
%
@@ -2385,7 +2385,7 @@
% True if the two pages have arabic page numbers are at most off by
% one so that |\vpageref| would produce a special string.
%
-% This is n some sense a general version of |\vpagerefnearby| for
+% This is in some sense a general version of |\vpagerefnearby| for
% use in more complex situations. I.e., if you try to determine if
% a larger set of references would be close to the current page and
% you use each time |\vpagerefnearby| then you generate a lot of
@@ -2449,4 +2449,3 @@
% \Finale
%
\endinput
-
diff --git a/macros/latex/required/tools/varioref.ins b/macros/latex/required/tools/varioref.ins
index e436202e4d..951eedad89 100644
--- a/macros/latex/required/tools/varioref.ins
+++ b/macros/latex/required/tools/varioref.ins
@@ -3,31 +3,31 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright (C) 1993-2019
+%% Copyright (C) 1993-2020
%% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file.
-%%
+%% in this file.
+%%
%% This file is part of the Standard LaTeX `Tools Bundle'.
%% -------------------------------------------------------
-%%
+%%
%% It 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.
%% The latest version of this license is in
%% https://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2008 or later.
-%%
+%%
%% As this file contains legal notices, it is NOT PERMITTED to modify
%% this file in any way that the legal information placed into
%% generated files is changed (i.e., the files generated when the
%% original file is executed). This restriction does not apply if
%% (parts of) the content is reused in a different WORK producing its
%% own generated files.
-%%
+%%
%% The list of all files belonging to the `Tools Bundle' is
%% given in the file `manifest.txt'.
-%%
+%%
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -45,9 +45,9 @@ The source is maintained by the LaTeX Project team and bug
reports for it can be opened at https://latex-project.org/bugs/
(but please observe conditions on bug reports sent to that address!)
-Copyright (C) 1993-2019
+Copyright (C) 1993-2020
The LaTeX3 Project and any individual authors listed elsewhere
-in this file.
+in this file.
This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
--------------------------------------------------------------------------
@@ -57,7 +57,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
version 2005/12/01 or later.
This file may only be distributed together with a copy of the LaTeX
diff --git a/macros/latex/required/tools/varioref.pdf b/macros/latex/required/tools/varioref.pdf
index ccc28c65d8..2386f287ec 100644
--- a/macros/latex/required/tools/varioref.pdf
+++ b/macros/latex/required/tools/varioref.pdf
Binary files differ
diff --git a/macros/latex/required/tools/verbatim.dtx b/macros/latex/required/tools/verbatim.dtx
index b89bab7759..121e2d4b39 100644
--- a/macros/latex/required/tools/verbatim.dtx
+++ b/macros/latex/required/tools/verbatim.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
@@ -14,7 +14,7 @@
% The latest version of this license is in
% https://www.latex-project.org/lppl.txt
% and version 1.3c or later is part of all distributions of LaTeX
-% version 2005/12/01 or later.
+% version 2008 or later.
%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
@@ -828,7 +828,7 @@
% \begin{macrocode}
\@namedef{verbatim*}{\begingroup\@verbatim
% \end{macrocode}
-%
+%
% \changes{v1.5r}{2019/11/10}{Support kernel \cs{verbvisiblespace} (gh/212)}
% \begin{macrocode}
\@setupverbvisiblespace\@vobeyspaces
@@ -1488,7 +1488,7 @@
\else
% \end{macrocode}
% At this point we pass the name of the file to |\@addtofilelist|
-% so that its appears appears in the output of a |\listfiles|
+% so that its appears in the output of a |\listfiles|
% command.
% \changes{v1.5j}{1996/09/25}{Add \cs{@addtofilelist} and
% \cs{ProvidesFile} so that the name of the file
diff --git a/macros/latex/required/tools/verbatim.pdf b/macros/latex/required/tools/verbatim.pdf
index b88fd209bd..73e90c27ce 100644
--- a/macros/latex/required/tools/verbatim.pdf
+++ b/macros/latex/required/tools/verbatim.pdf
Binary files differ
diff --git a/macros/latex/required/tools/xr.dtx b/macros/latex/required/tools/xr.dtx
index 97c4c68084..a6b2ffd819 100644
--- a/macros/latex/required/tools/xr.dtx
+++ b/macros/latex/required/tools/xr.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
@@ -86,7 +86,7 @@
%
% As first suggested in Enrico Gregorio's |xcite| package, the current version
% also allows |\cite| to reference |\bibitem| in the external document.
-% For compatibility with |xcite|, |\externalcitedocument| is made available
+% For compatibility with |xcite|, |\externalcitedocument| is made available
% as an alias for |\externaldocument|
%
% \StopEventually{}
@@ -183,4 +183,3 @@
%
% \Finale
%
-
diff --git a/macros/latex/required/tools/xr.pdf b/macros/latex/required/tools/xr.pdf
index f1917ed252..0253f595e8 100644
--- a/macros/latex/required/tools/xr.pdf
+++ b/macros/latex/required/tools/xr.pdf
Binary files differ
diff --git a/macros/latex/required/tools/xspace.dtx b/macros/latex/required/tools/xspace.dtx
index 0745caf507..ebe8d0f947 100644
--- a/macros/latex/required/tools/xspace.dtx
+++ b/macros/latex/required/tools/xspace.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
diff --git a/macros/latex/required/tools/xspace.pdf b/macros/latex/required/tools/xspace.pdf
index a9bfadd378..c38797ee4e 100644
--- a/macros/latex/required/tools/xspace.pdf
+++ b/macros/latex/required/tools/xspace.pdf
Binary files differ