From bd84edb1170fd557dd410d7f0f88e4474f7d0203 Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Sun, 19 Dec 2021 14:09:34 +0900
Subject: [PATCH] Fix #9962: texinfo: Do not use @definfoenclose to empasize
 string

Since texinfo-6.8, `@definfoenclose` command has been deprecated. This
stops to use it to reduce the deprecation warning.

This also disables the customization the styles of emphasized text via
the command.
---
 CHANGES                   |  5 +++++
 doc/faq.rst               | 16 ----------------
 sphinx/writers/texinfo.py | 16 +++++++++-------
 3 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/CHANGES b/CHANGES
index 328b38e432c..ac84eac47b4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,8 @@ Dependencies
 Incompatible changes
 --------------------
 
+* #9962: texinfo: Customizing styles of emphasized text via ``@definfoenclose``
+  command was not supported because the command was deprecated since texinfo 6.8
 * #2068: :confval:`intersphinx_disabled_reftypes` has changed default value
   from an empty list to ``['std:doc']`` as avoid too surprising silent
   intersphinx resolutions.
@@ -23,6 +25,9 @@ Features added
 Bugs fixed
 ----------
 
+* #9962: texinfo: Deprecation message for ``@definfoenclose`` command on
+  bulding texinfo document
+
 Testing
 --------
 
diff --git a/doc/faq.rst b/doc/faq.rst
index 2e108143957..68eb4745f6b 100644
--- a/doc/faq.rst
+++ b/doc/faq.rst
@@ -350,19 +350,3 @@ The following notes may be helpful if you want to create Texinfo files:
   scheme ``info``.  For example::
 
      info:Texinfo#makeinfo_options
-
-- Inline markup
-
-  The standard formatting for ``*strong*`` and ``_emphasis_`` can
-  result in ambiguous output when used to markup parameter names and
-  other values.  Since this is a fairly common practice, the default
-  formatting has been changed so that ``emphasis`` and ``strong`` are
-  now displayed like ```literal'``\s.
-
-  The standard formatting can be re-enabled by adding the following to
-  your :file:`conf.py`::
-
-     texinfo_elements = {'preamble': """
-     @definfoenclose strong,*,*
-     @definfoenclose emph,_,_
-     """}
diff --git a/sphinx/writers/texinfo.py b/sphinx/writers/texinfo.py
index 11f2fba0f93..9881598af46 100644
--- a/sphinx/writers/texinfo.py
+++ b/sphinx/writers/texinfo.py
@@ -58,8 +58,6 @@
 @exampleindent %(exampleindent)s
 @finalout
 %(direntry)s
-@definfoenclose strong,`,'
-@definfoenclose emph,`,'
 @c %%**end of header
 
 @copying
@@ -805,17 +803,21 @@ def depart_line(self, node: Element) -> None:
     # -- Inline
 
     def visit_strong(self, node: Element) -> None:
-        self.body.append('@strong{')
+        self.body.append('`')
 
     def depart_strong(self, node: Element) -> None:
-        self.body.append('}')
+        self.body.append("'")
 
     def visit_emphasis(self, node: Element) -> None:
-        element = 'emph' if not self.in_samp else 'var'
-        self.body.append('@%s{' % element)
+        if self.in_samp:
+            self.body.append('@var{')
+            self.context.append('}')
+        else:
+            self.body.append('`')
+            self.context.append("'")
 
     def depart_emphasis(self, node: Element) -> None:
-        self.body.append('}')
+        self.body.append(self.context.pop())
 
     def is_samp(self, node: Element) -> bool:
         return 'samp' in node['classes']