Skip to content

Fix mfenced separators in canonicalization #895

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

Merged
NSoiffer merged 3 commits into from
Oct 23, 2026
Merged

Fix mfenced separators in canonicalization #895

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35d11bd
Fix mfenced separators in canonicalization
dkager Oct 23, 2026
cf4a444
Add mfenced tests for too many, default and whitespace-only separators
dkager Oct 23, 2026
9aab1bc
Refactor separator handling in canonicalize.rs
NSoiffer Oct 23, 2026
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
119 changes: 113 additions & 6 deletions src/canonicalize.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1882,7 +1882,7 @@ impl CanonicalizeContext {
let close = close_raw.as_deref().unwrap_or(")").replace('>', "⟩");
// debug!("open={}, close={}", open, close);
let separators_raw = mfenced.attribute_value("separators");
let mut separators = separators_raw.as_deref().unwrap_or(",").chars();
let separators: Vec<char> = separators_raw.as_deref().unwrap_or(",").chars().filter(|ch| !ch.is_whitespace()).collect();
set_mathml_name(mfenced, "mrow");
mfenced.remove_attribute("open");
mfenced.remove_attribute("close");
Expand All @@ -1894,9 +1894,10 @@ impl CanonicalizeContext {
}
if !children.is_empty() {
new_children.push(children[0]);
for child in &children[1..] {
let sep = separators.next().unwrap_or(',').to_string();
new_children.push( ChildOfElement::Element( create_mo(mfenced.document(), &sep, MFENCED_ATTR_VALUE)) );
for (i, child) in children[1..].iter().enumerate() {
if let Some(&sep) = separators.get(i).or_else(|| separators.last()) {
new_children.push(ChildOfElement::Element( create_mo(mfenced.document(), &sep.to_string(), MFENCED_ATTR_VALUE)) );
}
new_children.push(*child);
}
}
Expand Down Expand Up @@ -4991,14 +4992,120 @@ mod canonicalize_tests {
<mi>y</mi>
</mrow>
<mo data-changed='from_mfenced'>;</mo>
<mi>z</mi>
<mo data-changed='from_mfenced'>;</mo>
<mi>a</mi>
</mrow>
<mo data-changed='from_mfenced'>)</mo>
</mrow>
</mrow>
</math>";
are_strs_canonically_equal_result(test_str, target_str, &[])
}

#[test]
fn mfenced_empty_separators() -> Result<()> {
let test_str = "<math><mfenced separators=''><mn>5</mn><mo>+</mo><mn>3</mn></mfenced></math>";
let target_str = "<math>
<mrow>
<mo data-changed='from_mfenced'>(</mo>
<mrow data-changed='added'>
<mn>5</mn>
<mo>+</mo>
<mn>3</mn>
</mrow>
<mo data-changed='from_mfenced'>)</mo>
</mrow>
</math>";
are_strs_canonically_equal_result(test_str, target_str, &[])
}

#[test]
fn mfenced_repeat_last_separator() -> Result<()> {
let test_str = "<math><mfenced separators=';'><mi>x</mi><mi>y</mi><mi>z</mi></mfenced></math>";
let target_str = "<math>
<mrow>
<mo data-changed='from_mfenced'>(</mo>
<mrow data-changed='added'>
<mi>x</mi>
<mo data-changed='from_mfenced'>;</mo>
<mi>y</mi>
<mo data-changed='from_mfenced'>;</mo>
<mi>z</mi>
<mo data-changed='from_mfenced'>,</mo>
<mi>a</mi>
</mrow>
<mo data-changed='from_mfenced'>)</mo>
</mrow>
</math>";
are_strs_canonically_equal_result(test_str, target_str, &[])
}

#[test]
fn mfenced_separators_with_whitespace() -> Result<()> {
let test_str = "<math><mfenced separators='; ,'><mi>x</mi><mi>y</mi><mi>z</mi></mfenced></math>";
let target_str = "<math>
<mrow>
<mo data-changed='from_mfenced'>(</mo>
<mrow data-changed='added'>
<mi>x</mi>
<mo data-changed='from_mfenced'>;</mo>
<mrow data-changed='added'>
<mi>y</mi>
<mo data-changed='from_mfenced'>,</mo>
<mi>z</mi>
</mrow>
</mrow>
<mo data-changed='from_mfenced'>)</mo>
</mrow>
</math>";
are_strs_canonically_equal_result(test_str, target_str, &[])
}

#[test]
fn mfenced_too_many_separators() -> Result<()> {
let test_str = "<math><mfenced separators=';,'><mi>x</mi><mi>y</mi></mfenced></math>";
let target_str = "<math>
<mrow>
<mo data-changed='from_mfenced'>(</mo>
<mrow data-changed='added'>
<mi>x</mi>
<mo data-changed='from_mfenced'>;</mo>
<mi>y</mi>
</mrow>
<mo data-changed='from_mfenced'>)</mo>
</mrow>
</math>";
are_strs_canonically_equal_result(test_str, target_str, &[])
}

#[test]
fn mfenced_default_separator() -> Result<()> {
let test_str = "<math><mfenced><mi>x</mi><mi>y</mi></mfenced></math>";
let target_str = "<math>
<mrow>
<mo data-changed='from_mfenced'>(</mo>
<mrow data-changed='added'>
<mi>x</mi>
<mo data-changed='from_mfenced'>,</mo>
<mi>y</mi>
</mrow>
<mo data-changed='from_mfenced'>)</mo>
</mrow>
</math>";
are_strs_canonically_equal_result(test_str, target_str, &[])
}

#[test]
fn mfenced_whitespace_only_separators() -> Result<()> {
let test_str = "<math><mfenced separators=' '><mn>5</mn><mo>+</mo><mn>3</mn></mfenced></math>";
let target_str = "<math>
<mrow>
<mo data-changed='from_mfenced'>(</mo>
<mrow data-changed='added'>
<mn>5</mn>
<mo>+</mo>
<mn>3</mn>
</mrow>
<mo data-changed='from_mfenced'>)</mo>
</mrow>
</math>";
are_strs_canonically_equal_result(test_str, target_str, &[])
Expand Down