mirror of
https://github.com/sphinx-doc/sphinx.git
synced 2025-02-25 18:55:22 -06:00
Merge branch '4.0.x' into 4.x
This commit is contained in:
commit
f14561da80
6
CHANGES
6
CHANGES
@ -98,7 +98,11 @@ Features added
|
||||
Bugs fixed
|
||||
----------
|
||||
|
||||
* 9313: LaTeX: complex table with merged cells broken since 4.0
|
||||
* #9330: changeset domain: :rst:dir:`versionchanged` with contents being a list
|
||||
will cause error during pdf build
|
||||
* #9313: LaTeX: complex table with merged cells broken since 4.0
|
||||
* #9305: LaTeX: backslash may cause Improper discretionary list pdf build error
|
||||
with Japanese engines
|
||||
|
||||
Testing
|
||||
--------
|
||||
|
@ -74,8 +74,10 @@ class VersionChange(SphinxDirective):
|
||||
if self.content:
|
||||
self.state.nested_parse(self.content, self.content_offset, node)
|
||||
classes = ['versionmodified', versionlabel_classes[self.name]]
|
||||
if len(node):
|
||||
if isinstance(node[0], nodes.paragraph) and node[0].rawsource:
|
||||
if len(node) > 0 and isinstance(node[0], nodes.paragraph):
|
||||
# the contents start with a paragraph
|
||||
if node[0].rawsource:
|
||||
# make the first paragraph translatable
|
||||
content = nodes.inline(node[0].rawsource, translatable=True)
|
||||
content.source = node[0].source
|
||||
content.line = node[0].line
|
||||
@ -84,10 +86,16 @@ class VersionChange(SphinxDirective):
|
||||
|
||||
para = cast(nodes.paragraph, node[0])
|
||||
para.insert(0, nodes.inline('', '%s: ' % text, classes=classes))
|
||||
else:
|
||||
elif len(node) > 0:
|
||||
# the contents do not starts with a paragraph
|
||||
para = nodes.paragraph('', '',
|
||||
nodes.inline('', '%s.' % text,
|
||||
classes=classes),
|
||||
nodes.inline('', '%s: ' % text, classes=classes),
|
||||
translatable=False)
|
||||
node.insert(0, para)
|
||||
else:
|
||||
# the contents are empty
|
||||
para = nodes.paragraph('', '',
|
||||
nodes.inline('', '%s.' % text, classes=classes),
|
||||
translatable=False)
|
||||
node.append(para)
|
||||
|
||||
|
@ -765,7 +765,8 @@
|
||||
% break at . , ; ? ! /
|
||||
\sphinxbreaksviaactive
|
||||
% break also at \
|
||||
\let\sphinx@textbackslash\textbackslash
|
||||
\setbox8=\hbox{\textbackslash}%
|
||||
\def\sphinx@textbackslash{\copy8}%
|
||||
\let\textbackslash\sphinxtextbackslash
|
||||
% by default, no continuation symbol on next line but may be added
|
||||
\let\sphinxafterbreak\sphinxafterbreakofinlineliteral
|
||||
|
Loading…
Reference in New Issue
Block a user