docxmlater 10.0.3 → 10.0.4

package/src/elements/Paragraph.ts

@@ -279,6 +279,15 @@ export interface ParagraphFormatting {
     /** Date when the paragraph mark was deleted */
     date: Date;
   };
+  /** Paragraph mark insertion tracking (for inserted ¶ symbols) */
+  paragraphMarkInsertion?: {
+    /** Unique revision ID */
+    id: number;
+    /** Author who inserted the paragraph mark */
+    author: string;
+    /** Date when the paragraph mark was inserted */
+    date: Date;
+  };
   /** True when the original XML had numId=0 (explicitly suppressed numbering) */
   numberingSuppressed?: boolean;
 }
@@ -2800,6 +2809,42 @@ export class Paragraph {
     return !!this.formatting.paragraphMarkDeletion;
   }
 
+  /**
+   * Marks the paragraph mark (¶ symbol) as inserted via tracked changes.
+   * This adds a `w:ins` element inside `w:pPr/w:rPr` indicating the insertion
+   * of the ¶ symbol.
+   *
+   * @param id - Unique revision ID
+   * @param author - Author who inserted the paragraph mark
+   * @param date - Date when the insertion occurred (defaults to now)
+   * @returns This paragraph for chaining
+   */
+  markParagraphMarkAsInserted(id: number, author: string, date?: Date): this {
+    this.formatting.paragraphMarkInsertion = {
+      id,
+      author,
+      date: date || new Date(),
+    };
+    return this;
+  }
+
+  /**
+   * Clears the paragraph mark insertion marker
+   * @returns This paragraph for chaining
+   */
+  clearParagraphMarkInsertion(): this {
+    delete this.formatting.paragraphMarkInsertion;
+    return this;
+  }
+
+  /**
+   * Checks if the paragraph mark is marked as inserted
+   * @returns True if the paragraph mark is inserted
+   */
+  isParagraphMarkInserted(): boolean {
+    return !!this.formatting.paragraphMarkInsertion;
+  }
+
   /**
    * Converts the paragraph to WordprocessingML XML element
    *
@@ -3137,7 +3182,8 @@ export class Paragraph {
     // Per CT_PPr, w:rPr comes after all CT_PPrBase elements and before w:sectPr/w:pPrChange
     if (
       this.formatting.paragraphMarkRunProperties ||
-      this.formatting.paragraphMarkDeletion
+      this.formatting.paragraphMarkDeletion ||
+      this.formatting.paragraphMarkInsertion
     ) {
       const rPrChildren: XMLElement[] = [];
 
@@ -3156,6 +3202,20 @@ export class Paragraph {
         }
       }
 
+      // Per CT_ParaRPr schema, w:ins precedes w:del in the sequence
+      // Add insertion marker if the paragraph mark is inserted (w:ins)
+      // Per ECMA-376 Part 1 §17.13.5.18 - tracks insertion of paragraph mark
+      if (this.formatting.paragraphMarkInsertion) {
+        const ins = this.formatting.paragraphMarkInsertion;
+        rPrChildren.push(
+          XMLBuilder.wSelf("ins", {
+            "w:id": ins.id.toString(),
+            "w:author": ins.author,
+            "w:date": formatDateForXml(ins.date),
+          })
+        );
+      }
+
       // Add deletion marker if the paragraph mark is deleted (w:del)
       // Per ECMA-376 Part 1 §17.13.5.14 - tracks deletion of paragraph mark
       if (this.formatting.paragraphMarkDeletion) {

package/src/utils/InMemoryRevisionAcceptor.ts

@@ -568,6 +568,26 @@ function acceptRevisionsInParagraph(
     }
   }
 
+  // Clear paragraph mark deletion tracking if accepting deletions
+  // This removes the w:del element from w:pPr/w:rPr
+  if (options.acceptDeletions) {
+    const formatting = paragraph.getFormatting();
+    if (formatting.paragraphMarkDeletion) {
+      paragraph.clearParagraphMarkDeletion();
+      result.deletionsAccepted++;
+    }
+  }
+
+  // Clear paragraph mark insertion tracking if accepting insertions
+  // This removes the w:ins element from w:pPr/w:rPr
+  if (options.acceptInsertions) {
+    const formatting = paragraph.getFormatting();
+    if (formatting.paragraphMarkInsertion) {
+      paragraph.clearParagraphMarkInsertion();
+      result.insertionsAccepted++;
+    }
+  }
+
   return result;
 }
 
@@ -576,7 +596,15 @@ function acceptRevisionsInParagraph(
  */
 export function paragraphHasRevisions(paragraph: Paragraph): boolean {
   const content = paragraph.getContent();
-  return content.some((item) => item instanceof Revision);
+  if (content.some((item) => item instanceof Revision)) {
+    return true;
+  }
+  // Also check paragraph mark revision markers in w:pPr/w:rPr
+  const formatting = paragraph.getFormatting();
+  if (formatting.paragraphMarkDeletion || formatting.paragraphMarkInsertion) {
+    return true;
+  }
+  return false;
 }
 
 /**

package/src/utils/SelectiveRevisionAcceptor.ts

@@ -238,6 +238,76 @@ export class SelectiveRevisionAcceptor {
 
     // Replace paragraph content with the transformed content
     paragraph.setContent(newContent);
+
+    // Handle paragraph mark revision markers (w:del/w:ins in w:pPr/w:rPr)
+    // Both accept and reject clear the marker — these are metadata-only markers (no content),
+    // so there is no content to add or remove, only the marker itself to clear.
+    const formatting = paragraph.getFormatting();
+    if (formatting.paragraphMarkDeletion) {
+      const del = formatting.paragraphMarkDeletion;
+      if (this.matchesMarkerCriteria(del, criteria)) {
+        paragraph.clearParagraphMarkDeletion();
+        processedIds.push(del.id.toString());
+      } else {
+        remainingIds.push(del.id.toString());
+      }
+    }
+    if (formatting.paragraphMarkInsertion) {
+      const ins = formatting.paragraphMarkInsertion;
+      if (this.matchesMarkerCriteria(ins, criteria)) {
+        paragraph.clearParagraphMarkInsertion();
+        processedIds.push(ins.id.toString());
+      } else {
+        remainingIds.push(ins.id.toString());
+      }
+    }
+  }
+
+  /**
+   * Check if a paragraph mark revision marker matches the given criteria.
+   * Simplified version of matchesCriteria for non-Revision marker objects.
+   */
+  private static matchesMarkerCriteria(
+    marker: { id: number; author: string; date: Date },
+    criteria: SelectionCriteria
+  ): boolean {
+    // If no criteria specified, match nothing
+    if (
+      !criteria.ids &&
+      !criteria.types &&
+      !criteria.authors &&
+      !criteria.dateRange &&
+      !criteria.categories &&
+      !criteria.custom
+    ) {
+      return false;
+    }
+
+    // Filter by IDs
+    if (criteria.ids && !criteria.ids.includes(marker.id)) {
+      return false;
+    }
+
+    // Filter by authors
+    if (criteria.authors && !criteria.authors.includes(marker.author)) {
+      return false;
+    }
+
+    // Filter by date range
+    if (criteria.dateRange) {
+      if (marker.date < criteria.dateRange.start || marker.date > criteria.dateRange.end) {
+        return false;
+      }
+    }
+
+    // types, categories, and custom filters don't apply to paragraph mark markers
+    // (they are not Revision objects with a type/category)
+    // If criteria only specifies types/categories/custom, markers won't match
+    if (criteria.types || criteria.categories || criteria.custom) {
+      return false;
+    }
+
+    return true;
   }
 
   /**