branch master updated: More isolation for @r

[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 752066907e More isolation for @r
752066907e is described below

commit 752066907ee79848285d72709c6463933506d82b
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Fri Jul 29 15:23:28 2022 +0100

    More isolation for @r
    
    * doc/texinfo.tex (\r):
    Cancel special definition of & used on def line.
    * doc/texinfo-tex-test.texi (Definitions): Add example.
    
    Patrice reported that input like @r{@b{&rest}} led to an error
    "Argument of & has an extra }", which was due to the need for a
    space to delimit the argument of &.
---
 ChangeLog                 | 12 ++++++++++++
 doc/texinfo-tex-test.texi |  7 +++++++
 doc/texinfo.tex           |  5 +++--
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 63ca7b84a5..d71a959545 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2022-07-29  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       More isolation for @r
+
+       * doc/texinfo.tex (\r):
+       Cancel special definition of & used on def line.
+       * doc/texinfo-tex-test.texi (Definitions): Add example.
+
+       Patrice reported that input like @r{@b{&rest}} led to an error
+       "Argument of & has an extra }", which was due to the need for a
+       space to delimit the argument of &.
+
 2022-07-28  Patrice Dumas  <pertusus@free.fr>
 
        LaTeX @deftype* not in slanted, only in code
diff --git a/doc/texinfo-tex-test.texi b/doc/texinfo-tex-test.texi
index 5750cc4822..745b88b0e3 100644
--- a/doc/texinfo-tex-test.texi
+++ b/doc/texinfo-tex-test.texi
@@ -1756,6 +1756,13 @@ a. b@*
 a.@: b
 @end defun
 
+Check explicit bold with @code{@@r@{@@b@{...} on def line
+
+@defun foo @r{@b{&rest}} (b(sdf)az)
+hello 
+@end defun
+
+
 
 
 
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index a1505769cf..23d56da1ad 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-27.14}
+\def\texinfoversion{2022-07-29.14}
 %
 % Copyright 1985, 1986, 1988, 1990-2022 Free Software Foundation, Inc.
 %
@@ -2818,7 +2818,7 @@ end
 \let\emph=\smartitalic
 
 % Explicit font changes: @r, @sc, undocumented @ii.
-\def\r#1{{\rm #1}}              % roman font
+\def\r#1{{\stopmagicamp\rm #1}} % roman font, used for code comment
 \def\sc#1{{\smallcaps#1}}       % smallcaps font
 \def\ii#1{{\it #1}}             % italic font
 
@@ -7887,6 +7887,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
 
   \gdef\boldbrax{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb}
   \gdef\magicamp{\let&=\amprm}
+  \gdef\stopmagicamp{\let&=\&}
 }
 \let\ampchar\&