Skip to content
Open
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
44 changes: 44 additions & 0 deletions src/formats/odf/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,50 @@ mod tests {
);
}

#[test]
fn continued_sublist_restarts_when_its_parent_advances() {
// Word saves nested lists as ODT with continue-numbering on every
// level; item 2's sublist must read 2.1, not 2.3.
let content = r#"<office:document-content
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0">
<office:automatic-styles><text:list-style style:name="L1">
<text:list-level-style-number text:level="1" style:num-format="1" style:num-suffix="."/>
<text:list-level-style-number text:level="2" style:num-format="1" style:num-suffix="." text:display-levels="2"/>
</text:list-style></office:automatic-styles>
<office:body><office:text>
<text:list text:style-name="L1" text:continue-numbering="true">
<text:list-item><text:p>Subject</text:p><text:list text:continue-numbering="true">
<text:list-item><text:p>Duty A</text:p></text:list-item>
<text:list-item><text:p>Duty B</text:p></text:list-item>
</text:list></text:list-item>
<text:list-item><text:p>Price</text:p><text:list text:continue-numbering="true">
<text:list-item><text:p>Payment</text:p></text:list-item>
</text:list></text:list-item>
</text:list>
</office:text></office:body></office:document-content>"#;
let md = crate::document_to_markdown(&parse(&odt_with_content(content)).unwrap());
assert!(md.contains("1.2. Duty B"), "{md}");
assert!(md.contains("2.1. Payment"), "{md}");

// The same when each sublist names its own list style.
let styled = content
.replace(
"</text:list-style></office:automatic-styles>",
r#"</text:list-style><text:list-style style:name="L2">
<text:list-level-style-number text:level="2" style:num-format="1" style:num-suffix="."/>
</text:list-style></office:automatic-styles>"#,
)
.replace(
r#"<text:list text:continue-numbering="true">"#,
r#"<text:list text:style-name="L2" text:continue-numbering="true">"#,
);
let md = crate::document_to_markdown(&parse(&odt_with_content(&styled)).unwrap());
assert!(md.contains("1. Payment"), "{md}");
assert!(!md.contains("3. Payment"), "{md}");
}
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
Resolved

#[test]
fn repeated_rows_parse_content_once() {
// A note inside a repeated row must register once, not per copy.
Expand Down
6 changes: 6 additions & 0 deletions src/formats/odf/text.rs
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,12 @@ fn parse_list(
}
}
let number = current.start.saturating_add(current.items.len() as u64);
if !header {
// A new item at this level restarts the levels below it, so a
// `continue-numbering` sublist under it starts afresh.
// Every style: a sublist may name its own list style.
ctx.list_counters.borrow_mut().retain(|(_, d), _| *d <= depth);
}
let mut chain = ancestors.to_vec();
chain.push(number);
let mut item_blocks = Vec::new();
Expand Down