branch master updated: Allow @{, @} in @copying block

[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 0d1776bdb2 Allow @{, @} in @copying block
0d1776bdb2 is described below

commit 0d1776bdb2b901d2fe559336631e25c18c00779c
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Mon Jul 25 22:58:15 2022 +0100

    Allow @{, @} in @copying block
    
    * doc/texinfo.tex (\macrobodyctxt): Move call to \usembodybackslash
    to sole calling site.
    (\copying): Call \macrobodyctxt instead of \scanctxt in order to
    change catcodes of { and }.  Use "other" space to find
    "@end copying" string.
    * doc/texinfo-tex-test.texi (Copying and captions): Test @{ and
    @} inside @copying.
---
 ChangeLog                 | 12 ++++++++++++
 doc/texinfo-tex-test.texi |  1 +
 doc/texinfo.tex           | 15 ++++++++-------
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0120e03b3e..7f5f0057e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2022-07-25  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       Allow @{, @} in @copying block
+
+       * doc/texinfo.tex (\macrobodyctxt): Move call to \usembodybackslash
+       to sole calling site.
+       (\copying): Call \macrobodyctxt instead of \scanctxt in order to
+       change catcodes of { and }.  Use "other" space to find
+       "@end copying" string.
+       * doc/texinfo-tex-test.texi (Copying and captions): Test @{ and
+       @} inside @copying.
+
 2022-07-25  Gavin Smith  <gavinsmith0123@gmail.com>
 
        texinfo.tex scanning contexts
diff --git a/doc/texinfo-tex-test.texi b/doc/texinfo-tex-test.texi
index bd7fa09d2c..5750cc4822 100644
--- a/doc/texinfo-tex-test.texi
+++ b/doc/texinfo-tex-test.texi
@@ -1635,6 +1635,7 @@ See @ref{Target}.@*
 @copying
 This manual is for blah-de-blah.@*
 Backslash \@*
+Brace commands @{ @{ @}
 
 Copyrite @copyright{} 201X@*
 þ þ þ þ þ þ þ þ
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index 8db90e60b7..d8594619b0 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-07-25.21}
+\def\texinfoversion{2022-07-25.22}
 %
 % Copyright 1985, 1986, 1988, 1990-2022 Free Software Foundation, Inc.
 %
@@ -7518,9 +7518,11 @@ might help (with 'rm \jobname.?? \jobname.??s')%
 % file; b) letting users define the frontmatter in as flexible order as
 % possible is desirable.
 %
-\def\copying{\checkenv{}\begingroup\scanctxt\docopying}
-\def\docopying#1@end copying{\endgroup\def\copyingtext{#1}}
-%
+\def\copying{\checkenv{}\begingroup\macrobodyctxt\docopying}
+{\catcode`\ =\other
+\gdef\docopying#1@end copying{\endgroup\def\copyingtext{#1}}
+}
+
 \def\insertcopying{%
   \begingroup
     \parindent = 0pt  % paragraph indentation looks wrong on title page
@@ -8069,12 +8071,11 @@ might help (with 'rm \jobname.?? \jobname.??s')%
   \passthroughcharstrue
 }
 
-\def\macrobodyctxt{% used for @macro definitions
+\def\macrobodyctxt{% used for @macro definitions and @copying
   \scanctxt
   \catcode`\ =\other
   \catcode`\{=\other
   \catcode`\}=\other
-  \usembodybackslash
 }
 
 % Used when scanning braced macro arguments.  Note, however, that catcode
@@ -8130,7 +8131,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
      \global\expandafter\let\csname ismacro.\the\macname\endcsname=1%
      \addtomacrolist{\the\macname}%
   \fi
-  \begingroup \macrobodyctxt
+  \begingroup \macrobodyctxt \usembodybackslash
   \ifrecursive \expandafter\parsermacbody
   \else \expandafter\parsemacbody
   \fi}