Author: georg.brandl
Date: Sun Mar 16 12:09:32 2008
New Revision: 61415
Modified:
doctools/trunk/sphinx/directives.py
doctools/trunk/sphinx/htmlwriter.py
doctools/trunk/sphinx/latexwriter.py
Log:
Add language and linenos options to literalinclude directive.
Modified: doctools/trunk/sphinx/directives.py
==============================================================================
--- doctools/trunk/sphinx/directives.py (original)
+++ doctools/trunk/sphinx/directives.py Sun Mar 16 12:09:32 2008
@@ -677,8 +677,14 @@
else:
retnode = nodes.literal_block(text, text, source=fn)
retnode.line = 1
+ if options.get('language', ''):
+ retnode['language'] = options['language']
+ if 'linenos' in options:
+ retnode['linenos'] = True
return [retnode]
+literalinclude_directive.options = {'linenos': directives.flag,
+ 'language': directives.unchanged}
literalinclude_directive.content = 0
literalinclude_directive.arguments = (1, 0, 0)
directives.register_directive('literalinclude', literalinclude_directive)
Modified: doctools/trunk/sphinx/htmlwriter.py
==============================================================================
--- doctools/trunk/sphinx/htmlwriter.py (original)
+++ doctools/trunk/sphinx/htmlwriter.py Sun Mar 16 12:09:32 2008
@@ -183,6 +183,7 @@
if node.has_key('language'):
# code-block directives
lang = node['language']
+ if node.has_key('linenos'):
linenos = node['linenos']
self.body.append(self.highlighter.highlight_block(node.rawsource, lang, linenos))
raise nodes.SkipNode
Modified: doctools/trunk/sphinx/latexwriter.py
==============================================================================
--- doctools/trunk/sphinx/latexwriter.py (original)
+++ doctools/trunk/sphinx/latexwriter.py Sun Mar 16 12:09:32 2008
@@ -656,6 +656,7 @@
if node.has_key('language'):
# code-block directives
lang = node['language']
+ if node.has_key('linenos'):
linenos = node['linenos']
hlcode = self.highlighter.highlight_block(code, lang, linenos)
# workaround for Unicode issue