Merge branch '2.2.1' into 2.0

CHANGES

@@ -56,6 +56,7 @@ Bugs fixed
 ----------
 
 * #6641: LaTeX: Undefined control sequence ``\sphinxmaketitle``
+* #6710: LaTeX not well configured for Greek language as main language
 
 Testing
 --------

doc/latex.rst

@@ -289,6 +289,11 @@ into the generated ``.tex`` files.  Its ``'sphinxsetup'`` key is described
 
      .. attention::
 
+        If Greek is main language, do not use this key.  Since Sphinx 2.2.1,
+        ``xelatex`` will be used automatically as :confval:`latex_engine`.
+        Formerly, Sphinx did not support producing PDF via LaTeX with Greek as
+        main language.
+
         Prior to 2.0, Unicode Greek letters were escaped to use LaTeX math
         mark-up.  This is not the case anymore, and the above must be used
         (only in case of ``'pdflatex'`` engine) if the source contains such

doc/usage/configuration.rst

@@ -1841,7 +1841,17 @@ These options influence LaTeX output.
    ``'xelatex'`` or ``'lualatex'`` and making sure to use an OpenType font
    with wide-enough glyph coverage is often easier than trying to make
    ``'pdflatex'`` work with the extra Unicode characters.  Since Sphinx 2.0
-   the default is the GNU FreeFont which covers well Latin, Cyrillic and Greek.
+   the default is the GNU FreeFont which covers well Latin, Cyrillic and
+   Greek.
+
+   .. versionchanged:: 2.1.0
+
+      Use ``xelatex`` (and LaTeX package ``xeCJK``) by default for Chinese
+      documents.
+
+   .. versionchanged:: 2.2.1
+
+      Use ``xelatex`` by default for Greek documents.
 
    Contrarily to :ref:`MathJaX math rendering in HTML output <math-support>`,
    LaTeX requires some extra configuration to support Unicode literals in

setup.py

@@ -47,7 +47,7 @@ extras_require = {
         'html5lib',
         'flake8>=3.5.0',
         'flake8-import-order',
-        'mypy>=0.730',
+        'mypy>=0.740',
         'docutils-stubs',
     ],
 }

sphinx/builders/latex/__init__.py

@@ -418,6 +418,8 @@ def default_latex_engine(config: Config) -> str:
         return 'platex'
     elif (config.language or '').startswith('zh'):
         return 'xelatex'
+    elif config.language == 'el':
+        return 'xelatex'
     else:
         return 'pdflatex'
 

sphinx/domains/cpp.py

@@ -32,7 +32,8 @@ from sphinx.util.nodes import make_refnode
 
 if False:
     # For type annotation
-    from typing import Any, Callable, Dict, Iterator, List, Match, Pattern, Tuple, Union  # NOQA
+    from docutils.nodes import TextElement
+    from typing import Any, Callable, Dict, Iterator, List, Match, Pattern, Tuple, Type, Union  # NOQA
     from sphinx.application import Sphinx  # NOQA
     from sphinx.builders import Builder  # NOQA
     from sphinx.config import Config  # NOQA
@@ -7037,7 +7038,7 @@ class CPPExprRole:
         if asCode:
             # render the expression as inline code
             self.class_type = 'cpp-expr'
-            self.node_type = nodes.literal
+            self.node_type = nodes.literal  # type: Type[TextElement]
         else:
             # render the expression as inline text
             self.class_type = 'cpp-texpr'

sphinx/util/docutils.py

@@ -187,7 +187,7 @@ class sphinx_domains:
     def __enter__(self) -> None:
         self.enable()
 
-    def __exit__(self, exc_type: "Type[Exception]", exc_value: Exception, traceback: Any) -> bool:  # NOQA
+    def __exit__(self, exc_type: "Type[Exception]", exc_value: Exception, traceback: Any) -> bool:  # type: ignore # NOQA
         self.disable()
         return False
 

sphinx/util/matching.py

@@ -9,7 +9,7 @@
 """
 
 import re
-from typing import Callable, Dict, List, Match, Pattern
+from typing import Callable, Dict, Iterable, List, Match, Pattern
 
 from sphinx.util.osutil import canon_path
 
@@ -96,7 +96,7 @@ def patmatch(name: str, pat: str) -> Match[str]:
     return _pat_cache[pat].match(name)
 
 
-def patfilter(names: List[str], pat: str) -> List[str]:
+def patfilter(names: Iterable[str], pat: str) -> List[str]:
     """Return the subset of the list NAMES that match PAT.
 
     Adapted from fnmatch module.

sphinx/util/pycompat.py

@@ -55,7 +55,7 @@ class UnicodeMixin:
     def __str__(self):
         warnings.warn('UnicodeMixin is deprecated',
                       RemovedInSphinx40Warning, stacklevel=2)
-        return self.__unicode__()
+        return self.__unicode__()  # type: ignore
 
 
 def execfile_(filepath: str, _globals: Any, open: Callable = open) -> None:

sphinx/writers/latex.py

@@ -116,6 +116,10 @@ XELATEX_DEFAULT_FONTPKG = r'''
   BoldItalicFont = *BoldOblique,
 ]
 '''
+XELATEX_GREEK_DEFAULT_FONTPKG = (XELATEX_DEFAULT_FONTPKG +
+                                 '\n\\newfontfamily\\greekfont{FreeSerif}' +
+                                 '\n\\newfontfamily\\greekfontsf{FreeSans}' +
+                                 '\n\\newfontfamily\\greekfonttt{FreeMono}')
 LUALATEX_DEFAULT_FONTPKG = XELATEX_DEFAULT_FONTPKG
 
 DEFAULT_SETTINGS = {
@@ -226,6 +230,9 @@ ADDITIONAL_SETTINGS = {
     ('xelatex', 'zh'): {
         'fontenc':      '\\usepackage{xeCJK}',
     },
+    ('xelatex', 'el'): {
+        'fontpkg':      XELATEX_GREEK_DEFAULT_FONTPKG,
+    },
 }  # type: Dict[Any, Dict[str, Any]]
 
 EXTRA_RE = re.compile(r'^(.*\S)\s+\(([^()]*)\)\s*$')

tests/test_build_latex.py

@@ -175,6 +175,17 @@ def test_latex_additional_settings_for_language_code(app, status, warning):
     assert r'\usepackage{xeCJK}' in result
 
 
+@pytest.mark.sphinx('latex', testroot='basic', confoverrides={'language': 'el'})
+def test_latex_additional_settings_for_greek(app, status, warning):
+    app.builder.build_all()
+    result = (app.outdir / 'test.tex').text(encoding='utf8')
+    print(result)
+    print(status.getvalue())
+    print(warning.getvalue())
+    assert '\\usepackage{polyglossia}\n\\setmainlanguage{greek}' in result
+    assert '\\newfontfamily\\greekfonttt{FreeMono}' in result
+
+
 @pytest.mark.sphinx('latex', testroot='latex-title')
 def test_latex_title_after_admonitions(app, status, warning):
     app.builder.build_all()