texlive[45231] Master/texmf-dist: widetable (6sep17)
commits+karl at tug.org
commits+karl at tug.org
Thu Sep 7 00:07:49 CEST 2017
Revision: 45231
http://tug.org/svn/texlive?view=revision&revision=45231
Author: karl
Date: 2017-09-07 00:07:49 +0200 (Thu, 07 Sep 2017)
Log Message:
-----------
widetable (6sep17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/widetable/README
trunk/Master/texmf-dist/doc/latex/widetable/manifest.txt
trunk/Master/texmf-dist/doc/latex/widetable/widetable.pdf
trunk/Master/texmf-dist/source/latex/widetable/widetable.dtx
trunk/Master/texmf-dist/tex/latex/widetable/widetable.sty
Removed Paths:
-------------
trunk/Master/texmf-dist/source/latex/widetable/widetable.ins
Modified: trunk/Master/texmf-dist/doc/latex/widetable/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/widetable/README 2017-09-06 22:06:23 UTC (rev 45230)
+++ trunk/Master/texmf-dist/doc/latex/widetable/README 2017-09-06 22:07:49 UTC (rev 45231)
@@ -1,3 +1,5 @@
+Package widetable version 1.2 dated 2017
+
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
@@ -12,3 +14,4 @@
http://www.latex-project.org/lppl.txt
and version 1.3 or later is part of all distributions of LaTeX
version 2003/12/01 or later.
+
Modified: trunk/Master/texmf-dist/doc/latex/widetable/manifest.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/widetable/manifest.txt 2017-09-06 22:06:23 UTC (rev 45230)
+++ trunk/Master/texmf-dist/doc/latex/widetable/manifest.txt 2017-09-06 22:07:49 UTC (rev 45231)
@@ -1,3 +1,5 @@
+Package widetable, version 1.x dated 2017
+
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
@@ -25,11 +27,10 @@
and covered by LPPL is defined by the unpacking scripts (with
extension .ins) which are part of the distribution.
-The main files of this work are
- widetable.ins
- widteable.dtx
+The main file of this work is
+ widteable.dtx (autoextracting .dtx file)
The derived files are
- widetable.pdf (obtained by pdflatexing widetale.dtx)
- widetable.sty (obtained by (la)texing widetale.ins)
+ widetable.pdf (obtained by pdflatexing widetale.dtx)
+ widetable.sty (obtained by (la)texing widetale.ins)
-Claudio Beccari, 26 October 2009
\ No newline at end of file
+Claudio Beccari
\ No newline at end of file
Modified: trunk/Master/texmf-dist/doc/latex/widetable/widetable.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/widetable/widetable.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/widetable/widetable.dtx 2017-09-06 22:06:23 UTC (rev 45230)
+++ trunk/Master/texmf-dist/source/latex/widetable/widetable.dtx 2017-09-06 22:07:49 UTC (rev 45231)
@@ -1,11 +1,85 @@
+% \iffalse meta-comment
+%<*internal>
+\begingroup
+\input docstrip.tex
+\keepsilent
+
+
+\preamble
+ ______________________________________________________
+ The WIDETABLE bundle
+ Copyright (C) 2009-2017 Claudio Beccari
+ All rights reserved
+
+ License information appended
+
+\endpreamble
+\postamble
+
+Copyright 2009-2017 Claudio Beccari
+
+Distributable under the LaTeX Project Public License,
+version 1.3c or higher (your choice). The latest version of
+this license is at: http://www.latex-project.org/lppl.txt
+
+This work is "author-maintained"
+
+This work consists of this file WIDETABLE.dtx, a README file
+the manifest.txt file, and the derived files:
+ widetable.sty and widetable.pdf.
+
+
+By running pdflatex on widetable.dtx the user gets the sty
+file and the English documentation file in
+PDF format.
+
+\endpostamble
+
+\askforoverwritefalse
+
+\generate{\file{widetable.sty}{\from{widetable.dtx}{package}}}
+
+\def\tmpa{plain}
+\ifx\tmpa\fmtname\endgroup\expandafter\bye\fi
+\endgroup
+%</internal>
+%
+% Copyright 2009--2017 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
+% 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 2003/12/01 or later.
+%
+% This file has the LPPL maintenance status "author-maintained".
+%
+% The list of all files belonging to the widetable bundle is
+% given in the file `manifest.txt'.
+%
+% The set of derived (unpacked) files belonging to the
+% distribution and covered by LPPL is created by the self
+% unpacking file widetable.dtx
+% which is the principal part of the distribution.
+%
+% \fi
+
+
+
+
% \iffalse
%<*driver>
\ProvidesFile{widetable.dtx}%
%</driver>
-%<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
+%<package>\NeedsTeXFormat{LaTeX2e}[2016/01/01]
%<package>\ProvidesPackage{widetable}%
%<*package>
- [2009/10/26 v.1.1 Package for typesetting specified width tables]
+ [2017/09/05 v.1.2 Package for typesetting specified width tables]
%</package>
%<*driver>
\documentclass{ltxdoc}
@@ -12,16 +86,28 @@
\hfuzz 10pt
\def\prog#1{\textsf{\slshape#1}}
\usepackage{multicol}
-\usepackage[latin1]{inputenc}
+\usepackage[utf8]{inputenc}
\usepackage[T1]{fontenc}
\usepackage{textcomp}
\usepackage{lmodern}
\usepackage[italian,english]{babel}
+% local definitions
+\let\originalmeta\meta
+\renewcommand\meta[1]{{\normalfont\originalmeta{#1}}}
+\renewcommand\marg[1]{\texttt{\{\meta{#1}\}}}
+\newcommand\Marg[1]{\texttt{\{#1\}}}
+\newcommand\opz[1]{\texttt{[\meta{#1}]}}
+\newcommand\Opz[1]{\texttt{[#1]}}
+\renewcommand\cs[1]{{\normalfont\ttfamily\char92#1}}
+\newcommand\Benv[1]{\texttt{\char92begin\{#1\}}}
+\newcommand\Eenv[1]{\texttt{\char92end\{#1\}}}
+\newcommand\eTeX{\raisebox{-0.5ex}{$\varepsilon$}\kern-0.1666em\TeX}
+% end local definitions
\begin{document}
\makeatletter
\GetFileInfo{widetable.dtx}%
-\title{The Package \textsf{widetable}\thanks{Version number \fileversion; last revision
-\filedate.}}
+\title{The Package \textsf{widetable}}
+\date{Version number \fileversion; last revision \filedate.}
\author{Claudio Beccari\thanks{\texttt{claudio dot beccari at gmail dot com}}}
\maketitle
\begin{multicols}{2}
@@ -31,12 +117,14 @@
\end{document}
%</driver>
% \fi
-% \CheckSum{314}
+% \CheckSum{180}
% \begin{abstract}
-% This package allows to typeset tables of specified width, provided they fit in one
-% page. Instead of introducing an infinite stretching glue, which has an
-% unsymmetrical effect in standard \LaTeX, here the |\tabcolsep| dimension is
-% computed so as to have the table come out with the proper width.
+% This package allows to typeset tables of specified width,
+% provided they fit in one page. Instead of introducing an
+% infinite stretching glue, which has an unsymmetrical effect
+% in standard \LaTeX, here the |\tabcolsep| dimension is
+% computed so as to have the table come out with the proper
+% width.
% \end{abstract}
%
% \section{Legalese}
@@ -63,413 +151,322 @@
% extension .ins) which are part of the distribution.
%
%\section{Introduction}
-% It is well known that when the standard environment |tabular*| is opened with
-% a specified width, it is necessary to introduce in the delimiter declaration |@{...}|
-% of (possibly) the first cell of the model row a declaration such as
+% It is well known that when the standard environment
+% |tabular*| is opened with a specified width, it is
+% necessary to introduce in the delimiter declaration
+% |@{...}| of (possibly) the first cell of the model row
+% a declaration such as
% \begin{verbatim}
% \extracolsep{\fill}
% \end{verbatim}
-% in addition to other possible printable delimiters, such as vertical lines, and
-% other fixed spacing commands. The effect is that the extra stretchable glue
-% operates only on the left of each cell \emph{after} (to the \emph{right} of)
-% the cell that received the declaration; the first cell will never get larger
-% in spite of the presence of this glue.
+% in addition to other possible printable delimiters, such
+% as vertical lines, and other fixed spacing commands. The
+% effect is that the extra stretchable glue operates only
+% on the left of each cell \emph{after} (to the \emph{right}
+% of) the cell that received the declaration; the first cell
+% will never get larger in spite of the presence of this glue.
%
-% Another package, |tabularX|, normally distributed by the \LaTeX\,3 Team with
-% every version of the \TeX\ system distribution, allows to create expandable cells,
-% provided they contain only text. These expandable cells are identified with the
-% column identifier |X|; this identifier defines a paragraph-like cell, the width of
-% which gets determined after some runs of the typesetter on the same source
-% tabular material, so as to find out the correct width of the textual columns.
+% Another package, |tabularX|, normally distributed by the
+% \LaTeX\,3 Team with every version of the \TeX\ system
+% distribution, allows to create expandable cells,
+% provided they contain only text. These expandable cells
+% are identified with the column identifier |X|; this
+% identifier defines a paragraph-like cell, the width of
+% which gets determined after some runs of the typesetter
+% on the same source tabular material, so as to find out the
+% correct width of the textual columns.
%
-% The approach here is a little bit different: the cell contents need not be textual
-% and no cell width is determined in one or more runs of the typesetter; instead the
-% inter column glue is determined so as to fill every cell on both sides with the
-% proper space. The macros contained in this package are insensitive to the
-% particular kind of cell descriptors and to the presence of multiple |\multicolumn|
-% commands. It proved to work properly also if the |array| package extensions are
-% used.
+% The approach here is a little bit different: the cell
+% contents need not be textual and no cell width is determined
+% in one or more runs of the typesetter; instead the
+% inter column glue is determined so as to fill every cell
+% on both sides with the proper space. The macros contained
+% in this package are insensitive to the particular kind
+% of cell descriptors and to the presence of multiple
+% |\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
+% except a warning message.
%
-% On the other hand, as well as for |tabularX|, it needs to typeset the table three
-% times; the first two times with standard values for the inter column glue
-% |\tabcolsep|, in order to find the exact parameters of the linear dependence of
-% the table width from the value of that glue; then executes some computations
-% so as to extrapolate the final correct value of |\tabcolsep|, and on the third run
-% it eventually typesets the table with the specified width.
+% On the other hand, as well as for |tabularX|, it needs to
+% typeset the table three times; the first two times with
+% standard values for the inter column glue |\tabcolsep|, in
+% order to find the exact parameters of the linear dependence
+% of the table width from the value of that glue; then executes
+% some computations so as to extrapolate the final correct
+% value of |\tabcolsep|, and on the third run it eventually
+% typesets the table with the specified width.
%
-% The time increase needed for these three table typesettings are in general rather
-% negligible, nevertheless if a specific document contained many dozens of such
-% tables, the compilation time might become observable.
+% The time increase needed for these three table typesettings
+% is in general rather negligible, nevertheless if a specific
+% document contained many dozens of such tables, the compilation
+% time might become perceivable.
%
-% It might be noticed that in order to perform the necessary computations a
-% fractional division algorithm had to be implemented; A specific \LaTeX\ run that
-% loads several different packages might then contain several fractional division
-% macros, besides those already contained in the kernel. But unfortunately each of
-% these macros has been designed for a specific purpose and a specific interface.
+% It might be noticed that in order to perform the necessary
+% computations a fractional division algorithm must be used;
+% since 2009 any \TeX\ installation uses the \eTeX\ extensions;
+% 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 environment includes
-% other unhided environment; this is explained in the Implementation section.
+% This package issues an error message only 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 than the |\linewidth|, than it might
-% be shrinked to |\linewidth| with |widetable|, provided there are enough
-% columns, and therefore delimiters, to be reduced in size. Of course it's impossible
-% to typeset any table with any negative value of |\tabcolsep|; or better, it is
-% possible, but the result in general is very messy.
+% 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
+% 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
+% impossible to typeset any table with any negative value
+% of |\tabcolsep|; or better, it is possible, but the result
+% in general is very messy.
%
-% In other words |widetable| should be used as a second resort, so as to correct
-% some typesetting features not considered aesthetically acceptable.
+% In other words |widetable| should be used as a second resort,
+% so as to correct some typesetting features not considered
+% aesthetically acceptable.
%
-% The syntax for the use of the environment |widetable| is the same as that of the
-% |tabular*| environment; the only difference is the name. Therefore one has to
-% specify:
+% The syntax for the use of 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%
-% \cs{begin}\texttt{\{widetable\}\{}\meta{width}\texttt{\}\{}\meta{column descriptors}\texttt{\}}
-% \meta{line of cells}\texttt{\cs{\textbackslash}}
-% \meta{line of cells}\texttt{\cs{\textbackslash}}
+% \Benv{widetable}\marg{width}\opz{alignment}\marg{column descriptors}
+% \meta{row of cells}\cs{\textbackslash}
+% \meta{row of cells}\cs{\textbackslash}
% \texttt{...}
-% \meta{line of cells}\texttt{\cs{\textbackslash}}
-% \meta{line of cells}\texttt{\cs{\textbackslash}}
-% \cs{end}\texttt{\{widetable\}}
+% \meta{row of cells}\cs{\textbackslash}
+% \meta{row of cells}\cs{\textbackslash}
+% \Eenv{widetable}
% \end{flushleft}
%
% \section{The method}
-% The principle on which this little package is based is the following; suppose a
-% certain table is typeset with an inter column glue $t_0=0$ and that its width
-% turns out to be $l_0$; 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
+% The principle on which this little package is based is the
+% following; suppose a certain table is typeset with an inter
+% column glue $t_0=0$ and that its width turns out to be $l_0$;
+% 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
% \[
% 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 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 of the enclosing boxes.
+%
+% Therefore we need to run the typesetting of the same tabular
+% 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
+% of the enclosing boxes.
%
% \section{The long division algorithm}
-% The only simple equation the algorithm must compute consists in evaluating the
-% difference of of two lengths (a computation that is perfectly feasible with the
-% available simple \TeX\ primitive commands); a fractional division (not feasible
-% with any \TeX\ primitive command), and finally into multiplying this division
-% result by the only non zero inter column glue (another simple task to be done
-% with \TeX\ primitive commands).
-%
-% I have tried several algorithms for computing the fractional result of the division
-% of two lengths; unfortunately no one guarantees a minimum of precision with
-% any sized operands; overflows and similar ``accidents'' are very common.
-% Iterative algorithms are difficult to initialize; scaling the operands give a good
-% % chance of getting acceptable results, but in one way or another I always found
-% some drawbacks.
-% Therefore I decided to program the so called ``long division'' algorithm
-% preceded by a number of tests in order to avoid spending time in vanishing
-% results, and, even more important, to waste time in getting overflows that cause
-% an abnormal termination of the typesetting program.
-%
-% Of course there is no limit to a better solution; nevertheless the one I
-% implemented never crashed in any real world situation I tested.
+% In previous versions 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.
%
-% \section{Using the \boldmath$\varepsilon$-\TeX\ facilies}
-% On the other side if the |etex| facilies are available a different approach may
-% be taken; |etex| natively performs several calculations connected by mathematical
-% operations. In particular the scaling operation such as a dimension multiplied by
-% a number ad immediately divided by another number is performed by storing the
-% intermediate result into a 64-bit register, so that no overflow takes place if the
-% operands represent lengths or the scaled-point numbers equivalent to these lengths.
-% If the |etex| facilties are available, other calculations are more easily performed
-% in order to determine directly the scaled length it is necessary to determine.
-%
-% Therefore this package works equally well with old engines that do not have the
-% |etex| functionality and with modern engines that possess this functionality;
-% of course modern engines work much better and faster.
+% With the \eTeX\ extensions to the typesetting engine (already
+% provided in |xetex| and |latex|, 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.
%
-% \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.
+% \section{Using the \eTeX\ facilies}
+% 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
+% numbers, or two dimensions), such scaling operation scales
+% $L_1$ to $L_2$ by computing
+%\[
+% 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
+% 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
+% they must be very unusual, and very unlikely to happen for
+% the calculations of this package. In case of overflow a
+% |\maxdimen| value is automatically obtained and computations
+% go on as possible, may be giving rise to other errors or
+% warnings, for example overfull lines.
%
-% I also thank very much Peter R.~Wilson who wrote the excellent class |memoir.cls|
-% and its formidable decumentation. I copied from his code the necessary lines for
-% testing the |etex| functionality of the engine that is processing this file.
+% 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.
+
+% \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.
%
% \StopEventually{}
%
+%\iffalse
+%<*package>
+%\fi
% \section{Implementation}
-% 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
-% first even numbered ones, as our Grand Wizard suggested in the \TeX\-book.
+%
+% We identify the package and the necessary \LaTeX\ kernel
+% \begin{macrocode}
+\ProvidesPackage{widetable}[2017/09/05 v.1.2 A simpler way to produce
+ tables of specified width]
+% \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
+% 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.
%
-% Actually I'd prefer to define such registers within the group of the division
-% algorithm, so as not to mess up anything that might be used by other macros,
-% but I accepted the suggestion of Enrico Gregorio, about the programming style
-% and I left these register definitions in a global position, instead of a local group
-% position.
%
-% Another point that initially I had solved in a different way was to use register
-% numbers over the value 255, the maximum that good old \TeX\ could handle.
-% Now the typesetting\slash interpreter program \textsf{pdftex} embeds all the
-% extensions introduced with the former \textsf{$\varepsilon$-\TeX} program;
-% now the numbering of the registers can go up to $2^{15}-1$, and there is
-% enough choice for any numbering. But it may be argued that \LaTeX\ users do
-% not upgrade their software so often, while there are some situations where the
-% use of obsolete versions must be still preferred (I can't imagine any, but they
-% assure me that there are some). Therefore Enrico correctly suggests to use the
-% scratch even numbered registers (Knuth's suggestion, although Knuth excluded
-% the counter registers from this statement, being the first 10 counters reserved
-% for complicated page numbering applications).
% \begin{macrocode}
\dimendef\wt at Numer=2
\dimendef\wt at Denom=4
\countdef\wt at Num=2
\countdef\wt at Den=4
-\countdef\wt at I=6
-\def\wt at segno{}
-
% \end{macrocode}
%
-% We copy from |memoir.cls| the relevant lines and modify them in order to make
-% them suitable for this |widetable| package. The relevant point is that a new |\if|
-% is defined, |\ifetex|, and is immediately set to |true| or |false| depending on the
-% fact that the engine being used has the |etex| functionalities. Actually all modern
-% engines have these functionalites, but they might have been disabled; old engines
-% lack these functionalites. May be, if a real \textsf{ifetex.sty} package existed, it
-% would not be necessary to do any testing and to emulate its inner workings. May be
-% this package could more efficiently detect it the current engine might be conforming
-% to the |etex| specifications, but the latter have been disabled. In any case if the
-% package existed, its macros would be used instead of the emulated ones.
+% We require the |xparse| package in order to define the
+% environment |widetable| with its extended commands.
% \begin{macrocode}
-\newif\ifm at mifetex
- \m at mifetexfalse
-\IfFileExists{ifetex.sty}{\RequirePackage{ifetex}\relax}{%
- \PackageWarningNoLine{widetable}{%
- If there is an `ifetex' package then it is not installed.\MessageBreak
- The package is being emulated}%
-\m at mifetextrue
-\newif\ifetex
- \etexfalse
-\ifx\eTeXversion\undefined
-\else
- \ifx\eTeXversion\@undefined
- \else
- \ifx\eTeXversion\relax
- \else
- \ifnum\eTeXversion>0\relax
- \etextrue
- \fi
- \fi
- \fi
-\fi
-%%\EmulatedPackage{ifetex}[2008/07/23]% from memoir.cls
-}
-
+\usepackage{xparse}
% \end{macrocode}
-%
-% We then start the definition of the division algorithm; the name of the macro and
-% the separators of the delimited arguments are in Italian, thus minimizing the risk
-% of colliding with macros of other packages. ``dividi\dots per\dots in\dots''
-% means ``divide\dots by\dots, to\dots''; the first ``\dots'' represent the
-% dividend, the second ``dots'' represent the divisor (both are lengths), while the
-% third ``\dots'' represent the quotient (a signed fractional decimal number).
-%
-% The first operations performed on the operands are to copy them into named
-% dimension registers; the named registers make the programming a little easier,
-% in the sense that the chosen names have a meaning and their contents should
-% conform to that meaning.
-%
-% Then the sings of the register operands are checked and pssibly changed so as to
-% work with positive values; the overall result sign is memorized into a named
-% macro (all macros are named, but here the name conforms to its contents
-% ``segno'' maps to ``sign'').
-% Afterwards the zero value of the denominator is tested; if the test is true the
-% result assigned to the internal quotient macro |\wt at Q| is the signed dimensional
-% ``infiniy'', that in \TeX\ and \LaTeX\ is equal to $2^{30}-1$ scaled points; this
-% value is assigned by the format to the kernel dimension register |\maxdimen|, so
-% we need just use this name, instead of assigning strange numerical values; the
-% only thing we must pay attention to is to strip the ``pt'' information from this
-% ``infinite'' dimension, since the quotient must be a dimensionless signed
-% fractional decimal number. Notice that in this apllication the denominator never
-% vanishes, so that actually some of the tests are useless; nevertheless if the macro
-% is copied and used in other packages they might turn up to be essential.
-%
-% Otherwise we load the operands in similarly named counter registers, effectively
-% transferring the dimension integer number of scaled points to integer variables
-% over which we continue our operations.
-%
-% We compute by the primitive \TeX\ integer division command the integer part of
-% the quotient and we assing its expanded decimal value, followed by a decimal
-% point, to the temporary internal quotient. Getting back to dimensions,
-% we compute the remainder of the numerator minus the quotient times the
-% denominator in terms of lengths. We locally set the number of iterations |\wt at I|
-% to six, and then we call the iterative algorithm of the long division within a
-% |\@whilenum|\dots|\do| cycle.
-%
-% At the exit of this cycle the internal quotient |\wt at Q| contains all the digits of the
-% integer and the fractional part of the result.
-%
-% Now comes the interesting part: we are within a group and we must ``throw''
-% the quotient outside the group, but hopefully we would not like to leave
-% something behind; we then define an expanded macro that contains the
-% unexpanded |\endgroup| so that when we execute that macro, it is this very
-% action that closes the group and at the same time, in spite of having been started
-% within it,
-% it keeps being executed bringing outside the definition of the external quotient
-% that will be executed outside the group with the expanded value of the
-% internal quotient. When |\x| is finished it does not exist any more as well as any
-% value that was assigned or defined within the group.
+%
+% We define a local scaling macro |\WT at scale| to execute the
+% scaling operation that is of interest to the |widetable|
+% package. We provide some tests so as to set some values
+% for very unusual situations. The four arguments are as such:
+% |#1|: length to be scaled; |#2|: numerator of the scaling
+% ratio; |#3|: denominator of the scaling ratio; |#4|: scaled
+% length.
% \begin{macrocode}
-\def\dividi#1\per#2\in#3{%
- \begingroup
- \wt at Numer #1\relax \wt at Denom #2\relax
- \ifdim\wt at Denom<\z@ \wt at Denom -\wt at Denom \wt at Numer -\wt at Numer\fi
- \ifdim\wt at Numer<\z@ \def\wt at segno{-}\wt at Numer -\wt at Numer\fi
- \ifdim\wt at Denom=\z@
- \edef\wt at Q{\ifdim\wt at Numer<\z at -\fi\strip at pt\maxdimen}%
- \else
- \wt at Num=\wt at Numer \wt at Den=\wt at Denom \divide\wt at Num\wt at Den
- \edef\wt at Q{\number\wt at Num.}%
- \advance\wt at Numer -\wt at Q\wt at Denom \wt at I=6
- \@whilenum \wt at I>\z@ \do{\wt at dividiDec\advance\wt at I\m at ne}%
- \fi
- \edef\x{\noexpand\endgroup\noexpand\def\noexpand#3{\wt at segno\wt at Q}}
- \x
-}
-
-% \end{macrocode}
-%
-% The cycle for the long division consists in multiplying the remainder in
-% |\wt at Numer| by ten, then reassigning the dimension value to the numerator
-% integer counter so as to determine a new digit of the quotient in |\wt at q|. After
-% this, this digit is appended by means of an expanded definition of the internal
-% quotient, but it is used also for determining the new remainder in the
-% |\wt at Numer| dimension register. Since the iteration is performed six times, six
-% fractional digits are determined by this procedure, probably one digit too many,
-% but its better one too many than the opposite.
-% \begin{macrocode}
-\def\wt at dividiDec{%
- \wt at Numer=10\wt at Numer \wt at Num=\wt at Numer \divide\wt at Num\wt at Den
- \edef\wt at q{\number\wt at Num}\edef\wt at Q{\wt at Q\wt at q}%
- \advance\wt at Numer -\wt at q\wt at Denom}
-
-% \end{macrocode}
-%
-% On the other hand for exploiting the facilites of the |etex| engine we define
-% a new command |\scala| (`` imperative of the verb to scale'') that performs
-% the scaling oepration by executing first a multiplication and then a division,
-% while accumulating the intermediate result into a 64-bit register so as not to
-% loose precision. Therefore this new command receives four arguments: the first
-% is the length to be scaled, the second and the third are two lengths the ratio
-% of which forms the scaling factore, and the foruth is the resulting scaled
-% dimension. The numerator and the denominator lengths whose ratio defines the
-% scaling factor are stored into two numerical registers as scaled points;
-% therefore the length to be scaled is first multiplied by the numerator integer
-% number of scaled points, and immediately divided by the denominator integer number
-% of scaled points; the result is assigned to a temmporary dimension that on exit
-% will be assigned to the fourth macro argument. in order to preserve all the
-% variable and register contents, everything is done within a group and the final
-% result is thrown out of the group by means of the usual trick already used in the
-% |\dividi| macro above.
-% \begin{macrocode}
-\def\scala#1\per#2\diviso#3\in#4{\begingroup
+\newcommand\WT at scale[4]{\begingroup
\wt at Num #2\relax \wt at Den #3\relax
-\ifnum\wt at Den<\z@ \wt at Den -\wt at Den \wt at Num -\wt at Num \fi
-\ifnum\wt at Den=\z@
- \@tempdima\ifnum\wt at Num<0-\fi\maxdimen
+\ifnum#3=\z@
+ \@tempdima\ifnum#2<0-\fi\maxdimen
\else
- \@tempdima\dimexpr#1*\wt at Num/\wt at Den\relax
+ \@tempdima\dimexpr#1*#2/#3\relax
\fi
-\edef\x{\noexpand\endgroup\noexpand\def\noexpand#4{\the\@tempdima}}%
+\edef\x{\noexpand\endgroup\noexpand\setlength{#4}{\the\@tempdima}}%
\x}
-
% \end{macrocode}
-% At this point it will be the |widetable| environment responsibility to call |\scala|
-% or |\dividi| according to the availaility of the |etex| facilities specified by the
-% status of the |\ifetex| test.
+%
+% At this point it will be the |widetable| environment
+% responsibility to call |\WT at scale| with the proper arguments
%
-% Now we define the dimension register that is to contain the desired table width.
-% 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.
+% Now we define the dimension register that is to contain the
+% desired table width.
+% 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 at width
-
-\def\wt at starttabular{\expandafter\tabular\expandafter{\wt at preamble}}
-
% \end{macrocode}
%
-% The environment opening as well as the environment closing are defined by
-% means of low level commands. Due to the syntax of the opening command that
-% requires two compulsory arguments, these are saved in the recently defined
-% dimension register and to a macro respectively; anotehr macro |\wt at getTable| is
-% used to get the body of the table; the |\end{widetable}| statement
-% represents the ending delimiter of the table contents.
-%
+% A new boolean, |wt at scartare|, is defined; this boolean
+% variable will be set true in order to detect if the
+% table body is is not well formed, with |\begin| and |\end|
+% statements that don't match, and the like; actually the
+% |widetable| environment can contain other environment,
+% even another |widetable| environment, but the external
+% one should not be upset by the internal ones. In order
+% to achieve this result, it is necessary that any
+% embedded environment is hidden int a group delimited by
+% a pair of matching braces.
% \begin{macrocode}
-\def\widetable#1#2{%
- \def\@tempC{widetable}\setlength{\wt at width}{#1}%
- \def\wt at preamble{#2}\wt at getTable}
+\newif\ifwt at scartare\wt at scartarefalse
% \end{macrocode}
%
-% A new boolean, |wt at scartare|, is defined; this boolean variable will be set true in
-% order to detect if the table body is is not well formed, with |\begin| and |\end|
-% statements tha don't match, and the like; actually the |widetable| environment can
-% contain other environmente, even another |widetable| environment, but the
-% external one should not be upset by the internal ones. In order to achieve this
-% result, it is necessary that any embedded environment is hidden int a group
-% delimited by a pair of matching braces.
+% The environment opening as well as the environment closing
+% are defined by means of low level commands. Due to the syntax
+% of the opening command that requires two compulsory
+% arguments, these are saved in the recently defined
+% dimension register and to a macro respectively; another
+% macro |\wt at getTable| is used to get the body of the table;
+% the |\end{widetable}| statement represents the ending
+% delimiter of the table contents.
+%
% \begin{macrocode}
-\newif\ifwt at scartare\wt at scartarefalse
-
+\DeclareDocumentCommand\widetable{m O{c} m}
+{% OPENING WIDETABLE
+ \def\@tempC{widetable}
+ \setlength{\wt at width}{#1}%
+ \def\wt at preamble{#3}
+ \edef\wt at starttabular{\noexpand\tabular[#2]{\wt at preamble}}
+ \wt at getTable}%
% \end{macrocode}
%
-% The closing statement will acttually do the greatest part of the job. First of all if
-% the above mentioned boolean variable is true, it skips everyting and it does not
-% set any table; but if the boolean variable is false, the table body is well formed
-% and it can do the job as described in the previous sections. It first sets
-% |\tabcolsep| to zero and sets the resulting table in box zero; the lower
-% level |tabular| with the information saved into |\wt at startabular| and the body of
+% The closing statement will actually do the greatest part of
+% the job. First of all if the above mentioned boolean variable
+% is true, it skips everything and it does not set any table;
+% but if the boolean variable is false, the table body is well
+% formed and it can do the job as described in the previous
+% sections. It first sets |\tabcolsep| to zero and sets the
+% resulting table in box zero; the lower level |tabular| with
+% the information saved into |\wt at startabular| and the body of
% the table contained into the token register zero.
%
-% Then it sets |\tabcolsep| to 1\,cm (arbitrarily chosen) and typesets again the table
-% into box two. The width of box zero is $l_0$ and that of box two is $l_1$; these
-% are the lengths needed by the equation that evaluates the final typesetting glue.
-% The arbitrary constant of 1\,cm is $t_1$, and the specified width $l$ is the
-% dimension saved into |\wt at width|. The subtractions are operated directly on the
-% dimension registers |\wt at width| (the numerator) and on the auxiliary register
-% |\@tempdimenb|; the |\dividi| or the |\scala| command, depending on the |\ifetex|
-% status, is executed in order to get the scaling ratio in |\@tempA|, if the |etex|
-% facilites are not available, and, in any case, 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 entering |widetable|.
+% Then it sets |\tabcolsep| to 1\,cm (arbitrarily chosen) and
+% typesets again the table into box two. The width of box zero
+% is $l_0$ and that of box two is $l_1$; these are the lengths
+% needed by the equation that evaluates the final typesetting
+% intercolumn spacing.
+% The arbitrary constant of 1\,cm is $t_1$, and the specified
+% width $l$ is the dimension saved into |\wt at width|. The
+% subtractions are operated directly on the dimension
+% registers |\wt at width| (the numerator) and on the auxiliary
+% register |\@tempdimenb|; the |\WT at scale| command is executed
+% 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
+% entering |widetable|.
% \begin{macrocode}
-\def\endwidetable{%
+\def\endwidetable{% CLOSING WIDETABLE
\ifwt at scartare
\noindent\null
\else
\tabcolsep=\z@
\setbox\z@=\hbox{\wt at starttabular\the\toks@\endtabular}%
- \tabcolsep=1cm\relax
+ \tabcolsep=6pt\relax
\setbox\tw@=\hbox{\wt at starttabular\the\toks@\endtabular}%
- \advance\wt at width-\wd\z@
- \@tempdimb=\wd\tw@
- \advance\@tempdimb-\wd\z@
- \ifetex
- \scala\tabcolsep\per\wt at width\diviso\@tempdimb\in\tabcolsep\relax
+ \ifdim\wt at width<\wd\z@
+ \@tempdimb=\dimexpr\wd\tw at -\wd\z@\relax
+ \PackageWorning{widetable}{%
+ The natural width `\the\wd\z@' of the tabular
+ material\MessageBreak
+ is larger than the specified width
+ `\the\wt at width'\MessageBreak\null\space \MessageBreak
+ The table is typeset with the default column spacing}
\else
- \dividi\wt at width\per\@tempdimb\in\@tempA
- \tabcolsep=\@tempA\tabcolsep
+ \@tempdimb=\dimexpr\wt at width-\wd\z@\relax
\fi
+ \@tempdimc=\dimexpr\wd\tw at -\wd\z@\relax
+ \WT at scale{\tabcolsep}{\@tempdimb}{\@tempdimc}{\tabcolsep}\relax
\wt at starttabular\the\toks@\endtabular
\fi
\ignorespacesafterend
@@ -476,35 +473,43 @@
}
% \end{macrocode}
-%
-% Of course other actions must be performed before executing the closing
-% environment statement. We need a macro |wt at finetabella| that is equivalent to
-% the ending environment statement.
+%
+% Of course other actions must be performed before executing
+% the closing environment statement. We need a macro
+% |wt at finetabella| that is equivalent to the ending environment
+% statement.
% \begin{macrocode}
\def\wt at finetabella{\end{widetable}}%
% \end{macrocode}
-%
-% We finally can define the all 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|. The environment name is
-% assigned to the macro |\@tempB|, which is checked against the correct name
-% |widetable| saved in the macro |\@tempC| by the opening command. If the names
-% match, then the table body is assigned to the token register zero, to be used later
-% on by the typesetting macros. But if the names don't match, then something went
-% wrong and a package message is issued to explain what happened and how the
-% program will manage the situation.
+%
+% We finally can define the all 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|.
+% The environment name is assigned to the macro |\@tempB|,
+% which is checked against the correct name |widetable|
+% saved in macro |\@tempC| by the opening command. If the
+% names match, then the table body is assigned to the token
+% register zero, to be used later on by the typesetting macros.
+% But if the names don't match, then something went wrong
+% and a package message is issued to explain what happened
+% and how the program will manage the situation.
%
-% Specifically the names may not match if a cell contained another environment and
-% its whole |\begin{...}...\end{...}| was not closed within a pair of matched
-% braces. If an enclosed environment is hidden within a group, the delimited macro
-% |\wt at getTable| will ignore such embedded environment, otherwise it will get a
-% non matching name and messy things might happen. Besides warning about this
-% fact, the body of the table, at least what has been read by the macro, will be
-% discarded and substituted with a box containing a message; therefore a table will
-% be typeset, but not the desired one. The remaining part of the body remains in
-% the input stream and might cause, presumably, strange errors, such as |&|
-% characters used outside a tabular or array environment. We must take care of this
+% Specifically the names may not match if a cell contained
+% another environment and its whole |\begin{...}...\end{...}|
+% was not closed within a pair of matched braces. If an
+% enclosed environment is hidden within a group, the delimited
+% argument macro |\wt at getTable| will ignore such embedded
+% environment, otherwise it will get a non matching name
+% and messy things might happen. Besides warning about this
+% fact, the body of the table, at least what has been read
+% by the macro, will be discarded and substituted with a box
+% containing a message; therefore a table will be typeset,
+% but not the desired one. The remaining part of the body
+% remains in the input stream and might cause, presumably,
+% strange errors, such as |&| characters used outside a
+% tabular or array environment. We must take care of this
% so that the typesetting procedure does not crash.
% \begin{macrocode}
\def\wt at getTable#1\end#2{\def\@tempB{#2}%
@@ -521,8 +526,9 @@
\MessageBreak
with a framed box}%
\advance\wt at width-2\fboxsep
- \noindent\fbox{\parbox{\wt at width}{The table was not typeset because
- it contains a visible \texttt{\char`\\end} in one or more cells.}}\par
+ \noindent\fbox{\parbox{\wt at width}{The table was not typeset
+ because it contains a visible \texttt{\char`\\end} in one
+ or more cells.}}\par
\expandafter\wt at finishTable
\fi
}
@@ -529,11 +535,14 @@
% \end{macrocode}
%
-% 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
-% 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
+% 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
+% 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|.
% \begin{macrocode}
\def\wt at finishTable#1\end#2{%
@@ -546,30 +555,42 @@
}
% \end{macrocode}
% \section{Conclusion}
-% Tables should always have their natural width, but\dots\ The default value of
-%|\tabcolsep| is fixed by the document class, it is not prescribed by a supreme law:
-% therefore what does it mean ``natural width''. Probably the one determined by the
-% class default value of |\tabcolsep| so all tables have the same general look.
+% Tables should always have their natural width, but\dots\
+% The default value of|\tabcolsep| is fixed by the document
+% class, it is not prescribed by a supreme law: therefore
+% what does it mean ``natural width''. Probably the one
+% determined by the class default value of |\tabcolsep|
+% so all tables have the same general look.
%
-% Nevertheless sometimes a table is slightly wider than the current measure; why not
-% shrink the table by shrinking |\tabcolsep| by the right ammount in order to fit the
-% measure? The result might be a table where only the interculomn spaces are shrunk,
-% not the whole table, fonts, drawings, and figures included, a result easily
-% obtainable with a |\resizebox| command available throught th \textsf{graphicx.sty}
-% package. Nobody forbids to follow this technique, of course, but the |widetable|
-% route might yield a better result.
+% Nevertheless sometimes a table is slightly wider than
+% 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,
+% drawings, and figures included, a result easily obtainable
+% with a |\resizebox| command available through the
+% \textsf{graphicx.sty} package. Nobody forbids to follow
+% this technique, of course, but the |widetable| route might
+% yield a better result.
%
-% 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
-% solution in order to avoid a multitude of slightly different indents or left margins.
+% 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
+% solution in order to avoid a multitude of slightly
+% different indents or left margins.
%
-% This package might be useful also for copying some macros so as to avoid some
-% programming in other packages; this use is certainly permitted by the LaTeX Project
-% Public License, which sets the observance of very light obbligations.
+% This package might be useful also for copying some macros
+% so as to avoid some programming in other packages; this
+% use is certainly permitted by the LaTeX Project
+% Public License, which sets the observance of very light
+% obligations.
% \begin{macrocode}
\endinput
% \end{macrocode}
+%\iffalse
+%</package>
+%\fi
%
% \Finale
% \endinput
Deleted: trunk/Master/texmf-dist/source/latex/widetable/widetable.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/widetable/widetable.ins 2017-09-06 22:06:23 UTC (rev 45230)
+++ trunk/Master/texmf-dist/source/latex/widetable/widetable.ins 2017-09-06 22:07:49 UTC (rev 45231)
@@ -1,71 +0,0 @@
-%%
-%% ----------------------------------------
-%%
-%% This file is part of the widetable package.
-%%
-%% This work 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 2003/12/01 or later.
-%%
-%% This work has the LPPL maintenance status "maintained".
-%%
-%% The Current Maintainer of this work is Claudio Beccari
-%%
-%% The list of all files belonging to the distribution is
-%% given in the 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.
-%%
-%% --------------- start of docstrip commands ------------------
-%%
-\def\batchfile{widetable.ins}
-\input docstrip.tex
-\preamble
-
-Copyright 2009 Claudio Beccari
-
- This package 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.
-
- This work 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 2003/12/01 or later.
-
- This work has the LPPL maintenance status "maintained".
-
- The Current Maintainer of this work is Claudio Beccari
-
-\endpreamble
-\def\batchfile{widetable.dst} % ignored in distribution
-\input docstrip.tex % ignored in distribution
-
-\keepsilent
-
-\Msg{*** File widetable.sty is being generated ***}
-
-\generateFile{widetable.sty}{t}{\from{widetable.dtx}{package}}
-
-\ifToplevel{
-\Msg{***********************************************************}
-\Msg{*}
-\Msg{* Now move (if it is not already there) widetable.sty }
-\Msg{* to a folder on the LaTeX search path}
-\Msg{*}
-\Msg{* Documentation is obtained by LaTeXing widetable.dtx.}
-\Msg{*}
-\Msg{* Happy TeXing!}
-\Msg{***********************************************************}
-}
-
-\endinput
Modified: trunk/Master/texmf-dist/tex/latex/widetable/widetable.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/widetable/widetable.sty 2017-09-06 22:06:23 UTC (rev 45230)
+++ trunk/Master/texmf-dist/tex/latex/widetable/widetable.sty 2017-09-06 22:07:49 UTC (rev 45231)
@@ -5,119 +5,65 @@
%% The original source files were:
%%
%% widetable.dtx (with options: `package')
+%% ______________________________________________________
+%% The WIDETABLE bundle
+%% Copyright (C) 2009-2017 Claudio Beccari
+%% All rights reserved
%%
-%% Copyright 2009 Claudio Beccari
+%% License information appended
%%
-%% This package 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.
-%%
-%% This work 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 2003/12/01 or later.
-%%
-%% This work has the LPPL maintenance status "maintained".
-%%
-%% The Current Maintainer of this work is Claudio Beccari
-%%
-\NeedsTeXFormat{LaTeX2e}[2005/12/01]
+
+\NeedsTeXFormat{LaTeX2e}[2016/01/01]
\ProvidesPackage{widetable}%
- [2009/10/26 v.1.1 Package for typesetting specified width tables]
+ [2017/09/05 v.1.2 Package for typesetting specified width tables]
+
+\ProvidesPackage{widetable}[2017/09/05 v.1.2 A simpler way to produce
+ tables of specified width]
\dimendef\wt at Numer=2
\dimendef\wt at Denom=4
\countdef\wt at Num=2
\countdef\wt at Den=4
-\countdef\wt at I=6
-\def\wt at segno{}
-
-\newif\ifm at mifetex
- \m at mifetexfalse
-\IfFileExists{ifetex.sty}{\RequirePackage{ifetex}\relax}{%
- \PackageWarningNoLine{widetable}{%
- If there is an `ifetex' package then it is not installed.\MessageBreak
- The package is being emulated}%
-\m at mifetextrue
-\newif\ifetex
- \etexfalse
-\ifx\eTeXversion\undefined
-\else
- \ifx\eTeXversion\@undefined
- \else
- \ifx\eTeXversion\relax
- \else
- \ifnum\eTeXversion>0\relax
- \etextrue
- \fi
- \fi
- \fi
-\fi
-%%\EmulatedPackage{ifetex}[2008/07/23]% from memoir.cls
-}
-
-\def\dividi#1\per#2\in#3{%
- \begingroup
- \wt at Numer #1\relax \wt at Denom #2\relax
- \ifdim\wt at Denom<\z@ \wt at Denom -\wt at Denom \wt at Numer -\wt at Numer\fi
- \ifdim\wt at Numer<\z@ \def\wt at segno{-}\wt at Numer -\wt at Numer\fi
- \ifdim\wt at Denom=\z@
- \edef\wt at Q{\ifdim\wt at Numer<\z at -\fi\strip at pt\maxdimen}%
- \else
- \wt at Num=\wt at Numer \wt at Den=\wt at Denom \divide\wt at Num\wt at Den
- \edef\wt at Q{\number\wt at Num.}%
- \advance\wt at Numer -\wt at Q\wt at Denom \wt at I=6
- \@whilenum \wt at I>\z@ \do{\wt at dividiDec\advance\wt at I\m at ne}%
- \fi
- \edef\x{\noexpand\endgroup\noexpand\def\noexpand#3{\wt at segno\wt at Q}}
- \x
-}
-
-\def\wt at dividiDec{%
- \wt at Numer=10\wt at Numer \wt at Num=\wt at Numer \divide\wt at Num\wt at Den
- \edef\wt at q{\number\wt at Num}\edef\wt at Q{\wt at Q\wt at q}%
- \advance\wt at Numer -\wt at q\wt at Denom}
-
-\def\scala#1\per#2\diviso#3\in#4{\begingroup
+\usepackage{xparse}
+\newcommand\WT at scale[4]{\begingroup
\wt at Num #2\relax \wt at Den #3\relax
-\ifnum\wt at Den<\z@ \wt at Den -\wt at Den \wt at Num -\wt at Num \fi
-\ifnum\wt at Den=\z@
- \@tempdima\ifnum\wt at Num<0-\fi\maxdimen
+\ifnum#3=\z@
+ \@tempdima\ifnum#2<0-\fi\maxdimen
\else
- \@tempdima\dimexpr#1*\wt at Num/\wt at Den\relax
+ \@tempdima\dimexpr#1*#2/#3\relax
\fi
-\edef\x{\noexpand\endgroup\noexpand\def\noexpand#4{\the\@tempdima}}%
+\edef\x{\noexpand\endgroup\noexpand\setlength{#4}{\the\@tempdima}}%
\x}
-
\newdimen\wt at width
-
-\def\wt at starttabular{\expandafter\tabular\expandafter{\wt at preamble}}
-
-\def\widetable#1#2{%
- \def\@tempC{widetable}\setlength{\wt at width}{#1}%
- \def\wt at preamble{#2}\wt at getTable}
-
\newif\ifwt at scartare\wt at scartarefalse
-\def\endwidetable{%
+\DeclareDocumentCommand\widetable{m O{c} m}
+{% OPENING WIDETABLE
+ \def\@tempC{widetable}
+ \setlength{\wt at width}{#1}%
+ \def\wt at preamble{#3}
+ \edef\wt at starttabular{\noexpand\tabular[#2]{\wt at preamble}}
+ \wt at getTable}%
+\def\endwidetable{% CLOSING WIDETABLE
\ifwt at scartare
\noindent\null
\else
\tabcolsep=\z@
\setbox\z@=\hbox{\wt at starttabular\the\toks@\endtabular}%
- \tabcolsep=1cm\relax
+ \tabcolsep=6pt\relax
\setbox\tw@=\hbox{\wt at starttabular\the\toks@\endtabular}%
- \advance\wt at width-\wd\z@
- \@tempdimb=\wd\tw@
- \advance\@tempdimb-\wd\z@
- \ifetex
- \scala\tabcolsep\per\wt at width\diviso\@tempdimb\in\tabcolsep\relax
+ \ifdim\wt at width<\wd\z@
+ \@tempdimb=\dimexpr\wd\tw at -\wd\z@\relax
+ \PackageWorning{widetable}{%
+ The natural width `\the\wd\z@' of the tabular
+ material\MessageBreak
+ is larger than the specified width
+ `\the\wt at width'\MessageBreak\null\space \MessageBreak
+ The table is typeset with the default column spacing}
\else
- \dividi\wt at width\per\@tempdimb\in\@tempA
- \tabcolsep=\@tempA\tabcolsep
+ \@tempdimb=\dimexpr\wt at width-\wd\z@\relax
\fi
+ \@tempdimc=\dimexpr\wd\tw at -\wd\z@\relax
+ \WT at scale{\tabcolsep}{\@tempdimb}{\@tempdimc}{\tabcolsep}\relax
\wt at starttabular\the\toks@\endtabular
\fi
\ignorespacesafterend
@@ -139,8 +85,9 @@
\MessageBreak
with a framed box}%
\advance\wt at width-2\fboxsep
- \noindent\fbox{\parbox{\wt at width}{The table was not typeset because
- it contains a visible \texttt{\char`\\end} in one or more cells.}}\par
+ \noindent\fbox{\parbox{\wt at width}{The table was not typeset
+ because it contains a visible \texttt{\char`\\end} in one
+ or more cells.}}\par
\expandafter\wt at finishTable
\fi
}
@@ -154,6 +101,23 @@
\fi
}
-\endinput
+%%
+%% Copyright 2009-2017 Claudio Beccari
+%%
+%% Distributable under the LaTeX Project Public License,
+%% version 1.3c or higher (your choice). The latest version of
+%% this license is at: http://www.latex-project.org/lppl.txt
+%%
+%% This work is "author-maintained"
+%%
+%% This work consists of this file WIDETABLE.dtx, a README file
+%% the manifest.txt file, and the derived files:
+%% widetable.sty and widetable.pdf.
+%%
+%%
+%% By running pdflatex on widetable.dtx the user gets the sty
+%% file and the English documentation file in
+%% PDF format.
+%%
%%
%% End of file `widetable.sty'.
More information about the tex-live-commits
mailing list