Version bump

#1303 Re-name methods to be full english words
Merge pull request #1313 from dolanmiu/dependabot/npm_and_yarn/prettier-2.5.0
2021-11-26 15:07:51 +00:00 · 2021-11-26 15:07:15 +00:00 · 2021-11-26 15:01:47 +00:00 · 2021-11-26 15:01:40 +00:00 · 2021-11-26 15:01:33 +00:00 · 2021-11-26 15:01:25 +00:00
320 changed files with 27631 additions and 9471 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -0,0 +1,40 @@
 version: 2
 updates:
 - package-ecosystem: npm
  directory: "/"
  schedule:
    interval: daily
  open-pull-requests-limit: 10
  ignore:
  - dependency-name: "@types/node"
    versions:
    - 14.14.22
    - 14.14.24
    - 14.14.25
    - 14.14.26
    - 14.14.28
    - 14.14.29
    - 14.14.30
    - 15.0.0
  - dependency-name: webpack
    versions:
    - 5.31.2
    - 5.35.0
  - dependency-name: ts-loader
    versions:
    - 9.1.0
  - dependency-name: awesome-typescript-loader
    versions:
    - 5.2.1
  - dependency-name: chai
    versions:
    - 4.2.0
    - 4.3.0
    - 4.3.1
    - 4.3.3
  - dependency-name: replace-in-file
    versions:
    - 6.1.0
  - dependency-name: "@types/chai"
    versions:
    - 4.2.14
--- a/.github/workflows/default.yml
+++ b/.github/workflows/default.yml
@ -33,6 +33,11 @@ jobs:
              run: npm ci
            - name: Test
              run: npm run test.coverage
            - name: Codecov
              uses: codecov/codecov-action@v1
              with:
                  fail_ci_if_error: true
                  verbose: true
    lint:
        name: Lint
        runs-on: ubuntu-latest
@ -53,82 +58,3 @@ jobs:
              run: npm ci
            - name: Prettier
              run: npm run style
    demos:
        name: Run Demos
        needs: [build]
        runs-on: ubuntu-latest
        steps:
            - name: Checkout Repo
              uses: actions/checkout@master
            - name: Install Dependencies
              run: npm ci
            - name: Download Artifact
              uses: actions/download-artifact@master
              with:
                  name: build
                  path: build
            - name: Run demos
              run: |
                  npm run ts-node -- ./demo/1-basic.ts
                  npm run ts-node -- ./demo/2-declaritive-styles.ts
                  npm run ts-node -- ./demo/3-numbering-and-bullet-points.ts
                  npm run ts-node -- ./demo/4-basic-table.ts
                  npm run ts-node -- ./demo/5-images.ts
                  npm run ts-node -- ./demo/6-page-borders.ts
                  npm run ts-node -- ./demo/7-landscape.ts
                  npm run ts-node -- ./demo/8-header-footer.ts
                  npm run ts-node -- ./demo/9-images-in-header-and-footer.ts
                  npm run ts-node -- ./demo/10-my-cv.ts
                  npm run ts-node -- ./demo/11-declaritive-styles-2.ts
                  npm run ts-node -- ./demo/12-scaling-images.ts
                  npm run ts-node -- ./demo/13-xml-styles.ts
                  npm run ts-node -- ./demo/14-page-numbers.ts
                  npm run ts-node -- ./demo/15-page-break-before.ts
                  npm run ts-node -- ./demo/16-multiple-sections.ts
                  npm run ts-node -- ./demo/17-footnotes.ts
                  npm run ts-node -- ./demo/18-image-from-buffer.ts
                  npm run ts-node -- ./demo/19-export-to-base64.ts
                  npm run ts-node -- ./demo/20-table-cell-borders.ts
                  npm run ts-node -- ./demo/21-bookmarks.ts
                  npm run ts-node -- ./demo/22-right-to-left-text.ts
                  npm run ts-node -- ./demo/23-base64-images.ts
                  npm run ts-node -- ./demo/24-images-to-table-cell.ts
                  npm run ts-node -- ./demo/25-table-xml-styles.ts
                  npm run ts-node -- ./demo/26-paragraph-borders.ts
                  npm run ts-node -- ./demo/27-declaritive-styles-3.ts
                  npm run ts-node -- ./demo/28-table-of-contents.ts
                  npm run ts-node -- ./demo/29-numbered-lists.ts
                  npm run ts-node -- ./demo/30-template-document.ts
                  npm run ts-node -- ./demo/31-tables.ts
                  npm run ts-node -- ./demo/32-merge-and-shade-table-cells.ts
                  npm run ts-node -- ./demo/33-sequential-captions.ts
                  npm run ts-node -- ./demo/34-floating-tables.ts
                  npm run ts-node -- ./demo/35-hyperlinks.ts
                  npm run ts-node -- ./demo/36-image-to-table-cell.ts
                  npm run ts-node -- ./demo/37-images-to-header-and-footer.ts
                  npm run ts-node -- ./demo/38-text-wrapping.ts
                  npm run ts-node -- ./demo/39-page-numbers.ts
                  npm run ts-node -- ./demo/40-line-numbers.ts
                  npm run ts-node -- ./demo/41-merge-table-cells-2.ts
                  npm run ts-node -- ./demo/42-restart-page-numbers.ts
                  npm run ts-node -- ./demo/43-images-to-table-cell-2.ts
                  npm run ts-node -- ./demo/44-multiple-columns.ts
                  npm run ts-node -- ./demo/45-highlighting-text.ts
                  npm run ts-node -- ./demo/46-shading-text.ts
                  npm run ts-node -- ./demo/47-number-of-total-pages-section.ts
                  npm run ts-node -- ./demo/48-vertical-align.ts
                  npm run ts-node -- ./demo/49-table-borders.ts
                  npm run ts-node -- ./demo/50-readme-demo.ts
                  npm run ts-node -- ./demo/51-character-styles.ts
                  npm run ts-node -- ./demo/52-japanese.ts
                  npm run ts-node -- ./demo/53-chinese.ts
                  npm run ts-node -- ./demo/54-custom-properties.ts
                  npm run ts-node -- ./demo/55-math.ts
                  npm run ts-node -- ./demo/56-background-color.ts
                  npm run ts-node -- ./demo/57-add-parent-numbered-lists.ts
                  npm run ts-node -- ./demo/58-section-types.ts
                  npm run ts-node -- ./demo/59-header-footer-margins.ts
                  npm run ts-node -- ./demo/60-track-revisions.ts
                  npm run ts-node -- ./demo/61-text-frame.ts
                  npm run ts-node -- ./demo/62-paragraph-spacing.ts
                  npm run ts-node -- ./demo/63-odd-even-header-footer.ts
--- a/.github/workflows/demos.yml
+++ b/.github/workflows/demos.yml
@ -0,0 +1,690 @@
 name: Demos
 on:
    push:
        branches:
            - master
    pull_request:
        branches:
            - master
 jobs:
    build:
        name: Build
        runs-on: ubuntu-latest
        steps:
            - name: Checkout Repo
              uses: actions/checkout@master
            - name: Install Dependencies
              run: npm ci
            - name: Build
              run: npm run build
            - name: Archive Production Artifact
              uses: actions/upload-artifact@master
              with:
                  name: build
                  path: build
    demos:
        name: Run Demos and Validate
        needs: [build]
        runs-on: ubuntu-latest
        steps:
            - name: Checkout Repo
              uses: actions/checkout@master
            - name: Install Dependencies
              run: npm ci
            - name: Download Artifact
              uses: actions/download-artifact@master
              with:
                  name: build
                  path: build
            - name: Run Demo
              run: npm run ts-node -- ./demo/1-basic.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/2-declaritive-styles.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/3-numbering-and-bullet-points.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/4-basic-table.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/5-images.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/6-page-borders.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/7-landscape.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/8-header-footer.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/9-images-in-header-and-footer.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/10-my-cv.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/11-declaritive-styles-2.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/12-scaling-images.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/13-xml-styles.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/14-page-numbers.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/15-page-break-before.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/16-multiple-sections.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/17-footnotes.ts
            - name: Extract Word Document
              run: npm run extract
            # element r: Schemas validity error : Element '{http://schemas.openxmlformats.org/wordprocessingml/2006/main}r': This element is not expected.
            # - name: Validate XML
            #   uses: ChristophWurst/xmllint-action@v1
            #   with:
            #     xml-file: build/extracted-doc/word/document.xml
            #     xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/18-image-from-buffer.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/19-export-to-base64.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/20-table-cell-borders.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/21-bookmarks.ts
            - name: Extract Word Document
              run: npm run extract
            # Bad ID - need numeric ID
            # - name: Validate XML
            #   uses: ChristophWurst/xmllint-action@v1
            #   with:
            #     xml-file: build/extracted-doc/word/document.xml
            #     xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/22-right-to-left-text.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/23-base64-images.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/24-images-to-table-cell.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/25-table-xml-styles.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/26-paragraph-borders.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/27-declaritive-styles-3.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/28-table-of-contents.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/29-numbered-lists.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/30-template-document.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/31-tables.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/32-merge-and-shade-table-cells.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/33-sequential-captions.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/34-floating-tables.ts
            - name: Extract Word Document
              run: npm run extract
            # element tblpPr: Schemas validity error : Element '{http://schemas.openxmlformats.org/wordprocessingml/2006/main}tblpPr', attribute 'overlap': The attribute 'overlap' is not allowed.
            # element tblpPr: Schemas validity error : Element '{http://schemas.openxmlformats.org/wordprocessingml/2006/main}tblpPr': Element content is not allowed, because the content type is empty.
            # - name: Validate XML
            #   uses: ChristophWurst/xmllint-action@v1
            #   with:
            #     xml-file: build/extracted-doc/word/document.xml
            #     xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/35-hyperlinks.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/36-image-to-table-cell.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/37-images-to-header-and-footer.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/38-text-wrapping.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/39-page-numbers.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/40-line-numbers.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/41-merge-table-cells-2.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/42-restart-page-numbers.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/43-images-to-table-cell-2.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/44-multiple-columns.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/45-highlighting-text.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/46-shading-text.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/47-number-of-total-pages-section.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/48-vertical-align.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/49-table-borders.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/50-readme-demo.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/51-character-styles.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/52-japanese.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/53-chinese.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/54-custom-properties.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/55-math.ts
            - name: Extract Word Document
              run: npm run extract
            #: element subHide: Schemas validity error : Element '{http://schemas.openxmlformats.org/officeDocument/2006/math}subHide': This element is not expected. Expected is ( {http://schemas.openxmlformats.org/officeDocument/2006/math}ctrlPr ).
            #: element e: Schemas validity error : Element '{http://schemas.openxmlformats.org/officeDocument/2006/math}e': This element is not expected. Expected is ( {http://schemas.openxmlformats.org/officeDocument/2006/math}sub ).
            #: element e: Schemas validity error : Element '{http://schemas.openxmlformats.org/officeDocument/2006/math}e': This element is not expected. Expected is ( {http://schemas.openxmlformats.org/officeDocument/2006/math}sup ).
            #: element e: Schemas validity error : Element '{http://schemas.openxmlformats.org/officeDocument/2006/math}e': This element is not expected. Expected is ( {http://schemas.openxmlformats.org/officeDocument/2006/math}sub ).
            # - name: Validate XML
            #   uses: ChristophWurst/xmllint-action@v1
            #   with:
            #     xml-file: build/extracted-doc/word/document.xml
            #     xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/56-background-color.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/57-add-parent-numbered-lists.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/58-section-types.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/59-header-footer-margins.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/60-track-revisions.ts
            - name: Extract Word Document
              run: npm run extract
            # element r: Schemas validity error : Element '{http://schemas.openxmlformats.org/wordprocessingml/2006/main}r': This element is not expected.
            # - name: Validate XML
            #   uses: ChristophWurst/xmllint-action@v1
            #   with:
            #     xml-file: build/extracted-doc/word/document.xml
            #     xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/61-text-frame.ts
            - name: Extract Word Document
              run: npm run extract
            # element left: Schemas validity error : Element '{http://schemas.openxmlformats.org/wordprocessingml/2006/main}left': This element is not expected. Expected is one of ( {http://schemas.openxmlformats.org/wordprocessingml/2006/main}right, {http://schemas.openxmlformats.org/wordprocessingml/2006/main}between, {http://schemas.openxmlformats.org/wordprocessingml/2006/main}bar ).
            # - name: Validate XML
            #   uses: ChristophWurst/xmllint-action@v1
            #   with:
            #     xml-file: build/extracted-doc/word/document.xml
            #     xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/62-paragraph-spacing.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/63-odd-even-header-footer.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/64-complex-numbering-text.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/65-page-sizes.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/66-fields.ts
            - name: Extract Word Document
              run: npm run extract
            # element bookmarkStart: Schemas validity error : Element '{http://schemas.openxmlformats.org/wordprocessingml/2006/main}bookmarkStart', attribute '{http://schemas.openxmlformats.org/wordprocessingml/2006/main}id': '-irrswq-ln94j4fdgdjxs' is not a valid value of the atomic type '{http://schemas.openxmlformats.org/wordprocessingml/2006/main}ST_DecimalNumber'.
            # element bookmarkEnd: Schemas validity error : Element '{http://schemas.openxmlformats.org/wordprocessingml/2006/main}bookmarkEnd', attribute '{http://schemas.openxmlformats.org/wordprocessingml/2006/main}id': '-irrswq-ln94j4fdgdjxs' is not a valid value of the atomic type '{http://schemas.openxmlformats.org/wordprocessingml/2006/main}ST_DecimalNumber'.
            # - name: Validate XML
            #   uses: ChristophWurst/xmllint-action@v1
            #   with:
            #     xml-file: build/extracted-doc/word/document.xml
            #     xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/67-column-break.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/68-numbering-instances-and-starting-number.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/69-different-width-columns.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/70-line-numbers-suppression.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
            - name: Run Demo
              run: npm run ts-node -- ./demo/71-page-borders-2.ts
            - name: Extract Word Document
              run: npm run extract
            - name: Validate XML
              uses: ChristophWurst/xmllint-action@v1
              with:
                  xml-file: build/extracted-doc/word/document.xml
                  xml-schema-file: ooxml-schemas/microsoft/wml-2010.xsd
--- a/.github/workflows/github-pages.yml
+++ b/.github/workflows/github-pages.yml
@ -0,0 +1,43 @@
 name: Github Pages
 on:
    push:
        branches:
            - master
 jobs:
    build:
        name: Build
        runs-on: ubuntu-latest
        steps:
            - name: Checkout Repo
              uses: actions/checkout@master
            - name: Install Dependencies
              run: npm ci
            - name: Build 🔧
              run: |
                  npm run typedoc
                  echo "docx.js.org" > docs/.nojekyll
                  echo "docx.js.org" > docs/CNAME
            - name: Archive Production Artifact
              uses: actions/upload-artifact@master
              with:
                  name: docs
                  path: docs
    deploy:
        needs: [build]
        runs-on: ubuntu-latest
        steps:
            - name: Checkout Repo 🛎️
              uses: actions/checkout@master
            - name: Install Dependencies
              run: npm ci
            - name: Download Artifact
              uses: actions/download-artifact@master
              with:
                  name: docs
                  path: docs
            - name: Deploy 🚀
              uses: JamesIves/github-pages-deploy-action@4.1.5
              with:
                  branch: gh-pages
                  folder: docs
--- a/.github/workflows/remove-old-artifacts.yml
+++ b/.github/workflows/remove-old-artifacts.yml
@ -0,0 +1,26 @@
 name: Remove old artifacts
 on:
  schedule:
    # Every day at 1am
    - cron: "0 1 * * *"
  workflow_dispatch:
    inputs:
      logLevel:
        description: "Log level"
        required: true
        default: "warning"
 jobs:
  remove-old-artifacts:
    runs-on: ubuntu-latest
    timeout-minutes: 10
    steps:
      - name: Remove old artifacts
        uses: c-hive/gha-remove-artifacts@v1
        with:
          age: "1 week"
          # Optional inputs
          # skip-tags: true
          # skip-recent: 5
--- a/.nycrc
+++ b/.nycrc
@ -1,9 +1,9 @@
 {
  "check-coverage": true,
-  "lines": 98.86,
+  "lines": 99.32,
-  "functions": 97.86,
+  "functions": 99.11,
-  "branches": 95.86,
+  "branches": 96.27,
-  "statements": 98.86,
+  "statements": 99.32,
  "include": [
    "src/**/*.ts"
  ],
@ -21,6 +21,5 @@
  ],
  "cache": true,
  "all": true,
  "instrument": false,
  "sourceMap": true
 }
--- a/.travis.yml
+++ b/.travis.yml
@ -1,63 +0,0 @@
 language: node_js
 node_js:
  - 10
 install:
  - npm install
  - npm install -g codecov
 script:
  - npm run lint
  - npm run test.coverage
  - npm run style
  - npm run build
  - npm run ts-node -- ./demo/1-basic.ts
 #   - npm run e2e "My Document.docx"
  - npm run ts-node -- ./demo/2-declaritive-styles.ts
  - npm run ts-node -- ./demo/3-numbering-and-bullet-points.ts
  - npm run ts-node -- ./demo/4-basic-table.ts
  - npm run ts-node -- ./demo/5-images.ts
  - npm run ts-node -- ./demo/6-page-borders.ts
  - npm run ts-node -- ./demo/7-landscape.ts
  - npm run ts-node -- ./demo/8-header-footer.ts
  - npm run ts-node -- ./demo/9-images-in-header-and-footer.ts
  - npm run ts-node -- ./demo/10-my-cv.ts
 #   - npm run e2e "My Document.docx"
  - npm run ts-node -- ./demo/11-declaritive-styles-2.ts
  - npm run ts-node -- ./demo/12-scaling-images.ts
  - npm run ts-node -- ./demo/13-xml-styles.ts
  - npm run ts-node -- ./demo/14-page-numbers.ts
  - npm run ts-node -- ./demo/15-page-break-before.ts
  - npm run ts-node -- ./demo/16-multiple-sections.ts
  - npm run ts-node -- ./demo/17-footnotes.ts
  - npm run ts-node -- ./demo/18-image-from-buffer.ts
  - npm run ts-node -- ./demo/19-export-to-base64.ts
  - npm run ts-node -- ./demo/20-table-cell-borders.ts
  - npm run ts-node -- ./demo/21-bookmarks.ts
  - npm run ts-node -- ./demo/22-right-to-left-text.ts
  - npm run ts-node -- ./demo/23-base64-images.ts
  - npm run ts-node -- ./demo/24-images-to-table-cell.ts
 #   - npm run ts-node -- ./demo/demo25.ts
  - npm run ts-node -- ./demo/26-paragraph-borders.ts
  - npm run ts-node -- ./demo/27-declaritive-styles-3.ts
  - npm run ts-node -- ./demo/28-table-of-contents.ts
  - npm run ts-node -- ./demo/29-numbered-lists.ts
  - npm run ts-node -- ./demo/30-template-document.ts
  - npm run ts-node -- ./demo/31-tables.ts
  - npm run ts-node -- ./demo/32-merge-and-shade-table-cells.ts
 #   - npm run e2e "My Document.docx" // Need to fix
  - npm run ts-node -- ./demo/33-sequential-captions.ts
  - npm run ts-node -- ./demo/34-floating-tables.ts
 after_failure:
  - "cat /home/travis/builds/dolanmiu/docx/npm-debug.log"
 after_success:
  - npm run typedoc
  - echo "docx.js.org" > docs/.nojekyll
  - echo "docx.js.org" > docs/CNAME
  - codecov
 deploy:
  provider: pages
  skip-cleanup: true
  github-token: $GITHUB_TOKEN
  keep-history: true
  local-dir: docs
  on:
    branch: master
--- a/README.md
+++ b/README.md
@ -10,7 +10,6 @@
 [![NPM version][npm-image]][npm-url]
 [![Downloads per month][downloads-image]][downloads-url]
 [![Build Status][travis-image]][travis-url]
 [![GitHub Action Workflow Status][github-actions-workflow-image]][github-actions-workflow-url]
 [![Dependency Status][daviddm-image]][daviddm-url]
 [![Known Vulnerabilities][snky-image]][snky-url]
@ -103,8 +102,6 @@ Made with 💖
 [npm-url]: https://npmjs.org/package/docx
 [downloads-image]: https://img.shields.io/npm/dm/docx.svg
 [downloads-url]: https://npmjs.org/package/docx
 [travis-image]: https://travis-ci.org/dolanmiu/docx.svg?branch=master
 [travis-url]: https://travis-ci.org/dolanmiu/docx
 [github-actions-workflow-image]: https://github.com/dolanmiu/docx/workflows/Default/badge.svg
 [github-actions-workflow-url]: https://github.com/dolanmiu/docx/actions
 [daviddm-image]: https://david-dm.org/dolanmiu/docx.svg?theme=shields.io
--- a/demo/10-my-cv.ts
+++ b/demo/10-my-cv.ts
@ -9,7 +9,46 @@ const PHONE_NUMBER = "07534563401";
 const PROFILE_URL = "https://www.linkedin.com/in/dolan1";
 const EMAIL = "docx@com";
-const experiences = [
+interface Experience {
    readonly isCurrent: boolean;
    readonly summary: string;
    readonly title: string;
    readonly startDate: {
        readonly month: number;
        readonly year: number;
    };
    readonly endDate?: {
        readonly month: number;
        readonly year: number;
    };
    readonly company: {
        readonly name: string;
    };
 }
 interface Education {
    readonly degree: string;
    readonly fieldOfStudy: string;
    readonly notes: string;
    readonly schoolName: string;
    readonly startDate: {
        readonly year: number;
    };
    readonly endDate: {
        readonly year: number;
    };
 }
 interface Skill {
    readonly name: string;
 }
 interface Achivement {
    readonly issuer: string;
    readonly name: string;
 }
 const experiences: Experience[] = [
    {
        isCurrent: true,
        summary: "Full-stack developer working with Angular and Java. Working for the iShares platform",
@ -75,12 +114,11 @@ const experiences = [
    },
 ];
-const education = [
+const education: Education[] = [
    {
        degree: "Master of Science (MSc)",
        fieldOfStudy: "Computer Science",
-        notes:
+        notes: "Exam Results: 1st Class with Distinction, Dissertation: 1st Class with Distinction\n\nRelevant Courses: Java and C# Programming, Software Engineering, Artificial Intelligence, \nComputational Photography, Algorithmics, Architecture and Hardware.\n\nCreated a Windows 8 game in JavaScript for the dissertation. \n\nCreated an award-winning 3D stereoscopic game in C# using XNA.",
            "Exam Results: 1st Class with Distinction, Dissertation: 1st Class with Distinction\n\nRelevant Courses: Java and C# Programming, Software Engineering, Artificial Intelligence, \nComputational Photography, Algorithmics, Architecture and Hardware.\n\nCreated a Windows 8 game in JavaScript for the dissertation. \n\nCreated an award-winning 3D stereoscopic game in C# using XNA.",
        schoolName: "University College London",
        startDate: {
            year: 2012,
@ -92,8 +130,7 @@ const education = [
    {
        degree: "Bachelor of Engineering (BEng)",
        fieldOfStudy: "Material Science and Engineering",
-        notes:
+        notes: "Exam Results: 2:1, Dissertation: 1st Class with Distinction\n\nRelevant courses: C Programming, Mathematics and Business for Engineers.",
            "Exam Results: 2:1, Dissertation: 1st Class with Distinction\n\nRelevant courses: C Programming, Mathematics and Business for Engineers.",
        schoolName: "Imperial College London",
        startDate: {
            year: 2009,
@ -104,7 +141,7 @@ const education = [
    },
 ];
-const skills = [
+const skills: Skill[] = [
    {
        name: "Angular",
    },
@ -119,7 +156,7 @@ const skills = [
    },
 ];
-const achievements = [
+const achievements: Achivement[] = [
    {
        issuer: "Oracle",
        name: "Oracle Certified Expert",
@ -128,7 +165,7 @@ const achievements = [
 class DocumentCreator {
    // tslint:disable-next-line: typedef
-    public create([experiences, educations, skills, achivements]): Document {
+    public create([experiences, educations, skills, achivements]: [Experience[], Education[], Skill[], Achivement[]]): Document {
        const document = new Document({
            sections: [
                {
@ -193,8 +230,7 @@ class DocumentCreator {
                        ),
                        new Paragraph("More references upon request"),
                        new Paragraph({
-                            text:
+                            text: "This CV was generated in real-time based on my Linked-In profile from my personal website www.dolan.bio.",
                                "This CV was generated in real-time based on my Linked-In profile from my personal website www.dolan.bio.",
                            alignment: AlignmentType.CENTER,
                        }),
                    ],
--- a/demo/11-declaritive-styles-2.ts
+++ b/demo/11-declaritive-styles-2.ts
@ -15,6 +15,7 @@ import {
    TableRow,
    TabStopPosition,
    UnderlineType,
    LevelFormat,
 } from "../build";
 const table = new Table({
@ -51,6 +52,19 @@ const table = new Table({
 });
 const doc = new Document({
    numbering:{
        config:[{
            reference: 'ref1',
            levels: [
            {
                level: 0,
                format: LevelFormat.DECIMAL,
                text: '%1)',
                start: 50,
            }
            ],
        }]
    },
    styles: {
        default: {
            heading1: {
@ -155,6 +169,28 @@ const doc = new Document({
                    spacing: { line: 276, before: 20 * 72 * 0.1, after: 20 * 72 * 0.05 },
                },
            },
            {
                id: "numberedPara",
                name: "Numbered Para",
                basedOn: "Normal",
                next: "Normal",
                quickFormat: true,
                run: {
                    font: "Calibri",
                    size: 26,
                    bold: true,
                },
                paragraph: {
                    spacing: { line: 276, before: 20 * 72 * 0.1, after: 20 * 72 * 0.05 },
                    rightTabStop: TabStopPosition.MAX,
                    leftTabStop: 453.543307087,
                    numbering : {
                        reference: 'ref1',
                        instance: 0,
                        level: 0,
                    }
                },
            },
        ],
    },
    sections: [
@ -260,6 +296,14 @@ const doc = new Document({
                    text: "Test 2",
                    style: "normalPara2",
                }),
                new Paragraph({
                    text: "Numbered paragraph that has numbering attached to custom styles",
                    style: "numberedPara",
                }),
                new Paragraph({
                    text: "Numbered para would show up in the styles pane at Word",
                    style: "numberedPara",
                }),
            ],
        },
    ],
--- a/demo/16-multiple-sections.ts
+++ b/demo/16-multiple-sections.ts
@ -1,7 +1,7 @@
 // Multiple sections and headers
 // Import from 'docx' rather than '../build' if you install from npm
 import * as fs from "fs";
-import { Document, Footer, Header, Packer, PageNumber, PageNumberFormat, PageOrientation, Paragraph, TextRun } from "../build";
+import { Document, Footer, Header, Packer, PageNumber, NumberFormat, PageOrientation, Paragraph, TextRun } from "../build";
 const doc = new Document({
    sections: [
@ -13,7 +13,7 @@ const doc = new Document({
                page: {
                    pageNumbers: {
                        start: 1,
-                        formatType: PageNumberFormat.DECIMAL,
+                        formatType: NumberFormat.DECIMAL,
                    },
                },
            },
@ -38,7 +38,7 @@ const doc = new Document({
                    },
                    pageNumbers: {
                        start: 1,
-                        formatType: PageNumberFormat.DECIMAL,
+                        formatType: NumberFormat.DECIMAL,
                    },
                },
            },
@ -85,7 +85,7 @@ const doc = new Document({
                        orientation: PageOrientation.PORTRAIT,
                    },
                    pageNumbers: {
-                        formatType: PageNumberFormat.UPPER_ROMAN,
+                        formatType: NumberFormat.UPPER_ROMAN,
                    },
                },
            },
@ -116,7 +116,7 @@ const doc = new Document({
                    },
                    pageNumbers: {
                        start: 25,
-                        formatType: PageNumberFormat.DECIMAL,
+                        formatType: NumberFormat.DECIMAL,
                    },
                },
            },
--- a/demo/2-declaritive-styles.ts
+++ b/demo/2-declaritive-styles.ts
@ -24,7 +24,7 @@ const doc = new Document({
                    size: 28,
                    bold: true,
                    italics: true,
-                    color: "red",
+                    color: "FF0000",
                },
                paragraph: {
                    spacing: {
--- a/demo/20-table-cell-borders.ts
+++ b/demo/20-table-cell-borders.ts
@ -36,17 +36,17 @@ const doc = new Document({
                                        top: {
                                            style: BorderStyle.DASH_DOT_STROKED,
                                            size: 3,
-                                            color: "red",
+                                            color: "FF0000",
                                        },
                                        bottom: {
                                            style: BorderStyle.DOUBLE,
                                            size: 3,
-                                            color: "blue",
+                                            color: "0000FF",
                                        },
                                        left: {
                                            style: BorderStyle.DASH_DOT_STROKED,
                                            size: 3,
-                                            color: "green",
+                                            color: "00FF00",
                                        },
                                        right: {
                                            style: BorderStyle.DASH_DOT_STROKED,
--- a/demo/21-bookmarks.ts
+++ b/demo/21-bookmarks.ts
@ -1,7 +1,7 @@
 // This demo shows how to create bookmarks then link to them with internal hyperlinks
 // Import from 'docx' rather than '../build' if you install from npm
 import * as fs from "fs";
-import { Bookmark, Document, Footer, HeadingLevel, InternalHyperlink, Packer, PageBreak, Paragraph, TextRun } from "../build";
+import { Bookmark, Document, Footer, HeadingLevel, InternalHyperlink, Packer, PageBreak, Paragraph, TextRun, PageReference } from "../build";
 const LOREM_IPSUM =
    "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam mi velit, convallis convallis scelerisque nec, faucibus nec leo. Phasellus at posuere mauris, tempus dignissim velit. Integer et tortor dolor. Duis auctor efficitur mattis. Vivamus ut metus accumsan tellus auctor sollicitudin venenatis et nibh. Cras quis massa ac metus fringilla venenatis. Proin rutrum mauris purus, ut suscipit magna consectetur id. Integer consectetur sollicitudin ante, vitae faucibus neque efficitur in. Praesent ultricies nibh lectus. Mauris pharetra id odio eget iaculis. Duis dictum, risus id pellentesque rutrum, lorem quam malesuada massa, quis ullamcorper turpis urna a diam. Cras vulputate metus vel massa porta ullamcorper. Etiam porta condimentum nulla nec tristique. Sed nulla urna, pharetra non tortor sed, sollicitudin molestie diam. Maecenas enim leo, feugiat eget vehicula id, sollicitudin vitae ante.";
@ -18,10 +18,12 @@ const doc = new Document({
                        new Paragraph({
                            children: [
                                new InternalHyperlink({
-                                    child: new TextRun({
+                                    children: [
                                        new TextRun({
                                            text: "Click here!",
                                            style: "Hyperlink",
                                        }),
                                    ],
                                    anchor: "myAnchorId",
                                }),
                            ],
@ -47,14 +49,24 @@ const doc = new Document({
                new Paragraph({
                    children: [
                        new InternalHyperlink({
-                            child: new TextRun({
+                            children: [
-                                text: "Anchor Text",
+                                new TextRun({
                                    text: "Styled",
                                    bold: true,
                                    style: "Hyperlink",
                                }),
                                new TextRun({
                                    text: " Anchor Text",
                                    style: "Hyperlink",
                                }),
                            ],
                            anchor: "myAnchorId",
                        }),
                    ],
                }),
                new Paragraph({
                    children: [new TextRun("The bookmark can be seen on page "), new PageReference("myAnchorId")],
                }),
            ],
        },
    ],
--- a/demo/26-paragraph-borders.ts
+++ b/demo/26-paragraph-borders.ts
@ -1,7 +1,7 @@
 // Creates two paragraphs, one with a border and one without
 // Import from 'docx' rather than '../build' if you install from npm
 import * as fs from "fs";
-import { Document, Packer, Paragraph } from "../build";
+import { BorderStyle, Document, Packer, Paragraph } from "../build";
 const doc = new Document({
    sections: [
@ -14,13 +14,13 @@ const doc = new Document({
                        top: {
                            color: "auto",
                            space: 1,
-                            value: "single",
+                            style: BorderStyle.SINGLE,
                            size: 6,
                        },
                        bottom: {
                            color: "auto",
                            space: 1,
-                            value: "single",
+                            style: BorderStyle.SINGLE,
                            size: 6,
                        },
                    },
--- a/demo/28-table-of-contents.ts
+++ b/demo/28-table-of-contents.ts
@ -9,6 +9,9 @@ import { File, HeadingLevel, Packer, Paragraph, StyleLevel, TableOfContents } fr
 // Let's define the properties for generate a TOC for heading 1-5 and MySpectacularStyle,
 // making the entries be hyperlinks for the paragraph
 const doc = new File({
    features: {
        updateFields: true,
    },
    styles: {
        paragraphStyles: [
            {
--- a/demo/32-merge-and-shade-table-cells.ts
+++ b/demo/32-merge-and-shade-table-cells.ts
@ -98,7 +98,7 @@ const table3 = new Table({
                    children: [new Paragraph("Bar1")],
                    shading: {
                        fill: "b79c2f",
-                        val: ShadingType.REVERSE_DIAGONAL_STRIPE,
+                        type: ShadingType.REVERSE_DIAGONAL_STRIPE,
                        color: "auto",
                    },
                }),
@ -106,7 +106,7 @@ const table3 = new Table({
                    children: [new Paragraph("Bar2")],
                    shading: {
                        fill: "42c5f4",
-                        val: ShadingType.PERCENT_95,
+                        type: ShadingType.PERCENT_95,
                        color: "auto",
                    },
                }),
@ -114,7 +114,7 @@ const table3 = new Table({
                    children: [new Paragraph("Bar3")],
                    shading: {
                        fill: "880aa8",
-                        val: ShadingType.PERCENT_10,
+                        type: ShadingType.PERCENT_10,
                        color: "e2df0b",
                    },
                }),
@ -122,7 +122,7 @@ const table3 = new Table({
                    children: [new Paragraph("Bar4")],
                    shading: {
                        fill: "FF0000",
-                        val: ShadingType.CLEAR,
+                        type: ShadingType.CLEAR,
                        color: "auto",
                    },
                }),
@ -224,22 +224,22 @@ const borders = {
    top: {
        style: BorderStyle.DASH_SMALL_GAP,
        size: 1,
-        color: "red",
+        color: "FF0000",
    },
    bottom: {
        style: BorderStyle.DASH_SMALL_GAP,
        size: 1,
-        color: "red",
+        color: "FF0000",
    },
    left: {
        style: BorderStyle.DASH_SMALL_GAP,
        size: 1,
-        color: "red",
+        color: "FF0000",
    },
    right: {
        style: BorderStyle.DASH_SMALL_GAP,
        size: 1,
-        color: "red",
+        color: "FF0000",
    },
 };
--- a/demo/35-hyperlinks.ts
+++ b/demo/35-hyperlinks.ts
@ -11,10 +11,12 @@ const doc = new Document({
                    children: [
                        new TextRun("Click here for the "),
                        new ExternalHyperlink({
-                            child: new TextRun({
+                            children: [
                                new TextRun({
                                    text: "Footnotes external hyperlink",
                                    style: "Hyperlink",
                                }),
                            ],
                            link: "http://www.example.com",
                        }),
                    ],
@ -31,10 +33,12 @@ const doc = new Document({
                            children: [
                                new TextRun("Click here for the "),
                                new ExternalHyperlink({
-                                    child: new TextRun({
+                                    children: [
                                        new TextRun({
                                            text: "Footer external hyperlink",
                                            style: "Hyperlink",
                                        }),
                                    ],
                                    link: "http://www.example.com",
                                }),
                            ],
@ -49,10 +53,12 @@ const doc = new Document({
                            children: [
                                new TextRun("Click here for the "),
                                new ExternalHyperlink({
-                                    child: new TextRun({
+                                    children: [
                                        new TextRun({
                                            text: "Header external hyperlink",
                                            style: "Hyperlink",
                                        }),
                                    ],
                                    link: "http://www.google.com",
                                }),
                            ],
@ -64,10 +70,12 @@ const doc = new Document({
                new Paragraph({
                    children: [
                        new ExternalHyperlink({
-                            child: new TextRun({
+                            children: [
                                new TextRun({
                                    text: "Anchor Text",
                                    style: "Hyperlink",
                                }),
                            ],
                            link: "http://www.example.com",
                        }),
                        new FootnoteReferenceRun(1),
@ -76,24 +84,63 @@ const doc = new Document({
                new Paragraph({
                    children: [
                        new ExternalHyperlink({
-                            child: new ImageRun({
+                            children: [
                                new ImageRun({
                                    data: fs.readFileSync("./demo/images/image1.jpeg"),
                                    transformation: {
                                        width: 100,
                                        height: 100,
                                    },
                                }),
                            ],
                            link: "http://www.google.com",
                        }),
                        new ExternalHyperlink({
-                            child: new TextRun({
+                            children: [
                                new TextRun({
                                    text: "BBC News Link",
                                    style: "Hyperlink",
                                }),
                            ],
                            link: "https://www.bbc.co.uk/news",
                        }),
                    ],
                }),
                new Paragraph({
                    children: [
                        new TextRun({
                            text: "This is a hyperlink with formatting: ",
                        }),
                        new ExternalHyperlink({
                            children: [
                                new TextRun({
                                    text: "A ",
                                    style: "Hyperlink",
                                }),
                                new TextRun({
                                    text: "single ",
                                    bold: true,
                                    style: "Hyperlink",
                                }),
                                new TextRun({
                                    text: "link",
                                    doubleStrike: true,
                                    style: "Hyperlink",
                                }),
                                new TextRun({
                                    text: "1",
                                    superScript: true,
                                    style: "Hyperlink",
                                }),
                                new TextRun({
                                    text: "!",
                                    style: "Hyperlink",
                                }),
                            ],
                            link: "http://www.example.com",
                        }),
                    ],
                }),
            ],
        },
    ],
--- a/demo/39-page-numbers.ts
+++ b/demo/39-page-numbers.ts
@ -1,7 +1,7 @@
 // Example how to display page numbers
 // Import from 'docx' rather than '../build' if you install from npm
 import * as fs from "fs";
-import { AlignmentType, Document, Footer, Header, Packer, PageBreak, PageNumber, PageNumberFormat, Paragraph, TextRun } from "../build";
+import { AlignmentType, Document, Footer, Header, Packer, PageBreak, PageNumber, NumberFormat, Paragraph, TextRun } from "../build";
 const doc = new Document({
    sections: [
@ -10,7 +10,7 @@ const doc = new Document({
                page: {
                    pageNumbers: {
                        start: 1,
-                        formatType: PageNumberFormat.DECIMAL,
+                        formatType: NumberFormat.DECIMAL,
                    },
                },
            },
--- a/demo/45-highlighting-text.ts
+++ b/demo/45-highlighting-text.ts
@ -14,7 +14,7 @@ const doc = new Document({
                            children: [
                                new TextRun({
                                    text: "Hello World",
-                                    color: "red",
+                                    color: "FF0000",
                                    bold: true,
                                    size: 24,
                                    font: {
--- a/demo/46-shading-text.ts
+++ b/demo/46-shading-text.ts
@ -14,7 +14,7 @@ const doc = new Document({
                            children: [
                                new TextRun({
                                    text: "Hello World",
-                                    color: "red",
+                                    color: "FF0000",
                                    bold: true,
                                    size: 24,
                                    font: {
--- a/demo/47-number-of-total-pages-section.ts
+++ b/demo/47-number-of-total-pages-section.ts
@ -1,7 +1,7 @@
 // Multiple sections with total number of pages in each section
 // Import from 'docx' rather than '../build' if you install from npm
 import * as fs from "fs";
-import { AlignmentType, Document, Footer, Header, Packer, PageBreak, PageNumber, PageNumberFormat, Paragraph, TextRun } from "../build";
+import { AlignmentType, Document, Footer, Header, Packer, PageBreak, PageNumber, NumberFormat, Paragraph, TextRun } from "../build";
 const header = new Header({
    children: [
@ -31,7 +31,7 @@ const doc = new Document({
                page: {
                    pageNumbers: {
                        start: 1,
-                        formatType: PageNumberFormat.DECIMAL,
+                        formatType: NumberFormat.DECIMAL,
                    },
                },
            },
@ -52,7 +52,7 @@ const doc = new Document({
                page: {
                    pageNumbers: {
                        start: 1,
-                        formatType: PageNumberFormat.DECIMAL,
+                        formatType: NumberFormat.DECIMAL,
                    },
                },
            },
--- a/demo/48-vertical-align.ts
+++ b/demo/48-vertical-align.ts
@ -1,13 +1,13 @@
 // Example of making content of section vertically aligned
 // Import from 'docx' rather than '../build' if you install from npm
 import * as fs from "fs";
-import { Document, Packer, Paragraph, SectionVerticalAlignValue, TextRun } from "../build";
+import { Document, Packer, Paragraph, VerticalAlign, TextRun } from "../build";
 const doc = new Document({
    sections: [
        {
            properties: {
-                verticalAlign: SectionVerticalAlignValue.CENTER,
+                verticalAlign: VerticalAlign.CENTER,
            },
            children: [
                new Paragraph({
--- a/demo/49-table-borders.ts
+++ b/demo/49-table-borders.ts
@ -24,22 +24,22 @@ const table = new Table({
                        top: {
                            style: BorderStyle.DASH_SMALL_GAP,
                            size: 1,
-                            color: "red",
+                            color: "ff0000",
                        },
                        bottom: {
                            style: BorderStyle.DASH_SMALL_GAP,
                            size: 1,
-                            color: "red",
+                            color: "ff0000",
                        },
                        left: {
                            style: BorderStyle.DASH_SMALL_GAP,
                            size: 1,
-                            color: "red",
+                            color: "ff0000",
                        },
                        right: {
                            style: BorderStyle.DASH_SMALL_GAP,
                            size: 1,
-                            color: "red",
+                            color: "ff0000",
                        },
                    },
                    children: [new Paragraph("Hello")],
--- a/demo/60-track-revisions.ts
+++ b/demo/60-track-revisions.ts
@ -20,10 +20,12 @@ import {
    - https://docs.microsoft.com/en-us/dotnet/api/documentformat.openxml.wordprocessing.insertedrun
    - https://docs.microsoft.com/en-us/dotnet/api/documentformat.openxml.wordprocessing.deletedrun
-    The method `addTrackRevisions()` adds an element `<w:trackRevisions />` to the `settings.xml` file. This specifies that the application shall track *new* revisions made to the existing document.
+    The setting `features: { trackRevisions: true }` adds an element `<w:trackRevisions />` to the `settings.xml` file.
    This specifies that the application shall track *new* revisions made to the existing document.
    See also https://docs.microsoft.com/en-us/dotnet/api/documentformat.openxml.wordprocessing.trackrevisions
-    Note that this setting enables to track *new changes* after teh file is generated, so this example will still show inserted and deleted text runs when you remove it.
+    Note that this setting enables to track *new changes* after teh file is generated, so this example will still
    show inserted and deleted text runs when you remove it.
 */
 const paragraph = new Paragraph({
@ -85,7 +87,7 @@ const doc = new Document({
                        new DeletedTextRun({
                            break: 1,
                            text: "in order",
-                            color: "red",
+                            color: "ff0000",
                            bold: true,
                            size: 24,
                            font: {
--- a/demo/61-text-frame.ts
+++ b/demo/61-text-frame.ts
@ -1,7 +1,16 @@
 // Text Frame (Text Box) example
 // Import from 'docx' rather than '../build' if you install from npm
 import * as fs from "fs";
-import { Document, FrameAnchorType, HorizontalPositionAlign, Packer, Paragraph, TextRun, VerticalPositionAlign } from "../build";
+import {
    BorderStyle,
    Document,
    FrameAnchorType,
    HorizontalPositionAlign,
    Packer,
    Paragraph,
    TextRun,
    VerticalPositionAlign,
 } from "../build";
 const doc = new Document({
    sections: [
@ -29,25 +38,25 @@ const doc = new Document({
                        top: {
                            color: "auto",
                            space: 1,
-                            value: "single",
+                            style: BorderStyle.SINGLE,
                            size: 6,
                        },
                        bottom: {
                            color: "auto",
                            space: 1,
-                            value: "single",
+                            style: BorderStyle.SINGLE,
                            size: 6,
                        },
                        left: {
                            color: "auto",
                            space: 1,
-                            value: "single",
+                            style: BorderStyle.SINGLE,
                            size: 6,
                        },
                        right: {
                            color: "auto",
                            space: 1,
-                            value: "single",
+                            style: BorderStyle.SINGLE,
                            size: 6,
                        },
                    },
--- a/demo/64-complex-numbering-text.ts
+++ b/demo/64-complex-numbering-text.ts
@ -0,0 +1,111 @@
 // Numbered lists - With complex number text
 // Import from 'docx' rather than '../build' if you install from npm
 import * as fs from "fs";
 import { Document, Packer, Paragraph, LevelFormat } from "../build";
 const doc = new Document({
    numbering: {
        config: [
            {
                reference: "ref1",
                levels: [
                    {
                        level: 0,
                        format: LevelFormat.DECIMAL,
                        text: "%1",
                    },
                    {
                        level: 1,
                        format: LevelFormat.DECIMAL,
                        text: "%1.%2",
                    },
                    {
                        level: 2,
                        format: LevelFormat.DECIMAL,
                        text: "%1.%2.%3",
                    },
                ],
            },
        ],
    },
    sections: [
        {
            children: [
                new Paragraph({
                    text: "REF1 - lvl:0",
                    numbering: {
                        reference: "ref1",
                        level: 0,
                    },
                }),
                new Paragraph({
                    text: "REF1 - lvl:1",
                    numbering: {
                        reference: "ref1",
                        level: 1,
                    },
                }),
                new Paragraph({
                    text: "REF1  - lvl:2",
                    numbering: {
                        reference: "ref1",
                        level: 2,
                    },
                }),
                new Paragraph({
                    text: "REF1 - lvl:0",
                    numbering: {
                        reference: "ref1",
                        level: 0,
                    },
                }),
                new Paragraph({
                    text: "REF1 - lvl:0",
                    numbering: {
                        reference: "ref1",
                        level: 0,
                    },
                }),
                new Paragraph({
                    text: "REF1 - lvl:0",
                    numbering: {
                        reference: "ref1",
                        level: 0,
                    },
                }),
                new Paragraph({
                    text: "Random text",
                }),
                new Paragraph({
                    text: "REF1 - inst:1 - lvl:0",
                    numbering: {
                        reference: "ref1",
                        instance: 1,
                        level: 0,
                    },
                }),
                new Paragraph({
                    text: "REF1 - inst:0 - lvl:0",
                    numbering: {
                        reference: "ref1",
                        instance: 0,
                        level: 0,
                    },
                }),
                new Paragraph({
                    text: "REF1 - inst:0 - lvl:0",
                    numbering: {
                        reference: "ref1",
                        instance: 0,
                        level: 0,
                    },
                }),
            ],
        },
    ],
 });
 // Used to export the file into a .docx file
 Packer.toBuffer(doc).then((buffer) => {
    fs.writeFileSync("6-numbering.docx", buffer);
 });
--- a/demo/65-page-sizes.ts
+++ b/demo/65-page-sizes.ts
@ -0,0 +1,38 @@
 // Example of how to set the document page sizes
 // Reference from https://papersizes.io/a/a3
 // Import from 'docx' rather than '../build' if you install from npm
 import * as fs from "fs";
 import { convertMillimetersToTwip, Document, Packer, PageOrientation, Paragraph } from "../build";
 const doc = new Document({
    sections: [
        {
            properties: {
                page: {
                    size: {
                        orientation: PageOrientation.LANDSCAPE,
                        height: convertMillimetersToTwip(210),
                        width: convertMillimetersToTwip(148),
                    },
                },
            },
            children: [new Paragraph("Hello World")],
        },
        {
            properties: {
                page: {
                    size: {
                        orientation: PageOrientation.PORTRAIT,
                        height: convertMillimetersToTwip(420),
                        width: convertMillimetersToTwip(297),
                    },
                },
            },
            children: [new Paragraph("Hello World")],
        },
    ],
 });
 Packer.toBuffer(doc).then((buffer) => {
    fs.writeFileSync("My Document.docx", buffer);
 });
--- a/demo/66-fields.ts
+++ b/demo/66-fields.ts
@ -0,0 +1,43 @@
 // Use fields to include dynamic text
 // Import from 'docx' rather than '../build' if you install from npm
 import * as fs from "fs";
 import { Bookmark, Document, Packer, Paragraph, SimpleField, TextRun } from "../build";
 const doc = new Document({
    creator: 'Me',
    sections: [
        {
            properties: {},
            children: [
                new Paragraph({
                    children: [
                        new TextRun("This document is called "),
                        new SimpleField("FILENAME", "My Document.docx"),
                        new TextRun(", was created on "),
                        new SimpleField('CREATEDATE  \\@ "d MMMM yyyy"'),
                        new TextRun(" by "),
                        new SimpleField("AUTHOR"),
                    ],
                }),
                new Paragraph({
                    children: [
                        new TextRun("The document has "),
                        new SimpleField("NUMWORDS", "34"),
                        new TextRun(" words and if you'd print it "),
                        new Bookmark({
                            id: "TimesPrinted",
                            children: [new TextRun("42")],
                        }),
                        new TextRun(" times two-sided, you would need "),
                        new SimpleField("=INT((TimesPrinted+1)/2)"),
                        new TextRun(" sheets of paper."),
                    ],
                }),
            ],
        },
    ],
 });
 Packer.toBuffer(doc).then((buffer) => {
    fs.writeFileSync("My Document.docx", buffer);
 });
--- a/demo/67-column-break.ts
+++ b/demo/67-column-break.ts
@ -0,0 +1,28 @@
 // Section with 2 columns including a column break
 // Import from 'docx' rather than '../build' if you install from npm
 import * as fs from "fs";
 import { Document, Packer, Paragraph, ColumnBreak, TextRun } from "../build";
 const doc = new Document({
    sections: [
        {
            properties: {
                column: {
                    space: 708,
                    count: 2,
                },
            },
            children: [
                new Paragraph({ children: [
                    new TextRun('This text will be in the first column.'),
                    new ColumnBreak(),
                    new TextRun('This text will be in the second column.'),
                ] }),
            ],
        },
    ],
 });
 Packer.toBuffer(doc).then((buffer) => {
    fs.writeFileSync("My Document.docx", buffer);
 });
--- a/demo/68-numbering-instances-and-starting-number.ts
+++ b/demo/68-numbering-instances-and-starting-number.ts
@ -0,0 +1,88 @@
 import * as fs from "fs";
 import { Document, Packer, Paragraph, LevelFormat } from "../build";
 const doc = new Document({
    numbering: {
        config: [
            {
                reference: "ref1",
                levels: [
                    {
                        level: 0,
                        format: LevelFormat.DECIMAL,
                        text: "%1",
                        start: 10,
                    },
                ],
            },
            {
                reference: "ref2",
                levels: [
                    {
                        level: 0,
                        format: LevelFormat.DECIMAL,
                        text: "%1",
                    },
                ],
            },
        ],
    },
    sections: [
        {
            children: [
                new Paragraph({
                    text: "REF1 - inst:0 - lvl:0",
                    numbering: {
                        reference: "ref1",
                        instance: 0,
                        level: 0,
                    },
                }),
                new Paragraph({
                    text: "REF1 - inst:0 - lvl:0",
                    numbering: {
                        reference: "ref1",
                        instance: 0,
                        level: 0,
                    },
                }),
                new Paragraph({
                    text: "REF1 - inst:1 - lvl:0",
                    numbering: {
                        reference: "ref1",
                        instance: 1,
                        level: 0,
                    },
                }),
                new Paragraph({
                    text: "REF1 - inst:1 - lvl:0",
                    numbering: {
                        reference: "ref1",
                        instance: 1,
                        level: 0,
                    },
                }),
                new Paragraph({
                    text: "REF2 - inst:0 - lvl:0",
                    numbering: {
                        reference: "ref2",
                        instance: 1,
                        level: 0,
                    },
                }),
                new Paragraph({
                    text: "REF2 - inst:0 - lvl:0",
                    numbering: {
                        reference: "ref2",
                        instance: 1,
                        level: 0,
                    },
                }),
            ],
        },
    ],
 });
 Packer.toBuffer(doc).then((buffer) => {
    fs.writeFileSync("My Document.docx", buffer);
 });
--- a/demo/69-different-width-columns.ts
+++ b/demo/69-different-width-columns.ts
@ -0,0 +1,31 @@
 // Sections with multiple columns
 // Import from 'docx' rather than '../build' if you install from npm
 import * as fs from "fs";
 import { Column, Document, Packer, Paragraph } from "../build";
 const doc = new Document({
    sections: [
        {
            properties: {
                column: {
                    count: 2,
                    space: 720,
                    equalWidth: false,
                    children: [new Column({ width: 2880, space: 720 }), new Column({ width: 5760 })],
                },
            },
            children: [
                new Paragraph(
                    "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
                ),
                new Paragraph(
                    "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
                ),
            ],
        },
    ],
 });
 Packer.toBuffer(doc).then((buffer) => {
    fs.writeFileSync("My Document.docx", buffer);
 });
--- a/demo/70-line-numbers-suppression.ts
+++ b/demo/70-line-numbers-suppression.ts
@ -0,0 +1,37 @@
 // Example demonstrating line numbers with suppression.
 // Import from 'docx' rather than '../build' if you install from npm
 import * as fs from "fs";
 import { Document, HeadingLevel, LineNumberRestartFormat, Packer, Paragraph } from "../build";
 const doc = new Document({
    sections: [
        {
            properties: {
                lineNumbers: {
                    countBy: 1,
                    restart: LineNumberRestartFormat.CONTINUOUS,
                },
            },
            children: [
                new Paragraph({
                    text: "Hello",
                    heading: HeadingLevel.HEADING_1,
                }),
                new Paragraph(
                    "Himenaeos duis luctus nullam fermentum lobortis potenti vivamus non dis, sed facilisis ultricies scelerisque aenean risus hac senectus. Adipiscing id venenatis justo ante gravida placerat, ac curabitur dis pellentesque proin bibendum risus, aliquam porta taciti vulputate primis. Tortor ipsum fermentum quam vel convallis primis nisl praesent tincidunt, lobortis quisque felis vitae condimentum class ut sem nam, aenean potenti pretium ac amet lacinia himenaeos mi. Aliquam nisl turpis hendrerit est morbi malesuada, augue interdum mus inceptos curabitur tristique, parturient feugiat sodales nulla facilisi. Aliquam non pulvinar purus nulla ex integer, velit faucibus vitae at bibendum quam, risus elit aenean adipiscing posuere.",
                ),
                new Paragraph({
                    text: "Enim mollit nostrud ut dolor eiusmod id sit occaecat dolore culpa amet. Veniam dolor consequat dolor labore ullamco laborum dolore eiusmod qui adipisicing. Elit nulla cupidatat et magna. Id eiusmod tempor non laborum ipsum. Veniam et aliqua excepteur duis officia enim elit excepteur fugiat duis. Sit sunt ullamco non dolor est qui deserunt consequat magna. Esse pariatur esse dolor ut excepteur dolor nisi nisi non est cupidatat mollit.",
                    suppressLineNumbers: true,
                }),
                new Paragraph(
                    "Sed laoreet id mattis egestas nam mollis elit lacinia convallis dui tincidunt ultricies habitant, pharetra per maximus interdum neque tempor risus efficitur morbi imperdiet senectus. Lectus laoreet senectus finibus inceptos donec potenti fermentum, ultrices eleifend odio suscipit magnis tellus maximus nibh, ac sit nullam eget felis himenaeos. Diam class sem magnis aenean commodo faucibus id proin mi, nullam sodales nec mus parturient ornare ad inceptos velit hendrerit, bibendum placerat eleifend integer facilisis urna dictumst suspendisse.",
                ),
            ],
        },
    ],
 });
 Packer.toBuffer(doc).then((buffer) => {
    fs.writeFileSync("My Document.docx", buffer);
 });
--- a/demo/71-page-borders-2.ts
+++ b/demo/71-page-borders-2.ts
@ -0,0 +1,63 @@
 // Example demonstrating page borders with style, colors and size
 // Import from 'docx' rather than '../build' if you install from npm
 import * as fs from "fs";
 import { Document, Packer, TextRun, Paragraph, BorderStyle, PageBorderDisplay, PageBorderOffsetFrom, PageBorderZOrder } from "../build";
 const doc = new Document({
    sections: [
        {
            properties: {
                page: {
                    borders: {
                        pageBorderBottom: {
                            style: BorderStyle.SINGLE,
                            size: 2 * 8, //2pt;
                            color: "000000",
                        },
                        pageBorderLeft: {
                            style: BorderStyle.SINGLE,
                            size: 1 * 8, //1pt;
                            color: "000000",
                        },
                        pageBorderRight: {
                            style: BorderStyle.SINGLE,
                            size: 1 * 8, //1pt;
                            color: "FF00AA",
                        },
                        pageBorderTop: {
                            style: BorderStyle.SINGLE,
                            size: 1 * 8, //1pt;
                            color: "000000",
                        },
                        pageBorders: {
                            display: PageBorderDisplay.ALL_PAGES,
                            offsetFrom: PageBorderOffsetFrom.TEXT,
                            zOrder: PageBorderZOrder.FRONT,
                        },
                    },
                },
            },
            children: [
                new Paragraph({
                    children: [
                        new TextRun({
                            text: `Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.`,
                        }),
                    ],
                }),
                new Paragraph({
                    children: [
                        new TextRun({
                            text: `Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.`,
                        }),
                    ],
                }),
            ],
        },
    ],
 });
 // Used to export the file into a .docx file
 Packer.toBuffer(doc).then((buffer) => {
    fs.writeFileSync("My Document.docx", buffer);
 });
--- a/demo/browser-demo.html
+++ b/demo/browser-demo.html
@ -12,9 +12,7 @@
        <script>
            function generate() {
-                const doc = new docx.Document();
+                const doc = new docx.Document({
                const doc = new Document({
                    sections: [
                        {
                            children: [
--- a/demo/index.ts
+++ b/demo/index.ts
@ -1,7 +1,7 @@
 // tslint:disable:no-console
-import * as fs from "fs";
+import fs from "fs";
-import * as prompt from "prompt";
+import prompt from "prompt";
-import * as shelljs from "shelljs";
+import shelljs from "shelljs";
 console.log("What demo do you wish to run? (Enter a number)");
@ -17,8 +17,8 @@ const schema = {
 prompt.start();
-prompt.get(schema, (_, result) => {
+prompt.get(schema as any, (_, result) => {
-    const demoNumber = result.number;
+    const demoNumber = result.number as string;
    const files = fs.readdirSync("./demo").filter((fn) => fn.startsWith(demoNumber));
    if (files.length === 0) {
--- a/docs/README.md
+++ b/docs/README.md
@ -44,7 +44,7 @@ const doc = new Document({
                ],
            }),
        ],
-    }];
+    }],
 });
 // Used to export the file into a .docx file
--- a/docs/_coverpage.md
+++ b/docs/_coverpage.md
@ -4,7 +4,7 @@
 -   Simple, declarative API
 -   60+ usage examples
-   Battle tested, mature, 98%+ coverage
+-   Battle tested, mature, 99%+ coverage
 [GitHub](https://github.com/dolanmiu/docx)
 [Get Started](#Welcome)
--- a/docs/_sidebar.md
+++ b/docs/_sidebar.md
@ -15,6 +15,7 @@
 	* [Image](usage/images.md)
 	* [Headers & Footers](usage/headers-and-footers.md)
 	* [Bullet Points](usage/bullet-points.md)
    * [Hyperlinks](usage/hyperlinks.md)
    * [Numbering](usage/numbering.md)
    * [Tables](usage/tables.md)
 	* [Tab Stops](usage/tab-stops.md)
--- a/docs/usage/change-tracking.md
+++ b/docs/usage/change-tracking.md
@ -27,7 +27,7 @@ const paragraph = new Paragraph({
 });
 ```
-Note that for a `InsertedTextRun` and `DeletedTextRun`, it is not possible to simply call it with only a text as in `new TextRun("some text")`, since the additonal fields for change tracking need to be provided. Similar to a normal `TextRun` you can add additional text properties.
+Note that for a `InsertedTextRun` and `DeletedTextRun`, it is not possible to simply call it with only a text as in `new TextRun("some text")`, since the additional fields for change tracking need to be provided. Similar to a normal `TextRun` you can add additional text properties.
 ```ts
 import { Paragraph, TextRun, InsertedTextRun, DeletedTextRun } from "docx";
@ -37,7 +37,7 @@ const paragraph = new Paragraph({
        new TextRun("This is a simple demo"),
        new DeletedTextRun({
            text: "with a deletion.",
-            color: "red",
+            color: "ff0000",
            bold: true,
            size: 24,
            id: 0,
@ -48,7 +48,7 @@ const paragraph = new Paragraph({
 });
 ```
-In addtion to marking text as inserted or deleted, change tracking can also be added via the document settings. This will enable new changes to be tracked as well.
+In addition to marking text as inserted or deleted, change tracking can also be added via the document settings. This will enable new changes to be tracked as well.
 ```ts
 import { Document } from "docx";
--- a/docs/usage/fields.md
+++ b/docs/usage/fields.md
@ -0,0 +1,73 @@
 # Fields
 Fields are pieces of dynamic text that you can include in your document. Often used fields are page numbers or references, but you can also include document properties like the author name or last saved date.
 ## Simple fields
 There are very complicated fields like the table of contents, but in many cases the whole field just has the same properties (like formatting). In those cases, you can use simple fields.
 Word uses field codes to identify what the result of the field should be. You can find these field codes by adding a field in a document (`Insert -> Quick Parts -> Field...`) and clicking the 'Field codes'-button. Some examples include:
 Field type  | Example         | Description
 ----------- | --------------- | ---------------------------------------------------------
 = (Formula) | `=2*21`         | Calculates the result of a formula. You can also use bookmarks as variables, see below.
 Author      | `AUTHOR`        | Includes the author mentioned in the document properties.
 CreateDate  | `CREATEDATE`    | Date the document was created.
 Date        | `DATE`          | Today's date.
 FileName    | `FILENAME \p`   | The name of the document. Add `\p` for the complete path.
 Info        | `INFO NumWords` | Data from the document properties, e.g. the number of words in the document.
 NumPages    | `NUMPAGES`      | Number of pages in the document.
 UserName    | `USERNAME`      | Your user name from the Office personalization settings.
 Fields can be added as a child of a paragraph:
 ```ts
 const paragraph = new Paragraph({
    children: [new TextRun("This document was created by: "), new SimpleField("AUTHOR")],
 });
 ```
 Fields can contain a cached value that gives the word processor a text to show without having to calculate all fields. The cached value can be updated by selecting the field and pressing F9. A cached value can be passed in as the second argument to the constructor.
 ```ts
 const paragraph = new Paragraph({
    children: [new TextRun("This document was created by: "), new SimpleField("AUTHOR", "Richard Brodie")],
 });
 ```
 ### Formulas
 One type of field is the formula that can be used to do some basic calculations. This can be done with static values, e.g. `12 + 34`, but a value from a bookmark can also be used in a calculation. This can be seen in the following example:
 ```ts
 const paragraph = new Paragraph({
    children: [
        new TextRun("Value one is: "),
        new Bookmark({ id: "One", children: [new TextRun("451")]}),
        new TextRun(". The second value is: "),
        new Bookmark({ id: "Two", children: [new TextRun("886")]}),
        new TextRun(". The sum of these values is: "),
        new SimpleField("=One+Two"),
    ],
 });
 ```
 ### Mail merge fields
 Fields are often used in a mail merge where a template document is created and data from another source (Excel or a database) is inserted in the document.
 A convenience class was added to add these mail merge fields to the document easily. You can add these to a paragraph like any other field and only have to supply the name of the field in your data set:
 ```ts
 const paragraph = new Paragraph({
    children: [new TextRun("Your score was "), new SimpleMailMergeField("Score"), new TextRun(" of 100 points")],
 });
 ```
 This code is equivalent to:
 ```ts
 const paragraph = new Paragraph({
    children: [new TextRun("Your score was "), new SimpleField("MERGEFIELD Score", "«Score»"), new TextRun(" of 100 points")],
 });
 ```
--- a/docs/usage/headers-and-footers.md
+++ b/docs/usage/headers-and-footers.md
@ -8,24 +8,24 @@ Every Section has a sections which you can define its Headers and Footers:
 const doc = new Document({
    sections: [{
        headers: {
-            default: new Header({ // The standard default header
+            default: new Header({ // The standard default header on every page or header on odd pages when the 'Different Odd & Even Pages' option is activated
                children: [],
            }),
-            first: new Header({ // The first header
+            first: new Header({ // The header on first page when the 'Different First Page' option is activated
                children: [],
            }),
-            even: new Header({ // The header on every other page
+            even: new Header({ // The header on even pages when the 'Different Odd & Even Pages' option is activated
                children: [],
            }),
        },
        footers: {
-            default: new Footer({ // The standard default footer
+            default: new Footer({ // The standard default footer on every page or footer on odd pages when the 'Different Odd & Even Pages' option is activated
                children: [],
            }),
-            first: new Footer({ // The first footer
+            first: new Footer({ // The footer on first page when the 'Different First Page' option is activated
                children: [],
            }),
-            even: new Footer({ // The footer on every other page
+            even: new Footer({ // The footer on even pages when the 'Different Odd & Even Pages' option is activated
                children: [],
            }),
        },
--- a/docs/usage/hyperlinks.md
+++ b/docs/usage/hyperlinks.md
@ -1,47 +1,98 @@
 # Hyperlinks
 !> Hyperlinks require an understanding of [Paragraphs](usage/paragraph.md) and [Text](usage/text.md).
 There are two types of hyperlinks: internal (pointing to a bookmark inside the document) and external (pointing to an external url).
 ## Internal
-To create an internal hyperlink you need first to create a bookmark (the paragraph that will be the destination of the hyperlink) with `doc.createBookmark(anchor, text)`.
+To create an internal hyperlink you need first to create a `Bookmark`, which contains the content that will be the destination of the hyperlink.
-A bookmark is composed of an anchor (an identifier) and the text displayed. After creating a bookmark just add it to a paragraph with `paragraph.addBookmark(bookmark)`
+A bookmark is composed of an anchor (an identifier) and the text displayed. After creating a bookmark just add it to a paragraph. For example, creating a bookmarked heading:
 For example:
 ```ts
-const paragraph = this.doc.createParagraph();
+const chapter1 = new Paragraph({
-const bookmark = this.doc.createBookmark('anchorForChapter1', 'This is chapter1');
+    heading: HeadingLevel.HEADING_1,
-paragraph.addBookmark(bookmark);
+    children: [
        new Bookmark({
            id: "anchorForChapter1",
            children: [
                new TextRun("Chapter 1"),
            ],
        }),
    ],
 })
 ```
-Then you can create an hyperlink pointing to that bookmark with `doc.createInternalHyperLink(anchor,text)`:
+Then you can create an hyperlink pointing to that bookmark with an `InternalHyperLink`:
 ```ts
-const paragraph = this.doc.createParagraph();
+const link = new InternalHyperlink({
-const link = this.doc.createInternalHyperLink('anchorForChapter1', 'This is a link to chapter1');
+    children: [
-paragraph.addHyperLink(link);
+        new TextRun({
            text: "See Chapter 1",
            style: "Hyperlink",
        }),
    ],
    anchor: "anchorForChapter1",
 })
 ```
 You can also get the page number of the bookmark by creating a page reference to it:
 ```ts
 const paragraph = new Paragraph({
    children: [
        new TextRun("Chapter 1 can be seen on page "),
        new PageReference("anchorForChapter1"),
    ],
 });
 ```
 ## External
-To create an external hyperlink you just need to specify the url and the text of the link, then add it to a paragraph with `doc.createHyperlink(url, text)`:
+To create an external hyperlink you just need to specify the url and the text of the link, then add it to a paragraph:
 ```ts
-const paragraph = this.doc.createParagraph();
+const paragraph = new Paragraph({
-const link = this.doc.createHyperlink('https://docx.js.org', 'This is an external link');
+    children: [
-paragraph.addHyperLink(link);
+        new ExternalHyperlink({
            children: [
                new TextRun({
                    text: "This is an external link!",
                    style: "Hyperlink",
                }),
            ],
            link: "https://docx.js.org",
        }),
    ],
 });
 ```
-## Styling an hyperlink
+## Styling hyperlinks
-It is possible to set the style of the text of an hyperlink. This can be done applying run formatting on `TextRun` property of the hyperlink.
+It is possible to set the style of the text of both internal and external hyperlinks. This can be done applying run formatting on any of the `TextRun` children of the hyperlink. Use the `style: "Hyperlink"` property to show the default link styles, which can be combined with any other style.
 Example:
 ```ts
-const link = this.doc.createHyperlink('https://docx.js.org', 'This is an external link');
+const styledLink = new ExternalHyperlink({
-link.TextRun.bold().italics()
+    children: [
        new TextRun({
            text: "This is a ",
            style: "Hyperlink",
        }),
        new TextRun({
            text: "bold",
            bold: true,
            style: "Hyperlink",
        }),
        new TextRun({
            text: " link!",
            style: "Hyperlink",
        }),
    ],
    link: "https://docx.js.org",
 });
 ```
--- a/docs/usage/images.md
+++ b/docs/usage/images.md
@ -78,7 +78,7 @@ const doc = new Document({
 > Positioning is the method on how to place the image on the document
-![Word Image Positiong](https://user-images.githubusercontent.com/34742290/41765548-b0946302-7604-11e8-96f9-166a9f0b8f39.png)
+![Word Image Positioning](https://user-images.githubusercontent.com/34742290/41765548-b0946302-7604-11e8-96f9-166a9f0b8f39.png)
 Three types of image positioning is supported:
@ -89,7 +89,7 @@ By default, images are exported as `Inline` elements.
 ### Usage
-Pass `options` into the `[POSITION_OPTIONS]` metioned in the [Intro above](#Intro).
+Pass `options` into the `[POSITION_OPTIONS]` mentioned in the [Intro above](#Intro).
 ## Floating
--- a/docs/usage/math.md
+++ b/docs/usage/math.md
@ -6,7 +6,7 @@
 1.  To add math, create a `Math` object
 2.  Add `MathComponents` inside `Math`
-3.  `MathComponents` can have nested `MathComponents` inside. e.g. A fraction where the numerator is a square root, and the demoninator as another fraction. More on `MathComponents` below
+3.  `MathComponents` can have nested `MathComponents` inside. e.g. A fraction where the numerator is a square root, and the denominator as another fraction. More on `MathComponents` below
 4.  Make sure to add the `Math` object inside a `Paragraph`
 ## Example
@ -61,7 +61,7 @@ new Math({
 ### Math Fraction
-`MathFractions` require a `numerator` and a `demoninator`, which are both a list of `MathComponents`
+`MathFractions` require a `numerator` and a `denominator`, which are both a list of `MathComponents`
 #### Example
--- a/docs/usage/numbering.md
+++ b/docs/usage/numbering.md
@ -23,7 +23,7 @@ those bullets/numbering. An abstract numbering system defines how
 bullets/numbers are to be shown for lists, including any sublists that
 may be used. Thus each abstract definition includes a series of
 _levels_ which form a sequence starting at 0 indicating the top-level
-list look and increasing from there to descibe the sublists, then
+list look and increasing from there to describe the sublists, then
 sub-sublists, etc. Each level includes the following properties:
 *   **level**: This is its 0-based index in the definition stack
@ -39,10 +39,10 @@ sub-sublists, etc. Each level includes the following properties:
    the sequence "a)", "b)", ...
 *   and a few others, which you can see in the OXML spec section 17.9.6
-## Document-level bullets/numbering defintions (concrete)
+## Document-level bullets/numbering definitions (concrete)
 Concrete definitions are sort of like concrete subclasses of the
-abstract defintions. They indicate their parent and are allowed to
+abstract definitions. They indicate their parent and are allowed to
 override certain level definitions. Thus two lists that differ only in
 how sub-sub-lists are to be displayed can share the same abstract
 numbering definition and have slightly different concrete definitions.
--- a/docs/usage/page-numbers.md
+++ b/docs/usage/page-numbers.md
@ -5,35 +5,49 @@
 ?> **Note:** This feature only works on Headers and Footers
 ```ts
-doc.Header.createParagraph().addRun(new TextRun("Page Number: ").pageNumber()).addRun(new TextRun("to ").numberOfTotalPages());
+new Paragraph({
    children: [
        new TextRun({
            children: ["Page #: ", PageNumber.CURRENT],
        })
    ]
 })
 ```
 ## Current page number
 To get the current page number, call the `.pageNumber()` method on a `TextRun`. Then add the newly created `TextRun` into a paragraph
 ```ts
-pageNumber();
+PageNumber.CURRENT
 ```
 For example:
 ```ts
-const currentPageRun = new TextRun("Current Page Number: ").pageNumber();
+new Paragraph({
-paragraph.addRun(currentPageRun);
+    children: [
        new TextRun({
            children: ["Page Number ", PageNumber.CURRENT],
        })
    ]
 })
 ```
 ## Total number of pages
 ```ts
-numberOfTotalPages();
+PageNumber.TOTAL_PAGES
 ```
 For example:
 ```ts
-const lastPage = new TextRun("Total Page Number: ").numberOfTotalPages();
+new Paragraph({
-paragraph.addRun(lastPage);
+    children: [
        new TextRun({
            children: ["Total Pages Number: ", PageNumber.TOTAL_PAGES],
        })
    ]
 })
 ```
@ -42,17 +56,14 @@ paragraph.addRun(lastPage);
 You can combine the two to get "Page 2 of 10" effect:
 ```ts
-const currentPageRun = new TextRun("Page ").pageNumber();
+new Paragraph({
-const lastPage = new TextRun("of ").numberOfTotalPages();
+    children: [
-
+        new TextRun("My awesome text here for my university dissertation. ")
-paragraph.addRun(currentPageRun);
+        new TextRun({
-paragraph.addRun(lastPage);
+            children: ["Page ", PageNumber.CURRENT, " of ", PageNumber.TOTAL_PAGES],
-```
+        })
-
+    ]
-Or:
+})
 ```ts
 doc.Header.createParagraph().addRun(new TextRun("Page ").pageNumber()).addRun(new TextRun("of ").numberOfTotalPages());
 ```
 ## Examples
--- a/docs/usage/paragraph.md
+++ b/docs/usage/paragraph.md
@ -1,8 +1,8 @@
 # Paragraph
-> Everything (text, images, graphs etc) in OpenXML is organised in paragraphs.
+> Everything (text, images, graphs etc) in OpenXML is organized in paragraphs.
-!> Paragraphs requires an understanding of [Sections](sections.md).
+!> Paragraphs requires an understanding of [Sections](usage/sections.md).
 You can create `Paragraphs` in the following ways:
@ -16,7 +16,7 @@ const paragraph = new Paragraph("Short hand Hello World");
 ### Children Method
-This method is useful for adding different [text](text.md) with different styles, [symbols](symbols.md), or adding [images](images.md) inline.
+This method is useful for adding different [text](usage/text.md) with different styles, [symbols](usage/symbols.md), or adding [images](usage/images.md) inline.
 ```ts
 const paragraph = new Paragraph({
@ -42,7 +42,7 @@ const doc = new Document({
 });
 ```
-Or the preferred convension, define the paragraph inside the section and remove the usage of variables:
+Or the preferred convention, define the paragraph inside the section and remove the usage of variables:
 ```ts
 const doc = new Document({
@ -180,12 +180,12 @@ Adding spacing between paragraphs
 ### ISpacingProperties
-| Property | Type           | Notes    |
+| Property | Type           | Notes    | Possible Values               |
-| -------- | -------------- | -------- |
+| -------- | -------------- | -------- | ----------------------------- |
-| after    | `number`       | Optional |
+| after    | `number`       | Optional |                               |
-| before   | `number`       | Optional |
+| before   | `number`       | Optional |                               |
-| line     | `number`       | Optional |
+| line     | `number`       | Optional |                               |
-| lineRule | `LineRuleType` | Optional |
+| lineRule | `LineRuleType` | Optional | `AT_LEAST`, `EXACTLY`, `AUTO` |
 **Example:**
--- a/docs/usage/styling-with-xml.md
+++ b/docs/usage/styling-with-xml.md
@ -3,7 +3,7 @@
 ## Setup
 1.  Create a new word document in Microsoft Word
-2.  Customise the styles on the Ribbon Bar.
+2.  Customize the styles on the Ribbon Bar.
    For example, modify the `Normal`, `Heading 1`, `Heading 2` like so:
    ![image](https://user-images.githubusercontent.com/2917613/41195113-65edebfa-6c1f-11e8-97b4-77de2d60044a.png)
--- a/docs/usage/symbols.md
+++ b/docs/usage/symbols.md
@ -1,8 +1,8 @@
 # Symbol Runs
-!> SymbolRuns require an understanding of [Paragraphs](paragraph.md).
+!> SymbolRuns require an understanding of [Paragraphs](usage/paragraph.md).
-You can add multiple `symbol runs` in `Paragraphs` along with [text runs](text.md) using the Paragraph's `children` property.
+You can add multiple `symbol runs` in `Paragraphs` along with [text runs](usage/text.md) using the Paragraph's `children` property.
 ```ts
 import { Paragraph, TextRun, SymbolRun } from "docx";
@ -50,4 +50,4 @@ const symbol = new SymbolRun({
 });
 ```
-See the [text run](text.md) documentation for more info.
+See the [text run](usage/text.md) documentation for more info.
--- a/docs/usage/tab-stops.md
+++ b/docs/usage/tab-stops.md
@ -4,15 +4,15 @@
 !> **Note**: The unit of measurement for a tab stop is in [DXA](https://stackoverflow.com/questions/14360183/default-wordml-unit-measurement-pixel-or-point-or-inches)
-![Word 2013 Tabs](http://www.teachucomp.com/wp-content/uploads/blog-4-22-2015-UsingTabStopsInWord-1024x577.png "Word 2013 Tab Stops")
+![Word 2013 Tabs](https://support.content.office.net/en-us/media/d75ca75d-9fe9-4d46-9a8b-4534c13acbc5.png "Word 2013 Tab Stops")
-Simply call the relevant methods on the paragraph listed below. Then just add a `tab()` method call to a text object. Adding multiple `tabStops` will mean you would have to chain `tab()` until the desired `tabStop` is selected. Example is shown below.
+Simply declare the tab stops on the paragraph, as shown below. Use the tab character `\t` to indicate the tab position within the `text` property of a `TextRun`. Adding multiple `tabStops` will mean you can add additional `\t` characters until the desired `tabStop` is selected. Example is shown below.
 ## Example
 ```ts
 const paragraph = new Paragraph({
-    children: [new TextRun("Hey everyone").bold(), new TextRun(\t"11th November 1999")],
+    children: [new TextRun({ text: "Hey everyone", bold: true}), new TextRun("\t11th November 1999")],
    tabStops: [
        {
            type: TabStopType.RIGHT,
@ -26,7 +26,7 @@ The example above will create a left aligned text, and a right aligned text on t
 ```ts
 const paragraph = new Paragraph({
-    children: [new TextRun("Second tab stop here I come!")],
+    children: [new TextRun("\t\tSecond tab stop here I come!")],
    tabStops: [
        {
            type: TabStopType.RIGHT,
@ -46,7 +46,7 @@ You can add multiple tab stops of the same `type` too.
 ```ts
 const paragraph = new Paragraph({
-    children: [new TextRun("Multiple tab stops!")],
+    children: [new TextRun("Multiple \ttab \tstops!")],
    tabStops: [
        {
            type: TabStopType.RIGHT,
@ -103,7 +103,7 @@ const paragraph = new Paragraph({
 });
 ```
-2268 is the distance fro0oum the left side.
+2268 is the distance from the left side.
 ## Max Right Tab Stop
--- a/docs/usage/table-of-contents.md
+++ b/docs/usage/table-of-contents.md
@ -2,7 +2,7 @@
 You can generate table of contents with `docx`. More information can be found [here](http://officeopenxml.com/WPtableOfContents.php).
-> Tables of Contents are fields and, by design, it's content is only generated or updated by Word. We can't do it programatically.
+> Tables of Contents are fields and, by design, it's content is only generated or updated by Word. We can't do it programmatically.
 > This is why, when you open a the file, Word you will prompt the message "This document contains fields that may refer to other files. Do you want to update the fields in this document?".
 > You have say yes to Word generate the content of all table of contents.
@ -12,14 +12,29 @@ The complete documentation can be found [here](https://www.ecma-international.or
 All you need to do is create a `TableOfContents` object and assign it to the document.
 **Note**: updateFields feature must be enabled for TableOfContents to update correctly.
 ```ts
-const toc = new TableOfContents("Summary", {
+const doc = new Document({
    features: {
        updateFields: true,
    },
    sections: [
        {
            children: [
                new TableOfContents("Summary", {
                    hyperlink: true,
                    headingStyleRange: "1-5",
-    stylesWithLevels: [new StyleLevel("MySpectacularStyle", 1)],
+                }),
                new Paragraph({
                    text: "Header #1",
                    heading: HeadingLevel.HEADING_1,
                    pageBreakBefore: true,
                }),
            ]
        }
    ]
 });
 doc.addTableOfContents(toc);
 ```
 ## Table of Contents Options
--- a/docs/usage/tables.md
+++ b/docs/usage/tables.md
@ -6,7 +6,7 @@
 -   `Tables` contain a list of `Rows`
 -   `Rows` contain a list of `TableCells`
-   `TableCells` contain a list of `Parahraphs` and/or `Tables`. You can add `Tables` as tables can be nested inside each other
+-   `TableCells` contain a list of `Paragraphs` and/or `Tables`. You can add `Tables` as tables can be nested inside each other
 Create a simple table like so:
@ -53,6 +53,18 @@ const table = new Table({
 });
 ```
 ### Set Indent
 ```ts
 const table = new Table({
    ...,
    indent: {
        size: 600,
        type: WidthType.DXA,
    }
 });
 ```
 ## Table Row
 A table consists of multiple `table rows`. Table rows have a list of `children` which accepts a list of `table cells` explained below. You can create a simple `table row` like so:
@ -145,7 +157,7 @@ const tableRow = new TableRow({
 | Property      | Type                                | Notes                                                       |
 | ------------- | ----------------------------------- | ----------------------------------------------------------- |
 | children      | `Array<Paragraph or Table>`         | Required. You can nest tables by adding a table into a cell |
-| shading       | `ITableShadingAttributesProperties` | Optional                                                    |
+| shading       | `IShadingAttributesProperties`      | Optional                                                    |
 | margins       | `ITableCellMarginOptions`           | Optional                                                    |
 | verticalAlign | `VerticalAlign`                     | Optional                                                    |
 | columnSpan    | `number`                            | Optional                                                    |
@ -171,7 +183,7 @@ const cell = new TableCell({
        top: {
            style: BorderStyle.DASH_DOT_STROKED,
            size: 1,
-            color: "red",
+            color: "ff0000",
        },
        bottom: {
            style: BorderStyle.THICK_THIN_MEDIUM_GAP,
@ -190,12 +202,12 @@ Google DOCS does not support start and end borders, instead they use left and ri
 const cell = new TableCell({
    ...,
    borders: {
-        top: {
+        left: {
            style: BorderStyle.DOT_DOT_DASH,
            size: 3,
-            color: "green",
+            color: "00FF00",
        },
-        bottom: {
+        right: {
            style: BorderStyle.DOT_DOT_DASH,
            size: 3,
            color: "ff8000",
@ -231,17 +243,11 @@ const cell = new TableCell({
 `WidthType` values can be:
 | Property   | Notes                             |
-| -------- | --------------------------------- |
+| ---------- | --------------------------------- |
 | AUTO       |                                   |
-| DXA      | value is in twentieths of a point |
+| DXA        | Value is in twentieths of a point |
-| NIL      | is considered as zero             |
+| NIL        | Is considered as zero             |
-| PCT      | percent of table width            |
+| PERCENTAGE | Percent of table width            |
 #### Example
 ```ts
 cell.Properties.setWidth(100, WidthType.DXA);
 ```
 ### Nested Tables
@ -346,7 +352,7 @@ _Source: https://github.com/dolanmiu/docx/blob/master/demo/4-basic-table.ts_
 ### Custom borders
-Example showing how to add colourful borders to tables
+Example showing how to add colorful borders to tables
 [Example](https://raw.githubusercontent.com/dolanmiu/docx/master/demo/20-table-cell-borders.ts ':include')
--- a/ooxml-schemas/ISO-IEC29500-4_2016/dml-chart.xsd
+++ b/ooxml-schemas/ISO-IEC29500-4_2016/dml-chart.xsd
--- a/ooxml-schemas/ISO-IEC29500-4_2016/dml-chartDrawing.xsd
+++ b/ooxml-schemas/ISO-IEC29500-4_2016/dml-chartDrawing.xsd
@ -0,0 +1,146 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
  xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"
  xmlns="http://schemas.openxmlformats.org/drawingml/2006/chartDrawing"
  targetNamespace="http://schemas.openxmlformats.org/drawingml/2006/chartDrawing"
  elementFormDefault="qualified">
  <xsd:import namespace="http://schemas.openxmlformats.org/drawingml/2006/main"
    schemaLocation="dml-main.xsd"/>
  <xsd:complexType name="CT_ShapeNonVisual">
    <xsd:sequence>
      <xsd:element name="cNvPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="cNvSpPr" type="a:CT_NonVisualDrawingShapeProps" minOccurs="1" maxOccurs="1"
      />
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_Shape">
    <xsd:sequence>
      <xsd:element name="nvSpPr" type="CT_ShapeNonVisual" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="spPr" type="a:CT_ShapeProperties" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="style" type="a:CT_ShapeStyle" minOccurs="0" maxOccurs="1"/>
      <xsd:element name="txBody" type="a:CT_TextBody" minOccurs="0" maxOccurs="1"/>
    </xsd:sequence>
    <xsd:attribute name="macro" type="xsd:string" use="optional"/>
    <xsd:attribute name="textlink" type="xsd:string" use="optional"/>
    <xsd:attribute name="fLocksText" type="xsd:boolean" use="optional" default="true"/>
    <xsd:attribute name="fPublished" type="xsd:boolean" use="optional" default="false"/>
  </xsd:complexType>
  <xsd:complexType name="CT_ConnectorNonVisual">
    <xsd:sequence>
      <xsd:element name="cNvPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="cNvCxnSpPr" type="a:CT_NonVisualConnectorProperties" minOccurs="1"
        maxOccurs="1"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_Connector">
    <xsd:sequence>
      <xsd:element name="nvCxnSpPr" type="CT_ConnectorNonVisual" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="spPr" type="a:CT_ShapeProperties" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="style" type="a:CT_ShapeStyle" minOccurs="0" maxOccurs="1"/>
    </xsd:sequence>
    <xsd:attribute name="macro" type="xsd:string" use="optional"/>
    <xsd:attribute name="fPublished" type="xsd:boolean" use="optional" default="false"/>
  </xsd:complexType>
  <xsd:complexType name="CT_PictureNonVisual">
    <xsd:sequence>
      <xsd:element name="cNvPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="cNvPicPr" type="a:CT_NonVisualPictureProperties" minOccurs="1"
        maxOccurs="1"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_Picture">
    <xsd:sequence>
      <xsd:element name="nvPicPr" type="CT_PictureNonVisual" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="blipFill" type="a:CT_BlipFillProperties" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="spPr" type="a:CT_ShapeProperties" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="style" type="a:CT_ShapeStyle" minOccurs="0" maxOccurs="1"/>
    </xsd:sequence>
    <xsd:attribute name="macro" type="xsd:string" use="optional" default=""/>
    <xsd:attribute name="fPublished" type="xsd:boolean" use="optional" default="false"/>
  </xsd:complexType>
  <xsd:complexType name="CT_GraphicFrameNonVisual">
    <xsd:sequence>
      <xsd:element name="cNvPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="cNvGraphicFramePr" type="a:CT_NonVisualGraphicFrameProperties"
        minOccurs="1" maxOccurs="1"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_GraphicFrame">
    <xsd:sequence>
      <xsd:element name="nvGraphicFramePr" type="CT_GraphicFrameNonVisual" minOccurs="1"
        maxOccurs="1"/>
      <xsd:element name="xfrm" type="a:CT_Transform2D" minOccurs="1" maxOccurs="1"/>
      <xsd:element ref="a:graphic" minOccurs="1" maxOccurs="1"/>
    </xsd:sequence>
    <xsd:attribute name="macro" type="xsd:string" use="optional"/>
    <xsd:attribute name="fPublished" type="xsd:boolean" use="optional" default="false"/>
  </xsd:complexType>
  <xsd:complexType name="CT_GroupShapeNonVisual">
    <xsd:sequence>
      <xsd:element name="cNvPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="cNvGrpSpPr" type="a:CT_NonVisualGroupDrawingShapeProps" minOccurs="1"
        maxOccurs="1"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_GroupShape">
    <xsd:sequence>
      <xsd:element name="nvGrpSpPr" type="CT_GroupShapeNonVisual" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="grpSpPr" type="a:CT_GroupShapeProperties" minOccurs="1" maxOccurs="1"/>
      <xsd:choice minOccurs="0" maxOccurs="unbounded">
        <xsd:element name="sp" type="CT_Shape"/>
        <xsd:element name="grpSp" type="CT_GroupShape"/>
        <xsd:element name="graphicFrame" type="CT_GraphicFrame"/>
        <xsd:element name="cxnSp" type="CT_Connector"/>
        <xsd:element name="pic" type="CT_Picture"/>
      </xsd:choice>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:group name="EG_ObjectChoices">
    <xsd:sequence>
      <xsd:choice minOccurs="1" maxOccurs="1">
        <xsd:element name="sp" type="CT_Shape"/>
        <xsd:element name="grpSp" type="CT_GroupShape"/>
        <xsd:element name="graphicFrame" type="CT_GraphicFrame"/>
        <xsd:element name="cxnSp" type="CT_Connector"/>
        <xsd:element name="pic" type="CT_Picture"/>
      </xsd:choice>
    </xsd:sequence>
  </xsd:group>
  <xsd:simpleType name="ST_MarkerCoordinate">
    <xsd:restriction base="xsd:double">
      <xsd:minInclusive value="0.0"/>
      <xsd:maxInclusive value="1.0"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:complexType name="CT_Marker">
    <xsd:sequence>
      <xsd:element name="x" type="ST_MarkerCoordinate" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="y" type="ST_MarkerCoordinate" minOccurs="1" maxOccurs="1"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_RelSizeAnchor">
    <xsd:sequence>
      <xsd:element name="from" type="CT_Marker"/>
      <xsd:element name="to" type="CT_Marker"/>
      <xsd:group ref="EG_ObjectChoices"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_AbsSizeAnchor">
    <xsd:sequence>
      <xsd:element name="from" type="CT_Marker"/>
      <xsd:element name="ext" type="a:CT_PositiveSize2D"/>
      <xsd:group ref="EG_ObjectChoices"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:group name="EG_Anchor">
    <xsd:choice>
      <xsd:element name="relSizeAnchor" type="CT_RelSizeAnchor"/>
      <xsd:element name="absSizeAnchor" type="CT_AbsSizeAnchor"/>
    </xsd:choice>
  </xsd:group>
  <xsd:complexType name="CT_Drawing">
    <xsd:sequence>
      <xsd:group ref="EG_Anchor" minOccurs="0" maxOccurs="unbounded"/>
    </xsd:sequence>
  </xsd:complexType>
 </xsd:schema>
--- a/ooxml-schemas/ISO-IEC29500-4_2016/dml-diagram.xsd
+++ b/ooxml-schemas/ISO-IEC29500-4_2016/dml-diagram.xsd
--- a/ooxml-schemas/ISO-IEC29500-4_2016/dml-lockedCanvas.xsd
+++ b/ooxml-schemas/ISO-IEC29500-4_2016/dml-lockedCanvas.xsd
@ -0,0 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
  xmlns="http://schemas.openxmlformats.org/drawingml/2006/lockedCanvas"
  xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"
  xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
  elementFormDefault="qualified"
  targetNamespace="http://schemas.openxmlformats.org/drawingml/2006/lockedCanvas">
  <xsd:import namespace="http://schemas.openxmlformats.org/drawingml/2006/main"
    schemaLocation="dml-main.xsd"/>
  <xsd:element name="lockedCanvas" type="a:CT_GvmlGroupShape"/>
 </xsd:schema>
--- a/ooxml-schemas/ISO-IEC29500-4_2016/dml-main.xsd
+++ b/ooxml-schemas/ISO-IEC29500-4_2016/dml-main.xsd
--- a/ooxml-schemas/ISO-IEC29500-4_2016/dml-picture.xsd
+++ b/ooxml-schemas/ISO-IEC29500-4_2016/dml-picture.xsd
@ -0,0 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
  xmlns="http://schemas.openxmlformats.org/drawingml/2006/picture"
  xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" elementFormDefault="qualified"
  targetNamespace="http://schemas.openxmlformats.org/drawingml/2006/picture">
  <xsd:import namespace="http://schemas.openxmlformats.org/drawingml/2006/main"
    schemaLocation="dml-main.xsd"/>
  <xsd:complexType name="CT_PictureNonVisual">
    <xsd:sequence>
      <xsd:element name="cNvPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="cNvPicPr" type="a:CT_NonVisualPictureProperties" minOccurs="1"
        maxOccurs="1"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_Picture">
    <xsd:sequence minOccurs="1" maxOccurs="1">
      <xsd:element name="nvPicPr" type="CT_PictureNonVisual" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="blipFill" type="a:CT_BlipFillProperties" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="spPr" type="a:CT_ShapeProperties" minOccurs="1" maxOccurs="1"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:element name="pic" type="CT_Picture"/>
 </xsd:schema>
--- a/ooxml-schemas/ISO-IEC29500-4_2016/dml-spreadsheetDrawing.xsd
+++ b/ooxml-schemas/ISO-IEC29500-4_2016/dml-spreadsheetDrawing.xsd
@ -0,0 +1,185 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
  xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"
  xmlns="http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing"
  xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
  targetNamespace="http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing"
  elementFormDefault="qualified">
  <xsd:import namespace="http://schemas.openxmlformats.org/drawingml/2006/main"
    schemaLocation="dml-main.xsd"/>
  <xsd:import schemaLocation="shared-relationshipReference.xsd"
    namespace="http://schemas.openxmlformats.org/officeDocument/2006/relationships"/>
  <xsd:element name="from" type="CT_Marker"/>
  <xsd:element name="to" type="CT_Marker"/>
  <xsd:complexType name="CT_AnchorClientData">
    <xsd:attribute name="fLocksWithSheet" type="xsd:boolean" use="optional" default="true"/>
    <xsd:attribute name="fPrintsWithSheet" type="xsd:boolean" use="optional" default="true"/>
  </xsd:complexType>
  <xsd:complexType name="CT_ShapeNonVisual">
    <xsd:sequence>
      <xsd:element name="cNvPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="cNvSpPr" type="a:CT_NonVisualDrawingShapeProps" minOccurs="1" maxOccurs="1"
      />
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_Shape">
    <xsd:sequence>
      <xsd:element name="nvSpPr" type="CT_ShapeNonVisual" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="spPr" type="a:CT_ShapeProperties" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="style" type="a:CT_ShapeStyle" minOccurs="0" maxOccurs="1"/>
      <xsd:element name="txBody" type="a:CT_TextBody" minOccurs="0" maxOccurs="1"/>
    </xsd:sequence>
    <xsd:attribute name="macro" type="xsd:string" use="optional"/>
    <xsd:attribute name="textlink" type="xsd:string" use="optional"/>
    <xsd:attribute name="fLocksText" type="xsd:boolean" use="optional" default="true"/>
    <xsd:attribute name="fPublished" type="xsd:boolean" use="optional" default="false"/>
  </xsd:complexType>
  <xsd:complexType name="CT_ConnectorNonVisual">
    <xsd:sequence>
      <xsd:element name="cNvPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="cNvCxnSpPr" type="a:CT_NonVisualConnectorProperties" minOccurs="1"
        maxOccurs="1"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_Connector">
    <xsd:sequence>
      <xsd:element name="nvCxnSpPr" type="CT_ConnectorNonVisual" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="spPr" type="a:CT_ShapeProperties" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="style" type="a:CT_ShapeStyle" minOccurs="0" maxOccurs="1"/>
    </xsd:sequence>
    <xsd:attribute name="macro" type="xsd:string" use="optional"/>
    <xsd:attribute name="fPublished" type="xsd:boolean" use="optional" default="false"/>
  </xsd:complexType>
  <xsd:complexType name="CT_PictureNonVisual">
    <xsd:sequence>
      <xsd:element name="cNvPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="cNvPicPr" type="a:CT_NonVisualPictureProperties" minOccurs="1"
        maxOccurs="1"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_Picture">
    <xsd:sequence>
      <xsd:element name="nvPicPr" type="CT_PictureNonVisual" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="blipFill" type="a:CT_BlipFillProperties" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="spPr" type="a:CT_ShapeProperties" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="style" type="a:CT_ShapeStyle" minOccurs="0" maxOccurs="1"/>
    </xsd:sequence>
    <xsd:attribute name="macro" type="xsd:string" use="optional" default=""/>
    <xsd:attribute name="fPublished" type="xsd:boolean" use="optional" default="false"/>
  </xsd:complexType>
  <xsd:complexType name="CT_GraphicalObjectFrameNonVisual">
    <xsd:sequence>
      <xsd:element name="cNvPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="cNvGraphicFramePr" type="a:CT_NonVisualGraphicFrameProperties"
        minOccurs="1" maxOccurs="1"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_GraphicalObjectFrame">
    <xsd:sequence>
      <xsd:element name="nvGraphicFramePr" type="CT_GraphicalObjectFrameNonVisual" minOccurs="1"
        maxOccurs="1"/>
      <xsd:element name="xfrm" type="a:CT_Transform2D" minOccurs="1" maxOccurs="1"/>
      <xsd:element ref="a:graphic" minOccurs="1" maxOccurs="1"/>
    </xsd:sequence>
    <xsd:attribute name="macro" type="xsd:string" use="optional"/>
    <xsd:attribute name="fPublished" type="xsd:boolean" use="optional" default="false"/>
  </xsd:complexType>
  <xsd:complexType name="CT_GroupShapeNonVisual">
    <xsd:sequence>
      <xsd:element name="cNvPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="cNvGrpSpPr" type="a:CT_NonVisualGroupDrawingShapeProps" minOccurs="1"
        maxOccurs="1"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_GroupShape">
    <xsd:sequence>
      <xsd:element name="nvGrpSpPr" type="CT_GroupShapeNonVisual" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="grpSpPr" type="a:CT_GroupShapeProperties" minOccurs="1" maxOccurs="1"/>
      <xsd:choice minOccurs="0" maxOccurs="unbounded">
        <xsd:element name="sp" type="CT_Shape"/>
        <xsd:element name="grpSp" type="CT_GroupShape"/>
        <xsd:element name="graphicFrame" type="CT_GraphicalObjectFrame"/>
        <xsd:element name="cxnSp" type="CT_Connector"/>
        <xsd:element name="pic" type="CT_Picture"/>
      </xsd:choice>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:group name="EG_ObjectChoices">
    <xsd:sequence>
      <xsd:choice minOccurs="1" maxOccurs="1">
        <xsd:element name="sp" type="CT_Shape"/>
        <xsd:element name="grpSp" type="CT_GroupShape"/>
        <xsd:element name="graphicFrame" type="CT_GraphicalObjectFrame"/>
        <xsd:element name="cxnSp" type="CT_Connector"/>
        <xsd:element name="pic" type="CT_Picture"/>
        <xsd:element name="contentPart" type="CT_Rel"/>
      </xsd:choice>
    </xsd:sequence>
  </xsd:group>
  <xsd:complexType name="CT_Rel">
    <xsd:attribute ref="r:id" use="required"/>
  </xsd:complexType>
  <xsd:simpleType name="ST_ColID">
    <xsd:restriction base="xsd:int">
      <xsd:minInclusive value="0"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_RowID">
    <xsd:restriction base="xsd:int">
      <xsd:minInclusive value="0"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:complexType name="CT_Marker">
    <xsd:sequence>
      <xsd:element name="col" type="ST_ColID"/>
      <xsd:element name="colOff" type="a:ST_Coordinate"/>
      <xsd:element name="row" type="ST_RowID"/>
      <xsd:element name="rowOff" type="a:ST_Coordinate"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:simpleType name="ST_EditAs">
    <xsd:restriction base="xsd:token">
      <xsd:enumeration value="twoCell"/>
      <xsd:enumeration value="oneCell"/>
      <xsd:enumeration value="absolute"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:complexType name="CT_TwoCellAnchor">
    <xsd:sequence>
      <xsd:element name="from" type="CT_Marker"/>
      <xsd:element name="to" type="CT_Marker"/>
      <xsd:group ref="EG_ObjectChoices"/>
      <xsd:element name="clientData" type="CT_AnchorClientData" minOccurs="1" maxOccurs="1"/>
    </xsd:sequence>
    <xsd:attribute name="editAs" type="ST_EditAs" use="optional" default="twoCell"/>
  </xsd:complexType>
  <xsd:complexType name="CT_OneCellAnchor">
    <xsd:sequence>
      <xsd:element name="from" type="CT_Marker"/>
      <xsd:element name="ext" type="a:CT_PositiveSize2D"/>
      <xsd:group ref="EG_ObjectChoices"/>
      <xsd:element name="clientData" type="CT_AnchorClientData" minOccurs="1" maxOccurs="1"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_AbsoluteAnchor">
    <xsd:sequence>
      <xsd:element name="pos" type="a:CT_Point2D"/>
      <xsd:element name="ext" type="a:CT_PositiveSize2D"/>
      <xsd:group ref="EG_ObjectChoices"/>
      <xsd:element name="clientData" type="CT_AnchorClientData" minOccurs="1" maxOccurs="1"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:group name="EG_Anchor">
    <xsd:choice>
      <xsd:element name="twoCellAnchor" type="CT_TwoCellAnchor"/>
      <xsd:element name="oneCellAnchor" type="CT_OneCellAnchor"/>
      <xsd:element name="absoluteAnchor" type="CT_AbsoluteAnchor"/>
    </xsd:choice>
  </xsd:group>
  <xsd:complexType name="CT_Drawing">
    <xsd:sequence>
      <xsd:group ref="EG_Anchor" minOccurs="0" maxOccurs="unbounded"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:element name="wsDr" type="CT_Drawing"/>
 </xsd:schema>
--- a/ooxml-schemas/ISO-IEC29500-4_2016/dml-wordprocessingDrawing.xsd
+++ b/ooxml-schemas/ISO-IEC29500-4_2016/dml-wordprocessingDrawing.xsd
@ -0,0 +1,287 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
  xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"
  xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
  xmlns:dpct="http://schemas.openxmlformats.org/drawingml/2006/picture"
  xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
  xmlns="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"
  targetNamespace="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"
  elementFormDefault="qualified">
  <xsd:import namespace="http://schemas.openxmlformats.org/drawingml/2006/main"
    schemaLocation="dml-main.xsd"/>
  <xsd:import schemaLocation="wml.xsd"
    namespace="http://schemas.openxmlformats.org/wordprocessingml/2006/main"/>
  <xsd:import namespace="http://schemas.openxmlformats.org/drawingml/2006/picture"
    schemaLocation="dml-picture.xsd"/>
  <xsd:import namespace="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
    schemaLocation="shared-relationshipReference.xsd"/>
  <xsd:complexType name="CT_EffectExtent">
    <xsd:attribute name="l" type="a:ST_Coordinate" use="required"/>
    <xsd:attribute name="t" type="a:ST_Coordinate" use="required"/>
    <xsd:attribute name="r" type="a:ST_Coordinate" use="required"/>
    <xsd:attribute name="b" type="a:ST_Coordinate" use="required"/>
  </xsd:complexType>
  <xsd:simpleType name="ST_WrapDistance">
    <xsd:restriction base="xsd:unsignedInt"/>
  </xsd:simpleType>
  <xsd:complexType name="CT_Inline">
    <xsd:sequence>
      <xsd:element name="extent" type="a:CT_PositiveSize2D"/>
      <xsd:element name="effectExtent" type="CT_EffectExtent" minOccurs="0"/>
      <xsd:element name="docPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="cNvGraphicFramePr" type="a:CT_NonVisualGraphicFrameProperties"
        minOccurs="0" maxOccurs="1"/>
      <xsd:element ref="a:graphic" minOccurs="1" maxOccurs="1"/>
    </xsd:sequence>
    <xsd:attribute name="distT" type="ST_WrapDistance" use="optional"/>
    <xsd:attribute name="distB" type="ST_WrapDistance" use="optional"/>
    <xsd:attribute name="distL" type="ST_WrapDistance" use="optional"/>
    <xsd:attribute name="distR" type="ST_WrapDistance" use="optional"/>
  </xsd:complexType>
  <xsd:simpleType name="ST_WrapText">
    <xsd:restriction base="xsd:token">
      <xsd:enumeration value="bothSides"/>
      <xsd:enumeration value="left"/>
      <xsd:enumeration value="right"/>
      <xsd:enumeration value="largest"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:complexType name="CT_WrapPath">
    <xsd:sequence>
      <xsd:element name="start" type="a:CT_Point2D" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="lineTo" type="a:CT_Point2D" minOccurs="2" maxOccurs="unbounded"/>
    </xsd:sequence>
    <xsd:attribute name="edited" type="xsd:boolean" use="optional"/>
  </xsd:complexType>
  <xsd:complexType name="CT_WrapNone"/>
  <xsd:complexType name="CT_WrapSquare">
    <xsd:sequence>
      <xsd:element name="effectExtent" type="CT_EffectExtent" minOccurs="0"/>
    </xsd:sequence>
    <xsd:attribute name="wrapText" type="ST_WrapText" use="required"/>
    <xsd:attribute name="distT" type="ST_WrapDistance" use="optional"/>
    <xsd:attribute name="distB" type="ST_WrapDistance" use="optional"/>
    <xsd:attribute name="distL" type="ST_WrapDistance" use="optional"/>
    <xsd:attribute name="distR" type="ST_WrapDistance" use="optional"/>
  </xsd:complexType>
  <xsd:complexType name="CT_WrapTight">
    <xsd:sequence>
      <xsd:element name="wrapPolygon" type="CT_WrapPath" minOccurs="1" maxOccurs="1"/>
    </xsd:sequence>
    <xsd:attribute name="wrapText" type="ST_WrapText" use="required"/>
    <xsd:attribute name="distL" type="ST_WrapDistance" use="optional"/>
    <xsd:attribute name="distR" type="ST_WrapDistance" use="optional"/>
  </xsd:complexType>
  <xsd:complexType name="CT_WrapThrough">
    <xsd:sequence>
      <xsd:element name="wrapPolygon" type="CT_WrapPath" minOccurs="1" maxOccurs="1"/>
    </xsd:sequence>
    <xsd:attribute name="wrapText" type="ST_WrapText" use="required"/>
    <xsd:attribute name="distL" type="ST_WrapDistance" use="optional"/>
    <xsd:attribute name="distR" type="ST_WrapDistance" use="optional"/>
  </xsd:complexType>
  <xsd:complexType name="CT_WrapTopBottom">
    <xsd:sequence>
      <xsd:element name="effectExtent" type="CT_EffectExtent" minOccurs="0"/>
    </xsd:sequence>
    <xsd:attribute name="distT" type="ST_WrapDistance" use="optional"/>
    <xsd:attribute name="distB" type="ST_WrapDistance" use="optional"/>
  </xsd:complexType>
  <xsd:group name="EG_WrapType">
    <xsd:sequence>
      <xsd:choice minOccurs="1" maxOccurs="1">
        <xsd:element name="wrapNone" type="CT_WrapNone" minOccurs="1" maxOccurs="1"/>
        <xsd:element name="wrapSquare" type="CT_WrapSquare" minOccurs="1" maxOccurs="1"/>
        <xsd:element name="wrapTight" type="CT_WrapTight" minOccurs="1" maxOccurs="1"/>
        <xsd:element name="wrapThrough" type="CT_WrapThrough" minOccurs="1" maxOccurs="1"/>
        <xsd:element name="wrapTopAndBottom" type="CT_WrapTopBottom" minOccurs="1" maxOccurs="1"/>
      </xsd:choice>
    </xsd:sequence>
  </xsd:group>
  <xsd:simpleType name="ST_PositionOffset">
    <xsd:restriction base="xsd:int"/>
  </xsd:simpleType>
  <xsd:simpleType name="ST_AlignH">
    <xsd:restriction base="xsd:token">
      <xsd:enumeration value="left"/>
      <xsd:enumeration value="right"/>
      <xsd:enumeration value="center"/>
      <xsd:enumeration value="inside"/>
      <xsd:enumeration value="outside"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_RelFromH">
    <xsd:restriction base="xsd:token">
      <xsd:enumeration value="margin"/>
      <xsd:enumeration value="page"/>
      <xsd:enumeration value="column"/>
      <xsd:enumeration value="character"/>
      <xsd:enumeration value="leftMargin"/>
      <xsd:enumeration value="rightMargin"/>
      <xsd:enumeration value="insideMargin"/>
      <xsd:enumeration value="outsideMargin"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:complexType name="CT_PosH">
    <xsd:sequence>
      <xsd:choice minOccurs="1" maxOccurs="1">
        <xsd:element name="align" type="ST_AlignH" minOccurs="1" maxOccurs="1"/>
        <xsd:element name="posOffset" type="ST_PositionOffset" minOccurs="1" maxOccurs="1"/>
      </xsd:choice>
    </xsd:sequence>
    <xsd:attribute name="relativeFrom" type="ST_RelFromH" use="required"/>
  </xsd:complexType>
  <xsd:simpleType name="ST_AlignV">
    <xsd:restriction base="xsd:token">
      <xsd:enumeration value="top"/>
      <xsd:enumeration value="bottom"/>
      <xsd:enumeration value="center"/>
      <xsd:enumeration value="inside"/>
      <xsd:enumeration value="outside"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_RelFromV">
    <xsd:restriction base="xsd:token">
      <xsd:enumeration value="margin"/>
      <xsd:enumeration value="page"/>
      <xsd:enumeration value="paragraph"/>
      <xsd:enumeration value="line"/>
      <xsd:enumeration value="topMargin"/>
      <xsd:enumeration value="bottomMargin"/>
      <xsd:enumeration value="insideMargin"/>
      <xsd:enumeration value="outsideMargin"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:complexType name="CT_PosV">
    <xsd:sequence>
      <xsd:choice minOccurs="1" maxOccurs="1">
        <xsd:element name="align" type="ST_AlignV" minOccurs="1" maxOccurs="1"/>
        <xsd:element name="posOffset" type="ST_PositionOffset" minOccurs="1" maxOccurs="1"/>
      </xsd:choice>
    </xsd:sequence>
    <xsd:attribute name="relativeFrom" type="ST_RelFromV" use="required"/>
  </xsd:complexType>
  <xsd:complexType name="CT_Anchor">
    <xsd:sequence>
      <xsd:element name="simplePos" type="a:CT_Point2D"/>
      <xsd:element name="positionH" type="CT_PosH"/>
      <xsd:element name="positionV" type="CT_PosV"/>
      <xsd:element name="extent" type="a:CT_PositiveSize2D"/>
      <xsd:element name="effectExtent" type="CT_EffectExtent" minOccurs="0"/>
      <xsd:group ref="EG_WrapType"/>
      <xsd:element name="docPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="cNvGraphicFramePr" type="a:CT_NonVisualGraphicFrameProperties"
        minOccurs="0" maxOccurs="1"/>
      <xsd:element ref="a:graphic" minOccurs="1" maxOccurs="1"/>
    </xsd:sequence>
    <xsd:attribute name="distT" type="ST_WrapDistance" use="optional"/>
    <xsd:attribute name="distB" type="ST_WrapDistance" use="optional"/>
    <xsd:attribute name="distL" type="ST_WrapDistance" use="optional"/>
    <xsd:attribute name="distR" type="ST_WrapDistance" use="optional"/>
    <xsd:attribute name="simplePos" type="xsd:boolean"/>
    <xsd:attribute name="relativeHeight" type="xsd:unsignedInt" use="required"/>
    <xsd:attribute name="behindDoc" type="xsd:boolean" use="required"/>
    <xsd:attribute name="locked" type="xsd:boolean" use="required"/>
    <xsd:attribute name="layoutInCell" type="xsd:boolean" use="required"/>
    <xsd:attribute name="hidden" type="xsd:boolean" use="optional"/>
    <xsd:attribute name="allowOverlap" type="xsd:boolean" use="required"/>
  </xsd:complexType>
  <xsd:complexType name="CT_TxbxContent">
    <xsd:group ref="w:EG_BlockLevelElts" minOccurs="1" maxOccurs="unbounded"/>
  </xsd:complexType>
  <xsd:complexType name="CT_TextboxInfo">
    <xsd:sequence>
      <xsd:element name="txbxContent" type="CT_TxbxContent" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="extLst" type="a:CT_OfficeArtExtensionList" minOccurs="0" maxOccurs="1"/>
    </xsd:sequence>
    <xsd:attribute name="id" type="xsd:unsignedShort" use="optional" default="0"/>
  </xsd:complexType>
  <xsd:complexType name="CT_LinkedTextboxInformation">
    <xsd:sequence>
      <xsd:element name="extLst" type="a:CT_OfficeArtExtensionList" minOccurs="0" maxOccurs="1"/>
    </xsd:sequence>
    <xsd:attribute name="id" type="xsd:unsignedShort" use="required"/>
    <xsd:attribute name="seq" type="xsd:unsignedShort" use="required"/>
  </xsd:complexType>
  <xsd:complexType name="CT_WordprocessingShape">
    <xsd:sequence minOccurs="1" maxOccurs="1">
      <xsd:element name="cNvPr" type="a:CT_NonVisualDrawingProps" minOccurs="0" maxOccurs="1"/>
      <xsd:choice minOccurs="1" maxOccurs="1">
        <xsd:element name="cNvSpPr" type="a:CT_NonVisualDrawingShapeProps" minOccurs="1"
          maxOccurs="1"/>
        <xsd:element name="cNvCnPr" type="a:CT_NonVisualConnectorProperties" minOccurs="1"
          maxOccurs="1"/>
      </xsd:choice>
      <xsd:element name="spPr" type="a:CT_ShapeProperties" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="style" type="a:CT_ShapeStyle" minOccurs="0" maxOccurs="1"/>
      <xsd:element name="extLst" type="a:CT_OfficeArtExtensionList" minOccurs="0" maxOccurs="1"/>
      <xsd:choice minOccurs="0" maxOccurs="1">
        <xsd:element name="txbx" type="CT_TextboxInfo" minOccurs="1" maxOccurs="1"/>
        <xsd:element name="linkedTxbx" type="CT_LinkedTextboxInformation" minOccurs="1"
          maxOccurs="1"/>
      </xsd:choice>
      <xsd:element name="bodyPr" type="a:CT_TextBodyProperties" minOccurs="1" maxOccurs="1"/>
    </xsd:sequence>
    <xsd:attribute name="normalEastAsianFlow" type="xsd:boolean" use="optional" default="false"/>
  </xsd:complexType>
  <xsd:complexType name="CT_GraphicFrame">
    <xsd:sequence>
      <xsd:element name="cNvPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="cNvFrPr" type="a:CT_NonVisualGraphicFrameProperties" minOccurs="1"
        maxOccurs="1"/>
      <xsd:element name="xfrm" type="a:CT_Transform2D" minOccurs="1" maxOccurs="1"/>
      <xsd:element ref="a:graphic" minOccurs="1" maxOccurs="1"/>
      <xsd:element name="extLst" type="a:CT_OfficeArtExtensionList" minOccurs="0" maxOccurs="1"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_WordprocessingContentPartNonVisual">
    <xsd:sequence>
      <xsd:element name="cNvPr" type="a:CT_NonVisualDrawingProps" minOccurs="0" maxOccurs="1"/>
      <xsd:element name="cNvContentPartPr" type="a:CT_NonVisualContentPartProperties" minOccurs="0" maxOccurs="1"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_WordprocessingContentPart">
    <xsd:sequence>
      <xsd:element name="nvContentPartPr" type="CT_WordprocessingContentPartNonVisual" minOccurs="0" maxOccurs="1"/>
      <xsd:element name="xfrm" type="a:CT_Transform2D" minOccurs="0" maxOccurs="1"/>
      <xsd:element name="extLst" type="a:CT_OfficeArtExtensionList" minOccurs="0" maxOccurs="1"/>
    </xsd:sequence>
    <xsd:attribute name="bwMode" type="a:ST_BlackWhiteMode" use="optional"/>
    <xsd:attribute ref="r:id" use="required"/>
  </xsd:complexType>
  <xsd:complexType name="CT_WordprocessingGroup">
    <xsd:sequence minOccurs="1" maxOccurs="1">
      <xsd:element name="cNvPr" type="a:CT_NonVisualDrawingProps" minOccurs="0" maxOccurs="1"/>
      <xsd:element name="cNvGrpSpPr" type="a:CT_NonVisualGroupDrawingShapeProps" minOccurs="1"
        maxOccurs="1"/>
      <xsd:element name="grpSpPr" type="a:CT_GroupShapeProperties" minOccurs="1" maxOccurs="1"/>
      <xsd:choice minOccurs="0" maxOccurs="unbounded">
        <xsd:element ref="wsp"/>
        <xsd:element name="grpSp" type="CT_WordprocessingGroup"/>
        <xsd:element name="graphicFrame" type="CT_GraphicFrame"/>
        <xsd:element ref="dpct:pic"/>
        <xsd:element name="contentPart" type="CT_WordprocessingContentPart"/>
      </xsd:choice>
      <xsd:element name="extLst" type="a:CT_OfficeArtExtensionList" minOccurs="0" maxOccurs="1"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_WordprocessingCanvas">
    <xsd:sequence minOccurs="1" maxOccurs="1">
      <xsd:element name="bg" type="a:CT_BackgroundFormatting" minOccurs="0" maxOccurs="1"/>
      <xsd:element name="whole" type="a:CT_WholeE2oFormatting" minOccurs="0" maxOccurs="1"/>
      <xsd:choice minOccurs="0" maxOccurs="unbounded">
        <xsd:element ref="wsp"/>
        <xsd:element ref="dpct:pic"/>
        <xsd:element name="contentPart" type="CT_WordprocessingContentPart"/>
        <xsd:element ref="wgp"/>
        <xsd:element name="graphicFrame" type="CT_GraphicFrame"/>
      </xsd:choice>
      <xsd:element name="extLst" type="a:CT_OfficeArtExtensionList" minOccurs="0" maxOccurs="1"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:element name="wpc" type="CT_WordprocessingCanvas"/>
  <xsd:element name="wgp" type="CT_WordprocessingGroup"/>
  <xsd:element name="wsp" type="CT_WordprocessingShape"/>
  <xsd:element name="inline" type="CT_Inline"/>
  <xsd:element name="anchor" type="CT_Anchor"/>
 </xsd:schema>
--- a/ooxml-schemas/ISO-IEC29500-4_2016/pml.xsd
+++ b/ooxml-schemas/ISO-IEC29500-4_2016/pml.xsd
--- a/ooxml-schemas/ISO-IEC29500-4_2016/shared-additionalCharacteristics.xsd
+++ b/ooxml-schemas/ISO-IEC29500-4_2016/shared-additionalCharacteristics.xsd
@ -0,0 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
  xmlns="http://schemas.openxmlformats.org/officeDocument/2006/characteristics"
  targetNamespace="http://schemas.openxmlformats.org/officeDocument/2006/characteristics"
  elementFormDefault="qualified">
  <xsd:complexType name="CT_AdditionalCharacteristics">
    <xsd:sequence>
      <xsd:element name="characteristic" type="CT_Characteristic" minOccurs="0"
        maxOccurs="unbounded"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_Characteristic">
    <xsd:attribute name="name" type="xsd:string" use="required"/>
    <xsd:attribute name="relation" type="ST_Relation" use="required"/>
    <xsd:attribute name="val" type="xsd:string" use="required"/>
    <xsd:attribute name="vocabulary" type="xsd:anyURI" use="optional"/>
  </xsd:complexType>
  <xsd:simpleType name="ST_Relation">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="ge"/>
      <xsd:enumeration value="le"/>
      <xsd:enumeration value="gt"/>
      <xsd:enumeration value="lt"/>
      <xsd:enumeration value="eq"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:element name="additionalCharacteristics" type="CT_AdditionalCharacteristics"/>
 </xsd:schema>
--- a/ooxml-schemas/ISO-IEC29500-4_2016/shared-bibliography.xsd
+++ b/ooxml-schemas/ISO-IEC29500-4_2016/shared-bibliography.xsd
@ -0,0 +1,144 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
  xmlns="http://schemas.openxmlformats.org/officeDocument/2006/bibliography"
  xmlns:s="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
  targetNamespace="http://schemas.openxmlformats.org/officeDocument/2006/bibliography"
  elementFormDefault="qualified">
  <xsd:import namespace="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
    schemaLocation="shared-commonSimpleTypes.xsd"/>
  <xsd:simpleType name="ST_SourceType">
    <xsd:restriction base="s:ST_String">
      <xsd:enumeration value="ArticleInAPeriodical"/>
      <xsd:enumeration value="Book"/>
      <xsd:enumeration value="BookSection"/>
      <xsd:enumeration value="JournalArticle"/>
      <xsd:enumeration value="ConferenceProceedings"/>
      <xsd:enumeration value="Report"/>
      <xsd:enumeration value="SoundRecording"/>
      <xsd:enumeration value="Performance"/>
      <xsd:enumeration value="Art"/>
      <xsd:enumeration value="DocumentFromInternetSite"/>
      <xsd:enumeration value="InternetSite"/>
      <xsd:enumeration value="Film"/>
      <xsd:enumeration value="Interview"/>
      <xsd:enumeration value="Patent"/>
      <xsd:enumeration value="ElectronicSource"/>
      <xsd:enumeration value="Case"/>
      <xsd:enumeration value="Misc"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:complexType name="CT_NameListType">
    <xsd:sequence>
      <xsd:element name="Person" type="CT_PersonType" minOccurs="1" maxOccurs="unbounded"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_PersonType">
    <xsd:sequence>
      <xsd:element name="Last" type="s:ST_String" minOccurs="0" maxOccurs="unbounded"/>
      <xsd:element name="First" type="s:ST_String" minOccurs="0" maxOccurs="unbounded"/>
      <xsd:element name="Middle" type="s:ST_String" minOccurs="0" maxOccurs="unbounded"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_NameType">
    <xsd:sequence>
      <xsd:element name="NameList" type="CT_NameListType" minOccurs="1" maxOccurs="1"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_NameOrCorporateType">
    <xsd:sequence>
      <xsd:choice minOccurs="0" maxOccurs="1">
        <xsd:element name="NameList" type="CT_NameListType" minOccurs="1" maxOccurs="1"/>
        <xsd:element name="Corporate" minOccurs="1" maxOccurs="1" type="s:ST_String"/>
      </xsd:choice>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_AuthorType">
    <xsd:sequence>
      <xsd:choice minOccurs="0" maxOccurs="unbounded">
        <xsd:element name="Artist" type="CT_NameType"/>
        <xsd:element name="Author" type="CT_NameOrCorporateType"/>
        <xsd:element name="BookAuthor" type="CT_NameType"/>
        <xsd:element name="Compiler" type="CT_NameType"/>
        <xsd:element name="Composer" type="CT_NameType"/>
        <xsd:element name="Conductor" type="CT_NameType"/>
        <xsd:element name="Counsel" type="CT_NameType"/>
        <xsd:element name="Director" type="CT_NameType"/>
        <xsd:element name="Editor" type="CT_NameType"/>
        <xsd:element name="Interviewee" type="CT_NameType"/>
        <xsd:element name="Interviewer" type="CT_NameType"/>
        <xsd:element name="Inventor" type="CT_NameType"/>
        <xsd:element name="Performer" type="CT_NameOrCorporateType"/>
        <xsd:element name="ProducerName" type="CT_NameType"/>
        <xsd:element name="Translator" type="CT_NameType"/>
        <xsd:element name="Writer" type="CT_NameType"/>
      </xsd:choice>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_SourceType">
    <xsd:sequence>
      <xsd:choice minOccurs="0" maxOccurs="unbounded">
        <xsd:element name="AbbreviatedCaseNumber" type="s:ST_String"/>
        <xsd:element name="AlbumTitle" type="s:ST_String"/>
        <xsd:element name="Author" type="CT_AuthorType"/>
        <xsd:element name="BookTitle" type="s:ST_String"/>
        <xsd:element name="Broadcaster" type="s:ST_String"/>
        <xsd:element name="BroadcastTitle" type="s:ST_String"/>
        <xsd:element name="CaseNumber" type="s:ST_String"/>
        <xsd:element name="ChapterNumber" type="s:ST_String"/>
        <xsd:element name="City" type="s:ST_String"/>
        <xsd:element name="Comments" type="s:ST_String"/>
        <xsd:element name="ConferenceName" type="s:ST_String"/>
        <xsd:element name="CountryRegion" type="s:ST_String"/>
        <xsd:element name="Court" type="s:ST_String"/>
        <xsd:element name="Day" type="s:ST_String"/>
        <xsd:element name="DayAccessed" type="s:ST_String"/>
        <xsd:element name="Department" type="s:ST_String"/>
        <xsd:element name="Distributor" type="s:ST_String"/>
        <xsd:element name="Edition" type="s:ST_String"/>
        <xsd:element name="Guid" type="s:ST_String"/>
        <xsd:element name="Institution" type="s:ST_String"/>
        <xsd:element name="InternetSiteTitle" type="s:ST_String"/>
        <xsd:element name="Issue" type="s:ST_String"/>
        <xsd:element name="JournalName" type="s:ST_String"/>
        <xsd:element name="LCID" type="s:ST_Lang"/>
        <xsd:element name="Medium" type="s:ST_String"/>
        <xsd:element name="Month" type="s:ST_String"/>
        <xsd:element name="MonthAccessed" type="s:ST_String"/>
        <xsd:element name="NumberVolumes" type="s:ST_String"/>
        <xsd:element name="Pages" type="s:ST_String"/>
        <xsd:element name="PatentNumber" type="s:ST_String"/>
        <xsd:element name="PeriodicalTitle" type="s:ST_String"/>
        <xsd:element name="ProductionCompany" type="s:ST_String"/>
        <xsd:element name="PublicationTitle" type="s:ST_String"/>
        <xsd:element name="Publisher" type="s:ST_String"/>
        <xsd:element name="RecordingNumber" type="s:ST_String"/>
        <xsd:element name="RefOrder" type="s:ST_String"/>
        <xsd:element name="Reporter" type="s:ST_String"/>
        <xsd:element name="SourceType" type="ST_SourceType"/>
        <xsd:element name="ShortTitle" type="s:ST_String"/>
        <xsd:element name="StandardNumber" type="s:ST_String"/>
        <xsd:element name="StateProvince" type="s:ST_String"/>
        <xsd:element name="Station" type="s:ST_String"/>
        <xsd:element name="Tag" type="s:ST_String"/>
        <xsd:element name="Theater" type="s:ST_String"/>
        <xsd:element name="ThesisType" type="s:ST_String"/>
        <xsd:element name="Title" type="s:ST_String"/>
        <xsd:element name="Type" type="s:ST_String"/>
        <xsd:element name="URL" type="s:ST_String"/>
        <xsd:element name="Version" type="s:ST_String"/>
        <xsd:element name="Volume" type="s:ST_String"/>
        <xsd:element name="Year" type="s:ST_String"/>
        <xsd:element name="YearAccessed" type="s:ST_String"/>
      </xsd:choice>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:element name="Sources" type="CT_Sources"/>
  <xsd:complexType name="CT_Sources">
    <xsd:sequence>
      <xsd:element name="Source" type="CT_SourceType" minOccurs="0" maxOccurs="unbounded"/>
    </xsd:sequence>
    <xsd:attribute name="SelectedStyle" type="s:ST_String"/>
    <xsd:attribute name="StyleName" type="s:ST_String"/>
    <xsd:attribute name="URI" type="s:ST_String"/>
  </xsd:complexType>
 </xsd:schema>
--- a/ooxml-schemas/ISO-IEC29500-4_2016/shared-commonSimpleTypes.xsd
+++ b/ooxml-schemas/ISO-IEC29500-4_2016/shared-commonSimpleTypes.xsd
@ -0,0 +1,172 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
  xmlns="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
  targetNamespace="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
  elementFormDefault="qualified">
  <xsd:simpleType name="ST_Lang">
    <xsd:restriction base="xsd:string"/>
  </xsd:simpleType>
  <xsd:simpleType name="ST_HexColorRGB">
    <xsd:restriction base="xsd:hexBinary">
      <xsd:length value="3" fixed="true"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_Panose">
    <xsd:restriction base="xsd:hexBinary">
      <xsd:length value="10"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_CalendarType">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="gregorian"/>
      <xsd:enumeration value="gregorianUs"/>
      <xsd:enumeration value="gregorianMeFrench"/>
      <xsd:enumeration value="gregorianArabic"/>
      <xsd:enumeration value="hijri"/>
      <xsd:enumeration value="hebrew"/>
      <xsd:enumeration value="taiwan"/>
      <xsd:enumeration value="japan"/>
      <xsd:enumeration value="thai"/>
      <xsd:enumeration value="korea"/>
      <xsd:enumeration value="saka"/>
      <xsd:enumeration value="gregorianXlitEnglish"/>
      <xsd:enumeration value="gregorianXlitFrench"/>
      <xsd:enumeration value="none"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_AlgClass">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="hash"/>
      <xsd:enumeration value="custom"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_CryptProv">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="rsaAES"/>
      <xsd:enumeration value="rsaFull"/>
      <xsd:enumeration value="custom"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_AlgType">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="typeAny"/>
      <xsd:enumeration value="custom"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_ColorType">
    <xsd:restriction base="xsd:string"/>
  </xsd:simpleType>
  <xsd:simpleType name="ST_Guid">
    <xsd:restriction base="xsd:token">
      <xsd:pattern value="\{[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}\}"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_OnOff">
    <xsd:union memberTypes="xsd:boolean ST_OnOff1"/>
  </xsd:simpleType>
  <xsd:simpleType name="ST_OnOff1">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="on"/>
      <xsd:enumeration value="off"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_String">
    <xsd:restriction base="xsd:string"/>
  </xsd:simpleType>
  <xsd:simpleType name="ST_XmlName">
    <xsd:restriction base="xsd:NCName">
      <xsd:minLength value="1"/>
      <xsd:maxLength value="255"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_TrueFalse">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="t"/>
      <xsd:enumeration value="f"/>
      <xsd:enumeration value="true"/>
      <xsd:enumeration value="false"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_TrueFalseBlank">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="t"/>
      <xsd:enumeration value="f"/>
      <xsd:enumeration value="true"/>
      <xsd:enumeration value="false"/>
      <xsd:enumeration value=""/>
      <xsd:enumeration value="True"/>
      <xsd:enumeration value="False"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_UnsignedDecimalNumber">
    <xsd:restriction base="xsd:unsignedLong"/>
  </xsd:simpleType>
  <xsd:simpleType name="ST_TwipsMeasure">
    <xsd:union memberTypes="ST_UnsignedDecimalNumber ST_PositiveUniversalMeasure"/>
  </xsd:simpleType>
  <xsd:simpleType name="ST_VerticalAlignRun">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="baseline"/>
      <xsd:enumeration value="superscript"/>
      <xsd:enumeration value="subscript"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_Xstring">
    <xsd:restriction base="xsd:string"/>
  </xsd:simpleType>
  <xsd:simpleType name="ST_XAlign">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="left"/>
      <xsd:enumeration value="center"/>
      <xsd:enumeration value="right"/>
      <xsd:enumeration value="inside"/>
      <xsd:enumeration value="outside"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_YAlign">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="inline"/>
      <xsd:enumeration value="top"/>
      <xsd:enumeration value="center"/>
      <xsd:enumeration value="bottom"/>
      <xsd:enumeration value="inside"/>
      <xsd:enumeration value="outside"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_ConformanceClass">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="strict"/>
      <xsd:enumeration value="transitional"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_UniversalMeasure">
    <xsd:restriction base="xsd:string">
      <xsd:pattern value="-?[0-9]+(\.[0-9]+)?(mm|cm|in|pt|pc|pi)"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_PositiveUniversalMeasure">
    <xsd:restriction base="ST_UniversalMeasure">
      <xsd:pattern value="[0-9]+(\.[0-9]+)?(mm|cm|in|pt|pc|pi)"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_Percentage">
    <xsd:restriction base="xsd:string">
      <xsd:pattern value="-?[0-9]+(\.[0-9]+)?%"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_FixedPercentage">
    <xsd:restriction base="ST_Percentage">
      <xsd:pattern value="-?((100)|([0-9][0-9]?))(\.[0-9][0-9]?)?%"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_PositivePercentage">
    <xsd:restriction base="ST_Percentage">
      <xsd:pattern value="[0-9]+(\.[0-9]+)?%"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_PositiveFixedPercentage">
    <xsd:restriction base="ST_Percentage">
      <xsd:pattern value="((100)|([0-9][0-9]?))(\.[0-9][0-9]?)?%"/>
    </xsd:restriction>
  </xsd:simpleType>
 </xsd:schema>
--- a/ooxml-schemas/ISO-IEC29500-4_2016/shared-customXmlDataProperties.xsd
+++ b/ooxml-schemas/ISO-IEC29500-4_2016/shared-customXmlDataProperties.xsd
@ -0,0 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
  xmlns="http://schemas.openxmlformats.org/officeDocument/2006/customXml"
  xmlns:s="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
  targetNamespace="http://schemas.openxmlformats.org/officeDocument/2006/customXml"
  elementFormDefault="qualified" attributeFormDefault="qualified" blockDefault="#all">
  <xsd:import namespace="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
    schemaLocation="shared-commonSimpleTypes.xsd"/>
  <xsd:complexType name="CT_DatastoreSchemaRef">
    <xsd:attribute name="uri" type="xsd:string" use="required"/>
  </xsd:complexType>
  <xsd:complexType name="CT_DatastoreSchemaRefs">
    <xsd:sequence>
      <xsd:element name="schemaRef" type="CT_DatastoreSchemaRef" minOccurs="0" maxOccurs="unbounded"
      />
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_DatastoreItem">
    <xsd:sequence>
      <xsd:element name="schemaRefs" type="CT_DatastoreSchemaRefs" minOccurs="0"/>
    </xsd:sequence>
    <xsd:attribute name="itemID" type="s:ST_Guid" use="required"/>
  </xsd:complexType>
  <xsd:element name="datastoreItem" type="CT_DatastoreItem"/>
 </xsd:schema>
--- a/ooxml-schemas/ISO-IEC29500-4_2016/shared-customXmlSchemaProperties.xsd
+++ b/ooxml-schemas/ISO-IEC29500-4_2016/shared-customXmlSchemaProperties.xsd
@ -0,0 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
  xmlns="http://schemas.openxmlformats.org/schemaLibrary/2006/main"
  targetNamespace="http://schemas.openxmlformats.org/schemaLibrary/2006/main"
  attributeFormDefault="qualified" elementFormDefault="qualified">
  <xsd:complexType name="CT_Schema">
    <xsd:attribute name="uri" type="xsd:string" default=""/>
    <xsd:attribute name="manifestLocation" type="xsd:string"/>
    <xsd:attribute name="schemaLocation" type="xsd:string"/>
    <xsd:attribute name="schemaLanguage" type="xsd:token"/>
  </xsd:complexType>
  <xsd:complexType name="CT_SchemaLibrary">
    <xsd:sequence>
      <xsd:element name="schema" type="CT_Schema" minOccurs="0" maxOccurs="unbounded"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:element name="schemaLibrary" type="CT_SchemaLibrary"/>
 </xsd:schema>
--- a/ooxml-schemas/ISO-IEC29500-4_2016/shared-documentPropertiesCustom.xsd
+++ b/ooxml-schemas/ISO-IEC29500-4_2016/shared-documentPropertiesCustom.xsd
@ -0,0 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
  xmlns="http://schemas.openxmlformats.org/officeDocument/2006/custom-properties"
  xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"
  xmlns:s="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
  targetNamespace="http://schemas.openxmlformats.org/officeDocument/2006/custom-properties"
  blockDefault="#all" elementFormDefault="qualified">
  <xsd:import namespace="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"
    schemaLocation="shared-documentPropertiesVariantTypes.xsd"/>
  <xsd:import namespace="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
    schemaLocation="shared-commonSimpleTypes.xsd"/>
  <xsd:element name="Properties" type="CT_Properties"/>
  <xsd:complexType name="CT_Properties">
    <xsd:sequence>
      <xsd:element name="property" minOccurs="0" maxOccurs="unbounded" type="CT_Property"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_Property">
    <xsd:choice minOccurs="1" maxOccurs="1">
      <xsd:element ref="vt:vector"/>
      <xsd:element ref="vt:array"/>
      <xsd:element ref="vt:blob"/>
      <xsd:element ref="vt:oblob"/>
      <xsd:element ref="vt:empty"/>
      <xsd:element ref="vt:null"/>
      <xsd:element ref="vt:i1"/>
      <xsd:element ref="vt:i2"/>
      <xsd:element ref="vt:i4"/>
      <xsd:element ref="vt:i8"/>
      <xsd:element ref="vt:int"/>
      <xsd:element ref="vt:ui1"/>
      <xsd:element ref="vt:ui2"/>
      <xsd:element ref="vt:ui4"/>
      <xsd:element ref="vt:ui8"/>
      <xsd:element ref="vt:uint"/>
      <xsd:element ref="vt:r4"/>
      <xsd:element ref="vt:r8"/>
      <xsd:element ref="vt:decimal"/>
      <xsd:element ref="vt:lpstr"/>
      <xsd:element ref="vt:lpwstr"/>
      <xsd:element ref="vt:bstr"/>
      <xsd:element ref="vt:date"/>
      <xsd:element ref="vt:filetime"/>
      <xsd:element ref="vt:bool"/>
      <xsd:element ref="vt:cy"/>
      <xsd:element ref="vt:error"/>
      <xsd:element ref="vt:stream"/>
      <xsd:element ref="vt:ostream"/>
      <xsd:element ref="vt:storage"/>
      <xsd:element ref="vt:ostorage"/>
      <xsd:element ref="vt:vstream"/>
      <xsd:element ref="vt:clsid"/>
    </xsd:choice>
    <xsd:attribute name="fmtid" use="required" type="s:ST_Guid"/>
    <xsd:attribute name="pid" use="required" type="xsd:int"/>
    <xsd:attribute name="name" use="optional" type="xsd:string"/>
    <xsd:attribute name="linkTarget" use="optional" type="xsd:string"/>
  </xsd:complexType>
 </xsd:schema>
--- a/ooxml-schemas/ISO-IEC29500-4_2016/shared-documentPropertiesExtended.xsd
+++ b/ooxml-schemas/ISO-IEC29500-4_2016/shared-documentPropertiesExtended.xsd
@ -0,0 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
  xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties"
  xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"
  targetNamespace="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties"
  elementFormDefault="qualified" blockDefault="#all">
  <xsd:import namespace="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"
    schemaLocation="shared-documentPropertiesVariantTypes.xsd"/>
  <xsd:element name="Properties" type="CT_Properties"/>
  <xsd:complexType name="CT_Properties">
    <xsd:all>
      <xsd:element name="Template" minOccurs="0" maxOccurs="1" type="xsd:string"/>
      <xsd:element name="Manager" minOccurs="0" maxOccurs="1" type="xsd:string"/>
      <xsd:element name="Company" minOccurs="0" maxOccurs="1" type="xsd:string"/>
      <xsd:element name="Pages" minOccurs="0" maxOccurs="1" type="xsd:int"/>
      <xsd:element name="Words" minOccurs="0" maxOccurs="1" type="xsd:int"/>
      <xsd:element name="Characters" minOccurs="0" maxOccurs="1" type="xsd:int"/>
      <xsd:element name="PresentationFormat" minOccurs="0" maxOccurs="1" type="xsd:string"/>
      <xsd:element name="Lines" minOccurs="0" maxOccurs="1" type="xsd:int"/>
      <xsd:element name="Paragraphs" minOccurs="0" maxOccurs="1" type="xsd:int"/>
      <xsd:element name="Slides" minOccurs="0" maxOccurs="1" type="xsd:int"/>
      <xsd:element name="Notes" minOccurs="0" maxOccurs="1" type="xsd:int"/>
      <xsd:element name="TotalTime" minOccurs="0" maxOccurs="1" type="xsd:int"/>
      <xsd:element name="HiddenSlides" minOccurs="0" maxOccurs="1" type="xsd:int"/>
      <xsd:element name="MMClips" minOccurs="0" maxOccurs="1" type="xsd:int"/>
      <xsd:element name="ScaleCrop" minOccurs="0" maxOccurs="1" type="xsd:boolean"/>
      <xsd:element name="HeadingPairs" minOccurs="0" maxOccurs="1" type="CT_VectorVariant"/>
      <xsd:element name="TitlesOfParts" minOccurs="0" maxOccurs="1" type="CT_VectorLpstr"/>
      <xsd:element name="LinksUpToDate" minOccurs="0" maxOccurs="1" type="xsd:boolean"/>
      <xsd:element name="CharactersWithSpaces" minOccurs="0" maxOccurs="1" type="xsd:int"/>
      <xsd:element name="SharedDoc" minOccurs="0" maxOccurs="1" type="xsd:boolean"/>
      <xsd:element name="HyperlinkBase" minOccurs="0" maxOccurs="1" type="xsd:string"/>
      <xsd:element name="HLinks" minOccurs="0" maxOccurs="1" type="CT_VectorVariant"/>
      <xsd:element name="HyperlinksChanged" minOccurs="0" maxOccurs="1" type="xsd:boolean"/>
      <xsd:element name="DigSig" minOccurs="0" maxOccurs="1" type="CT_DigSigBlob"/>
      <xsd:element name="Application" minOccurs="0" maxOccurs="1" type="xsd:string"/>
      <xsd:element name="AppVersion" minOccurs="0" maxOccurs="1" type="xsd:string"/>
      <xsd:element name="DocSecurity" minOccurs="0" maxOccurs="1" type="xsd:int"/>
    </xsd:all>
  </xsd:complexType>
  <xsd:complexType name="CT_VectorVariant">
    <xsd:sequence minOccurs="1" maxOccurs="1">
      <xsd:element ref="vt:vector"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_VectorLpstr">
    <xsd:sequence minOccurs="1" maxOccurs="1">
      <xsd:element ref="vt:vector"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_DigSigBlob">
    <xsd:sequence minOccurs="1" maxOccurs="1">
      <xsd:element ref="vt:blob"/>
    </xsd:sequence>
  </xsd:complexType>
 </xsd:schema>
--- a/ooxml-schemas/ISO-IEC29500-4_2016/shared-documentPropertiesVariantTypes.xsd
+++ b/ooxml-schemas/ISO-IEC29500-4_2016/shared-documentPropertiesVariantTypes.xsd
@ -0,0 +1,195 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
  xmlns="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"
  xmlns:s="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
  targetNamespace="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"
  blockDefault="#all" elementFormDefault="qualified">
  <xsd:import namespace="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
    schemaLocation="shared-commonSimpleTypes.xsd"/>
  <xsd:simpleType name="ST_VectorBaseType">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="variant"/>
      <xsd:enumeration value="i1"/>
      <xsd:enumeration value="i2"/>
      <xsd:enumeration value="i4"/>
      <xsd:enumeration value="i8"/>
      <xsd:enumeration value="ui1"/>
      <xsd:enumeration value="ui2"/>
      <xsd:enumeration value="ui4"/>
      <xsd:enumeration value="ui8"/>
      <xsd:enumeration value="r4"/>
      <xsd:enumeration value="r8"/>
      <xsd:enumeration value="lpstr"/>
      <xsd:enumeration value="lpwstr"/>
      <xsd:enumeration value="bstr"/>
      <xsd:enumeration value="date"/>
      <xsd:enumeration value="filetime"/>
      <xsd:enumeration value="bool"/>
      <xsd:enumeration value="cy"/>
      <xsd:enumeration value="error"/>
      <xsd:enumeration value="clsid"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_ArrayBaseType">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="variant"/>
      <xsd:enumeration value="i1"/>
      <xsd:enumeration value="i2"/>
      <xsd:enumeration value="i4"/>
      <xsd:enumeration value="int"/>
      <xsd:enumeration value="ui1"/>
      <xsd:enumeration value="ui2"/>
      <xsd:enumeration value="ui4"/>
      <xsd:enumeration value="uint"/>
      <xsd:enumeration value="r4"/>
      <xsd:enumeration value="r8"/>
      <xsd:enumeration value="decimal"/>
      <xsd:enumeration value="bstr"/>
      <xsd:enumeration value="date"/>
      <xsd:enumeration value="bool"/>
      <xsd:enumeration value="cy"/>
      <xsd:enumeration value="error"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_Cy">
    <xsd:restriction base="xsd:string">
      <xsd:pattern value="\s*[0-9]*\.[0-9]{4}\s*"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_Error">
    <xsd:restriction base="xsd:string">
      <xsd:pattern value="\s*0x[0-9A-Za-z]{8}\s*"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:complexType name="CT_Empty"/>
  <xsd:complexType name="CT_Null"/>
  <xsd:complexType name="CT_Vector">
    <xsd:choice minOccurs="1" maxOccurs="unbounded">
      <xsd:element ref="variant"/>
      <xsd:element ref="i1"/>
      <xsd:element ref="i2"/>
      <xsd:element ref="i4"/>
      <xsd:element ref="i8"/>
      <xsd:element ref="ui1"/>
      <xsd:element ref="ui2"/>
      <xsd:element ref="ui4"/>
      <xsd:element ref="ui8"/>
      <xsd:element ref="r4"/>
      <xsd:element ref="r8"/>
      <xsd:element ref="lpstr"/>
      <xsd:element ref="lpwstr"/>
      <xsd:element ref="bstr"/>
      <xsd:element ref="date"/>
      <xsd:element ref="filetime"/>
      <xsd:element ref="bool"/>
      <xsd:element ref="cy"/>
      <xsd:element ref="error"/>
      <xsd:element ref="clsid"/>
    </xsd:choice>
    <xsd:attribute name="baseType" type="ST_VectorBaseType" use="required"/>
    <xsd:attribute name="size" type="xsd:unsignedInt" use="required"/>
  </xsd:complexType>
  <xsd:complexType name="CT_Array">
    <xsd:choice minOccurs="1" maxOccurs="unbounded">
      <xsd:element ref="variant"/>
      <xsd:element ref="i1"/>
      <xsd:element ref="i2"/>
      <xsd:element ref="i4"/>
      <xsd:element ref="int"/>
      <xsd:element ref="ui1"/>
      <xsd:element ref="ui2"/>
      <xsd:element ref="ui4"/>
      <xsd:element ref="uint"/>
      <xsd:element ref="r4"/>
      <xsd:element ref="r8"/>
      <xsd:element ref="decimal"/>
      <xsd:element ref="bstr"/>
      <xsd:element ref="date"/>
      <xsd:element ref="bool"/>
      <xsd:element ref="error"/>
      <xsd:element ref="cy"/>
    </xsd:choice>
    <xsd:attribute name="lBounds" type="xsd:int" use="required"/>
    <xsd:attribute name="uBounds" type="xsd:int" use="required"/>
    <xsd:attribute name="baseType" type="ST_ArrayBaseType" use="required"/>
  </xsd:complexType>
  <xsd:complexType name="CT_Variant">
    <xsd:choice minOccurs="1" maxOccurs="1">
      <xsd:element ref="variant"/>
      <xsd:element ref="vector"/>
      <xsd:element ref="array"/>
      <xsd:element ref="blob"/>
      <xsd:element ref="oblob"/>
      <xsd:element ref="empty"/>
      <xsd:element ref="null"/>
      <xsd:element ref="i1"/>
      <xsd:element ref="i2"/>
      <xsd:element ref="i4"/>
      <xsd:element ref="i8"/>
      <xsd:element ref="int"/>
      <xsd:element ref="ui1"/>
      <xsd:element ref="ui2"/>
      <xsd:element ref="ui4"/>
      <xsd:element ref="ui8"/>
      <xsd:element ref="uint"/>
      <xsd:element ref="r4"/>
      <xsd:element ref="r8"/>
      <xsd:element ref="decimal"/>
      <xsd:element ref="lpstr"/>
      <xsd:element ref="lpwstr"/>
      <xsd:element ref="bstr"/>
      <xsd:element ref="date"/>
      <xsd:element ref="filetime"/>
      <xsd:element ref="bool"/>
      <xsd:element ref="cy"/>
      <xsd:element ref="error"/>
      <xsd:element ref="stream"/>
      <xsd:element ref="ostream"/>
      <xsd:element ref="storage"/>
      <xsd:element ref="ostorage"/>
      <xsd:element ref="vstream"/>
      <xsd:element ref="clsid"/>
    </xsd:choice>
  </xsd:complexType>
  <xsd:complexType name="CT_Vstream">
    <xsd:simpleContent>
      <xsd:extension base="xsd:base64Binary">
        <xsd:attribute name="version" type="s:ST_Guid"/>
      </xsd:extension>
    </xsd:simpleContent>
  </xsd:complexType>
  <xsd:element name="variant" type="CT_Variant"/>
  <xsd:element name="vector" type="CT_Vector"/>
  <xsd:element name="array" type="CT_Array"/>
  <xsd:element name="blob" type="xsd:base64Binary"/>
  <xsd:element name="oblob" type="xsd:base64Binary"/>
  <xsd:element name="empty" type="CT_Empty"/>
  <xsd:element name="null" type="CT_Null"/>
  <xsd:element name="i1" type="xsd:byte"/>
  <xsd:element name="i2" type="xsd:short"/>
  <xsd:element name="i4" type="xsd:int"/>
  <xsd:element name="i8" type="xsd:long"/>
  <xsd:element name="int" type="xsd:int"/>
  <xsd:element name="ui1" type="xsd:unsignedByte"/>
  <xsd:element name="ui2" type="xsd:unsignedShort"/>
  <xsd:element name="ui4" type="xsd:unsignedInt"/>
  <xsd:element name="ui8" type="xsd:unsignedLong"/>
  <xsd:element name="uint" type="xsd:unsignedInt"/>
  <xsd:element name="r4" type="xsd:float"/>
  <xsd:element name="r8" type="xsd:double"/>
  <xsd:element name="decimal" type="xsd:decimal"/>
  <xsd:element name="lpstr" type="xsd:string"/>
  <xsd:element name="lpwstr" type="xsd:string"/>
  <xsd:element name="bstr" type="xsd:string"/>
  <xsd:element name="date" type="xsd:dateTime"/>
  <xsd:element name="filetime" type="xsd:dateTime"/>
  <xsd:element name="bool" type="xsd:boolean"/>
  <xsd:element name="cy" type="ST_Cy"/>
  <xsd:element name="error" type="ST_Error"/>
  <xsd:element name="stream" type="xsd:base64Binary"/>
  <xsd:element name="ostream" type="xsd:base64Binary"/>
  <xsd:element name="storage" type="xsd:base64Binary"/>
  <xsd:element name="ostorage" type="xsd:base64Binary"/>
  <xsd:element name="vstream" type="CT_Vstream"/>
  <xsd:element name="clsid" type="s:ST_Guid"/>
 </xsd:schema>
--- a/ooxml-schemas/ISO-IEC29500-4_2016/shared-math.xsd
+++ b/ooxml-schemas/ISO-IEC29500-4_2016/shared-math.xsd
@ -0,0 +1,582 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
  xmlns="http://schemas.openxmlformats.org/officeDocument/2006/math"
  xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math"
  xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
  xmlns:s="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
  elementFormDefault="qualified" attributeFormDefault="qualified" blockDefault="#all"
  targetNamespace="http://schemas.openxmlformats.org/officeDocument/2006/math">
  <xsd:import namespace="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
    schemaLocation="wml.xsd"/>
  <xsd:import namespace="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
    schemaLocation="shared-commonSimpleTypes.xsd"/>
  <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
  <xsd:simpleType name="ST_Integer255">
    <xsd:restriction base="xsd:integer">
      <xsd:minInclusive value="1"/>
      <xsd:maxInclusive value="255"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:complexType name="CT_Integer255">
    <xsd:attribute name="val" type="ST_Integer255" use="required"/>
  </xsd:complexType>
  <xsd:simpleType name="ST_Integer2">
    <xsd:restriction base="xsd:integer">
      <xsd:minInclusive value="-2"/>
      <xsd:maxInclusive value="2"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:complexType name="CT_Integer2">
    <xsd:attribute name="val" type="ST_Integer2" use="required"/>
  </xsd:complexType>
  <xsd:simpleType name="ST_SpacingRule">
    <xsd:restriction base="xsd:integer">
      <xsd:minInclusive value="0"/>
      <xsd:maxInclusive value="4"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:complexType name="CT_SpacingRule">
    <xsd:attribute name="val" type="ST_SpacingRule" use="required"/>
  </xsd:complexType>
  <xsd:simpleType name="ST_UnSignedInteger">
    <xsd:restriction base="xsd:unsignedInt"/>
  </xsd:simpleType>
  <xsd:complexType name="CT_UnSignedInteger">
    <xsd:attribute name="val" type="ST_UnSignedInteger" use="required"/>
  </xsd:complexType>
  <xsd:simpleType name="ST_Char">
    <xsd:restriction base="xsd:string">
      <xsd:maxLength value="1"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:complexType name="CT_Char">
    <xsd:attribute name="val" type="ST_Char" use="required"/>
  </xsd:complexType>
  <xsd:complexType name="CT_OnOff">
    <xsd:attribute name="val" type="s:ST_OnOff"/>
  </xsd:complexType>
  <xsd:complexType name="CT_String">
    <xsd:attribute name="val" type="s:ST_String"/>
  </xsd:complexType>
  <xsd:complexType name="CT_XAlign">
    <xsd:attribute name="val" type="s:ST_XAlign" use="required"/>
  </xsd:complexType>
  <xsd:complexType name="CT_YAlign">
    <xsd:attribute name="val" type="s:ST_YAlign" use="required"/>
  </xsd:complexType>
  <xsd:simpleType name="ST_Shp">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="centered"/>
      <xsd:enumeration value="match"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:complexType name="CT_Shp">
    <xsd:attribute name="val" type="ST_Shp" use="required"/>
  </xsd:complexType>
  <xsd:simpleType name="ST_FType">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="bar"/>
      <xsd:enumeration value="skw"/>
      <xsd:enumeration value="lin"/>
      <xsd:enumeration value="noBar"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:complexType name="CT_FType">
    <xsd:attribute name="val" type="ST_FType" use="required"/>
  </xsd:complexType>
  <xsd:simpleType name="ST_LimLoc">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="undOvr"/>
      <xsd:enumeration value="subSup"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:complexType name="CT_LimLoc">
    <xsd:attribute name="val" type="ST_LimLoc" use="required"/>
  </xsd:complexType>
  <xsd:simpleType name="ST_TopBot">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="top"/>
      <xsd:enumeration value="bot"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:complexType name="CT_TopBot">
    <xsd:attribute name="val" type="ST_TopBot" use="required"/>
  </xsd:complexType>
  <xsd:simpleType name="ST_Script">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="roman"/>
      <xsd:enumeration value="script"/>
      <xsd:enumeration value="fraktur"/>
      <xsd:enumeration value="double-struck"/>
      <xsd:enumeration value="sans-serif"/>
      <xsd:enumeration value="monospace"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:complexType name="CT_Script">
    <xsd:attribute name="val" type="ST_Script"/>
  </xsd:complexType>
  <xsd:simpleType name="ST_Style">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="p"/>
      <xsd:enumeration value="b"/>
      <xsd:enumeration value="i"/>
      <xsd:enumeration value="bi"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:complexType name="CT_Style">
    <xsd:attribute name="val" type="ST_Style"/>
  </xsd:complexType>
  <xsd:complexType name="CT_ManualBreak">
    <xsd:attribute name="alnAt" type="ST_Integer255"/>
  </xsd:complexType>
  <xsd:group name="EG_ScriptStyle">
    <xsd:sequence>
      <xsd:element name="scr" minOccurs="0" type="CT_Script"/>
      <xsd:element name="sty" minOccurs="0" type="CT_Style"/>
    </xsd:sequence>
  </xsd:group>
  <xsd:complexType name="CT_RPR">
    <xsd:sequence>
      <xsd:element name="lit" minOccurs="0" type="CT_OnOff"/>
      <xsd:choice>
        <xsd:element name="nor" minOccurs="0" type="CT_OnOff"/>
        <xsd:sequence>
          <xsd:group ref="EG_ScriptStyle"/>
        </xsd:sequence>
      </xsd:choice>
      <xsd:element name="brk" minOccurs="0" type="CT_ManualBreak"/>
      <xsd:element name="aln" minOccurs="0" type="CT_OnOff"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_Text">
    <xsd:simpleContent>
      <xsd:extension base="s:ST_String">
        <xsd:attribute ref="xml:space" use="optional"/>
      </xsd:extension>
    </xsd:simpleContent>
  </xsd:complexType>
  <xsd:complexType name="CT_R">
    <xsd:sequence>
      <xsd:element name="rPr" type="CT_RPR" minOccurs="0"/>
      <xsd:group ref="w:EG_RPr" minOccurs="0"/>
      <xsd:choice minOccurs="0" maxOccurs="unbounded">
        <xsd:group ref="w:EG_RunInnerContent"/>
        <xsd:element name="t" type="CT_Text" minOccurs="0"/>
      </xsd:choice>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_CtrlPr">
    <xsd:sequence>
      <xsd:group ref="w:EG_RPrMath" minOccurs="0"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_AccPr">
    <xsd:sequence>
      <xsd:element name="chr" type="CT_Char" minOccurs="0"/>
      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_Acc">
    <xsd:sequence>
      <xsd:element name="accPr" type="CT_AccPr" minOccurs="0"/>
      <xsd:element name="e" type="CT_OMathArg"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_BarPr">
    <xsd:sequence>
      <xsd:element name="pos" type="CT_TopBot" minOccurs="0"/>
      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_Bar">
    <xsd:sequence>
      <xsd:element name="barPr" type="CT_BarPr" minOccurs="0"/>
      <xsd:element name="e" type="CT_OMathArg"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_BoxPr">
    <xsd:sequence>
      <xsd:element name="opEmu" type="CT_OnOff" minOccurs="0"/>
      <xsd:element name="noBreak" type="CT_OnOff" minOccurs="0"/>
      <xsd:element name="diff" type="CT_OnOff" minOccurs="0"/>
      <xsd:element name="brk" type="CT_ManualBreak" minOccurs="0"/>
      <xsd:element name="aln" type="CT_OnOff" minOccurs="0"/>
      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_Box">
    <xsd:sequence>
      <xsd:element name="boxPr" type="CT_BoxPr" minOccurs="0"/>
      <xsd:element name="e" type="CT_OMathArg"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_BorderBoxPr">
    <xsd:sequence>
      <xsd:element name="hideTop" type="CT_OnOff" minOccurs="0"/>
      <xsd:element name="hideBot" type="CT_OnOff" minOccurs="0"/>
      <xsd:element name="hideLeft" type="CT_OnOff" minOccurs="0"/>
      <xsd:element name="hideRight" type="CT_OnOff" minOccurs="0"/>
      <xsd:element name="strikeH" type="CT_OnOff" minOccurs="0"/>
      <xsd:element name="strikeV" type="CT_OnOff" minOccurs="0"/>
      <xsd:element name="strikeBLTR" type="CT_OnOff" minOccurs="0"/>
      <xsd:element name="strikeTLBR" type="CT_OnOff" minOccurs="0"/>
      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_BorderBox">
    <xsd:sequence>
      <xsd:element name="borderBoxPr" type="CT_BorderBoxPr" minOccurs="0"/>
      <xsd:element name="e" type="CT_OMathArg"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_DPr">
    <xsd:sequence>
      <xsd:element name="begChr" type="CT_Char" minOccurs="0"/>
      <xsd:element name="sepChr" type="CT_Char" minOccurs="0"/>
      <xsd:element name="endChr" type="CT_Char" minOccurs="0"/>
      <xsd:element name="grow" type="CT_OnOff" minOccurs="0"/>
      <xsd:element name="shp" type="CT_Shp" minOccurs="0"/>
      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_D">
    <xsd:sequence>
      <xsd:element name="dPr" type="CT_DPr" minOccurs="0"/>
      <xsd:element name="e" type="CT_OMathArg" maxOccurs="unbounded"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_EqArrPr">
    <xsd:sequence>
      <xsd:element name="baseJc" type="CT_YAlign" minOccurs="0"/>
      <xsd:element name="maxDist" type="CT_OnOff" minOccurs="0"/>
      <xsd:element name="objDist" type="CT_OnOff" minOccurs="0"/>
      <xsd:element name="rSpRule" type="CT_SpacingRule" minOccurs="0"/>
      <xsd:element name="rSp" type="CT_UnSignedInteger" minOccurs="0"/>
      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_EqArr">
    <xsd:sequence>
      <xsd:element name="eqArrPr" type="CT_EqArrPr" minOccurs="0"/>
      <xsd:element name="e" type="CT_OMathArg" maxOccurs="unbounded"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_FPr">
    <xsd:sequence>
      <xsd:element name="type" type="CT_FType" minOccurs="0"/>
      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_F">
    <xsd:sequence>
      <xsd:element name="fPr" type="CT_FPr" minOccurs="0"/>
      <xsd:element name="num" type="CT_OMathArg"/>
      <xsd:element name="den" type="CT_OMathArg"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_FuncPr">
    <xsd:sequence>
      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_Func">
    <xsd:sequence>
      <xsd:element name="funcPr" type="CT_FuncPr" minOccurs="0"/>
      <xsd:element name="fName" type="CT_OMathArg"/>
      <xsd:element name="e" type="CT_OMathArg"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_GroupChrPr">
    <xsd:sequence>
      <xsd:element name="chr" type="CT_Char" minOccurs="0"/>
      <xsd:element name="pos" type="CT_TopBot" minOccurs="0"/>
      <xsd:element name="vertJc" type="CT_TopBot" minOccurs="0"/>
      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_GroupChr">
    <xsd:sequence>
      <xsd:element name="groupChrPr" type="CT_GroupChrPr" minOccurs="0"/>
      <xsd:element name="e" type="CT_OMathArg"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_LimLowPr">
    <xsd:sequence>
      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_LimLow">
    <xsd:sequence>
      <xsd:element name="limLowPr" type="CT_LimLowPr" minOccurs="0"/>
      <xsd:element name="e" type="CT_OMathArg"/>
      <xsd:element name="lim" type="CT_OMathArg"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_LimUppPr">
    <xsd:sequence>
      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_LimUpp">
    <xsd:sequence>
      <xsd:element name="limUppPr" type="CT_LimUppPr" minOccurs="0"/>
      <xsd:element name="e" type="CT_OMathArg"/>
      <xsd:element name="lim" type="CT_OMathArg"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_MCPr">
    <xsd:sequence>
      <xsd:element name="count" type="CT_Integer255" minOccurs="0"/>
      <xsd:element name="mcJc" type="CT_XAlign" minOccurs="0"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_MC">
    <xsd:sequence>
      <xsd:element name="mcPr" type="CT_MCPr" minOccurs="0"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_MCS">
    <xsd:sequence>
      <xsd:element name="mc" type="CT_MC" maxOccurs="unbounded"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_MPr">
    <xsd:sequence>
      <xsd:element name="baseJc" type="CT_YAlign" minOccurs="0"/>
      <xsd:element name="plcHide" type="CT_OnOff" minOccurs="0"/>
      <xsd:element name="rSpRule" type="CT_SpacingRule" minOccurs="0"/>
      <xsd:element name="cGpRule" type="CT_SpacingRule" minOccurs="0"/>
      <xsd:element name="rSp" type="CT_UnSignedInteger" minOccurs="0"/>
      <xsd:element name="cSp" type="CT_UnSignedInteger" minOccurs="0"/>
      <xsd:element name="cGp" type="CT_UnSignedInteger" minOccurs="0"/>
      <xsd:element name="mcs" type="CT_MCS" minOccurs="0"/>
      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_MR">
    <xsd:sequence>
      <xsd:element name="e" type="CT_OMathArg" maxOccurs="unbounded"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_M">
    <xsd:sequence>
      <xsd:element name="mPr" type="CT_MPr" minOccurs="0"/>
      <xsd:element name="mr" type="CT_MR" maxOccurs="unbounded"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_NaryPr">
    <xsd:sequence>
      <xsd:element name="chr" type="CT_Char" minOccurs="0"/>
      <xsd:element name="limLoc" type="CT_LimLoc" minOccurs="0"/>
      <xsd:element name="grow" type="CT_OnOff" minOccurs="0"/>
      <xsd:element name="subHide" type="CT_OnOff" minOccurs="0"/>
      <xsd:element name="supHide" type="CT_OnOff" minOccurs="0"/>
      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_Nary">
    <xsd:sequence>
      <xsd:element name="naryPr" type="CT_NaryPr" minOccurs="0"/>
      <xsd:element name="sub" type="CT_OMathArg"/>
      <xsd:element name="sup" type="CT_OMathArg"/>
      <xsd:element name="e" type="CT_OMathArg"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_PhantPr">
    <xsd:sequence>
      <xsd:element name="show" type="CT_OnOff" minOccurs="0"/>
      <xsd:element name="zeroWid" type="CT_OnOff" minOccurs="0"/>
      <xsd:element name="zeroAsc" type="CT_OnOff" minOccurs="0"/>
      <xsd:element name="zeroDesc" type="CT_OnOff" minOccurs="0"/>
      <xsd:element name="transp" type="CT_OnOff" minOccurs="0"/>
      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_Phant">
    <xsd:sequence>
      <xsd:element name="phantPr" type="CT_PhantPr" minOccurs="0"/>
      <xsd:element name="e" type="CT_OMathArg"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_RadPr">
    <xsd:sequence>
      <xsd:element name="degHide" type="CT_OnOff" minOccurs="0"/>
      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_Rad">
    <xsd:sequence>
      <xsd:element name="radPr" type="CT_RadPr" minOccurs="0"/>
      <xsd:element name="deg" type="CT_OMathArg"/>
      <xsd:element name="e" type="CT_OMathArg"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_SPrePr">
    <xsd:sequence>
      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_SPre">
    <xsd:sequence>
      <xsd:element name="sPrePr" type="CT_SPrePr" minOccurs="0"/>
      <xsd:element name="sub" type="CT_OMathArg"/>
      <xsd:element name="sup" type="CT_OMathArg"/>
      <xsd:element name="e" type="CT_OMathArg"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_SSubPr">
    <xsd:sequence>
      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_SSub">
    <xsd:sequence>
      <xsd:element name="sSubPr" type="CT_SSubPr" minOccurs="0"/>
      <xsd:element name="e" type="CT_OMathArg"/>
      <xsd:element name="sub" type="CT_OMathArg"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_SSubSupPr">
    <xsd:sequence>
      <xsd:element name="alnScr" type="CT_OnOff" minOccurs="0"/>
      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_SSubSup">
    <xsd:sequence>
      <xsd:element name="sSubSupPr" type="CT_SSubSupPr" minOccurs="0"/>
      <xsd:element name="e" type="CT_OMathArg"/>
      <xsd:element name="sub" type="CT_OMathArg"/>
      <xsd:element name="sup" type="CT_OMathArg"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_SSupPr">
    <xsd:sequence>
      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_SSup">
    <xsd:sequence>
      <xsd:element name="sSupPr" type="CT_SSupPr" minOccurs="0"/>
      <xsd:element name="e" type="CT_OMathArg"/>
      <xsd:element name="sup" type="CT_OMathArg"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:group name="EG_OMathMathElements">
    <xsd:choice>
      <xsd:element name="acc" type="CT_Acc"/>
      <xsd:element name="bar" type="CT_Bar"/>
      <xsd:element name="box" type="CT_Box"/>
      <xsd:element name="borderBox" type="CT_BorderBox"/>
      <xsd:element name="d" type="CT_D"/>
      <xsd:element name="eqArr" type="CT_EqArr"/>
      <xsd:element name="f" type="CT_F"/>
      <xsd:element name="func" type="CT_Func"/>
      <xsd:element name="groupChr" type="CT_GroupChr"/>
      <xsd:element name="limLow" type="CT_LimLow"/>
      <xsd:element name="limUpp" type="CT_LimUpp"/>
      <xsd:element name="m" type="CT_M"/>
      <xsd:element name="nary" type="CT_Nary"/>
      <xsd:element name="phant" type="CT_Phant"/>
      <xsd:element name="rad" type="CT_Rad"/>
      <xsd:element name="sPre" type="CT_SPre"/>
      <xsd:element name="sSub" type="CT_SSub"/>
      <xsd:element name="sSubSup" type="CT_SSubSup"/>
      <xsd:element name="sSup" type="CT_SSup"/>
      <xsd:element name="r" type="CT_R"/>
    </xsd:choice>
  </xsd:group>
  <xsd:group name="EG_OMathElements">
    <xsd:choice>
      <xsd:group ref="EG_OMathMathElements"/>
      <xsd:group ref="w:EG_PContentMath"/>
    </xsd:choice>
  </xsd:group>
  <xsd:complexType name="CT_OMathArgPr">
    <xsd:sequence>
      <xsd:element name="argSz" type="CT_Integer2" minOccurs="0"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_OMathArg">
    <xsd:sequence>
      <xsd:element name="argPr" type="CT_OMathArgPr" minOccurs="0"/>
      <xsd:group ref="EG_OMathElements" minOccurs="0" maxOccurs="unbounded"/>
      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:simpleType name="ST_Jc">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="left"/>
      <xsd:enumeration value="right"/>
      <xsd:enumeration value="center"/>
      <xsd:enumeration value="centerGroup"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:complexType name="CT_OMathJc">
    <xsd:attribute name="val" type="ST_Jc"/>
  </xsd:complexType>
  <xsd:complexType name="CT_OMathParaPr">
    <xsd:sequence>
      <xsd:element name="jc" type="CT_OMathJc" minOccurs="0"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_TwipsMeasure">
    <xsd:attribute name="val" type="s:ST_TwipsMeasure" use="required"/>
  </xsd:complexType>
  <xsd:simpleType name="ST_BreakBin">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="before"/>
      <xsd:enumeration value="after"/>
      <xsd:enumeration value="repeat"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:complexType name="CT_BreakBin">
    <xsd:attribute name="val" type="ST_BreakBin"/>
  </xsd:complexType>
  <xsd:simpleType name="ST_BreakBinSub">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="--"/>
      <xsd:enumeration value="-+"/>
      <xsd:enumeration value="+-"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:complexType name="CT_BreakBinSub">
    <xsd:attribute name="val" type="ST_BreakBinSub"/>
  </xsd:complexType>
  <xsd:complexType name="CT_MathPr">
    <xsd:sequence>
      <xsd:element name="mathFont" type="CT_String" minOccurs="0"/>
      <xsd:element name="brkBin" type="CT_BreakBin" minOccurs="0"/>
      <xsd:element name="brkBinSub" type="CT_BreakBinSub" minOccurs="0"/>
      <xsd:element name="smallFrac" type="CT_OnOff" minOccurs="0"/>
      <xsd:element name="dispDef" type="CT_OnOff" minOccurs="0"/>
      <xsd:element name="lMargin" type="CT_TwipsMeasure" minOccurs="0"/>
      <xsd:element name="rMargin" type="CT_TwipsMeasure" minOccurs="0"/>
      <xsd:element name="defJc" type="CT_OMathJc" minOccurs="0"/>
      <xsd:element name="preSp" type="CT_TwipsMeasure" minOccurs="0"/>
      <xsd:element name="postSp" type="CT_TwipsMeasure" minOccurs="0"/>
      <xsd:element name="interSp" type="CT_TwipsMeasure" minOccurs="0"/>
      <xsd:element name="intraSp" type="CT_TwipsMeasure" minOccurs="0"/>
      <xsd:choice minOccurs="0">
        <xsd:element name="wrapIndent" type="CT_TwipsMeasure"/>
        <xsd:element name="wrapRight" type="CT_OnOff"/>
      </xsd:choice>
      <xsd:element name="intLim" type="CT_LimLoc" minOccurs="0"/>
      <xsd:element name="naryLim" type="CT_LimLoc" minOccurs="0"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:element name="mathPr" type="CT_MathPr"/>
  <xsd:complexType name="CT_OMathPara">
    <xsd:sequence>
      <xsd:element name="oMathParaPr" type="CT_OMathParaPr" minOccurs="0"/>
      <xsd:element name="oMath" type="CT_OMath" maxOccurs="unbounded"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_OMath">
    <xsd:sequence>
      <xsd:group ref="EG_OMathElements" minOccurs="0" maxOccurs="unbounded"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:element name="oMathPara" type="CT_OMathPara"/>
  <xsd:element name="oMath" type="CT_OMath"/>
 </xsd:schema>
--- a/ooxml-schemas/ISO-IEC29500-4_2016/shared-relationshipReference.xsd
+++ b/ooxml-schemas/ISO-IEC29500-4_2016/shared-relationshipReference.xsd
@ -0,0 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
  xmlns="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
  xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
  elementFormDefault="qualified"
  targetNamespace="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
  blockDefault="#all">
  <xsd:simpleType name="ST_RelationshipId">
    <xsd:restriction base="xsd:string"/>
  </xsd:simpleType>
  <xsd:attribute name="id" type="ST_RelationshipId"/>
  <xsd:attribute name="embed" type="ST_RelationshipId"/>
  <xsd:attribute name="link" type="ST_RelationshipId"/>
  <xsd:attribute name="dm" type="ST_RelationshipId" default=""/>
  <xsd:attribute name="lo" type="ST_RelationshipId" default=""/>
  <xsd:attribute name="qs" type="ST_RelationshipId" default=""/>
  <xsd:attribute name="cs" type="ST_RelationshipId" default=""/>
  <xsd:attribute name="blip" type="ST_RelationshipId" default=""/>
  <xsd:attribute name="pict" type="ST_RelationshipId"/>
  <xsd:attribute name="href" type="ST_RelationshipId"/>
  <xsd:attribute name="topLeft" type="ST_RelationshipId"/>
  <xsd:attribute name="topRight" type="ST_RelationshipId"/>
  <xsd:attribute name="bottomLeft" type="ST_RelationshipId"/>
  <xsd:attribute name="bottomRight" type="ST_RelationshipId"/>
 </xsd:schema>
--- a/ooxml-schemas/ISO-IEC29500-4_2016/sml.xsd
+++ b/ooxml-schemas/ISO-IEC29500-4_2016/sml.xsd
--- a/ooxml-schemas/ISO-IEC29500-4_2016/vml-main.xsd
+++ b/ooxml-schemas/ISO-IEC29500-4_2016/vml-main.xsd
@ -0,0 +1,570 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:schemas-microsoft-com:vml"
  xmlns:pvml="urn:schemas-microsoft-com:office:powerpoint"
  xmlns:o="urn:schemas-microsoft-com:office:office"
  xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
  xmlns:w10="urn:schemas-microsoft-com:office:word"
  xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
  xmlns:x="urn:schemas-microsoft-com:office:excel"
  xmlns:s="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
  targetNamespace="urn:schemas-microsoft-com:vml" elementFormDefault="qualified"
  attributeFormDefault="unqualified">
  <xsd:import namespace="urn:schemas-microsoft-com:office:office"
    schemaLocation="vml-officeDrawing.xsd"/>
  <xsd:import namespace="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
    schemaLocation="wml.xsd"/>
  <xsd:import namespace="urn:schemas-microsoft-com:office:word"
    schemaLocation="vml-wordprocessingDrawing.xsd"/>
  <xsd:import namespace="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
    schemaLocation="shared-relationshipReference.xsd"/>
  <xsd:import namespace="urn:schemas-microsoft-com:office:excel"
    schemaLocation="vml-spreadsheetDrawing.xsd"/>
  <xsd:import namespace="urn:schemas-microsoft-com:office:powerpoint"
    schemaLocation="vml-presentationDrawing.xsd"/>
  <xsd:import namespace="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
    schemaLocation="shared-commonSimpleTypes.xsd"/>
  <xsd:attributeGroup name="AG_Id">
    <xsd:attribute name="id" type="xsd:string" use="optional"/>
  </xsd:attributeGroup>
  <xsd:attributeGroup name="AG_Style">
    <xsd:attribute name="style" type="xsd:string" use="optional"/>
  </xsd:attributeGroup>
  <xsd:attributeGroup name="AG_Type">
    <xsd:attribute name="type" type="xsd:string" use="optional"/>
  </xsd:attributeGroup>
  <xsd:attributeGroup name="AG_Adj">
    <xsd:attribute name="adj" type="xsd:string" use="optional"/>
  </xsd:attributeGroup>
  <xsd:attributeGroup name="AG_Path">
    <xsd:attribute name="path" type="xsd:string" use="optional"/>
  </xsd:attributeGroup>
  <xsd:attributeGroup name="AG_Fill">
    <xsd:attribute name="filled" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="fillcolor" type="s:ST_ColorType" use="optional"/>
  </xsd:attributeGroup>
  <xsd:attributeGroup name="AG_Chromakey">
    <xsd:attribute name="chromakey" type="s:ST_ColorType" use="optional"/>
  </xsd:attributeGroup>
  <xsd:attributeGroup name="AG_Ext">
    <xsd:attribute name="ext" form="qualified" type="ST_Ext"/>
  </xsd:attributeGroup>
  <xsd:attributeGroup name="AG_CoreAttributes">
    <xsd:attributeGroup ref="AG_Id"/>
    <xsd:attributeGroup ref="AG_Style"/>
    <xsd:attribute name="href" type="xsd:string" use="optional"/>
    <xsd:attribute name="target" type="xsd:string" use="optional"/>
    <xsd:attribute name="class" type="xsd:string" use="optional"/>
    <xsd:attribute name="title" type="xsd:string" use="optional"/>
    <xsd:attribute name="alt" type="xsd:string" use="optional"/>
    <xsd:attribute name="coordsize" type="xsd:string" use="optional"/>
    <xsd:attribute name="coordorigin" type="xsd:string" use="optional"/>
    <xsd:attribute name="wrapcoords" type="xsd:string" use="optional"/>
    <xsd:attribute name="print" type="s:ST_TrueFalse" use="optional"/>
  </xsd:attributeGroup>
  <xsd:attributeGroup name="AG_ShapeAttributes">
    <xsd:attributeGroup ref="AG_Chromakey"/>
    <xsd:attributeGroup ref="AG_Fill"/>
    <xsd:attribute name="opacity" type="xsd:string" use="optional"/>
    <xsd:attribute name="stroked" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="strokecolor" type="s:ST_ColorType" use="optional"/>
    <xsd:attribute name="strokeweight" type="xsd:string" use="optional"/>
    <xsd:attribute name="insetpen" type="s:ST_TrueFalse" use="optional"/>
  </xsd:attributeGroup>
  <xsd:attributeGroup name="AG_OfficeCoreAttributes">
    <xsd:attribute ref="o:spid"/>
    <xsd:attribute ref="o:oned"/>
    <xsd:attribute ref="o:regroupid"/>
    <xsd:attribute ref="o:doubleclicknotify"/>
    <xsd:attribute ref="o:button"/>
    <xsd:attribute ref="o:userhidden"/>
    <xsd:attribute ref="o:bullet"/>
    <xsd:attribute ref="o:hr"/>
    <xsd:attribute ref="o:hrstd"/>
    <xsd:attribute ref="o:hrnoshade"/>
    <xsd:attribute ref="o:hrpct"/>
    <xsd:attribute ref="o:hralign"/>
    <xsd:attribute ref="o:allowincell"/>
    <xsd:attribute ref="o:allowoverlap"/>
    <xsd:attribute ref="o:userdrawn"/>
    <xsd:attribute ref="o:bordertopcolor"/>
    <xsd:attribute ref="o:borderleftcolor"/>
    <xsd:attribute ref="o:borderbottomcolor"/>
    <xsd:attribute ref="o:borderrightcolor"/>
    <xsd:attribute ref="o:dgmlayout"/>
    <xsd:attribute ref="o:dgmnodekind"/>
    <xsd:attribute ref="o:dgmlayoutmru"/>
    <xsd:attribute ref="o:insetmode"/>
  </xsd:attributeGroup>
  <xsd:attributeGroup name="AG_OfficeShapeAttributes">
    <xsd:attribute ref="o:spt"/>
    <xsd:attribute ref="o:connectortype"/>
    <xsd:attribute ref="o:bwmode"/>
    <xsd:attribute ref="o:bwpure"/>
    <xsd:attribute ref="o:bwnormal"/>
    <xsd:attribute ref="o:forcedash"/>
    <xsd:attribute ref="o:oleicon"/>
    <xsd:attribute ref="o:ole"/>
    <xsd:attribute ref="o:preferrelative"/>
    <xsd:attribute ref="o:cliptowrap"/>
    <xsd:attribute ref="o:clip"/>
  </xsd:attributeGroup>
  <xsd:attributeGroup name="AG_AllCoreAttributes">
    <xsd:attributeGroup ref="AG_CoreAttributes"/>
    <xsd:attributeGroup ref="AG_OfficeCoreAttributes"/>
  </xsd:attributeGroup>
  <xsd:attributeGroup name="AG_AllShapeAttributes">
    <xsd:attributeGroup ref="AG_ShapeAttributes"/>
    <xsd:attributeGroup ref="AG_OfficeShapeAttributes"/>
  </xsd:attributeGroup>
  <xsd:attributeGroup name="AG_ImageAttributes">
    <xsd:attribute name="src" type="xsd:string" use="optional"/>
    <xsd:attribute name="cropleft" type="xsd:string" use="optional"/>
    <xsd:attribute name="croptop" type="xsd:string" use="optional"/>
    <xsd:attribute name="cropright" type="xsd:string" use="optional"/>
    <xsd:attribute name="cropbottom" type="xsd:string" use="optional"/>
    <xsd:attribute name="gain" type="xsd:string" use="optional"/>
    <xsd:attribute name="blacklevel" type="xsd:string" use="optional"/>
    <xsd:attribute name="gamma" type="xsd:string" use="optional"/>
    <xsd:attribute name="grayscale" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="bilevel" type="s:ST_TrueFalse" use="optional"/>
  </xsd:attributeGroup>
  <xsd:attributeGroup name="AG_StrokeAttributes">
    <xsd:attribute name="on" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="weight" type="xsd:string" use="optional"/>
    <xsd:attribute name="color" type="s:ST_ColorType" use="optional"/>
    <xsd:attribute name="opacity" type="xsd:string" use="optional"/>
    <xsd:attribute name="linestyle" type="ST_StrokeLineStyle" use="optional"/>
    <xsd:attribute name="miterlimit" type="xsd:decimal" use="optional"/>
    <xsd:attribute name="joinstyle" type="ST_StrokeJoinStyle" use="optional"/>
    <xsd:attribute name="endcap" type="ST_StrokeEndCap" use="optional"/>
    <xsd:attribute name="dashstyle" type="xsd:string" use="optional"/>
    <xsd:attribute name="filltype" type="ST_FillType" use="optional"/>
    <xsd:attribute name="src" type="xsd:string" use="optional"/>
    <xsd:attribute name="imageaspect" type="ST_ImageAspect" use="optional"/>
    <xsd:attribute name="imagesize" type="xsd:string" use="optional"/>
    <xsd:attribute name="imagealignshape" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="color2" type="s:ST_ColorType" use="optional"/>
    <xsd:attribute name="startarrow" type="ST_StrokeArrowType" use="optional"/>
    <xsd:attribute name="startarrowwidth" type="ST_StrokeArrowWidth" use="optional"/>
    <xsd:attribute name="startarrowlength" type="ST_StrokeArrowLength" use="optional"/>
    <xsd:attribute name="endarrow" type="ST_StrokeArrowType" use="optional"/>
    <xsd:attribute name="endarrowwidth" type="ST_StrokeArrowWidth" use="optional"/>
    <xsd:attribute name="endarrowlength" type="ST_StrokeArrowLength" use="optional"/>
    <xsd:attribute ref="o:href"/>
    <xsd:attribute ref="o:althref"/>
    <xsd:attribute ref="o:title"/>
    <xsd:attribute ref="o:forcedash"/>
    <xsd:attribute ref="r:id" use="optional"/>
    <xsd:attribute name="insetpen" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute ref="o:relid"/>
  </xsd:attributeGroup>
  <xsd:group name="EG_ShapeElements">
    <xsd:choice>
      <xsd:element ref="path"/>
      <xsd:element ref="formulas"/>
      <xsd:element ref="handles"/>
      <xsd:element ref="fill"/>
      <xsd:element ref="stroke"/>
      <xsd:element ref="shadow"/>
      <xsd:element ref="textbox"/>
      <xsd:element ref="textpath"/>
      <xsd:element ref="imagedata"/>
      <xsd:element ref="o:skew"/>
      <xsd:element ref="o:extrusion"/>
      <xsd:element ref="o:callout"/>
      <xsd:element ref="o:lock"/>
      <xsd:element ref="o:clippath"/>
      <xsd:element ref="o:signatureline"/>
      <xsd:element ref="w10:wrap"/>
      <xsd:element ref="w10:anchorlock"/>
      <xsd:element ref="w10:bordertop"/>
      <xsd:element ref="w10:borderbottom"/>
      <xsd:element ref="w10:borderleft"/>
      <xsd:element ref="w10:borderright"/>
      <xsd:element ref="x:ClientData" minOccurs="0"/>
      <xsd:element ref="pvml:textdata" minOccurs="0"/>
    </xsd:choice>
  </xsd:group>
  <xsd:element name="shape" type="CT_Shape"/>
  <xsd:element name="shapetype" type="CT_Shapetype"/>
  <xsd:element name="group" type="CT_Group"/>
  <xsd:element name="background" type="CT_Background"/>
  <xsd:complexType name="CT_Shape">
    <xsd:choice maxOccurs="unbounded">
      <xsd:group ref="EG_ShapeElements"/>
      <xsd:element ref="o:ink"/>
      <xsd:element ref="pvml:iscomment"/>
      <xsd:element ref="o:equationxml"/>
    </xsd:choice>
    <xsd:attributeGroup ref="AG_AllCoreAttributes"/>
    <xsd:attributeGroup ref="AG_AllShapeAttributes"/>
    <xsd:attributeGroup ref="AG_Type"/>
    <xsd:attributeGroup ref="AG_Adj"/>
    <xsd:attributeGroup ref="AG_Path"/>
    <xsd:attribute ref="o:gfxdata"/>
    <xsd:attribute name="equationxml" type="xsd:string" use="optional"/>
  </xsd:complexType>
  <xsd:complexType name="CT_Shapetype">
    <xsd:sequence>
      <xsd:group ref="EG_ShapeElements" minOccurs="0" maxOccurs="unbounded"/>
      <xsd:element ref="o:complex" minOccurs="0"/>
    </xsd:sequence>
    <xsd:attributeGroup ref="AG_AllCoreAttributes"/>
    <xsd:attributeGroup ref="AG_AllShapeAttributes"/>
    <xsd:attributeGroup ref="AG_Adj"/>
    <xsd:attributeGroup ref="AG_Path"/>
    <xsd:attribute ref="o:master"/>
  </xsd:complexType>
  <xsd:complexType name="CT_Group">
    <xsd:choice maxOccurs="unbounded">
      <xsd:group ref="EG_ShapeElements"/>
      <xsd:element ref="group"/>
      <xsd:element ref="shape"/>
      <xsd:element ref="shapetype"/>
      <xsd:element ref="arc"/>
      <xsd:element ref="curve"/>
      <xsd:element ref="image"/>
      <xsd:element ref="line"/>
      <xsd:element ref="oval"/>
      <xsd:element ref="polyline"/>
      <xsd:element ref="rect"/>
      <xsd:element ref="roundrect"/>
      <xsd:element ref="o:diagram"/>
    </xsd:choice>
    <xsd:attributeGroup ref="AG_AllCoreAttributes"/>
    <xsd:attributeGroup ref="AG_Fill"/>
    <xsd:attribute name="editas" type="ST_EditAs" use="optional"/>
    <xsd:attribute ref="o:tableproperties"/>
    <xsd:attribute ref="o:tablelimits"/>
  </xsd:complexType>
  <xsd:complexType name="CT_Background">
    <xsd:sequence>
      <xsd:element ref="fill" minOccurs="0"/>
    </xsd:sequence>
    <xsd:attributeGroup ref="AG_Id"/>
    <xsd:attributeGroup ref="AG_Fill"/>
    <xsd:attribute ref="o:bwmode"/>
    <xsd:attribute ref="o:bwpure"/>
    <xsd:attribute ref="o:bwnormal"/>
    <xsd:attribute ref="o:targetscreensize"/>
  </xsd:complexType>
  <xsd:element name="fill" type="CT_Fill"/>
  <xsd:element name="formulas" type="CT_Formulas"/>
  <xsd:element name="handles" type="CT_Handles"/>
  <xsd:element name="imagedata" type="CT_ImageData"/>
  <xsd:element name="path" type="CT_Path"/>
  <xsd:element name="textbox" type="CT_Textbox"/>
  <xsd:element name="shadow" type="CT_Shadow"/>
  <xsd:element name="stroke" type="CT_Stroke"/>
  <xsd:element name="textpath" type="CT_TextPath"/>
  <xsd:complexType name="CT_Fill">
    <xsd:sequence>
      <xsd:element ref="o:fill" minOccurs="0"/>
    </xsd:sequence>
    <xsd:attributeGroup ref="AG_Id"/>
    <xsd:attribute name="type" type="ST_FillType" use="optional"/>
    <xsd:attribute name="on" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="color" type="s:ST_ColorType" use="optional"/>
    <xsd:attribute name="opacity" type="xsd:string" use="optional"/>
    <xsd:attribute name="color2" type="s:ST_ColorType" use="optional"/>
    <xsd:attribute name="src" type="xsd:string" use="optional"/>
    <xsd:attribute ref="o:href"/>
    <xsd:attribute ref="o:althref"/>
    <xsd:attribute name="size" type="xsd:string" use="optional"/>
    <xsd:attribute name="origin" type="xsd:string" use="optional"/>
    <xsd:attribute name="position" type="xsd:string" use="optional"/>
    <xsd:attribute name="aspect" type="ST_ImageAspect" use="optional"/>
    <xsd:attribute name="colors" type="xsd:string" use="optional"/>
    <xsd:attribute name="angle" type="xsd:decimal" use="optional"/>
    <xsd:attribute name="alignshape" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="focus" type="xsd:string" use="optional"/>
    <xsd:attribute name="focussize" type="xsd:string" use="optional"/>
    <xsd:attribute name="focusposition" type="xsd:string" use="optional"/>
    <xsd:attribute name="method" type="ST_FillMethod" use="optional"/>
    <xsd:attribute ref="o:detectmouseclick"/>
    <xsd:attribute ref="o:title"/>
    <xsd:attribute ref="o:opacity2"/>
    <xsd:attribute name="recolor" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="rotate" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute ref="r:id" use="optional"/>
    <xsd:attribute ref="o:relid" use="optional"/>
  </xsd:complexType>
  <xsd:complexType name="CT_Formulas">
    <xsd:sequence>
      <xsd:element name="f" type="CT_F" minOccurs="0" maxOccurs="unbounded"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_F">
    <xsd:attribute name="eqn" type="xsd:string"/>
  </xsd:complexType>
  <xsd:complexType name="CT_Handles">
    <xsd:sequence>
      <xsd:element name="h" type="CT_H" minOccurs="0" maxOccurs="unbounded"/>
    </xsd:sequence>
  </xsd:complexType>
  <xsd:complexType name="CT_H">
    <xsd:attribute name="position" type="xsd:string"/>
    <xsd:attribute name="polar" type="xsd:string"/>
    <xsd:attribute name="map" type="xsd:string"/>
    <xsd:attribute name="invx" type="s:ST_TrueFalse"/>
    <xsd:attribute name="invy" type="s:ST_TrueFalse"/>
    <xsd:attribute name="switch" type="s:ST_TrueFalseBlank"/>
    <xsd:attribute name="xrange" type="xsd:string"/>
    <xsd:attribute name="yrange" type="xsd:string"/>
    <xsd:attribute name="radiusrange" type="xsd:string"/>
  </xsd:complexType>
  <xsd:complexType name="CT_ImageData">
    <xsd:attributeGroup ref="AG_Id"/>
    <xsd:attributeGroup ref="AG_ImageAttributes"/>
    <xsd:attributeGroup ref="AG_Chromakey"/>
    <xsd:attribute name="embosscolor" type="s:ST_ColorType" use="optional"/>
    <xsd:attribute name="recolortarget" type="s:ST_ColorType"/>
    <xsd:attribute ref="o:href"/>
    <xsd:attribute ref="o:althref"/>
    <xsd:attribute ref="o:title"/>
    <xsd:attribute ref="o:oleid"/>
    <xsd:attribute ref="o:detectmouseclick"/>
    <xsd:attribute ref="o:movie"/>
    <xsd:attribute ref="o:relid"/>
    <xsd:attribute ref="r:id"/>
    <xsd:attribute ref="r:pict"/>
    <xsd:attribute ref="r:href"/>
  </xsd:complexType>
  <xsd:complexType name="CT_Path">
    <xsd:attributeGroup ref="AG_Id"/>
    <xsd:attribute name="v" type="xsd:string" use="optional"/>
    <xsd:attribute name="limo" type="xsd:string" use="optional"/>
    <xsd:attribute name="textboxrect" type="xsd:string" use="optional"/>
    <xsd:attribute name="fillok" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="strokeok" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="shadowok" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="arrowok" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="gradientshapeok" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="textpathok" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="insetpenok" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute ref="o:connecttype"/>
    <xsd:attribute ref="o:connectlocs"/>
    <xsd:attribute ref="o:connectangles"/>
    <xsd:attribute ref="o:extrusionok"/>
  </xsd:complexType>
  <xsd:complexType name="CT_Shadow">
    <xsd:attributeGroup ref="AG_Id"/>
    <xsd:attribute name="on" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="type" type="ST_ShadowType" use="optional"/>
    <xsd:attribute name="obscured" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="color" type="s:ST_ColorType" use="optional"/>
    <xsd:attribute name="opacity" type="xsd:string" use="optional"/>
    <xsd:attribute name="offset" type="xsd:string" use="optional"/>
    <xsd:attribute name="color2" type="s:ST_ColorType" use="optional"/>
    <xsd:attribute name="offset2" type="xsd:string" use="optional"/>
    <xsd:attribute name="origin" type="xsd:string" use="optional"/>
    <xsd:attribute name="matrix" type="xsd:string" use="optional"/>
  </xsd:complexType>
  <xsd:complexType name="CT_Stroke">
    <xsd:sequence>
      <xsd:element ref="o:left" minOccurs="0"/>
      <xsd:element ref="o:top" minOccurs="0"/>
      <xsd:element ref="o:right" minOccurs="0"/>
      <xsd:element ref="o:bottom" minOccurs="0"/>
      <xsd:element ref="o:column" minOccurs="0"/>
    </xsd:sequence>
    <xsd:attributeGroup ref="AG_Id"/>
    <xsd:attributeGroup ref="AG_StrokeAttributes"/>
  </xsd:complexType>
  <xsd:complexType name="CT_Textbox">
    <xsd:choice>
      <xsd:element ref="w:txbxContent" minOccurs="0"/>
      <xsd:any namespace="##local" processContents="skip"/>
    </xsd:choice>
    <xsd:attributeGroup ref="AG_Id"/>
    <xsd:attributeGroup ref="AG_Style"/>
    <xsd:attribute name="inset" type="xsd:string" use="optional"/>
    <xsd:attribute ref="o:singleclick"/>
    <xsd:attribute ref="o:insetmode"/>
  </xsd:complexType>
  <xsd:complexType name="CT_TextPath">
    <xsd:attributeGroup ref="AG_Id"/>
    <xsd:attributeGroup ref="AG_Style"/>
    <xsd:attribute name="on" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="fitshape" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="fitpath" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="trim" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="xscale" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="string" type="xsd:string" use="optional"/>
  </xsd:complexType>
  <xsd:element name="arc" type="CT_Arc"/>
  <xsd:element name="curve" type="CT_Curve"/>
  <xsd:element name="image" type="CT_Image"/>
  <xsd:element name="line" type="CT_Line"/>
  <xsd:element name="oval" type="CT_Oval"/>
  <xsd:element name="polyline" type="CT_PolyLine"/>
  <xsd:element name="rect" type="CT_Rect"/>
  <xsd:element name="roundrect" type="CT_RoundRect"/>
  <xsd:complexType name="CT_Arc">
    <xsd:sequence>
      <xsd:group ref="EG_ShapeElements" minOccurs="0" maxOccurs="unbounded"/>
    </xsd:sequence>
    <xsd:attributeGroup ref="AG_AllCoreAttributes"/>
    <xsd:attributeGroup ref="AG_AllShapeAttributes"/>
    <xsd:attribute name="startAngle" type="xsd:decimal" use="optional"/>
    <xsd:attribute name="endAngle" type="xsd:decimal" use="optional"/>
  </xsd:complexType>
  <xsd:complexType name="CT_Curve">
    <xsd:sequence>
      <xsd:group ref="EG_ShapeElements" minOccurs="0" maxOccurs="unbounded"/>
    </xsd:sequence>
    <xsd:attributeGroup ref="AG_AllCoreAttributes"/>
    <xsd:attributeGroup ref="AG_AllShapeAttributes"/>
    <xsd:attribute name="from" type="xsd:string" use="optional"/>
    <xsd:attribute name="control1" type="xsd:string" use="optional"/>
    <xsd:attribute name="control2" type="xsd:string" use="optional"/>
    <xsd:attribute name="to" type="xsd:string" use="optional"/>
  </xsd:complexType>
  <xsd:complexType name="CT_Image">
    <xsd:sequence>
      <xsd:group ref="EG_ShapeElements" minOccurs="0" maxOccurs="unbounded"/>
    </xsd:sequence>
    <xsd:attributeGroup ref="AG_AllCoreAttributes"/>
    <xsd:attributeGroup ref="AG_AllShapeAttributes"/>
    <xsd:attributeGroup ref="AG_ImageAttributes"/>
  </xsd:complexType>
  <xsd:complexType name="CT_Line">
    <xsd:sequence>
      <xsd:group ref="EG_ShapeElements" minOccurs="0" maxOccurs="unbounded"/>
    </xsd:sequence>
    <xsd:attributeGroup ref="AG_AllCoreAttributes"/>
    <xsd:attributeGroup ref="AG_AllShapeAttributes"/>
    <xsd:attribute name="from" type="xsd:string" use="optional"/>
    <xsd:attribute name="to" type="xsd:string" use="optional"/>
  </xsd:complexType>
  <xsd:complexType name="CT_Oval">
    <xsd:choice maxOccurs="unbounded">
      <xsd:group ref="EG_ShapeElements" minOccurs="0" maxOccurs="unbounded"/>
    </xsd:choice>
    <xsd:attributeGroup ref="AG_AllCoreAttributes"/>
    <xsd:attributeGroup ref="AG_AllShapeAttributes"/>
  </xsd:complexType>
  <xsd:complexType name="CT_PolyLine">
    <xsd:choice minOccurs="0" maxOccurs="unbounded">
      <xsd:group ref="EG_ShapeElements"/>
      <xsd:element ref="o:ink"/>
    </xsd:choice>
    <xsd:attributeGroup ref="AG_AllCoreAttributes"/>
    <xsd:attributeGroup ref="AG_AllShapeAttributes"/>
    <xsd:attribute name="points" type="xsd:string" use="optional"/>
  </xsd:complexType>
  <xsd:complexType name="CT_Rect">
    <xsd:choice maxOccurs="unbounded">
      <xsd:group ref="EG_ShapeElements" minOccurs="0" maxOccurs="unbounded"/>
    </xsd:choice>
    <xsd:attributeGroup ref="AG_AllCoreAttributes"/>
    <xsd:attributeGroup ref="AG_AllShapeAttributes"/>
  </xsd:complexType>
  <xsd:complexType name="CT_RoundRect">
    <xsd:choice maxOccurs="unbounded">
      <xsd:group ref="EG_ShapeElements" minOccurs="0" maxOccurs="unbounded"/>
    </xsd:choice>
    <xsd:attributeGroup ref="AG_AllCoreAttributes"/>
    <xsd:attributeGroup ref="AG_AllShapeAttributes"/>
    <xsd:attribute name="arcsize" type="xsd:string" use="optional"/>
  </xsd:complexType>
  <xsd:simpleType name="ST_Ext">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="view"/>
      <xsd:enumeration value="edit"/>
      <xsd:enumeration value="backwardCompatible"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_FillType">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="solid"/>
      <xsd:enumeration value="gradient"/>
      <xsd:enumeration value="gradientRadial"/>
      <xsd:enumeration value="tile"/>
      <xsd:enumeration value="pattern"/>
      <xsd:enumeration value="frame"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_FillMethod">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="none"/>
      <xsd:enumeration value="linear"/>
      <xsd:enumeration value="sigma"/>
      <xsd:enumeration value="any"/>
      <xsd:enumeration value="linear sigma"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_ShadowType">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="single"/>
      <xsd:enumeration value="double"/>
      <xsd:enumeration value="emboss"/>
      <xsd:enumeration value="perspective"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_StrokeLineStyle">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="single"/>
      <xsd:enumeration value="thinThin"/>
      <xsd:enumeration value="thinThick"/>
      <xsd:enumeration value="thickThin"/>
      <xsd:enumeration value="thickBetweenThin"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_StrokeJoinStyle">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="round"/>
      <xsd:enumeration value="bevel"/>
      <xsd:enumeration value="miter"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_StrokeEndCap">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="flat"/>
      <xsd:enumeration value="square"/>
      <xsd:enumeration value="round"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_StrokeArrowLength">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="short"/>
      <xsd:enumeration value="medium"/>
      <xsd:enumeration value="long"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_StrokeArrowWidth">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="narrow"/>
      <xsd:enumeration value="medium"/>
      <xsd:enumeration value="wide"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_StrokeArrowType">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="none"/>
      <xsd:enumeration value="block"/>
      <xsd:enumeration value="classic"/>
      <xsd:enumeration value="oval"/>
      <xsd:enumeration value="diamond"/>
      <xsd:enumeration value="open"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_ImageAspect">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="ignore"/>
      <xsd:enumeration value="atMost"/>
      <xsd:enumeration value="atLeast"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_EditAs">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="canvas"/>
      <xsd:enumeration value="orgchart"/>
      <xsd:enumeration value="radial"/>
      <xsd:enumeration value="cycle"/>
      <xsd:enumeration value="stacked"/>
      <xsd:enumeration value="venn"/>
      <xsd:enumeration value="bullseye"/>
    </xsd:restriction>
  </xsd:simpleType>
 </xsd:schema>
--- a/ooxml-schemas/ISO-IEC29500-4_2016/vml-officeDrawing.xsd
+++ b/ooxml-schemas/ISO-IEC29500-4_2016/vml-officeDrawing.xsd
@ -0,0 +1,509 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
  xmlns="urn:schemas-microsoft-com:office:office" xmlns:v="urn:schemas-microsoft-com:vml"
  xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
  xmlns:s="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
  targetNamespace="urn:schemas-microsoft-com:office:office" elementFormDefault="qualified"
  attributeFormDefault="unqualified">
  <xsd:import namespace="urn:schemas-microsoft-com:vml" schemaLocation="vml-main.xsd"/>
  <xsd:import namespace="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
    schemaLocation="shared-relationshipReference.xsd"/>
  <xsd:import namespace="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
    schemaLocation="shared-commonSimpleTypes.xsd"/>
  <xsd:attribute name="bwmode" type="ST_BWMode"/>
  <xsd:attribute name="bwpure" type="ST_BWMode"/>
  <xsd:attribute name="bwnormal" type="ST_BWMode"/>
  <xsd:attribute name="targetscreensize" type="ST_ScreenSize"/>
  <xsd:attribute name="insetmode" type="ST_InsetMode" default="custom"/>
  <xsd:attribute name="spt" type="xsd:float"/>
  <xsd:attribute name="wrapcoords" type="xsd:string"/>
  <xsd:attribute name="oned" type="s:ST_TrueFalse"/>
  <xsd:attribute name="regroupid" type="xsd:integer"/>
  <xsd:attribute name="doubleclicknotify" type="s:ST_TrueFalse"/>
  <xsd:attribute name="connectortype" type="ST_ConnectorType" default="straight"/>
  <xsd:attribute name="button" type="s:ST_TrueFalse"/>
  <xsd:attribute name="userhidden" type="s:ST_TrueFalse"/>
  <xsd:attribute name="forcedash" type="s:ST_TrueFalse"/>
  <xsd:attribute name="oleicon" type="s:ST_TrueFalse"/>
  <xsd:attribute name="ole" type="s:ST_TrueFalseBlank"/>
  <xsd:attribute name="preferrelative" type="s:ST_TrueFalse"/>
  <xsd:attribute name="cliptowrap" type="s:ST_TrueFalse"/>
  <xsd:attribute name="clip" type="s:ST_TrueFalse"/>
  <xsd:attribute name="bullet" type="s:ST_TrueFalse"/>
  <xsd:attribute name="hr" type="s:ST_TrueFalse"/>
  <xsd:attribute name="hrstd" type="s:ST_TrueFalse"/>
  <xsd:attribute name="hrnoshade" type="s:ST_TrueFalse"/>
  <xsd:attribute name="hrpct" type="xsd:float"/>
  <xsd:attribute name="hralign" type="ST_HrAlign" default="left"/>
  <xsd:attribute name="allowincell" type="s:ST_TrueFalse"/>
  <xsd:attribute name="allowoverlap" type="s:ST_TrueFalse"/>
  <xsd:attribute name="userdrawn" type="s:ST_TrueFalse"/>
  <xsd:attribute name="bordertopcolor" type="xsd:string"/>
  <xsd:attribute name="borderleftcolor" type="xsd:string"/>
  <xsd:attribute name="borderbottomcolor" type="xsd:string"/>
  <xsd:attribute name="borderrightcolor" type="xsd:string"/>
  <xsd:attribute name="connecttype" type="ST_ConnectType"/>
  <xsd:attribute name="connectlocs" type="xsd:string"/>
  <xsd:attribute name="connectangles" type="xsd:string"/>
  <xsd:attribute name="master" type="xsd:string"/>
  <xsd:attribute name="extrusionok" type="s:ST_TrueFalse"/>
  <xsd:attribute name="href" type="xsd:string"/>
  <xsd:attribute name="althref" type="xsd:string"/>
  <xsd:attribute name="title" type="xsd:string"/>
  <xsd:attribute name="singleclick" type="s:ST_TrueFalse"/>
  <xsd:attribute name="oleid" type="xsd:float"/>
  <xsd:attribute name="detectmouseclick" type="s:ST_TrueFalse"/>
  <xsd:attribute name="movie" type="xsd:float"/>
  <xsd:attribute name="spid" type="xsd:string"/>
  <xsd:attribute name="opacity2" type="xsd:string"/>
  <xsd:attribute name="relid" type="r:ST_RelationshipId"/>
  <xsd:attribute name="dgmlayout" type="ST_DiagramLayout"/>
  <xsd:attribute name="dgmnodekind" type="xsd:integer"/>
  <xsd:attribute name="dgmlayoutmru" type="ST_DiagramLayout"/>
  <xsd:attribute name="gfxdata" type="xsd:base64Binary"/>
  <xsd:attribute name="tableproperties" type="xsd:string"/>
  <xsd:attribute name="tablelimits" type="xsd:string"/>
  <xsd:element name="shapedefaults" type="CT_ShapeDefaults"/>
  <xsd:element name="shapelayout" type="CT_ShapeLayout"/>
  <xsd:element name="signatureline" type="CT_SignatureLine"/>
  <xsd:element name="ink" type="CT_Ink"/>
  <xsd:element name="diagram" type="CT_Diagram"/>
  <xsd:element name="equationxml" type="CT_EquationXml"/>
  <xsd:complexType name="CT_ShapeDefaults">
    <xsd:all minOccurs="0">
      <xsd:element ref="v:fill" minOccurs="0"/>
      <xsd:element ref="v:stroke" minOccurs="0"/>
      <xsd:element ref="v:textbox" minOccurs="0"/>
      <xsd:element ref="v:shadow" minOccurs="0"/>
      <xsd:element ref="skew" minOccurs="0"/>
      <xsd:element ref="extrusion" minOccurs="0"/>
      <xsd:element ref="callout" minOccurs="0"/>
      <xsd:element ref="lock" minOccurs="0"/>
      <xsd:element name="colormru" minOccurs="0" type="CT_ColorMru"/>
      <xsd:element name="colormenu" minOccurs="0" type="CT_ColorMenu"/>
    </xsd:all>
    <xsd:attributeGroup ref="v:AG_Ext"/>
    <xsd:attribute name="spidmax" type="xsd:integer" use="optional"/>
    <xsd:attribute name="style" type="xsd:string" use="optional"/>
    <xsd:attribute name="fill" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="fillcolor" type="s:ST_ColorType" use="optional"/>
    <xsd:attribute name="stroke" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="strokecolor" type="s:ST_ColorType"/>
    <xsd:attribute name="allowincell" form="qualified" type="s:ST_TrueFalse"/>
  </xsd:complexType>
  <xsd:complexType name="CT_Ink">
    <xsd:sequence/>
    <xsd:attribute name="i" type="xsd:string"/>
    <xsd:attribute name="annotation" type="s:ST_TrueFalse"/>
    <xsd:attribute name="contentType" type="ST_ContentType" use="optional"/>
  </xsd:complexType>
  <xsd:complexType name="CT_SignatureLine">
    <xsd:attributeGroup ref="v:AG_Ext"/>
    <xsd:attribute name="issignatureline" type="s:ST_TrueFalse"/>
    <xsd:attribute name="id" type="s:ST_Guid"/>
    <xsd:attribute name="provid" type="s:ST_Guid"/>
    <xsd:attribute name="signinginstructionsset" type="s:ST_TrueFalse"/>
    <xsd:attribute name="allowcomments" type="s:ST_TrueFalse"/>
    <xsd:attribute name="showsigndate" type="s:ST_TrueFalse"/>
    <xsd:attribute name="suggestedsigner" type="xsd:string" form="qualified"/>
    <xsd:attribute name="suggestedsigner2" type="xsd:string" form="qualified"/>
    <xsd:attribute name="suggestedsigneremail" type="xsd:string" form="qualified"/>
    <xsd:attribute name="signinginstructions" type="xsd:string"/>
    <xsd:attribute name="addlxml" type="xsd:string"/>
    <xsd:attribute name="sigprovurl" type="xsd:string"/>
  </xsd:complexType>
  <xsd:complexType name="CT_ShapeLayout">
    <xsd:all>
      <xsd:element name="idmap" type="CT_IdMap" minOccurs="0"/>
      <xsd:element name="regrouptable" type="CT_RegroupTable" minOccurs="0"/>
      <xsd:element name="rules" type="CT_Rules" minOccurs="0"/>
    </xsd:all>
    <xsd:attributeGroup ref="v:AG_Ext"/>
  </xsd:complexType>
  <xsd:complexType name="CT_IdMap">
    <xsd:attributeGroup ref="v:AG_Ext"/>
    <xsd:attribute name="data" type="xsd:string" use="optional"/>
  </xsd:complexType>
  <xsd:complexType name="CT_RegroupTable">
    <xsd:sequence>
      <xsd:element name="entry" type="CT_Entry" minOccurs="0" maxOccurs="unbounded"/>
    </xsd:sequence>
    <xsd:attributeGroup ref="v:AG_Ext"/>
  </xsd:complexType>
  <xsd:complexType name="CT_Entry">
    <xsd:attribute name="new" type="xsd:int" use="optional"/>
    <xsd:attribute name="old" type="xsd:int" use="optional"/>
  </xsd:complexType>
  <xsd:complexType name="CT_Rules">
    <xsd:sequence>
      <xsd:element name="r" type="CT_R" minOccurs="0" maxOccurs="unbounded"/>
    </xsd:sequence>
    <xsd:attributeGroup ref="v:AG_Ext"/>
  </xsd:complexType>
  <xsd:complexType name="CT_R">
    <xsd:sequence>
      <xsd:element name="proxy" type="CT_Proxy" minOccurs="0" maxOccurs="unbounded"/>
    </xsd:sequence>
    <xsd:attribute name="id" type="xsd:string" use="required"/>
    <xsd:attribute name="type" type="ST_RType" use="optional"/>
    <xsd:attribute name="how" type="ST_How" use="optional"/>
    <xsd:attribute name="idref" type="xsd:string" use="optional"/>
  </xsd:complexType>
  <xsd:complexType name="CT_Proxy">
    <xsd:attribute name="start" type="s:ST_TrueFalseBlank" use="optional" default="false"/>
    <xsd:attribute name="end" type="s:ST_TrueFalseBlank" use="optional" default="false"/>
    <xsd:attribute name="idref" type="xsd:string" use="optional"/>
    <xsd:attribute name="connectloc" type="xsd:int" use="optional"/>
  </xsd:complexType>
  <xsd:complexType name="CT_Diagram">
    <xsd:sequence>
      <xsd:element name="relationtable" type="CT_RelationTable" minOccurs="0"/>
    </xsd:sequence>
    <xsd:attributeGroup ref="v:AG_Ext"/>
    <xsd:attribute name="dgmstyle" type="xsd:integer" use="optional"/>
    <xsd:attribute name="autoformat" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="reverse" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="autolayout" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="dgmscalex" type="xsd:integer" use="optional"/>
    <xsd:attribute name="dgmscaley" type="xsd:integer" use="optional"/>
    <xsd:attribute name="dgmfontsize" type="xsd:integer" use="optional"/>
    <xsd:attribute name="constrainbounds" type="xsd:string" use="optional"/>
    <xsd:attribute name="dgmbasetextscale" type="xsd:integer" use="optional"/>
  </xsd:complexType>
  <xsd:complexType name="CT_EquationXml">
    <xsd:sequence>
      <xsd:any namespace="##any"/>
    </xsd:sequence>
    <xsd:attribute name="contentType" type="ST_AlternateMathContentType" use="optional"/>
  </xsd:complexType>
  <xsd:simpleType name="ST_AlternateMathContentType">
    <xsd:restriction base="xsd:string"/>
  </xsd:simpleType>
  <xsd:complexType name="CT_RelationTable">
    <xsd:sequence>
      <xsd:element name="rel" type="CT_Relation" minOccurs="0" maxOccurs="unbounded"/>
    </xsd:sequence>
    <xsd:attributeGroup ref="v:AG_Ext"/>
  </xsd:complexType>
  <xsd:complexType name="CT_Relation">
    <xsd:attributeGroup ref="v:AG_Ext"/>
    <xsd:attribute name="idsrc" type="xsd:string" use="optional"/>
    <xsd:attribute name="iddest" type="xsd:string" use="optional"/>
    <xsd:attribute name="idcntr" type="xsd:string" use="optional"/>
  </xsd:complexType>
  <xsd:complexType name="CT_ColorMru">
    <xsd:attributeGroup ref="v:AG_Ext"/>
    <xsd:attribute name="colors" type="xsd:string"/>
  </xsd:complexType>
  <xsd:complexType name="CT_ColorMenu">
    <xsd:attributeGroup ref="v:AG_Ext"/>
    <xsd:attribute name="strokecolor" type="s:ST_ColorType"/>
    <xsd:attribute name="fillcolor" type="s:ST_ColorType"/>
    <xsd:attribute name="shadowcolor" type="s:ST_ColorType"/>
    <xsd:attribute name="extrusioncolor" type="s:ST_ColorType"/>
  </xsd:complexType>
  <xsd:element name="skew" type="CT_Skew"/>
  <xsd:element name="extrusion" type="CT_Extrusion"/>
  <xsd:element name="callout" type="CT_Callout"/>
  <xsd:element name="lock" type="CT_Lock"/>
  <xsd:element name="OLEObject" type="CT_OLEObject"/>
  <xsd:element name="complex" type="CT_Complex"/>
  <xsd:element name="left" type="CT_StrokeChild"/>
  <xsd:element name="top" type="CT_StrokeChild"/>
  <xsd:element name="right" type="CT_StrokeChild"/>
  <xsd:element name="bottom" type="CT_StrokeChild"/>
  <xsd:element name="column" type="CT_StrokeChild"/>
  <xsd:element name="clippath" type="CT_ClipPath"/>
  <xsd:element name="fill" type="CT_Fill"/>
  <xsd:complexType name="CT_Skew">
    <xsd:attributeGroup ref="v:AG_Ext"/>
    <xsd:attribute name="id" type="xsd:string" use="optional"/>
    <xsd:attribute name="on" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="offset" type="xsd:string" use="optional"/>
    <xsd:attribute name="origin" type="xsd:string" use="optional"/>
    <xsd:attribute name="matrix" type="xsd:string" use="optional"/>
  </xsd:complexType>
  <xsd:complexType name="CT_Extrusion">
    <xsd:attributeGroup ref="v:AG_Ext"/>
    <xsd:attribute name="on" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="type" type="ST_ExtrusionType" default="parallel" use="optional"/>
    <xsd:attribute name="render" type="ST_ExtrusionRender" default="solid" use="optional"/>
    <xsd:attribute name="viewpointorigin" type="xsd:string" use="optional"/>
    <xsd:attribute name="viewpoint" type="xsd:string" use="optional"/>
    <xsd:attribute name="plane" type="ST_ExtrusionPlane" default="XY" use="optional"/>
    <xsd:attribute name="skewangle" type="xsd:float" use="optional"/>
    <xsd:attribute name="skewamt" type="xsd:string" use="optional"/>
    <xsd:attribute name="foredepth" type="xsd:string" use="optional"/>
    <xsd:attribute name="backdepth" type="xsd:string" use="optional"/>
    <xsd:attribute name="orientation" type="xsd:string" use="optional"/>
    <xsd:attribute name="orientationangle" type="xsd:float" use="optional"/>
    <xsd:attribute name="lockrotationcenter" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="autorotationcenter" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="rotationcenter" type="xsd:string" use="optional"/>
    <xsd:attribute name="rotationangle" type="xsd:string" use="optional"/>
    <xsd:attribute name="colormode" type="ST_ColorMode" use="optional"/>
    <xsd:attribute name="color" type="s:ST_ColorType" use="optional"/>
    <xsd:attribute name="shininess" type="xsd:float" use="optional"/>
    <xsd:attribute name="specularity" type="xsd:string" use="optional"/>
    <xsd:attribute name="diffusity" type="xsd:string" use="optional"/>
    <xsd:attribute name="metal" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="edge" type="xsd:string" use="optional"/>
    <xsd:attribute name="facet" type="xsd:string" use="optional"/>
    <xsd:attribute name="lightface" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="brightness" type="xsd:string" use="optional"/>
    <xsd:attribute name="lightposition" type="xsd:string" use="optional"/>
    <xsd:attribute name="lightlevel" type="xsd:string" use="optional"/>
    <xsd:attribute name="lightharsh" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="lightposition2" type="xsd:string" use="optional"/>
    <xsd:attribute name="lightlevel2" type="xsd:string" use="optional"/>
    <xsd:attribute name="lightharsh2" type="s:ST_TrueFalse" use="optional"/>
  </xsd:complexType>
  <xsd:complexType name="CT_Callout">
    <xsd:attributeGroup ref="v:AG_Ext"/>
    <xsd:attribute name="on" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="type" type="xsd:string" use="optional"/>
    <xsd:attribute name="gap" type="xsd:string" use="optional"/>
    <xsd:attribute name="angle" type="ST_Angle" use="optional"/>
    <xsd:attribute name="dropauto" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="drop" type="ST_CalloutDrop" use="optional"/>
    <xsd:attribute name="distance" type="xsd:string" use="optional"/>
    <xsd:attribute name="lengthspecified" type="s:ST_TrueFalse" default="f" use="optional"/>
    <xsd:attribute name="length" type="xsd:string" use="optional"/>
    <xsd:attribute name="accentbar" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="textborder" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="minusx" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="minusy" type="s:ST_TrueFalse" use="optional"/>
  </xsd:complexType>
  <xsd:complexType name="CT_Lock">
    <xsd:attributeGroup ref="v:AG_Ext"/>
    <xsd:attribute name="position" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="selection" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="grouping" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="ungrouping" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="rotation" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="cropping" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="verticies" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="adjusthandles" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="text" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="aspectratio" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="shapetype" type="s:ST_TrueFalse" use="optional"/>
  </xsd:complexType>
  <xsd:complexType name="CT_OLEObject">
    <xsd:sequence>
      <xsd:element name="LinkType" type="ST_OLELinkType" minOccurs="0"/>
      <xsd:element name="LockedField" type="s:ST_TrueFalseBlank" minOccurs="0"/>
      <xsd:element name="FieldCodes" type="xsd:string" minOccurs="0"/>
    </xsd:sequence>
    <xsd:attribute name="Type" type="ST_OLEType" use="optional"/>
    <xsd:attribute name="ProgID" type="xsd:string" use="optional"/>
    <xsd:attribute name="ShapeID" type="xsd:string" use="optional"/>
    <xsd:attribute name="DrawAspect" type="ST_OLEDrawAspect" use="optional"/>
    <xsd:attribute name="ObjectID" type="xsd:string" use="optional"/>
    <xsd:attribute ref="r:id" use="optional"/>
    <xsd:attribute name="UpdateMode" type="ST_OLEUpdateMode" use="optional"/>
  </xsd:complexType>
  <xsd:complexType name="CT_Complex">
    <xsd:attributeGroup ref="v:AG_Ext"/>
  </xsd:complexType>
  <xsd:complexType name="CT_StrokeChild">
    <xsd:attributeGroup ref="v:AG_Ext"/>
    <xsd:attribute name="on" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="weight" type="xsd:string" use="optional"/>
    <xsd:attribute name="color" type="s:ST_ColorType" use="optional"/>
    <xsd:attribute name="color2" type="s:ST_ColorType" use="optional"/>
    <xsd:attribute name="opacity" type="xsd:string" use="optional"/>
    <xsd:attribute name="linestyle" type="v:ST_StrokeLineStyle" use="optional"/>
    <xsd:attribute name="miterlimit" type="xsd:decimal" use="optional"/>
    <xsd:attribute name="joinstyle" type="v:ST_StrokeJoinStyle" use="optional"/>
    <xsd:attribute name="endcap" type="v:ST_StrokeEndCap" use="optional"/>
    <xsd:attribute name="dashstyle" type="xsd:string" use="optional"/>
    <xsd:attribute name="insetpen" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="filltype" type="v:ST_FillType" use="optional"/>
    <xsd:attribute name="src" type="xsd:string" use="optional"/>
    <xsd:attribute name="imageaspect" type="v:ST_ImageAspect" use="optional"/>
    <xsd:attribute name="imagesize" type="xsd:string" use="optional"/>
    <xsd:attribute name="imagealignshape" type="s:ST_TrueFalse" use="optional"/>
    <xsd:attribute name="startarrow" type="v:ST_StrokeArrowType" use="optional"/>
    <xsd:attribute name="startarrowwidth" type="v:ST_StrokeArrowWidth" use="optional"/>
    <xsd:attribute name="startarrowlength" type="v:ST_StrokeArrowLength" use="optional"/>
    <xsd:attribute name="endarrow" type="v:ST_StrokeArrowType" use="optional"/>
    <xsd:attribute name="endarrowwidth" type="v:ST_StrokeArrowWidth" use="optional"/>
    <xsd:attribute name="endarrowlength" type="v:ST_StrokeArrowLength" use="optional"/>
    <xsd:attribute ref="href"/>
    <xsd:attribute ref="althref"/>
    <xsd:attribute ref="title"/>
    <xsd:attribute ref="forcedash"/>
  </xsd:complexType>
  <xsd:complexType name="CT_ClipPath">
    <xsd:attribute name="v" type="xsd:string" use="required" form="qualified"/>
  </xsd:complexType>
  <xsd:complexType name="CT_Fill">
    <xsd:attributeGroup ref="v:AG_Ext"/>
    <xsd:attribute name="type" type="ST_FillType"/>
  </xsd:complexType>
  <xsd:simpleType name="ST_RType">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="arc"/>
      <xsd:enumeration value="callout"/>
      <xsd:enumeration value="connector"/>
      <xsd:enumeration value="align"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_How">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="top"/>
      <xsd:enumeration value="middle"/>
      <xsd:enumeration value="bottom"/>
      <xsd:enumeration value="left"/>
      <xsd:enumeration value="center"/>
      <xsd:enumeration value="right"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_BWMode">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="color"/>
      <xsd:enumeration value="auto"/>
      <xsd:enumeration value="grayScale"/>
      <xsd:enumeration value="lightGrayscale"/>
      <xsd:enumeration value="inverseGray"/>
      <xsd:enumeration value="grayOutline"/>
      <xsd:enumeration value="highContrast"/>
      <xsd:enumeration value="black"/>
      <xsd:enumeration value="white"/>
      <xsd:enumeration value="hide"/>
      <xsd:enumeration value="undrawn"/>
      <xsd:enumeration value="blackTextAndLines"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_ScreenSize">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="544,376"/>
      <xsd:enumeration value="640,480"/>
      <xsd:enumeration value="720,512"/>
      <xsd:enumeration value="800,600"/>
      <xsd:enumeration value="1024,768"/>
      <xsd:enumeration value="1152,862"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_InsetMode">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="auto"/>
      <xsd:enumeration value="custom"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_ColorMode">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="auto"/>
      <xsd:enumeration value="custom"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_ContentType">
    <xsd:restriction base="xsd:string"/>
  </xsd:simpleType>
  <xsd:simpleType name="ST_DiagramLayout">
    <xsd:restriction base="xsd:integer">
      <xsd:enumeration value="0"/>
      <xsd:enumeration value="1"/>
      <xsd:enumeration value="2"/>
      <xsd:enumeration value="3"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_ExtrusionType">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="perspective"/>
      <xsd:enumeration value="parallel"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_ExtrusionRender">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="solid"/>
      <xsd:enumeration value="wireFrame"/>
      <xsd:enumeration value="boundingCube"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_ExtrusionPlane">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="XY"/>
      <xsd:enumeration value="ZX"/>
      <xsd:enumeration value="YZ"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_Angle">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="any"/>
      <xsd:enumeration value="30"/>
      <xsd:enumeration value="45"/>
      <xsd:enumeration value="60"/>
      <xsd:enumeration value="90"/>
      <xsd:enumeration value="auto"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_CalloutDrop">
    <xsd:restriction base="xsd:string"/>
  </xsd:simpleType>
  <xsd:simpleType name="ST_CalloutPlacement">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="top"/>
      <xsd:enumeration value="center"/>
      <xsd:enumeration value="bottom"/>
      <xsd:enumeration value="user"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_ConnectorType">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="none"/>
      <xsd:enumeration value="straight"/>
      <xsd:enumeration value="elbow"/>
      <xsd:enumeration value="curved"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_HrAlign">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="left"/>
      <xsd:enumeration value="right"/>
      <xsd:enumeration value="center"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_ConnectType">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="none"/>
      <xsd:enumeration value="rect"/>
      <xsd:enumeration value="segments"/>
      <xsd:enumeration value="custom"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_OLELinkType">
    <xsd:restriction base="xsd:string"/>
  </xsd:simpleType>
  <xsd:simpleType name="ST_OLEType">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="Embed"/>
      <xsd:enumeration value="Link"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_OLEDrawAspect">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="Content"/>
      <xsd:enumeration value="Icon"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_OLEUpdateMode">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="Always"/>
      <xsd:enumeration value="OnCall"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_FillType">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="gradientCenter"/>
      <xsd:enumeration value="solid"/>
      <xsd:enumeration value="pattern"/>
      <xsd:enumeration value="tile"/>
      <xsd:enumeration value="frame"/>
      <xsd:enumeration value="gradientUnscaled"/>
      <xsd:enumeration value="gradientRadial"/>
      <xsd:enumeration value="gradient"/>
      <xsd:enumeration value="background"/>
    </xsd:restriction>
  </xsd:simpleType>
 </xsd:schema>
--- a/ooxml-schemas/ISO-IEC29500-4_2016/vml-presentationDrawing.xsd
+++ b/ooxml-schemas/ISO-IEC29500-4_2016/vml-presentationDrawing.xsd
@ -0,0 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
  xmlns="urn:schemas-microsoft-com:office:powerpoint"
  targetNamespace="urn:schemas-microsoft-com:office:powerpoint" elementFormDefault="qualified"
  attributeFormDefault="unqualified">
  <xsd:element name="iscomment" type="CT_Empty"/>
  <xsd:element name="textdata" type="CT_Rel"/>
  <xsd:complexType name="CT_Empty"/>
  <xsd:complexType name="CT_Rel">
    <xsd:attribute name="id" type="xsd:string"/>
  </xsd:complexType>
 </xsd:schema>
--- a/ooxml-schemas/ISO-IEC29500-4_2016/vml-spreadsheetDrawing.xsd
+++ b/ooxml-schemas/ISO-IEC29500-4_2016/vml-spreadsheetDrawing.xsd
@ -0,0 +1,108 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
  xmlns="urn:schemas-microsoft-com:office:excel"
  xmlns:s="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
  targetNamespace="urn:schemas-microsoft-com:office:excel" elementFormDefault="qualified"
  attributeFormDefault="unqualified">
  <xsd:import namespace="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
    schemaLocation="shared-commonSimpleTypes.xsd"/>
  <xsd:element name="ClientData" type="CT_ClientData"/>
  <xsd:complexType name="CT_ClientData">
    <xsd:choice minOccurs="0" maxOccurs="unbounded">
      <xsd:element name="MoveWithCells" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="SizeWithCells" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="Anchor" type="xsd:string"/>
      <xsd:element name="Locked" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="DefaultSize" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="PrintObject" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="Disabled" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="AutoFill" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="AutoLine" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="AutoPict" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="FmlaMacro" type="xsd:string"/>
      <xsd:element name="TextHAlign" type="xsd:string"/>
      <xsd:element name="TextVAlign" type="xsd:string"/>
      <xsd:element name="LockText" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="JustLastX" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="SecretEdit" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="Default" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="Help" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="Cancel" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="Dismiss" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="Accel" type="xsd:integer"/>
      <xsd:element name="Accel2" type="xsd:integer"/>
      <xsd:element name="Row" type="xsd:integer"/>
      <xsd:element name="Column" type="xsd:integer"/>
      <xsd:element name="Visible" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="RowHidden" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="ColHidden" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="VTEdit" type="xsd:integer"/>
      <xsd:element name="MultiLine" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="VScroll" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="ValidIds" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="FmlaRange" type="xsd:string"/>
      <xsd:element name="WidthMin" type="xsd:integer"/>
      <xsd:element name="Sel" type="xsd:integer"/>
      <xsd:element name="NoThreeD2" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="SelType" type="xsd:string"/>
      <xsd:element name="MultiSel" type="xsd:string"/>
      <xsd:element name="LCT" type="xsd:string"/>
      <xsd:element name="ListItem" type="xsd:string"/>
      <xsd:element name="DropStyle" type="xsd:string"/>
      <xsd:element name="Colored" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="DropLines" type="xsd:integer"/>
      <xsd:element name="Checked" type="xsd:integer"/>
      <xsd:element name="FmlaLink" type="xsd:string"/>
      <xsd:element name="FmlaPict" type="xsd:string"/>
      <xsd:element name="NoThreeD" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="FirstButton" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="FmlaGroup" type="xsd:string"/>
      <xsd:element name="Val" type="xsd:integer"/>
      <xsd:element name="Min" type="xsd:integer"/>
      <xsd:element name="Max" type="xsd:integer"/>
      <xsd:element name="Inc" type="xsd:integer"/>
      <xsd:element name="Page" type="xsd:integer"/>
      <xsd:element name="Horiz" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="Dx" type="xsd:integer"/>
      <xsd:element name="MapOCX" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="CF" type="ST_CF"/>
      <xsd:element name="Camera" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="RecalcAlways" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="AutoScale" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="DDE" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="UIObj" type="s:ST_TrueFalseBlank"/>
      <xsd:element name="ScriptText" type="xsd:string"/>
      <xsd:element name="ScriptExtended" type="xsd:string"/>
      <xsd:element name="ScriptLanguage" type="xsd:nonNegativeInteger"/>
      <xsd:element name="ScriptLocation" type="xsd:nonNegativeInteger"/>
      <xsd:element name="FmlaTxbx" type="xsd:string"/>
    </xsd:choice>
    <xsd:attribute name="ObjectType" type="ST_ObjectType" use="required"/>
  </xsd:complexType>
  <xsd:simpleType name="ST_CF">
    <xsd:restriction base="xsd:string"/>
  </xsd:simpleType>
  <xsd:simpleType name="ST_ObjectType">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="Button"/>
      <xsd:enumeration value="Checkbox"/>
      <xsd:enumeration value="Dialog"/>
      <xsd:enumeration value="Drop"/>
      <xsd:enumeration value="Edit"/>
      <xsd:enumeration value="GBox"/>
      <xsd:enumeration value="Label"/>
      <xsd:enumeration value="LineA"/>
      <xsd:enumeration value="List"/>
      <xsd:enumeration value="Movie"/>
      <xsd:enumeration value="Note"/>
      <xsd:enumeration value="Pict"/>
      <xsd:enumeration value="Radio"/>
      <xsd:enumeration value="RectA"/>
      <xsd:enumeration value="Scroll"/>
      <xsd:enumeration value="Spin"/>
      <xsd:enumeration value="Shape"/>
      <xsd:enumeration value="Group"/>
      <xsd:enumeration value="Rect"/>
    </xsd:restriction>
  </xsd:simpleType>
 </xsd:schema>
--- a/ooxml-schemas/ISO-IEC29500-4_2016/vml-wordprocessingDrawing.xsd
+++ b/ooxml-schemas/ISO-IEC29500-4_2016/vml-wordprocessingDrawing.xsd
@ -0,0 +1,96 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
  xmlns="urn:schemas-microsoft-com:office:word"
  targetNamespace="urn:schemas-microsoft-com:office:word" elementFormDefault="qualified"
  attributeFormDefault="unqualified">
  <xsd:element name="bordertop" type="CT_Border"/>
  <xsd:element name="borderleft" type="CT_Border"/>
  <xsd:element name="borderright" type="CT_Border"/>
  <xsd:element name="borderbottom" type="CT_Border"/>
  <xsd:complexType name="CT_Border">
    <xsd:attribute name="type" type="ST_BorderType" use="optional"/>
    <xsd:attribute name="width" type="xsd:positiveInteger" use="optional"/>
    <xsd:attribute name="shadow" type="ST_BorderShadow" use="optional"/>
  </xsd:complexType>
  <xsd:element name="wrap" type="CT_Wrap"/>
  <xsd:complexType name="CT_Wrap">
    <xsd:attribute name="type" type="ST_WrapType" use="optional"/>
    <xsd:attribute name="side" type="ST_WrapSide" use="optional"/>
    <xsd:attribute name="anchorx" type="ST_HorizontalAnchor" use="optional"/>
    <xsd:attribute name="anchory" type="ST_VerticalAnchor" use="optional"/>
  </xsd:complexType>
  <xsd:element name="anchorlock" type="CT_AnchorLock"/>
  <xsd:complexType name="CT_AnchorLock"/>
  <xsd:simpleType name="ST_BorderType">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="none"/>
      <xsd:enumeration value="single"/>
      <xsd:enumeration value="thick"/>
      <xsd:enumeration value="double"/>
      <xsd:enumeration value="hairline"/>
      <xsd:enumeration value="dot"/>
      <xsd:enumeration value="dash"/>
      <xsd:enumeration value="dotDash"/>
      <xsd:enumeration value="dashDotDot"/>
      <xsd:enumeration value="triple"/>
      <xsd:enumeration value="thinThickSmall"/>
      <xsd:enumeration value="thickThinSmall"/>
      <xsd:enumeration value="thickBetweenThinSmall"/>
      <xsd:enumeration value="thinThick"/>
      <xsd:enumeration value="thickThin"/>
      <xsd:enumeration value="thickBetweenThin"/>
      <xsd:enumeration value="thinThickLarge"/>
      <xsd:enumeration value="thickThinLarge"/>
      <xsd:enumeration value="thickBetweenThinLarge"/>
      <xsd:enumeration value="wave"/>
      <xsd:enumeration value="doubleWave"/>
      <xsd:enumeration value="dashedSmall"/>
      <xsd:enumeration value="dashDotStroked"/>
      <xsd:enumeration value="threeDEmboss"/>
      <xsd:enumeration value="threeDEngrave"/>
      <xsd:enumeration value="HTMLOutset"/>
      <xsd:enumeration value="HTMLInset"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_BorderShadow">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="t"/>
      <xsd:enumeration value="true"/>
      <xsd:enumeration value="f"/>
      <xsd:enumeration value="false"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_WrapType">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="topAndBottom"/>
      <xsd:enumeration value="square"/>
      <xsd:enumeration value="none"/>
      <xsd:enumeration value="tight"/>
      <xsd:enumeration value="through"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_WrapSide">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="both"/>
      <xsd:enumeration value="left"/>
      <xsd:enumeration value="right"/>
      <xsd:enumeration value="largest"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_HorizontalAnchor">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="margin"/>
      <xsd:enumeration value="page"/>
      <xsd:enumeration value="text"/>
      <xsd:enumeration value="char"/>
    </xsd:restriction>
  </xsd:simpleType>
  <xsd:simpleType name="ST_VerticalAnchor">
    <xsd:restriction base="xsd:string">
      <xsd:enumeration value="margin"/>
      <xsd:enumeration value="page"/>
      <xsd:enumeration value="text"/>
      <xsd:enumeration value="line"/>
    </xsd:restriction>
  </xsd:simpleType>
 </xsd:schema>
--- a/ooxml-schemas/ISO-IEC29500-4_2016/wml.xsd
+++ b/ooxml-schemas/ISO-IEC29500-4_2016/wml.xsd
--- a/ooxml-schemas/ISO-IEC29500-4_2016/xml.xsd
+++ b/ooxml-schemas/ISO-IEC29500-4_2016/xml.xsd
@ -0,0 +1,116 @@
 <?xml version='1.0'?>
 <xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">
 <xs:annotation>
  <xs:documentation>
   See http://www.w3.org/XML/1998/namespace.html and
   http://www.w3.org/TR/REC-xml for information about this namespace.
    This schema document describes the XML namespace, in a form
    suitable for import by other schema documents.  
    Note that local names in this namespace are intended to be defined
    only by the World Wide Web Consortium or its subgroups.  The
    following names are currently defined in this namespace and should
    not be used with conflicting semantics by any Working Group,
    specification, or document instance:
    base (as an attribute name): denotes an attribute whose value
         provides a URI to be used as the base for interpreting any
         relative URIs in the scope of the element on which it
         appears; its value is inherited.  This name is reserved
         by virtue of its definition in the XML Base specification.
    lang (as an attribute name): denotes an attribute whose value
         is a language code for the natural language of the content of
         any element; its value is inherited.  This name is reserved
         by virtue of its definition in the XML specification.
    space (as an attribute name): denotes an attribute whose
         value is a keyword indicating what whitespace processing
         discipline is intended for the content of the element; its
         value is inherited.  This name is reserved by virtue of its
         definition in the XML specification.
    Father (in any context at all): denotes Jon Bosak, the chair of 
         the original XML Working Group.  This name is reserved by 
         the following decision of the W3C XML Plenary and 
         XML Coordination groups:
             In appreciation for his vision, leadership and dedication
             the W3C XML Plenary on this 10th day of February, 2000
             reserves for Jon Bosak in perpetuity the XML name
             xml:Father
  </xs:documentation>
 </xs:annotation>
 <xs:annotation>
  <xs:documentation>This schema defines attributes and an attribute group
        suitable for use by
        schemas wishing to allow xml:base, xml:lang or xml:space attributes
        on elements they define.
        To enable this, such a schema must import this schema
        for the XML namespace, e.g. as follows:
        &lt;schema . . .>
         . . .
         &lt;import namespace="http://www.w3.org/XML/1998/namespace"
                    schemaLocation="http://www.w3.org/2001/03/xml.xsd"/>
        Subsequently, qualified reference to any of the attributes
        or the group defined below will have the desired effect, e.g.
        &lt;type . . .>
         . . .
         &lt;attributeGroup ref="xml:specialAttrs"/>
         will define a type which will schema-validate an instance
         element with any of those attributes</xs:documentation>
 </xs:annotation>
 <xs:annotation>
  <xs:documentation>In keeping with the XML Schema WG's standard versioning
   policy, this schema document will persist at
   http://www.w3.org/2001/03/xml.xsd.
   At the date of issue it can also be found at
   http://www.w3.org/2001/xml.xsd.
   The schema document at that URI may however change in the future,
   in order to remain compatible with the latest version of XML Schema
   itself.  In other words, if the XML Schema namespace changes, the version
   of this document at
   http://www.w3.org/2001/xml.xsd will change
   accordingly; the version at
   http://www.w3.org/2001/03/xml.xsd will not change.
  </xs:documentation>
 </xs:annotation>
 <xs:attribute name="lang" type="xs:language">
  <xs:annotation>
   <xs:documentation>In due course, we should install the relevant ISO 2- and 3-letter
         codes as the enumerated possible values . . .</xs:documentation>
  </xs:annotation>
 </xs:attribute>
 <xs:attribute name="space" default="preserve">
  <xs:simpleType>
   <xs:restriction base="xs:NCName">
    <xs:enumeration value="default"/>
    <xs:enumeration value="preserve"/>
   </xs:restriction>
  </xs:simpleType>
 </xs:attribute>
 <xs:attribute name="base" type="xs:anyURI">
  <xs:annotation>
   <xs:documentation>See http://www.w3.org/TR/xmlbase/ for
                     information about this attribute.</xs:documentation>
  </xs:annotation>
 </xs:attribute>
 <xs:attributeGroup name="specialAttrs">
  <xs:attribute ref="xml:base"/>
  <xs:attribute ref="xml:lang"/>
  <xs:attribute ref="xml:space"/>
 </xs:attributeGroup>
 </xs:schema>
--- a/ooxml-schemas/mce/mc.xsd
+++ b/ooxml-schemas/mce/mc.xsd
@ -0,0 +1,75 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsd:schema xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	attributeFormDefault="unqualified" elementFormDefault="qualified"
 	targetNamespace="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
  <!--
    This XSD is a modified version of the one found at:
    https://github.com/plutext/docx4j/blob/master/xsd/mce/markup-compatibility-2006-MINIMAL.xsd
    This XSD has 2 objectives:
        1. round tripping @mc:Ignorable
 			<w:document
 			            xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 			            xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
 			            mc:Ignorable="w14 w15 wp14">
        2. enabling AlternateContent to be manipulated in certain elements
           (in the unusual case where the content model is xsd:any, it doesn't have to be explicitly added)
 		See further ECMA-376, 4th Edition, Office Open XML File Formats
 		Part 3 : Markup Compatibility and Extensibility
   -->
  <!--  Objective 1 -->
  <xsd:attribute name="Ignorable" type="xsd:string" />
  <!--  Objective 2 -->
 	<xsd:attribute name="MustUnderstand" type="xsd:string"  />
 	<xsd:attribute name="ProcessContent" type="xsd:string"  />
 <!-- An AlternateContent element shall contain one or more Choice child elements, optionally followed by a
 Fallback child element. If present, there shall be only one Fallback element, and it shall follow all Choice
 elements. -->
 	<xsd:element name="AlternateContent">
 		<xsd:complexType>
 			<xsd:sequence>
 				<xsd:element name="Choice" minOccurs="0" maxOccurs="unbounded">
 					<xsd:complexType>
 						<xsd:sequence>
 							<xsd:any minOccurs="0" maxOccurs="unbounded"
 								processContents="strict">
 							</xsd:any>
 						</xsd:sequence>
 						<xsd:attribute name="Requires" type="xsd:string" use="required" />
 						<xsd:attribute ref="mc:Ignorable" use="optional" />
 						<xsd:attribute ref="mc:MustUnderstand" use="optional" />
 						<xsd:attribute ref="mc:ProcessContent" use="optional" />
 					</xsd:complexType>
 				</xsd:element>
 				<xsd:element name="Fallback" minOccurs="0" maxOccurs="1">
 					<xsd:complexType>
 						<xsd:sequence>
 							<xsd:any minOccurs="0" maxOccurs="unbounded"
 								processContents="strict">
 							</xsd:any>
 						</xsd:sequence>
 						<xsd:attribute ref="mc:Ignorable" use="optional" />
 						<xsd:attribute ref="mc:MustUnderstand" use="optional" />
 						<xsd:attribute ref="mc:ProcessContent" use="optional" />
 					</xsd:complexType>
 				</xsd:element>
 			</xsd:sequence>
 			<!-- AlternateContent elements might include the attributes Ignorable,
 				MustUnderstand and ProcessContent described in this Part of ECMA-376. These
 				attributes’ qualified names shall be prefixed when associated with an AlternateContent
 				element. -->
 			<xsd:attribute ref="mc:Ignorable" use="optional" />
 			<xsd:attribute ref="mc:MustUnderstand" use="optional" />
 			<xsd:attribute ref="mc:ProcessContent" use="optional" />
 		</xsd:complexType>
 	</xsd:element>
 </xsd:schema>
--- a/ooxml-schemas/microsoft/wml-2010.xsd
+++ b/ooxml-schemas/microsoft/wml-2010.xsd
@ -0,0 +1,560 @@
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:w12="http://schemas.openxmlformats.org/wordprocessingml/2006/main" elementFormDefault="qualified" attributeFormDefault="qualified" blockDefault="#all" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:s="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns="http://schemas.microsoft.com/office/word/2010/wordml" targetNamespace="http://schemas.microsoft.com/office/word/2010/wordml">
   <!-- <xsd:import id="rel" namespace="http://schemas.openxmlformats.org/officeDocument/2006/relationships" schemaLocation="orel.xsd"/> -->
   <xsd:import id="w" namespace="http://schemas.openxmlformats.org/wordprocessingml/2006/main" schemaLocation="word12.xsd"/>
   <!-- <xsd:import namespace="http://schemas.openxmlformats.org/drawingml/2006/main" schemaLocation="oartbasetypes.xsd"/>
   <xsd:import namespace="http://schemas.openxmlformats.org/drawingml/2006/main" schemaLocation="oartsplineproperties.xsd"/> -->
   <xsd:complexType name="CT_LongHexNumber">
     <xsd:attribute name="val" type="w:ST_LongHexNumber" use="required"/>
   </xsd:complexType>
   <xsd:simpleType name="ST_OnOff">
     <xsd:restriction base="xsd:string">
       <xsd:enumeration value="true"/>
       <xsd:enumeration value="false"/>
       <xsd:enumeration value="0"/>
       <xsd:enumeration value="1"/>
     </xsd:restriction>
   </xsd:simpleType>
   <xsd:complexType name="CT_OnOff">
     <xsd:attribute name="val" type="ST_OnOff"/>
   </xsd:complexType>
   <xsd:element name="docId" type="CT_LongHexNumber"/>
   <xsd:element name="conflictMode" type="CT_OnOff"/>
   <xsd:attributeGroup name="AG_Parids">
     <xsd:attribute name="paraId" type="w:ST_LongHexNumber"/>
     <xsd:attribute name="textId" type="w:ST_LongHexNumber"/>
   </xsd:attributeGroup>
   <xsd:attribute name="anchorId" type="w:ST_LongHexNumber"/>
   <xsd:attribute name="noSpellErr" type="ST_OnOff"/>
   <xsd:element name="customXmlConflictInsRangeStart" type="w:CT_TrackChange"/>
   <xsd:element name="customXmlConflictInsRangeEnd" type="w:CT_Markup"/>
   <xsd:element name="customXmlConflictDelRangeStart" type="w:CT_TrackChange"/>
   <xsd:element name="customXmlConflictDelRangeEnd" type="w:CT_Markup"/>
   <xsd:group name="EG_RunLevelConflicts">
     <xsd:sequence>
       <xsd:element name="conflictIns" type="w:CT_RunTrackChange" minOccurs="0"/>
       <xsd:element name="conflictDel" type="w:CT_RunTrackChange" minOccurs="0"/>
     </xsd:sequence>
   </xsd:group>
   <xsd:group name="EG_Conflicts">
     <xsd:choice>
       <xsd:element name="conflictIns" type="w:CT_TrackChange" minOccurs="0"/>
       <xsd:element name="conflictDel" type="w:CT_TrackChange" minOccurs="0"/>
     </xsd:choice>
   </xsd:group>
   <xsd:complexType name="CT_Percentage">
     <xsd:attribute name="val" type="a:ST_Percentage" use="required"/>
   </xsd:complexType>
   <xsd:complexType name="CT_PositiveFixedPercentage">
     <xsd:attribute name="val" type="a:ST_PositiveFixedPercentage" use="required"/>
   </xsd:complexType>
   <xsd:complexType name="CT_PositivePercentage">
     <xsd:attribute name="val" type="a:ST_PositivePercentage" use="required"/>
   </xsd:complexType>
   <xsd:simpleType name="ST_SchemeColorVal">
     <xsd:restriction base="xsd:string">
       <xsd:enumeration value="bg1"/>
       <xsd:enumeration value="tx1"/>
       <xsd:enumeration value="bg2"/>
       <xsd:enumeration value="tx2"/>
       <xsd:enumeration value="accent1"/>
       <xsd:enumeration value="accent2"/>
       <xsd:enumeration value="accent3"/>
       <xsd:enumeration value="accent4"/>
       <xsd:enumeration value="accent5"/>
       <xsd:enumeration value="accent6"/>
       <xsd:enumeration value="hlink"/>
       <xsd:enumeration value="folHlink"/>
       <xsd:enumeration value="dk1"/>
       <xsd:enumeration value="lt1"/>
       <xsd:enumeration value="dk2"/>
       <xsd:enumeration value="lt2"/>
       <xsd:enumeration value="phClr"/>
     </xsd:restriction>
   </xsd:simpleType>
   <xsd:simpleType name="ST_RectAlignment">
     <xsd:restriction base="xsd:string">
       <xsd:enumeration value="none"/>
       <xsd:enumeration value="tl"/>
       <xsd:enumeration value="t"/>
       <xsd:enumeration value="tr"/>
       <xsd:enumeration value="l"/>
       <xsd:enumeration value="ctr"/>
       <xsd:enumeration value="r"/>
       <xsd:enumeration value="bl"/>
       <xsd:enumeration value="b"/>
       <xsd:enumeration value="br"/>
     </xsd:restriction>
   </xsd:simpleType>
   <xsd:simpleType name="ST_PathShadeType">
     <xsd:restriction base="xsd:string">
       <xsd:enumeration value="shape"/>
       <xsd:enumeration value="circle"/>
       <xsd:enumeration value="rect"/>
     </xsd:restriction>
   </xsd:simpleType>
   <xsd:simpleType name="ST_LineCap">
     <xsd:restriction base="xsd:string">
       <xsd:enumeration value="rnd"/>
       <xsd:enumeration value="sq"/>
       <xsd:enumeration value="flat"/>
     </xsd:restriction>
   </xsd:simpleType>
   <xsd:simpleType name="ST_PresetLineDashVal">
     <xsd:restriction base="xsd:string">
       <xsd:enumeration value="solid"/>
       <xsd:enumeration value="dot"/>
       <xsd:enumeration value="sysDot"/>
       <xsd:enumeration value="dash"/>
       <xsd:enumeration value="sysDash"/>
       <xsd:enumeration value="lgDash"/>
       <xsd:enumeration value="dashDot"/>
       <xsd:enumeration value="sysDashDot"/>
       <xsd:enumeration value="lgDashDot"/>
       <xsd:enumeration value="lgDashDotDot"/>
       <xsd:enumeration value="sysDashDotDot"/>
     </xsd:restriction>
   </xsd:simpleType>
   <xsd:simpleType name="ST_PenAlignment">
     <xsd:restriction base="xsd:string">
       <xsd:enumeration value="ctr"/>
       <xsd:enumeration value="in"/>
     </xsd:restriction>
   </xsd:simpleType>
   <xsd:simpleType name="ST_CompoundLine">
     <xsd:restriction base="xsd:string">
       <xsd:enumeration value="sng"/>
       <xsd:enumeration value="dbl"/>
       <xsd:enumeration value="thickThin"/>
       <xsd:enumeration value="thinThick"/>
       <xsd:enumeration value="tri"/>
     </xsd:restriction>
   </xsd:simpleType>
   <xsd:complexType name="CT_RelativeRect">
     <xsd:attribute name="l" use="optional" type="a:ST_Percentage"/>
     <xsd:attribute name="t" use="optional" type="a:ST_Percentage"/>
     <xsd:attribute name="r" use="optional" type="a:ST_Percentage"/>
     <xsd:attribute name="b" use="optional" type="a:ST_Percentage"/>
   </xsd:complexType>
   <xsd:group name="EG_ColorTransform">
     <xsd:choice>
       <xsd:element name="tint" type="CT_PositiveFixedPercentage"/>
       <xsd:element name="shade" type="CT_PositiveFixedPercentage"/>
       <xsd:element name="alpha" type="CT_PositiveFixedPercentage"/>
       <xsd:element name="hueMod" type="CT_PositivePercentage"/>
       <xsd:element name="sat" type="CT_Percentage"/>
       <xsd:element name="satOff" type="CT_Percentage"/>
       <xsd:element name="satMod" type="CT_Percentage"/>
       <xsd:element name="lum" type="CT_Percentage"/>
       <xsd:element name="lumOff" type="CT_Percentage"/>
       <xsd:element name="lumMod" type="CT_Percentage"/>
     </xsd:choice>
   </xsd:group>
   <xsd:complexType name="CT_SRgbColor">
     <xsd:sequence>
       <xsd:group ref="EG_ColorTransform" minOccurs="0" maxOccurs="unbounded"/>
     </xsd:sequence>
     <xsd:attribute name="val" type="s:ST_HexColorRGB" use="required"/>
   </xsd:complexType>
   <xsd:complexType name="CT_SchemeColor">
     <xsd:sequence>
       <xsd:group ref="EG_ColorTransform" minOccurs="0" maxOccurs="unbounded"/>
     </xsd:sequence>
     <xsd:attribute name="val" type="ST_SchemeColorVal" use="required"/>
   </xsd:complexType>
   <xsd:group name="EG_ColorChoice">
     <xsd:choice>
       <xsd:element name="srgbClr" type="CT_SRgbColor"/>
       <xsd:element name="schemeClr" type="CT_SchemeColor"/>
     </xsd:choice>
   </xsd:group>
   <xsd:complexType name="CT_Color">
     <xsd:sequence>
       <xsd:group ref="EG_ColorChoice"/>
     </xsd:sequence>
   </xsd:complexType>
   <xsd:complexType name="CT_GradientStop">
     <xsd:sequence>
       <xsd:group ref="EG_ColorChoice"/>
     </xsd:sequence>
     <xsd:attribute name="pos" type="a:ST_PositiveFixedPercentage" use="required"/>
   </xsd:complexType>
   <xsd:complexType name="CT_GradientStopList">
     <xsd:sequence>
       <xsd:element name="gs" type="CT_GradientStop" minOccurs="2" maxOccurs="10"/>
     </xsd:sequence>
   </xsd:complexType>
   <xsd:complexType name="CT_LinearShadeProperties">
     <xsd:attribute name="ang" type="a:ST_PositiveFixedAngle" use="optional"/>
     <xsd:attribute name="scaled" type="ST_OnOff" use="optional"/>
   </xsd:complexType>
   <xsd:complexType name="CT_PathShadeProperties">
     <xsd:sequence>
       <xsd:element name="fillToRect" type="CT_RelativeRect" minOccurs="0"/>
     </xsd:sequence>
     <xsd:attribute name="path" type="ST_PathShadeType" use="optional"/>
   </xsd:complexType>
   <xsd:group name="EG_ShadeProperties">
     <xsd:choice>
       <xsd:element name="lin" type="CT_LinearShadeProperties"/>
       <xsd:element name="path" type="CT_PathShadeProperties"/>
     </xsd:choice>
   </xsd:group>
   <xsd:complexType name="CT_SolidColorFillProperties">
     <xsd:sequence>
       <xsd:group ref="EG_ColorChoice" minOccurs="0"/>
     </xsd:sequence>
   </xsd:complexType>
   <xsd:complexType name="CT_GradientFillProperties">
     <xsd:sequence>
       <xsd:element name="gsLst" type="CT_GradientStopList" minOccurs="0"/>
       <xsd:group ref="EG_ShadeProperties" minOccurs="0"/>
     </xsd:sequence>
   </xsd:complexType>
   <xsd:group name="EG_FillProperties">
     <xsd:choice>
       <xsd:element name="noFill" type="w:CT_Empty"/>
       <xsd:element name="solidFill" type="CT_SolidColorFillProperties"/>
       <xsd:element name="gradFill" type="CT_GradientFillProperties"/>
     </xsd:choice>
   </xsd:group>
   <xsd:complexType name="CT_PresetLineDashProperties">
     <xsd:attribute name="val" type="ST_PresetLineDashVal" use="optional"/>
   </xsd:complexType>
   <xsd:group name="EG_LineDashProperties">
     <xsd:choice>
       <xsd:element name="prstDash" type="CT_PresetLineDashProperties"/>
     </xsd:choice>
   </xsd:group>
   <xsd:complexType name="CT_LineJoinMiterProperties">
     <xsd:attribute name="lim" type="a:ST_PositivePercentage" use="optional"/>
   </xsd:complexType>
   <xsd:group name="EG_LineJoinProperties">
     <xsd:choice>
       <xsd:element name="round" type="w:CT_Empty"/>
       <xsd:element name="bevel" type="w:CT_Empty"/>
       <xsd:element name="miter" type="CT_LineJoinMiterProperties"/>
     </xsd:choice>
   </xsd:group>
   <xsd:simpleType name="ST_PresetCameraType">
     <xsd:restriction base="xsd:token">
       <xsd:enumeration value="legacyObliqueTopLeft"/>
       <xsd:enumeration value="legacyObliqueTop"/>
       <xsd:enumeration value="legacyObliqueTopRight"/>
       <xsd:enumeration value="legacyObliqueLeft"/>
       <xsd:enumeration value="legacyObliqueFront"/>
       <xsd:enumeration value="legacyObliqueRight"/>
       <xsd:enumeration value="legacyObliqueBottomLeft"/>
       <xsd:enumeration value="legacyObliqueBottom"/>
       <xsd:enumeration value="legacyObliqueBottomRight"/>
       <xsd:enumeration value="legacyPerspectiveTopLeft"/>
       <xsd:enumeration value="legacyPerspectiveTop"/>
       <xsd:enumeration value="legacyPerspectiveTopRight"/>
       <xsd:enumeration value="legacyPerspectiveLeft"/>
       <xsd:enumeration value="legacyPerspectiveFront"/>
       <xsd:enumeration value="legacyPerspectiveRight"/>
       <xsd:enumeration value="legacyPerspectiveBottomLeft"/>
       <xsd:enumeration value="legacyPerspectiveBottom"/>
       <xsd:enumeration value="legacyPerspectiveBottomRight"/>
       <xsd:enumeration value="orthographicFront"/>
       <xsd:enumeration value="isometricTopUp"/>
       <xsd:enumeration value="isometricTopDown"/>
       <xsd:enumeration value="isometricBottomUp"/>
       <xsd:enumeration value="isometricBottomDown"/>
       <xsd:enumeration value="isometricLeftUp"/>
       <xsd:enumeration value="isometricLeftDown"/>
       <xsd:enumeration value="isometricRightUp"/>
       <xsd:enumeration value="isometricRightDown"/>
       <xsd:enumeration value="isometricOffAxis1Left"/>
       <xsd:enumeration value="isometricOffAxis1Right"/>
       <xsd:enumeration value="isometricOffAxis1Top"/>
       <xsd:enumeration value="isometricOffAxis2Left"/>
       <xsd:enumeration value="isometricOffAxis2Right"/>
       <xsd:enumeration value="isometricOffAxis2Top"/>
       <xsd:enumeration value="isometricOffAxis3Left"/>
       <xsd:enumeration value="isometricOffAxis3Right"/>
       <xsd:enumeration value="isometricOffAxis3Bottom"/>
       <xsd:enumeration value="isometricOffAxis4Left"/>
       <xsd:enumeration value="isometricOffAxis4Right"/>
       <xsd:enumeration value="isometricOffAxis4Bottom"/>
       <xsd:enumeration value="obliqueTopLeft"/>
       <xsd:enumeration value="obliqueTop"/>
       <xsd:enumeration value="obliqueTopRight"/>
       <xsd:enumeration value="obliqueLeft"/>
       <xsd:enumeration value="obliqueRight"/>
       <xsd:enumeration value="obliqueBottomLeft"/>
       <xsd:enumeration value="obliqueBottom"/>
       <xsd:enumeration value="obliqueBottomRight"/>
       <xsd:enumeration value="perspectiveFront"/>
       <xsd:enumeration value="perspectiveLeft"/>
       <xsd:enumeration value="perspectiveRight"/>
       <xsd:enumeration value="perspectiveAbove"/>
       <xsd:enumeration value="perspectiveBelow"/>
       <xsd:enumeration value="perspectiveAboveLeftFacing"/>
       <xsd:enumeration value="perspectiveAboveRightFacing"/>
       <xsd:enumeration value="perspectiveContrastingLeftFacing"/>
       <xsd:enumeration value="perspectiveContrastingRightFacing"/>
       <xsd:enumeration value="perspectiveHeroicLeftFacing"/>
       <xsd:enumeration value="perspectiveHeroicRightFacing"/>
       <xsd:enumeration value="perspectiveHeroicExtremeLeftFacing"/>
       <xsd:enumeration value="perspectiveHeroicExtremeRightFacing"/>
       <xsd:enumeration value="perspectiveRelaxed"/>
       <xsd:enumeration value="perspectiveRelaxedModerately"/>
     </xsd:restriction>
   </xsd:simpleType>
   <xsd:complexType name="CT_Camera">
     <xsd:attribute name="prst" use="required" type="ST_PresetCameraType"/>
   </xsd:complexType>
   <xsd:complexType name="CT_SphereCoords">
     <xsd:attribute name="lat" type="a:ST_PositiveFixedAngle" use="required"/>
     <xsd:attribute name="lon" type="a:ST_PositiveFixedAngle" use="required"/>
     <xsd:attribute name="rev" type="a:ST_PositiveFixedAngle" use="required"/>
   </xsd:complexType>
   <xsd:simpleType name="ST_LightRigType">
     <xsd:restriction base="xsd:token">
       <xsd:enumeration value="legacyFlat1"/>
       <xsd:enumeration value="legacyFlat2"/>
       <xsd:enumeration value="legacyFlat3"/>
       <xsd:enumeration value="legacyFlat4"/>
       <xsd:enumeration value="legacyNormal1"/>
       <xsd:enumeration value="legacyNormal2"/>
       <xsd:enumeration value="legacyNormal3"/>
       <xsd:enumeration value="legacyNormal4"/>
       <xsd:enumeration value="legacyHarsh1"/>
       <xsd:enumeration value="legacyHarsh2"/>
       <xsd:enumeration value="legacyHarsh3"/>
       <xsd:enumeration value="legacyHarsh4"/>
       <xsd:enumeration value="threePt"/>
       <xsd:enumeration value="balanced"/>
       <xsd:enumeration value="soft"/>
       <xsd:enumeration value="harsh"/>
       <xsd:enumeration value="flood"/>
       <xsd:enumeration value="contrasting"/>
       <xsd:enumeration value="morning"/>
       <xsd:enumeration value="sunrise"/>
       <xsd:enumeration value="sunset"/>
       <xsd:enumeration value="chilly"/>
       <xsd:enumeration value="freezing"/>
       <xsd:enumeration value="flat"/>
       <xsd:enumeration value="twoPt"/>
       <xsd:enumeration value="glow"/>
       <xsd:enumeration value="brightRoom"/>
     </xsd:restriction>
   </xsd:simpleType>
   <xsd:simpleType name="ST_LightRigDirection">
     <xsd:restriction base="xsd:token">
       <xsd:enumeration value="tl"/>
       <xsd:enumeration value="t"/>
       <xsd:enumeration value="tr"/>
       <xsd:enumeration value="l"/>
       <xsd:enumeration value="r"/>
       <xsd:enumeration value="bl"/>
       <xsd:enumeration value="b"/>
       <xsd:enumeration value="br"/>
     </xsd:restriction>
   </xsd:simpleType>
   <xsd:complexType name="CT_LightRig">
     <xsd:sequence>
       <xsd:element name="rot" type="CT_SphereCoords" minOccurs="0"/>
     </xsd:sequence>
     <xsd:attribute name="rig" type="ST_LightRigType" use="required"/>
     <xsd:attribute name="dir" type="ST_LightRigDirection" use="required"/>
   </xsd:complexType>
   <xsd:simpleType name="ST_BevelPresetType">
     <xsd:restriction base="xsd:token">
       <xsd:enumeration value="relaxedInset"/>
       <xsd:enumeration value="circle"/>
       <xsd:enumeration value="slope"/>
       <xsd:enumeration value="cross"/>
       <xsd:enumeration value="angle"/>
       <xsd:enumeration value="softRound"/>
       <xsd:enumeration value="convex"/>
       <xsd:enumeration value="coolSlant"/>
       <xsd:enumeration value="divot"/>
       <xsd:enumeration value="riblet"/>
       <xsd:enumeration value="hardEdge"/>
       <xsd:enumeration value="artDeco"/>
     </xsd:restriction>
   </xsd:simpleType>
   <xsd:complexType name="CT_Bevel">
     <xsd:attribute name="w" type="a:ST_PositiveCoordinate" use="optional"/>
     <xsd:attribute name="h" type="a:ST_PositiveCoordinate" use="optional"/>
     <xsd:attribute name="prst" type="ST_BevelPresetType" use="optional"/>
   </xsd:complexType>
   <xsd:simpleType name="ST_PresetMaterialType">
     <xsd:restriction base="xsd:token">
       <xsd:enumeration value="legacyMatte"/>
       <xsd:enumeration value="legacyPlastic"/>
       <xsd:enumeration value="legacyMetal"/>
       <xsd:enumeration value="legacyWireframe"/>
       <xsd:enumeration value="matte"/>
       <xsd:enumeration value="plastic"/>
       <xsd:enumeration value="metal"/>
       <xsd:enumeration value="warmMatte"/>
       <xsd:enumeration value="translucentPowder"/>
       <xsd:enumeration value="powder"/>
       <xsd:enumeration value="dkEdge"/>
       <xsd:enumeration value="softEdge"/>
       <xsd:enumeration value="clear"/>
       <xsd:enumeration value="flat"/>
       <xsd:enumeration value="softmetal"/>
       <xsd:enumeration value="none"/>
     </xsd:restriction>
   </xsd:simpleType>
   <xsd:complexType name="CT_Glow">
     <xsd:sequence>
       <xsd:group ref="EG_ColorChoice"/>
     </xsd:sequence>
     <xsd:attribute name="rad" use="optional" type="a:ST_PositiveCoordinate"/>
   </xsd:complexType>
   <xsd:complexType name="CT_Shadow">
     <xsd:sequence>
       <xsd:group ref="EG_ColorChoice"/>
     </xsd:sequence>
     <xsd:attribute name="blurRad" use="optional" type="a:ST_PositiveCoordinate"/>
     <xsd:attribute name="dist" use="optional" type="a:ST_PositiveCoordinate"/>
     <xsd:attribute name="dir" use="optional" type="a:ST_PositiveFixedAngle"/>
     <xsd:attribute name="sx" use="optional" type="a:ST_Percentage"/>
     <xsd:attribute name="sy" use="optional" type="a:ST_Percentage"/>
     <xsd:attribute name="kx" use="optional" type="a:ST_FixedAngle"/>
     <xsd:attribute name="ky" use="optional" type="a:ST_FixedAngle"/>
     <xsd:attribute name="algn" use="optional" type="ST_RectAlignment"/>
   </xsd:complexType>
   <xsd:complexType name="CT_Reflection">
     <xsd:attribute name="blurRad" use="optional" type="a:ST_PositiveCoordinate"/>
     <xsd:attribute name="stA" use="optional" type="a:ST_PositiveFixedPercentage"/>
     <xsd:attribute name="stPos" use="optional" type="a:ST_PositiveFixedPercentage"/>
     <xsd:attribute name="endA" use="optional" type="a:ST_PositiveFixedPercentage"/>
     <xsd:attribute name="endPos" use="optional" type="a:ST_PositiveFixedPercentage"/>
     <xsd:attribute name="dist" use="optional" type="a:ST_PositiveCoordinate"/>
     <xsd:attribute name="dir" use="optional" type="a:ST_PositiveFixedAngle"/>
     <xsd:attribute name="fadeDir" use="optional" type="a:ST_PositiveFixedAngle"/>
     <xsd:attribute name="sx" use="optional" type="a:ST_Percentage"/>
     <xsd:attribute name="sy" use="optional" type="a:ST_Percentage"/>
     <xsd:attribute name="kx" use="optional" type="a:ST_FixedAngle"/>
     <xsd:attribute name="ky" use="optional" type="a:ST_FixedAngle"/>
     <xsd:attribute name="algn" use="optional" type="ST_RectAlignment"/>
   </xsd:complexType>
   <xsd:complexType name="CT_FillTextEffect">
     <xsd:sequence>
       <xsd:group ref="EG_FillProperties" minOccurs="0"/>
     </xsd:sequence>
   </xsd:complexType>
   <xsd:complexType name="CT_TextOutlineEffect">
     <xsd:sequence>
       <xsd:group ref="EG_FillProperties" minOccurs="0"/>
       <xsd:group ref="EG_LineDashProperties" minOccurs="0"/>
       <xsd:group ref="EG_LineJoinProperties" minOccurs="0"/>
     </xsd:sequence>
     <xsd:attribute name="w" use="optional" type="a:ST_LineWidth"/>
     <xsd:attribute name="cap" use="optional" type="ST_LineCap"/>
     <xsd:attribute name="cmpd" use="optional" type="ST_CompoundLine"/>
     <xsd:attribute name="algn" use="optional" type="ST_PenAlignment"/>
   </xsd:complexType>
   <xsd:complexType name="CT_Scene3D">
     <xsd:sequence>
       <xsd:element name="camera" type="CT_Camera"/>
       <xsd:element name="lightRig" type="CT_LightRig"/>
     </xsd:sequence>
   </xsd:complexType>
   <xsd:complexType name="CT_Props3D">
     <xsd:sequence>
       <xsd:element name="bevelT" type="CT_Bevel" minOccurs="0"/>
       <xsd:element name="bevelB" type="CT_Bevel" minOccurs="0"/>
       <xsd:element name="extrusionClr" type="CT_Color" minOccurs="0"/>
       <xsd:element name="contourClr" type="CT_Color" minOccurs="0"/>
     </xsd:sequence>
     <xsd:attribute name="extrusionH" type="a:ST_PositiveCoordinate" use="optional"/>
     <xsd:attribute name="contourW" type="a:ST_PositiveCoordinate" use="optional"/>
     <xsd:attribute name="prstMaterial" type="ST_PresetMaterialType" use="optional"/>
   </xsd:complexType>
   <xsd:group name="EG_RPrTextEffects">
     <xsd:sequence>
       <xsd:element name="glow" minOccurs="0" type="CT_Glow"/>
       <xsd:element name="shadow" minOccurs="0" type="CT_Shadow"/>
       <xsd:element name="reflection" minOccurs="0" type="CT_Reflection"/>
       <xsd:element name="textOutline" minOccurs="0" type="CT_TextOutlineEffect"/>
       <xsd:element name="textFill" minOccurs="0" type="CT_FillTextEffect"/>
       <xsd:element name="scene3d" minOccurs="0" type="CT_Scene3D"/>
       <xsd:element name="props3d" minOccurs="0" type="CT_Props3D"/>
     </xsd:sequence>
   </xsd:group>
   <xsd:simpleType name="ST_Ligatures">
     <xsd:restriction base="xsd:string">
       <xsd:enumeration value="none"/>
       <xsd:enumeration value="standard"/>
       <xsd:enumeration value="contextual"/>
       <xsd:enumeration value="historical"/>
       <xsd:enumeration value="discretional"/>
       <xsd:enumeration value="standardContextual"/>
       <xsd:enumeration value="standardHistorical"/>
       <xsd:enumeration value="contextualHistorical"/>
       <xsd:enumeration value="standardDiscretional"/>
       <xsd:enumeration value="contextualDiscretional"/>
       <xsd:enumeration value="historicalDiscretional"/>
       <xsd:enumeration value="standardContextualHistorical"/>
       <xsd:enumeration value="standardContextualDiscretional"/>
       <xsd:enumeration value="standardHistoricalDiscretional"/>
       <xsd:enumeration value="contextualHistoricalDiscretional"/>
       <xsd:enumeration value="all"/>
     </xsd:restriction>
   </xsd:simpleType>
   <xsd:complexType name="CT_Ligatures">
     <xsd:attribute name="val" type="ST_Ligatures" use="required"/>
   </xsd:complexType>
   <xsd:simpleType name="ST_NumForm">
     <xsd:restriction base="xsd:string">
       <xsd:enumeration value="default"/>
       <xsd:enumeration value="lining"/>
       <xsd:enumeration value="oldStyle"/>
     </xsd:restriction>
   </xsd:simpleType>
   <xsd:complexType name="CT_NumForm">
     <xsd:attribute name="val" type="ST_NumForm" use="required"/>
   </xsd:complexType>
   <xsd:simpleType name="ST_NumSpacing">
     <xsd:restriction base="xsd:string">
       <xsd:enumeration value="default"/>
       <xsd:enumeration value="proportional"/>
       <xsd:enumeration value="tabular"/>
     </xsd:restriction>
   </xsd:simpleType>
   <xsd:complexType name="CT_NumSpacing">
     <xsd:attribute name="val" type="ST_NumSpacing" use="required"/>
   </xsd:complexType>
   <xsd:complexType name="CT_StyleSet">
     <xsd:attribute name="id" type="s:ST_UnsignedDecimalNumber" use="required"/>
     <xsd:attribute name="val" type="ST_OnOff" use="optional"/>
   </xsd:complexType>
   <xsd:complexType name="CT_StylisticSets">
     <xsd:sequence minOccurs="0">
       <xsd:element name="styleSet" minOccurs="0" maxOccurs="unbounded" type="CT_StyleSet"/>
     </xsd:sequence>
   </xsd:complexType>
   <xsd:group name="EG_RPrOpenType">
     <xsd:sequence>
       <xsd:element name="ligatures" minOccurs="0" type="CT_Ligatures"/>
       <xsd:element name="numForm" minOccurs="0" type="CT_NumForm"/>
       <xsd:element name="numSpacing" minOccurs="0" type="CT_NumSpacing"/>
       <xsd:element name="stylisticSets" minOccurs="0" type="CT_StylisticSets"/>
       <xsd:element name="cntxtAlts" minOccurs="0" type="CT_OnOff"/>
     </xsd:sequence>
   </xsd:group>
   <xsd:element name="discardImageEditingData" type="CT_OnOff"/>
   <xsd:element name="defaultImageDpi" type="CT_DefaultImageDpi"/>
   <xsd:complexType name="CT_DefaultImageDpi">
     <xsd:attribute name="val" type="w:ST_DecimalNumber" use="required"/>
   </xsd:complexType>
   <xsd:element name="entityPicker" type="w:CT_Empty"/>
   <xsd:complexType name="CT_SdtCheckboxSymbol">
     <xsd:attribute name="font" type="s:ST_String"/>
     <xsd:attribute name="val" type="w:ST_ShortHexNumber"/>
   </xsd:complexType>
   <xsd:complexType name="CT_SdtCheckbox">
     <xsd:sequence>
       <xsd:element name="checked" type="CT_OnOff" minOccurs="0"/>
       <xsd:element name="checkedState" type="CT_SdtCheckboxSymbol" minOccurs="0"/>
       <xsd:element name="uncheckedState" type="CT_SdtCheckboxSymbol" minOccurs="0"/>
     </xsd:sequence>
   </xsd:complexType>
   <xsd:element name="checkbox" type="CT_SdtCheckbox"/>
 </xsd:schema>
--- a/ooxml-schemas/microsoft/wml-2012.xsd
+++ b/ooxml-schemas/microsoft/wml-2012.xsd
@ -0,0 +1,66 @@
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:w12="http://schemas.openxmlformats.org/wordprocessingml/2006/main" elementFormDefault="qualified" attributeFormDefault="qualified" blockDefault="#all" xmlns="http://schemas.microsoft.com/office/word/2012/wordml" targetNamespace="http://schemas.microsoft.com/office/word/2012/wordml">
   <xsd:import id="w12" namespace="http://schemas.openxmlformats.org/wordprocessingml/2006/main" schemaLocation="word12.xsd"/>
   <xsd:element name="color" type="w12:CT_Color"/>
   <xsd:simpleType name="ST_SdtAppearance">
     <xsd:restriction base="xsd:string">
       <xsd:enumeration value="boundingBox"/>
       <xsd:enumeration value="tags"/>
       <xsd:enumeration value="hidden"/>
     </xsd:restriction>
   </xsd:simpleType>
   <xsd:element name="dataBinding" type="w12:CT_DataBinding"/>
   <xsd:complexType name="CT_SdtAppearance">
     <xsd:attribute name="val" type="ST_SdtAppearance"/>
   </xsd:complexType>
   <xsd:element name="appearance" type="CT_SdtAppearance"/>
   <xsd:complexType name="CT_CommentsEx">
     <xsd:sequence>
       <xsd:element name="commentEx" type="CT_CommentEx" minOccurs="0" maxOccurs="unbounded"/>
     </xsd:sequence>
   </xsd:complexType>
   <xsd:complexType name="CT_CommentEx">
     <xsd:attribute name="paraId" type="w12:ST_LongHexNumber" use="required"/>
     <xsd:attribute name="paraIdParent" type="w12:ST_LongHexNumber" use="optional"/>
     <xsd:attribute name="done" type="w12:ST_OnOff" use="optional"/>
   </xsd:complexType>
   <xsd:element name="commentsEx" type="CT_CommentsEx"/>
   <xsd:complexType name="CT_People">
     <xsd:sequence>
       <xsd:element name="person" type="CT_Person" minOccurs="0" maxOccurs="unbounded"/>
     </xsd:sequence>
   </xsd:complexType>
   <xsd:complexType name="CT_PresenceInfo">
     <xsd:attribute name="providerId" type="xsd:string" use="required"/>
     <xsd:attribute name="userId" type="xsd:string" use="required"/>
   </xsd:complexType>
   <xsd:complexType name="CT_Person">
     <xsd:sequence>
       <xsd:element name="presenceInfo" type="CT_PresenceInfo" minOccurs="0" maxOccurs="1"/>
     </xsd:sequence>
     <xsd:attribute name="author" type="w12:ST_String" use="required"/>
   </xsd:complexType>
   <xsd:element name="people" type="CT_People"/>
   <xsd:complexType name="CT_SdtRepeatedSection">
     <xsd:sequence>
       <xsd:element name="sectionTitle" type="w12:CT_String" minOccurs="0"/>
       <xsd:element name="doNotAllowInsertDeleteSection" type="w12:CT_OnOff" minOccurs="0"/>
     </xsd:sequence>
   </xsd:complexType>
   <xsd:simpleType name="ST_Guid">
     <xsd:restriction base="xsd:token">
       <xsd:pattern value="\{[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}\}"/>
     </xsd:restriction>
   </xsd:simpleType>
   <xsd:complexType name="CT_Guid">
     <xsd:attribute name="val" type="ST_Guid"/>
   </xsd:complexType>
   <xsd:element name="repeatingSection" type="CT_SdtRepeatedSection"/>
   <xsd:element name="repeatingSectionItem" type="w12:CT_Empty"/>
   <xsd:element name="chartTrackingRefBased" type="w12:CT_OnOff"/>
   <xsd:element name="collapsed" type="w12:CT_OnOff"/>
   <xsd:element name="docId" type="CT_Guid"/>
   <xsd:element name="footnoteColumns" type="w12:CT_DecimalNumber"/>
   <xsd:element name="webExtensionLinked" type="w12:CT_OnOff"/>
   <xsd:element name="webExtensionCreated" type="w12:CT_OnOff"/>
   <xsd:attribute name="restartNumberingAfterBreak" type="w12:ST_OnOff"/>
 </xsd:schema>
--- a/ooxml-schemas/microsoft/wml-2018.xsd
+++ b/ooxml-schemas/microsoft/wml-2018.xsd
@ -0,0 +1,14 @@
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:w12="http://schemas.openxmlformats.org/wordprocessingml/2006/main" elementFormDefault="qualified" attributeFormDefault="qualified" blockDefault="#all" xmlns="http://schemas.microsoft.com/office/word/2018/wordml" targetNamespace="http://schemas.microsoft.com/office/word/2018/wordml">
   <xsd:import id="w12" namespace="http://schemas.openxmlformats.org/wordprocessingml/2006/main" schemaLocation="word12.xsd"/>
   <xsd:complexType name="CT_Extension">
     <xsd:sequence>
       <xsd:any processContents="lax"/>
     </xsd:sequence>
     <xsd:attribute name="uri" type="xsd:token"/>
   </xsd:complexType>
   <xsd:complexType name="CT_ExtensionList">
     <xsd:sequence>
       <xsd:element name="ext" type="CT_Extension" minOccurs="0" maxOccurs="unbounded"/>
     </xsd:sequence>
   </xsd:complexType>
 </xsd:schema>
--- a/ooxml-schemas/microsoft/wml-cex-2018.xsd
+++ b/ooxml-schemas/microsoft/wml-cex-2018.xsd
@ -0,0 +1,19 @@
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:w12="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w16="http://schemas.microsoft.com/office/word/2018/wordml" elementFormDefault="qualified" attributeFormDefault="qualified" blockDefault="#all" xmlns="http://schemas.microsoft.com/office/word/2018/wordml/cex" targetNamespace="http://schemas.microsoft.com/office/word/2018/wordml/cex">
   <xsd:import id="w16" namespace="http://schemas.microsoft.com/office/word/2018/wordml" schemaLocation="word16.xsd"/>
   <xsd:import id="w12" namespace="http://schemas.openxmlformats.org/wordprocessingml/2006/main" schemaLocation="word12.xsd"/>
   <xsd:complexType name="CT_CommentsExtensible">
     <xsd:sequence>
       <xsd:element name="commentExtensible" type="CT_CommentExtensible" minOccurs="0" maxOccurs="unbounded"/>
       <xsd:element name="extLst" type="w16:CT_ExtensionList" minOccurs="0" maxOccurs="1"/>
     </xsd:sequence>
   </xsd:complexType>
   <xsd:complexType name="CT_CommentExtensible">
     <xsd:sequence>
       <xsd:element name="extLst" type="w16:CT_ExtensionList" minOccurs="0" maxOccurs="1"/>
     </xsd:sequence>
     <xsd:attribute name="durableId" type="w12:ST_LongHexNumber" use="required"/>
     <xsd:attribute name="dateUtc" type="w12:ST_DateTime" use="optional"/>
     <xsd:attribute name="intelligentPlaceholder" type="w12:ST_OnOff" use="optional"/>
   </xsd:complexType>
   <xsd:element name="commentsExtensible" type="CT_CommentsExtensible"/>
 </xsd:schema>
--- a/ooxml-schemas/microsoft/wml-cid-2016.xsd
+++ b/ooxml-schemas/microsoft/wml-cid-2016.xsd
@ -0,0 +1,13 @@
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:w12="http://schemas.openxmlformats.org/wordprocessingml/2006/main" elementFormDefault="qualified" attributeFormDefault="qualified" blockDefault="#all" xmlns="http://schemas.microsoft.com/office/word/2016/wordml/cid" targetNamespace="http://schemas.microsoft.com/office/word/2016/wordml/cid">
   <xsd:import id="w12" namespace="http://schemas.openxmlformats.org/wordprocessingml/2006/main" schemaLocation="word12.xsd"/>
   <xsd:complexType name="CT_CommentsIds">
     <xsd:sequence>
       <xsd:element name="commentId" type="CT_CommentId" minOccurs="0" maxOccurs="unbounded"/>
     </xsd:sequence>
   </xsd:complexType>
   <xsd:complexType name="CT_CommentId">
     <xsd:attribute name="paraId" type="w12:ST_LongHexNumber" use="required"/>
     <xsd:attribute name="durableId" type="w12:ST_LongHexNumber" use="required"/>
   </xsd:complexType>
   <xsd:element name="commentsIds" type="CT_CommentsIds"/>
 </xsd:schema>
--- a/ooxml-schemas/microsoft/wml-sdtdatahash-2020.xsd
+++ b/ooxml-schemas/microsoft/wml-sdtdatahash-2020.xsd
@ -0,0 +1,4 @@
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:w12="http://schemas.openxmlformats.org/wordprocessingml/2006/main" elementFormDefault="qualified" attributeFormDefault="qualified" blockDefault="#all" xmlns="http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash" targetNamespace="http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash">
   <xsd:import id="w12" namespace="http://schemas.openxmlformats.org/wordprocessingml/2006/main" schemaLocation="word12.xsd"/>
   <xsd:attribute name="storeItemChecksum" type="w12:ST_String"/>
 </xsd:schema>
--- a/ooxml-schemas/microsoft/wml-symex-2015.xsd
+++ b/ooxml-schemas/microsoft/wml-symex-2015.xsd
@ -0,0 +1,8 @@
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:w12="http://schemas.openxmlformats.org/wordprocessingml/2006/main" elementFormDefault="qualified" attributeFormDefault="qualified" blockDefault="#all" xmlns="http://schemas.microsoft.com/office/word/2015/wordml/symex" targetNamespace="http://schemas.microsoft.com/office/word/2015/wordml/symex">
   <xsd:import id="w12" namespace="http://schemas.openxmlformats.org/wordprocessingml/2006/main" schemaLocation="word12.xsd"/>
   <xsd:complexType name="CT_SymEx">
     <xsd:attribute name="font" type="w12:ST_String"/>
     <xsd:attribute name="char" type="w12:ST_LongHexNumber"/>
   </xsd:complexType>
   <xsd:element name="symEx" type="CT_SymEx"/>
 </xsd:schema>
--- a/ooxml-schemas/microsoft/word12.xsd
+++ b/ooxml-schemas/microsoft/word12.xsd
@ -0,0 +1,3 @@
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:s="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes">
   <xsd:import namespace="http://schemas.openxmlformats.org/wordprocessingml/2006/main" schemaLocation="../ISO-IEC29500-4_2016/wml.xsd"/>
 </xsd:schema>
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,26 +1,26 @@
 {
  "name": "docx",
-  "version": "6.0.1",
+  "version": "7.2.0",
  "description": "Easily generate .docx files with JS/TS with a nice declarative API. Works for Node and on the Browser.",
  "main": "build/index.js",
  "scripts": {
    "pretest": "rimraf ./build",
-    "test": "mocha-webpack \"src/**/*.ts\"",
+    "test": "TS_NODE_PROJECT=\"tsconfig.spec.json\" mocha -r ts-node/register -r tsconfig-paths/register \"src/**/*.ts\"",
    "test.coverage": "nyc npm test",
    "test.watch": "npm test -- --watch",
    "prepublishOnly": "npm run build --production",
    "lint": "tslint --project .",
    "build": "npm run webpack && npm run fix-types",
-    "tsc": "rimraf ./build && tsc -p .",
+    "webpack": "rimraf ./build && webpack --config ./webpack.config.ts",
-    "webpack": "rimraf ./build && webpack",
+    "demo": "npm run build && npm run ts-node --skip-project ./demo",
    "demo": "npm run build && npm run ts-node ./demo",
    "typedoc": "rimraf ./build && typedoc src/index.ts --tsconfig tsconfig.typedoc.json",
    "style": "prettier -l \"src/**/*.ts\"",
    "style.fix": "npm run style -- --write",
-    "fix-types": "ts-node scripts/types-absolute-fixer.ts",
+    "fix-types": "ts-node --skip-project scripts/types-absolute-fixer.ts",
    "e2e": "ts-node scripts/e2e.ts",
    "serve.docs": "cd docs && docsify serve",
-    "ts-node": "ts-node"
+    "extract": "ts-node --project tsconfig.spec.json scripts/extract-document.ts",
    "ts-node": "ts-node --skip-project"
  },
  "pre-commit": [
    "style",
@ -49,8 +49,7 @@
  ],
  "types": "./build/index.d.ts",
  "dependencies": {
-    "@types/jszip": "^3.1.4",
+    "@types/node": "^16.0.0",
    "@types/node": "^14.0.5",
    "jszip": "^3.1.5",
    "nanoid": "^3.1.20",
    "xml": "^1.0.1",
@ -64,34 +63,42 @@
  "homepage": "https://github.com/dolanmiu/docx#readme",
  "devDependencies": {
    "@types/chai": "^4.2.15",
-    "@types/mocha": "^8.0.0",
+    "@types/glob": "^7.1.4",
    "@types/mocha": "^9.0.0",
    "@types/prompt": "^1.1.1",
    "@types/request-promise": "^4.1.42",
-    "@types/sinon": "^9.0.4",
+    "@types/shelljs": "^0.8.9",
-    "@types/webpack": "^4.4.24",
+    "@types/sinon": "^10.0.0",
-    "awesome-typescript-loader": "^3.4.1",
+    "@types/unzipper": "^0.10.4",
    "@types/webpack": "^5.0.0",
    "buffer": "^6.0.3",
    "chai": "^3.5.0",
    "docsify-cli": "^4.3.0",
    "glob": "^7.1.2",
    "istanbul-instrumenter-loader": "^3.0.1",
    "jszip": "^3.1.5",
-    "mocha": "^5.2.0",
+    "mocha": "^9.0.2",
    "mocha-webpack": "^1.0.1",
    "nyc": "^15.1.0",
    "pre-commit": "^1.2.2",
-    "prettier": "^2.1.2",
+    "prettier": "^2.3.1",
    "process": "^0.11.10",
    "prompt": "^1.0.0",
-    "replace-in-file": "^3.1.0",
+    "replace-in-file": "^6.2.0",
    "request": "^2.88.0",
    "request-promise": "^4.2.2",
    "rimraf": "^3.0.2",
    "shelljs": "^0.8.4",
-    "sinon": "^9.0.2",
+    "sinon": "^12.0.1",
-    "ts-node": "^9.0.0",
+    "stream-browserify": "^3.0.0",
    "ts-loader": "^9.0.0",
    "ts-node": "^10.2.1",
    "tsconfig-paths": "^3.9.0",
    "tslint": "^6.1.3",
    "tslint-immutable": "^6.0.1",
-    "typedoc": "^0.20.29",
+    "typedoc": "^0.22.3",
-    "typescript": "4.2.3",
+    "typescript": "4.5.2",
-    "webpack": "^3.10.0"
+    "unzipper": "^0.10.11",
    "webpack": "^5.28.0",
    "webpack-cli": "^4.6.0"
  },
  "engines": {
    "node": ">=10"
--- a/scripts/extract-document.ts
+++ b/scripts/extract-document.ts
@ -0,0 +1,10 @@
 import * as unzipper from "unzipper";
 const main = async () => {
    const zip = await unzipper.Open.file("My Document.docx");
    await zip.extract({
        path: "build/extracted-doc",
    });
 };
 main();
--- a/scripts/types-absolute-fixer.ts
+++ b/scripts/types-absolute-fixer.ts
@ -1,18 +1,16 @@
 import * as glob from "glob";
-import * as replace from "replace-in-file";
+import { replaceInFile } from "replace-in-file";
 const files = glob.sync("build/**/*.d.ts");
 for (const file of files) {
-    replace({
+    replaceInFile({
        files: file,
        from: /"file[a-z/-]*"/gi,
        to: (match) => {
            const matchSlug = match.replace(/['"]+/g, "").trim();
            const levelCount = file.split("/").length - 2;
-            const backLevels = Array(levelCount)
+            const backLevels = Array(levelCount).fill("../").join("");
                .fill("../")
                .join("");
            return `"${backLevels}${matchSlug}"`;
        },
--- a/src/convenience-functions.spec.ts
+++ b/src/convenience-functions.spec.ts
@ -18,14 +18,14 @@ describe("Utility", () => {
    });
    describe("#uniqueNumericId", () => {
-        it("should generate a unique ID", () => {
+        it("should generate a unique incrementing ID", () => {
            // tslint:disable-next-line: no-unused-expression
-            expect(uniqueNumericId()).to.not.be.empty;
+            expect(uniqueNumericId()).to.not.be.undefined;
        });
    });
    describe("#uniqueId", () => {
-        it("should call the underlying header's addChildElement", () => {
+        it("should generate a unique pseudorandom ID", () => {
            // tslint:disable-next-line: no-unused-expression
            expect(uniqueId()).to.not.be.empty;
        });
--- a/src/convenience-functions.ts
+++ b/src/convenience-functions.ts
@ -1,6 +1,6 @@
-import { customAlphabet, nanoid } from "nanoid/non-secure";
+import { nanoid } from "nanoid/non-secure";
-const numericNanoId = customAlphabet("0123456789", 15);
+let currentCount = 0;
 // Twip - twentieths of a point
 export const convertMillimetersToTwip = (millimeters: number): number => {
@ -12,7 +12,7 @@ export const convertInchesToTwip = (inches: number): number => {
 };
 export const uniqueNumericId = (): number => {
-    return parseFloat(numericNanoId());
+    return ++currentCount;
 };
 export const uniqueId = (): string => {
--- a/src/export/formatter.spec.ts
+++ b/src/export/formatter.spec.ts
@ -1,7 +1,7 @@
 import { assert, expect } from "chai";
 import * as sinon from "sinon";
-import { Formatter } from "export/formatter";
+import { Formatter } from "@export/formatter";
 import { Paragraph, TextRun } from "file";
 import { CoreProperties } from "file/core-properties";
 import { Attributes } from "file/xml-components";
@ -45,18 +45,10 @@ describe("Formatter", () => {
                            {
                                "w:rPr": [
                                    {
-                                        "w:b": {
+                                        "w:b": {},
                                            _attr: {
                                                "w:val": true,
                                            },
                                        },
                                    },
                                    {
-                                        "w:bCs": {
+                                        "w:bCs": {},
                                            _attr: {
                                                "w:val": true,
                                            },
                                        },
                                    },
                                ],
                            },
--- a/src/export/packer/image-replacer.spec.ts
+++ b/src/export/packer/image-replacer.spec.ts
@ -36,7 +36,7 @@ describe("ImageReplacer", () => {
    describe("#getMediaData()", () => {
        it("should get media data", () => {
            const imageReplacer = new ImageReplacer();
-            const result = imageReplacer.getMediaData("test {test-image} test", ({
+            const result = imageReplacer.getMediaData("test {test-image} test", {
                Array: [
                    {
                        stream: Buffer.from(""),
@ -53,7 +53,7 @@ describe("ImageReplacer", () => {
                        },
                    },
                ],
-            } as unknown) as Media);
+            } as unknown as Media);
            expect(result).to.have.length(1);
        });
--- a/src/export/packer/next-compiler.ts
+++ b/src/export/packer/next-compiler.ts
@ -70,7 +70,6 @@ export class Compiler {
    }
    private xmlifyFile(file: File, prettify?: boolean): IXmlifyedFileMapping {
        file.verifyUpdateFields();
        const documentRelationshipCount = file.Document.Relationships.RelationshipCount + 1;
        const documentXmlData = xml(
@ -78,7 +77,13 @@ export class Compiler {
                viewWrapper: file.Document,
                file,
            }),
-            prettify,
+            {
                indent: prettify,
                declaration: {
                    standalone: "yes",
                    encoding: "UTF-8",
                },
            },
        );
        const documentMediaDatas = this.imageReplacer.getMediaData(documentXmlData, file.Media);
@ -98,7 +103,12 @@ export class Compiler {
                            viewWrapper: file.Document,
                            file,
                        }),
-                        prettify,
+                        {
                            indent: prettify,
                            declaration: {
                                encoding: "UTF-8",
                            },
                        },
                    );
                })(),
                path: "word/_rels/document.xml.rels",
@ -113,13 +123,23 @@ export class Compiler {
                path: "word/document.xml",
            },
            Styles: {
-                data: xml(
+                data: (() => {
                    const xmlStyles = xml(
                        this.formatter.format(file.Styles, {
                            viewWrapper: file.Document,
                            file,
                        }),
-                    prettify,
+                        {
-                ),
+                            indent: prettify,
                            declaration: {
                                standalone: "yes",
                                encoding: "UTF-8",
                            },
                        },
                    );
                    const referencedXmlStyles = this.numberingReplacer.replace(xmlStyles, file.Numbering.ConcreteNumbering);
                    return referencedXmlStyles;
                })(),
                path: "word/styles.xml",
            },
            Properties: {
@ -129,6 +149,7 @@ export class Compiler {
                        file,
                    }),
                    {
                        indent: prettify,
                        declaration: {
                            standalone: "yes",
                            encoding: "UTF-8",
@ -143,7 +164,13 @@ export class Compiler {
                        viewWrapper: file.Document,
                        file,
                    }),
-                    prettify,
+                    {
                        indent: prettify,
                        declaration: {
                            standalone: "yes",
                            encoding: "UTF-8",
                        },
                    },
                ),
                path: "word/numbering.xml",
            },
@ -153,7 +180,12 @@ export class Compiler {
                        viewWrapper: file.Document,
                        file,
                    }),
-                    prettify,
+                    {
                        indent: prettify,
                        declaration: {
                            encoding: "UTF-8",
                        },
                    },
                ),
                path: "_rels/.rels",
            },
@ -163,7 +195,12 @@ export class Compiler {
                        viewWrapper: headerWrapper,
                        file,
                    }),
-                    prettify,
+                    {
                        indent: prettify,
                        declaration: {
                            encoding: "UTF-8",
                        },
                    },
                );
                const mediaDatas = this.imageReplacer.getMediaData(xmlData, file.Media);
@ -181,7 +218,12 @@ export class Compiler {
                            viewWrapper: headerWrapper,
                            file,
                        }),
-                        prettify,
+                        {
                            indent: prettify,
                            declaration: {
                                encoding: "UTF-8",
                            },
                        },
                    ),
                    path: `word/_rels/header${index + 1}.xml.rels`,
                };
@ -192,7 +234,12 @@ export class Compiler {
                        viewWrapper: footerWrapper,
                        file,
                    }),
-                    prettify,
+                    {
                        indent: prettify,
                        declaration: {
                            encoding: "UTF-8",
                        },
                    },
                );
                const mediaDatas = this.imageReplacer.getMediaData(xmlData, file.Media);
@ -210,7 +257,12 @@ export class Compiler {
                            viewWrapper: footerWrapper,
                            file,
                        }),
-                        prettify,
+                        {
                            indent: prettify,
                            declaration: {
                                encoding: "UTF-8",
                            },
                        },
                    ),
                    path: `word/_rels/footer${index + 1}.xml.rels`,
                };
@ -221,7 +273,12 @@ export class Compiler {
                        viewWrapper: headerWrapper,
                        file,
                    }),
-                    prettify,
+                    {
                        indent: prettify,
                        declaration: {
                            encoding: "UTF-8",
                        },
                    },
                );
                const mediaDatas = this.imageReplacer.getMediaData(tempXmlData, file.Media);
                // TODO: 0 needs to be changed when headers get relationships of their own
@ -238,7 +295,12 @@ export class Compiler {
                        viewWrapper: footerWrapper,
                        file,
                    }),
-                    prettify,
+                    {
                        indent: prettify,
                        declaration: {
                            encoding: "UTF-8",
                        },
                    },
                );
                const mediaDatas = this.imageReplacer.getMediaData(tempXmlData, file.Media);
                // TODO: 0 needs to be changed when headers get relationships of their own
@ -255,7 +317,12 @@ export class Compiler {
                        viewWrapper: file.Document,
                        file,
                    }),
-                    prettify,
+                    {
                        indent: prettify,
                        declaration: {
                            encoding: "UTF-8",
                        },
                    },
                ),
                path: "[Content_Types].xml",
            },
@ -265,7 +332,13 @@ export class Compiler {
                        viewWrapper: file.Document,
                        file,
                    }),
-                    prettify,
+                    {
                        indent: prettify,
                        declaration: {
                            standalone: "yes",
                            encoding: "UTF-8",
                        },
                    },
                ),
                path: "docProps/custom.xml",
            },
@ -275,7 +348,13 @@ export class Compiler {
                        viewWrapper: file.Document,
                        file,
                    }),
-                    prettify,
+                    {
                        indent: prettify,
                        declaration: {
                            standalone: "yes",
                            encoding: "UTF-8",
                        },
                    },
                ),
                path: "docProps/app.xml",
            },
@ -285,7 +364,12 @@ export class Compiler {
                        viewWrapper: file.FootNotes,
                        file: file,
                    }),
-                    prettify,
+                    {
                        indent: prettify,
                        declaration: {
                            encoding: "UTF-8",
                        },
                    },
                ),
                path: "word/footnotes.xml",
            },
@ -295,7 +379,12 @@ export class Compiler {
                        viewWrapper: file.FootNotes,
                        file: file,
                    }),
-                    prettify,
+                    {
                        indent: prettify,
                        declaration: {
                            encoding: "UTF-8",
                        },
                    },
                ),
                path: "word/_rels/footnotes.xml.rels",
            },
@ -305,7 +394,13 @@ export class Compiler {
                        viewWrapper: file.Document,
                        file,
                    }),
-                    prettify,
+                    {
                        indent: prettify,
                        declaration: {
                            standalone: "yes",
                            encoding: "UTF-8",
                        },
                    },
                ),
                path: "word/settings.xml",
            },
--- a/src/export/packer/packer.spec.ts
+++ b/src/export/packer/packer.spec.ts
@ -12,7 +12,7 @@ describe("Packer", () => {
    beforeEach(() => {
        file = new File({
            creator: "Dolan Miu",
-            revision: "1",
+            revision: 1,
            lastModifiedBy: "Dolan Miu",
            sections: [
                {
--- a/src/file/border/border.spec.ts
+++ b/src/file/border/border.spec.ts
@ -0,0 +1,54 @@
 import { expect } from "chai";
 import { Formatter } from "export/formatter";
 import { BorderStyle } from "file/border";
 import { BorderElement } from "./border";
 describe("BorderElement", () => {
    describe("#constructor", () => {
        it("should create a simple border element", () => {
            const border = new BorderElement("w:top", {
                style: BorderStyle.SINGLE,
            });
            const tree = new Formatter().format(border);
            expect(tree).to.deep.equal({
                "w:top": {
                    _attr: {
                        "w:val": "single",
                    },
                },
            });
        });
        it("should create a simple border element with a size", () => {
            const border = new BorderElement("w:top", {
                style: BorderStyle.SINGLE,
                size: 22,
            });
            const tree = new Formatter().format(border);
            expect(tree).to.deep.equal({
                "w:top": {
                    _attr: {
                        "w:val": "single",
                        "w:sz": 22,
                    },
                },
            });
        });
        it("should create a simple border element with space", () => {
            const border = new BorderElement("w:top", {
                style: BorderStyle.SINGLE,
                space: 22,
            });
            const tree = new Formatter().format(border);
            expect(tree).to.deep.equal({
                "w:top": {
                    _attr: {
                        "w:val": "single",
                        "w:space": 22,
                    },
                },
            });
        });
    });
 });
--- a/Show More
+++ b/Show More