branch master updated: Fix @{, @} in copying, captions

[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 dd2b6bf7ad Fix @{, @} in copying, captions
dd2b6bf7ad is described below

commit dd2b6bf7ad2c563deaf52676c3bbe33d60c1f202
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Jul 24 21:36:19 2022 +0100

    Fix @{, @} in copying, captions
    
    * doc/texinfo.tex (\scanargctxt): Change catcodes of { and } as
    well as @ so that @{ and @} commands can occur inside @copying
    block.  Report from Patrice.
---
 ChangeLog       | 8 ++++++++
 doc/texinfo.tex | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 1e31f4d822..b20b0b3354 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2022-07-24  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       Fix @{, @} in copying, captions
+
+       * doc/texinfo.tex (\scanargctxt): Change catcodes of { and } as
+       well as @ so that @{ and @} commands can occur inside @copying
+       block.  Report from Patrice.
+
 2022-07-24  Patrice Dumas  <pertusus@free.fr>
 
        No @-commands in file names except for @@, @{ and @}
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index a2bcf60e49..ebb575ddff 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-05-30.20}
+\def\texinfoversion{2022-07-24.20}
 %
 % Copyright 1985, 1986, 1988, 1990-2022 Free Software Foundation, Inc.
 %
@@ -8069,6 +8069,8 @@ might help (with 'rm \jobname.?? \jobname.??s')%
 \def\scanargctxt{% used for copying and captions, not macros.
   \scanctxt
   \catcode`\@=\other
+  \catcode`\{=\other
+  \catcode`\}=\other
   \catcode`\\=\other
   \catcode`\^^M=\other
 }