branch master updated: * doc/texinfo.tex (\r): Output -- and --- as ligature even if in code.

[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 d174fd1e37 * doc/texinfo.tex (\r): Output -- and --- as ligature even 
if in code.
d174fd1e37 is described below

commit d174fd1e378e1aa12b196b8addd8e1b5953cd391
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Jul 31 15:55:13 2022 +0100

    * doc/texinfo.tex (\r): Output -- and --- as ligature even if in code.
---
 ChangeLog       |  4 ++++
 doc/texinfo.tex | 12 +++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8a1b1e20f6..1cf14a2896 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2022-07-31  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       * doc/texinfo.tex (\r): Output -- and --- as ligature even if in code.
+
 2022-07-31  Patrice Dumas  <pertusus@free.fr>
 
        No @deftypefnnewline effect on typed variable definitions in Info
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index 02bbbbaff6..16017f0188 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-30.12}
+\def\texinfoversion{2022-07-31.14}
 %
 % Copyright 1985, 1986, 1988, 1990-2022 Free Software Foundation, Inc.
 %
@@ -2817,8 +2817,14 @@ end
 \let\dfn=\smartslanted
 \let\emph=\smartitalic
 
-% Explicit font changes: @r, @sc, undocumented @ii.
-\def\r#1{{\defcharsdefault\rm #1}} % roman font, used for code comment
+% @r for roman font, used for code comment
+\def\r#1{{%
+  \usenormaldash % get --, --- ligatures even if in @code
+  \defcharsdefault  % in case on def line
+  \rm #1}}
+{\catcode`-=\active \gdef\usenormaldash{\let-\normaldash}}
+
+% @sc, undocumented @ii.
 \def\sc#1{{\smallcaps#1}}       % smallcaps font
 \def\ii#1{{\it #1}}             % italic font