Merge branch '4.0.x' into 4.x

This commit is contained in:
jfbu
2021-06-14 23:00:18 +02:00
3 changed files with 20 additions and 7 deletions

View File

@@ -98,7 +98,11 @@ Features added
Bugs fixed 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 Testing
-------- --------

View File

@@ -74,8 +74,10 @@ class VersionChange(SphinxDirective):
if self.content: if self.content:
self.state.nested_parse(self.content, self.content_offset, node) self.state.nested_parse(self.content, self.content_offset, node)
classes = ['versionmodified', versionlabel_classes[self.name]] classes = ['versionmodified', versionlabel_classes[self.name]]
if len(node): if len(node) > 0 and isinstance(node[0], nodes.paragraph):
if isinstance(node[0], nodes.paragraph) and node[0].rawsource: # the contents start with a paragraph
if node[0].rawsource:
# make the first paragraph translatable
content = nodes.inline(node[0].rawsource, translatable=True) content = nodes.inline(node[0].rawsource, translatable=True)
content.source = node[0].source content.source = node[0].source
content.line = node[0].line content.line = node[0].line
@@ -84,10 +86,16 @@ class VersionChange(SphinxDirective):
para = cast(nodes.paragraph, node[0]) para = cast(nodes.paragraph, node[0])
para.insert(0, nodes.inline('', '%s: ' % text, classes=classes)) 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('', '', para = nodes.paragraph('', '',
nodes.inline('', '%s.' % text, nodes.inline('', '%s: ' % text, classes=classes),
classes=classes), translatable=False)
node.insert(0, para)
else:
# the contents are empty
para = nodes.paragraph('', '',
nodes.inline('', '%s.' % text, classes=classes),
translatable=False) translatable=False)
node.append(para) node.append(para)

View File

@@ -765,7 +765,8 @@
% break at . , ; ? ! / % break at . , ; ? ! /
\sphinxbreaksviaactive \sphinxbreaksviaactive
% break also at \ % break also at \
\let\sphinx@textbackslash\textbackslash \setbox8=\hbox{\textbackslash}%
\def\sphinx@textbackslash{\copy8}%
\let\textbackslash\sphinxtextbackslash \let\textbackslash\sphinxtextbackslash
% by default, no continuation symbol on next line but may be added % by default, no continuation symbol on next line but may be added
\let\sphinxafterbreak\sphinxafterbreakofinlineliteral \let\sphinxafterbreak\sphinxafterbreakofinlineliteral