Oops, did inadvertent branch.

This commit is contained in:
Karl Berry 1997-01-04 19:24:13 +00:00
parent 4398fea0c2
commit 3e99cd6f00

View File

@ -1,8 +1,8 @@
%% TeX macros to handle Texinfo files. %% TeX macros to handle Texinfo files.
%% $Id: texinfo.tex,v 2.195 1996/12/18 03:22:53 drepper Exp $ %% $Id: texinfo.tex,v 2.196 1997/01/04 19:24:13 karl Exp $
% Copyright (C) 1985, 86, 88, 90, 91, 92, 93, % Copyright (C) 1985, 86, 88, 90, 91, 92, 93,
% 94, 95, 1996 Free Software Foundation, Inc. % 94, 95, 96, 97 Free Software Foundation, Inc.
%This texinfo.tex file is free software; you can redistribute it and/or %This texinfo.tex file is free software; you can redistribute it and/or
%modify it under the terms of the GNU General Public License as %modify it under the terms of the GNU General Public License as
@ -36,7 +36,7 @@
% This automatically updates the version number based on RCS. % This automatically updates the version number based on RCS.
\def\deftexinfoversion$#1: #2 ${\def\texinfoversion{#2}} \def\deftexinfoversion$#1: #2 ${\def\texinfoversion{#2}}
\deftexinfoversion$Revision: 2.195 $ \deftexinfoversion$Revision: 2.196 $
\message{Loading texinfo package [Version \texinfoversion]:} \message{Loading texinfo package [Version \texinfoversion]:}
% If in a .fmt file, print the version number % If in a .fmt file, print the version number
@ -60,7 +60,6 @@
\let\ptexrbrace=\} \let\ptexrbrace=\}
\let\ptexstar=\* \let\ptexstar=\*
\let\ptext=\t \let\ptext=\t
\let\ptextilde=\~
% Be sure we're in horizontal mode when doing a tie, since we make space % Be sure we're in horizontal mode when doing a tie, since we make space
% equivalent to this in @example-like environments. Otherwise, a space % equivalent to this in @example-like environments. Otherwise, a space
@ -73,7 +72,6 @@
\global\let\tiepenalty = \@M \global\let\tiepenalty = \@M
\gdef\tie{\leavevmode\penalty\tiepenalty\ } \gdef\tie{\leavevmode\penalty\tiepenalty\ }
} }
\let\~ = \tie % And make it available as @~.
\message{Basics,} \message{Basics,}
@ -2078,7 +2076,7 @@ July\or August\or September\or October\or November\or December\fi
% characters. % characters.
\noindent\ignorespaces##\unskip\multistrut}\cr \noindent\ignorespaces##\unskip\multistrut}\cr
% \everycr will reset column counter, \colcount, at the end of % \everycr will reset column counter, \colcount, at the end of
% each line. Every column entry will cause \colcount to advance by one. % each line. Every column entry will cause \colcount to advance by one.
% The table preamble % The table preamble
% looks at the current \colcount to find the correct column width. % looks at the current \colcount to find the correct column width.
\global\everycr{\noalign{% \global\everycr{\noalign{%
@ -3391,7 +3389,6 @@ width0pt\relax} \fi
\escapechar=`\\ \escapechar=`\\
% %
\let\,=\ptexcomma \let\,=\ptexcomma
\let\~=\ptextilde
\let\{=\ptexlbrace \let\{=\ptexlbrace
\let\}=\ptexrbrace \let\}=\ptexrbrace
\let\.=\ptexdot \let\.=\ptexdot