summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Master/texmf-dist/doc/latex/booktabs/COPYING340
-rw-r--r--Master/texmf-dist/doc/latex/booktabs/README122
-rw-r--r--Master/texmf-dist/doc/latex/booktabs/booktabs.pdfbin193778 -> 295150 bytes
-rw-r--r--Master/texmf-dist/source/latex/booktabs/booktabs.dtx106
-rw-r--r--Master/texmf-dist/source/latex/booktabs/booktabs.ins89
-rw-r--r--Master/texmf-dist/tex/latex/booktabs/booktabs.sty49
6 files changed, 166 insertions, 540 deletions
diff --git a/Master/texmf-dist/doc/latex/booktabs/COPYING b/Master/texmf-dist/doc/latex/booktabs/COPYING
deleted file mode 100644
index d60c31a97a5..00000000000
--- a/Master/texmf-dist/doc/latex/booktabs/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- 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
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/Master/texmf-dist/doc/latex/booktabs/README b/Master/texmf-dist/doc/latex/booktabs/README
index 39d0fd1e606..fb43faf3ac5 100644
--- a/Master/texmf-dist/doc/latex/booktabs/README
+++ b/Master/texmf-dist/doc/latex/booktabs/README
@@ -1,62 +1,60 @@
- The booktabs package
- For publication quality tables for LaTeX
-
-
-File: README
-Author: Danie Els
-
-
-DESCRIPTION
-===========
-
-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--2005 Simon Fear
-Licence: GPL
-
-FILES IN DISTRIBUTION
-=====================
-
- BASE DISTRIBUTION:
-
- README This file.
- booktabs.ins Package installation file.
- booktabs.dtx Package source file.
- COPYING GPL license file.
-
- booktabs.sty Package style file. It was produced by
- executing "latex booktabs.ins".
-
- DOCUMENTATION:
-
- booktabs.pdf User manual for booktabs package. It was
- produced by executing:
- pdflatex booktabs.dtx
- pdflatex booktabs.dtx
- makeindex -s gglo.ist -o booktabs.gls booktabs.glo
- makeindex -s gind.ist -o booktabs.ind booktabs.idx
- pdflatex booktabs.dtx
- pdflatex booktabs.dtx
-
-BASIC INSTALLATION
-====================
-
- The minimum requirement to use the package is the to have
- booktabs.sty in a directory where TeX can find it.
-
- For a basic installation on a TDS compliant system, move the
- following files to the following directories:
-
- <texmf>/tex/latex/booktabs/
- booktabs.sty
-
- <texmf>/source/latex/booktabs/
- booktabs.ins
- booktabs.dtx
- COPY
-
- <texmf>/doc/latex/booktabs/
- README
- booktabs.pdf
+ The booktabs package
+ For publication quality tables for LaTeX
+
+
+File: README
+Author: Danie Els
+
+
+DESCRIPTION
+===========
+
+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--2016 Simon Fear
+Licence: GPL
+
+FILES IN DISTRIBUTION
+=====================
+
+ BASE DISTRIBUTION:
+
+ README This file.
+ booktabs.ins Package installation file.
+ booktabs.dtx Package source file.
+
+ booktabs.sty Package style file. It was produced by
+ executing "latex booktabs.ins".
+
+ DOCUMENTATION:
+
+ booktabs.pdf User manual for booktabs package. It was
+ produced by executing:
+ pdflatex booktabs.dtx
+ pdflatex booktabs.dtx
+ makeindex -s gglo.ist -o booktabs.gls booktabs.glo
+ makeindex -s gind.ist -o booktabs.ind booktabs.idx
+ pdflatex booktabs.dtx
+ pdflatex booktabs.dtx
+
+BASIC INSTALLATION
+====================
+
+ The minimum requirement to use the package is to have
+ booktabs.sty in a directory where TeX can find it.
+
+ For a basic installation on a TDS compliant system, move the
+ following files to the following directories:
+
+ <texmf>/tex/latex/booktabs/
+ booktabs.sty
+
+ <texmf>/source/latex/booktabs/
+ booktabs.ins
+ booktabs.dtx
+
+ <texmf>/doc/latex/booktabs/
+ README
+ booktabs.pdf
diff --git a/Master/texmf-dist/doc/latex/booktabs/booktabs.pdf b/Master/texmf-dist/doc/latex/booktabs/booktabs.pdf
index 04a0050b2da..0628380fff2 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 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
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
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-07 01:00:41 +0000