DesignCraft: An open-source page and layout design editor written by scratch in pure Rust
Merge PR #687
Brandon Thomasbfd2c5986798
diff --cc Cargo.lockindex 6b405ed62,07ae0c036..aa11ac714--- a/Cargo.lock+++ b/Cargo.lock@@@ -1129,10 -1117,10 +1129,10 @@@ dependencies =[[package]]name = "designcraft-textimport"-version = "0.7.1"+version = "0.8.0"dependencies = ["designcraft-doc",- "quick-xml 0.38.4",+ "quick-xml","zip",]diff --cc Cargo.tomlindex efd3b6171,6653e3209..4e9726329--- a/Cargo.toml+++ b/Cargo.toml@@@ -64,8 -62,9 +64,8 @@@ krilla-svg = "=0.8.1flo_curves = "0.8"# QR codes (Object › Generate QR Code); MIT.qrcodegen = "1.8"-krilla = { version = "0.8", features = ["pdf"] }hayro = "0.7"- quick-xml = "0.38"+ quick-xml = "0.41"zip = { version = "3", default-features = false, features = ["deflate"] }# uidiff --cc crates/textimport/src/docx.rsindex a51e9fe02,1b4f28cb5..327979191--- a/crates/textimport/src/docx.rs+++ b/crates/textimport/src/docx.rs@@@ -610,186 -515,17 +614,200 @@@ mod testsassert_eq!(i.story.text, "Kept text. MOVED HERE. Plain INSERTED\nEnd.");}+ /// A paragraph in a Word list: `w:numPr` with `numId` and, unless `None`, `ilvl`.+ fn list_p(num_id: &str, ilvl: Option<&str>, text: &str) -> String {+ let ilvl = ilvl.map(|l| format!(r#"<w:ilvl w:val="{l}"/>"#)).unwrap_or_default();+ format!(r#"<w:p><w:pPr><w:numPr>{ilvl}<w:numId w:val="{num_id}"/></w:numPr></w:pPr><w:r><w:t>{text}</w:t></w:r></w:p>"#)+ }++ fn plain_p(text: &str) -> String {+ format!(r#"<w:p><w:r><w:t>{text}</w:t></w:r></w:p>"#)+ }++ fn lists_docx(numbering: &str, styles: &str, body: &[String]) -> Imported {+ let document = format!(r#"<w:document {W}><w:body>{}</w:body></w:document>"#, body.concat());+ let i = import(&docx_parts(&[("word/document.xml", &document), ("word/styles.xml", styles), ("word/numbering.xml", numbering)])).unwrap();+ i.story.check().unwrap();+ i+ }++ /// The label the model gives paragraph `i` when its number is `n`.+ fn label(st: &Story, i: usize, n: u32) -> String {+ let mut p = designcraft_doc::ParaProps::default();+ p.apply(&st.paras[i].para);+ match p.list_type {+ ListType::Numbers => p.number_label(n),+ ListType::Bullets => p.bullet_label(),+ ListType::None => String::new(),+ }+ }++ /// Regression (#626): pandoc's Markdown list example lost its bullets and numbers.+ #[test]+ fn bullets_and_numbers_from_numbering_xml() {+ let numbering = format!(+ r#"<w:numbering {W}>+ <w:abstractNum w:abstractNumId="990"><w:lvl w:ilvl="0"><w:start w:val="1"/><w:numFmt w:val="bullet"/><w:lvlText w:val="•"/>+ <w:pPr><w:ind w:left="480" w:hanging="480"/></w:pPr></w:lvl></w:abstractNum>+ <w:abstractNum w:abstractNumId="991"><w:lvl w:ilvl="0"><w:start w:val="1"/><w:numFmt w:val="decimal"/><w:lvlText w:val="%1."/>+ <w:pPr><w:ind w:left="480" w:hanging="480"/></w:pPr></w:lvl></w:abstractNum>+ <w:num w:numId="1000"><w:abstractNumId w:val="990"/></w:num>+ <w:num w:numId="1001"><w:abstractNumId w:val="991"/><w:lvlOverride w:ilvl="0"><w:startOverride w:val="1"/></w:lvlOverride></w:num>+ </w:numbering>"#+ );+ let body = [+ plain_p("Intro paragraph."),+ list_p("1000", Some("0"), "first item"),+ list_p("1000", Some("0"), "second item"),+ list_p("1001", Some("0"), "step one"),+ list_p("1001", Some("0"), "step two"),+ ];+ let st = lists_docx(&numbering, "", &body).story;+ let types: Vec<Option<ListType>> = st.paras.iter().map(|p| p.para.list_type).collect();+ assert_eq!(types, [None, Some(ListType::Bullets), Some(ListType::Bullets), Some(ListType::Numbers), Some(ListType::Numbers)]);+ assert_eq!(label(&st, 1, 1), "•\t");+ assert_eq!(st.paras[3].para.number_style, Some(designcraft_doc::NumberStyle::Arabic));+ assert_eq!((label(&st, 3, 1), label(&st, 4, 2)), ("1.\t".to_string(), "2.\t".to_string()));+ // The model's own counter already starts at 1 and carries on: no Start At needed.+ assert_eq!((st.paras[3].para.start_at, st.paras[4].para.start_at), (None, None));+ assert_eq!((st.paras[1].para.left_indent, st.paras[1].para.first_line_indent), (Some(24.0), Some(-24.0)));+ }++ /// Level 1 inside level 0, parent numbers in a label, numbering that carries on past a plain+ /// paragraph, and a `num` with a start override restarting.+ #[test]+ fn nested_levels_and_restarts() {+ let numbering = format!(+ r#"<w:numbering {W}>+ <w:abstractNum w:abstractNumId="1">+ <w:lvl w:ilvl="0"><w:start w:val="1"/><w:numFmt w:val="decimal"/><w:lvlText w:val="%1."/></w:lvl>+ <w:lvl w:ilvl="1"><w:start w:val="1"/><w:numFmt w:val="lowerLetter"/><w:lvlText w:val="%2)"/><w:suff w:val="space"/>+ <w:pPr><w:ind w:left="1440" w:hanging="360"/></w:pPr></w:lvl>+ <w:lvl w:ilvl="2"><w:start w:val="1"/><w:numFmt w:val="upperRoman"/><w:lvlText w:val="%1.%2.%3"/></w:lvl>+ </w:abstractNum>+ <w:num w:numId="1"><w:abstractNumId w:val="1"/></w:num>+ <w:num w:numId="2"><w:abstractNumId w:val="1"/><w:lvlOverride w:ilvl="0"><w:startOverride w:val="1"/></w:lvlOverride></w:num>+ <w:num w:numId="3"><w:abstractNumId w:val="1"/></w:num>+ </w:numbering>"#+ );+ let body = [+ list_p("1", None, "A"),+ list_p("1", Some("1"), "B"),+ list_p("1", Some("1"), "C"),+ list_p("1", Some("2"), "D"),+ list_p("1", Some("0"), "E"),+ plain_p("Between"),+ list_p("1", Some("0"), "F"),+ list_p("2", Some("0"), "G"),+ list_p("3", Some("0"), "H"),+ ];+ let st = lists_docx(&numbering, "", &body).story;+ let start: Vec<Option<Option<u32>>> = st.paras.iter().map(|p| p.para.start_at).collect();+ // Word's numbers: 1, a, b, 1.b.I, 2, –, 3, 1 (own counter), 4 (shares numId 1's). E's 2+ // follows the model's counter (1 after D).+ assert_eq!(start, [None, Some(Some(1)), None, Some(Some(1)), None, None, Some(Some(3)), Some(Some(1)), Some(Some(4))]);+ assert_eq!(label(&st, 1, 1), "a) ");+ assert_eq!(label(&st, 3, 1), "1.b.I\t");+ assert_eq!(st.paras[1].para.left_indent, Some(72.0));+ assert_eq!(st.paras[1].para.first_line_indent, Some(-18.0));+ }++ /// A paragraph style's `w:numPr` (inherited through `w:basedOn`) makes its paragraphs a list;+ /// numId 0 on a paragraph takes it out of the list.+ #[test]+ fn style_lists_and_num_id_zero() {+ let numbering = format!(+ r#"<w:numbering {W}>+ <w:abstractNum w:abstractNumId="7">+ <w:lvl w:ilvl="0"><w:numFmt w:val="bullet"/><w:lvlText w:val=""/><w:rPr><w:rFonts w:ascii="Symbol" w:hAnsi="Symbol"/></w:rPr></w:lvl>+ <w:lvl w:ilvl="1"><w:numFmt w:val="bullet"/><w:lvlText w:val="o"/><w:rPr><w:rFonts w:ascii="Courier New"/></w:rPr></w:lvl>+ </w:abstractNum>+ <w:num w:numId="5"><w:abstractNumId w:val="7"/></w:num>+ </w:numbering>"#+ );+ let styles = format!(+ r#"<w:styles {W}>+ <w:style w:type="paragraph" w:styleId="ListBullet"><w:name w:val="List Bullet"/><w:pPr><w:numPr><w:numId w:val="5"/></w:numPr></w:pPr></w:style>+ <w:style w:type="paragraph" w:styleId="ListBullet2"><w:name w:val="List Bullet 2"/><w:basedOn w:val="ListBullet"/>+ <w:pPr><w:numPr><w:ilvl w:val="1"/></w:numPr></w:pPr></w:style>+ </w:styles>"#+ );+ let styled =+ |id: &str, extra: &str, text: &str| format!(r#"<w:p><w:pPr><w:pStyle w:val="{id}"/>{extra}</w:pPr><w:r><w:t>{text}</w:t></w:r></w:p>"#);+ let body = [+ styled("ListBullet", "", "one"),+ styled("ListBullet2", "", "two"),+ styled("ListBullet", r#"<w:numPr><w:ilvl w:val="0"/><w:numId w:val="0"/></w:numPr>"#, "not a list"),+ ];+ let st = lists_docx(&numbering, &styles, &body).story;+ assert_eq!(label(&st, 0, 1), "•\t");+ assert_eq!(label(&st, 1, 1), "◦\t");+ assert_eq!(st.paras[2].para.list_type, None);+ assert_eq!(st.paras[2].style, "List Bullet");+ }++ /// Hostile list definitions: missing abstractNums and levels, huge or negative levels and+ /// starts, a long label, a `w:basedOn` cycle. No panic; what can't be a list is plain.+ #[test]+ fn hostile_numbering_falls_back_to_plain_paragraphs() {+ let long = "x".repeat(10_000);+ let numbering = format!(+ r#"<w:numbering {W}>+ <w:abstractNum w:abstractNumId="1">+ <w:lvl w:ilvl="0"><w:start w:val="99999999999999"/><w:numFmt w:val="decimal"/><w:lvlText w:val="%1{long}%9%"/></w:lvl>+ <w:lvl w:ilvl="99999999999999"><w:numFmt w:val="decimal"/></w:lvl>+ <w:lvl w:ilvl="-1"><w:numFmt w:val="decimal"/></w:lvl>+ <w:lvl w:ilvl="3"><w:start w:val="-5"/><w:numFmt w:val="ordinalText"/><w:lvlText w:val="%4^"/><w:lvlRestart w:val="99"/></w:lvl>+ </w:abstractNum>+ <w:num w:numId="1"><w:abstractNumId w:val="1"/></w:num>+ <w:num w:numId="2"><w:abstractNumId w:val="404"/></w:num>+ <w:num w:numId="3"/>+ <w:num><w:abstractNumId w:val="1"/></w:num>+ </w:numbering>"#+ );+ let styles = format!(+ r#"<w:styles {W}>+ <w:style w:type="paragraph" w:styleId="A"><w:name w:val="A"/><w:basedOn w:val="B"/></w:style>+ <w:style w:type="paragraph" w:styleId="B"><w:name w:val="B"/><w:basedOn w:val="A"/></w:style>+ </w:styles>"#+ );+ let body = [+ list_p("2", None, "missing abstractNum"),+ list_p("3", None, "num without abstractNum"),+ list_p("404", None, "unknown numId"),+ list_p("1", Some("99999999999999"), "huge level"),+ list_p("1", Some("9"), "level 9"),+ list_p("1", Some("-1"), "negative level"),+ list_p("1", Some("1"), "undefined level"),+ r#"<w:p><w:pPr><w:pStyle w:val="A"/><w:numPr><w:ilvl w:val="0"/></w:numPr></w:pPr><w:r><w:t>cycle</w:t></w:r></w:p>"#.to_string(),+ list_p("1", None, "huge start"),+ list_p("1", Some("3"), "negative start"),+ ];+ let st = lists_docx(&numbering, &styles, &body).story;+ assert!(st.paras[..8].iter().all(|p| p.para.list_type.is_none()), "{:?}", st.paras);+ assert_eq!(st.paras[8].para.start_at, Some(Some(u32::MAX)));+ let expr = st.paras[8].para.number_expression.clone().unwrap_or_default();+ assert!(expr.starts_with("^#x") && expr.chars().count() < 80, "{expr}");+ // A start below 0 counts from 0, which the model shows as 1; `^` in a label is literal.+ assert_eq!(label(&st, 9, 1), "1^\t");+ // Unreadable list definitions leave plain paragraphs and a warning, not a failed import.+ let document = format!(r#"<w:document {W}><w:body>{}</w:body></w:document>"#, list_p("1", None, "x"));+ let i = import(&docx_parts(&[("word/document.xml", &document), ("word/numbering.xml", "<w:numbering></w:num>")])).unwrap();+ assert_eq!(i.story.paras[0].para.list_type, None);+ assert_eq!(i.warnings.len(), 1);+ }+++ #[test]+ fn an_element_with_many_attributes_parses_in_linear_time() {+ // RUSTSEC-2026-0194: before quick-xml 0.41 the duplicate-attribute check compared each name with every+ // earlier one on the element, so a crafted .docx/.xlsx with one huge tag hung the import (O(N²)).+ let attrs: String = (0..100_000).map(|i| format!(" w:a{i}=\"{i}\"")).collect();+ let xml = format!("<w:document><w:body><w:p{attrs}/></w:body></w:document>");+ let started = std::time::Instant::now();+ let doc = parse(&xml).unwrap();+ assert!(started.elapsed() < std::time::Duration::from_secs(5), "parse took {:?}", started.elapsed());+ let p = doc.child("body").and_then(|b| b.child("p")).unwrap();+ assert_eq!(p.attr("a0"), Some("0"));+ assert_eq!(p.attr("a99999"), Some("99999"));+ }}