branch master updated: * doc/texinfo.tex (\multitable): Fix indendation of code. Remove useless macro \multistrut replacing it with \strut (always set to this since October 2004). Remove comment about space added by \multistrut, as no such space was added. Remove documentation of @multitable as this is in the manual. Remove comment crediting original author of macros, recorded here as Amy Hendrickson, 8/18/94, 3/6/96 (\tab): Remove comment from April 1999 saying what used to be in the code. (\alphaenumerate, [...]

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 6d704d5  * doc/texinfo.tex (\multitable): Fix indendation of code.  
Remove useless macro \multistrut replacing it with \strut (always set to this 
since October 2004).  Remove comment about space added by \multistrut, as no 
such space was added.  Remove documentation of @multitable as this is in the 
manual.  Remove comment crediting original author of macros, recorded here as 
Amy Hendrickson, 8/18/94, 3/6/96 (\tab): Remove comment from April 1999 saying 
what used to be in the code [...]
6d704d5 is described below

commit 6d704d51740de5a1239a9f4fce2d5ab8b63b0b65
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sat Mar 20 00:12:34 2021 +0000

    * doc/texinfo.tex (\multitable): Fix indendation of code.  Remove
    useless macro \multistrut replacing it with \strut (always set to
    this since October 2004).  Remove comment about space added by
    \multistrut, as no such space was added.  Remove documentation of
    @multitable as this is in the manual.  Remove comment crediting
    original author of macros, recorded here as
    Amy Hendrickson, 8/18/94, 3/6/96
    (\tab): Remove comment from April 1999 saying what used to be
    in the code.
    (\alphaenumerate, \capsenumerate): Remove undocumented aliases.
---
 ChangeLog       |  14 ++++++
 doc/texinfo.tex | 138 ++++++++++++--------------------------------------------
 2 files changed, 44 insertions(+), 108 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d31258f..b86100d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2021-03-20  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       * doc/texinfo.tex (\multitable): Fix indendation of code.  Remove
+       useless macro \multistrut replacing it with \strut (always set to
+       this since October 2004).  Remove comment about space added by
+       \multistrut, as no such space was added.  Remove documentation of
+       @multitable as this is in the manual.  Remove comment crediting
+       original author of macros, recorded here as
+       Amy Hendrickson, 8/18/94, 3/6/96
+       (\tab): Remove comment from April 1999 saying what used to be
+       in the code.
+       (\alphaenumerate, \capsenumerate): Remove undocumented aliases.
+
+
 2021-03-18  Gavin Smith  <gavinsmith0123@gmail.com>
 
        Narrow @multitable nested within @quotation
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index b8414cc..f36f1ae 100644
--- a/doc/texinfo.tex
+++ b/doc/texinfo.tex
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2021-03-18.20}
+\def\texinfoversion{2021-03-20.00}
 %
 % Copyright 1985, 1986, 1988, 1990-2021 Free Software Foundation, Inc.
 %
@@ -4289,65 +4289,8 @@ $$%
   \doitemize{#1.}\flushcr
 }
 
-% @alphaenumerate and @capsenumerate are abbreviations for giving an arg
-% to @enumerate.
-%
-\def\alphaenumerate{\enumerate{a}}
-\def\capsenumerate{\enumerate{A}}
-\def\Ealphaenumerate{\Eenumerate}
-\def\Ecapsenumerate{\Eenumerate}
-
 
 % @multitable macros
-% Amy Hendrickson, 8/18/94, 3/6/96
-%
-% @multitable ... @end multitable will make as many columns as desired.
-% Contents of each column will wrap at width given in preamble.  Width
-% can be specified either with sample text given in a template line,
-% or in percent of \hsize, the current width of text on page.
-
-% Table can continue over pages but will only break between lines.
-
-% To make preamble:
-%
-% Either define widths of columns in terms of percent of \hsize:
-%   @multitable @columnfractions .25 .3 .45
-%   @item ...
-%
-%   Numbers following @columnfractions are the percent of the total
-%   current hsize to be used for each column. You may use as many
-%   columns as desired.
-
-
-% Or use a template:
-%   @multitable {Column 1 template} {Column 2 template} {Column 3 template}
-%   @item ...
-%   using the widest term desired in each column.
-
-% Each new table line starts with @item, each subsequent new column
-% starts with @tab. Empty columns may be produced by supplying @tab's
-% with nothing between them for as many times as empty columns are needed,
-% ie, @tab@tab@tab will produce two empty columns.
-
-% @item, @tab do not need to be on their own lines, but it will not hurt
-% if they are.
-
-% Sample multitable:
-
-%   @multitable {Column 1 template} {Column 2 template} {Column 3 template}
-%   @item first col stuff @tab second col stuff @tab third col
-%   @item
-%   first col stuff
-%   @tab
-%   second col stuff
-%   @tab
-%   third col
-%   @item first col stuff @tab second col stuff
-%   @tab Many paragraphs of text may be used in any column.
-%
-%         They will wrap at the width determined by the template.
-%   @item@tab@tab This will be in third column.
-%   @end multitable
 
 % Default dimensions may be reset by user.
 % @multitableparskip is vertical space between paragraphs in table.
@@ -4412,8 +4355,6 @@ $$%
   \go
 }
 
-% multitable-only commands.
-% 
 % @headitem starts a heading row, which we typeset in bold.  Assignments
 % have to be global since we are inside the implicit group of an
 % alignment entry.  \everycr below resets \everytab so we don't have to
@@ -4430,14 +4371,8 @@ $$%
 % default for tables with no headings.
 \let\headitemcrhook=\relax
 %
-% A \tab used to include \hskip1sp.  But then the space in a template
-% line is not enough.  That is bad.  So let's go back to just `&' until
-% we again encounter the problem the 1sp was intended to solve.
-%                                      --karl, nathan@acm.org, 20apr99.
 \def\tab{\checkenv\multitable &\the\everytab}%
 
-% @multitable ... @end multitable definitions:
-%
 \newtoks\everytab  % insert after every tab.
 %
 \envdef\multitable{%
@@ -4484,7 +4419,7 @@ $$%
   % continue for many paragraphs if desired.
   \halign\bgroup &%
     \global\advance\colcount by 1
-    \multistrut
+    \strut
     \vtop{%
       \advance\hsize by -1\leftskip
       % Use the current \colcount to find the correct column width:
@@ -4505,27 +4440,18 @@ $$%
       % Make sure we don't inherit \rightskip from the outer environment.
       \rightskip=0pt
       \ifnum\colcount=1
-       % The first column will be indented with the surrounding text.
-       \advance\hsize by\leftskip
+        % The first column will be indented with the surrounding text.
+        \advance\hsize by\leftskip
       \else
-       \ifsetpercent \else
-         % If user has not set preamble in terms of percent of \hsize
-         % we will advance \hsize by \multitablecolspace.
-         \advance\hsize by \multitablecolspace
-       \fi
-       % In either case we will make \leftskip=\multitablecolspace:
-      \leftskip=\multitablecolspace
+        \ifsetpercent \else
+          % If user has not set preamble in terms of percent of \hsize
+          % we will advance \hsize by \multitablecolspace.
+          \advance\hsize by \multitablecolspace
+        \fi
+        % In either case we will make \leftskip=\multitablecolspace:
+        \leftskip=\multitablecolspace
       \fi
-      % Ignoring space at the beginning and end avoids an occasional spurious
-      % blank line, when TeX decides to break the line at the space before the
-      % box from the multistrut, so the strut ends up on a line by itself.
-      % For example:
-      % @multitable @columnfractions .11 .89
-      % @item @code{#}
-      % @tab Legal holiday which is valid in major parts of the whole country.
-      % Is automatically provided with highlighting sequences respectively
-      % marking characters.
-      \noindent\ignorespaces##\unskip\multistrut
+      \noindent\ignorespaces##\unskip\strut
     }\cr
 }
 \def\Emultitable{%
@@ -4535,29 +4461,25 @@ $$%
 }
 
 \def\setmultitablespacing{%
-  \def\multistrut{\strut}% just use the standard line spacing
-  %
   % Compute \multitablelinespace (if not defined by user) for use in
-  % \multitableparskip calculation.  We used define \multistrut based on
-  % this, but (ironically) that caused the spacing to be off.
-  % See bug-texinfo report from Werner Lemberg, 31 Oct 2004 12:52:20 +0100.
-\ifdim\multitablelinespace=0pt
-\setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip
-\global\advance\multitablelinespace by-\ht0
-\fi
-% Test to see if parskip is larger than space between lines of
-% table. If not, do nothing.
-%        If so, set to same dimension as multitablelinespace.
-\ifdim\multitableparskip>\multitablelinespace
-\global\multitableparskip=\multitablelinespace
-\global\advance\multitableparskip-7pt % to keep parskip somewhat smaller
-                                      % than skip between lines in the table.
-\fi%
-\ifdim\multitableparskip=0pt
-\global\multitableparskip=\multitablelinespace
-\global\advance\multitableparskip-7pt % to keep parskip somewhat smaller
-                                      % than skip between lines in the table.
-\fi}
+  % \multitableparskip calculation.
+  \ifdim\multitablelinespace=0pt
+    \setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip
+    \global\advance\multitablelinespace by-\ht0
+  \fi
+  % Test to see if parskip is larger than space between lines of
+  % table. If not, do nothing.
+  %        If so, set to same dimension as multitablelinespace.
+  \ifdim\multitableparskip>\multitablelinespace
+    \global\multitableparskip=\multitablelinespace
+    \global\advance\multitableparskip-7pt % keep parskip somewhat smaller than
+                                          % skip between lines in the table.
+  \fi%
+  \ifdim\multitableparskip=0pt
+    \global\multitableparskip=\multitablelinespace
+    \global\advance\multitableparskip-7pt % keep parskip somewhat smaller than
+                                          % skip between lines in the table.
+  \fi}
 
 
 \message{conditionals,}