summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/tools
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-04-06 21:33:45 +0000
committerKarl Berry <karl@freefriends.org>2018-04-06 21:33:45 +0000
commit588be4d1b7e254f46ac3c678ef1b3f38833f6491 (patch)
treec73b58d23db18c19737ff12c67e208fd7a89c4c6 /Master/texmf-dist/source/latex/tools
parentc436d9d03043bac0aac83254a8f1a2a45e4aaafd (diff)
latex2e (6apr18)
git-svn-id: svn://tug.org/texlive/trunk@47330 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/tools')
-rw-r--r--Master/texmf-dist/source/latex/tools/afterpage.dtx2
-rw-r--r--Master/texmf-dist/source/latex/tools/afterpage.ins19
-rw-r--r--Master/texmf-dist/source/latex/tools/array.dtx223
-rw-r--r--Master/texmf-dist/source/latex/tools/bm.dtx2
-rw-r--r--Master/texmf-dist/source/latex/tools/bm.ins19
-rw-r--r--Master/texmf-dist/source/latex/tools/calc.dtx8
-rw-r--r--Master/texmf-dist/source/latex/tools/dcolumn.dtx2
-rw-r--r--Master/texmf-dist/source/latex/tools/delarray.dtx2
-rw-r--r--Master/texmf-dist/source/latex/tools/enumerate.dtx2
-rw-r--r--Master/texmf-dist/source/latex/tools/fileerr.dtx2
-rw-r--r--Master/texmf-dist/source/latex/tools/fontsmpl.dtx2
-rw-r--r--Master/texmf-dist/source/latex/tools/ftnright.dtx2
-rw-r--r--Master/texmf-dist/source/latex/tools/hhline.dtx2
-rw-r--r--Master/texmf-dist/source/latex/tools/indentfirst.dtx2
-rw-r--r--Master/texmf-dist/source/latex/tools/layout.dtx2
-rw-r--r--Master/texmf-dist/source/latex/tools/longtable.dtx2
-rw-r--r--Master/texmf-dist/source/latex/tools/longtable.ins19
-rw-r--r--Master/texmf-dist/source/latex/tools/multicol.dtx79
-rw-r--r--Master/texmf-dist/source/latex/tools/multicol.ins19
-rw-r--r--Master/texmf-dist/source/latex/tools/rawfonts.dtx2
-rw-r--r--Master/texmf-dist/source/latex/tools/showkeys.dtx2
-rw-r--r--Master/texmf-dist/source/latex/tools/somedefs.dtx2
-rw-r--r--Master/texmf-dist/source/latex/tools/tabularx.dtx10
-rw-r--r--Master/texmf-dist/source/latex/tools/tabularx.ins19
-rw-r--r--Master/texmf-dist/source/latex/tools/theorem.dtx2
-rw-r--r--Master/texmf-dist/source/latex/tools/tools.ins19
-rw-r--r--Master/texmf-dist/source/latex/tools/trace.dtx2
-rw-r--r--Master/texmf-dist/source/latex/tools/varioref.dtx2
-rw-r--r--Master/texmf-dist/source/latex/tools/varioref.ins19
-rw-r--r--Master/texmf-dist/source/latex/tools/verbatim.dtx2
-rw-r--r--Master/texmf-dist/source/latex/tools/xr.dtx2
-rw-r--r--Master/texmf-dist/source/latex/tools/xspace.dtx2
32 files changed, 383 insertions, 112 deletions
diff --git a/Master/texmf-dist/source/latex/tools/afterpage.dtx b/Master/texmf-dist/source/latex/tools/afterpage.dtx
index 9619ca092c4..01817368c0f 100644
--- a/Master/texmf-dist/source/latex/tools/afterpage.dtx
+++ b/Master/texmf-dist/source/latex/tools/afterpage.dtx
@@ -12,7 +12,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
-% http://www.latex-project.org/lppl.txt
+% 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.
%
diff --git a/Master/texmf-dist/source/latex/tools/afterpage.ins b/Master/texmf-dist/source/latex/tools/afterpage.ins
index 0798458ee59..2f704e10d73 100644
--- a/Master/texmf-dist/source/latex/tools/afterpage.ins
+++ b/Master/texmf-dist/source/latex/tools/afterpage.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1993-2016
+%% Copyright 1993-2017
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -14,13 +14,16 @@
%% 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
-%% http://www.latex-project.org/lppl.txt
+%% 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.
%%
-%% In particular, NO PERMISSION is granted to modify the contents of this
-%% file since it contains the legal notices that are placed in the files
-%% it generates.
+%% 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'.
@@ -39,10 +42,10 @@
This is a generated file.
The source is maintained by the LaTeX Project team and bug
-reports for it can be opened at http://latex-project.org/bugs.html
+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-2016
+Copyright 1993-2017
The LaTeX3 Project and any individual authors listed elsewhere
in this file.
@@ -53,7 +56,7 @@ 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
- http://www.latex-project.org/lppl.txt
+ 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.
diff --git a/Master/texmf-dist/source/latex/tools/array.dtx b/Master/texmf-dist/source/latex/tools/array.dtx
index 2a648888065..1502265d962 100644
--- a/Master/texmf-dist/source/latex/tools/array.dtx
+++ b/Master/texmf-dist/source/latex/tools/array.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993-2016
+% Copyright 1993-2017
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
@@ -12,7 +12,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
-% http://www.latex-project.org/lppl.txt
+% 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.
%
@@ -26,7 +26,7 @@
%% Copyright (C) 1989-1998 Frank Mittelbach, all rights reserved.
%<+package>\NeedsTeXFormat{LaTeX2e}[1995/06/01]
%<+package>\ProvidesPackage{array}
-%<+package> [2016/10/06 v2.4d Tabular extension package (FMi)]
+%<+package> [2017/11/07 v2.4f Tabular extension package (FMi)]
%
% \fi
%
@@ -225,7 +225,7 @@
% For example, we used =\setlength{\extrarowheight}{1pt}=
% in table~\ref{tab:opt}.
%
-% \begin{table}[t]
+% \begin{table}[!t]
% \begin{center}
% \setlength{\extrarowheight}{1pt}
% \begin{tabular}{|>{\tt}c|m{9cm}|}
@@ -271,6 +271,23 @@
% vertical line, so this option doesn't
% suppress the normally inserted space between
% columns in contrast to =@{...}=.\\
+% \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
+% either \texttt{l}, \texttt{c} or
+% \texttt{r}. Works essentially like
+% =\makebox[=width=][=align=]{=cell=}= so
+% silently overprints if the cell content is
+% wider than the specified width. If that is
+% not desired use \texttt{W} instead.\\
+% \hline
+% W\{align\}\{width\} & Like \texttt{w} but spits out an overfull
+% box warning (and an overfullrule marker in
+% draft mode) when the cell content is too wide
+% to fit. This also means that the alignment is
+% different if there is too much material,
+% because it then always protrudes to the right!\\
% \hline
% \end{tabular}
% \end{center}
@@ -324,6 +341,13 @@
% columns which is enlarged by one centimeter, while
% =c@{\hspace{1cm}}c= gives you exactly one centimeter
% space between two columns.
+%
+% \item
+% A declaration like =w{l}{3cm}= (or even shorter =wl{3cm}=)
+% works like an =l= column except that the width will always be
+% =3cm= regardless of the cell content. Same with =w{c}= or
+% =w{r}=. This means that it is easy to set up tables in which all
+% columns have predefined widths.
% \end{itemize}
%
% \subsection{Defining new column specifiers}
@@ -594,6 +618,16 @@
% note below).
% \end{itemize}
%
+% Prior to version 2.4f the space added by the optional argument to "\\"
+% was added inside an m-cell if the last column was of type
+% \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.
+%
%
% \subsection{Bugs and Features}
%
@@ -1267,6 +1301,16 @@
% \begin{macrocode}
\let\@sharp\relax \let\@startpbox\relax \let\@endpbox\relax
% \end{macrocode}
+% Two more are needed to deal with the code that handles struts
+% for extra space after a row from =\\[<space>]=
+% (=\do@row@strut=) and code that manages m-cells depending on
+% their heights (=\align@mcell=).
+% \changes{v2.4e}{2016/10/07}{Fixing SX68732}
+% \changes{v2.4f}{2017/11/04}{Managing m-cells without \cs{vcenter}}
+% \begin{macrocode}
+ \let\do@row@strut\relax
+ \let\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
% its result in the macro =\@tempa=.
@@ -1510,8 +1554,10 @@
% \end{macrocode}
% We end this case with =\d@llarend= and =\hfil= where =\d@llarend=
% again is either =$= or =\endgroup=.
+% The strut to enforce a regular row height is placed between the two.
+% \changes{v2.4e}{2016/10/07}{Fixing SX68732}
% \begin{macrocode}
- \d@llarend \hfil \or
+ \d@llarend \do@row@strut \hfil \or
% \end{macrocode}
% The templates for \texttt{l} and \texttt{r} (i.e.\ =\@chnum= $1$
% or $2$) are generated the same way. Since one =\hfil= is
@@ -1526,16 +1572,19 @@
% internal/2122}
% \changes{v2.3i}{1996/06/14}
% {Change both \cs{kern}\cs{z@} to \cs{hskip}1sp for latex/2160}
+% \changes{v2.4e}{2016/10/07}{Fixing SX68732}
% \begin{macrocode}
- \hskip1sp\d@llarbegin \insert@column \d@llarend \hfil \or
- \hfil\hskip1sp\d@llarbegin \insert@column \d@llarend \or
+ \hskip1sp\d@llarbegin \insert@column \d@llarend \do@row@strut \hfil \or
+ \hfil\hskip1sp\d@llarbegin \insert@column \d@llarend \do@row@strut \or
% \end{macrocode}
% The templates for \texttt{p}, \texttt{m} and \texttt{b} mainly
% consist of a \textsf{box}. In case of \texttt{m} it is generated
% by =\vcenter=. This command is allowed only in math
% mode. Therefore we start with a~=$=.
+% \changes{v2.4f}{2017/11/04}{Managing m-cells without \cs{vcenter}}
% \begin{macrocode}
- $\vcenter
+% $\vcenter
+ \setbox\mcell@box\vbox
% \end{macrocode}
% The part of the templates which is the same in all three cases
% (\texttt{p}, \texttt{m} and \texttt{b})
@@ -1545,15 +1594,22 @@
% \textsf{token} (i.e.\ =\@nextchar=).
% Between these two macros we find the well known
% =\insert@column=.
+% The strut is places after the box
+% \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 $\or
+ \@startpbox{\@nextchar}\insert@column \@endpbox
+ \align@mcell
+%$
+ \do@row@strut \or
% \end{macrocode}
% The templates for \texttt{p} and \texttt{b} are generated in the
% same way though we do not need the =$= characters because we use
% =\vtop= or =\vbox=.
+% \changes{v2.4e}{2016/10/07}{Fixing SX68732}
% \begin{macrocode}
- \vtop \@startpbox{\@nextchar}\insert@column \@endpbox \or
- \vbox \@startpbox{\@nextchar}\insert@column \@endpbox
+ \vtop \@startpbox{\@nextchar}\insert@column \@endpbox\do@row@strut \or
+ \vbox \@startpbox{\@nextchar}\insert@column \@endpbox\do@row@strut
% \end{macrocode}
% Other values for =\@chnum= are impossible. Therefore we
% end the arguments to =\@addtopreamble= and =\ifcase=.
@@ -1564,6 +1620,65 @@
% \end{macrocode}
% \end{macro}
%
+
+%
+% \begin{macro}{\mcell@box}
+% When dealing with m-cells we need a box to measure the cell
+% height.
+% \changes{v2.4f}{2017/11/04}{Managing m-cells without \cs{vcenter}}
+% \begin{macrocode}
+\newbox\mcell@box
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}{\align@mcell}
+% M-cells are supposed to be vertically centered within the table
+% row. In the original implementation that was done using
+% =\vcenter= but the issue with that approach is that it centers
+% the material based on the math-axis. In most situations that
+% comes out quit right, but if, for example, an m-cell has only a
+% single line worth of material inside it will be positioned
+% differently to a =l=, =c= or =r= cell or to a =p= or =b= cell
+% with the same content.
+%
+% For that reason the new implementation does the centering
+% manually: First we check the height of the cell and if that is
+% less or equal to =\ht\@arstrutbox= we assume that this is a
+% single line cell. In that case we don't do any vertical maneuvre
+% and simply output the box, i.e., make it behave like a single
+% line p-cell.
+% \changes{v2.4f}{2017/11/04}{Managing m-cells without \cs{vcenter}}
+% \begin{macrocode}
+\def\align@mcell{%
+ \ifdim \ht\mcell@box > \ht\@arstrutbox
+% \end{macrocode}
+% Otherwise we realign vertically by lowering the box. The question
+% is how much do we need to move down? If there is any
+% =\arraystretch= in place then the first line will have some
+% unusual height and we don't want to consider that when finding
+% the middle point. So we substract from the cell height the height
+% of that strut. But of course we want to include the normal height
+% of the first line (which would be something like =\ht\strutbox=)
+% so we need to add that. On the other hand, when centering around
+% the mid-point of the cell, we also need to account for the depth
+% of the last line (which is nominally something like
+% =\dp\strutbox=). Both together equals =\baselineskip= so that is
+% what we add and then lower the cell by half of the resulting value.
+% \begin{macrocode}
+ \begingroup
+ \dimen@\ht\mcell@box
+ \advance\dimen@-\ht\@arstrutbox
+ \advance\dimen@\baselineskip
+ \lower.5\dimen@\box\mcell@box
+ \endgroup
+ \else % assume one line and align at baseline
+ \box\mcell@box
+ \fi}
+% \end{macrocode}
+% \end{macro}
+%
+
%
% \begin{macro}{\@classix}
% In case of class $9$ (\texttt{>}--\textsf{token}) we first check
@@ -2038,10 +2153,15 @@
% \begin{macro}{\@xargarraycr}
% \begin{macro}{\@yargarraycr}
% The following macros were already explained above.
+% \changes{v2.4e}{2016/10/07}{Fixing SX68732}
+% \begin{macrocode}
+\def\@xargarraycr#1{\unskip\gdef\do@row@strut
+ {\@tempdima #1\advance\@tempdima \dp\@arstrutbox
+ \vrule \@depth\@tempdima \@width\z@\global\let\do@row@strut\relax}\cr}
+\let\do@row@strut\relax
+% \end{macrocode}
+%
% \begin{macrocode}
-\def\@xargarraycr#1{\unskip
- \@tempdima #1\advance\@tempdima \dp\@arstrutbox
- \vrule \@depth\@tempdima \@width\z@ \cr}
\def\@yargarraycr#1{\cr\noalign{\vskip #1}}
% \end{macrocode}
% \end{macro}
@@ -2541,9 +2661,13 @@
% The main modification to "\@mkpream" is to replace the call to
% "\@xexpast" (which expanded $*$-forms) by a loop which expands
% all "\newcolumntype" specifiers.
+% \changes{v2.4e}{2016/10/07}{Fixing SX68732}
+% \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\@startpbox\relax \let\@endpbox\relax
+ \let\do@row@strut\relax
+ \let\align@mcell\relax
% \end{macrocode}
% Now we remove possible $*$-forms and user-defined column
% specifiers in the user preamble by repeatedly executing the list
@@ -2807,6 +2931,77 @@
%</package>
% \end{macrocode}
% \end{macro}
+
+% \subsection{Implementing column types \texttt{w} and \texttt{W}}
+%
+% In TugBoat 38/2 an extension was presented that implemented two
+% aditional column types \texttt{w} and \texttt{W}. These have now
+% been added to the package itself.
+%
+%
+% \begin{macro}{\ar@cellbox}
+% For \texttt{w} and \texttt{W} column types we need a box to
+% temporarily hold the cell content.
+% \changes{v2.4f}{2017/11/07}{Macro added}
+% \begin{macrocode}
+\newsavebox\ar@cellbox
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}{\newcolumntype w}
+% The \texttt{w} column type has two arguments: the first holds the
+% alignment which is either "l", "c", or "r" and the second is the
+% nominal width of the column.
+% \changes{v2.4f}{2017/11/07}{Column type added}
+% \begin{macrocode}
+\newcolumntype{w}[2]{%
+% \end{macrocode}
+% Before the cell content we start an "lrbox"-environment to
+% collect the cell material into the previously allocated box
+% "\ar@cellbox".
+% \begin{macrocode}
+ >{\begin{lrbox}\ar@cellbox}%
+% \end{macrocode}
+% Then comes a specifier for the cell content. We use "c", but
+% that doesn't matter as in the end we will always put a box of a
+% specific width ("#2") into the cells of that column, so "l" or
+% "r" would give the same result. There is only a difference if
+% there are also very wide "\multicolumn" rows overwriting the
+% setting in which case "c" seems to be slightly better.
+% \begin{macrocode}
+ c%
+% \end{macrocode}
+% At the end of the cell we end the "lrbox" environment so that all
+% of the cell content is now in box "\ar@cellbox". As a final step we
+% put that box into a "\makebox" using the optional arguments of
+% that command to achieve the correct width and the desired
+% alignment within that width.
+% \begin{macrocode}
+ <{\end{lrbox}%
+ \makebox[#2][#1]{\usebox\ar@cellbox}}}
+% \end{macrocode}
+% \end{macro}
+
+%
+%
+% \begin{macro}{\newcolumntype W}
+% The \texttt{W} is similar but in this case we want a warning if
+% the cell content is too wide.
+% \changes{v2.4f}{2017/11/07}{Column type added}
+% \begin{macrocode}
+\newcolumntype{W}[2]
+ {>{\begin{lrbox}\ar@cellbox}%
+ c%
+ <{\end{lrbox}%
+ \let\hss\hfil
+ \makebox[#2][#1]{\unhbox\ar@cellbox}}}
+% \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.
+% \end{macro}
+%
%
% \PrintIndex
% \PrintChanges
diff --git a/Master/texmf-dist/source/latex/tools/bm.dtx b/Master/texmf-dist/source/latex/tools/bm.dtx
index 11b159cbde2..b8be6530eb7 100644
--- a/Master/texmf-dist/source/latex/tools/bm.dtx
+++ b/Master/texmf-dist/source/latex/tools/bm.dtx
@@ -12,7 +12,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
-% http://www.latex-project.org/lppl.txt
+% 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.
%
diff --git a/Master/texmf-dist/source/latex/tools/bm.ins b/Master/texmf-dist/source/latex/tools/bm.ins
index 5059195ad79..8e6b2b10750 100644
--- a/Master/texmf-dist/source/latex/tools/bm.ins
+++ b/Master/texmf-dist/source/latex/tools/bm.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1993-2016
+%% Copyright 1993-2017
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -14,13 +14,16 @@
%% 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
-%% http://www.latex-project.org/lppl.txt
+%% 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.
%%
-%% In particular, NO PERMISSION is granted to modify the contents of this
-%% file since it contains the legal notices that are placed in the files
-%% it generates.
+%% 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'.
@@ -39,10 +42,10 @@
This is a generated file.
The source is maintained by the LaTeX Project team and bug
-reports for it can be opened at http://latex-project.org/bugs.html
+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-2016
+Copyright 1993-2017
The LaTeX3 Project and any individual authors listed elsewhere
in this file.
@@ -53,7 +56,7 @@ 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
- http://www.latex-project.org/lppl.txt
+ 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.
diff --git a/Master/texmf-dist/source/latex/tools/calc.dtx b/Master/texmf-dist/source/latex/tools/calc.dtx
index 50f725e3f7e..ce6aeae034b 100644
--- a/Master/texmf-dist/source/latex/tools/calc.dtx
+++ b/Master/texmf-dist/source/latex/tools/calc.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993-2014
+% Copyright 1993-2017
%
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
@@ -12,7 +12,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
-% http://www.latex-project.org/lppl.txt
+% 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.
%
@@ -40,7 +40,7 @@
%<driver> \ProvidesFile{calc.drv}
% \fi
% \ProvidesFile{calc.dtx}
- [2014/10/28 v4.3 Infix arithmetic (KKT,FJ)]
+ [2017/05/25 v4.3 Infix arithmetic (KKT,FJ)]
%
% \iffalse
%<*driver>
@@ -248,7 +248,7 @@
% methods of accessing text dimensions. After
% |\settowidth{\txtwd}{Some text}| you can use:
%\begin{verbatim}
-% \setlength{\parskip}{0.68\textwd}
+% \setlength{\parskip}{0.68\txtwd}
%\end{verbatim}
% whereas using the more direct access to the width of the text
% requires the longer form for multiplication, thus:
diff --git a/Master/texmf-dist/source/latex/tools/dcolumn.dtx b/Master/texmf-dist/source/latex/tools/dcolumn.dtx
index 24de1dad05c..ea3dddc3430 100644
--- a/Master/texmf-dist/source/latex/tools/dcolumn.dtx
+++ b/Master/texmf-dist/source/latex/tools/dcolumn.dtx
@@ -12,7 +12,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
-% http://www.latex-project.org/lppl.txt
+% 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.
%
diff --git a/Master/texmf-dist/source/latex/tools/delarray.dtx b/Master/texmf-dist/source/latex/tools/delarray.dtx
index 525f8df4985..79d69e1b0c2 100644
--- a/Master/texmf-dist/source/latex/tools/delarray.dtx
+++ b/Master/texmf-dist/source/latex/tools/delarray.dtx
@@ -12,7 +12,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
-% http://www.latex-project.org/lppl.txt
+% 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.
%
diff --git a/Master/texmf-dist/source/latex/tools/enumerate.dtx b/Master/texmf-dist/source/latex/tools/enumerate.dtx
index 172e3711f9b..43976903e72 100644
--- a/Master/texmf-dist/source/latex/tools/enumerate.dtx
+++ b/Master/texmf-dist/source/latex/tools/enumerate.dtx
@@ -12,7 +12,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
-% http://www.latex-project.org/lppl.txt
+% 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.
%
diff --git a/Master/texmf-dist/source/latex/tools/fileerr.dtx b/Master/texmf-dist/source/latex/tools/fileerr.dtx
index b665750f91b..089149df972 100644
--- a/Master/texmf-dist/source/latex/tools/fileerr.dtx
+++ b/Master/texmf-dist/source/latex/tools/fileerr.dtx
@@ -12,7 +12,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
-% http://www.latex-project.org/lppl.txt
+% 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.
%
diff --git a/Master/texmf-dist/source/latex/tools/fontsmpl.dtx b/Master/texmf-dist/source/latex/tools/fontsmpl.dtx
index 815cb9476e9..5c8af97e7e7 100644
--- a/Master/texmf-dist/source/latex/tools/fontsmpl.dtx
+++ b/Master/texmf-dist/source/latex/tools/fontsmpl.dtx
@@ -12,7 +12,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
-% http://www.latex-project.org/lppl.txt
+% 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.
%
diff --git a/Master/texmf-dist/source/latex/tools/ftnright.dtx b/Master/texmf-dist/source/latex/tools/ftnright.dtx
index 0bcc0121e7a..31b30335220 100644
--- a/Master/texmf-dist/source/latex/tools/ftnright.dtx
+++ b/Master/texmf-dist/source/latex/tools/ftnright.dtx
@@ -12,7 +12,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
-% http://www.latex-project.org/lppl.txt
+% 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.
%
diff --git a/Master/texmf-dist/source/latex/tools/hhline.dtx b/Master/texmf-dist/source/latex/tools/hhline.dtx
index bcde38623f8..6d08658ef99 100644
--- a/Master/texmf-dist/source/latex/tools/hhline.dtx
+++ b/Master/texmf-dist/source/latex/tools/hhline.dtx
@@ -12,7 +12,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
-% http://www.latex-project.org/lppl.txt
+% 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.
%
diff --git a/Master/texmf-dist/source/latex/tools/indentfirst.dtx b/Master/texmf-dist/source/latex/tools/indentfirst.dtx
index a487867aab3..6d9a564e58d 100644
--- a/Master/texmf-dist/source/latex/tools/indentfirst.dtx
+++ b/Master/texmf-dist/source/latex/tools/indentfirst.dtx
@@ -12,7 +12,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
-% http://www.latex-project.org/lppl.txt
+% 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.
%
diff --git a/Master/texmf-dist/source/latex/tools/layout.dtx b/Master/texmf-dist/source/latex/tools/layout.dtx
index 99349491408..40f790aed99 100644
--- a/Master/texmf-dist/source/latex/tools/layout.dtx
+++ b/Master/texmf-dist/source/latex/tools/layout.dtx
@@ -12,7 +12,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
-% http://www.latex-project.org/lppl.txt
+% 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.
%
diff --git a/Master/texmf-dist/source/latex/tools/longtable.dtx b/Master/texmf-dist/source/latex/tools/longtable.dtx
index 74ab53d7231..cf7babe8f9c 100644
--- a/Master/texmf-dist/source/latex/tools/longtable.dtx
+++ b/Master/texmf-dist/source/latex/tools/longtable.dtx
@@ -12,7 +12,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
-% http://www.latex-project.org/lppl.txt
+% 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.
%
diff --git a/Master/texmf-dist/source/latex/tools/longtable.ins b/Master/texmf-dist/source/latex/tools/longtable.ins
index e37c0dda6d1..381c415b62b 100644
--- a/Master/texmf-dist/source/latex/tools/longtable.ins
+++ b/Master/texmf-dist/source/latex/tools/longtable.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1993-2016
+%% Copyright 1993-2017
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -14,13 +14,16 @@
%% 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
-%% http://www.latex-project.org/lppl.txt
+%% 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.
%%
-%% In particular, NO PERMISSION is granted to modify the contents of this
-%% file since it contains the legal notices that are placed in the files
-%% it generates.
+%% 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'.
@@ -39,10 +42,10 @@
This is a generated file.
The source is maintained by the LaTeX Project team and bug
-reports for it can be opened at http://latex-project.org/bugs.html
+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-2016
+Copyright 1993-2017
The LaTeX3 Project and any individual authors listed elsewhere
in this file.
@@ -53,7 +56,7 @@ 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
- http://www.latex-project.org/lppl.txt
+ 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.
diff --git a/Master/texmf-dist/source/latex/tools/multicol.dtx b/Master/texmf-dist/source/latex/tools/multicol.dtx
index 28523c3fef5..f1d8b777d38 100644
--- a/Master/texmf-dist/source/latex/tools/multicol.dtx
+++ b/Master/texmf-dist/source/latex/tools/multicol.dtx
@@ -8,7 +8,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
-% http://www.latex-project.org/lppl.txt
+% 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.
%
@@ -20,7 +20,7 @@
% \iffalse This is a METACOMMENT
%
%% Package `multicol' to use with LaTeX2e
-%% Copyright 1989-2016 Frank Mittelbach
+%% Copyright 1989-2018 Frank Mittelbach
%%
%% In addition to the terms of LPPL any distributed version
%% (unchanged or modified) of multicol has to keep the statement
@@ -86,12 +86,19 @@
%<*dtx>
\ProvidesFile{multicol.dtx}
%</dtx>
-%<package>\NeedsTeXFormat{LaTeX2e}[1997/12/01]
+%<package>\NeedsTeXFormat{LaTeX2e}[2018-04-01]
+%<package>
+%<package>\providecommand\DeclareRelease[3]{}
+%<package>\providecommand\DeclareCurrentRelease[2]{}
+%<package>
+%<package>\DeclareRelease{}{2017-04-11}{multicol-2017-04-11.sty}
+%<package>\DeclareCurrentRelease{}{2018-04-01}
+%<package>
%<package>\ProvidesPackage{multicol}
%<driver> \ProvidesFile{multicol.drv}
% \fi
% \ProvidesFile{multicol.dtx}
- [2017/04/11 v1.8q multicolumn formatting (FMi)]
+ [2018/04/01 v1.8r multicolumn formatting (FMi)]
%
%
%%
@@ -1667,6 +1674,24 @@
% \end{macrocode}
% \end{macro}
%
+%
+% \begin{macro}{\@Mvi}
+% In versions prior to 1.8r the balancing at the end of the
+% environment was done by changing the output routine from
+% |\multi@column@out| to |\balance@column@out|. As it turned out
+% that this has a couple of issues when the last columns should not
+% be balanced after aled (for example because they contained several
+% |\columnbreak| commands we now stay with one output routine for
+% the environment and only signal that we reached the end of the
+% environment by marking it with a special penalty that we can check
+% for later.
+% \changes{v1.8r}{2018/01/28}{Macro added}
+% \begin{macrocode}
+\mathchardef\@Mvi=10006 % 10005 is \columnbreak
+% \end{macrocode}
+% \end{macro}
+%
+%
% \begin{macro}{\endmulticols}
% When the end of the \mc{} environment is sensed we have to
% balance the gathered material. Depending on whether or not we are
@@ -1763,13 +1788,13 @@
% the very last item on the main vertical list is a valid break
% point so that \TeX{} breaks the page in case it is overfull.
% \begin{macrocode}
- \penalty\z@
+ \penalty\z@
% \end{macrocode}
-% Now it's safe to change the output routine in order to balance
-% the columns.
+% Now it's safe to call the output routine in order to balance
+% the columns. We do this by calling it with a special penalty.
+% \changes{v1.8r}{2018/01/28}{Use special penalty to signal end of environment}
% \begin{macrocode}
- \output{\balance@columns@out}%
- \eject
+ \penalty-\@Mvi
% \end{macrocode}
% If the \mc{} environment body was completely empty or if a
% multi-page \mc{} just ends at a page boundary we have the unusual
@@ -2563,6 +2588,26 @@
\reinsert@footnotes
\else
% \end{macrocode}
+% Another special case is reaching the end of the \mc{}
+% environment which is signalled by |-\@Mvi|.
+% \changes{v1.8r}{2018/01/28}{Handling end of env through special penalty}
+% \begin{macrocode}
+ \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
+% (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|
+% if we are inside \texttt{multicols*} in which case we would get a loop
+% if the |\outputpenalty| is not changed---this could be cleaned up
+% in a better way; basically it is like this, because of the older
+% code was using different ORs and I simply reused most of it.
+% \begin{macrocode}
+ \outputpenalty\@M % pretend we had a natural forced break
+ \balance@columns@out
+ \else
+% \end{macrocode}
% If we encounter a float or a marginpar in the current
% implementation we simply warn the user that this is not allowed.
% Then we reinsert the page and its footnotes.
@@ -2580,9 +2625,10 @@
% this is possible with |\xdef|.)
% \changes{v1.2a}{1990/02/05}{Float boxes freed.}
% \begin{macrocode}
- \xdef\@freelist{\@freelist\@currlist}%
- \gdef\@currlist{}%
- \fi
+ \xdef\@freelist{\@freelist\@currlist}%
+ \gdef\@currlist{}%
+ \fi
+ \fi
\fi
% \end{macrocode}
% If the penalty is $-10001$ it will come from a |\clearpage| and
@@ -2712,7 +2758,14 @@
\setbox\@cclv\vbox
{\vskip\topskip
\vskip-\splittopskip
- \unvbox\mult@box}%
+ \unvbox\mult@box
+% \end{macrocode}
+% We also have to re-add the end of environment penalty since after
+% this page we may want balance the remaining material.
+% \changes{v1.8r}{2018/01/28}{Re-add the final penalty}
+% \begin{macrocode}
+ \penalty-\@Mvi
+ }%
% \end{macrocode}
% We then call the standard multicol output routine which will
% produce a normal page for us (remember we are still within the
diff --git a/Master/texmf-dist/source/latex/tools/multicol.ins b/Master/texmf-dist/source/latex/tools/multicol.ins
index 900691e3161..ee295fed174 100644
--- a/Master/texmf-dist/source/latex/tools/multicol.ins
+++ b/Master/texmf-dist/source/latex/tools/multicol.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1993-2016
+%% Copyright 1993-2018
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -14,13 +14,16 @@
%% 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
-%% http://www.latex-project.org/lppl.txt
+%% 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.
%%
-%% In particular, NO PERMISSION is granted to modify the contents of this
-%% file since it contains the legal notices that are placed in the files
-%% it generates.
+%% 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'.
@@ -39,10 +42,10 @@
This is a generated file.
The source is maintained by the LaTeX Project team and bug
-reports for it can be opened at http://latex-project.org/bugs.html
+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-2016
+Copyright 1993-2017
The LaTeX3 Project and any individual authors listed elsewhere
in this file.
@@ -53,7 +56,7 @@ 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
- http://www.latex-project.org/lppl.txt
+ 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.
diff --git a/Master/texmf-dist/source/latex/tools/rawfonts.dtx b/Master/texmf-dist/source/latex/tools/rawfonts.dtx
index 1057b58fe3e..51502c631ee 100644
--- a/Master/texmf-dist/source/latex/tools/rawfonts.dtx
+++ b/Master/texmf-dist/source/latex/tools/rawfonts.dtx
@@ -12,7 +12,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
-% http://www.latex-project.org/lppl.txt
+% 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.
%
diff --git a/Master/texmf-dist/source/latex/tools/showkeys.dtx b/Master/texmf-dist/source/latex/tools/showkeys.dtx
index 841be6c3add..14ac876627f 100644
--- a/Master/texmf-dist/source/latex/tools/showkeys.dtx
+++ b/Master/texmf-dist/source/latex/tools/showkeys.dtx
@@ -12,7 +12,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
-% http://www.latex-project.org/lppl.txt
+% 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.
%
diff --git a/Master/texmf-dist/source/latex/tools/somedefs.dtx b/Master/texmf-dist/source/latex/tools/somedefs.dtx
index 70c05c58382..bad29b00439 100644
--- a/Master/texmf-dist/source/latex/tools/somedefs.dtx
+++ b/Master/texmf-dist/source/latex/tools/somedefs.dtx
@@ -12,7 +12,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
-% http://www.latex-project.org/lppl.txt
+% 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.
%
diff --git a/Master/texmf-dist/source/latex/tools/tabularx.dtx b/Master/texmf-dist/source/latex/tools/tabularx.dtx
index 0b98296eb31..5eaabbe3102 100644
--- a/Master/texmf-dist/source/latex/tools/tabularx.dtx
+++ b/Master/texmf-dist/source/latex/tools/tabularx.dtx
@@ -12,7 +12,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
-% http://www.latex-project.org/lppl.txt
+% 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.
%
@@ -21,7 +21,7 @@
%
% \fi
% \iffalse
-%% File: tabularx.dtx Copyright (C) 1991-1999 2012 2014 2016 David Carlisle
+%% File: tabularx.dtx Copyright (C) 1991-1999 2012 2014 2016 2017 David Carlisle
%
%<*dtx>
\ProvidesFile{tabularx.dtx}
@@ -31,7 +31,7 @@
%<driver> \ProvidesFile{tabularx.drv}
% \fi
% \ProvidesFile{tabularx.dtx}
- [2016/02/03 v2.11 `tabularx' package (DPC)]
+ [2016/02/03 v2.11b `tabularx' package (DPC)]
% \iffalse
%<*driver>
\documentclass{ltxdoc}
@@ -231,7 +231,9 @@
% 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 "{>{\hsize=.5\hsize}X>{\hsize=1.5\hsize}X}"
+% 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
% first. However if you want to play games like this you should follow
% the following two rules.
diff --git a/Master/texmf-dist/source/latex/tools/tabularx.ins b/Master/texmf-dist/source/latex/tools/tabularx.ins
index 04ee4f70650..0953bdea542 100644
--- a/Master/texmf-dist/source/latex/tools/tabularx.ins
+++ b/Master/texmf-dist/source/latex/tools/tabularx.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1993-2016
+%% Copyright 1993-2017
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -14,13 +14,16 @@
%% 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
-%% http://www.latex-project.org/lppl.txt
+%% 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.
%%
-%% In particular, NO PERMISSION is granted to modify the contents of this
-%% file since it contains the legal notices that are placed in the files
-%% it generates.
+%% 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'.
@@ -39,10 +42,10 @@
This is a generated file.
The source is maintained by the LaTeX Project team and bug
-reports for it can be opened at http://latex-project.org/bugs.html
+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-2016
+Copyright 1993-2017
The LaTeX3 Project and any individual authors listed elsewhere
in this file.
@@ -53,7 +56,7 @@ 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
- http://www.latex-project.org/lppl.txt
+ 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.
diff --git a/Master/texmf-dist/source/latex/tools/theorem.dtx b/Master/texmf-dist/source/latex/tools/theorem.dtx
index fe782782406..5a76fdb2006 100644
--- a/Master/texmf-dist/source/latex/tools/theorem.dtx
+++ b/Master/texmf-dist/source/latex/tools/theorem.dtx
@@ -12,7 +12,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
-% http://www.latex-project.org/lppl.txt
+% 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.
%
diff --git a/Master/texmf-dist/source/latex/tools/tools.ins b/Master/texmf-dist/source/latex/tools/tools.ins
index b51fc9c8f89..817e149bcae 100644
--- a/Master/texmf-dist/source/latex/tools/tools.ins
+++ b/Master/texmf-dist/source/latex/tools/tools.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1993-2016
+%% Copyright 1993-2017
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -14,13 +14,16 @@
%% 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
-%% http://www.latex-project.org/lppl.txt
+%% 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.
%%
-%% In particular, NO PERMISSION is granted to modify the contents of this
-%% file since it contains the legal notices that are placed in the files
-%% it generates.
+%% 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'.
@@ -42,11 +45,11 @@
This is a generated file.
The source is maintained by the LaTeX Project team and bug
-reports for it can be opened at http://latex-project.org/bugs.html
+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-2016
+Copyright 1993-2017
The LaTeX3 Project and any individual authors listed elsewhere
in this file.
@@ -57,7 +60,7 @@ 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
- http://www.latex-project.org/lppl.txt
+ 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.
diff --git a/Master/texmf-dist/source/latex/tools/trace.dtx b/Master/texmf-dist/source/latex/tools/trace.dtx
index 0a082f3f471..422c43e0713 100644
--- a/Master/texmf-dist/source/latex/tools/trace.dtx
+++ b/Master/texmf-dist/source/latex/tools/trace.dtx
@@ -12,7 +12,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
-% http://www.latex-project.org/lppl.txt
+% 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.
%
diff --git a/Master/texmf-dist/source/latex/tools/varioref.dtx b/Master/texmf-dist/source/latex/tools/varioref.dtx
index a506523d4af..2417e9b1203 100644
--- a/Master/texmf-dist/source/latex/tools/varioref.dtx
+++ b/Master/texmf-dist/source/latex/tools/varioref.dtx
@@ -12,7 +12,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
-% http://www.latex-project.org/lppl.txt
+% 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.
%
diff --git a/Master/texmf-dist/source/latex/tools/varioref.ins b/Master/texmf-dist/source/latex/tools/varioref.ins
index cb58d693b6a..6c0482ddd08 100644
--- a/Master/texmf-dist/source/latex/tools/varioref.ins
+++ b/Master/texmf-dist/source/latex/tools/varioref.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1993-2016
+%% Copyright 1993-2017
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -14,13 +14,16 @@
%% 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
-%% http://www.latex-project.org/lppl.txt
+%% 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.
%%
-%% In particular, NO PERMISSION is granted to modify the contents of this
-%% file since it contains the legal notices that are placed in the files
-%% it generates.
+%% 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'.
@@ -39,10 +42,10 @@
This is a generated file.
The source is maintained by the LaTeX Project team and bug
-reports for it can be opened at http://latex-project.org/bugs.html
+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-2016
+Copyright 1993-2017
The LaTeX3 Project and any individual authors listed elsewhere
in this file.
@@ -53,7 +56,7 @@ 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
- http://www.latex-project.org/lppl.txt
+ 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.
diff --git a/Master/texmf-dist/source/latex/tools/verbatim.dtx b/Master/texmf-dist/source/latex/tools/verbatim.dtx
index b47419085c2..4b85f1a3ad9 100644
--- a/Master/texmf-dist/source/latex/tools/verbatim.dtx
+++ b/Master/texmf-dist/source/latex/tools/verbatim.dtx
@@ -12,7 +12,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
-% http://www.latex-project.org/lppl.txt
+% 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.
%
diff --git a/Master/texmf-dist/source/latex/tools/xr.dtx b/Master/texmf-dist/source/latex/tools/xr.dtx
index bb766181482..5cd0cebc4bc 100644
--- a/Master/texmf-dist/source/latex/tools/xr.dtx
+++ b/Master/texmf-dist/source/latex/tools/xr.dtx
@@ -12,7 +12,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
-% http://www.latex-project.org/lppl.txt
+% 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.
%
diff --git a/Master/texmf-dist/source/latex/tools/xspace.dtx b/Master/texmf-dist/source/latex/tools/xspace.dtx
index 6e3784cf09a..4fd2de18e70 100644
--- a/Master/texmf-dist/source/latex/tools/xspace.dtx
+++ b/Master/texmf-dist/source/latex/tools/xspace.dtx
@@ -12,7 +12,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
-% http://www.latex-project.org/lppl.txt
+% 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.
%