diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/booktabs')
| -rw-r--r-- | Master/texmf-dist/source/latex/booktabs/booktabs.dtx | 106 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/booktabs/booktabs.ins | 89 |
2 files changed, 87 insertions, 108 deletions
diff --git a/Master/texmf-dist/source/latex/booktabs/booktabs.dtx b/Master/texmf-dist/source/latex/booktabs/booktabs.dtx index 5b0e32caef4..e599a2d7c95 100644 --- a/Master/texmf-dist/source/latex/booktabs/booktabs.dtx +++ b/Master/texmf-dist/source/latex/booktabs/booktabs.dtx @@ -1,34 +1,22 @@ % \iffalse (meta-comment) % ----------------------------------------------------------------- -% File: booktabs.dtx -% Author: Simon Fear -% Maintainer: Danie Els (dnjels@sun.ac.za) +% booktabs.dtx +% Copyright (C) 1995--2016 Simon Fear +% Maintained by 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 -% -% 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 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. +% 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: % -% 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 +% http://www.latex-project.org/lppl.txt % -% ----------------------------------------------------------------- -% This file contains the documentations and source code for the -% booktabs package for use with LaTeX2e. See the file 'README' -% for a list of all the files as well as directions for the -% installation of this package. +% and version 1.3 or later is part of all distributions of LaTeX +% version 2005/12/01 or later. % ----------------------------------------------------------------- % \fi % @@ -39,12 +27,12 @@ %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01] %<package>\ProvidesPackage{booktabs} %<*package> - [2005/04/14 v1.61803 publication quality tables] + [2016/04/27 v1.618033 publication quality tables] %</package> % %<*driver> \documentclass{ltxdoc} - \usepackage{booktabs}[2005/04/14] + \usepackage{booktabs}[2016/04/27] \EnableCrossrefs \CodelineIndex \RecordChanges @@ -60,7 +48,7 @@ %</driver> % \fi % -% \CheckSum{484} +% \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 @@ -99,8 +87,10 @@ % release (Version 1.61) of the =booktabs= package, described % herein, adds some enhancements to the 1995 release (Version 1.00), % most notably =longtable= compatibility. -% Releases (Versions 1.618, 1.6180 and 1.61803) are -% only bug patches and support for the =colortbl= package.\footnote{By Danie Els +% +% 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@sun.ac.za}) in the absence of the author.} % \end{abstract} % @@ -450,7 +440,8 @@ % package. But doubled =booktabs= rules make almost no sense at all. In % the unfortunate event that a =booktabs= rule should occur at a page % break, then you will have to make the necessary adjustments by -% hand. (In general, this will mean deleting the offending rule.) +% hand.\footnote{Fixed in version 1.618033 (Morten H{\o}gholm)} +% (In general, this will mean deleting the offending rule.) % % % \section{Booktabs and and the colortbl package} @@ -754,27 +745,11 @@ % % \begin{macro}{\@BTrule} % 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)} % \begin{macrocode} \def\@BTrule[#1]{% - \global\@thisrulewidth=#1\relax -% \end{macrocode} -% Save the width argument (if the user didn't give one, then the -% calling routine will have called =\@BTrule= with the default) in a global -% variable for later use when drawing the rule. -% \begin{macrocode} - \ifnum\@thisruleclass=\tw@\vskip\@aboverulesep\else % \end{macrocode} -% Specialrules always insert specified space above. (Note: addlinespaces -% don't come here). -% \begin{macrocode} - \ifnum\@lastruleclass=\z@\vskip\@aboverulesep\else - \ifnum\@lastruleclass=\@ne\vskip\doublerulesep\fi\fi\fi -% \end{macrocode} -% After text (last rule class 0), precede the rule by =\aboverulesep=; -% but if immediately after a -% previous rule, insert a =\doublerulesep=. -% -% Now we work out, by a very nasty hack, if we're within a +% Now we work out, by a very nasty hack, if we're within a % =longtable=. It's easy if =\longtable= isn't even defined: then we % can't be. But it is not enough just to check if =longtable= is % loaded --- we might be within an ordinary table rather than a @@ -787,16 +762,39 @@ % way it implements this! So, it is not entirely safe, but I have % found no better way so far. % -% We set up =\@BTswitch= to call =\@BTnormal= or =\@BLTrule=, as +% We set up =\@BTswitch= to call =\@BTnormal= or =\@BLTrule=, as % appropriate, then call it. % \begin{macrocode} \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 +% \end{macrocode} +% Call =\@BTswitch= at end of macro +% \begin{macrocode} + \global\@thisrulewidth=#1\relax +% \end{macrocode} +% Save the width argument (if the user didn't give one, then the +% calling routine will have called =\@BTrule= with the default) in a global +% variable for later use when drawing the rule. +% \begin{macrocode} + \ifnum\@thisruleclass=\tw@\vskip\@aboverulesep\else +% \end{macrocode} +% Specialrules always insert specified space above. (Note: addlinespaces +% don't come here). +% \begin{macrocode} + \ifnum\@lastruleclass=\z@\vskip\@aboverulesep\else + \ifnum\@lastruleclass=\@ne\vskip\doublerulesep\fi\fi\fi +% \end{macrocode} +% After text (last rule class 0), precede the rule by =\aboverulesep=; +% but if immediately after a +% previous rule, insert a =\doublerulesep=. +% +% \begin{macrocode} \@BTswitch} % \end{macrocode} % \end{macro} @@ -1014,21 +1012,23 @@ % as boxes in text, rather than in a =\noalign= group, which permits % the left and right kerning. % \changes{v1.6180}{2005/03/16}{add colortbl \cmd{\CT@arc@} command for color support} +% \changes{v1.618033}{2016/04/27}{add \cmd{\kern}\cmd{\z@} after \cmd{\hfill} to protects against unskips} % \begin{macrocode} \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}% % \end{macrocode} % \end{macro} % \begin{macro}{\@cmidruleb} % \changes{v1.6180}{2005/03/16}{add colortbl \cmd{\CT@arc@} command for color support} +% \changes{v1.618033}{2016/04/27}{add \cmd{\kern}\cmd{\z@} after \cmd{\hfill} to protects against unskips} % \begin{macrocode} \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}% % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/source/latex/booktabs/booktabs.ins b/Master/texmf-dist/source/latex/booktabs/booktabs.ins index d1354fa4dd0..deac64347b6 100644 --- a/Master/texmf-dist/source/latex/booktabs/booktabs.ins +++ b/Master/texmf-dist/source/latex/booktabs/booktabs.ins @@ -1,67 +1,46 @@ -% ----------------------------------------------------------------- -% File: booktabs.ins -% 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 -% -% 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 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. -% -% 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 -% -% ----------------------------------------------------------------- -% This file will generate fast loadable files and documentation -% driver files from the doc files in this package when run through -% LaTeX or TeX. -% -% The file README' contains a list of all the files as well -% directions for installation of this package. -% ----------------------------------------------------------------- +%% booktabs.ins +%% +%% This file will generate fast loadable files and documentation driver +%% files from the doc files in this package when run through LaTeX or +%% TeX. +%% -------------------------------------------------------------------- +%% +%% Copyright (C) 1995--2016 Simon Fear +%% Maintained by Danie Els <dnjels@sun.ac.za> +%% +%% 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: +%% +%% 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. +%% -\def\batchfile{booktabs.ins} -\def\filedate{2005/03/16} \input docstrip.tex \keepsilent -\preamble - ------------------------------------------------------------------ -Author: Simon Fear -Maintainer: Danie Els (dnjels@sun.ac.za) +\usedir{tex/latex/skeleton} -This file is part of the booktabs package for publication -quality tables for LaTeX +\preamble - 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. ----------------------------------------------------------------- \endpreamble |