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

use inputenc latex template variable always

Browse Source
This commit is contained in:
jfbu 2016-11-05 11:06:49 +01:00
parent be8034e131
commit e49132d3e4
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/config.rst
View File

@ -1768,7 +1768,7 @@ These options influence LaTeX output. See further :doc:`latex`.
``'inputenc'`` ``'inputenc'``
"inputenc" package inclusion, defaults to "inputenc" package inclusion, defaults to
``'\\usepackage[utf8]{inputenc}'`` when using pdflatex. ``'\\usepackage[utf8]{inputenc}'`` when using pdflatex.
Otherwise unset. Otherwise empty.
.. versionchanged:: 1.4.3 .. versionchanged:: 1.4.3
Previously ``'\\usepackage[utf8]{inputenc}'`` was used for all Previously ``'\\usepackage[utf8]{inputenc}'`` was used for all

2
sphinx/templates/latex/content.tex_t
View File

@ -15,9 +15,7 @@
\fi \sphinxpxdimen=<%= pxunit %>\relax \fi \sphinxpxdimen=<%= pxunit %>\relax
<%= passoptionstopackages %> <%= passoptionstopackages %>
<%= geometry %> <%= geometry %>
<% if latex_engine == 'pdflatex' -%>
<%= inputenc %> <%= inputenc %>
<% endif -%>
<%= utf8extra %> <%= utf8extra %>
<%= cmappkg %> <%= cmappkg %>
<%= fontenc %> <%= fontenc %>

4
sphinx/writers/latex.py
View File

@ -102,7 +102,9 @@ DEFAULT_SETTINGS = {
ADDITIONAL_SETTINGS = { ADDITIONAL_SETTINGS = {
'pdflatex': { 'pdflatex': {
'inputenc': '\\usepackage[utf8]{inputenc}', 'inputenc': '\\usepackage[utf8]{inputenc}',
'utf8extra': '\\DeclareUnicodeCharacter{00A0}{\\nobreakspace}', 'utf8extra': ('\\ifdefined\\DeclareUnicodeCharacter\n'
' \\DeclareUnicodeCharacter{00A0}{\\nobreakspace}\n'
'\\fi'),
}, },
'xelatex': { 'xelatex': {
'latex_engine': 'xelatex', 'latex_engine': 'xelatex',