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

Fix for graphviz map files from Sebastian Wiesner.

Browse Source
This commit is contained in:
Georg Brandl 2009-03-16 21:15:26 +01:00
parent 03c95bbc6e
commit 302e4e0a3b
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sphinx/ext/graphviz.py
View File

@ -91,7 +91,7 @@ def render_dot(self, code, options, format, prefix='graphviz'):
outfn = path.join(self.builder.outdir, fname)
if path.isfile(outfn):
return relfn
return relfn, outfn
if hasattr(self.builder, '_graphviz_warned_dot') or \
hasattr(self.builder, '_graphviz_warned_ps2pdf'):
@ -122,12 +122,12 @@ def render_dot(self, code, options, format, prefix='graphviz'):
if p.returncode != 0:
raise GraphvizError('dot exited with error:\n[stderr]\n%s\n'
'[stdout]\n%s' % (stderr, stdout))
return relfn
return relfn, outfn
def render_dot_html(self, node, code, options, prefix='graphviz', imgcls=None):
try:
fname = render_dot(self, code, options, 'png', prefix)
fname, outfn = render_dot(self, code, options, 'png', prefix)
except GraphvizError, exc:
self.builder.warn('dot code %r: ' % code + str(exc))
raise nodes.SkipNode
@ -136,9 +136,11 @@ def render_dot_html(self, node, code, options, prefix='graphviz', imgcls=None):
if fname is None:
self.body.append(self.encode(code))
else:
mapfile = open(path.join(self.builder.outdir, fname) + '.map', 'rb')
imgmap = mapfile.readlines()
mapfile.close()
mapfile = open(outfn + '.map', 'rb')
try:
imgmap = mapfile.readlines()
finally:
mapfile.close()
imgcss = imgcls and 'class="%s"' % imgcls or ''
if len(imgmap) == 2:
# nothing in image map (the lines are <map> and </map>)