mirror of
https://github.com/storytold/craft-libs.git
synced 2026-11-16 23:42:27 +00:00
Merge pull request #1352 from batistalucasv/fix/docx-numbering-change-without-list
craft-docx: preserve w:numberingChange when active numbering is absent
This commit is contained in:
3 files changed
+54
-7
No files matched your search
@@ -249,10 +249,11 @@ impl Reader<'_> {
|
||||
.unwrap_or_default();
|
||||
para.props.fmt_change = PropChange::boxed(self.revision(RevisionKind::Format, ch), old);
|
||||
}
|
||||
if para.props.numbering.is_some()
|
||||
&& let Some(ch) = ppr.child("w:numPr").and_then(|n| n.child("w:numberingChange"))
|
||||
{
|
||||
let original = ch.attr("w:original").unwrap_or("").chars().take(256).collect();
|
||||
if let Some(ch) = ppr.child("w:numPr").and_then(|n| n.child("w:numberingChange")) {
|
||||
// Multi-level numbering caches (`w:original`) routinely exceed 256 chars while staying
|
||||
// bounded against hostile attributes.
|
||||
const MAX_CHANGE_ORIGINAL: usize = 4096;
|
||||
let original = ch.attr("w:original").unwrap_or("").chars().take(MAX_CHANGE_ORIGINAL).collect();
|
||||
para.props.num_change = Some(Box::new(NumChange { rev: self.revision(RevisionKind::Format, ch), original }));
|
||||
}
|
||||
if let Some(s) = ppr.child("w:sectPr") {
|
||||
|
||||
@@ -261,10 +261,12 @@ pub fn ppr_inner(w: &mut W, p: &ParaProps, framed: bool, num_change: Option<&Cha
|
||||
toggle(w, "w:pageBreakBefore", p.page_break_before);
|
||||
write_frame(w, p, framed);
|
||||
toggle(w, "w:widowControl", p.widow_control);
|
||||
if let Some(nr) = p.numbering {
|
||||
if p.numbering.is_some() || num_change.is_some() {
|
||||
w.open("w:numPr", &[]);
|
||||
w.val("w:ilvl", &n(nr.level.min(8) as i64));
|
||||
w.val("w:numId", &n(nr.num as i64));
|
||||
if let Some(nr) = p.numbering {
|
||||
w.val("w:ilvl", &n(nr.level.min(8) as i64));
|
||||
w.val("w:numId", &n(nr.num as i64));
|
||||
}
|
||||
if let Some(a) = num_change {
|
||||
let refs: Vec<(&str, &str)> = a.iter().map(|(k, v)| (*k, v.as_str())).collect();
|
||||
w.empty("w:numberingChange", &refs);
|
||||
|
||||
@@ -2197,6 +2197,50 @@ fn formatting_revisions_round_trip() {
|
||||
assert_eq!(again.revisions, d.revisions);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn numbering_change_without_active_list_roundtrips() {
|
||||
let body = r#"<w:p><w:pPr><w:numPr><w:numberingChange w:id="1" w:author="Alice" w:date="2026-10-01T00:00:00Z" w:original="%1:1:0:."/></w:numPr></w:pPr><w:r><w:t>Removed</w:t></w:r></w:p>"#;
|
||||
let d = read_body(body);
|
||||
let p = paras(&d);
|
||||
assert_eq!(p.len(), 1);
|
||||
assert!(p[0].props.numbering.is_none());
|
||||
let nc = p[0].props.num_change.as_deref().expect("numberingChange read back");
|
||||
assert_eq!(nc.original, "%1:1:0:.");
|
||||
|
||||
let bytes = craft_docx::write(&d).unwrap();
|
||||
let mut zip = zip::ZipArchive::new(std::io::Cursor::new(&bytes)).unwrap();
|
||||
let mut xml = String::new();
|
||||
std::io::Read::read_to_string(&mut zip.by_name("word/document.xml").unwrap(), &mut xml).unwrap();
|
||||
assert!(xml.contains(r#"<w:numPr><w:numberingChange w:id="#), "{xml}");
|
||||
assert!(xml.contains(r#"w:original="%1:1:0:."/></w:numPr>"#), "{xml}");
|
||||
|
||||
let again = craft_docx::read(&bytes).unwrap();
|
||||
let ap = paras(&again);
|
||||
assert!(ap[0].props.numbering.is_none());
|
||||
let anc = ap[0].props.num_change.as_deref().expect("numberingChange preserved after save");
|
||||
assert_eq!(anc.original, "%1:1:0:.");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn numbering_change_original_preserves_long_values_within_bound() {
|
||||
let long_orig = "%1:1:0:.".repeat(64); // 512 chars, well past the old 256-char cap
|
||||
assert!(long_orig.len() > 256 && long_orig.len() < 4096);
|
||||
let over_cap = "x".repeat(5000);
|
||||
let body = format!(
|
||||
r#"<w:p><w:pPr><w:numPr><w:numberingChange w:id="1" w:author="Alice" w:original="{long_orig}"/></w:numPr></w:pPr><w:r><w:t>Long</w:t></w:r></w:p>
|
||||
<w:p><w:pPr><w:numPr><w:numberingChange w:id="2" w:author="Alice" w:original="{over_cap}"/></w:numPr></w:pPr><w:r><w:t>Bounded</w:t></w:r></w:p>"#
|
||||
);
|
||||
let d = read_body(&body);
|
||||
let p = paras(&d);
|
||||
assert_eq!(p[0].props.num_change.as_deref().map(|n| n.original.as_str()), Some(long_orig.as_str()));
|
||||
assert_eq!(p[1].props.num_change.as_deref().map(|n| n.original.chars().count()), Some(4096));
|
||||
|
||||
let bytes = craft_docx::write(&d).unwrap();
|
||||
let again = craft_docx::read(&bytes).unwrap();
|
||||
let ap = paras(&again);
|
||||
assert_eq!(ap[0].props.num_change.as_deref().map(|n| n.original.as_str()), Some(long_orig.as_str()));
|
||||
}
|
||||
|
||||
/// A package with `styles`, a theme (accent1 4472C4, accent2 ED7D31, major font "Major Face") and,
|
||||
/// when given, `settings`.
|
||||
fn themed_docx(body: &str, styles: &str, settings: Option<&str>) -> Document {
|
||||
|
||||
Reference in new issue
Block a user