From 7c2f5f16eb1898e8b154d1a9bcfa13782b3c2d24 Mon Sep 17 00:00:00 2001 From: jfbu Date: Tue, 25 Apr 2017 10:14:53 +0200 Subject: [PATCH] Fix #3664 relative to ``\labelsep`` setting in LaTeX fulllineitems This also removes re-definition of description environment which is not needed anymore as ``\labelsep`` is not modified. --- CHANGES | 1 + sphinx/texinputs/sphinx.sty | 21 +++++++-------------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/CHANGES b/CHANGES index 4035a50ce..b38d91c4d 100644 --- a/CHANGES +++ b/CHANGES @@ -15,6 +15,7 @@ Bugs fixed * #3614: Sphinx crashes with requests-2.5.0 * #3618: autodoc crashes with tupled arguments +* #3664: No space after the bullet in items of a latex list produced by Sphinx Testing -------- diff --git a/sphinx/texinputs/sphinx.sty b/sphinx/texinputs/sphinx.sty index 571f26c72..9c2a0d72f 100644 --- a/sphinx/texinputs/sphinx.sty +++ b/sphinx/texinputs/sphinx.sty @@ -6,7 +6,7 @@ % \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{sphinx}[2017/03/26 v1.5.4 LaTeX package (Sphinx markup)] +\ProvidesPackage{sphinx}[2017/04/25 v1.5.6 LaTeX package (Sphinx markup)] % this is the \ltx@ifundefined of ltxcmds.sty, which is loaded by % kvoptions (and later by hyperref), but the first release of @@ -1164,26 +1164,19 @@ % {fulllineitems} is the main environment for object descriptions. % \newcommand{\py@itemnewline}[1]{% + \kern\labelsep \@tempdima\linewidth - \advance\@tempdima \leftmargin\makebox[\@tempdima][l]{#1}% + \advance\@tempdima \labelwidth\makebox[\@tempdima][l]{#1}% + \kern-\labelsep } -\newenvironment{fulllineitems}{ - \begin{list}{}{\labelwidth \leftmargin \labelsep \z@ +\newenvironment{fulllineitems}{% + \begin{list}{}{\labelwidth \leftmargin \rightmargin \z@ \topsep -\parskip \partopsep \parskip \itemsep -\parsep - \let\makelabel=\py@itemnewline} + \let\makelabel=\py@itemnewline}% }{\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 % \newlength{\py@argswidth}