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 #10135 from tk0miya/10121_depart_admonitions

Browse Source 
Fix #10121: html: <div> tag for admonition is not closed w/ docutils-0.18
This commit is contained in:
Takeshi KOMIYA 2022-01-30 23:16:33 +09:00 committed by GitHub
commit 65c6684a83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sphinx/writers/html.py
View File

@ -14,7 +14,7 @@ import posixpath
import re import re
import urllib.parse import urllib.parse
import warnings import warnings
from typing import TYPE_CHECKING, Iterable, Tuple, cast from typing import TYPE_CHECKING, Iterable, Optional, Tuple, cast
from docutils import nodes from docutils import nodes
from docutils.nodes import Element, Node, Text from docutils.nodes import Element, Node, Text
@ -285,6 +285,9 @@ class HTMLTranslator(SphinxTranslator, BaseTranslator):
node.insert(0, nodes.title(name, admonitionlabels[name])) node.insert(0, nodes.title(name, admonitionlabels[name]))
self.set_first_last(node) self.set_first_last(node)
def depart_admonition(self, node: Optional[Element] = None) -> None:
self.body.append('</div>\n')
def visit_seealso(self, node: Element) -> None: def visit_seealso(self, node: Element) -> None:
self.visit_admonition(node, 'seealso') self.visit_admonition(node, 'seealso')

5
sphinx/writers/html5.py
View File

@ -13,7 +13,7 @@ import posixpath
import re import re
import urllib.parse import urllib.parse
import warnings import warnings
from typing import TYPE_CHECKING, Iterable, Set, Tuple, cast from typing import TYPE_CHECKING, Iterable, Optional, Set, Tuple, cast
from docutils import nodes from docutils import nodes
from docutils.nodes import Element, Node, Text from docutils.nodes import Element, Node, Text
@ -259,6 +259,9 @@ class HTML5Translator(SphinxTranslator, BaseTranslator):
if name: if name:
node.insert(0, nodes.title(name, admonitionlabels[name])) node.insert(0, nodes.title(name, admonitionlabels[name]))
def depart_admonition(self, node: Optional[Element] = None) -> None:
self.body.append('</div>\n')
def visit_seealso(self, node: Element) -> None: def visit_seealso(self, node: Element) -> None:
self.visit_admonition(node, 'seealso') self.visit_admonition(node, 'seealso')