branch master updated: texinfo.tex scanning contexts

[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 c53902266b texinfo.tex scanning contexts
c53902266b is described below

commit c53902266b7160553c1871adab484ad5061b8d86
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Mon Jul 25 22:17:42 2022 +0100

    texinfo.tex scanning contexts
    
    * doc/texinfo.tex (\scanctxt):
    Set active backslash.  This means that active backslash is
    used instead of the "other" catcode when scanning arguments to
    @copying and @caption, but this appears not to make a difference
    as the arguments are not being expanded or executed straight away.
    (\scanargctxt): Remove this and replace calls with \scanctxt.
---
 ChangeLog       | 11 +++++++++++
 doc/texinfo.tex | 13 ++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c213afc9c4..0120e03b3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2022-07-25  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       texinfo.tex scanning contexts
+
+       * doc/texinfo.tex (\scanctxt):
+       Set active backslash.  This means that active backslash is
+       used instead of the "other" catcode when scanning arguments to
+       @copying and @caption, but this appears not to make a difference
+       as the arguments are not being expanded or executed straight away.
+       (\scanargctxt): Remove this and replace calls with \scanctxt.
+
 2022-07-25  Gavin Smith  <gavinsmith0123@gmail.com>
 
        texinfo.tex scanning contexts
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index 7bb4ecc4f5..8db90e60b7 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.20}
+\def\texinfoversion{2022-07-25.21}
 %
 % Copyright 1985, 1986, 1988, 1990-2022 Free Software Foundation, Inc.
 %
@@ -7518,7 +7518,7 @@ 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\scanargctxt\docopying}
+\def\copying{\checkenv{}\begingroup\scanctxt\docopying}
 \def\docopying#1@end copying{\endgroup\def\copyingtext{#1}}
 %
 \def\insertcopying{%
@@ -8065,14 +8065,10 @@ might help (with 'rm \jobname.?? \jobname.??s')%
   \catcode`\~=\other
   \catcode`\@=\other
   \catcode`\^^M=\other
+  \catcode`\\=\active
   \passthroughcharstrue
 }
 
-\def\scanargctxt{% used for copying and captions, not macros.
-  \scanctxt
-  \catcode`\\=\other
-}
-
 \def\macrobodyctxt{% used for @macro definitions
   \scanctxt
   \catcode`\ =\other
@@ -8087,7 +8083,6 @@ might help (with 'rm \jobname.?? \jobname.??s')%
 \def\macroargctxt{%
   \scanctxt
   \catcode`\ =\active
-  \catcode`\\=\active
 }
 
 \def\macrolineargctxt{% used for whole-line arguments without braces
@@ -9602,7 +9597,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
 %
 \def\caption{\docaption\thiscaption}
 \def\shortcaption{\docaption\thisshortcaption}
-\def\docaption{\checkenv\float \bgroup\scanargctxt\defcaption}
+\def\docaption{\checkenv\float \bgroup\scanctxt\defcaption}
 \def\defcaption#1#2{\egroup \def#1{#2}}
 
 % The parameter is the control sequence identifying the counter we are