branch master updated: Narrow @multitable nested within @quotation

[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 3ac054d  Narrow @multitable nested within @quotation
3ac054d is described below

commit 3ac054dd04ad976a8ff05627f3bd4193d9bbac9d
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Thu Mar 18 20:58:13 2021 +0000

    Narrow @multitable nested within @quotation
    
    * doc/texinfo.tex (\domultitable): Subtract \leftskip before
    calculating column widths as fraction of \hsize.
    * doc/texinfo-tex-test.texi (@multitable): New section.
    
    Report of excessive width from Werner Lemberg.
---
 ChangeLog                 | 10 ++++++++++
 doc/texinfo-tex-test.texi | 33 +++++++++++++++++++++++++++++++++
 doc/texinfo.tex           |  3 ++-
 3 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 4f0e1e1..d31258f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2021-03-18  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       Narrow @multitable nested within @quotation
+
+       * doc/texinfo.tex (\domultitable): Subtract \leftskip before
+       calculating column widths as fraction of \hsize.
+       * doc/texinfo-tex-test.texi (@multitable): New section.
+       
+       Report of excessive width from Werner Lemberg.
+
 2021-03-12  Gavin Smith  <gavinsmith0123@gmail.com>
 
        Fix NetBSD build
diff --git a/doc/texinfo-tex-test.texi b/doc/texinfo-tex-test.texi
index 318a1d2..4b06905 100644
--- a/doc/texinfo-tex-test.texi
+++ b/doc/texinfo-tex-test.texi
@@ -1590,6 +1590,39 @@ chicken          pizza   beefburger      hotdog
 “Please come again”
 @end verbatim
 
+@section @code{@@multitable}
+
+Nested in @@quotation:
+
+before before before before before before before before
+before before before before before before before before
+before before before before before before before before
+before before before before before before before before
+
+@quotation
+@multitable @columnfractions 0.5 0.5
+@item
+left left left left left left left left
+left left left left left left left left
+left left left left left left left left
+left left left left left left left left
+@tab
+right right right right right right right right
+right right right right right right right right
+right right right right right right right right
+right right right right right right right right
+@end multitable
+@end quotation
+
+after after after after after after after after
+after after after after after after after after
+after after after after after after after after
+after after after after after after after after
+
+
+
+
+
 
 @chapter Document encoding
 
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index 3914141..b8414cc 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-02-20.11}
+\def\texinfoversion{2021-03-18.20}
 %
 % Copyright 1985, 1986, 1988, 1990-2021 Free Software Foundation, Inc.
 %
@@ -4486,6 +4486,7 @@ $$%
     \global\advance\colcount by 1
     \multistrut
     \vtop{%
+      \advance\hsize by -1\leftskip
       % Use the current \colcount to find the correct column width:
       \hsize=\expandafter\csname col\the\colcount\endcsname
       %