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

Merge branch '1.7'

Browse Source
This commit is contained in:
jfbu 2018-07-31 09:48:43 +02:00
commit dc3db45550
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -235,6 +235,10 @@ Bugs fixed
* #5198: document not in toctree warning when including files only for parallel * #5198: document not in toctree warning when including files only for parallel
builds builds
* LaTeX: reduce "Token not allowed in a PDF string" hyperref warnings in latex
console output (refs: #5136)
* LaTeX: suppress "remreset Warning: The remreset package is obsolete" in latex
console output with recent LaTeX (refs: #5137)
Testing Testing
-------- --------

5
sphinx/texinputs/sphinx.sty
View File

@ -182,7 +182,10 @@
% control caption around literal-block % control caption around literal-block
\RequirePackage{capt-of} \RequirePackage{capt-of}
\RequirePackage{needspace} \RequirePackage{needspace}
\RequirePackage{remreset}% provides \@removefromreset % LaTeX 2018-04-01 and later provides \@removefromreset
\ltx@ifundefined{@removefromreset}
{\RequirePackage{remreset}}
{}% avoid warning
% to make pdf with correct encoded bookmarks in Japanese % to make pdf with correct encoded bookmarks in Japanese
% this should precede the hyperref package % this should precede the hyperref package
\ifx\kanjiskip\@undefined \ifx\kanjiskip\@undefined