Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

👌 IMPROVE: Convert nested headings to rubrics #497

Merged
merged 1 commit into from
Jan 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion myst_parser/docutils_renderer.py
Original file line number Diff line number Diff line change
Expand Up @@ -584,12 +584,20 @@ def blocks_mathjax_processing(self) -> bool:
def render_heading(self, token: SyntaxTreeNode) -> None:

if self.md_env.get("match_titles", None) is False:
# this can occur if a nested parse is performed by a directive
# (such as an admonition) which contains a header.
# this would break the document structure
self.create_warning(
"Header nested in this element can lead to unexpected outcomes",
"Disallowed nested header found, converting to rubric",
line=token_line(token, default=0),
subtype="nested_header",
append_to=self.current_node,
)
rubric = nodes.rubric(token.content, "")
self.add_line_and_source_path(rubric, token)
with self.current_node_context(rubric, append=True):
self.render_children(token)
return

# Test if we're replacing a section level first
level = int(token.tag[1])
Expand Down
11 changes: 10 additions & 1 deletion myst_parser/mocking.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,16 @@ def nested_parse(
state_machine_class=None,
state_machine_kwargs=None,
) -> None:
"""Perform a nested parse of the input block, with ``node`` as the parent."""
"""Perform a nested parse of the input block, with ``node`` as the parent.

:param block: The block of lines to parse.
:param input_offset: The offset of the first line of block,
to the starting line of the state (i.e. directive).
:param node: The parent node to attach the parsed content to.
:param match_titles: Whether to to allow the parsing of headings
(normally this is false,
since nested heading would break the document structure)
"""
sm_match_titles = self.state_machine.match_titles
render_match_titles = self._renderer.md_env.get("match_titles", None)
self.state_machine.match_titles = self._renderer.md_env[
Expand Down
5 changes: 5 additions & 0 deletions myst_parser/sphinx_renderer.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,11 @@ def render_heading(self, token: SyntaxTreeNode) -> None:
The approach is similar to ``sphinx.ext.autosectionlabel``
"""
super().render_heading(token)

if not isinstance(self.current_node, nodes.section):
return

# create the slug string
slug = cast(str, token.attrGet("id"))
if slug is None:
return
Expand Down
2 changes: 1 addition & 1 deletion tests/test_renderers/fixtures/reporter_warnings.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ header nested in admonition
# Header
```
.
<string>:2: (WARNING/2) Header nested in this element can lead to unexpected outcomes
<string>:2: (WARNING/2) Disallowed nested header found, converting to rubric
.

nested parse warning
Expand Down