easy-template-x 7.1.1 → 7.2.0

package/README.md

@@ -292,7 +292,7 @@ The default heuristics are as follows:
 ##### Changing the default
 
 To use a different behavior than the default one you can use the `loopOver`
-option. Supported values are: `row`, `column` and `content`.
+option. Supported values are: `row`, `column`, `paragraph` and `content`.
 
 **Note:** This option controls conditions too.
 
@@ -331,6 +331,22 @@ And the third will produce this document:
 
 ![output document](./docs/assets/loop-over-content-out.png?raw=true)
 
+For paragraphs, you can choose between this syntax (same as the default behavior):
+
+![input template](./docs/assets/loop-over-paragraph-in-1.png?raw=true)
+
+And this syntax:
+
+![input template](./docs/assets/loop-over-paragraph-in-2.png?raw=true)
+
+The first will produce this document:
+
+![output document](./docs/assets/loop-over-paragraph-out-1.png?raw=true)
+
+And the second will produce this document:
+
+![output document](./docs/assets/loop-over-paragraph-out-2.png?raw=true)
+
 ### Image plugin
 
 Embed images into the document.  

package/dist/cjs/easy-template-x.cjs

@@ -3361,7 +3361,66 @@ class LoopListStrategy {
   }
 }
 
+const LoopOver = Object.freeze({
+  /**
+   * Loop over the entire table row.
+   */
+  Row: 'row',
+  /**
+   * Loop over the entire table column.
+   */
+  Column: 'column',
+  /**
+   * Loop over the entire paragraph.
+   */
+  Paragraph: 'paragraph',
+  /**
+   * Loop over the content enclosed between the opening and closing tag.
+   */
+  Content: 'content'
+});
+
 class LoopParagraphStrategy {
+  isApplicable(openTag, closeTag, isCondition) {
+    const options = openTag.options;
+    return options?.loopOver === LoopOver.Paragraph;
+  }
+  splitBefore(openTag, closeTag) {
+    const firstParagraph = officeMarkup.query.containingParagraphNode(openTag.xmlTextNode);
+    const lastParagraph = officeMarkup.query.containingParagraphNode(closeTag.xmlTextNode);
+    const paragraphsToRepeat = xml.query.siblingsInRange(firstParagraph, lastParagraph);
+
+    // Remove the loop tags.
+    xml.modify.remove(openTag.xmlTextNode);
+    xml.modify.remove(closeTag.xmlTextNode);
+    return {
+      firstNode: firstParagraph,
+      nodesToRepeat: paragraphsToRepeat,
+      lastNode: lastParagraph
+    };
+  }
+  mergeBack(newParagraphs, firstParagraph, lastParagraph) {
+    // Add new paragraphs to the document.
+    let insertAfter = lastParagraph;
+    for (const curParagraphsGroup of newParagraphs) {
+      for (const paragraph of curParagraphsGroup) {
+        xml.modify.insertAfter(paragraph, insertAfter);
+        insertAfter = paragraph;
+      }
+    }
+
+    // Remove old paragraphs - between first and last paragraph.
+    xml.modify.removeSiblings(firstParagraph, lastParagraph);
+
+    // Remove old paragraphs - first and last.
+    xml.modify.remove(firstParagraph);
+    if (firstParagraph !== lastParagraph) {
+      xml.modify.remove(lastParagraph);
+    }
+  }
+}
+
+class LoopContentStrategy {
   isApplicable(openTag, closeTag, isCondition) {
     return true;
   }
@@ -3423,21 +3482,6 @@ class LoopParagraphStrategy {
   }
 }
 
-const LoopOver = Object.freeze({
-  /**
-   * Loop over the entire row.
-   */
-  Row: 'row',
-  /**
-   * Loop over the entire column.
-   */
-  Column: 'column',
-  /**
-   * Loop over the content enclosed between the opening and closing tag.
-   */
-  Content: 'content'
-});
-
 class LoopTableColumnsStrategy {
   isApplicable(openTag, closeTag, isCondition) {
     const openCell = officeMarkup.query.containingTableCellNode(openTag.xmlTextNode);
@@ -3633,7 +3677,7 @@ class LoopTableRowsStrategy {
 const LOOP_CONTENT_TYPE = 'loop';
 class LoopPlugin extends TemplatePlugin {
   contentType = LOOP_CONTENT_TYPE;
-  loopStrategies = [new LoopTableColumnsStrategy(), new LoopTableRowsStrategy(), new LoopListStrategy(), new LoopParagraphStrategy() // the default strategy
+  loopStrategies = [new LoopParagraphStrategy(), new LoopTableColumnsStrategy(), new LoopTableRowsStrategy(), new LoopListStrategy(), new LoopContentStrategy() // the default strategy
   ];
   setUtilities(utilities) {
     this.utilities = utilities;
@@ -3803,7 +3847,7 @@ class TextPlugin extends TemplatePlugin {
     if (lines.length < 2) {
       this.replaceSingleLine(tag, lines.length ? lines[0] : '');
     } else {
-      this.replaceMultiLine(tag.xmlTextNode, lines);
+      this.replaceMultiLine(tag, lines);
     }
   }
   replaceInAttribute(tag, text) {
@@ -3831,14 +3875,14 @@ class TextPlugin extends TemplatePlugin {
     const wordTextNode = officeMarkup.query.containingTextNode(textNode);
     officeMarkup.modify.setSpacePreserveAttribute(wordTextNode);
   }
-  replaceMultiLine(textNode, lines) {
+  replaceMultiLine(tag, lines) {
+    const textNode = tag.xmlTextNode;
     const runNode = officeMarkup.query.containingRunNode(textNode);
     const namespace = runNode.nodeName.split(':')[0];
 
     // First line
-    if (typeof lines[0] === 'string') {
-      textNode.textContent = lines[0];
-    }
+    const firstLine = lines[0];
+    textNode.textContent = firstLine;
 
     // Other lines
     for (let i = 1; i < lines.length; i++) {
@@ -3852,6 +3896,11 @@ class TextPlugin extends TemplatePlugin {
         xml.modify.appendChild(runNode, lineNode);
       }
     }
+
+    // Clean up if the original text node is now empty
+    if (!firstLine) {
+      officeMarkup.modify.removeTag(tag);
+    }
   }
   getLineBreak(namespace) {
     return xml.create.generalNode(namespace + ':br');
@@ -5244,7 +5293,7 @@ class TemplateHandler {
   /**
    * Version number of the `easy-template-x` library.
    */
-  version = "7.1.0" ;
+  version = "7.2.0" ;
   constructor(options) {
     this.options = new TemplateHandlerOptions(options);
     const delimiters = this.options.delimiters;

package/dist/es/easy-template-x.mjs

@@ -3359,7 +3359,66 @@ class LoopListStrategy {
   }
 }
 
+const LoopOver = Object.freeze({
+  /**
+   * Loop over the entire table row.
+   */
+  Row: 'row',
+  /**
+   * Loop over the entire table column.
+   */
+  Column: 'column',
+  /**
+   * Loop over the entire paragraph.
+   */
+  Paragraph: 'paragraph',
+  /**
+   * Loop over the content enclosed between the opening and closing tag.
+   */
+  Content: 'content'
+});
+
 class LoopParagraphStrategy {
+  isApplicable(openTag, closeTag, isCondition) {
+    const options = openTag.options;
+    return options?.loopOver === LoopOver.Paragraph;
+  }
+  splitBefore(openTag, closeTag) {
+    const firstParagraph = officeMarkup.query.containingParagraphNode(openTag.xmlTextNode);
+    const lastParagraph = officeMarkup.query.containingParagraphNode(closeTag.xmlTextNode);
+    const paragraphsToRepeat = xml.query.siblingsInRange(firstParagraph, lastParagraph);
+
+    // Remove the loop tags.
+    xml.modify.remove(openTag.xmlTextNode);
+    xml.modify.remove(closeTag.xmlTextNode);
+    return {
+      firstNode: firstParagraph,
+      nodesToRepeat: paragraphsToRepeat,
+      lastNode: lastParagraph
+    };
+  }
+  mergeBack(newParagraphs, firstParagraph, lastParagraph) {
+    // Add new paragraphs to the document.
+    let insertAfter = lastParagraph;
+    for (const curParagraphsGroup of newParagraphs) {
+      for (const paragraph of curParagraphsGroup) {
+        xml.modify.insertAfter(paragraph, insertAfter);
+        insertAfter = paragraph;
+      }
+    }
+
+    // Remove old paragraphs - between first and last paragraph.
+    xml.modify.removeSiblings(firstParagraph, lastParagraph);
+
+    // Remove old paragraphs - first and last.
+    xml.modify.remove(firstParagraph);
+    if (firstParagraph !== lastParagraph) {
+      xml.modify.remove(lastParagraph);
+    }
+  }
+}
+
+class LoopContentStrategy {
   isApplicable(openTag, closeTag, isCondition) {
     return true;
   }
@@ -3421,21 +3480,6 @@ class LoopParagraphStrategy {
   }
 }
 
-const LoopOver = Object.freeze({
-  /**
-   * Loop over the entire row.
-   */
-  Row: 'row',
-  /**
-   * Loop over the entire column.
-   */
-  Column: 'column',
-  /**
-   * Loop over the content enclosed between the opening and closing tag.
-   */
-  Content: 'content'
-});
-
 class LoopTableColumnsStrategy {
   isApplicable(openTag, closeTag, isCondition) {
     const openCell = officeMarkup.query.containingTableCellNode(openTag.xmlTextNode);
@@ -3631,7 +3675,7 @@ class LoopTableRowsStrategy {
 const LOOP_CONTENT_TYPE = 'loop';
 class LoopPlugin extends TemplatePlugin {
   contentType = LOOP_CONTENT_TYPE;
-  loopStrategies = [new LoopTableColumnsStrategy(), new LoopTableRowsStrategy(), new LoopListStrategy(), new LoopParagraphStrategy() // the default strategy
+  loopStrategies = [new LoopParagraphStrategy(), new LoopTableColumnsStrategy(), new LoopTableRowsStrategy(), new LoopListStrategy(), new LoopContentStrategy() // the default strategy
   ];
   setUtilities(utilities) {
     this.utilities = utilities;
@@ -3801,7 +3845,7 @@ class TextPlugin extends TemplatePlugin {
     if (lines.length < 2) {
       this.replaceSingleLine(tag, lines.length ? lines[0] : '');
     } else {
-      this.replaceMultiLine(tag.xmlTextNode, lines);
+      this.replaceMultiLine(tag, lines);
     }
   }
   replaceInAttribute(tag, text) {
@@ -3829,14 +3873,14 @@ class TextPlugin extends TemplatePlugin {
     const wordTextNode = officeMarkup.query.containingTextNode(textNode);
     officeMarkup.modify.setSpacePreserveAttribute(wordTextNode);
   }
-  replaceMultiLine(textNode, lines) {
+  replaceMultiLine(tag, lines) {
+    const textNode = tag.xmlTextNode;
     const runNode = officeMarkup.query.containingRunNode(textNode);
     const namespace = runNode.nodeName.split(':')[0];
 
     // First line
-    if (typeof lines[0] === 'string') {
-      textNode.textContent = lines[0];
-    }
+    const firstLine = lines[0];
+    textNode.textContent = firstLine;
 
     // Other lines
     for (let i = 1; i < lines.length; i++) {
@@ -3850,6 +3894,11 @@ class TextPlugin extends TemplatePlugin {
         xml.modify.appendChild(runNode, lineNode);
       }
     }
+
+    // Clean up if the original text node is now empty
+    if (!firstLine) {
+      officeMarkup.modify.removeTag(tag);
+    }
   }
   getLineBreak(namespace) {
     return xml.create.generalNode(namespace + ':br');
@@ -5242,7 +5291,7 @@ class TemplateHandler {
   /**
    * Version number of the `easy-template-x` library.
    */
-  version = "7.1.0" ;
+  version = "7.2.0" ;
   constructor(options) {
     this.options = new TemplateHandlerOptions(options);
     const delimiters = this.options.delimiters;

package/dist/types/plugins/loop/loopTagOptions.d.ts

@@ -1,6 +1,7 @@
 export declare const LoopOver: Readonly<{
     readonly Row: "row";
     readonly Column: "column";
+    readonly Paragraph: "paragraph";
     readonly Content: "content";
 }>;
 export type LoopOver = typeof LoopOver[keyof typeof LoopOver];

package/dist/types/plugins/loop/strategy/index.d.ts

@@ -1,5 +1,6 @@
 export * from './iLoopStrategy';
 export * from './loopListStrategy';
 export * from './loopParagraphStrategy';
+export * from './loopContentStrategy';
 export * from './loopTableColumnsStrategy';
 export * from './loopTableRowsStrategy';

package/dist/types/plugins/loop/strategy/loopContentStrategy.d.ts

@@ -0,0 +1,8 @@
+import { TextNodeTag } from "src/compilation";
+import { XmlNode } from "src/xml";
+import { ILoopStrategy, SplitBeforeResult } from "./iLoopStrategy";
+export declare class LoopContentStrategy implements ILoopStrategy {
+    isApplicable(openTag: TextNodeTag, closeTag: TextNodeTag, isCondition: boolean): boolean;
+    splitBefore(openTag: TextNodeTag, closeTag: TextNodeTag): SplitBeforeResult;
+    mergeBack(middleParagraphs: XmlNode[][], firstParagraph: XmlNode, lastParagraph: XmlNode): void;
+}

package/dist/types/plugins/loop/strategy/loopParagraphStrategy.d.ts

@@ -4,5 +4,5 @@ import { ILoopStrategy, SplitBeforeResult } from "./iLoopStrategy";
 export declare class LoopParagraphStrategy implements ILoopStrategy {
     isApplicable(openTag: TextNodeTag, closeTag: TextNodeTag, isCondition: boolean): boolean;
     splitBefore(openTag: TextNodeTag, closeTag: TextNodeTag): SplitBeforeResult;
-    mergeBack(middleParagraphs: XmlNode[][], firstParagraph: XmlNode, lastParagraph: XmlNode): void;
+    mergeBack(newParagraphs: XmlNode[][], firstParagraph: XmlNode, lastParagraph: XmlNode): void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy-template-x",
-  "version": "7.1.1",
+  "version": "7.2.0",
   "description": "Generate docx documents from templates, in Node or in the browser.",
   "keywords": [
     "docx",

package/src/plugins/loop/loopPlugin.ts

@@ -7,7 +7,7 @@ import { PluginUtilities, TemplatePlugin } from "src/plugins/templatePlugin";
 import { TemplateData } from "src/templateData";
 import { last } from "src/utils";
 import { xml, XmlNode } from "src/xml";
-import { ILoopStrategy, LoopListStrategy, LoopParagraphStrategy, LoopTableColumnsStrategy, LoopTableRowsStrategy } from "./strategy";
+import { ILoopStrategy, LoopListStrategy, LoopParagraphStrategy, LoopContentStrategy, LoopTableColumnsStrategy, LoopTableRowsStrategy } from "./strategy";
 
 export const LOOP_CONTENT_TYPE = 'loop';
 
@@ -16,10 +16,11 @@ export class LoopPlugin extends TemplatePlugin {
     public readonly contentType = LOOP_CONTENT_TYPE;
 
     private readonly loopStrategies: ILoopStrategy[] = [
+        new LoopParagraphStrategy(),
         new LoopTableColumnsStrategy(),
         new LoopTableRowsStrategy(),
         new LoopListStrategy(),
-        new LoopParagraphStrategy() // the default strategy
+        new LoopContentStrategy() // the default strategy
     ];
 
     public setUtilities(utilities: PluginUtilities): void {

package/src/plugins/loop/loopTagOptions.ts

@@ -1,12 +1,16 @@
 export const LoopOver = Object.freeze({
     /**
-     * Loop over the entire row.
+     * Loop over the entire table row.
      */
     Row: 'row',
     /**
-     * Loop over the entire column.
+     * Loop over the entire table column.
      */
     Column: 'column',
+    /**
+     * Loop over the entire paragraph.
+     */
+    Paragraph: 'paragraph',
     /**
      * Loop over the content enclosed between the opening and closing tag.
      */

package/src/plugins/loop/strategy/index.ts

@@ -1,5 +1,6 @@
 export * from './iLoopStrategy';
 export * from './loopListStrategy';
 export * from './loopParagraphStrategy';
+export * from './loopContentStrategy';
 export * from './loopTableColumnsStrategy';
 export * from './loopTableRowsStrategy';

package/src/plugins/loop/strategy/{loopParagraphStrategy.tests.ts → loopContentStrategy.tests.ts}

@@ -1,11 +1,11 @@
 import { TagDisposition, TagPlacement, TextNodeTag, XmlTextNode } from "src";
-import { LoopParagraphStrategy } from "src/plugins/loop/strategy";
+import { LoopContentStrategy } from "./loopContentStrategy";
 import { parseXml } from "test/testUtils";
 import { describe, expect, it } from "vitest";
 
-describe(LoopParagraphStrategy, () => {
+describe(LoopContentStrategy, () => {
 
-    describe(LoopParagraphStrategy.prototype.splitBefore, () => {
+    describe(LoopContentStrategy.prototype.splitBefore, () => {
 
         it("when the closing loop tag's run has additional content before the tag, the extra content is preserved (bug #36)", () => {
 
@@ -45,7 +45,7 @@ describe(LoopParagraphStrategy, () => {
             expect(openTag.xmlTextNode.textContent).toEqual('{#loop}');
             expect(closeTag.xmlTextNode.textContent).toEqual('{/loop}');
 
-            const strategy = new LoopParagraphStrategy();
+            const strategy = new LoopContentStrategy();
 
             //
             // test

package/src/plugins/loop/strategy/loopContentStrategy.ts

@@ -0,0 +1,76 @@
+import { TextNodeTag } from "src/compilation";
+import { officeMarkup } from "src/office";
+import { xml, XmlNode } from "src/xml";
+import { ILoopStrategy, SplitBeforeResult } from "./iLoopStrategy";
+
+export class LoopContentStrategy implements ILoopStrategy {
+
+    public isApplicable(openTag: TextNodeTag, closeTag: TextNodeTag, isCondition: boolean): boolean {
+        return true;
+    }
+
+    public splitBefore(openTag: TextNodeTag, closeTag: TextNodeTag): SplitBeforeResult {
+
+        // Gather some info
+        let firstParagraph: XmlNode = officeMarkup.query.containingParagraphNode(openTag.xmlTextNode);
+        let lastParagraph: XmlNode = officeMarkup.query.containingParagraphNode(closeTag.xmlTextNode);
+        const areSame = (firstParagraph === lastParagraph);
+
+        // Split first paragraph
+        const removeTextNode = true;
+        let splitResult = officeMarkup.modify.splitParagraphByTextNode(firstParagraph, openTag.xmlTextNode, removeTextNode);
+        firstParagraph = splitResult[0];
+        let afterFirstParagraph = splitResult[1];
+        if (areSame)
+            lastParagraph = afterFirstParagraph;
+
+        // Split last paragraph
+        splitResult = officeMarkup.modify.splitParagraphByTextNode(lastParagraph, closeTag.xmlTextNode, removeTextNode);
+        const beforeLastParagraph = splitResult[0];
+        lastParagraph = splitResult[1];
+        if (areSame)
+            afterFirstParagraph = beforeLastParagraph;
+
+        // Disconnect splitted paragraph from their parents
+        xml.modify.remove(afterFirstParagraph);
+        if (!areSame)
+            xml.modify.remove(beforeLastParagraph);
+
+        // Extract all paragraphs in between
+        let middleParagraphs: XmlNode[];
+        if (areSame) {
+            middleParagraphs = [afterFirstParagraph];
+        } else {
+            const inBetween = xml.modify.removeSiblings(firstParagraph, lastParagraph);
+            middleParagraphs = [afterFirstParagraph].concat(inBetween).concat(beforeLastParagraph);
+        }
+
+        return {
+            firstNode: firstParagraph,
+            nodesToRepeat: middleParagraphs,
+            lastNode: lastParagraph
+        };
+    }
+
+    public mergeBack(middleParagraphs: XmlNode[][], firstParagraph: XmlNode, lastParagraph: XmlNode): void {
+
+        let mergeTo = firstParagraph;
+        for (const curParagraphsGroup of middleParagraphs) {
+
+            // Merge first paragraphs
+            officeMarkup.modify.joinParagraphs(mergeTo, curParagraphsGroup[0]);
+
+            // Add middle and last paragraphs to the original document
+            for (let i = 1; i < curParagraphsGroup.length; i++) {
+                xml.modify.insertBefore(curParagraphsGroup[i], lastParagraph);
+                mergeTo = curParagraphsGroup[i];
+            }
+        }
+
+        // Merge last paragraph
+        officeMarkup.modify.joinParagraphs(mergeTo, lastParagraph);
+
+        // Remove the old last paragraph (was merged into the new one)
+        xml.modify.remove(lastParagraph);
+    }
+}

package/src/plugins/loop/strategy/loopParagraphStrategy.ts

@@ -1,4 +1,5 @@
 import { TextNodeTag } from "src/compilation";
+import { LoopOver, LoopTagOptions } from "src/plugins/loop/loopTagOptions";
 import { officeMarkup } from "src/office";
 import { xml, XmlNode } from "src/xml";
 import { ILoopStrategy, SplitBeforeResult } from "./iLoopStrategy";
@@ -6,71 +7,44 @@ import { ILoopStrategy, SplitBeforeResult } from "./iLoopStrategy";
 export class LoopParagraphStrategy implements ILoopStrategy {
 
     public isApplicable(openTag: TextNodeTag, closeTag: TextNodeTag, isCondition: boolean): boolean {
-        return true;
+        const options = openTag.options as LoopTagOptions;
+        return options?.loopOver === LoopOver.Paragraph;
     }
 
     public splitBefore(openTag: TextNodeTag, closeTag: TextNodeTag): SplitBeforeResult {
+        const firstParagraph = officeMarkup.query.containingParagraphNode(openTag.xmlTextNode);
+        const lastParagraph = officeMarkup.query.containingParagraphNode(closeTag.xmlTextNode);
+        const paragraphsToRepeat = xml.query.siblingsInRange(firstParagraph, lastParagraph);
 
-        // Gather some info
-        let firstParagraph: XmlNode = officeMarkup.query.containingParagraphNode(openTag.xmlTextNode);
-        let lastParagraph: XmlNode = officeMarkup.query.containingParagraphNode(closeTag.xmlTextNode);
-        const areSame = (firstParagraph === lastParagraph);
-
-        // Split first paragraph
-        const removeTextNode = true;
-        let splitResult = officeMarkup.modify.splitParagraphByTextNode(firstParagraph, openTag.xmlTextNode, removeTextNode);
-        firstParagraph = splitResult[0];
-        let afterFirstParagraph = splitResult[1];
-        if (areSame)
-            lastParagraph = afterFirstParagraph;
-
-        // Split last paragraph
-        splitResult = officeMarkup.modify.splitParagraphByTextNode(lastParagraph, closeTag.xmlTextNode, removeTextNode);
-        const beforeLastParagraph = splitResult[0];
-        lastParagraph = splitResult[1];
-        if (areSame)
-            afterFirstParagraph = beforeLastParagraph;
-
-        // Disconnect splitted paragraph from their parents
-        xml.modify.remove(afterFirstParagraph);
-        if (!areSame)
-            xml.modify.remove(beforeLastParagraph);
-
-        // Extract all paragraphs in between
-        let middleParagraphs: XmlNode[];
-        if (areSame) {
-            middleParagraphs = [afterFirstParagraph];
-        } else {
-            const inBetween = xml.modify.removeSiblings(firstParagraph, lastParagraph);
-            middleParagraphs = [afterFirstParagraph].concat(inBetween).concat(beforeLastParagraph);
-        }
+        // Remove the loop tags.
+        xml.modify.remove(openTag.xmlTextNode);
+        xml.modify.remove(closeTag.xmlTextNode);
 
         return {
             firstNode: firstParagraph,
-            nodesToRepeat: middleParagraphs,
+            nodesToRepeat: paragraphsToRepeat,
             lastNode: lastParagraph
         };
     }
 
-    public mergeBack(middleParagraphs: XmlNode[][], firstParagraph: XmlNode, lastParagraph: XmlNode): void {
-
-        let mergeTo = firstParagraph;
-        for (const curParagraphsGroup of middleParagraphs) {
+    public mergeBack(newParagraphs: XmlNode[][], firstParagraph: XmlNode, lastParagraph: XmlNode): void {
 
-            // Merge first paragraphs
-            officeMarkup.modify.joinParagraphs(mergeTo, curParagraphsGroup[0]);
-
-            // Add middle and last paragraphs to the original document
-            for (let i = 1; i < curParagraphsGroup.length; i++) {
-                xml.modify.insertBefore(curParagraphsGroup[i], lastParagraph);
-                mergeTo = curParagraphsGroup[i];
+        // Add new paragraphs to the document.
+        let insertAfter = lastParagraph;
+        for (const curParagraphsGroup of newParagraphs) {
+            for (const paragraph of curParagraphsGroup) {
+                xml.modify.insertAfter(paragraph, insertAfter);
+                insertAfter = paragraph;
             }
         }
 
-        // Merge last paragraph
-        officeMarkup.modify.joinParagraphs(mergeTo, lastParagraph);
+        // Remove old paragraphs - between first and last paragraph.
+        xml.modify.removeSiblings(firstParagraph, lastParagraph);
 
-        // Remove the old last paragraph (was merged into the new one)
-        xml.modify.remove(lastParagraph);
+        // Remove old paragraphs - first and last.
+        xml.modify.remove(firstParagraph);
+        if (firstParagraph !== lastParagraph) {
+            xml.modify.remove(lastParagraph);
+        }
     }
 }