branch master updated: * doc/texinfo.tex (\domultitable): Zero \rightskip but keep stretch. This is intended to allow @multitable to be nested inside @quotation, the formatting of which was broken by change on 2022-04-04 for @raggedright. Report from Werner. * doc/texinfo-tex-test.texi (@multitable): Add test case.

[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 c997231d30 * doc/texinfo.tex (\domultitable): Zero \rightskip but keep 
stretch.  This is intended to allow @multitable to be nested inside @quotation, 
the formatting of which was broken by change on 2022-04-04 for @raggedright.  
Report from Werner. * doc/texinfo-tex-test.texi (@multitable): Add test case.
c997231d30 is described below

commit c997231d3001a9be4c8a5b467c32f1a40539d01f
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sat Apr 9 09:56:39 2022 +0100

    * doc/texinfo.tex (\domultitable): Zero \rightskip but keep
    stretch.  This is intended to allow @multitable to be nested
    inside @quotation, the formatting of which was broken by change
    on 2022-04-04 for @raggedright.  Report from Werner.
    * doc/texinfo-tex-test.texi (@multitable): Add test case.
---
 ChangeLog                 | 8 ++++++++
 doc/texinfo-tex-test.texi | 9 +++++++++
 doc/texinfo.tex           | 3 ++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 6eddff23d0..deb106fbd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2022-04-09  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       * doc/texinfo.tex (\domultitable): Zero \rightskip but keep
+       stretch.  This is intended to allow @multitable to be nested
+       inside @quotation, the formatting of which was broken by change
+       on 2022-04-04 for @raggedright.  Report from Werner.
+       * doc/texinfo-tex-test.texi (@multitable): Add test case.
+
 2022-04-08  Gavin Smith  <gavinsmith0123@gmail.com>
 
        Avoid undefined hash key access in get_file_information
diff --git a/doc/texinfo-tex-test.texi b/doc/texinfo-tex-test.texi
index 3f939fc05c..27ef16f744 100644
--- a/doc/texinfo-tex-test.texi
+++ b/doc/texinfo-tex-test.texi
@@ -1698,6 +1698,15 @@ right right right right right right right right
 @end multitable
 @end quotation
 
+@noindent With more columns:
+
+@quotation
+@multitable {@w{@code{português} or}} {@code{do} @code{re}/@code{re} @code{mi} 
@code{fa} @code{sol} @code{la} @code{sib} @code{si}}
+@item @code{català} or@*@ @code{catalan}
+  @tab @code{do} @code{re} @code{mi} @code{fa} @code{sol} @code{la} @code{sib} 
@code{si}
+@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
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index ab837e82eb..8fc17de28c 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{2022-03-13.19}
+\def\texinfoversion{2022-04-09.08}
 %
 % Copyright 1985, 1986, 1988, 1990-2022 Free Software Foundation, Inc.
 %
@@ -4409,6 +4409,7 @@ $$%
       % Find the correct column width
       \hsize=\expandafter\csname col\the\colcount\endcsname
       %
+      \advance\rightskip by -1\rightskip % Zero leaving only any stretch
       \ifnum\colcount=1
         \advance\hsize by\leftskip % Add indent of surrounding text
       \else