booktabs (29apr16)

git-svn-id: svn://tug.org/texlive/trunk@40846 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 19 insertions, 30 deletions

diff --git a/Master/texmf-dist/tex/latex/booktabs/booktabs.sty b/Master/texmf-dist/tex/latex/booktabs/booktabs.sty
index cf25d78c2be..7ff9a5a5e3b 100644
--- a/Master/texmf-dist/tex/latex/booktabs/booktabs.sty
+++ b/Master/texmf-dist/tex/latex/booktabs/booktabs.sty
@@ -6,33 +6,21 @@
 %%
 %% booktabs.dtx  (with options: `package')
 %% 
-%% -----------------------------------------------------------------
-%% Author:     Simon Fear
-%% Maintainer: Danie Els (dnjels@sun.ac.za)
-%% 
-%% This file is part of the booktabs package for publication
-%% quality tables for LaTeX
-%% 
-%%       Copyright (C) 1995--2005 Simon Fear
+%% Copyright (C) 1995--2016 Simon Fear
+%% Maintained by Danie Els <dnjels@sun.ac.za>
 %% 
-%% This program is free software; you can redistribute it and/or
-%% modify it under the terms of the GNU General Public License as
-%% published by the Free Software Foundation; either version 2 of
-%% the License, or (at your option) any later version.
+%% 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 program is distributed in the hope that it will be useful,
-%% but WITHOUT ANY WARRANTY; without even the implied warranty of
-%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%% GNU General Public License for more details.
+%%    http://www.latex-project.org/lppl.txt
 %% 
-%% You should have received a copy of the GNU General Public
-%% License along with this program; if not, write to the Free
-%% Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-%% MA 02111-1307 USA
+%% 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}
-    [2005/04/14 v1.61803 publication quality tables]
+    [2016/04/27 v1.618033 publication quality tables]
 \newdimen\heavyrulewidth
 \newdimen\lightrulewidth
 \newdimen\cmidrulewidth
@@ -90,17 +78,18 @@
 \def\@addspace[#1]{\global\@belowrulesep=#1\global\@thisruleclass=\tw@
   \futurelet\@tempa\@BTendrule}
 \def\@BTrule[#1]{%
-  \global\@thisrulewidth=#1\relax
-  \ifnum\@thisruleclass=\tw@\vskip\@aboverulesep\else
-  \ifnum\@lastruleclass=\z@\vskip\@aboverulesep\else
-  \ifnum\@lastruleclass=\@ne\vskip\doublerulesep\fi\fi\fi
   \ifx\longtable\undefined
-     \let\@BTswitch\@BTnormal
+    \let\@BTswitch\@BTnormal
   \else\ifx\hline\LT@hline
-     \let\@BTswitch\@BLTrule
+    \nobreak
+    \let\@BTswitch\@BLTrule
   \else
-     \let\@BTswitch\@BTnormal
+    \let\@BTswitch\@BTnormal
   \fi\fi
+  \global\@thisrulewidth=#1\relax
+  \ifnum\@thisruleclass=\tw@\vskip\@aboverulesep\else
+  \ifnum\@lastruleclass=\z@\vskip\@aboverulesep\else
+  \ifnum\@lastruleclass=\@ne\vskip\doublerulesep\fi\fi\fi
   \@BTswitch}
 \AtBeginDocument{%
    \providecommand*\CT@arc@{}}%% colortbl support
@@ -169,12 +158,12 @@
 \def\@cmidrulea{%
    \multispan\@cmidla&\multispan\@cmidlb
    \unskip\hskip\cmrkern@l%
-  {\CT@arc@\leaders\hrule \@height\@thisrulewidth\hfill}%
+  {\CT@arc@\leaders\hrule \@height\@thisrulewidth\hfill\kern\z@}%
    \hskip\cmrkern@r\cr}%
 \def\@cmidruleb{%
     \multispan\@cmidlb
     \unskip\hskip \cmrkern@l%
-   {\CT@arc@\leaders\hrule \@height\@thisrulewidth\hfill}%
+   {\CT@arc@\leaders\hrule \@height\@thisrulewidth\hfill\kern\z@}%
     \hskip\cmrkern@r\cr}%
 \def\morecmidrules{\noalign{\relax}}
 \endinput