summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2017-09-22 13:41:10 -0500
committerGitHub <noreply@github.com>2017-09-22 13:41:10 -0500
commitda86874a3d8f882d6aedd882b2e27f59b59d6798 (patch)
tree80ac094461521cd5cf0ba5806b75366103d599bd
parent5b6452d412b5be45f265093e75563fcf6d05dc3e (diff)
downloadcpython-git-da86874a3d8f882d6aedd882b2e27f59b59d6798.tar.gz
[2.7] bpo-31423: Fix building the PDF documentation (GH-3693) (GH-3700)
Use prefixed macro names for the `authoraddress` function, add T2A to the font encoding in LaTeX sources to support Cyrillic characters in the PDF documentation, and replace the deprecated `font_size` config option with `pointsize`. (cherry picked from commit da9b4cfb488119f2493a762fcb1d85c58494f51d)
-rw-r--r--Doc/conf.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/Doc/conf.py b/Doc/conf.py
index 14bb6419d3..557fe1e72f 100644
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -83,13 +83,17 @@ html_split_index = True
# ------------------------
# Get LaTeX to handle Unicode correctly
-latex_elements = {'inputenc': r'\usepackage[utf8x]{inputenc}', 'utf8extra': ''}
+latex_elements = {
+ 'inputenc': r'\usepackage[utf8x]{inputenc}',
+ 'utf8extra': '',
+ 'fontenc': r'\usepackage[T1,T2A]{fontenc}',
+}
# Additional stuff for the LaTeX preamble.
latex_elements['preamble'] = r'''
\authoraddress{
- \strong{Python Software Foundation}\\
- Email: \email{docs@python.org}
+ \sphinxstrong{Python Software Foundation}\\
+ Email: \sphinxemail{docs@python.org}
}
\let\Verbatim=\OriginalVerbatim
\let\endVerbatim=\endOriginalVerbatim
@@ -99,7 +103,7 @@ latex_elements['preamble'] = r'''
latex_elements['papersize'] = 'a4'
# The font size ('10pt', '11pt' or '12pt').
-latex_elements['font_size'] = '10pt'
+latex_elements['pointsize'] = '10pt'
# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, author, document class [howto/manual]).