Skip to content

fix: strip nested prefixes from multi-line dollarmath blocks #152

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.

Sign up for GitHub

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

Open
BetterAndBetterII wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: strip nested prefixes from multi-line dollarmath blocks #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 17 additions & 1 deletion mdit_py_plugins/dollarmath/index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,22 @@ def _math_inline_dollar(state: StateInline, silent: bool) -> bool:
DOLLAR_EQNO_REV = re.compile(r"^\s*\)([^)$\r\n]+?)\(\s*\${2}")


def _math_block_content(
state: StateBlock, startLine: int, startPos: int, endLine: int, end: int
) -> str:
"""Extract math body, omitting parent container prefixes on each line."""
content_start = startPos + 2
if startLine == endLine:
return state.src[content_start:end]

parts: list[str] = [state.src[content_start : state.eMarks[startLine]], "\n"]
for line in range(startLine + 1, endLine):
parts.append(state.src[state.bMarks[line] : state.eMarks[line]])
parts.append("\n")
parts.append(state.src[state.bMarks[endLine] : end])
return "".join(parts)


def math_block_dollar(
allow_labels: bool = True,
label_normalizer: Callable[[str], str] | None = None,
Expand Down Expand Up @@ -365,7 +381,7 @@ def _math_block_dollar(

token = state.push("math_block_label" if label else "math_block", "math", 0)
token.block = True
token.content = state.src[startPos + 2 : end]
token.content = _math_block_content(state, startLine, startPos, nextLine, end)
token.markup = "$$"
token.map = [startLine, state.line]
if label:
Expand Down
33 changes: 33 additions & 0 deletions tests/fixtures/dollar_math.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,39 @@ a+b=c
</blockquote>
.

display equation in blockquote, multi-line. (valid=True)
.
> Given
>
> $$
> x^2 + y^2 = 9
> $$
>
> What is the radius of the circle?
.
<blockquote>
<p>Given</p>
<div class="math block">
x^2 + y^2 = 9
</div>
<p>What is the radius of the circle?</p>
</blockquote>
.

labelled display equation in blockquote, multi-line. (valid=True)
.
> $$
> a+b=c
> $$ (2)
.
<blockquote>
<div id="2" class="math block">
<a href="#2" class="mathlabel" title="Permalink to this equation">¶</a>
a+b=c
</div>
</blockquote>
.

mixed syntax:
.
$$
Expand Down