[7992] check if still in monospace for code quotes

[gavinsmith0123]

Revision: 7992
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7992
Author:   gavin
Date:     2017-12-26 15:35:36 -0500 (Tue, 26 Dec 2017)
Log Message:
-----------
check if still in monospace for code quotes

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/doc/texinfo.tex

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2017-12-18 20:28:14 UTC (rev 7991)
+++ trunk/ChangeLog     2017-12-26 20:35:36 UTC (rev 7992)
@@ -1,3 +1,9 @@
+2017-12-26  Gavin Smith  <address@hidden>
+
+       * doc/texinfo.tex (\codequoteright, \codequoteleft): Check if we 
+       are still in a monospace font in case we are inside @r, like
+       @address@hidden  Report from rms.
+
 2017-12-18  Gavin Smith  <address@hidden>
 
        * doc/texinfo.tex (\resetmathfonts): Revert last change.  Wrong 

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2017-12-18 20:28:14 UTC (rev 7991)
+++ trunk/doc/texinfo.tex       2017-12-26 20:35:36 UTC (rev 7992)
@@ -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{2017-12-18.20}
+\def\texinfoversion{2017-12-26.20}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -2700,11 +2700,15 @@
 % lilypond developers report.  xpdf does work with the regular 0x27.
 %
 \def\codequoteright{%
-  \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax
-    \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
-      '%
+  \ifmonospace
+    \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax
+      \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
+        '%
+      \else \char'15 \fi
     \else \char'15 \fi
-  \else \char'15 \fi
+   \else
+     '%
+   \fi
 }
 %
 % and a similar option for the left quote char vs. a grave accent.
@@ -2712,13 +2716,17 @@
 % the code environments to do likewise.
 %
 \def\codequoteleft{%
-  \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax
-    \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
-      % [Knuth] pp. 380,381,391
-      % \relax disables Spanish ligatures ?` and !` of \tt font.
-      \relax`%
+  \ifmonospace
+    \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax
+      \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
+        % [Knuth] pp. 380,381,391
+        % \relax disables Spanish ligatures ?` and !` of \tt font.
+        \relax`%
+      \else \char'22 \fi
     \else \char'22 \fi
-  \else \char'22 \fi
+   \else
+     \relax`%
+   \fi
 }
 
 % Commands to set the quote options.