The "xetex" writer now ignores settings in the [latex2e writer] config section.

Move settings intended for both, `xetex` and `latex2e` writers
to section [latex writers].

git-svn-id: https://svn.code.sf.net/p/docutils/code/trunk@9293 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

4 files changed, 22 insertions, 18 deletions

diff --git a/docutils/HISTORY.txt b/docutils/HISTORY.txt
index 8b9f6929a..5ca3bf227 100644
--- a/docutils/HISTORY.txt
+++ b/docutils/HISTORY.txt
@@ -88,6 +88,10 @@ Changes Since 0.19
 
   - Do not output empty "manual" in ``.TH``
 
+* docutils/writers/xetex/__init__.py
+
+  - Ignore settings in the [latex2e writer] configuration file section.
+
 * setup.py
 
   - Fix SetuptoolsDeprecationWarning: ``Installing '' as data is deprecated``
diff --git a/docutils/RELEASE-NOTES.txt b/docutils/RELEASE-NOTES.txt
index 180395d81..6762d9ff2 100644
--- a/docutils/RELEASE-NOTES.txt
+++ b/docutils/RELEASE-NOTES.txt
@@ -100,15 +100,6 @@ Future changes
   - Remove ``use_verbatim_when_possible`` setting
     (use literal_block_env_: verbatim) in Docutils 2.0.
 
-* "xetex" writer:
-
-  - Settings in the [latex2e writer] `configuration file section`__
-    will be ignored by the `xetex` writer in Docutils 0.20.
-    Move settings intended for both, `xetex` and `latex2e` writers
-    to section [latex writers].
-
-    __ docs/user/config.html#configuration-file-sections-entries
-
 * Remove the "rawsource" argument from `nodes.Text.__init__()`
   (deprecated and ignored since Docutils 0.18) in Docutils 2.0.
 
@@ -156,6 +147,17 @@ Release 0.20 (unpublished)
     Use dpub-ARIA role "doc-footnote" (instead of ARIA role "note")
     for footnotes.
 
+* Configuration changes:
+
+  - Settings in the [latex2e writer] configuration file section
+    are now ignored by the "xetex" writer.
+    Move settings intended for both, "xetex" and "latex2e" writers
+    to section `[latex writers]`_.
+
+    .. _[latex writers]: docs/user/config.html#latex-writers
+
+* Bugfixes and improvements (see HISTORY_).
+
 
 Release 0.19 (2022-07-05)
 =========================
diff --git a/docutils/docs/user/config.txt b/docutils/docs/user/config.txt
index f30a00c32..6cc43c1d1 100644
--- a/docutils/docs/user/config.txt
+++ b/docutils/docs/user/config.txt
@@ -145,6 +145,9 @@ Individual configuration sections and settings are described in the
 following section.
 
 
+.. _configuration section:
+.. _configuration sections:
+
 -------------------------------------
 Configuration File Sections & Entries
 -------------------------------------
@@ -1901,7 +1904,6 @@ LaTeX (pdfTeX_). It shares all settings defined in the `[latex writers]`_
 
 .. _LaTeX2e writer: latex.html#latex2e-writer
 .. _pdfTeX: https://www.tug.org/applications/pdftex/
-.. _configuration section: `Configuration File Sections & Entries`_
 
 
 Writer Specific Defaults
@@ -1938,14 +1940,12 @@ Default: "T1".  Option: ``--font-encoding``.
 [xetex writer]
 ~~~~~~~~~~~~~~
 
-The `XeTeX writer`_ generates a LaTeX source for compilation with `XeTeX or
-LuaTeX`_. It derives from the latex2e writer, and shares all settings
-defined in the `[latex writers]`_ and `[latex2e writer]`_ `configuration
-sections`_.
+The `XeTeX writer`_ generates a LaTeX source for compilation with `XeTeX
+or LuaTeX`_. It derives from the latex2e writer, and shares all settings
+defined in the `[latex writers]`_ `configuration section`_.
 
 .. _XeTeX writer: latex.html#xetex-writer
 .. _XeTeX or LuaTeX: https://texfaq.org/FAQ-xetex-luatex
-.. _configuration sections: `Configuration File Sections & Entries`_
 
 Writer Specific Defaults
 """"""""""""""""""""""""
diff --git a/docutils/docutils/writers/xetex/__init__.py b/docutils/docutils/writers/xetex/__init__.py
index 480d09448..4397843c1 100644
--- a/docutils/docutils/writers/xetex/__init__.py
+++ b/docutils/docutils/writers/xetex/__init__.py
@@ -40,9 +40,7 @@ class Writer(latex2e.Writer):
 \\setmonofont[HyphenChar=None,Scale=MatchLowercase]{DejaVu Sans Mono}"""
 
     config_section = 'xetex writer'
-    # TODO: remove dependency on `latex2e writer`.
-    config_section_dependencies = ('writers', 'latex writers',
-                                   'latex2e writer')
+    config_section_dependencies = ('writers', 'latex writers')
 
     # use a copy of the parent spec with some modifications:
     settings_spec = frontend.filter_settings_spec(