diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2019-06-02 01:02:54 +0900 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2019-06-02 01:02:54 +0900 |
| commit | 4c19ab705873035abf1c7bed2cc4f3b7f63eeeb6 (patch) | |
| tree | 068380c3bf7a13d4add9c0dd75b205013306d732 /sphinx/transforms | |
| parent | ce3c5735cd45308e887f66ac231284acd59e0b5c (diff) | |
| parent | 54d5fcfaebc3364044761d30c0fed6bd4d3052c3 (diff) | |
| download | sphinx-git-4c19ab705873035abf1c7bed2cc4f3b7f63eeeb6.tar.gz | |
Merge commit '54d5fcfaebc3364044761d30c0fed6bd4d3052c3'
Diffstat (limited to 'sphinx/transforms')
| -rw-r--r-- | sphinx/transforms/post_transforms/code.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sphinx/transforms/post_transforms/code.py b/sphinx/transforms/post_transforms/code.py index fb8533e9c..a42de4bf1 100644 --- a/sphinx/transforms/post_transforms/code.py +++ b/sphinx/transforms/post_transforms/code.py @@ -25,6 +25,7 @@ if False: HighlightSetting = NamedTuple('HighlightSetting', [('language', str), + ('force', bool), ('lineno_threshold', int)]) @@ -51,7 +52,7 @@ class HighlightLanguageTransform(SphinxTransform): class HighlightLanguageVisitor(nodes.NodeVisitor): def __init__(self, document, default_language): # type: (nodes.document, str) -> None - self.default_setting = HighlightSetting(default_language, sys.maxsize) + self.default_setting = HighlightSetting(default_language, False, sys.maxsize) self.settings = [] # type: List[HighlightSetting] super().__init__(document) @@ -81,16 +82,16 @@ class HighlightLanguageVisitor(nodes.NodeVisitor): def visit_highlightlang(self, node): # type: (addnodes.highlightlang) -> None - self.settings[-1] = HighlightSetting(node['lang'], node['linenothreshold']) + self.settings[-1] = HighlightSetting(node['lang'], + node['force'], + node['linenothreshold']) def visit_literal_block(self, node): # type: (nodes.literal_block) -> None setting = self.settings[-1] if 'language' not in node: node['language'] = setting.language - node['force_highlighting'] = False - elif 'force_highlighting' not in node: - node['force_highlighting'] = True + node['force'] = setting.force if 'linenos' not in node: lines = node.astext().count('\n') node['linenos'] = (lines >= setting.lineno_threshold - 1) |