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

Merge pull request #8455 from tk0miya/8454_graphviz_layout_option

Browse Source 
Fix #8454: graphviz: The layout option for graph and digraph don't work
This commit is contained in:
Takeshi KOMIYA 2020-11-21 01:07:55 +09:00 committed by GitHub
commit 296e764198
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -48,6 +48,7 @@ Bugs fixed
* #8443: autodoc: autoattribute directive can't create document for PEP-526 * #8443: autodoc: autoattribute directive can't create document for PEP-526
based uninitalized variables based uninitalized variables
* #8419: html search: Do not load ``language_data.js`` in non-search pages * #8419: html search: Do not load ``language_data.js`` in non-search pages
* #8454: graphviz: The layout option for graph and digraph directives don't work
Testing Testing
-------- --------

5
sphinx/ext/graphviz.py
View File

@ -182,7 +182,8 @@ class GraphvizSimple(SphinxDirective):
'alt': directives.unchanged, 'alt': directives.unchanged,
'align': align_spec, 'align': align_spec,
'caption': directives.unchanged, 'caption': directives.unchanged,
'graphviz_dot': directives.unchanged, 'layout': directives.unchanged,
'graphviz_dot': directives.unchanged, # an old alias of `layout` option
'name': directives.unchanged, 'name': directives.unchanged,
'class': directives.class_option, 'class': directives.class_option,
} }
@ -194,6 +195,8 @@ class GraphvizSimple(SphinxDirective):
node['options'] = {'docname': self.env.docname} node['options'] = {'docname': self.env.docname}
if 'graphviz_dot' in self.options: if 'graphviz_dot' in self.options:
node['options']['graphviz_dot'] = self.options['graphviz_dot'] node['options']['graphviz_dot'] = self.options['graphviz_dot']
if 'layout' in self.options:
node['options']['graphviz_dot'] = self.options['layout']
if 'alt' in self.options: if 'alt' in self.options:
node['alt'] = self.options['alt'] node['alt'] = self.options['alt']
if 'align' in self.options: if 'align' in self.options: