fix: ignore change property to import diff docx (#85)

docx-core/src/reader/ignore.rs

@@ -0,0 +1,20 @@
+use std::io::Read;
+use std::str::FromStr;
+
+use xml::reader::{EventReader, XmlEvent};
+
+use super::*;
+
+pub(crate) fn ignore_element<R: Read>(el: XMLElement, ignore: XMLElement, r: &mut EventReader<R>) {
+    if ignore == el {
+        loop {
+            let e = r.next();
+            if let Ok(XmlEvent::EndElement { name, .. }) = e {
+                let e = XMLElement::from_str(&name.local_name).unwrap();
+                if e == ignore {
+                    break;
+                }
+            }
+        }
+    }
+}

docx-core/src/reader/mod.rs

@@ -7,6 +7,7 @@ mod document_rels;
 mod drawing;
 mod errors;
 mod from_xml;
+mod ignore;
 mod insert;
 mod level;
 mod level_override;

docx-core/src/reader/paragraph.rs

@@ -22,6 +22,9 @@ impl ElementReader for Paragraph {
                     attributes, name, ..
                 }) => {
                     let e = XMLElement::from_str(&name.local_name).unwrap();
+
+                    ignore::ignore_element(e.clone(), XMLElement::ParagraphPropertyChange, r);
+
                     match e {
                         XMLElement::Run => {
                             let run = Run::read(r, attrs)?;

docx-core/src/reader/table.rs

@@ -18,6 +18,10 @@ impl ElementReader for Table {
                     attributes, name, ..
                 }) => {
                     let e = XMLElement::from_str(&name.local_name).unwrap();
+
+                    ignore::ignore_element(e.clone(), XMLElement::TablePropertyChange, r);
+                    ignore::ignore_element(e.clone(), XMLElement::TableGridChange, r);
+
                     match e {
                         XMLElement::TableRow => {
                             t = t.add_row(TableRow::read(r, &attributes)?);

docx-core/src/reader/table_cell.rs

@@ -30,6 +30,13 @@ impl ElementReader for TableCell {
                                     attributes, name, ..
                                 }) => {
                                     let e = XMLElement::from_str(&name.local_name).unwrap();
+
+                                    ignore::ignore_element(
+                                        e.clone(),
+                                        XMLElement::TableCellPropertyChange,
+                                        r,
+                                    );
+
                                     match e {
                                         XMLElement::TableCellWidth => {
                                             let mut w = 0;

docx-core/src/reader/table_row.rs

@@ -16,6 +16,9 @@ impl ElementReader for TableRow {
                     attributes, name, ..
                 }) => {
                     let e = XMLElement::from_str(&name.local_name).unwrap();
+
+                    ignore::ignore_element(e.clone(), XMLElement::TableRowPropertyChange, r);
+                    
                     if let XMLElement::TableCell = e {
                         cells.push(TableCell::read(r, &attributes)?);
                         continue;

docx-core/src/reader/xml_element.rs

@@ -6,7 +6,7 @@ use xml::reader::EventReader;
 
 use crate::reader::ReaderError;
 
-#[derive(PartialEq, Debug)]
+#[derive(PartialEq, Debug, Clone)]
 pub enum XMLElement {
     Body,
     Paragraph,
@@ -26,6 +26,7 @@ pub enum XMLElement {
     Break,
     Tab,
     ParagraphStyle,
+    ParagraphPropertyChange,
     Indent,
     Name,
     Alignment,
@@ -53,6 +54,11 @@ pub enum XMLElement {
     TableWidth,
     TableIndent,
     TableBorders,
+    // Change
+    TableGridChange,
+    TablePropertyChange,
+    TableRowPropertyChange,
+    TableCellPropertyChange,
     Top,
     Right,
     Left,
@@ -158,6 +164,7 @@ impl FromStr for XMLElement {
             "szCs" => Ok(XMLElement::SizeCs),
             "u" => Ok(XMLElement::Underline),
             "pStyle" => Ok(XMLElement::ParagraphStyle),
+            "pPrChange" => Ok(XMLElement::ParagraphPropertyChange),
             "highlight" => Ok(XMLElement::Highlight),
             "b" => Ok(XMLElement::Bold),
             "bCs" => Ok(XMLElement::BoldCs),
@@ -200,6 +207,10 @@ impl FromStr for XMLElement {
             "insideV" => Ok(XMLElement::InsideV),
             "tblCellMar" => Ok(XMLElement::TableCellMargin),
             "tblGrid" => Ok(XMLElement::TableGrid),
+            "tblPrChange" => Ok(XMLElement::TablePropertyChange),
+            "trPrChange" => Ok(XMLElement::TableRowPropertyChange),
+            "tcPrChange" => Ok(XMLElement::TableCellPropertyChange),
+            "tblGridChange" => Ok(XMLElement::TableGridChange),
             "gridCol" => Ok(XMLElement::GridCol),
             "style" => Ok(XMLElement::Style),
             "basedOn" => Ok(XMLElement::BasedOn),