From 99df5e837334b62c29c979bb0806f525778a4f3e Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Mon, 9 Sep 2019 23:11:23 +0100 Subject: [PATCH] [3.8] bpo-34293: Fix PDF documentation paper size (GH-8585) (GH-15816) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The "A4" pdfs were previously the wrong size due to a change in the options in Sphinx 1.5. See also sphinx-doc/sphinxGH-5235 (cherry picked from commit b5381f669718aa19690f42f3b8bd88f03045b9d2) Authored-by: Jean-François B --- Doc/Makefile | 6 +++++- .../Documentation/2018-07-31-15-38-26.bpo-34293.yHupAL.rst | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Documentation/2018-07-31-15-38-26.bpo-34293.yHupAL.rst diff --git a/Doc/Makefile b/Doc/Makefile index 6f86728ea83..05eeab9124d 100644 --- a/Doc/Makefile +++ b/Doc/Makefile @@ -13,7 +13,11 @@ SOURCES = DISTVERSION = $(shell $(PYTHON) tools/extensions/patchlevel.py) SPHINXERRORHANDLING = -W -ALLSPHINXOPTS = -b $(BUILDER) -d build/doctrees -D latex_elements.papersize=$(PAPER) \ +# Internal variables. +PAPEROPT_a4 = -D latex_elements.papersize=a4paper +PAPEROPT_letter = -D latex_elements.papersize=letterpaper + +ALLSPHINXOPTS = -b $(BUILDER) -d build/doctrees $(PAPEROPT_$(PAPER)) \ $(SPHINXOPTS) $(SPHINXERRORHANDLING) . build/$(BUILDER) $(SOURCES) .PHONY: help build html htmlhelp latex text changes linkcheck \ diff --git a/Misc/NEWS.d/next/Documentation/2018-07-31-15-38-26.bpo-34293.yHupAL.rst b/Misc/NEWS.d/next/Documentation/2018-07-31-15-38-26.bpo-34293.yHupAL.rst new file mode 100644 index 00000000000..912a3ad48d4 --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2018-07-31-15-38-26.bpo-34293.yHupAL.rst @@ -0,0 +1 @@ +Fix the Doc/Makefile regarding PAPER environment variable and PDF builds