IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Load CMU by filename, not font name, for XeLaTeX

Browse Source
This commit is contained in:
jfbu 2018-11-17 01:38:01 +01:00
parent f56431b687
commit 6283324b1a
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -39,6 +39,9 @@ Dependencies
then, the last four are font packages arising in the default value for then, the last four are font packages arising in the default value for
:confval:`latex_elements`.\ ``'fontpkg'``, and may be replaced by other font :confval:`latex_elements`.\ ``'fontpkg'``, and may be replaced by other font
packages providing ``LGR`` and/or ``T2A`` support. packages providing ``LGR`` and/or ``T2A`` support.
* LaTeX builder with :confval:`latex_engine` set to ``'xelatex'`` or to
``'lualatex'`` requires (by default) the ``Computer Modern Unicode`` fonts,
which in Ubuntu xenial are in ``texlive-fonts-extra``.
Incompatible changes Incompatible changes
-------------------- --------------------

3
doc/usage/builders/index.rst
View File

@ -167,7 +167,8 @@ The builder's "name" must be given to the **-b** command-line option of
* ``texlive-fonts-extra``, ``texlive-lang-greek`` (if needed to * ``texlive-fonts-extra``, ``texlive-lang-greek`` (if needed to
support Greek or Cyrillic letters in non-cyrillic document) support Greek or Cyrillic letters in non-cyrillic document)
* ``latexmk`` (for ``make latexpdf`` on GNU/Linux and MacOS X) * ``latexmk`` (for ``make latexpdf`` on GNU/Linux and MacOS X)
* ``texlive-luatex``, ``texlive-xetex`` (see :confval:`latex_engine`) * ``texlive-luatex``, ``texlive-xetex``, ``texlive-fonts-extra``
(if :confval:`latex_engine` is set to ``'xelatex'`` or ``'lualatex'``)
The testing of Sphinx LaTeX is done on Ubuntu xenial with the above mentioned The testing of Sphinx LaTeX is done on Ubuntu xenial with the above mentioned
packages, which are from a TeXLive 2015 snapshot dated March 2016. packages, which are from a TeXLive 2015 snapshot dated March 2016.

15
sphinx/writers/latex.py
View File

@ -158,9 +158,18 @@ ADDITIONAL_SETTINGS = {
'polyglossia': '\\usepackage{polyglossia}', 'polyglossia': '\\usepackage{polyglossia}',
'babel': '', 'babel': '',
'fontenc': '\\usepackage{fontspec}', 'fontenc': '\\usepackage{fontspec}',
'fontpkg': ('\\setmainfont{CMU Serif}\n' 'fontpkg': ('\\setmainfont{cmunrm.otf}[\n'
'\\setsansfont{CMU Sans Serif}\n' ' BoldFont = cmunbx.otf,\n'
'\\setmonofont{CMU Typewriter Text}'), ' ItalicFont = cmunti.otf,\n'
' BoldItalicFont = cmunbi.otf]\n'
'\\setsansfont{cmunss.otf}[\n'
' BoldFont = cmunsx.otf,\n'
' ItalicFont = cmunsi.otf,\n'
' BoldItalicFont = cmunso.otf]\n'
'\\setmonofont{cmuntt.otf}[\n'
' BoldFont = cmuntb.otf,\n'
' ItalicFont = cmunit.otf,\n'
' BoldItalicFont = cmuntx.otf]'),
'textgreek': '', 'textgreek': '',
'utf8extra': ('\\catcode`^^^^00a0\\active\\protected\\def^^^^00a0' 'utf8extra': ('\\catcode`^^^^00a0\\active\\protected\\def^^^^00a0'
'{\\leavevmode\\nobreak\\ }'), '{\\leavevmode\\nobreak\\ }'),