Fix #6067: LaTeX: images having a target are concatenated to next line

This commit is contained in:
Takeshi KOMIYA 2019-02-28 01:39:29 +09:00
parent 836d65f04c
commit 6c244bdd69
4 changed files with 17 additions and 1 deletions

View File

@ -19,6 +19,7 @@ Bugs fixed
* LaTeX: Remove extraneous space after author names on PDF title page (refs: #6004)
* #6026: LaTeX: A cross reference to definition list does not work
* #6046: LaTeX: ``TypeError`` is raised when invalid latex_elements given
* #6067: LaTeX: images having a target are concatenated to next line
* #6019: imgconverter: Including multipage PDF fails
* #6047: autodoc: ``autofunction`` emits a warning for method objects

View File

@ -1987,6 +1987,8 @@ class LaTeXTranslator(nodes.NodeVisitor):
for id in node.get('ids'):
anchor = not self.in_caption
self.body += self.hypertarget(id, anchor=anchor)
if not self.is_inline(node):
self.body.append('\n')
uri = node.get('refuri', '')
if not uri and node.get('refid'):
uri = '%' + self.curfilestack[-1] + '#' + node['refid']
@ -2039,6 +2041,8 @@ class LaTeXTranslator(nodes.NodeVisitor):
def depart_reference(self, node):
# type: (nodes.Node) -> None
self.body.append(self.context.pop())
if not self.is_inline(node):
self.body.append('\n')
def visit_number_reference(self, node):
# type: (nodes.Node) -> None

View File

@ -15,6 +15,9 @@ test-image
.. image:: testimäge.png
.. image:: rimg.png
:target: https://www.sphinx-doc.org/
.. a remote image
.. image:: https://www.python.org/static/img/python-logo.png

View File

@ -1184,16 +1184,24 @@ def test_latex_raw_directive(app, status, warning):
@pytest.mark.sphinx('latex', testroot='images')
def test_latex_remote_images(app, status, warning):
def test_latex_images(app, status, warning):
app.builder.build_all()
result = (app.outdir / 'Python.tex').text(encoding='utf8')
# images are copied
assert '\\sphinxincludegraphics{{python-logo}.png}' in result
assert (app.outdir / 'python-logo.png').exists()
# not found images
assert '\\sphinxincludegraphics{{NOT_EXIST}.PNG}' not in result
assert ('WARNING: Could not fetch remote image: '
'http://example.com/NOT_EXIST.PNG [404]' in warning.getvalue())
# an image having target
assert ('\\sphinxhref{https://www.sphinx-doc.org/}'
'{\\sphinxincludegraphics{{rimg}.png}}\n\n' in result)
@pytest.mark.sphinx('latex', testroot='latex-index')
def test_latex_index(app, status, warning):