Commit e7ffb99
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -10,7 +10,7 @@ PAPER = | |||
| 10 | 10 | SOURCES = | |
| 11 | 11 | DISTVERSION = $(shell $(PYTHON) tools/extensions/patchlevel.py) | |
| 12 | 12 | ||
| 13 | - ALLSPHINXOPTS = -b $(BUILDER) -d build/doctrees -D latex_paper_size=$(PAPER) \ | ||
| 13 | + ALLSPHINXOPTS = -b $(BUILDER) -d build/doctrees -D latex_elements.papersize=$(PAPER) \ | ||
| 14 | 14 | $(SPHINXOPTS) . build/$(BUILDER) $(SOURCES) | |
| 15 | 15 | ||
| 16 | 16 | .PHONY: help build html htmlhelp latex text changes linkcheck \ | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -88,11 +88,24 @@ | |||
| 88 | 88 | # Options for LaTeX output | |
| 89 | 89 | # ------------------------ | |
| 90 | 90 | ||
| 91 | + # Get LaTeX to handle Unicode correctly | ||
| 92 | + latex_elements = {'inputenc': r'\usepackage[utf8x]{inputenc}', 'utf8extra': ''} | ||
| 93 | + | ||
| 94 | + # Additional stuff for the LaTeX preamble. | ||
| 95 | + latex_elements['preamble'] = r''' | ||
| 96 | + \authoraddress{ | ||
| 97 | + \strong{Python Software Foundation}\\ | ||
| 98 | + Email: \email{docs@python.org} | ||
| 99 | + } | ||
| 100 | + \let\Verbatim=\OriginalVerbatim | ||
| 101 | + \let\endVerbatim=\endOriginalVerbatim | ||
| 102 | + ''' | ||
| 103 | + | ||
| 91 | 104 | # The paper size ('letter' or 'a4'). | |
| 92 | - latex_paper_size = 'a4' | ||
| 105 | + latex_elements['papersize'] = 'a4' | ||
| 93 | 106 | ||
| 94 | 107 | # The font size ('10pt', '11pt' or '12pt'). | |
| 95 | - latex_font_size = '10pt' | ||
| 108 | + latex_elements['font_size'] = '10pt' | ||
| 96 | 109 | ||
| 97 | 110 | # Grouping the document tree into LaTeX files. List of tuples | |
| 98 | 111 | # (source start file, target name, title, author, document class [howto/manual]). | |
@@ -125,22 +138,9 @@ | |||
| 125 | 138 | for fn in os.listdir('howto') | |
| 126 | 139 | if fn.endswith('.rst') and fn != 'index.rst') | |
| 127 | 140 | ||
| 128 | - # Additional stuff for the LaTeX preamble. | ||
| 129 | - latex_preamble = r''' | ||
| 130 | - \authoraddress{ | ||
| 131 | - \strong{Python Software Foundation}\\ | ||
| 132 | - Email: \email{docs@python.org} | ||
| 133 | - } | ||
| 134 | - \let\Verbatim=\OriginalVerbatim | ||
| 135 | - \let\endVerbatim=\endOriginalVerbatim | ||
| 136 | - ''' | ||
| 137 | - | ||
| 138 | 141 | # Documents to append as an appendix to all manuals. | |
| 139 | 142 | latex_appendices = ['glossary', 'about', 'license', 'copyright'] | |
| 140 | 143 | ||
| 141 | - # Get LaTeX to handle Unicode correctly | ||
| 142 | - latex_elements = {'inputenc': r'\usepackage[utf8x]{inputenc}', 'utf8extra': ''} | ||
| 143 | - | ||
| 144 | 144 | # Options for Epub output | |
| 145 | 145 | # ----------------------- | |
| 146 | 146 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -661,7 +661,7 @@ C API | |||
| 661 | 661 | PY_SSIZE_T_CLEAN is defined. | |
| 662 | 662 | ||
| 663 | 663 | - Issue #28769: The result of PyUnicode_AsUTF8AndSize() and PyUnicode_AsUTF8() | |
| 664 | - is now of type "const char *" rather of "char *". | ||
| 664 | + is now of type ``const char *`` rather of ``char *``. | ||
| 665 | 665 | ||
| 666 | 666 | - Issue #29058: All stable API extensions added after Python 3.2 are now | |
| 667 | 667 | available only when Py_LIMITED_API is set to the PY_VERSION_HEX value of | |
0 commit comments