Merge pull request #9419 from zhsj/fancyvrb-zh

Add xeCJKVerbAddon to default fvset config for Chinese documents
sphinx-doc · Jul 10, 2021 · 7e3e152 · 7e3e152
2 parents f65955c + 92c9cab
commit 7e3e152
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/doc/latex.rst b/doc/latex.rst
@@ -531,6 +531,10 @@ Keys that don't need to be overridden unless in special cases are:
       Changed default for ``'pdflatex'``. Previously it was using 
       ``'\\fvset{fontsize=\\small}'``.
 
+   .. versionchanged:: 4.1.0
+      Changed default for Chinese documents to
+      ``'\\fvset{fontsize=\\small,formatcom=\\xeCJKVerbAddon}'``
+
 Keys that are set by other options and therefore should not be overridden are:
 
 ``'docclass'``

diff --git a/sphinx/builders/latex/constants.py b/sphinx/builders/latex/constants.py
@@ -198,6 +198,9 @@
         'polyglossia':  '',
         'babel':        '\\usepackage{babel}',
         'fontenc':      '\\usepackage{xeCJK}',
+        # set formatcom=\xeCJKVerbAddon to prevent xeCJK from adding extra spaces in
+        # fancyvrb Verbatim enviroment.
+        'fvset':        '\\fvset{fontsize=\\small,formatcom=\\xeCJKVerbAddon}',
     },
     ('xelatex', 'el'): {
         'fontpkg':      XELATEX_GREEK_DEFAULT_FONTPKG,