summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-12-14 21:56:06 +0000
committerKarl Berry <karl@freefriends.org>2018-12-14 21:56:06 +0000
commitc9f2f0cf146a8aee3eb8842a99ba0f782b219ec1 (patch)
treea94129c4cb5d8ab6f2992ed9ef51ee04b2179787 /Master/texmf-dist
parent01c5fe4e31b7afa5576b74cae3f220305fa07f47 (diff)
widetable (14dec18)
git-svn-id: svn://tug.org/texlive/trunk@49416 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/widetable/README6
-rw-r--r--Master/texmf-dist/doc/latex/widetable/manifest.txt16
-rw-r--r--Master/texmf-dist/doc/latex/widetable/widetable.pdfbin379682 -> 411914 bytes
-rw-r--r--Master/texmf-dist/source/latex/widetable/widetable.dtx302
-rw-r--r--Master/texmf-dist/tex/latex/widetable/widetable.sty26
5 files changed, 257 insertions, 93 deletions
diff --git a/Master/texmf-dist/doc/latex/widetable/README b/Master/texmf-dist/doc/latex/widetable/README
index 34931b5cb03..65c4a5e98e1 100644
--- a/Master/texmf-dist/doc/latex/widetable/README
+++ b/Master/texmf-dist/doc/latex/widetable/README
@@ -1,14 +1,14 @@
-Package widetable version 1.x dated 2017
+Package widetable version 1.x dated 2018
This small package is intended to be a second resource when typesetting
tables that would look a little better if they were set with a specified width.
It differs from tabularX since here all cells are widened by working on the
-inter column glue, not on the measure of certain specified textual cells as
+inter column glue, not on the measure of certain specified textual cells as
it is done with tabularX.
This work may be distributed and/or modified under the
- conditions of the LaTeX Project Public License, either version 1.3
+ 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
diff --git a/Master/texmf-dist/doc/latex/widetable/manifest.txt b/Master/texmf-dist/doc/latex/widetable/manifest.txt
index 791c9372071..5b3cc910b0e 100644
--- a/Master/texmf-dist/doc/latex/widetable/manifest.txt
+++ b/Master/texmf-dist/doc/latex/widetable/manifest.txt
@@ -1,4 +1,4 @@
-Package widetable, version 1.x dated 2017
+Package widetable, version 1.x dated 2018
This small package is intended to be a second resource when typesetting
tables that would look a little better if they were set with a specified width.
@@ -9,7 +9,7 @@ extensions if they are available.
This work may be distributed and/or modified under the
- conditions of the LaTeX Project Public License, either version 1.3
+ 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
@@ -23,14 +23,12 @@ extensions if they are available.
The list of all files belonging to the distribution is
given in this file `manifest.txt'.
- The list of derived (unpacked) files belonging to the distribution
- and covered by LPPL is defined by the unpacking scripts (with
- extension .ins) which are part of the distribution.
-
+
The main file of this work is
- widteable.dtx (autoextracting .dtx file)
+ widteable.dtx (autoextracting .dtx file when processed by
+ pdflatex)
The derived files are
- widetable.pdf (obtained by pdflatexing widetale.dtx)
- widetable.sty (obtained by (la)texing widetale.ins)
+ widetable.pdf
+ widetable.sty
Claudio Beccari \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/widetable/widetable.pdf b/Master/texmf-dist/doc/latex/widetable/widetable.pdf
index 371d7b0d25b..c63baaa2049 100644
--- a/Master/texmf-dist/doc/latex/widetable/widetable.pdf
+++ b/Master/texmf-dist/doc/latex/widetable/widetable.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/widetable/widetable.dtx b/Master/texmf-dist/source/latex/widetable/widetable.dtx
index bcd2010ce9a..db9dfb15be9 100644
--- a/Master/texmf-dist/source/latex/widetable/widetable.dtx
+++ b/Master/texmf-dist/source/latex/widetable/widetable.dtx
@@ -8,7 +8,7 @@
\preamble
______________________________________________________
The WIDETABLE bundle
- Copyright (C) 2009-2017 Claudio Beccari
+ Copyright (C) 2009-2018 Claudio Beccari
All rights reserved
License information appended
@@ -44,13 +44,13 @@ PDF format.
\endgroup
%</internal>
%
-% Copyright 2009--2017 Claudio Beccari
+% Copyright 2009--2018 Claudio Beccari
%
% This file is part of the widetable bundle
% -------------------------------------------
%
% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
+% 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
@@ -76,13 +76,12 @@ PDF format.
%<*driver>
\ProvidesFile{widetable.dtx}%
%</driver>
-%<package>\NeedsTeXFormat{LaTeX2e}[2016/01/01]
%<package>\ProvidesPackage{widetable}%
%<*package>
- [2017/09/09 v.1.4 Package for typesetting specified width tables]
+ [2018-12-14 v.1.5 Package for typesetting specified width tables]
%</package>
%<*driver>
-\documentclass{ltxdoc}
+\documentclass{ltxdoc}\errorcontextlines=100
\hfuzz 10pt
\def\prog#1{\textsf{\slshape#1}}
\usepackage{multicol}
@@ -91,6 +90,7 @@ PDF format.
\usepackage{textcomp}
\usepackage{lmodern}
\usepackage[italian,english]{babel}
+\usepackage{widetable,tabularx, booktabs,ragged2e}
% local definitions
\let\originalmeta\meta
\renewcommand\meta[1]{{\normalfont\originalmeta{#1}}}
@@ -117,7 +117,7 @@ PDF format.
\end{document}
%</driver>
% \fi
-% \CheckSum{178}
+% \CheckSum{181}
% \begin{abstract}
% This package allows to typeset tables of specified width,
% provided they fit in one page. Instead of introducing an
@@ -186,8 +186,8 @@ PDF format.
% |\multicolumn| commands. It proved to work properly also
% if the |array| package extensions are used.
% Nevertheless if multiple |\multirow| commands in different
-% rows ``interlace'' the columns thei work on, poor results
-% are obtained, and sometimes no result at all is obtained
+% rows ``interlace'' the columns they work on, poor results
+% are obtained, and sometimes no result at all is obtained
% except a warning message.
%
% On the other hand, as well as for |tabularX|, it needs to
@@ -210,16 +210,20 @@ PDF format.
% therefore fractional division is not any more an issue as
% it was in previous versions of this package.
%
-% \section{Usage}
-% This package issues an error message only in case the
+% \section{Normal use of \texttt{widetable}}
+% This package issues an error message in case the
% environment includes other unhidden environment; this is
-% explained in the Implementation section.
-% Here it is assumed that the table is first typeset to its
-% natural width; should it appear too small, and should it be
-% typeset at a larger width, for example by filling the
-% total |\linewidth| available at that specific point, then
-% and only then the |tabular| environment is changed to
-% |widetable|. Should the initial table be moderately larger
+% explained in the Implementation section. In plain words,
+% if a |widetable| environment is nested into another one,
+% the inner environment must be “hidden” within a group
+% (a pair of braces).
+%
+% Here it is assumed that the user typesets the table to its
+% natural width with |tabular|; should it appear too small,
+% and should it be typeset at a larger width, for example for
+% filling the total |\linewidth| available at that specific point,
+% then and only then the user changes the |tabular| environment
+% to |widetable|. Should the initial table be moderately larger
% than the |\linewidth|, then it might be shrunk to |\linewidth|
% with |widetable|, provided there are enough columns, and
% therefore delimiters, to be reduced in size. Of course it's
@@ -231,7 +235,7 @@ PDF format.
% so as to correct some typesetting features not considered
% aesthetically acceptable.
%
-% The syntax for the use of the environment |widetable| is the
+% The syntax for tusing the environment |widetable| is the
% same as that of the |tabular*| environment; the only difference
% is the name. Therefore one has to specify:
% \begin{flushleft}\obeylines%
@@ -251,38 +255,37 @@ PDF format.
% suppose the same tabular material is typeset again with an
% inter column glue $t_1 >0$ so that the table table gets as
% large as $l_1>l_0$. Then, if the table has to be as wide as
-% $l$ the inter column glue must equal the
-% value
+% $l$ the inter column glue must equal the value
% \[
% t = \frac{l - l_0}{l_1 - l_0}\cdot t_1
% \]
%
% Therefore we need to run the typesetting of the same tabular
-% material with the two values of the inter column glue set
+% material with the two values of the inter column glue set
% to zero and to $t_1$, respectively, so as to find the widths
% $l_0$ and $l_1$. Afterwards it has to determine the correct
% final value $t$, and typeset once again the same tabular
% material for the last time.
%
% Of course the first two runs must put their results into
-% suitable boxes so as to avoid outputting them into the output
-% file, while at the same time allowing to record the width
+% suitable boxes so as to avoid shipping them to the output
+% file, while at the same time allowing to record the width
% of the enclosing boxes.
%
-% \section{The long division algorithm}
-% In previous versions we provided a fractional length
+% \section{The long division algorithm}
+% In previous versions of this package we provided a fractional length
% division macro to perform such computations; the subtractions
% and multiplication could be done with regular primitive
% commands of the \TeX\ engine; but the fractional division
% required a special long division algorithm.
%
-% With the \eTeX\ extensions to the typesetting engine (already
-% provided in |xetex| and |latex|, therefore available in
+% With the \eTeX\ extensions to the typesetting engine |pdftex|
+% (native in |xetex| and |luatex|, therefore available in
% |XeLaTeX| and |LuaLaTeX|) there is no need to create any
% long division macro, because such computation is already
-% provided as a primitive command.
+% provided in those engines as a primitive command.
%
-% \section{Using the \eTeX\ facilies}
+% \section{Using the \eTeX\ facilities}
% In facts the \eTeX\ extension provides the scaling operation:
% given the length $L_1$ and two homogeneous quantities $X_1$
% and $X_2$ (where such quantities may be either two integer
@@ -292,7 +295,7 @@ PDF format.
% L_2 = L_1\cdot \frac{X_2}{X_1}
%\]
% The intermediate results are actually done with integer
-% arithmetics (internally length are an integer number of
+% arithmetics (internally length are coded as integer numbers of
% scaled points) but are done in double words so as to avoid
% underflow and overflows almost always. Some unusual situations
% might exist where underflows or overflows may occur, but
@@ -305,13 +308,157 @@ PDF format.
% The use of the \eTeX\ extensions implies that this package
% works correctly only with modern engines and kernel formats.
% This is why the package starts with a statement where the
-% kernel format is required to be quite recent.
-
+% kernel format is required to be quite recent.
+%
+% \section{Usage}
+% As explained above, the normal usage of |widetable| requires the same
+% syntax as that of |tabular*| except that no explicit stretchable
+% glue has to be inserted in the column separators as it is necessary
+% to do with |tabular*|. Examine the table shown in table~\ref{tab:tab} that is typeset at its natural width.
+% \begin{table}\centering
+% \begin{tabular}{llr>{\raggedright}p{0.29\textwidth}}
+% \toprule
+% Name & role & age & activity \tabularnewline
+% \midrule
+% William John & father & 45 & employee \tabularnewline
+% Mary Elisabeth & mother & 42 & elementary school
+% teacher\tabularnewline
+% Joan Laura & daughter & 14 & junior high school
+% student\tabularnewline
+% Jack Johnathan & son & 8 & elementary school pupil
+% \tabularnewline
+% \bottomrule
+% \end{tabular}
+% \caption{A regular table typeset with \texttt{tabular} and its width is its natural one}\label{tab:tab}
+% \end{table}
+%
+% The same table can be built with |tabular*| as in table~\ref{tab:tab*}.
+% \begin{table}\centering
+% \begin{tabular*}{\textwidth}%
+% {@{\hskip\tabcolsep\extracolsep{\fill}}llr>{\raggedright}p{0.29\textwidth}}
+% \toprule
+% Name & role & age & activity \tabularnewline
+% \midrule
+% William John & father & 45 & employee \tabularnewline
+% Mary Elisabeth & mother & 42 & elementary school
+% teacher\tabularnewline
+% Joan Laura & daughter & 14 & junior high school
+% student\tabularnewline
+% Jack Johnathan & son & 8 & elementary school pupil
+% \tabularnewline
+% \bottomrule
+% \end{tabular*}
+% \caption{A table typeset with \texttt{tabular*} where the total
+% width has been set to \cs{textwidth}}\label{tab:tab*}
+% \end{table}
+%
+% As it can be seen, large inter column spaces are inserted right
+% at the left of the contents of every cell except the first one,
+% and the table appears too much spread out.
+%
+% The table can be built also with the environment |tabularx|,
+% defined by the |tabularx| package; see the result in
+% table~\ref{tab:tabx}.
+% \begin{table}\centering
+% \begin{tabularx}{\textwidth}{llr>{\raggedright}X}
+% \toprule
+% Name & role & age & activity \tabularnewline
+% \midrule
+% William John & father & 45 & employee \tabularnewline
+% Mary Elisabeth & mother & 42 & elementary school
+% teacher\tabularnewline
+% Joan Laura & daughter & 14 & junior high school
+% student\tabularnewline
+% Jack Johnathan & son & 8 & elementary school pupil
+% \tabularnewline
+% \bottomrule
+% \end{tabularx}
+% \caption{A table typeset with \texttt{tabularx} where the total width
+% has been set to \cs{textwidth}}\label{tab:tabx}
+% \end{table}
+%
+% As it is noticeable the whole space to enlarge the table has
+% been taken from the |X| column, and the table does not look right.
+%
+% Now we show the difference by using the |widetable| environment
+% in table~\ref{tab:tabwide}.
+% \begin{table}\centering
+% \begin{widetable}{\textwidth}{llr>{\raggedright}p{0.29\textwidth}}
+% \toprule
+% Name & role & age & activity \tabularnewline
+% \midrule
+% William John & father & 45 & employee \tabularnewline
+% Mary Elisabeth & mother & 42 & elementary school
+% teacher\tabularnewline
+% Joan Laura & daughter & 14 & junior high school
+% student\tabularnewline
+% Jack Johnathan & son & 8 & elementary school pupil
+% \tabularnewline
+% \bottomrule
+% \end{widetable}
+% \caption{A table typeset with \texttt{widetable} where the total width
+% has been set to \cs{textwidth}}\label{tab:tabwide}
+% \end{table}
+%
+% In table~\ref{tab:tabwide} the column specifications are the same
+% as those used in the code of table~\ref{tab:tab}, but only the
+% spaces separating the columns have been modified, not the column
+% types and widths. Of course one my object that the table spaces
+% are too wide and table~\ref{tab:tab} looks better. But if, for
+% example, in a certain document tables must span the whole width,
+% the the solution given in table~\ref{tab:tabwide} is the only one
+% acceptable among the four shown in these examples. It's up to the
+% user to chose among these four solutions in terms of the actual
+% table contents and the stylistic constraints the document must
+% fulfil. If the examples were typeset with the horizontal and
+% vertical rules that emphasise each cell (instead of using only
+% the |booktabs| horizontal rules) it would be more evident
+% how the various environments shape the cells and where they
+% insert the extra spacing so as to reach the desired width.
+%
+% \section{Warnings}
+% Normally |widetable| works well as described in the example
+% shown in table~\ref{tab:tabwide}. Nevertheless there are some
+% issues that may alter its smooth working.
+%
+% One such issue takes place when the specified table width
+% is shorter the the natural width. In this case the table is
+% typeset as in table~\ref{tab:tab} at its natural width, but
+% a warning is issued that explains why: it looks like this
+%\begin{verbatim}
+%Package widetable Warning: The natural width 225.19809pt of the tabular
+%(widetable) material is larger than the specified width 177.5pt.
+%
+%(widetable)
+%(widetable) The table is typeset with the default
+%(widetable) column spacing on input line 392.
+%\end{verbatim}
+% As usual the warning is contained into the |.aux| file.
+%
+% When a nested tabular environment is contained in |widetable|
+% is not hidden within a group of paired braces, the inner
+% environment is substituted with a framed box that contains
+% a message, and a more descriptive warning is included into
+% the |.aux| file.
+%
+% When some adjacent cells are grouped with the |\multicolumn|
+% command; the table might come out of the correct specified width
+% even if the spanned cells (in different rows) do not belong
+% to the same columns, but the table looks very ugly; we cannot
+% say that |widetable| is responsible of this ugliness, or if
+% the table is ill formed because of using such overlapping
+% spanned cells; the best suggestion is to never use such
+% “acrobatic” table compositions.
+%
% \section{Acknowledgements}
% I must deeply thank Enrico Gregorio for the revision of
% this package macros and for his wise suggestions about
% the correct programming style. If some glitch still
% remains in the programming style, that is just my fault.
+% Deep thanks also go to Frank Mittelbach who spotted an error
+% and suggested some useful modifications; this new version
+% of the package and its documentation comes from Frank's
+% suggestions.
%
% \StopEventually{}
%
@@ -320,25 +467,43 @@ PDF format.
%\fi
% \section{Implementation}
%
-% We identify the package and the necessary \LaTeX\ kernel
+% The package is already identified by the same statement used
+% for this |.dtx| file. The necessary \LaTeX\ kernel date must
+% be specified in order to be sure that the \eTeX\ extensions
+% are available.
+% \begin{macrocode}
+\NeedsTeXFormat{LaTeX2e}[2018/01/01]
+% \end{macrocode}
+%
+% We suppose that the user might wish to use also the extensions
+% of the |array| package; in order to avoid possible option
+% clashes we defer loading this |array| package to the begin
+% document statement and we check if the user has already loaded
+% that package so as not to reload it. This task could be left
+% to the internal workings of the |\RequirePackage| macro, but
+% we prefer to do our checks with a more direct statement.
+% By so doing, this package already has available all the
+% facilities of the |array| package, in particular the
+% |\newcolumntype| command, the column types |m| and |b|,
+% and the various special codes to add commands at the beginning
+% and the end of all the cells of a given column.
% \begin{macrocode}
-\ProvidesPackage{widetable}[2017/09/05 v.1.2 A simpler way to produce
- tables of specified width]
+\AtBeginDocument{%
+ \@ifpackageloaded{array}{}{\RequirePackage{array}}%
+ }
% \end{macrocode}
-% The first thing to do is to globally define a certain
-% number of \TeX\ dimensions and counters; these dimension
-% and counter registers are selected among the extra registers
-% available with the \eTeX\ extensions. In facts such extensions
+%
+% Next we define a certain number of \TeX\ dimensions and counters;
+% these dimension and counter registers might be selected among the extra
+% registers available with the \eTeX\ extensions. In facts such extensions
% allow to use registers identified by numbers higher than 255,
% a limit of the good-old-\TeX; Enrico Gregorio in 2009 suggested
-% to avoid such kind of usage, stating that not all users
-% upgrade so often their \TeX\ system; OK, if they don't upgrade,
-% they have available the previous versions of this package;
-% now I assume that after so many years from when the engines
-% were extended with the \eTeX\ facilities, I can't see why
-% this package should resort to old approaches.
-%
-%
+% to avoid such kind of usage; heremarked that not all users
+% upgrade so often their \TeX\ system; OK, may be they have their
+% good reasons for not upgrading, and they have available the previous
+% versions of this package; may be they use a basic installation
+% of the \TeX\ system and add new packages when they need to use
+% them. Therefore we follow Enrico's suggestion and use some of the scratch registers always available to programmers.
% \begin{macrocode}
\dimendef\wt@Numer=2
\dimendef\wt@Denom=4
@@ -349,7 +514,7 @@ PDF format.
% We require the |xparse| package in order to define the
% environment |widetable| with its extended commands.
% \begin{macrocode}
-\usepackage{xparse}
+\RequirePackage{xparse}
% \end{macrocode}
%
% We define a local scaling macro |\WT@scale| to execute the
@@ -372,19 +537,20 @@ PDF format.
% \end{macrocode}
%
% At this point it will be the |widetable| environment
-% responsibility to call |\WT@scale| with the proper arguments
+% responsibility to call |\WT@scale| with the proper arguments.
%
% Now we define the dimension register that is to contain the
% desired table width.
+% \begin{macrocode}
+\newdimen\wt@width
+% \end{macrocode}
+%
% We further define the start of the tabular typesetting
% that will be useful in a while. Actually the table preamble
% is being saved into a macro, so that when the \meta{width}
% and the \meta{column descriptors} are given to the opening
% environment statement, these saved quantities can be used
% again and again.
-% \begin{macrocode}
-\newdimen\wt@width
-% \end{macrocode}
%
% A new boolean, |wt@scartare|, is defined; this boolean
% variable will be set true in order to detect if the
@@ -438,12 +604,13 @@ PDF format.
% The arbitrary constant of 1\,cm is $t_1$, and the specified
% width $l$ is the dimension saved into |\wt@width|. The
% subtractions are operated directly on the dimension
-% registers |\wt@width| (the numerator) and on the auxiliary
+% registers |\wt@width| (the numerator), and on the auxiliary
% register |\@tempdimenb|; the |\WT@scale| command is executed
-% in order to get the scaling ratio and the final definitive
+% in order to get the scaling ratio and the final definitive
% value of |\tabcolsep| is eventually computed.
% The table is finally typeset without using boxes, while the
-% contents of box zero and two are restored upon exiting the environment to any value they might have contained before
+% contents of box zero and two are restored upon exiting the
+% environment to any value they might have contained before
% entering |widetable|.
% \begin{macrocode}
\def\endwidetable{% CLOSING WIDETABLE
@@ -456,12 +623,12 @@ PDF format.
\setbox\tw@=\hbox{\wt@starttabular\the\toks@\endtabular}%
\ifdim\wt@width<\wd\z@
\@tempdimb=\dimexpr\wd\tw@-\wd\z@\relax
- \PackageWorning{widetable}{%
- The natural width `\the\wd\z@' of the tabular
- material\MessageBreak
- is larger than the specified width
- `\the\wt@width'\MessageBreak\null\space \MessageBreak
- The table is typeset with the default column spacing}%
+ \PackageWarning{widetable}{%
+ The natural width \the\wd\z@ \space of the tabular\MessageBreak
+ material is larger than the specified width
+ \the\wt@width.\MessageBreak\MessageBreak
+ The table is typeset with the default\MessageBreak
+ column spacing}%
\else
\@tempdimb=\dimexpr\wt@width-\wd\z@\relax
\fi
@@ -483,7 +650,7 @@ PDF format.
% \end{macrocode}
%
-% We finally can define the all important macro that gets
+% We finally can define the most important macro that gets
% the table body; it requires two delimited arguments:
% in |#1| the table body and, after the |\end| command,
% the closing environment name will be set in |#2|.
@@ -537,13 +704,12 @@ PDF format.
%
% In order to avoid a complete mess, we have to iteratively
% gobble the rest of the input stream until a valid
-% |\end{widetable}| is encountered; Actually the following
+% |\end{widetable}| is encountered; actually the following
% macro will do a nice job in general, but it is not
% infallible if the input stream is really composed in a very
% bad way. In facts it calls itself again and again, always
% gobbling it arguments, until a valid terminating environment
-% name matches the
-% name |widetable|.
+% name matches the name |widetable|.
% \begin{macrocode}
\def\wt@finishTable#1\end#2{%
\def\@tempB{#2}%
@@ -566,7 +732,7 @@ PDF format.
% the current measure; why not shrink the table by shrinking
% |\tabcolsep| by the right amount in order to fit the
% measure? The result might be a table where only the
-% intercolumn spaces are shrunk, not the whole table, fonts,
+% inter column spaces are shrunk, not the whole table, fonts,
% drawings, and figures included, a result easily obtainable
% with a |\resizebox| command available through the
% \textsf{graphicx.sty} package. Nobody forbids to follow
@@ -575,7 +741,7 @@ PDF format.
%
% The same is true when a natural width table is slightly
% shorter than the measure; enlarging it by retouching
-% the |\tabcolsep| intercolumn space might be the right
+% the |\tabcolsep| inter column space might be the right
% solution in order to avoid a multitude of slightly
% different indents or left margins.
%
diff --git a/Master/texmf-dist/tex/latex/widetable/widetable.sty b/Master/texmf-dist/tex/latex/widetable/widetable.sty
index 114ea14a57c..314f513b659 100644
--- a/Master/texmf-dist/tex/latex/widetable/widetable.sty
+++ b/Master/texmf-dist/tex/latex/widetable/widetable.sty
@@ -7,23 +7,23 @@
%% widetable.dtx (with options: `package')
%% ______________________________________________________
%% The WIDETABLE bundle
-%% Copyright (C) 2009-2017 Claudio Beccari
+%% Copyright (C) 2009-2018 Claudio Beccari
%% All rights reserved
%%
%% License information appended
%%
-\NeedsTeXFormat{LaTeX2e}[2016/01/01]
\ProvidesPackage{widetable}%
- [2017/09/09 v.1.4 Package for typesetting specified width tables]
-
-\ProvidesPackage{widetable}[2017/09/05 v.1.2 A simpler way to produce
- tables of specified width]
+ [2018-12-14 v.1.5 Package for typesetting specified width tables]
+\NeedsTeXFormat{LaTeX2e}[2018/01/01]
+\AtBeginDocument{%
+ \@ifpackageloaded{array}{}{\RequirePackage{array}}%
+ }
\dimendef\wt@Numer=2
\dimendef\wt@Denom=4
\countdef\wt@Num=2
\countdef\wt@Den=4
-\usepackage{xparse}
+\RequirePackage{xparse}
\newcommand\WT@scale[4]{\begingroup
\wt@Num #2\relax \wt@Den #3\relax
\ifnum#3=\z@
@@ -53,12 +53,12 @@
\setbox\tw@=\hbox{\wt@starttabular\the\toks@\endtabular}%
\ifdim\wt@width<\wd\z@
\@tempdimb=\dimexpr\wd\tw@-\wd\z@\relax
- \PackageWorning{widetable}{%
- The natural width `\the\wd\z@' of the tabular
- material\MessageBreak
- is larger than the specified width
- `\the\wt@width'\MessageBreak\null\space \MessageBreak
- The table is typeset with the default column spacing}%
+ \PackageWarning{widetable}{%
+ The natural width \the\wd\z@ \space of the tabular\MessageBreak
+ material is larger than the specified width
+ \the\wt@width.\MessageBreak\MessageBreak
+ The table is typeset with the default\MessageBreak
+ column spacing}%
\else
\@tempdimb=\dimexpr\wt@width-\wd\z@\relax
\fi