fix: num pages

bokuweb · May 16, 2024 · 95d84d3 · 95d84d3
1 parent 8beaf9e
commit 95d84d3
Show file tree

Hide file tree

Showing 13 changed files with 316 additions and 21 deletions.
diff --git a/docx-core/src/documents/elements/instr_text.rs b/docx-core/src/documents/elements/instr_text.rs
@@ -66,7 +66,7 @@ impl Serialize for InstrText {
             }
             InstrText::NUMPAGES(ref s) => {
                 let mut t = serializer.serialize_struct("NUMPAGES", 2)?;
-                t.serialize_field("type", "numpages")?;
+                t.serialize_field("type", "numPages")?;
                 t.serialize_field("data", s)?;
                 t.end()
             }

diff --git a/docx-core/src/documents/elements/num_pages.rs b/docx-core/src/documents/elements/num_pages.rs
@@ -186,21 +186,11 @@ mod tests {
     use std::str;
 
     #[test]
-    fn test_page() {
+    fn test_num_pages() {
         let b = NumPages::new().build();
         assert_eq!(
             str::from_utf8(&b).unwrap(),
-            r#"<w:sdt><w:sdtPr><w:rPr /></w:sdtPr><w:sdtContent><w:p w14:paraId="12345678"><w:pPr><w:rPr /></w:pPr><w:r><w:rPr /><w:fldChar w:fldCharType="begin" w:dirty="false" /><w:instrText>PAGE</w:instrText><w:fldChar w:fldCharType="separate" w:dirty="false" /><w:t xml:space="preserve">1</w:t><w:fldChar w:fldCharType="end" w:dirty="false" /></w:r></w:p></w:sdtContent>
-</w:sdt>"#
-        );
-    }
-
-    #[test]
-    fn test_page_with_wrap() {
-        let b = NumPages::new().wrap("none").x_align("left").build();
-        assert_eq!(
-            str::from_utf8(&b).unwrap(),
-            r#"<w:sdt><w:sdtPr><w:rPr /></w:sdtPr><w:sdtContent><w:p w14:paraId="12345678"><w:pPr><w:rPr /><w:framePr w:wrap="none" w:xAlign="left" /></w:pPr><w:r><w:rPr /><w:fldChar w:fldCharType="begin" w:dirty="false" /><w:instrText>PAGE</w:instrText><w:fldChar w:fldCharType="separate" w:dirty="false" /><w:t xml:space="preserve">1</w:t><w:fldChar w:fldCharType="end" w:dirty="false" /></w:r></w:p></w:sdtContent>
+            r#"<w:sdt><w:sdtPr><w:rPr /></w:sdtPr><w:sdtContent><w:p w14:paraId="12345678"><w:pPr><w:rPr /></w:pPr><w:r><w:rPr /><w:fldChar w:fldCharType="begin" w:dirty="false" /><w:instrText>NUMPAGES</w:instrText><w:fldChar w:fldCharType="separate" w:dirty="false" /><w:t xml:space="preserve">1</w:t><w:fldChar w:fldCharType="end" w:dirty="false" /></w:r></w:p></w:sdtContent>
 </w:sdt>"#
         );
     }

diff --git a/docx-core/src/documents/footer.rs b/docx-core/src/documents/footer.rs
@@ -38,6 +38,11 @@ impl Footer {
         self
     }
 
+    pub fn add_num_pages(mut self, p: NumPages) -> Self {
+        self.children.push(FooterChild::NumPages(Box::new(p)));
+        self
+    }
+
     /// reader only
     pub(crate) fn add_structured_data_tag(mut self, t: StructuredDataTag) -> Self {
         if t.has_numbering {
@@ -54,6 +59,7 @@ pub enum FooterChild {
     Paragraph(Box<Paragraph>),
     Table(Box<Table>),
     PageNum(Box<PageNum>),
+    NumPages(Box<NumPages>),
     StructuredDataTag(Box<StructuredDataTag>),
 }
 
@@ -81,6 +87,12 @@ impl Serialize for FooterChild {
                 t.serialize_field("data", r)?;
                 t.end()
             }
+            FooterChild::NumPages(ref r) => {
+                let mut t = serializer.serialize_struct("NumPages", 2)?;
+                t.serialize_field("type", "numPages")?;
+                t.serialize_field("data", r)?;
+                t.end()
+            }
             FooterChild::StructuredDataTag(ref r) => {
                 let mut t = serializer.serialize_struct("StructuredDataTag", 2)?;
                 t.serialize_field("type", "structuredDataTag")?;
@@ -101,6 +113,7 @@ impl BuildXML for Footer {
                 FooterChild::Paragraph(p) => b = b.add_child(p),
                 FooterChild::Table(t) => b = b.add_child(t),
                 FooterChild::PageNum(p) => b = b.add_child(p),
+                FooterChild::NumPages(p) => b = b.add_child(p),
                 FooterChild::StructuredDataTag(t) => b = b.add_child(t),
             }
         }

diff --git a/docx-core/src/documents/header.rs b/docx-core/src/documents/header.rs
@@ -38,6 +38,11 @@ impl Header {
         self
     }
 
+    pub fn add_num_pages(mut self, p: NumPages) -> Self {
+        self.children.push(HeaderChild::NumPages(Box::new(p)));
+        self
+    }
+
     /// reader only
     pub(crate) fn add_structured_data_tag(mut self, t: StructuredDataTag) -> Self {
         if t.has_numbering {
@@ -54,6 +59,7 @@ pub enum HeaderChild {
     Paragraph(Box<Paragraph>),
     Table(Box<Table>),
     PageNum(Box<PageNum>),
+    NumPages(Box<NumPages>),
     StructuredDataTag(Box<StructuredDataTag>),
 }
 
@@ -81,6 +87,12 @@ impl Serialize for HeaderChild {
                 t.serialize_field("data", r)?;
                 t.end()
             }
+            HeaderChild::NumPages(ref r) => {
+                let mut t = serializer.serialize_struct("numPages", 2)?;
+                t.serialize_field("type", "numPages")?;
+                t.serialize_field("data", r)?;
+                t.end()
+            }
             HeaderChild::StructuredDataTag(ref r) => {
                 let mut t = serializer.serialize_struct("StructuredDataTag", 2)?;
                 t.serialize_field("type", "structuredDataTag")?;
@@ -101,6 +113,7 @@ impl BuildXML for Header {
                 HeaderChild::Paragraph(p) => b = b.add_child(p),
                 HeaderChild::Table(t) => b = b.add_child(t),
                 HeaderChild::PageNum(p) => b = b.add_child(p),
+                HeaderChild::NumPages(p) => b = b.add_child(p),
                 HeaderChild::StructuredDataTag(t) => b = b.add_child(t),
             }
         }

diff --git a/docx-core/src/documents/mod.rs b/docx-core/src/documents/mod.rs
@@ -926,6 +926,7 @@ impl Docx {
                         );
                     }
                     HeaderChild::PageNum(_) => {}
+                    HeaderChild::NumPages(_) => {}
                     HeaderChild::StructuredDataTag(tag) => {
                         for child in tag.children.iter_mut() {
                             if let StructuredDataTagChild::Paragraph(paragraph) = child {
@@ -972,6 +973,7 @@ impl Docx {
                         );
                     }
                     HeaderChild::PageNum(_) => {}
+                    HeaderChild::NumPages(_) => {}
                     HeaderChild::StructuredDataTag(tag) => {
                         for child in tag.children.iter_mut() {
                             if let StructuredDataTagChild::Paragraph(paragraph) = child {
@@ -1018,6 +1020,7 @@ impl Docx {
                         );
                     }
                     HeaderChild::PageNum(_) => {}
+                    HeaderChild::NumPages(_) => {}
                     HeaderChild::StructuredDataTag(tag) => {
                         for child in tag.children.iter_mut() {
                             if let StructuredDataTagChild::Paragraph(paragraph) = child {
@@ -1063,6 +1066,7 @@ impl Docx {
                         );
                     }
                     FooterChild::PageNum(_) => {}
+                    FooterChild::NumPages(_) => {}
                     FooterChild::Table(table) => {
                         collect_images_from_table(
                             table,
@@ -1109,6 +1113,7 @@ impl Docx {
                         );
                     }
                     FooterChild::PageNum(_) => {}
+                    FooterChild::NumPages(_) => {}
                     FooterChild::Table(table) => {
                         collect_images_from_table(
                             table,
@@ -1155,6 +1160,7 @@ impl Docx {
                         );
                     }
                     FooterChild::PageNum(_) => {}
+                    FooterChild::NumPages(_) => {}
                     FooterChild::Table(table) => {
                         collect_images_from_table(
                             table,

diff --git a/docx-wasm/js/footer.ts b/docx-wasm/js/footer.ts
@@ -1,10 +1,11 @@
+import { NumPages } from "./num-pages";
 import { PageNum } from "./page-num";
 import { Paragraph } from "./paragraph";
 import { Table } from "./table";
 
 export class Footer {
   hasNumberings = false;
-  children: (Paragraph | Table | PageNum)[] = [];
+  children: (Paragraph | Table | PageNum | NumPages)[] = [];
 
   addParagraph(p: Paragraph) {
     if (p.hasNumberings) {
@@ -26,4 +27,9 @@ export class Footer {
     this.children.push(p);
     return this;
   }
+
+  addNumPages(p: NumPages) {
+    this.children.push(p);
+    return this;
+  }
 }
diff --git a/docx-wasm/js/header.ts b/docx-wasm/js/header.ts
@@ -1,10 +1,11 @@
+import { NumPages } from "./num-pages";
 import { PageNum } from "./page-num";
 import { Paragraph } from "./paragraph";
 import { Table } from "./table";
 
 export class Header {
   hasNumberings = false;
-  children: (Paragraph | Table | PageNum)[] = [];
+  children: (Paragraph | Table | PageNum | NumPages)[] = [];
 
   addParagraph(p: Paragraph) {
     if (p.hasNumberings) {
@@ -26,4 +27,9 @@ export class Header {
     this.children.push(p);
     return this;
   }
+
+  addNumPages(p: NumPages) {
+    this.children.push(p);
+    return this;
+  }
 }
diff --git a/docx-wasm/js/index.ts b/docx-wasm/js/index.ts
@@ -25,6 +25,8 @@ import { DocGridType, DocxJSON } from "./json";
 
 import * as wasm from "./pkg";
 import { Level } from "./level";
+import { PageNum } from "./page-num";
+import { NumPages } from "./num-pages";
 
 export class Docx {
   children: (
@@ -424,9 +426,12 @@ export class Docx {
           header = header.add_paragraph(build(c));
         } else if (c instanceof Table) {
           header = header.add_table(c.build());
-        } else {
+        } else if (c instanceof PageNum) {
           const p = c.build();
           header = header.add_page_num(p);
+        } else if (c instanceof NumPages) {
+          const p = c.build();
+          header = header.add_num_pages(p);
         }
       });
       docx = docx.header(header);
@@ -439,9 +444,12 @@ export class Docx {
           header = header.add_paragraph(build(c));
         } else if (c instanceof Table) {
           header = header.add_table(c.build());
-        } else {
+        } else if (c instanceof PageNum) {
           const p = c.build();
           header = header.add_page_num(p);
+        } else if (c instanceof NumPages) {
+          const p = c.build();
+          header = header.add_num_pages(p);
         }
       });
       docx = docx.first_header(header);
@@ -454,9 +462,12 @@ export class Docx {
           header = header.add_paragraph(build(c));
         } else if (c instanceof Table) {
           header = header.add_table(c.build());
-        } else {
+        } else if (c instanceof PageNum) {
           const p = c.build();
           header = header.add_page_num(p);
+        } else if (c instanceof NumPages) {
+          const p = c.build();
+          header = header.add_num_pages(p);
         }
       });
       docx = docx.even_header(header);
@@ -469,9 +480,12 @@ export class Docx {
           footer = footer.add_paragraph(build(c));
         } else if (c instanceof Table) {
           footer = footer.add_table(c.build());
-        } else {
+        } else if (c instanceof PageNum) {
           const p = c.build();
           footer = footer.add_page_num(p);
+        } else if (c instanceof NumPages) {
+          const p = c.build();
+          footer = footer.add_num_pages(p);
         }
       });
       docx = docx.footer(footer);
@@ -484,9 +498,12 @@ export class Docx {
           footer = footer.add_paragraph(build(c));
         } else if (c instanceof Table) {
           footer = footer.add_table(c.build());
-        } else {
+        } else if (c instanceof PageNum) {
           const p = c.build();
           footer = footer.add_page_num(p);
+        } else if (c instanceof NumPages) {
+          const p = c.build();
+          footer = footer.add_num_pages(p);
         }
       });
       docx = docx.first_footer(footer);
@@ -499,9 +516,12 @@ export class Docx {
           footer = footer.add_paragraph(build(c));
         } else if (c instanceof Table) {
           footer = footer.add_table(c.build());
-        } else {
+        } else if (c instanceof PageNum) {
           const p = c.build();
           footer = footer.add_page_num(p);
+        } else if (c instanceof NumPages) {
+          const p = c.build();
+          footer = footer.add_num_pages(p);
         }
       });
       docx = docx.even_footer(footer);