docxmlater 10.1.4 → 10.1.6

package/dist/core/DocumentGenerator.js

@@ -19,27 +19,27 @@ function normalizeXmlOutput(xml) {
 }
 class DocumentGenerator {
     generateContentTypes() {
-        return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">
-  <Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>
-  <Default Extension="xml" ContentType="application/xml"/>
-  <Override PartName="/word/document.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml"/>
-  <Override PartName="/word/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml"/>
-  <Override PartName="/word/numbering.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml"/>
-  <Override PartName="/word/fontTable.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml"/>
-  <Override PartName="/word/settings.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml"/>
-  <Override PartName="/word/webSettings.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml"/>
-  <Override PartName="/word/theme/theme1.xml" ContentType="application/vnd.openxmlformats-officedocument.theme+xml"/>
-  <Override PartName="/docProps/core.xml" ContentType="application/vnd.openxmlformats-package.core-properties+xml"/>
-  <Override PartName="/docProps/app.xml" ContentType="application/vnd.openxmlformats-officedocument.extended-properties+xml"/>
+        return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">
+  <Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>
+  <Default Extension="xml" ContentType="application/xml"/>
+  <Override PartName="/word/document.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml"/>
+  <Override PartName="/word/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml"/>
+  <Override PartName="/word/numbering.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml"/>
+  <Override PartName="/word/fontTable.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml"/>
+  <Override PartName="/word/settings.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml"/>
+  <Override PartName="/word/webSettings.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml"/>
+  <Override PartName="/word/theme/theme1.xml" ContentType="application/vnd.openxmlformats-officedocument.theme+xml"/>
+  <Override PartName="/docProps/core.xml" ContentType="application/vnd.openxmlformats-package.core-properties+xml"/>
+  <Override PartName="/docProps/app.xml" ContentType="application/vnd.openxmlformats-officedocument.extended-properties+xml"/>
 </Types>`;
     }
     generateRels() {
-        return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
-  <Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="word/document.xml"/>
-  <Relationship Id="rId2" Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" Target="docProps/core.xml"/>
-  <Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties" Target="docProps/app.xml"/>
+        return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
+  <Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="word/document.xml"/>
+  <Relationship Id="rId2" Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" Target="docProps/core.xml"/>
+  <Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties" Target="docProps/app.xml"/>
 </Relationships>`;
     }
     generateDocumentXml(bodyElements, section, namespaces, documentBackground) {
@@ -55,14 +55,14 @@ class DocumentGenerator {
         if (documentBackground) {
             const bgAttrs = {};
             if (documentBackground.color)
-                bgAttrs["w:color"] = documentBackground.color;
+                bgAttrs['w:color'] = documentBackground.color;
             if (documentBackground.themeColor)
-                bgAttrs["w:themeColor"] = documentBackground.themeColor;
+                bgAttrs['w:themeColor'] = documentBackground.themeColor;
             if (documentBackground.themeTint)
-                bgAttrs["w:themeTint"] = documentBackground.themeTint;
+                bgAttrs['w:themeTint'] = documentBackground.themeTint;
             if (documentBackground.themeShade)
-                bgAttrs["w:themeShade"] = documentBackground.themeShade;
-            preBodyContent = [XMLBuilder_1.XMLBuilder.wSelf("background", bgAttrs)];
+                bgAttrs['w:themeShade'] = documentBackground.themeShade;
+            preBodyContent = [XMLBuilder_1.XMLBuilder.wSelf('background', bgAttrs)];
         }
         const result = XMLBuilder_1.XMLBuilder.createDocument(bodyXmls, namespaces, preBodyContent);
         logger.info('Document.xml generated', { xmlSize: result.length });
@@ -75,80 +75,80 @@ class DocumentGenerator {
         const formatDate = (date) => {
             return (0, dateFormatting_1.formatDateForXml)(date);
         };
-        return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties"
-                   xmlns:dc="http://purl.org/dc/elements/1.1/"
-                   xmlns:dcterms="http://purl.org/dc/terms/"
-                   xmlns:dcmitype="http://purl.org/dc/dcmitype/"
-                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <dc:title>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.title || "")}</dc:title>
-  <dc:subject>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.subject || "")}</dc:subject>
-  <dc:creator>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.creator || "DocXML")}</dc:creator>
-  <cp:keywords>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.keywords || "")}</cp:keywords>
-  <dc:description>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.description || "")}</dc:description>
-  <cp:lastModifiedBy>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.lastModifiedBy || properties.creator || "DocXML")}</cp:lastModifiedBy>
+        return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties"
+                   xmlns:dc="http://purl.org/dc/elements/1.1/"
+                   xmlns:dcterms="http://purl.org/dc/terms/"
+                   xmlns:dcmitype="http://purl.org/dc/dcmitype/"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <dc:title>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.title || '')}</dc:title>
+  <dc:subject>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.subject || '')}</dc:subject>
+  <dc:creator>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.creator || 'DocXML')}</dc:creator>
+  <cp:keywords>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.keywords || '')}</cp:keywords>
+  <dc:description>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.description || '')}</dc:description>
+  <cp:lastModifiedBy>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.lastModifiedBy || properties.creator || 'DocXML')}</cp:lastModifiedBy>
   <cp:revision>${properties.revision || 1}</cp:revision>${properties.category
             ? `\n  <cp:category>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.category)}</cp:category>`
-            : ""}${properties.contentStatus
+            : ''}${properties.contentStatus
             ? `\n  <cp:contentStatus>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.contentStatus)}</cp:contentStatus>`
-            : ""}${properties.language
+            : ''}${properties.language
             ? `\n  <dc:language>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.language)}</dc:language>`
-            : ""}
-  <dcterms:created xsi:type="dcterms:W3CDTF">${formatDate(created)}</dcterms:created>
-  <dcterms:modified xsi:type="dcterms:W3CDTF">${formatDate(modified)}</dcterms:modified>
+            : ''}
+  <dcterms:created xsi:type="dcterms:W3CDTF">${formatDate(created)}</dcterms:created>
+  <dcterms:modified xsi:type="dcterms:W3CDTF">${formatDate(modified)}</dcterms:modified>
 </cp:coreProperties>`;
     }
     generateAppProps(properties = {}) {
-        return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties"
-            xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes">
-  <Application>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.application || "docxmlater")}</Application>
-  <DocSecurity>0</DocSecurity>
-  <ScaleCrop>false</ScaleCrop>
-  <Company>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.company || "")}</Company>${properties.manager
+        return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties"
+            xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes">
+  <Application>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.application || 'docxmlater')}</Application>
+  <DocSecurity>0</DocSecurity>
+  <ScaleCrop>false</ScaleCrop>
+  <Company>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.company || '')}</Company>${properties.manager
             ? `\n  <Manager>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.manager)}</Manager>`
-            : ""}
-  <LinksUpToDate>false</LinksUpToDate>
-  <SharedDoc>false</SharedDoc>
-  <HyperlinksChanged>false</HyperlinksChanged>
-  <AppVersion>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.appVersion || properties.version || "1.0.0")}</AppVersion>
+            : ''}
+  <LinksUpToDate>false</LinksUpToDate>
+  <SharedDoc>false</SharedDoc>
+  <HyperlinksChanged>false</HyperlinksChanged>
+  <AppVersion>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(properties.appVersion || properties.version || '1.0.0')}</AppVersion>
 </Properties>`;
     }
     generateCustomProps(customProps) {
         if (!customProps || Object.keys(customProps).length === 0) {
-            return "";
+            return '';
         }
         const formatCustomValue = (key, value, pid) => {
-            if (typeof value === "string") {
-                return `  <property fmtid="{D5CDD505-2E9C-101B-9397-08002B2CF9AE}" pid="${pid}" name="${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(key)}">
-    <vt:lpwstr>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(value)}</vt:lpwstr>
+            if (typeof value === 'string') {
+                return `  <property fmtid="{D5CDD505-2E9C-101B-9397-08002B2CF9AE}" pid="${pid}" name="${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(key)}">
+    <vt:lpwstr>${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(value)}</vt:lpwstr>
   </property>`;
             }
-            else if (typeof value === "number") {
-                return `  <property fmtid="{D5CDD505-2E9C-101B-9397-08002B2CF9AE}" pid="${pid}" name="${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(key)}">
-    <vt:r8>${value}</vt:r8>
+            else if (typeof value === 'number') {
+                return `  <property fmtid="{D5CDD505-2E9C-101B-9397-08002B2CF9AE}" pid="${pid}" name="${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(key)}">
+    <vt:r8>${value}</vt:r8>
   </property>`;
             }
-            else if (typeof value === "boolean") {
-                return `  <property fmtid="{D5CDD505-2E9C-101B-9397-08002B2CF9AE}" pid="${pid}" name="${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(key)}">
-    <vt:bool>${value ? "true" : "false"}</vt:bool>
+            else if (typeof value === 'boolean') {
+                return `  <property fmtid="{D5CDD505-2E9C-101B-9397-08002B2CF9AE}" pid="${pid}" name="${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(key)}">
+    <vt:bool>${value ? 'true' : 'false'}</vt:bool>
   </property>`;
             }
             else if (value instanceof Date) {
-                return `  <property fmtid="{D5CDD505-2E9C-101B-9397-08002B2CF9AE}" pid="${pid}" name="${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(key)}">
-    <vt:filetime>${value.toISOString()}</vt:filetime>
+                return `  <property fmtid="{D5CDD505-2E9C-101B-9397-08002B2CF9AE}" pid="${pid}" name="${XMLBuilder_1.XMLBuilder.sanitizeXmlContent(key)}">
+    <vt:filetime>${value.toISOString()}</vt:filetime>
   </property>`;
             }
-            return "";
+            return '';
         };
         const properties = Object.entries(customProps)
             .map(([key, value], index) => formatCustomValue(key, value, index + 2))
-            .filter((prop) => prop !== "")
-            .join("\n");
-        return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/custom-properties"
-            xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes">
-${properties}
+            .filter((prop) => prop !== '')
+            .join('\n');
+        return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/custom-properties"
+            xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes">
+${properties}
 </Properties>`;
     }
     generateContentTypesWithImagesHeadersFootersAndComments(imageManager, headerFooterManager, commentManager, zipHandler, fontManager, hasCustomProperties = false, originalContentTypes, footnoteManager, endnoteManager) {
@@ -166,11 +166,16 @@ ${properties}
             generatedDefaults.add(`${ext}|${mimeType}`);
         }
         const mediaExtensions = new Map([
-            ['png', 'image/png'], ['jpeg', 'image/jpeg'], ['jpg', 'image/jpeg'],
-            ['gif', 'image/gif'], ['bmp', 'image/bmp'], ['tiff', 'image/tiff'],
-            ['emf', 'image/x-emf'], ['wmf', 'image/x-wmf'],
+            ['png', 'image/png'],
+            ['jpeg', 'image/jpeg'],
+            ['jpg', 'image/jpeg'],
+            ['gif', 'image/gif'],
+            ['bmp', 'image/bmp'],
+            ['tiff', 'image/tiff'],
+            ['emf', 'image/x-emf'],
+            ['wmf', 'image/x-wmf'],
         ]);
-        for (const file of (zipHandler.getFilePaths?.() || [])) {
+        for (const file of zipHandler.getFilePaths?.() || []) {
             if (file.startsWith('word/media/')) {
                 const ext = file.split('.').pop()?.toLowerCase();
                 if (ext && mediaExtensions.has(ext)) {
@@ -190,7 +195,7 @@ ${properties}
         }
         const files = zipHandler.getFilePaths?.() || [];
         const filesInArchive = new Set(files);
-        const hasTtfFonts = files.some((f) => f.endsWith(".ttf"));
+        const hasTtfFonts = files.some((f) => f.endsWith('.ttf'));
         if (hasTtfFonts) {
             generatedDefaults.add('ttf|application/x-font-ttf');
         }
@@ -228,7 +233,8 @@ ${properties}
         if (hasComments) {
             generatedOverrides.add('/word/comments.xml|application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml');
         }
-        const hasFootnotes = (footnoteManager && footnoteManager.getCount() > 0) || filesInArchive.has('word/footnotes.xml');
+        const hasFootnotes = (footnoteManager && footnoteManager.getCount() > 0) ||
+            filesInArchive.has('word/footnotes.xml');
         if (hasFootnotes) {
             generatedOverrides.add('/word/footnotes.xml|application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml');
         }
@@ -248,27 +254,24 @@ ${properties}
         if (filesInArchive.has('word/commentsExtensible.xml')) {
             generatedOverrides.add('/word/commentsExtensible.xml|application/vnd.openxmlformats-officedocument.wordprocessingml.commentsExtensible+xml');
         }
-        if (zipHandler.hasFile?.("docProps/core.xml") || filesInArchive.has('docProps/core.xml')) {
+        if (zipHandler.hasFile?.('docProps/core.xml') || filesInArchive.has('docProps/core.xml')) {
             generatedOverrides.add('/docProps/core.xml|application/vnd.openxmlformats-package.core-properties+xml');
         }
-        if (zipHandler.hasFile?.("docProps/app.xml")) {
+        if (zipHandler.hasFile?.('docProps/app.xml')) {
             generatedOverrides.add('/docProps/app.xml|application/vnd.openxmlformats-officedocument.extended-properties+xml');
         }
-        if (zipHandler.hasFile?.("docProps/custom.xml") || hasCustomProperties) {
+        if (zipHandler.hasFile?.('docProps/custom.xml') || hasCustomProperties) {
             generatedOverrides.add('/docProps/custom.xml|application/vnd.openxmlformats-officedocument.custom-properties+xml');
         }
-        if (zipHandler.hasFile?.("customXML/item1.xml")) {
+        if (zipHandler.hasFile?.('customXML/item1.xml')) {
             generatedOverrides.add('/customXML/item1.xml|application/xml');
         }
-        if (zipHandler.hasFile?.("customXML/itemProps1.xml")) {
+        if (zipHandler.hasFile?.('customXML/itemProps1.xml')) {
             generatedOverrides.add('/customXML/itemProps1.xml|application/vnd.openxmlformats-officedocument.customXmlProperties+xml');
         }
-        const allDefaults = new Set([
-            ...generatedDefaults,
-            ...(originalContentTypes?.defaults || [])
-        ]);
+        const allDefaults = new Set([...generatedDefaults, ...(originalContentTypes?.defaults || [])]);
         const filteredOriginalOverrides = [];
-        for (const entry of (originalContentTypes?.overrides || [])) {
+        for (const entry of originalContentTypes?.overrides || []) {
             const parts = entry.split('|');
             const partName = parts[0] || '';
             const normalizedPath = partName.startsWith('/') ? partName.slice(1) : partName;
@@ -276,10 +279,7 @@ ${properties}
                 filteredOriginalOverrides.push(entry);
             }
         }
-        const allOverrides = new Set([
-            ...generatedOverrides,
-            ...filteredOriginalOverrides
-        ]);
+        const allOverrides = new Set([...generatedOverrides, ...filteredOriginalOverrides]);
         let xml = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n';
         xml += '<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">\n';
         for (const entry of allDefaults) {
@@ -386,7 +386,7 @@ ${properties}
                 }
             }
         }
-        const allHyperlinkRels = relationshipManager.getRelationshipsByType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink");
+        const allHyperlinkRels = relationshipManager.getRelationshipsByType('http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink');
         for (const rel of allHyperlinkRels) {
             if (!usedRelIds.has(rel.getId())) {
                 relationshipManager.removeRelationship(rel.getId());
@@ -455,9 +455,7 @@ ${properties}
     processHyperlinksInParagraph(paragraph, relationshipManager) {
         const content = paragraph.getContent();
         for (const item of content) {
-            if (item instanceof Hyperlink_1.Hyperlink &&
-                item.isExternal() &&
-                !item.getRelationshipId()) {
+            if (item instanceof Hyperlink_1.Hyperlink && item.isExternal() && !item.getRelationshipId()) {
                 this.registerHyperlinkRelationship(item, relationshipManager);
             }
             if (item instanceof Revision_1.Revision) {
@@ -483,60 +481,60 @@ ${properties}
         hyperlink.setRelationshipId(relationship.getId());
     }
     generateFontTable() {
-        return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<w:fonts xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
-         xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
-  <w:font w:name="Calibri">
-    <w:panose1 w:val="020F0502020204030204"/>
-    <w:charset w:val="00"/>
-    <w:family w:val="swiss"/>
-    <w:pitch w:val="variable"/>
-    <w:sig w:usb0="E10002FF" w:usb1="4000ACFF" w:usb2="00000009" w:usb3="00000000" w:csb0="0000019F" w:csb1="00000000"/>
-  </w:font>
-  <w:font w:name="Times New Roman">
-    <w:panose1 w:val="02020603050405020304"/>
-    <w:charset w:val="00"/>
-    <w:family w:val="roman"/>
-    <w:pitch w:val="variable"/>
-    <w:sig w:usb0="E0002AFF" w:usb1="C000785B" w:usb2="00000009" w:usb3="00000000" w:csb0="000001FF" w:csb1="00000000"/>
-  </w:font>
-  <w:font w:name="Arial">
-    <w:panose1 w:val="020B0604020202020204"/>
-    <w:charset w:val="00"/>
-    <w:family w:val="swiss"/>
-    <w:pitch w:val="variable"/>
-    <w:sig w:usb0="E0002AFF" w:usb1="C000247B" w:usb2="00000009" w:usb3="00000000" w:csb0="000001FF" w:csb1="00000000"/>
-  </w:font>
-  <w:font w:name="Courier New">
-    <w:panose1 w:val="02070309020205020404"/>
-    <w:charset w:val="00"/>
-    <w:family w:val="modern"/>
-    <w:pitch w:val="fixed"/>
-    <w:sig w:usb0="E0002AFF" w:usb1="C0007843" w:usb2="00000009" w:usb3="00000000" w:csb0="000001FF" w:csb1="00000000"/>
-  </w:font>
-  <w:font w:name="Calibri Light">
-    <w:panose1 w:val="020F0302020204030204"/>
-    <w:charset w:val="00"/>
-    <w:family w:val="swiss"/>
-    <w:pitch w:val="variable"/>
-    <w:sig w:usb0="E10002FF" w:usb1="4000ACFF" w:usb2="00000009" w:usb3="00000000" w:csb0="0000019F" w:csb1="00000000"/>
-  </w:font>
-  <w:font w:name="Georgia">
-    <w:panose1 w:val="02040502050204030303"/>
-    <w:charset w:val="00"/>
-    <w:family w:val="roman"/>
-    <w:pitch w:val="variable"/>
-    <w:sig w:usb0="E0002AFF" w:usb1="00000000" w:usb2="00000000" w:usb3="00000000" w:csb0="000001FF" w:csb1="00000000"/>
-  </w:font>
+        return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<w:fonts xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
+         xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
+  <w:font w:name="Calibri">
+    <w:panose1 w:val="020F0502020204030204"/>
+    <w:charset w:val="00"/>
+    <w:family w:val="swiss"/>
+    <w:pitch w:val="variable"/>
+    <w:sig w:usb0="E10002FF" w:usb1="4000ACFF" w:usb2="00000009" w:usb3="00000000" w:csb0="0000019F" w:csb1="00000000"/>
+  </w:font>
+  <w:font w:name="Times New Roman">
+    <w:panose1 w:val="02020603050405020304"/>
+    <w:charset w:val="00"/>
+    <w:family w:val="roman"/>
+    <w:pitch w:val="variable"/>
+    <w:sig w:usb0="E0002AFF" w:usb1="C000785B" w:usb2="00000009" w:usb3="00000000" w:csb0="000001FF" w:csb1="00000000"/>
+  </w:font>
+  <w:font w:name="Arial">
+    <w:panose1 w:val="020B0604020202020204"/>
+    <w:charset w:val="00"/>
+    <w:family w:val="swiss"/>
+    <w:pitch w:val="variable"/>
+    <w:sig w:usb0="E0002AFF" w:usb1="C000247B" w:usb2="00000009" w:usb3="00000000" w:csb0="000001FF" w:csb1="00000000"/>
+  </w:font>
+  <w:font w:name="Courier New">
+    <w:panose1 w:val="02070309020205020404"/>
+    <w:charset w:val="00"/>
+    <w:family w:val="modern"/>
+    <w:pitch w:val="fixed"/>
+    <w:sig w:usb0="E0002AFF" w:usb1="C0007843" w:usb2="00000009" w:usb3="00000000" w:csb0="000001FF" w:csb1="00000000"/>
+  </w:font>
+  <w:font w:name="Calibri Light">
+    <w:panose1 w:val="020F0302020204030204"/>
+    <w:charset w:val="00"/>
+    <w:family w:val="swiss"/>
+    <w:pitch w:val="variable"/>
+    <w:sig w:usb0="E10002FF" w:usb1="4000ACFF" w:usb2="00000009" w:usb3="00000000" w:csb0="0000019F" w:csb1="00000000"/>
+  </w:font>
+  <w:font w:name="Georgia">
+    <w:panose1 w:val="02040502050204030303"/>
+    <w:charset w:val="00"/>
+    <w:family w:val="roman"/>
+    <w:pitch w:val="variable"/>
+    <w:sig w:usb0="E0002AFF" w:usb1="00000000" w:usb2="00000000" w:usb3="00000000" w:csb0="000001FF" w:csb1="00000000"/>
+  </w:font>
 </w:fonts>`;
     }
     generateWebSettings(settings) {
         if (!settings) {
-            return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<w:webSettings xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
-               xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
-  <w:optimizeForBrowser/>
-  <w:allowPNG/>
+            return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<w:webSettings xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
+               xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
+  <w:optimizeForBrowser/>
+  <w:allowPNG/>
 </w:webSettings>`;
         }
         let children = '';
@@ -560,19 +558,21 @@ ${properties}
             children += `\n  <w:targetScreenSz w:val="${settings.targetScreenSz}"/>`;
         if (settings.encoding)
             children += `\n  <w:encoding w:val="${settings.encoding}"/>`;
-        return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<w:webSettings xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
-               xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">${children}
+        return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<w:webSettings xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
+               xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">${children}
 </w:webSettings>`;
     }
     generateSettings(trackChangesSettings) {
-        let xml = `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<w:settings xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
-            xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
+        let xml = `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<w:settings xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
+            xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
   <w:zoom w:percent="100"/>`;
         if (trackChangesSettings?.revisionView) {
             const view = trackChangesSettings.revisionView;
-            if (!view.showInsertionsAndDeletions || !view.showFormatting || view.showInkAnnotations === false) {
+            if (!view.showInsertionsAndDeletions ||
+                !view.showFormatting ||
+                view.showInkAnnotations === false) {
                 xml += `\n  <w:revisionView w:insDel="${view.showInsertionsAndDeletions ? '1' : '0'}" w:formatting="${view.showFormatting ? '1' : '0'}"`;
                 if (view.showInkAnnotations !== undefined) {
                     xml += ` w:inkAnnotations="${view.showInkAnnotations ? '1' : '0'}"`;
@@ -614,9 +614,9 @@ ${properties}
             }
             xml += '/>';
         }
-        xml += `
-  <w:defaultTabStop w:val="720"/>
-  <w:characterSpacingControl w:val="doNotCompress"/>
+        xml += `
+  <w:defaultTabStop w:val="720"/>
+  <w:characterSpacingControl w:val="doNotCompress"/>
   <w:updateFields w:val="true"/>`;
         if (trackChangesSettings?.rsids && trackChangesSettings.rsids.length > 0) {
             xml += '\n  <w:rsids>';
@@ -628,106 +628,106 @@ ${properties}
             }
             xml += '\n  </w:rsids>';
         }
-        xml += `
-  <w:compat>
-    <w:compatSetting w:name="compatibilityMode" w:uri="http://schemas.microsoft.com/office/word" w:val="15"/>
-    <w:compatSetting w:name="overrideTableStyleFontSizeAndJustification" w:uri="http://schemas.microsoft.com/office/word" w:val="1"/>
-    <w:compatSetting w:name="enableOpenTypeFeatures" w:uri="http://schemas.microsoft.com/office/word" w:val="1"/>
-    <w:compatSetting w:name="doNotFlipMirrorIndents" w:uri="http://schemas.microsoft.com/office/word" w:val="1"/>
-    <w:compatSetting w:name="differentiateMultirowTableHeaders" w:uri="http://schemas.microsoft.com/office/word" w:val="1"/>
-  </w:compat>
-  <w:themeFontLang w:val="en-US"/>
-  <w:clrSchemeMapping w:bg1="light1" w:t1="dark1" w:bg2="light2" w:t2="dark2" w:accent1="accent1" w:accent2="accent2" w:accent3="accent3" w:accent4="accent4" w:accent5="accent5" w:accent6="accent6" w:hyperlink="hyperlink" w:followedHyperlink="followedHyperlink"/>
+        xml += `
+  <w:compat>
+    <w:compatSetting w:name="compatibilityMode" w:uri="http://schemas.microsoft.com/office/word" w:val="15"/>
+    <w:compatSetting w:name="overrideTableStyleFontSizeAndJustification" w:uri="http://schemas.microsoft.com/office/word" w:val="1"/>
+    <w:compatSetting w:name="enableOpenTypeFeatures" w:uri="http://schemas.microsoft.com/office/word" w:val="1"/>
+    <w:compatSetting w:name="doNotFlipMirrorIndents" w:uri="http://schemas.microsoft.com/office/word" w:val="1"/>
+    <w:compatSetting w:name="differentiateMultirowTableHeaders" w:uri="http://schemas.microsoft.com/office/word" w:val="1"/>
+  </w:compat>
+  <w:themeFontLang w:val="en-US"/>
+  <w:clrSchemeMapping w:bg1="light1" w:t1="dark1" w:bg2="light2" w:t2="dark2" w:accent1="accent1" w:accent2="accent2" w:accent3="accent3" w:accent4="accent4" w:accent5="accent5" w:accent6="accent6" w:hyperlink="hyperlink" w:followedHyperlink="followedHyperlink"/>
 </w:settings>`;
         return xml;
     }
     generateTheme() {
-        return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<a:theme xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" name="Office Theme">
-  <a:themeElements>
-    <a:clrScheme name="Office">
-      <a:dk1><a:sysClr val="windowText" lastClr="000000"/></a:dk1>
-      <a:lt1><a:sysClr val="window" lastClr="FFFFFF"/></a:lt1>
-      <a:dk2><a:srgbClr val="44546A"/></a:dk2>
-      <a:lt2><a:srgbClr val="E7E6E6"/></a:lt2>
-      <a:accent1><a:srgbClr val="5B9BD5"/></a:accent1>
-      <a:accent2><a:srgbClr val="ED7D31"/></a:accent2>
-      <a:accent3><a:srgbClr val="A5A5A5"/></a:accent3>
-      <a:accent4><a:srgbClr val="FFC000"/></a:accent4>
-      <a:accent5><a:srgbClr val="4472C4"/></a:accent5>
-      <a:accent6><a:srgbClr val="70AD47"/></a:accent6>
-      <a:hlink><a:srgbClr val="0563C1"/></a:hlink>
-      <a:folHlink><a:srgbClr val="954F72"/></a:folHlink>
-    </a:clrScheme>
-    <a:fontScheme name="Office">
-      <a:majorFont>
-        <a:latin typeface="Calibri Light" panose="020F0302020204030204"/>
-        <a:ea typeface=""/>
-        <a:cs typeface=""/>
-      </a:majorFont>
-      <a:minorFont>
-        <a:latin typeface="Calibri" panose="020F0502020204030204"/>
-        <a:ea typeface=""/>
-        <a:cs typeface=""/>
-      </a:minorFont>
-    </a:fontScheme>
-    <a:fmtScheme name="Office">
-      <a:fillStyleLst>
-        <a:solidFill><a:schemeClr val="phClr"/></a:solidFill>
-        <a:gradFill rotWithShape="1">
-          <a:gsLst>
-            <a:gs pos="0"><a:schemeClr val="phClr"><a:lumMod val="110000"/><a:satMod val="105000"/><a:tint val="67000"/></a:schemeClr></a:gs>
-            <a:gs pos="50000"><a:schemeClr val="phClr"><a:lumMod val="105000"/><a:satMod val="103000"/><a:tint val="73000"/></a:schemeClr></a:gs>
-            <a:gs pos="100000"><a:schemeClr val="phClr"><a:lumMod val="105000"/><a:satMod val="109000"/><a:tint val="81000"/></a:schemeClr></a:gs>
-          </a:gsLst>
-          <a:lin ang="5400000" scaled="0"/>
-        </a:gradFill>
-        <a:gradFill rotWithShape="1">
-          <a:gsLst>
-            <a:gs pos="0"><a:schemeClr val="phClr"><a:satMod val="103000"/><a:lumMod val="102000"/><a:tint val="94000"/></a:schemeClr></a:gs>
-            <a:gs pos="50000"><a:schemeClr val="phClr"><a:satMod val="110000"/><a:lumMod val="100000"/><a:shade val="100000"/></a:schemeClr></a:gs>
-            <a:gs pos="100000"><a:schemeClr val="phClr"><a:lumMod val="99000"/><a:satMod val="120000"/><a:shade val="78000"/></a:schemeClr></a:gs>
-          </a:gsLst>
-          <a:lin ang="5400000" scaled="0"/>
-        </a:gradFill>
-      </a:fillStyleLst>
-      <a:lnStyleLst>
-        <a:ln w="6350" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/><a:miter lim="800000"/></a:ln>
-        <a:ln w="12700" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/><a:miter lim="800000"/></a:ln>
-        <a:ln w="19050" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/><a:miter lim="800000"/></a:ln>
-      </a:lnStyleLst>
-      <a:effectStyleLst>
-        <a:effectStyle><a:effectLst/></a:effectStyle>
-        <a:effectStyle><a:effectLst/></a:effectStyle>
-        <a:effectStyle>
-          <a:effectLst>
-            <a:outerShdw blurRad="57150" dist="19050" dir="5400000" algn="ctr" rotWithShape="0">
-              <a:srgbClr val="000000"><a:alpha val="63000"/></a:srgbClr>
-            </a:outerShdw>
-          </a:effectLst>
-        </a:effectStyle>
-      </a:effectStyleLst>
-      <a:bgFillStyleLst>
-        <a:solidFill><a:schemeClr val="phClr"/></a:solidFill>
-        <a:solidFill><a:schemeClr val="phClr"><a:tint val="95000"/><a:satMod val="170000"/></a:schemeClr></a:solidFill>
-        <a:gradFill rotWithShape="1">
-          <a:gsLst>
-            <a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="93000"/><a:satMod val="150000"/><a:shade val="98000"/><a:lumMod val="102000"/></a:schemeClr></a:gs>
-            <a:gs pos="50000"><a:schemeClr val="phClr"><a:tint val="98000"/><a:satMod val="130000"/><a:shade val="90000"/><a:lumMod val="103000"/></a:schemeClr></a:gs>
-            <a:gs pos="100000"><a:schemeClr val="phClr"><a:shade val="63000"/><a:satMod val="120000"/></a:schemeClr></a:gs>
-          </a:gsLst>
-          <a:lin ang="5400000" scaled="0"/>
-        </a:gradFill>
-      </a:bgFillStyleLst>
-    </a:fmtScheme>
-  </a:themeElements>
-  <a:objectDefaults/>
-  <a:extraClrSchemeLst/>
-  <a:extLst>
-    <a:ext uri="{05A4C25C-085E-4340-85A3-A5531E510DB2}">
-      <thm15:themeFamily xmlns:thm15="http://schemas.microsoft.com/office/thememl/2012/main" name="Office Theme" id="{62F939B6-93AF-4DB8-9C6B-D6C7DFDC589F}" vid="{4A3C46E8-61CC-4603-A589-7422A47A8E4A}"/>
-    </a:ext>
-  </a:extLst>
+        return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<a:theme xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" name="Office Theme">
+  <a:themeElements>
+    <a:clrScheme name="Office">
+      <a:dk1><a:sysClr val="windowText" lastClr="000000"/></a:dk1>
+      <a:lt1><a:sysClr val="window" lastClr="FFFFFF"/></a:lt1>
+      <a:dk2><a:srgbClr val="44546A"/></a:dk2>
+      <a:lt2><a:srgbClr val="E7E6E6"/></a:lt2>
+      <a:accent1><a:srgbClr val="5B9BD5"/></a:accent1>
+      <a:accent2><a:srgbClr val="ED7D31"/></a:accent2>
+      <a:accent3><a:srgbClr val="A5A5A5"/></a:accent3>
+      <a:accent4><a:srgbClr val="FFC000"/></a:accent4>
+      <a:accent5><a:srgbClr val="4472C4"/></a:accent5>
+      <a:accent6><a:srgbClr val="70AD47"/></a:accent6>
+      <a:hlink><a:srgbClr val="0563C1"/></a:hlink>
+      <a:folHlink><a:srgbClr val="954F72"/></a:folHlink>
+    </a:clrScheme>
+    <a:fontScheme name="Office">
+      <a:majorFont>
+        <a:latin typeface="Calibri Light" panose="020F0302020204030204"/>
+        <a:ea typeface=""/>
+        <a:cs typeface=""/>
+      </a:majorFont>
+      <a:minorFont>
+        <a:latin typeface="Calibri" panose="020F0502020204030204"/>
+        <a:ea typeface=""/>
+        <a:cs typeface=""/>
+      </a:minorFont>
+    </a:fontScheme>
+    <a:fmtScheme name="Office">
+      <a:fillStyleLst>
+        <a:solidFill><a:schemeClr val="phClr"/></a:solidFill>
+        <a:gradFill rotWithShape="1">
+          <a:gsLst>
+            <a:gs pos="0"><a:schemeClr val="phClr"><a:lumMod val="110000"/><a:satMod val="105000"/><a:tint val="67000"/></a:schemeClr></a:gs>
+            <a:gs pos="50000"><a:schemeClr val="phClr"><a:lumMod val="105000"/><a:satMod val="103000"/><a:tint val="73000"/></a:schemeClr></a:gs>
+            <a:gs pos="100000"><a:schemeClr val="phClr"><a:lumMod val="105000"/><a:satMod val="109000"/><a:tint val="81000"/></a:schemeClr></a:gs>
+          </a:gsLst>
+          <a:lin ang="5400000" scaled="0"/>
+        </a:gradFill>
+        <a:gradFill rotWithShape="1">
+          <a:gsLst>
+            <a:gs pos="0"><a:schemeClr val="phClr"><a:satMod val="103000"/><a:lumMod val="102000"/><a:tint val="94000"/></a:schemeClr></a:gs>
+            <a:gs pos="50000"><a:schemeClr val="phClr"><a:satMod val="110000"/><a:lumMod val="100000"/><a:shade val="100000"/></a:schemeClr></a:gs>
+            <a:gs pos="100000"><a:schemeClr val="phClr"><a:lumMod val="99000"/><a:satMod val="120000"/><a:shade val="78000"/></a:schemeClr></a:gs>
+          </a:gsLst>
+          <a:lin ang="5400000" scaled="0"/>
+        </a:gradFill>
+      </a:fillStyleLst>
+      <a:lnStyleLst>
+        <a:ln w="6350" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/><a:miter lim="800000"/></a:ln>
+        <a:ln w="12700" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/><a:miter lim="800000"/></a:ln>
+        <a:ln w="19050" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/><a:miter lim="800000"/></a:ln>
+      </a:lnStyleLst>
+      <a:effectStyleLst>
+        <a:effectStyle><a:effectLst/></a:effectStyle>
+        <a:effectStyle><a:effectLst/></a:effectStyle>
+        <a:effectStyle>
+          <a:effectLst>
+            <a:outerShdw blurRad="57150" dist="19050" dir="5400000" algn="ctr" rotWithShape="0">
+              <a:srgbClr val="000000"><a:alpha val="63000"/></a:srgbClr>
+            </a:outerShdw>
+          </a:effectLst>
+        </a:effectStyle>
+      </a:effectStyleLst>
+      <a:bgFillStyleLst>
+        <a:solidFill><a:schemeClr val="phClr"/></a:solidFill>
+        <a:solidFill><a:schemeClr val="phClr"><a:tint val="95000"/><a:satMod val="170000"/></a:schemeClr></a:solidFill>
+        <a:gradFill rotWithShape="1">
+          <a:gsLst>
+            <a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="93000"/><a:satMod val="150000"/><a:shade val="98000"/><a:lumMod val="102000"/></a:schemeClr></a:gs>
+            <a:gs pos="50000"><a:schemeClr val="phClr"><a:tint val="98000"/><a:satMod val="130000"/><a:shade val="90000"/><a:lumMod val="103000"/></a:schemeClr></a:gs>
+            <a:gs pos="100000"><a:schemeClr val="phClr"><a:shade val="63000"/><a:satMod val="120000"/></a:schemeClr></a:gs>
+          </a:gsLst>
+          <a:lin ang="5400000" scaled="0"/>
+        </a:gradFill>
+      </a:bgFillStyleLst>
+    </a:fmtScheme>
+  </a:themeElements>
+  <a:objectDefaults/>
+  <a:extraClrSchemeLst/>
+  <a:extLst>
+    <a:ext uri="{05A4C25C-085E-4340-85A3-A5531E510DB2}">
+      <thm15:themeFamily xmlns:thm15="http://schemas.microsoft.com/office/thememl/2012/main" name="Office Theme" id="{62F939B6-93AF-4DB8-9C6B-D6C7DFDC589F}" vid="{4A3C46E8-61CC-4603-A589-7422A47A8E4A}"/>
+    </a:ext>
+  </a:extLst>
 </a:theme>`;
     }
 }