summaryrefslogtreecommitdiff
path: root/sphinx/writers/html5.py
diff options
context:
space:
mode:
Diffstat (limited to 'sphinx/writers/html5.py')
-rw-r--r--sphinx/writers/html5.py12
1 files changed, 4 insertions, 8 deletions
diff --git a/sphinx/writers/html5.py b/sphinx/writers/html5.py
index 5e0be1a41..a08f62f73 100644
--- a/sphinx/writers/html5.py
+++ b/sphinx/writers/html5.py
@@ -278,7 +278,7 @@ class HTML5Translator(SphinxTranslator, BaseTranslator):
if figure_id in self.builder.fignumbers.get(key, {}):
self.body.append('<span class="caption-number">')
- prefix = self.builder.config.numfig_format.get(figtype)
+ prefix = self.config.numfig_format.get(figtype)
if prefix is None:
msg = __('numfig_format is not defined for %s') % figtype
logger.warning(msg)
@@ -382,14 +382,10 @@ class HTML5Translator(SphinxTranslator, BaseTranslator):
linenos = node.get('linenos', False)
highlight_args = node.get('highlight_args', {})
highlight_args['force'] = node.get('force', False)
- if lang is self.builder.config.highlight_language:
- # only pass highlighter options for original language
- opts = self.builder.config.highlight_options
- else:
- opts = {}
+ opts = self.config.highlight_options.get(lang, {})
- if linenos and self.builder.config.html_codeblock_linenos_style:
- linenos = self.builder.config.html_codeblock_linenos_style
+ if linenos and self.config.html_codeblock_linenos_style:
+ linenos = self.config.html_codeblock_linenos_style
highlighted = self.highlighter.highlight_block(
node.rawsource, lang, opts=opts, linenos=linenos,