diff --git a/docx-core/src/xml_builder/numbering.rs b/docx-core/src/xml_builder/numbering.rs index 055c88f..1e0fef6 100644 --- a/docx-core/src/xml_builder/numbering.rs +++ b/docx-core/src/xml_builder/numbering.rs @@ -11,10 +11,6 @@ impl XMLBuilder { "http://schemas.openxmlformats.org/officeDocument/2006/relationships", ) .attr("xmlns:o", "urn:schemas-microsoft-com:office:office") - .attr( - "xmlns:r", - "http://schemas.openxmlformats.org/officeDocument/2006/relationships", - ) .attr("xmlns:v", "urn:schemas-microsoft-com:vml") .attr( "xmlns:w", diff --git a/docx-core/src/zipper/mod.rs b/docx-core/src/zipper/mod.rs index 222959f..774f2f1 100644 --- a/docx-core/src/zipper/mod.rs +++ b/docx-core/src/zipper/mod.rs @@ -39,7 +39,7 @@ where zip.write_all(&xml.font_table)?; zip.start_file("word/comments.xml", options)?; zip.write_all(&xml.comments)?; - zip.start_file("word/numberings.xml", options)?; + zip.start_file("word/numbering.xml", options)?; zip.write_all(&xml.numberings)?; zip.finish()?; Ok(()) diff --git a/docx-core/tests/lib.rs b/docx-core/tests/lib.rs index 24a466f..dd1afdc 100644 --- a/docx-core/tests/lib.rs +++ b/docx-core/tests/lib.rs @@ -320,7 +320,26 @@ pub fn default_numbering() -> Result<(), DocxError> { let path = std::path::Path::new("./tests/output/default_numbering.docx"); let file = std::fs::File::create(&path).unwrap(); Docx::new() - .add_paragraph(Paragraph::new().add_run(Run::new().add_text("Hello"))) + .add_paragraph( + Paragraph::new() + .add_run(Run::new().add_text("Hello")) + .numbering(NumberingId::new("0"), IndentLevel::new(0)), + ) + .add_paragraph( + Paragraph::new() + .add_run(Run::new().add_text("World!")) + .numbering(NumberingId::new("0"), IndentLevel::new(1)), + ) + .add_paragraph( + Paragraph::new() + .add_run(Run::new().add_text("Foooo!")) + .numbering(NumberingId::new("0"), IndentLevel::new(2)), + ) + .add_paragraph( + Paragraph::new() + .add_run(Run::new().add_text("Bar!")) + .numbering(NumberingId::new("0"), IndentLevel::new(3)), + ) .build() .pack(file)?; Ok(()) diff --git a/docx-core/tests/output/[Content_Types].xml b/docx-core/tests/output/[Content_Types].xml index 4c07d60..0ce7a0f 100755 --- a/docx-core/tests/output/[Content_Types].xml +++ b/docx-core/tests/output/[Content_Types].xml @@ -9,4 +9,5 @@ + \ No newline at end of file diff --git a/docx-core/tests/output/word/_rels/document.xml.rels b/docx-core/tests/output/word/_rels/document.xml.rels index 16a4293..87225a6 100755 --- a/docx-core/tests/output/word/_rels/document.xml.rels +++ b/docx-core/tests/output/word/_rels/document.xml.rels @@ -1,6 +1,8 @@ - - + + + + \ No newline at end of file diff --git a/docx-core/tests/output/word/comments.xml b/docx-core/tests/output/word/comments.xml new file mode 100755 index 0000000..48e52f0 --- /dev/null +++ b/docx-core/tests/output/word/comments.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/docx-core/tests/output/word/document.xml b/docx-core/tests/output/word/document.xml index 3048d55..97fe8f1 100755 --- a/docx-core/tests/output/word/document.xml +++ b/docx-core/tests/output/word/document.xml @@ -15,26 +15,14 @@ + + + + - - - - - - Hello - - - - - - World! - - - - - + Hello diff --git a/docx-core/tests/output/word/fontTable.xml b/docx-core/tests/output/word/fontTable.xml new file mode 100755 index 0000000..dd78982 --- /dev/null +++ b/docx-core/tests/output/word/fontTable.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/docx-core/tests/output/word/numberings.xml b/docx-core/tests/output/word/numberings.xml new file mode 100755 index 0000000..2c770f1 --- /dev/null +++ b/docx-core/tests/output/word/numberings.xml @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/docx-core/tests/output/word/settings.xml b/docx-core/tests/output/word/settings.xml new file mode 100755 index 0000000..18642bd --- /dev/null +++ b/docx-core/tests/output/word/settings.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/docx-core/tests/output/word/styles.xml b/docx-core/tests/output/word/styles.xml index 316fe12..9cf26fa 100755 --- a/docx-core/tests/output/word/styles.xml +++ b/docx-core/tests/output/word/styles.xml @@ -1,22 +1 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file