From 039c68d8f3d5eedea3fde10bca17e52a56a4c63f Mon Sep 17 00:00:00 2001 From: jfbu Date: Wed, 19 Oct 2016 08:49:47 +0200 Subject: [PATCH] Fix #3062: Failed to build PDF using 1.5a2 PR #3030 (3e21ef4) moved "hyperref" loading to later but forgot the `\hypersetup` at sphinx.sty#L895 for Japanese documents. --- CHANGES | 3 ++- sphinx/texinputs/sphinx.sty | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 468906171..2a5a9f010 100644 --- a/CHANGES +++ b/CHANGES @@ -11,7 +11,8 @@ Bugs fixed ---------- * #2432: Fix unwanted * between varargs and keyword only args. Thanks to Alex Grönholm. - +* #3062: Failed to build PDF using 1.5a2 (undefined ``\hypersetup`` for + Japanese documents since PR#3030) Release 1.5 alpha2 (released Oct 17, 2016) ========================================== diff --git a/sphinx/texinputs/sphinx.sty b/sphinx/texinputs/sphinx.sty index d6e19d53d..72e4b7576 100644 --- a/sphinx/texinputs/sphinx.sty +++ b/sphinx/texinputs/sphinx.sty @@ -892,7 +892,7 @@ % adjust the margins for footer, % this works with the jsclasses only (Japanese standard document classes) \ifx\@jsc@uplatextrue\undefined\else - \hypersetup{setpagesize=false} + \PassOptionsToPackage{setpagesize=false}{hyperref} \setlength\footskip{2\baselineskip} \addtolength{\textheight}{-2\baselineskip} \fi