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.8'

Browse Source
This commit is contained in:
jfbu 2019-01-22 09:45:11 +01:00
commit f2536b145e
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -224,6 +224,8 @@ Bugs fixed
* #5231: "make html" does not read and build "po" files in "locale" dir * #5231: "make html" does not read and build "po" files in "locale" dir
* #5954: ``:scale:`` image option may break PDF build if image in an admonition * #5954: ``:scale:`` image option may break PDF build if image in an admonition
* #5966: mathjax has not been loaded on incremental build * #5966: mathjax has not been loaded on incremental build
* #5960: LaTeX: modified PDF layout since September 2018 TeXLive update of
:file:`parskip.sty`
Testing Testing
-------- --------

8
sphinx/texinputs/sphinx.sty
View File

@ -220,7 +220,13 @@
% For floating figures in the text. Better to load after float. % For floating figures in the text. Better to load after float.
\RequirePackage{wrapfig} \RequirePackage{wrapfig}
% Separate paragraphs by space by default. % Separate paragraphs by space by default.
\RequirePackage{parskip} \IfFileExists{parskip-2001-04-09.sty}% since September 2018 TeXLive update
% new parskip.sty, but let it rollback to old one.
% hopefully TeX installation not broken and LaTeX kernel not too old
{\RequirePackage{parskip}[=v1]}
% standard one from 1989. Admittedly \section of article/book gives possibly
% anomalous spacing, but we can't require September 2018 release for some time.
{\RequirePackage{parskip}}
% For parsed-literal blocks. % For parsed-literal blocks.
\RequirePackage{alltt} \RequirePackage{alltt}
% Display "real" single quotes in literal blocks. % Display "real" single quotes in literal blocks.