Fit graphviz images to page.

Use \sphinxincludegraphics, that's what the core image directives use
and it handles fitting properly.
This commit is contained in:
Roman Kapl
2018-02-11 15:32:59 +01:00
committed by Takeshi KOMIYA
parent ec8226daa7
commit 675b8fe48f
3 changed files with 6 additions and 6 deletions

View File

@@ -91,20 +91,20 @@ def test_graphviz_latex(app, status, warning):
content = (app.outdir / 'SphinxTests.tex').text()
macro = ('\\\\begin{figure}\\[htbp\\]\n\\\\centering\n\\\\capstart\n\n'
'\\\\includegraphics{graphviz-\\w+.pdf}\n'
'\\\\sphinxincludegraphics\\[\\]{graphviz-\\w+.pdf}\n'
'\\\\caption{caption of graph}\\\\label{.*}\\\\end{figure}')
assert re.search(macro, content, re.S)
macro = 'Hello \\\\includegraphics{graphviz-\\w+.pdf} graphviz world'
macro = 'Hello \\\\sphinxincludegraphics\\[\\]{graphviz-\\w+.pdf} graphviz world'
assert re.search(macro, content, re.S)
macro = ('\\\\begin{wrapfigure}{r}{0pt}\n\\\\centering\n'
'\\\\includegraphics{graphviz-\\w+.pdf}\n'
'\\\\sphinxincludegraphics\\[\\]{graphviz-\\w+.pdf}\n'
'\\\\caption{on right}\\\\label{.*}\\\\end{wrapfigure}')
assert re.search(macro, content, re.S)
macro = (r'\{\\hfill'
r'\\includegraphics{graphviz-.*}'
r'\\sphinxincludegraphics\[\]{graphviz-.*}'
r'\\hspace\*{\\fill}}')
assert re.search(macro, content, re.S)

View File

@@ -40,7 +40,7 @@ def test_inheritance_diagram_latex(app, status, warning):
content = (app.outdir / 'Python.tex').text()
pattern = ('\\\\begin{figure}\\[htbp]\n\\\\centering\n\\\\capstart\n\n'
'\\\\includegraphics{inheritance-\\w+.pdf}\n'
'\\\\sphinxincludegraphics\\[\\]{inheritance-\\w+.pdf}\n'
'\\\\caption{Test Foo!}\\\\label{\\\\detokenize{index:id1}}\\\\end{figure}')
assert re.search(pattern, content, re.M)