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 master

Browse Source 
Conflicts (fixed)::
	sphinx/texinputs/sphinx.sty
This commit is contained in:
jfbu 2016-09-07 22:33:03 +02:00
commit 1d7c82b3bb
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -155,6 +155,7 @@ Bugs fixed
* #2917: inline code is hyphenated on HTML * #2917: inline code is hyphenated on HTML
* #1462: autosummary warns for namedtuple with attribute with trailing underscore * #1462: autosummary warns for namedtuple with attribute with trailing underscore
* Could not reference equations if ``:nowrap:`` option specified * Could not reference equations if ``:nowrap:`` option specified
* #2873: code-block overflow in latex (due to commas)
Release 1.4.6 (released Aug 20, 2016) Release 1.4.6 (released Aug 20, 2016)
===================================== =====================================

2
doc/extdev/markupapi.rst
View File

@ -125,6 +125,8 @@ Both APIs parse the content into a given node. They are used like this::
node = docutils.nodes.paragraph() node = docutils.nodes.paragraph()
# either # either
from sphinx.ext.autodoc import AutodocReporter
self.state.memo.reporter = AutodocReporter(self.result, self.state.memo.reporter) # override reporter to avoid errors from "include" directive
nested_parse_with_titles(self.state, self.result, node) nested_parse_with_titles(self.state, self.result, node)
# or # or
self.state.nested_parse(self.result, 0, node) self.state.nested_parse(self.result, 0, node)

3
sphinx/texinputs/sphinx.sty
View File

@ -291,6 +291,7 @@
\def\PYGZti{\discretionary{\char`\~}{\sphinxafterbreak}{\char`\~}}% \def\PYGZti{\discretionary{\char`\~}{\sphinxafterbreak}{\char`\~}}%
} }
\def\sphinx@verbatim@nolig@list {\do \`}%
% Some characters . , ; ? ! / are not pygmentized. % Some characters . , ; ? ! / are not pygmentized.
% This macro makes them "active" and they will insert potential linebreaks % This macro makes them "active" and they will insert potential linebreaks
\newcommand*\sphinxbreaksatpunct {% \newcommand*\sphinxbreaksatpunct {%
@ -403,6 +404,8 @@
}% }%
% For grid placement from \strut's in \FancyVerbFormatLine % For grid placement from \strut's in \FancyVerbFormatLine
\lineskip\z@skip \lineskip\z@skip
% active comma should not be overwritten by \@noligs
\let\verbatim@nolig@list \sphinx@verbatim@nolig@list
% will fetch its optional arguments if any % will fetch its optional arguments if any
\OriginalVerbatim \OriginalVerbatim
} }