diff options
| author | Jakob Lykke Andersen <Jakob@caput.dk> | 2016-08-07 18:37:31 +0200 |
|---|---|---|
| committer | Jakob Lykke Andersen <Jakob@caput.dk> | 2016-08-07 18:37:31 +0200 |
| commit | 1b251797bbc7c8d760e6472268a38d9f12d9be6c (patch) | |
| tree | 1a2b670e3343cb65575522f941bc1c18a1cf0b3f /sphinx/directives/code.py | |
| parent | 5728e5e8374094e2f2c91f5960925646740cb3eb (diff) | |
| parent | a9da999d71fb37a8d683ab604f0eaa340b557f14 (diff) | |
| download | sphinx-git-1b251797bbc7c8d760e6472268a38d9f12d9be6c.tar.gz | |
Merge branch 'master' into cpp-concepts
Diffstat (limited to 'sphinx/directives/code.py')
| -rw-r--r-- | sphinx/directives/code.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sphinx/directives/code.py b/sphinx/directives/code.py index de804f988..f88b30987 100644 --- a/sphinx/directives/code.py +++ b/sphinx/directives/code.py @@ -342,8 +342,9 @@ class LiteralInclude(Directive): return [retnode] -directives.register_directive('highlight', Highlight) -directives.register_directive('highlightlang', Highlight) # old -directives.register_directive('code-block', CodeBlock) -directives.register_directive('sourcecode', CodeBlock) -directives.register_directive('literalinclude', LiteralInclude) +def setup(app): + directives.register_directive('highlight', Highlight) + directives.register_directive('highlightlang', Highlight) # old + directives.register_directive('code-block', CodeBlock) + directives.register_directive('sourcecode', CodeBlock) + directives.register_directive('literalinclude', LiteralInclude) |