@adobe/helix-md2docx 1.3.9 → 1.4.0

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+# [1.4.0](https://github.com/adobe/helix-md2docx/compare/v1.3.11...v1.4.0) (2022-03-24)
+
+
+### Features
+
+* new docx template ([e8a96b7](https://github.com/adobe/helix-md2docx/commit/e8a96b7035d1c6c804bf9c3c8b748c432e1f5421))
+
+## [1.3.11](https://github.com/adobe/helix-md2docx/compare/v1.3.10...v1.3.11) (2022-03-24)
+
+
+### Bug Fixes
+
+* handle row and colspan ([7077d4f](https://github.com/adobe/helix-md2docx/commit/7077d4f99957741885cdc1be39d6f23fa0cb88fa)), closes [#47](https://github.com/adobe/helix-md2docx/issues/47)
+
+## [1.3.10](https://github.com/adobe/helix-md2docx/compare/v1.3.9...v1.3.10) (2022-03-20)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @adobe/helix-fetch to v3.0.7 ([f211f44](https://github.com/adobe/helix-md2docx/commit/f211f4483dd6687e310e98c8b9793f65fa2f1893))
+
 ## [1.3.9](https://github.com/adobe/helix-md2docx/compare/v1.3.8...v1.3.9) (2022-03-18)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-md2docx",
-  "version": "1.3.9",
+  "version": "1.4.0",
   "description": "Helix Service that converts markdown to word documents",
   "main": "src/index.js",
   "type": "module",
@@ -27,7 +27,7 @@
   },
   "homepage": "https://github.com/adobe/helix-md2docx#readme",
   "dependencies": {
-    "@adobe/helix-fetch": "3.0.6",
+    "@adobe/helix-fetch": "3.0.7",
     "@adobe/helix-markdown-support": "3.1.2",
     "@adobe/helix-shared-process-queue": "1.1.4",
     "@adobe/helix-docx2md": "1.0.10",
@@ -43,7 +43,7 @@
   },
   "devDependencies": {
     "@adobe/eslint-config-helix": "1.3.2",
-    "@adobe/helix-mediahandler": "1.0.11",
+    "@adobe/helix-mediahandler": "1.0.13",
     "@semantic-release/changelog": "6.0.1",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",
@@ -57,7 +57,7 @@
     "fs-extra": "10.0.1",
     "husky": "7.0.4",
     "junit-report-builder": "3.0.0",
-    "lint-staged": "12.3.5",
+    "lint-staged": "12.3.7",
     "mocha": "9.2.2",
     "mocha-multi-reporters": "1.5.1",
     "semantic-release": "19.0.2",

package/src/mdast2docx/handlers/table.js

@@ -21,24 +21,32 @@ const { Paragraph, Table, WidthType } = docx;
 // decimal or a percent, so a % symbol should be included when type="pct".
 
 export default async function table(ctx, node) {
+  let numCols = node.maxCols;
+  if (node.children.length > 0) {
+    // eslint-disable-next-line no-param-reassign
+    node.children[0].tableHeader = true;
+    if (!numCols) {
+      numCols = node.children[0].children.length;
+    }
+  }
+
   const oldTable = ctx.table;
   ctx.table = {
-    // remember the table width (the column width will be calculated in the tableRow handler)
+    // remember the table width
     // default width: Letter Width - Margin = 8.5" - 2" = 6.5". the unit is 1/1440 inches.
-    width: oldTable ? oldTable.columnWidth : 1440 * 6.5,
+    width: oldTable?.columnWidth || 1440 * 6.5,
     align: node.align || [],
   };
+
+  // use the same width for all columns
+  ctx.table.columnWidth = numCols ? (ctx.table.width / numCols) : ctx.table.width;
+  const columnWidths = new Array(numCols).fill(Math.round(ctx.table.columnWidth));
+
   // process the rows
   const rows = await all(ctx, node);
 
-  // and remember the column width
-  const { columnWidth } = ctx.table;
   ctx.table = oldTable;
 
-  // use the same width for all columns
-  const numCols = rows.length ? rows[0].CellCount : 0;
-  const columnWidths = new Array(numCols).fill(Math.round(columnWidth));
-
   const tbl = new Table({
     style: 'PageBlock',
     rows,

package/src/mdast2docx/handlers/tableCell.js

@@ -13,7 +13,7 @@ import docx from 'docx';
 import all from '../all.js';
 
 const {
-  AlignmentType, Paragraph, Table, TableCell,
+  AlignmentType, Paragraph, Table, TableCell, ShadingType,
 } = docx;
 
 const ALIGN = {
@@ -45,7 +45,24 @@ export default async function tableCell(ctx, node, parent, siblings) {
     content.push(new Paragraph({ alignment, children: leaves }));
   }
 
-  return new TableCell({
+  const opts = {
     children: content,
-  });
+  };
+
+  if (node.data?.colSpan) {
+    opts.columnSpan = node.data.colSpan;
+  }
+  if (node.data?.rowSpan) {
+    opts.rowSpan = node.data.rowSpan;
+  }
+
+  if (parent.tableHeader) {
+    // shading for header row
+    opts.shading = {
+      fill: 'F4CCCD', // color defined in styles.xml (PageBlock table style)
+      type: ShadingType.CLEAR,
+      color: 'auto',
+    };
+  }
+  return new TableCell(opts);
 }

package/src/mdast2docx/handlers/tableRow.js

@@ -14,15 +14,10 @@ import all from '../all.js';
 
 const { TableRow } = docx;
 
-export default async function tableRow(ctx, node, parent, siblings) {
-  // adjust columnWidth
-  if (!ctx.table.columnWidth) {
-    ctx.table.columnWidth = ctx.table.width / node.children.length;
-  }
-
+export default async function tableRow(ctx, node) {
   const children = await all(ctx, node);
   return new TableRow({
     children,
-    tableHeader: siblings.length === 0,
+    // tableHeader: node.tableHeader,
   });
 }

package/src/mdast2docx/hast-table-cell-handler.js

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/*
+   copied and adapted (adding align) from
+   https://github.com/syntax-tree/hast-util-to-mdast/blob/main/lib/handlers/table-cell.js
+ */
+
+'use strict';
+
+import { all } from 'hast-util-to-mdast/lib/all.js';
+
+export default function cell(h, node) {
+  const wrap = h.wrapText;
+
+  // eslint-disable-next-line no-param-reassign
+  h.wrapText = false;
+
+  const result = h(node, 'tableCell', all(h, node));
+
+  if (node.properties?.rowSpan || node.properties?.colSpan || node.properties?.align) {
+    const data = result.data || (result.data = {});
+    if (node.properties.rowSpan) {
+      data.rowSpan = node.properties.rowSpan;
+    }
+    if (node.properties.colSpan) {
+      data.colSpan = node.properties.colSpan;
+    }
+    if (node.properties.align) {
+      data.align = node.properties.align;
+    }
+  }
+  // eslint-disable-next-line no-param-reassign
+  h.wrapText = wrap;
+
+  return result;
+}

package/src/mdast2docx/hast-table-handler.js

@@ -12,56 +12,15 @@
 
 'use strict';
 
-import { convertElement } from 'hast-util-is-element';
-import { visit } from 'unist-util-visit';
 import { all } from 'hast-util-to-mdast/lib/all.js';
 
-const thead = convertElement('thead');
-const tr = convertElement('tr');
-const cell = convertElement(['th', 'td']);
-
 /*
    copied and adapted from
-   https://github.com/syntax-tree/hast-util-to-mdast/blob/7.1.3/lib/handlers/table.js
+   https://github.com/syntax-tree/hast-util-to-mdast/blob/main/lib/handlers/table.js
  */
 
-// Infer whether the HTML table has a head and how it aligns.
-function inspect(node) {
-  let headless = true;
-  const align = [];
-  let rowIndex = 0;
-  let cellIndex = 0;
-
-  function visitor(child) {
-    // If there is a `thead`, assume there is a header row.
-    if (thead(child)) {
-      headless = false;
-    } else if (tr(child)) {
-      rowIndex += 1;
-      cellIndex = 0;
-    } else if (cell(child)) {
-      if (align[cellIndex] === undefined) {
-        align[cellIndex] = child.properties.align || null;
-      }
-
-      // If there is a th in the first row, assume there is a header row.
-      if (headless && rowIndex < 2 && child.tagName === 'th') {
-        headless = false;
-      }
-
-      cellIndex += 1;
-      return visit.SKIP;
-    }
-    return visit.CONTINUE;
-  }
-
-  visit(node, 'element', visitor);
-
-  return { align, headless };
-}
-
 // Ensure the cells in a row are properly structured.
-function toCells(children, info) {
+function toCells(children) {
   const nodes = [];
   let queue;
 
@@ -93,25 +52,14 @@ function toCells(children, info) {
     node.children = node.children.concat(queue);
   }
 
-  // add empty cells if there are more in the table
-  for (let index = nodes.length; index < info.align.length; index += 1) {
-    nodes.push({ type: 'tableCell', children: [] });
-  }
-
   return nodes;
 }
 
 // Ensure the rows are properly structured.
-function toRows(children, info) {
+function toRows(children) {
   const nodes = [];
   let queue;
 
-  // Add an empty header row.
-  // we don't need extra header rows
-  // if (info.headless) {
-  //   nodes.push({ type: 'tableRow', children: [] });
-  // }
-
   children.forEach((node) => {
     if (node.type === 'tableRow') {
       if (queue) {
@@ -133,13 +81,46 @@ function toRows(children, info) {
   }
   nodes.forEach((node) => {
     // eslint-disable-next-line no-param-reassign
-    node.children = toCells(node.children, info);
+    node.children = toCells(node.children);
   });
 
   return nodes;
 }
 
 export default function table(h, node) {
-  const info = inspect(node);
-  return h(node, 'table', { align: info.align }, toRows(all(h, node), info));
+  const mdNode = h(node, 'table', toRows(all(h, node)));
+
+  // clean up table in respect to row and colspan and compute alignments
+  mdNode.align = [];
+
+  // compute the number of cells in each row, respecting the row and col spans.
+  mdNode.maxCols = 0;
+  const pendingRowSpans = [];
+  for (const row of mdNode.children) {
+    row.numCols = pendingRowSpans.shift() || 0;
+    for (const cell of row.children) {
+      const rowSpan = Number.parseInt(cell.data?.rowSpan || '1', 10);
+      const colSpan = Number.parseInt(cell.data?.colSpan || '1', 10);
+      if (cell.data?.align && !mdNode.align[row.numCols]) {
+        mdNode.align[row.numCols] = cell.data.align;
+      }
+      row.numCols += colSpan;
+      if (rowSpan > 1) {
+        for (let i = 0; i < rowSpan - 1; i += 1) {
+          pendingRowSpans[i] = (pendingRowSpans[i] || 0) + colSpan;
+        }
+      }
+    }
+    mdNode.maxCols = Math.max(mdNode.maxCols, row.numCols);
+  }
+
+  // add empty cells if needed
+  for (const row of mdNode.children) {
+    for (let i = row.numCols; i < mdNode.maxCols; i += 1) {
+      row.children.push({ type: 'tableCell', children: [] });
+    }
+    delete row.numCols;
+  }
+
+  return mdNode;
 }

package/src/mdast2docx/mdast-sanitize-html.js

@@ -15,6 +15,7 @@ import parse from 'rehype-parse';
 import { toMdast } from 'hast-util-to-mdast';
 // import inspect from 'unist-util-inspect';
 import tableHandler from './hast-table-handler.js';
+import tableCellHandler from './hast-table-cell-handler.js';
 
 /**
  * Creates simple format handler
@@ -90,6 +91,8 @@ export default function sanitizeHtml(tree) {
           sup: formatHandler('superScript'),
           table: tableHandler,
           markdown: mdHandler(mdInserts),
+          th: tableCellHandler,
+          td: tableCellHandler,
         },
       });
 

package/src/mdast2docx/template/[Content_Types].xml

@@ -1,41 +1,39 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">
-    <Default Extension="png" ContentType="image/png"/>
-    <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/numbering.xml"
-              ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml"/>
-    <Override PartName="/word/styles.xml"
-              ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.styles+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/footnotes.xml"
-              ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml"/>
-    <Override PartName="/word/endnotes.xml"
-              ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml"/>
-    <Override PartName="/word/header1.xml"
-              ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml"/>
-    <Override PartName="/word/header2.xml"
-              ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml"/>
-    <Override PartName="/word/footer1.xml"
-              ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml"/>
-    <Override PartName="/word/footer2.xml"
-              ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml"/>
-    <Override PartName="/word/header3.xml"
-              ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml"/>
-    <Override PartName="/word/footer3.xml"
-              ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml"/>
-    <Override PartName="/word/fontTable.xml"
-              ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+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>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">
+  <Default
+      Extension="png"
+      ContentType="image/png"/>
+  <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/numbering.xml"
+      ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml"/>
+  <Override
+      PartName="/word/styles.xml"
+      ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.styles+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/fontTable.xml"
+      ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+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>

package/src/mdast2docx/template/docProps/app.xml

@@ -1,20 +1,40 @@
-<?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">
-    <Template>template.dotx</Template>
-    <TotalTime>6</TotalTime>
-    <Pages>2</Pages>
-    <Words>222</Words>
-    <Characters>1266</Characters>
-    <Application>Microsoft Office Word</Application>
-    <DocSecurity>0</DocSecurity>
-    <Lines>10</Lines>
-    <Paragraphs>2</Paragraphs>
-    <ScaleCrop>false</ScaleCrop>
-    <Company></Company>
-    <LinksUpToDate>false</LinksUpToDate>
-    <CharactersWithSpaces>1486</CharactersWithSpaces>
-    <SharedDoc>false</SharedDoc>
-    <HyperlinksChanged>false</HyperlinksChanged>
-    <AppVersion>16.0000</AppVersion>
-</Properties>
+<?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">
+  <Template>Normal.dotm</Template>
+  <TotalTime>51</TotalTime>
+  <Pages>3</Pages>
+  <Words>271</Words>
+  <Characters>1545</Characters>
+  <Application>Microsoft Office Word</Application>
+  <DocSecurity>0</DocSecurity>
+  <Lines>12</Lines>
+  <Paragraphs>3</Paragraphs>
+  <ScaleCrop>false</ScaleCrop>
+  <HeadingPairs>
+    <vt:vector
+        size="2"
+        baseType="variant">
+      <vt:variant>
+        <vt:lpstr>Title</vt:lpstr>
+      </vt:variant>
+      <vt:variant>
+        <vt:i4>1</vt:i4>
+      </vt:variant>
+    </vt:vector>
+  </HeadingPairs>
+  <TitlesOfParts>
+    <vt:vector
+        size="1"
+        baseType="lpstr">
+      <vt:lpstr></vt:lpstr>
+    </vt:vector>
+  </TitlesOfParts>
+  <Company></Company>
+  <LinksUpToDate>false</LinksUpToDate>
+  <CharactersWithSpaces>1813</CharactersWithSpaces>
+  <SharedDoc>false</SharedDoc>
+  <HyperlinksChanged>false</HyperlinksChanged>
+  <AppVersion>16.0000</AppVersion>
+</Properties>

package/src/mdast2docx/template/docProps/core.xml

@@ -1,12 +1,12 @@
-<?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:creator>Tobias Bocanegra</dc:creator>
-    <cp:lastModifiedBy>Tobias Bocanegra</cp:lastModifiedBy>
-    <cp:revision>3</cp:revision>
-    <dcterms:created xsi:type="dcterms:W3CDTF">2021-03-19T03:32:00Z</dcterms:created>
-    <dcterms:modified xsi:type="dcterms:W3CDTF">2021-04-02T02:45:00Z</dcterms:modified>
-</cp:coreProperties>
+<?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">
+  <cp:lastModifiedBy>Alexandre Capt</cp:lastModifiedBy>
+  <cp:revision>29</cp:revision>
+  <dcterms:created xsi:type="dcterms:W3CDTF">2022-03-23T14:16:00Z</dcterms:created>
+  <dcterms:modified xsi:type="dcterms:W3CDTF">2022-03-24T09:17:00Z</dcterms:modified>
+</cp:coreProperties>

package/src/mdast2docx/template/word/_rels/document.xml.rels

@@ -1,51 +1,36 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
-    <Relationship Id="rId8"
-                  Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"
-                  Target="media/image1.png"/>
-    <Relationship Id="rId13"
-                  Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/header"
-                  Target="header3.xml"/>
-    <Relationship Id="rId3"
-                  Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings"
-                  Target="settings.xml"/>
-    <Relationship Id="rId7"
-                  Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink"
-                  Target="https://www.adobe.com/" TargetMode="External"/>
-    <Relationship Id="rId12"
-                  Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer"
-                  Target="footer2.xml"/>
-    <Relationship Id="rId2"
-                  Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles"
-                  Target="styles.xml"/>
-    <Relationship Id="rId16"
-                  Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme"
-                  Target="theme/theme1.xml"/>
-    <Relationship Id="rId1"
-                  Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering"
-                  Target="numbering.xml"/>
-    <Relationship Id="rId6"
-                  Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/endnotes"
-                  Target="endnotes.xml"/>
-    <Relationship Id="rId11"
-                  Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer"
-                  Target="footer1.xml"/>
-    <Relationship Id="rId5"
-                  Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes"
-                  Target="footnotes.xml"/>
-    <Relationship Id="rId15"
-                  Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable"
-                  Target="fontTable.xml"/>
-    <Relationship Id="rId10"
-                  Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/header"
-                  Target="header2.xml"/>
-    <Relationship Id="rId4"
-                  Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/webSettings"
-                  Target="webSettings.xml"/>
-    <Relationship Id="rId9"
-                  Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/header"
-                  Target="header1.xml"/>
-    <Relationship Id="rId14"
-                  Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer"
-                  Target="footer3.xml"/>
-</Relationships>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
+  <Relationship
+      Id="rId8"
+      Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme"
+      Target="theme/theme1.xml"/>
+  <Relationship
+      Id="rId3"
+      Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings"
+      Target="settings.xml"/>
+  <Relationship
+      Id="rId7"
+      Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable"
+      Target="fontTable.xml"/>
+  <Relationship
+      Id="rId2"
+      Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles"
+      Target="styles.xml"/>
+  <Relationship
+      Id="rId1"
+      Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering"
+      Target="numbering.xml"/>
+  <Relationship
+      Id="rId6"
+      Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"
+      Target="media/image1.png"/>
+  <Relationship
+      Id="rId5"
+      Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink"
+      Target="https://www.adobe.com/"
+      TargetMode="External"/>
+  <Relationship
+      Id="rId4"
+      Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/webSettings"
+      Target="webSettings.xml"/>
+</Relationships>