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 'stable' into 1.6-release

Browse Source
This commit is contained in:
jfbu 2017-04-25 12:14:11 +02:00
commit 6c1c8948cb
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -212,6 +212,7 @@ Bugs fixed
* #3614: Sphinx crashes with requests-2.5.0 * #3614: Sphinx crashes with requests-2.5.0
* #3618: autodoc crashes with tupled arguments * #3618: autodoc crashes with tupled arguments
* #3664: No space after the bullet in items of a latex list produced by Sphinx
Testing Testing
-------- --------

21
sphinx/texinputs/sphinx.sty
View File

@ -6,7 +6,7 @@
% %
\NeedsTeXFormat{LaTeX2e}[1995/12/01] \NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{sphinx}[2017/03/26 v1.6 LaTeX package (Sphinx markup)] \ProvidesPackage{sphinx}[2017/04/25 v1.6 LaTeX package (Sphinx markup)]
% provides \ltx@ifundefined % provides \ltx@ifundefined
% (many packages load ltxcmds: graphicx does for pdftex and lualatex but % (many packages load ltxcmds: graphicx does for pdftex and lualatex but
@ -1186,26 +1186,19 @@
% {fulllineitems} is the main environment for object descriptions. % {fulllineitems} is the main environment for object descriptions.
% %
\newcommand{\py@itemnewline}[1]{% \newcommand{\py@itemnewline}[1]{%
\kern\labelsep
\@tempdima\linewidth \@tempdima\linewidth
\advance\@tempdima \leftmargin\makebox[\@tempdima][l]{#1}% \advance\@tempdima \labelwidth\makebox[\@tempdima][l]{#1}%
\kern-\labelsep
} }
\newenvironment{fulllineitems}{ \newenvironment{fulllineitems}{%
\begin{list}{}{\labelwidth \leftmargin \labelsep \z@ \begin{list}{}{\labelwidth \leftmargin
\rightmargin \z@ \topsep -\parskip \partopsep \parskip \rightmargin \z@ \topsep -\parskip \partopsep \parskip
\itemsep -\parsep \itemsep -\parsep
\let\makelabel=\py@itemnewline} \let\makelabel=\py@itemnewline}%
}{\end{list}} }{\end{list}}
% Redefine description environment so that it is usable inside fulllineitems.
%
% FIXME: use sphinxdescription, do not redefine description environment!
\renewcommand{\description}{%
\list{}{\labelwidth\z@
\itemindent-\leftmargin
\labelsep5pt\relax
\let\makelabel=\descriptionlabel}}
% Signatures, possibly multi-line % Signatures, possibly multi-line
% %
\newlength{\py@argswidth} \newlength{\py@argswidth}