summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/booktabs/README8
-rw-r--r--Master/texmf-dist/doc/latex/booktabs/booktabs.pdfbin296459 -> 295596 bytes
-rw-r--r--Master/texmf-dist/source/latex/booktabs/booktabs.dtx33
-rw-r--r--Master/texmf-dist/source/latex/booktabs/booktabs.ins47
-rw-r--r--Master/texmf-dist/tex/latex/booktabs/booktabs.sty29
5 files changed, 62 insertions, 55 deletions
diff --git a/Master/texmf-dist/doc/latex/booktabs/README b/Master/texmf-dist/doc/latex/booktabs/README
index 94a47a0d477..506d51b74ca 100644
--- a/Master/texmf-dist/doc/latex/booktabs/README
+++ b/Master/texmf-dist/doc/latex/booktabs/README
@@ -13,20 +13,18 @@ This package provide some additional commands to enhance
the quality of tables in LaTeX. Guidelines are given as
to what constitutes a good table in this context.
-Copyright: (C) 1995--2019 Simon Fear
-Licence: GPL
+Copyright: (C) 1995--2020 Simon Fear
+Licence: LPPL
FILES IN DISTRIBUTION
=====================
BASE DISTRIBUTION:
- README.md This file.
+ README This file.
booktabs.ins Package installation file.
booktabs.dtx Package source file.
- STYLE FILE
-
booktabs.sty Package style file. It was produced by
executing "latex booktabs.ins".
diff --git a/Master/texmf-dist/doc/latex/booktabs/booktabs.pdf b/Master/texmf-dist/doc/latex/booktabs/booktabs.pdf
index ab17c10ee9f..b7ef2a8e40f 100644
--- a/Master/texmf-dist/doc/latex/booktabs/booktabs.pdf
+++ b/Master/texmf-dist/doc/latex/booktabs/booktabs.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/booktabs/booktabs.dtx b/Master/texmf-dist/source/latex/booktabs/booktabs.dtx
index de915565e72..969e3b32906 100644
--- a/Master/texmf-dist/source/latex/booktabs/booktabs.dtx
+++ b/Master/texmf-dist/source/latex/booktabs/booktabs.dtx
@@ -1,22 +1,21 @@
% \iffalse (meta-comment)
% -----------------------------------------------------------------
% booktabs.dtx
-% Copyright (C) 1995--2019 Simon Fear
+% Copyright (C) 1995--2020 Simon Fear
% Maintained by Danie Els <dnjels@gmail.com>
%
% This file is part of the booktabs package for publication
% quality tables for LaTeX
% -----------------------------------------------------------------
%
-% This file may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
-% of this license or (at your option) any later version.
-% The latest version of this license is in:
+% 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. The latest version
+% of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2008/05/04 or later.
%
-% http://www.latex-project.org/lppl.txt
-%
-% and version 1.3 or later is part of all distributions of LaTeX
-% version 2005/12/01 or later.
% -----------------------------------------------------------------
% \fi
%
@@ -27,12 +26,12 @@
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{booktabs}
%<*package>
- [2019/10/08 v1.6180339 publication quality tables]
+ [2020/01/12 v1.61803398 Publication quality tables]
%</package>
%
%<*driver>
\documentclass{ltxdoc}
- \usepackage{booktabs}[2019/10/08]
+ \usepackage{booktabs}[2020/01/12]
\EnableCrossrefs
\CodelineIndex
\RecordChanges
@@ -48,7 +47,7 @@
%</driver>
% \fi
%
-% \CheckSum{497}
+% \CheckSum{489}
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -91,7 +90,7 @@
% Releases (Versions 1.618, 1.6180, 1.61803 and 1.618033) are
% only bug patches, support for the =colortbl= package and better
% compatability with =longtable=.\footnote{By Danie Els
-% (\texttt{dnjels@gmail.com}) in the absence of the author.}
+% (\texttt{dnjels@sun.ac.za}) in the absence of the author.}
% \end{abstract}
%
% \bigskip
@@ -747,6 +746,7 @@
% All the rules (except =\addlinespace=) share this code.
% \changes{v1.618033}{2016/04/27}{Rearranged and added \cmd{\nobreak} within longtable (Morten H{\o}gholm)}
% \changes{v1.6180339}{2019/10/08}{Add test for xltabular (Herbert Voss)}
+% \changes{v1.61803398}{2020/01/12}{Restore \cmd{\@BTrule} to v1.618033 (Danie Els) }
% \begin{macrocode}
\def\@BTrule[#1]{%
% \end{macrocode}
@@ -772,11 +772,8 @@
\nobreak
\let\@BTswitch\@BLTrule
\else
- \ifx\xltabular\undefined
- \let\@BTswitch\@BTnormal
- \else
- \let\@BTswitch\@BLTrule
- \fi\fi\fi
+ \let\@BTswitch\@BTnormal
+ \fi\fi
% \end{macrocode}
% Call =\@BTswitch= at end of macro
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/booktabs/booktabs.ins b/Master/texmf-dist/source/latex/booktabs/booktabs.ins
index e1bd227c156..0c6ccbb5468 100644
--- a/Master/texmf-dist/source/latex/booktabs/booktabs.ins
+++ b/Master/texmf-dist/source/latex/booktabs/booktabs.ins
@@ -5,42 +5,53 @@
%% TeX.
%% --------------------------------------------------------------------
%%
-%% Copyright (C) 1995--2019 Simon Fear
-%% Maintained by Danie Els <dnjels@sun.ac.za>
+%% Copyright (C) 1995--2020 Simon Fear
%%
%% This file is part of the booktabs package for publication quality
%% tables for LaTeX
%% --------------------------------------------------------------------
%%
-%% This file may be distributed and/or modified under the conditions of
-%% the LaTeX Project Public License, either version 1.3 of this license
-%% or (at your option) any later version. The latest version of this
-%% license is in:
+%% 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. The latest version
+%% of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
%%
-%% http://www.latex-project.org/lppl.txt
+%% This work has the LPPL maintenance status 'Maintained'.
%%
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%% This Current Maintainer of this work is Danie Els (dnjels@gmail.com)
%%
+%% This package consists of the files: booktabs.dtx
+%% booktabs.ins
+%% and the derived files: booktabs.cls
+%%
+%% --------------------------------------------------------------------
+
\input docstrip.tex
\keepsilent
-\usedir{tex/latex/booktabs}
+\usedir{tex/latex/skeleton}
\preamble
-Copyright (C) 1995--2019 Simon Fear
-Maintained by Danie Els <dnjels@sun.ac.za>
+Copyright (C) 1995--2020 Simon Fear
+Maintained by Danie Els <dnjels@gmail.com>
-This file may be distributed and/or modified under the conditions of the
-LaTeX Project Public License, either version 1.3 of this license or (at your
-option) any later version. The latest version of this license is in:
+-----------------------------------------------------------------
+ The booktabs package for publication quality tables for LaTeX
+-----------------------------------------------------------------
- http://www.latex-project.org/lppl.txt
+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. The latest version
+of this license is in
+ http://www.latex-project.org/lppl.txt
+and version 1.3c or later is part of all distributions of LaTeX
+version 2008/05/04 or later.
-and version 1.3 or later is part of all distributions of LaTeX version
-2005/12/01 or later.
-----------------------------------------------------------------
\endpreamble
diff --git a/Master/texmf-dist/tex/latex/booktabs/booktabs.sty b/Master/texmf-dist/tex/latex/booktabs/booktabs.sty
index 65f77740e75..c32cf7e1631 100644
--- a/Master/texmf-dist/tex/latex/booktabs/booktabs.sty
+++ b/Master/texmf-dist/tex/latex/booktabs/booktabs.sty
@@ -6,21 +6,25 @@
%%
%% booktabs.dtx (with options: `package')
%%
-%% Copyright (C) 1995--2019 Simon Fear
-%% Maintained by Danie Els <dnjels@sun.ac.za>
+%% Copyright (C) 1995--2020 Simon Fear
+%% Maintained by Danie Els <dnjels@gmail.com>
%%
-%% This file may be distributed and/or modified under the conditions of the
-%% LaTeX Project Public License, either version 1.3 of this license or (at your
-%% option) any later version. The latest version of this license is in:
+%% -----------------------------------------------------------------
+%% The booktabs package for publication quality tables for LaTeX
+%% -----------------------------------------------------------------
%%
-%% http://www.latex-project.org/lppl.txt
+%% 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. The latest version
+%% of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
%%
-%% and version 1.3 or later is part of all distributions of LaTeX version
-%% 2005/12/01 or later.
%% -----------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{booktabs}
- [2019/10/08 v1.6180339 publication quality tables]
+ [2020/01/12 v1.61803398 Publication quality tables]
\newdimen\heavyrulewidth
\newdimen\lightrulewidth
\newdimen\cmidrulewidth
@@ -84,11 +88,8 @@
\nobreak
\let\@BTswitch\@BLTrule
\else
- \ifx\xltabular\undefined
- \let\@BTswitch\@BTnormal
- \else
- \let\@BTswitch\@BLTrule
- \fi\fi\fi
+ \let\@BTswitch\@BTnormal
+ \fi\fi
\global\@thisrulewidth=#1\relax
\ifnum\@thisruleclass=\tw@\vskip\@aboverulesep\else
\ifnum\@lastruleclass=\z@\vskip\@aboverulesep\else