mirror of
https://github.com/mirror/make.git
synced 2025-01-16 23:31:08 +08:00
* texinfo.tex (\pickupwholefraction): Ignore whole-number part.
(\setuptable): Always pass whole-number part and decimal point. This allows leading zeroes. Suggestion from: Ben Bullock <ben@hayamasa.demon.co.uk>. Date: Fri, 21 Aug 1998 14:06:50 +0100 (BST)
This commit is contained in:
parent
7f83bfe911
commit
dc7cf1c4b2
57
texinfo.tex
57
texinfo.tex
@ -3,7 +3,7 @@
|
|||||||
% Load plain if necessary, i.e., if running under initex.
|
% Load plain if necessary, i.e., if running under initex.
|
||||||
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
|
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
|
||||||
%
|
%
|
||||||
\def\texinfoversion{1998-12-15}%
|
\def\texinfoversion{1998-12-19}%
|
||||||
%
|
%
|
||||||
% Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98
|
% Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98
|
||||||
% Free Software Foundation, Inc.
|
% Free Software Foundation, Inc.
|
||||||
@ -2145,31 +2145,44 @@ July\or August\or September\or October\or November\or December\fi
|
|||||||
\def\xcolumnfractions{\columnfractions}
|
\def\xcolumnfractions{\columnfractions}
|
||||||
\newif\ifsetpercent
|
\newif\ifsetpercent
|
||||||
|
|
||||||
% 2/1/96, to allow fractions to be given with more than one digit.
|
% #1 is the part of the @columnfraction before the decimal point, which
|
||||||
\def\pickupwholefraction#1 {\global\advance\colcount by1 %
|
% is presumably either 0 or the empty string (but we don't check, we
|
||||||
\expandafter\xdef\csname col\the\colcount\endcsname{.#1\hsize}%
|
% just throw it away). #2 is the decimal part, which we use as the
|
||||||
\setuptable}
|
% percent of \hsize for this column.
|
||||||
|
\def\pickupwholefraction#1.#2 {%
|
||||||
|
\global\advance\colcount by 1
|
||||||
|
\expandafter\xdef\csname col\the\colcount\endcsname{.#2\hsize}%
|
||||||
|
\setuptable
|
||||||
|
}
|
||||||
|
|
||||||
\newcount\colcount
|
\newcount\colcount
|
||||||
\def\setuptable#1{\def\firstarg{#1}%
|
\def\setuptable#1{%
|
||||||
\ifx\firstarg\xendsetuptable\let\go\relax%
|
\def\firstarg{#1}%
|
||||||
\else
|
\ifx\firstarg\xendsetuptable
|
||||||
\ifx\firstarg\xcolumnfractions\global\setpercenttrue%
|
\let\go = \relax
|
||||||
\else
|
\else
|
||||||
\ifsetpercent
|
\ifx\firstarg\xcolumnfractions
|
||||||
\let\go\pickupwholefraction % In this case arg of setuptable
|
\global\setpercenttrue
|
||||||
% is the decimal point before the
|
|
||||||
% number given in percent of hsize.
|
|
||||||
% We don't need this so we don't use it.
|
|
||||||
\else
|
\else
|
||||||
\global\advance\colcount by1
|
\ifsetpercent
|
||||||
\setbox0=\hbox{#1 }% Add a normal word space as a separator;
|
\let\go\pickupwholefraction
|
||||||
% typically that is always in the input, anyway.
|
\else
|
||||||
\expandafter\xdef\csname col\the\colcount\endcsname{\the\wd0}%
|
\global\advance\colcount by 1
|
||||||
|
\setbox0=\hbox{#1\unskip }% Add a normal word space as a separator;
|
||||||
|
% typically that is always in the input, anyway.
|
||||||
|
\expandafter\xdef\csname col\the\colcount\endcsname{\the\wd0}%
|
||||||
|
\fi
|
||||||
|
\fi
|
||||||
|
\ifx\go\pickupwholefraction
|
||||||
|
% Put the argument back for the \pickupwholefraction call, so
|
||||||
|
% we'll always have a period there to be parsed.
|
||||||
|
\def\go{\pickupwholefraction#1}%
|
||||||
|
\else
|
||||||
|
\let\go = \setuptable
|
||||||
\fi%
|
\fi%
|
||||||
\fi%
|
\fi
|
||||||
\ifx\go\pickupwholefraction\else\let\go\setuptable\fi%
|
\go
|
||||||
\fi\go}
|
}
|
||||||
|
|
||||||
% multitable syntax
|
% multitable syntax
|
||||||
\def\tab{&\hskip1sp\relax} % 2/2/96
|
\def\tab{&\hskip1sp\relax} % 2/2/96
|
||||||
@ -2177,7 +2190,7 @@ July\or August\or September\or October\or November\or December\fi
|
|||||||
% maintained, even if it is never used.
|
% maintained, even if it is never used.
|
||||||
|
|
||||||
% @multitable ... @end multitable definitions:
|
% @multitable ... @end multitable definitions:
|
||||||
|
%
|
||||||
\def\multitable{\parsearg\dotable}
|
\def\multitable{\parsearg\dotable}
|
||||||
\def\dotable#1{\bgroup
|
\def\dotable#1{\bgroup
|
||||||
\vskip\parskip
|
\vskip\parskip
|
||||||
|
Loading…
Reference in New Issue
Block a user