diff options
Diffstat (limited to 'Master/texmf-dist/source')
13 files changed, 51 insertions, 41 deletions
diff --git a/Master/texmf-dist/source/latex/cyrillic/cyinpenc.dtx b/Master/texmf-dist/source/latex/cyrillic/cyinpenc.dtx index 555a88de296..e560ca86914 100644 --- a/Master/texmf-dist/source/latex/cyrillic/cyinpenc.dtx +++ b/Master/texmf-dist/source/latex/cyrillic/cyinpenc.dtx @@ -12,7 +12,7 @@ % conditions of the LaTeX Project Public License, either version 1.3b % 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.3b or later is part of all distributions of LaTeX % version 2005/12/01 or later. % diff --git a/Master/texmf-dist/source/latex/cyrillic/cyoutenc.dtx b/Master/texmf-dist/source/latex/cyrillic/cyoutenc.dtx index e75d677c866..4b510de97f3 100644 --- a/Master/texmf-dist/source/latex/cyrillic/cyoutenc.dtx +++ b/Master/texmf-dist/source/latex/cyrillic/cyoutenc.dtx @@ -11,7 +11,7 @@ % conditions of the LaTeX Project Public License, either version 1.3b % 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.3b or later is part of all distributions of LaTeX % version 2005/12/01 or later. % diff --git a/Master/texmf-dist/source/latex/cyrillic/cyrlatex.ins b/Master/texmf-dist/source/latex/cyrillic/cyrlatex.ins index 7f2cc1908f8..701479f03ac 100644 --- a/Master/texmf-dist/source/latex/cyrillic/cyrlatex.ins +++ b/Master/texmf-dist/source/latex/cyrillic/cyrlatex.ins @@ -3,7 +3,7 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1993-2014 +%% 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 `Cyrillic Bundle' is %% given in the file `manifest.txt'. @@ -28,7 +31,7 @@ %% %% --------------- start of docstrip commands ------------------ %% -%% Copyright 1993-2014 +%% Copyright 1993-2017 %% %% This file is part of the `cyrillic' bundle in the LaTeX2e distribution. %% @@ -49,10 +52,10 @@ in the LaTeX2e distribution. 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-2015 +Copyright 1993-2017 The LaTeX3 Project and any individual authors listed elsewhere in this file. @@ -63,7 +66,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. @@ -130,10 +133,10 @@ in the LaTeX2e distribution. 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-2015 +Copyright 1993-2016 The LaTeX3 Project and any individual authors listed elsewhere in this file. @@ -144,7 +147,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. @@ -158,8 +161,11 @@ given in the file `manifest.txt'. In particular, permission is granted to customize the declarations in this file to serve the needs of your installation. -However, NO PERMISSION is granted to distribute a modified version -of this file under its original name. +However, a modified version of this file under its original name +should not be distributed as part of a standard LaTeX distribution, as +the modification will be nontransparent for the user of that +distribution (and thus violating clause 6a of the LPPL license), +making successful document exchange impossible. \endpreamble diff --git a/Master/texmf-dist/source/latex/cyrillic/lcy.dtx b/Master/texmf-dist/source/latex/cyrillic/lcy.dtx index acac253aab9..6605733fe65 100644 --- a/Master/texmf-dist/source/latex/cyrillic/lcy.dtx +++ b/Master/texmf-dist/source/latex/cyrillic/lcy.dtx @@ -11,7 +11,7 @@ % conditions of the LaTeX Project Public License, either version 1.3b % 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.3b or later is part of all distributions of LaTeX % version 2005/12/01 or later. % diff --git a/Master/texmf-dist/source/latex/cyrillic/lcycmlh.fdd b/Master/texmf-dist/source/latex/cyrillic/lcycmlh.fdd index 22c261883a1..6610d74de33 100644 --- a/Master/texmf-dist/source/latex/cyrillic/lcycmlh.fdd +++ b/Master/texmf-dist/source/latex/cyrillic/lcycmlh.fdd @@ -11,7 +11,7 @@ % conditions of the LaTeX Project Public License, either version 1.3b % 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.3b or later is part of all distributions of LaTeX % version 2005/12/01 or later. % diff --git a/Master/texmf-dist/source/latex/cyrillic/ot2.dtx b/Master/texmf-dist/source/latex/cyrillic/ot2.dtx index 2ad2547b75f..05e747a1368 100644 --- a/Master/texmf-dist/source/latex/cyrillic/ot2.dtx +++ b/Master/texmf-dist/source/latex/cyrillic/ot2.dtx @@ -11,7 +11,7 @@ % conditions of the LaTeX Project Public License, either version 1.3b % 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.3b or later is part of all distributions of LaTeX % version 2005/12/01 or later. % diff --git a/Master/texmf-dist/source/latex/cyrillic/ot2cmams.fdd b/Master/texmf-dist/source/latex/cyrillic/ot2cmams.fdd index acf91f82810..be875062689 100644 --- a/Master/texmf-dist/source/latex/cyrillic/ot2cmams.fdd +++ b/Master/texmf-dist/source/latex/cyrillic/ot2cmams.fdd @@ -11,7 +11,7 @@ % conditions of the LaTeX Project Public License, either version 1.3b % 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.3b or later is part of all distributions of LaTeX % version 2005/12/01 or later. % diff --git a/Master/texmf-dist/source/latex/cyrillic/ot2cmlh.fdd b/Master/texmf-dist/source/latex/cyrillic/ot2cmlh.fdd index 95c0937d447..5790955f59a 100644 --- a/Master/texmf-dist/source/latex/cyrillic/ot2cmlh.fdd +++ b/Master/texmf-dist/source/latex/cyrillic/ot2cmlh.fdd @@ -11,7 +11,7 @@ % conditions of the LaTeX Project Public License, either version 1.3b % 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.3b or later is part of all distributions of LaTeX % version 2005/12/01 or later. % diff --git a/Master/texmf-dist/source/latex/cyrillic/t2lhfnt.fdd b/Master/texmf-dist/source/latex/cyrillic/t2lhfnt.fdd index 09b268e012e..8f0dac0df6e 100644 --- a/Master/texmf-dist/source/latex/cyrillic/t2lhfnt.fdd +++ b/Master/texmf-dist/source/latex/cyrillic/t2lhfnt.fdd @@ -11,7 +11,7 @@ % conditions of the LaTeX Project Public License, either version 1.3b % 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.3b or later is part of all distributions of LaTeX % version 2005/12/01 or later. % diff --git a/Master/texmf-dist/source/latex/graphics/graphics.ins b/Master/texmf-dist/source/latex/graphics/graphics.ins index e4aeeb0f04a..95e190c9ecd 100644 --- a/Master/texmf-dist/source/latex/graphics/graphics.ins +++ b/Master/texmf-dist/source/latex/graphics/graphics.ins @@ -11,7 +11,7 @@ \preamble 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!) diff --git a/Master/texmf-dist/source/latex/graphics/rotating.dtx b/Master/texmf-dist/source/latex/graphics/rotating.dtx index db12ad6c3b9..41bd399d4ed 100644 --- a/Master/texmf-dist/source/latex/graphics/rotating.dtx +++ b/Master/texmf-dist/source/latex/graphics/rotating.dtx @@ -11,7 +11,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/array.dtx b/Master/texmf-dist/source/latex/tools/array.dtx index 1502265d962..fcef9426c48 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-2017 +% Copyright 1993-2018 % % The LaTeX3 Project and any individual authors listed elsewhere % in this file. @@ -26,13 +26,17 @@ %% Copyright (C) 1989-1998 Frank Mittelbach, all rights reserved. %<+package>\NeedsTeXFormat{LaTeX2e}[1995/06/01] %<+package>\ProvidesPackage{array} -%<+package> [2017/11/07 v2.4f Tabular extension package (FMi)] +%<+package> [2018/04/07 v2.4g Tabular extension package (FMi)] % % \fi % %% % % +% \changes{v2.4g}{2018/04/07}{Renamed internal \cs{mcell@box} to +% \cs{ar@mcellbox} and \cs{align@mcell} to \cs{ar@align@mcell} +% to avoid conflict with makecell package} +% % \changes{v2.4c}{2008/09/09}{(WR) Typo fix in documentation} % % \changes{v2.3c}{1995/11/02}{(DPC) minor doc changes} @@ -1304,12 +1308,12 @@ % 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=). +% their heights (=\ar@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 + \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 @@ -1584,7 +1588,7 @@ % \changes{v2.4f}{2017/11/04}{Managing m-cells without \cs{vcenter}} % \begin{macrocode} % $\vcenter - \setbox\mcell@box\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}) @@ -1599,7 +1603,7 @@ % \changes{v2.4f}{2017/11/04}{Managing m-cells without \cs{vcenter}} % \begin{macrocode} \@startpbox{\@nextchar}\insert@column \@endpbox - \align@mcell + \ar@align@mcell %$ \do@row@strut \or % \end{macrocode} @@ -1622,17 +1626,17 @@ % % -% \begin{macro}{\mcell@box} +% \begin{macro}{\ar@mcellbox} % 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 +\newbox\ar@mcellbox % \end{macrocode} % \end{macro} % % -% \begin{macro}{\align@mcell} +% \begin{macro}{\ar@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 @@ -1650,8 +1654,8 @@ % 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 +\def\ar@align@mcell{% + \ifdim \ht\ar@mcellbox > \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 @@ -1667,13 +1671,13 @@ % what we add and then lower the cell by half of the resulting value. % \begin{macrocode} \begingroup - \dimen@\ht\mcell@box + \dimen@\ht\ar@mcellbox \advance\dimen@-\ht\@arstrutbox \advance\dimen@\baselineskip - \lower.5\dimen@\box\mcell@box + \lower.5\dimen@\box\ar@mcellbox \endgroup \else % assume one line and align at baseline - \box\mcell@box + \box\ar@mcellbox \fi} % \end{macrocode} % \end{macro} @@ -1719,7 +1723,7 @@ % the definition of =\@arrayrule=. In the original a line without % width\footnote{So the space between \texttt{cc} and \texttt{c|c} % is equal.} is created by multiple insertions of -% =\hskip .5\arrayrulewidth=. +% =\hskip .5\arrayrulewidth=. % We only insert a vertical line into the % preamble. This is done to prevent problems with \TeX's main % memory when generating tables with many vertical lines in them @@ -2667,7 +2671,7 @@ \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 + \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 diff --git a/Master/texmf-dist/source/latex/tools/multicol.dtx b/Master/texmf-dist/source/latex/tools/multicol.dtx index f1d8b777d38..4da6dbd38d8 100644 --- a/Master/texmf-dist/source/latex/tools/multicol.dtx +++ b/Master/texmf-dist/source/latex/tools/multicol.dtx @@ -1680,7 +1680,7 @@ % 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 +% be balanced after all (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 |