schema: update to ODF 1.3 OS

Change-Id: I97e28612aeeebed709da9ad621250c6b26e55f92
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116734
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
diff --git a/schema/libreoffice/OpenDocument-dsig-schema-v1.3+libreoffice.rng b/schema/libreoffice/OpenDocument-dsig-schema-v1.3+libreoffice.rng
deleted file mode 100644
index 7fd47cf..0000000
--- a/schema/libreoffice/OpenDocument-dsig-schema-v1.3+libreoffice.rng
+++ /dev/null
@@ -1,77 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
        Open Document Format for Office Applications (OpenDocument) Version 1.3
        OASIS Standard, in progress
	Digital Signatures Relax-NG Schema
        Source: https://tools.oasis-open.org/version-control/svn/office/
        Copyright (c) OASIS Open 2002-2011. All Rights Reserved.

	All capitalized terms in the following text have the meanings assigned to them
   	in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
	full Policy may be found at the OASIS website.

	This document and translations of it may be copied and furnished to others, and
	derivative works that comment on or otherwise explain it or assist in its
	implementation may be prepared, copied, published, and distributed, in whole or
	in part, without restriction of any kind, provided that the above copyright
	notice and this section are included on all such copies and derivative works.
	However, this document itself may not be modified in any way, including by
	removing the copyright notice or references to OASIS, except as needed for the
	purpose of developing any document or deliverable produced by an OASIS
	Technical Committee (in which case the rules applicable to copyrights, as set
	forth in the OASIS IPR Policy, must be followed) or as required to translate it
	into languages other than English.

	The limited permissions granted above are perpetual and will not be revoked by
	OASIS or its successors or assigns.

	This document and the information contained herein is provided on an "AS IS"
	basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
	LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
	INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
	FITNESS FOR A PARTICULAR PURPOSE. 
-->
<rng:grammar xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:dsig="urn:oasis:names:tc:opendocument:xmlns:digitalsignature:1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
  <rng:start>
    <rng:choice>
      <rng:ref name="dsig-document-signatures"/>
    </rng:choice>
  </rng:start>
  <rng:define name="ds-signature">
    <rng:element name="ds:Signature">
      <!-- The permitted content of this element is the permitted -->
      <!-- content of the Signature element defined by W3C XML    -->
      <!-- Signature Syntax and Processing (Second Edition).      -->
      <!-- See OpenDocument v1.3 part 2, section 5.3.             -->
      <!-- Office-3874 -->
      <rng:ref name="dsMarkup"/>
    </rng:element>
  </rng:define>
  <rng:define name="dsMarkup">
    <rng:zeroOrMore>
      <rng:choice>
        <rng:attribute>
          <rng:anyName/>
        </rng:attribute>
        <rng:text/>
        <rng:element>
          <rng:anyName/>
          <rng:ref name="dsMarkup"/>
        </rng:element>
      </rng:choice>
    </rng:zeroOrMore>
  </rng:define>
  <rng:define name="dsig-document-signatures">
    <rng:element name="dsig:document-signatures">
      <rng:ref name="dsig-document-signatures-attlist"/>
      <rng:oneOrMore>
        <rng:ref name="ds-signature"/>
      </rng:oneOrMore>
    </rng:element>
  </rng:define>
  <rng:define name="dsig-document-signatures-attlist">
    <rng:attribute name="dsig:version">
      <rng:value>1.3</rng:value>
    </rng:attribute>
  </rng:define>
</rng:grammar>
diff --git a/schema/libreoffice/OpenDocument-manifest-schema-v1.3+libreoffice.rng b/schema/libreoffice/OpenDocument-manifest-schema-v1.3+libreoffice.rng
deleted file mode 100644
index f4f46547..0000000
--- a/schema/libreoffice/OpenDocument-manifest-schema-v1.3+libreoffice.rng
+++ /dev/null
@@ -1,258 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
        Open Document Format for Office Applications (OpenDocument) Version 1.3
        OASIS Standard in progress
       Manifest Relax-NG Schema
        Source: https://tools.oasis-open.org/version-control/svn/office/
        Copyright (c) OASIS Open 2002-2011. All Rights Reserved.

	All capitalized terms in the following text have the meanings assigned to them
   	in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
	full Policy may be found at the OASIS website.

	This document and translations of it may be copied and furnished to others, and
	derivative works that comment on or otherwise explain it or assist in its
	implementation may be prepared, copied, published, and distributed, in whole or
	in part, without restriction of any kind, provided that the above copyright
	notice and this section are included on all such copies and derivative works.
	However, this document itself may not be modified in any way, including by
	removing the copyright notice or references to OASIS, except as needed for the
	purpose of developing any document or deliverable produced by an OASIS
	Technical Committee (in which case the rules applicable to copyrights, as set
	forth in the OASIS IPR Policy, must be followed) or as required to translate it
	into languages other than English.

	The limited permissions granted above are perpetual and will not be revoked by
	OASIS or its successors or assigns.

	This document and the information contained herein is provided on an "AS IS"
	basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
	LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
	INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
	FITNESS FOR A PARTICULAR PURPOSE. 
-->
<rng:grammar xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
  <rng:start>
    <rng:choice>
      <rng:ref name="manifest"/>
    </rng:choice>
  </rng:start>
  <rng:define name="algorithm">
    <rng:element name="manifest:algorithm">
      <rng:ref name="algorithm-attlist"/>
      <rng:ref name="anyElements"/>
    </rng:element>
  </rng:define>
  <rng:define name="algorithm-attlist">
    <rng:interleave>
      <rng:attribute name="manifest:algorithm-name">
        <rng:choice>
          <rng:value>Blowfish CFB</rng:value>
          <rng:ref name="anyURI"/>
        </rng:choice>
      </rng:attribute>
      <rng:attribute name="manifest:initialisation-vector">
        <rng:ref name="base64Binary"/>
      </rng:attribute>
    </rng:interleave>
  </rng:define>
  <rng:define name="anyAttListOrElements">
    <rng:zeroOrMore>
      <rng:attribute>
        <rng:anyName/>
        <rng:text/>
      </rng:attribute>
    </rng:zeroOrMore>
    <rng:ref name="anyElements"/>
  </rng:define>
  <rng:define name="anyElements">
    <rng:zeroOrMore>
      <rng:element>
        <rng:anyName/>
        <rng:mixed>
          <rng:ref name="anyAttListOrElements"/>
        </rng:mixed>
      </rng:element>
    </rng:zeroOrMore>
  </rng:define>
  <rng:define name="anyURI">
    <rng:data type="anyURI"/>
  </rng:define>
  <rng:define name="base64Binary">
    <rng:data type="base64Binary"/>
  </rng:define>
  <rng:define name="encrypted-key">
    <rng:element name="manifest:encrypted-key">
      <rng:optional>
        <rng:element name="manifest:encryption-method">
          <rng:attribute name="manifest:PGPAlgorithm">
            <rng:ref name="anyURI"/>
          </rng:attribute>
        </rng:element>
      </rng:optional>
      <rng:element name="manifest:keyinfo">
        <rng:element name="manifest:PGPData">
          <rng:element name="manifest:PGPKeyID">
            <rng:ref name="base64Binary"/>
          </rng:element>
          <rng:optional>
            <rng:element name="manifest:PGPKeyPacket">
              <rng:ref name="base64Binary"/>
            </rng:element>
          </rng:optional>
        </rng:element>
      </rng:element>
      <rng:element name="manifest:CipherData">
        <rng:element name="manifest:CipherValue">
          <rng:ref name="base64Binary"/>
        </rng:element>
      </rng:element>
    </rng:element>
  </rng:define>
  <rng:define name="encryption-data">
    <rng:element name="manifest:encryption-data">
      <rng:ref name="encryption-data-attlist"/>
      <rng:ref name="algorithm"/>
      <rng:optional>
        <rng:ref name="start-key-generation"/>
      </rng:optional>
      <rng:ref name="key-derivation"/>
    </rng:element>
  </rng:define>
  <rng:define name="encryption-data-attlist">
    <rng:interleave>
      <rng:attribute name="manifest:checksum-type">
        <rng:choice>
          <rng:value>SHA1/1K</rng:value>
          <rng:ref name="anyURI"/>
        </rng:choice>
      </rng:attribute>
      <rng:attribute name="manifest:checksum">
        <rng:ref name="base64Binary"/>
      </rng:attribute>
    </rng:interleave>
  </rng:define>
  <rng:define name="file-entry">
    <rng:element name="manifest:file-entry">
      <rng:ref name="file-entry-attlist"/>
      <rng:optional>
        <rng:ref name="encryption-data"/>
      </rng:optional>
    </rng:element>
  </rng:define>
  <rng:define name="file-entry-attlist">
    <rng:interleave>
      <rng:attribute name="manifest:full-path">
        <rng:ref name="string"/>
      </rng:attribute>
      <rng:optional>
        <rng:attribute name="manifest:size">
          <rng:ref name="nonNegativeInteger"/>
        </rng:attribute>
      </rng:optional>
      <rng:attribute name="manifest:media-type">
        <rng:ref name="string"/>
      </rng:attribute>
      <rng:optional>
        <rng:attribute name="manifest:preferred-view-mode">
          <rng:choice>
            <rng:value>edit</rng:value>
            <rng:value>presentation-slide-show</rng:value>
            <rng:value>read-only</rng:value>
            <rng:ref name="namespacedToken"/>
          </rng:choice>
        </rng:attribute>
      </rng:optional>
      <rng:optional>
        <rng:attribute name="manifest:version">
          <rng:ref name="string"/>
        </rng:attribute>
      </rng:optional>
    </rng:interleave>
  </rng:define>
  <rng:define name="key-derivation">
    <rng:element name="manifest:key-derivation">
      <rng:ref name="key-derivation-attlist"/>
      <rng:empty/>
    </rng:element>
  </rng:define>
  <rng:define name="key-derivation-attlist">
    <rng:choice>
      <rng:attribute name="manifest:key-derivation-name">
           <rng:value>PGP</rng:value>
      </rng:attribute>
      <rng:interleave>
        <rng:attribute name="manifest:key-derivation-name">
          <rng:choice>
            <rng:value>PBKDF2</rng:value>
            <rng:ref name="anyURI"/>
          </rng:choice>
        </rng:attribute>
        <rng:attribute name="manifest:salt">
          <rng:ref name="base64Binary"/>
        </rng:attribute>
        <rng:attribute name="manifest:iteration-count">
          <rng:ref name="nonNegativeInteger"/>
        </rng:attribute>
        <rng:optional>
          <rng:attribute name="manifest:key-size">
            <rng:ref name="nonNegativeInteger"/>
          </rng:attribute>
        </rng:optional>
      </rng:interleave>
    </rng:choice>
  </rng:define>
  <rng:define name="manifest">
    <rng:element name="manifest:manifest">
      <rng:ref name="manifest-attlist"/>
      <rng:zeroOrMore>
        <rng:ref name="encrypted-key"/>
      </rng:zeroOrMore>
    <!-- https://issues.oasis-open.org/browse/OFFICE-3940 -->
      <rng:oneOrMore>
        <rng:ref name="file-entry"/>
      </rng:oneOrMore>
    </rng:element>
  </rng:define>
  <rng:define name="manifest-attlist">
    <rng:attribute name="manifest:version">
      <!-- FIXME remove this hack once we write 1.3 -->
      <rng:choice>
      <rng:value>1.2</rng:value>
      <rng:value>1.3</rng:value>
      </rng:choice>
    </rng:attribute>
  </rng:define>
  <rng:define name="namespacedToken">
    <rng:data type="QName">
      <rng:param name="pattern">[^:]+:[^:]+</rng:param>
    </rng:data>
  </rng:define>
  <rng:define name="nonNegativeInteger">
    <rng:data type="nonNegativeInteger"/>
  </rng:define>
  <rng:define name="start-key-generation">
    <rng:element name="manifest:start-key-generation">
      <rng:ref name="start-key-generation-attlist"/>
      <rng:empty/>
    </rng:element>
  </rng:define>
  <rng:define name="start-key-generation-attlist">
    <rng:interleave>
      <rng:attribute name="manifest:start-key-generation-name">
        <rng:choice>
          <rng:value>SHA1</rng:value>
          <rng:ref name="anyURI"/>
        </rng:choice>
      </rng:attribute>
      <rng:optional>
        <rng:attribute name="manifest:key-size">
          <rng:ref name="nonNegativeInteger"/>
        </rng:attribute>
      </rng:optional>
    </rng:interleave>
  </rng:define>
  <rng:define name="string">
    <rng:data type="string"/>
  </rng:define>
</rng:grammar>
diff --git a/schema/odf1.3/OpenDocument-dsig-schema-v1.3.rng b/schema/libreoffice/OpenDocument-v1.3+libreoffice-dsig-schema.rng
similarity index 78%
rename from schema/odf1.3/OpenDocument-dsig-schema-v1.3.rng
rename to schema/libreoffice/OpenDocument-v1.3+libreoffice-dsig-schema.rng
index be2e978..954add3 100644
--- a/schema/odf1.3/OpenDocument-dsig-schema-v1.3.rng
+++ b/schema/libreoffice/OpenDocument-v1.3+libreoffice-dsig-schema.rng
@@ -1,25 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
     Open Document Format for Office Applications (OpenDocument) Version 1.3
     Committee Specification 01
     25 December 2019
     Copyright (c) OASIS Open 2019. All Rights Reserved.
     Source: https://docs.oasis-open.org/office/OpenDocument/v1.3/cs01/schemas/
     OASIS Standard
     27 April 2021
     Copyright (c) OASIS Open 2021. All Rights Reserved.
     Source: https://docs.oasis-open.org/office/OpenDocument/v1.3/os/schemas/
     Latest stage of specification: https://docs.oasis-open.org/office/OpenDocument/v1.3/OpenDocument-v1.3-part1-introduction.html
     TC IPR Statement: https://www.oasis-open.org/committees/office/ipr.php 
-->
<!--

        Open Document Format for Office Applications (OpenDocument) Version 1.3
        OASIS Standard, in progress
	Digital Signatures Relax-NG Schema

        Copyright © OASIS Open [2002-2018]. All Rights Reserved.
        Distributed under the terms of the OASIS IPR Policy, [http://www.oasis-open.org/policies-guidelines/ipr],
        AS-IS, WITHOUT ANY IMPLIED OR EXPRESS WARRANTY; there is no warranty of MERCHANTABILITY,
        FITNESS FOR A PARTICULAR PURPOSE or NONINFRINGEMENT of the rights of others.
	
        Digital Signatures Relax-NG Schema	
        OpenDocument-v1.3-dsig-schema.rng
-->

<!-- https://issues.oasis-open.org/browse/OFFICE-2153 -->

<rng:grammar xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:dsig="urn:oasis:names:tc:opendocument:xmlns:digitalsignature:1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
diff --git a/schema/odf1.3/OpenDocument-manifest-schema-v1.3.rng b/schema/libreoffice/OpenDocument-v1.3+libreoffice-manifest-schema.rng
similarity index 91%
copy from schema/odf1.3/OpenDocument-manifest-schema-v1.3.rng
copy to schema/libreoffice/OpenDocument-v1.3+libreoffice-manifest-schema.rng
index 09f6bd3..a2631fa 100644
--- a/schema/odf1.3/OpenDocument-manifest-schema-v1.3.rng
+++ b/schema/libreoffice/OpenDocument-v1.3+libreoffice-manifest-schema.rng
@@ -1,24 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
     Open Document Format for Office Applications (OpenDocument) Version 1.3
     Committee Specification 01
     25 December 2019
     Copyright (c) OASIS Open 2019. All Rights Reserved.
     Source: https://docs.oasis-open.org/office/OpenDocument/v1.3/cs01/schemas/
     OASIS Standard
     27 April 2021
     Copyright (c) OASIS Open 2021. All Rights Reserved.
     Source: https://docs.oasis-open.org/office/OpenDocument/v1.3/os/schemas/
     Latest stage of specification: https://docs.oasis-open.org/office/OpenDocument/v1.3/OpenDocument-v1.3-part1-introduction.html
     TC IPR Statement: https://www.oasis-open.org/committees/office/ipr.php 
-->
<!--

        Open Document Format for Office Applications (OpenDocument) Version 1.3
        OASIS Standard in progress
        Manifest Relax-NG Schema

        Copyright © OASIS Open [2002-2018]. All Rights Reserved.
        Distributed under the terms of the OASIS IPR Policy, [http://www.oasis-open.org/policies-guidelines/ipr],
        AS-IS, WITHOUT ANY IMPLIED OR EXPRESS WARRANTY; there is no warranty of MERCHANTABILITY,
        FITNESS FOR A PARTICULAR PURPOSE or NONINFRINGEMENT of the rights of others.
        OpenDocument-v1.3-manifest-schema.rng
-->

<!-- https://issues.oasis-open.org/browse/OFFICE-2153 -->

<rng:grammar xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
@@ -169,7 +162,7 @@
  <rng:define name="key-derivation-attlist">
    <rng:choice>
      <rng:attribute name="manifest:key-derivation-name">
           <rng:value>PGP</rng:value>
        <rng:value>PGP</rng:value>
      </rng:attribute>
      <rng:interleave>
        <rng:attribute name="manifest:key-derivation-name">
@@ -198,7 +191,7 @@
      <rng:zeroOrMore>
        <rng:ref name="encrypted-key"/>
      </rng:zeroOrMore>
    <!-- https://issues.oasis-open.org/browse/OFFICE-3940 -->
      <!-- https://issues.oasis-open.org/browse/OFFICE-3940 -->
      <rng:oneOrMore>
        <rng:ref name="file-entry"/>
      </rng:oneOrMore>
@@ -206,7 +199,11 @@
  </rng:define>
  <rng:define name="manifest-attlist">
    <rng:attribute name="manifest:version">
      <!-- FIXME remove this hack once tests can pick different schemas to validate -->
      <rng:choice>
      <rng:value>1.2</rng:value>
      <rng:value>1.3</rng:value>
      </rng:choice>
    </rng:attribute>
  </rng:define>
  <rng:define name="namespacedToken">
diff --git a/schema/libreoffice/OpenDocument-v1.3+libreoffice-metadata.owl b/schema/libreoffice/OpenDocument-v1.3+libreoffice-metadata.owl
index 2c648cf..e35354c 100644
--- a/schema/libreoffice/OpenDocument-v1.3+libreoffice-metadata.owl
+++ b/schema/libreoffice/OpenDocument-v1.3+libreoffice-metadata.owl
@@ -1,36 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
     Open Document Format for Office Applications (OpenDocument) Version 1.3
     OASIS Standard
     27 April 2021
     Copyright (c) OASIS Open 2021. All Rights Reserved.
     Source: https://docs.oasis-open.org/office/OpenDocument/v1.3/os/schemas/
     Latest stage of specification: https://docs.oasis-open.org/office/OpenDocument/v1.3/OpenDocument-v1.3-part1-introduction.html
     TC IPR Statement: https://www.oasis-open.org/committees/office/ipr.php 

        Open Document Format for Office Applications (OpenDocument) Version 1.3
        OASIS Standard, In progress
	OWL Metadata Manifest Description
        Source: https://tools.oasis-open.org/version-control/svn/office/
        Copyright (c) OASIS Open 2002-2015. All Rights Reserved.

	All capitalized terms in the following text have the meanings assigned to them
   	in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
	full Policy may be found at the OASIS website.

	This document and translations of it may be copied and furnished to others, and
	derivative works that comment on or otherwise explain it or assist in its
	implementation may be prepared, copied, published, and distributed, in whole or
	in part, without restriction of any kind, provided that the above copyright
	notice and this section are included on all such copies and derivative works.
	However, this document itself may not be modified in any way, including by
	removing the copyright notice or references to OASIS, except as needed for the
	purpose of developing any document or deliverable produced by an OASIS
	Technical Committee (in which case the rules applicable to copyrights, as set
	forth in the OASIS IPR Policy, must be followed) or as required to translate it
	into languages other than English.

	The limited permissions granted above are perpetual and will not be revoked by
	OASIS or its successors or assigns.

	This document and the information contained herein is provided on an "AS IS"
	basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
	LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
	INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
	FITNESS FOR A PARTICULAR PURPOSE. 
        OWL Schema Metadata Manifest Description
        OpenDocument-v1.3-metadata.owl
-->

<!-- https://issues.oasis-open.org/browse/OFFICE-2153 -->

<rdf:RDF xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:odf="http://docs.oasis-open.org/ns/office/1.2/meta/odf#" xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:pkg="http://docs.oasis-open.org/ns/office/1.2/meta/pkg#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/01/rdf-schema#">

<owl:Ontology rdf:about="http://docs.oasis-open.org/ns/office/1.2/meta/odf#">
diff --git a/schema/libreoffice/OpenDocument-v1.3+libreoffice-package-metadata.owl b/schema/libreoffice/OpenDocument-v1.3+libreoffice-package-metadata.owl
index 9281dff..2f0c357 100644
--- a/schema/libreoffice/OpenDocument-v1.3+libreoffice-package-metadata.owl
+++ b/schema/libreoffice/OpenDocument-v1.3+libreoffice-package-metadata.owl
@@ -1,36 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
     Open Document Format for Office Applications (OpenDocument) Version 1.3
     OASIS Standard
     27 April 2021
     Copyright (c) OASIS Open 2021. All Rights Reserved.
     Source: https://docs.oasis-open.org/office/OpenDocument/v1.3/os/schemas/
     Latest stage of specification: https://docs.oasis-open.org/office/OpenDocument/v1.3/OpenDocument-v1.3-part1-introduction.html
     TC IPR Statement: https://www.oasis-open.org/committees/office/ipr.php 

        Open Document Format for Office Applications (OpenDocument) Version 1.3
        OASIS Standard, In progress
	OWL Metadata Manifest Description
        Source: https://tools.oasis-open.org/version-control/svn/office/
        Copyright (c) OASIS Open 2002-2015. All Rights Reserved.

	All capitalized terms in the following text have the meanings assigned to them
   	in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
	full Policy may be found at the OASIS website.

	This document and translations of it may be copied and furnished to others, and
	derivative works that comment on or otherwise explain it or assist in its
	implementation may be prepared, copied, published, and distributed, in whole or
	in part, without restriction of any kind, provided that the above copyright
	notice and this section are included on all such copies and derivative works.
	However, this document itself may not be modified in any way, including by
	removing the copyright notice or references to OASIS, except as needed for the
	purpose of developing any document or deliverable produced by an OASIS
	Technical Committee (in which case the rules applicable to copyrights, as set
	forth in the OASIS IPR Policy, must be followed) or as required to translate it
	into languages other than English.

	The limited permissions granted above are perpetual and will not be revoked by
	OASIS or its successors or assigns.

	This document and the information contained herein is provided on an "AS IS"
	basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
	LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
	INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
	FITNESS FOR A PARTICULAR PURPOSE. 
        OWL Package Metadata Manifest Description
        OpenDocument-v1.3-package-metadata.owl
-->

<!-- https://issues.oasis-open.org/browse/OFFICE-2153 -->

<rdf:RDF xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:pkg="http://docs.oasis-open.org/ns/office/1.2/meta/pkg#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/01/rdf-schema#">

<owl:Ontology rdf:about="http://docs.oasis-open.org/ns/office/1.2/meta/pkg#">
diff --git a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
similarity index 99%
rename from schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
rename to schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
index a4d359c..69a98498 100644
--- a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
+++ b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
@@ -41,7 +41,7 @@ xmlns:css3t="http://www.w3.org/TR/css3-text/"
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
>
  <rng:include href="../odf1.3/OpenDocument-schema-v1.3.rng">
  <rng:include href="../odf1.3/OpenDocument-v1.3-schema.rng">

    <rng:define name="office-document-common-attrs">
      <rng:interleave>
diff --git a/schema/odf1.3/OpenDocument-dsig-schema-v1.3.rng b/schema/odf1.3/OpenDocument-v1.3-dsig-schema.rng
similarity index 78%
copy from schema/odf1.3/OpenDocument-dsig-schema-v1.3.rng
copy to schema/odf1.3/OpenDocument-v1.3-dsig-schema.rng
index be2e978..954add3 100644
--- a/schema/odf1.3/OpenDocument-dsig-schema-v1.3.rng
+++ b/schema/odf1.3/OpenDocument-v1.3-dsig-schema.rng
@@ -1,25 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
     Open Document Format for Office Applications (OpenDocument) Version 1.3
     Committee Specification 01
     25 December 2019
     Copyright (c) OASIS Open 2019. All Rights Reserved.
     Source: https://docs.oasis-open.org/office/OpenDocument/v1.3/cs01/schemas/
     OASIS Standard
     27 April 2021
     Copyright (c) OASIS Open 2021. All Rights Reserved.
     Source: https://docs.oasis-open.org/office/OpenDocument/v1.3/os/schemas/
     Latest stage of specification: https://docs.oasis-open.org/office/OpenDocument/v1.3/OpenDocument-v1.3-part1-introduction.html
     TC IPR Statement: https://www.oasis-open.org/committees/office/ipr.php 
-->
<!--

        Open Document Format for Office Applications (OpenDocument) Version 1.3
        OASIS Standard, in progress
	Digital Signatures Relax-NG Schema

        Copyright © OASIS Open [2002-2018]. All Rights Reserved.
        Distributed under the terms of the OASIS IPR Policy, [http://www.oasis-open.org/policies-guidelines/ipr],
        AS-IS, WITHOUT ANY IMPLIED OR EXPRESS WARRANTY; there is no warranty of MERCHANTABILITY,
        FITNESS FOR A PARTICULAR PURPOSE or NONINFRINGEMENT of the rights of others.
	
        Digital Signatures Relax-NG Schema	
        OpenDocument-v1.3-dsig-schema.rng
-->

<!-- https://issues.oasis-open.org/browse/OFFICE-2153 -->

<rng:grammar xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:dsig="urn:oasis:names:tc:opendocument:xmlns:digitalsignature:1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
diff --git a/schema/odf1.3/OpenDocument-manifest-schema-v1.3.rng b/schema/odf1.3/OpenDocument-v1.3-manifest-schema.rng
similarity index 91%
rename from schema/odf1.3/OpenDocument-manifest-schema-v1.3.rng
rename to schema/odf1.3/OpenDocument-v1.3-manifest-schema.rng
index 09f6bd3..3ff6d39 100644
--- a/schema/odf1.3/OpenDocument-manifest-schema-v1.3.rng
+++ b/schema/odf1.3/OpenDocument-v1.3-manifest-schema.rng
@@ -1,24 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
     Open Document Format for Office Applications (OpenDocument) Version 1.3
     Committee Specification 01
     25 December 2019
     Copyright (c) OASIS Open 2019. All Rights Reserved.
     Source: https://docs.oasis-open.org/office/OpenDocument/v1.3/cs01/schemas/
     OASIS Standard
     27 April 2021
     Copyright (c) OASIS Open 2021. All Rights Reserved.
     Source: https://docs.oasis-open.org/office/OpenDocument/v1.3/os/schemas/
     Latest stage of specification: https://docs.oasis-open.org/office/OpenDocument/v1.3/OpenDocument-v1.3-part1-introduction.html
     TC IPR Statement: https://www.oasis-open.org/committees/office/ipr.php 
-->
<!--

        Open Document Format for Office Applications (OpenDocument) Version 1.3
        OASIS Standard in progress
        Manifest Relax-NG Schema

        Copyright © OASIS Open [2002-2018]. All Rights Reserved.
        Distributed under the terms of the OASIS IPR Policy, [http://www.oasis-open.org/policies-guidelines/ipr],
        AS-IS, WITHOUT ANY IMPLIED OR EXPRESS WARRANTY; there is no warranty of MERCHANTABILITY,
        FITNESS FOR A PARTICULAR PURPOSE or NONINFRINGEMENT of the rights of others.
        OpenDocument-v1.3-manifest-schema.rng
-->

<!-- https://issues.oasis-open.org/browse/OFFICE-2153 -->

<rng:grammar xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
@@ -169,7 +162,7 @@
  <rng:define name="key-derivation-attlist">
    <rng:choice>
      <rng:attribute name="manifest:key-derivation-name">
           <rng:value>PGP</rng:value>
        <rng:value>PGP</rng:value>
      </rng:attribute>
      <rng:interleave>
        <rng:attribute name="manifest:key-derivation-name">
@@ -198,7 +191,7 @@
      <rng:zeroOrMore>
        <rng:ref name="encrypted-key"/>
      </rng:zeroOrMore>
    <!-- https://issues.oasis-open.org/browse/OFFICE-3940 -->
      <!-- https://issues.oasis-open.org/browse/OFFICE-3940 -->
      <rng:oneOrMore>
        <rng:ref name="file-entry"/>
      </rng:oneOrMore>
@@ -241,4 +234,4 @@
  <rng:define name="string">
    <rng:data type="string"/>
  </rng:define>
</rng:grammar>
</rng:grammar>
\ No newline at end of file
diff --git a/schema/odf1.3/OpenDocument-v1.3-metadata.owl b/schema/odf1.3/OpenDocument-v1.3-metadata.owl
index 7237de1..24a0b9f 100644
--- a/schema/odf1.3/OpenDocument-v1.3-metadata.owl
+++ b/schema/odf1.3/OpenDocument-v1.3-metadata.owl
@@ -1,23 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
     Open Document Format for Office Applications (OpenDocument) Version 1.3
     Committee Specification 01
     25 December 2019
     Copyright (c) OASIS Open 2019. All Rights Reserved.
     Source: https://docs.oasis-open.org/office/OpenDocument/v1.3/cs01/schemas/
     OASIS Standard
     27 April 2021
     Copyright (c) OASIS Open 2021. All Rights Reserved.
     Source: https://docs.oasis-open.org/office/OpenDocument/v1.3/os/schemas/
     Latest stage of specification: https://docs.oasis-open.org/office/OpenDocument/v1.3/OpenDocument-v1.3-part1-introduction.html
     TC IPR Statement: https://www.oasis-open.org/committees/office/ipr.php 
-->
<!--

        Open Document Format for Office Applications (OpenDocument) Version 1.3
        OASIS Standard, In progress
	OWL Metadata Manifest Description

        Copyright © OASIS Open [2002-2018]. All Rights Reserved.
        Distributed under the terms of the OASIS IPR Policy, [http://www.oasis-open.org/policies-guidelines/ipr],
        AS-IS, WITHOUT ANY IMPLIED OR EXPRESS WARRANTY; there is no warranty of MERCHANTABILITY,
        FITNESS FOR A PARTICULAR PURPOSE or NONINFRINGEMENT of the rights of others.

        OWL Schema Metadata Manifest Description
        OpenDocument-v1.3-metadata.owl
-->

<!-- https://issues.oasis-open.org/browse/OFFICE-2153 -->
diff --git a/schema/odf1.3/OpenDocument-v1.3-package-metadata.owl b/schema/odf1.3/OpenDocument-v1.3-package-metadata.owl
index 60a9cb2..2f0c357 100644
--- a/schema/odf1.3/OpenDocument-v1.3-package-metadata.owl
+++ b/schema/odf1.3/OpenDocument-v1.3-package-metadata.owl
@@ -1,23 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
     Open Document Format for Office Applications (OpenDocument) Version 1.3
     Committee Specification 01
     25 December 2019
     Copyright (c) OASIS Open 2019. All Rights Reserved.
     Source: https://docs.oasis-open.org/office/OpenDocument/v1.3/cs01/schemas/
     OASIS Standard
     27 April 2021
     Copyright (c) OASIS Open 2021. All Rights Reserved.
     Source: https://docs.oasis-open.org/office/OpenDocument/v1.3/os/schemas/
     Latest stage of specification: https://docs.oasis-open.org/office/OpenDocument/v1.3/OpenDocument-v1.3-part1-introduction.html
     TC IPR Statement: https://www.oasis-open.org/committees/office/ipr.php 
-->
<!--

        Open Document Format for Office Applications (OpenDocument) Version 1.3
        OASIS Standard, In progress
	OWL Metadata Manifest Description

        Copyright © OASIS Open [2002-2018]. All Rights Reserved.
        Distributed under the terms of the OASIS IPR Policy, [http://www.oasis-open.org/policies-guidelines/ipr],
        AS-IS, WITHOUT ANY IMPLIED OR EXPRESS WARRANTY; there is no warranty of MERCHANTABILITY,
        FITNESS FOR A PARTICULAR PURPOSE or NONINFRINGEMENT of the rights of others.

        OWL Package Metadata Manifest Description
        OpenDocument-v1.3-package-metadata.owl
-->

<!-- https://issues.oasis-open.org/browse/OFFICE-2153 -->
diff --git a/schema/odf1.3/OpenDocument-schema-v1.3.rng b/schema/odf1.3/OpenDocument-v1.3-schema.rng
similarity index 99%
rename from schema/odf1.3/OpenDocument-schema-v1.3.rng
rename to schema/odf1.3/OpenDocument-v1.3-schema.rng
index 6c15e2f..bbffe38 100644
--- a/schema/odf1.3/OpenDocument-schema-v1.3.rng
+++ b/schema/odf1.3/OpenDocument-v1.3-schema.rng
@@ -1,25 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
     Open Document Format for Office Applications (OpenDocument) Version 1.3
     Committee Specification 01
     25 December 2019
     Copyright (c) OASIS Open 2019. All Rights Reserved.
     Source: https://docs.oasis-open.org/office/OpenDocument/v1.3/cs01/schemas/
     OASIS Standard
     27 April 2021
     Copyright (c) OASIS Open 2021. All Rights Reserved.
     Source: https://docs.oasis-open.org/office/OpenDocument/v1.3/os/schemas/
     Latest stage of specification: https://docs.oasis-open.org/office/OpenDocument/v1.3/OpenDocument-v1.3-part1-introduction.html
     TC IPR Statement: https://www.oasis-open.org/committees/office/ipr.php 
-->
<!--

        Open Document Format for Office Applications (OpenDocument) Version 1.3
        OASIS Standard, In progress
	Relax-NG Schema

        Copyright © OASIS Open [2002-2018]. All Rights Reserved.
        Distributed under the terms of the OASIS IPR Policy, [http://www.oasis-open.org/policies-guidelines/ipr],
        AS-IS, WITHOUT ANY IMPLIED OR EXPRESS WARRANTY; there is no warranty of MERCHANTABILITY,
        FITNESS FOR A PARTICULAR PURPOSE or NONINFRINGEMENT of the rights of others.

        Relax-NG Schema
        OpenDocument-v1.3-schema.rng
-->

<!-- https://issues.oasis-open.org/browse/OFFICE-2153 -->

<rng:grammar xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:db="urn:oasis:names:tc:opendocument:xmlns:database:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
@@ -755,7 +747,7 @@
            <rng:ref name="double"/>
          </rng:attribute>
          <rng:ref name="common-draw-size-attlist"/>
	  <!-- https://issues.oasis-open.org/browse/OFFICE-3883 -->
	        <!-- https://issues.oasis-open.org/browse/OFFICE-3883 -->
        </rng:group>
        <rng:empty/>
      </rng:choice>
@@ -783,7 +775,7 @@
    <rng:element name="chart:plot-area">
      <rng:ref name="chart-plot-area-attlist"/>
      <rng:optional>
	<!-- https://issues.oasis-open.org/browse/OFFICE-3928 -->
	      <!-- https://issues.oasis-open.org/browse/OFFICE-3928 -->
        <rng:ref name="chart-coordinate-region"/>
      </rng:optional>
      <rng:zeroOrMore>
@@ -1520,7 +1512,7 @@
        <rng:ref name="integer"/>
      </rng:attribute>
    </rng:optional>
<!-- https://issues.oasis-open.org/browse/OFFICE-3860  added number:min-decimal-places -->
    <!-- https://issues.oasis-open.org/browse/OFFICE-3860  added number:min-decimal-places -->
  </rng:define>
  <rng:define name="common-delay-for-repeat">
    <rng:optional>
@@ -2234,7 +2226,7 @@
          <rng:ref name="nonNegativeInteger"/>
          <rng:value>auto</rng:value>
        </rng:choice>
	<!-- https://issues.oasis-open.org/browse/OFFICE-3923 -->
	      <!-- https://issues.oasis-open.org/browse/OFFICE-3923 -->
      </rng:attribute>
    </rng:optional>
  </rng:define>
@@ -5313,7 +5305,7 @@
        </rng:attribute>
      </rng:optional>
      <rng:ref name="common-draw-mime-type-attlist"/>
  <!-- https://issues.oasis-open.org/browse/OFFICE-3943 -->
      <!-- https://issues.oasis-open.org/browse/OFFICE-3943 -->
      <rng:optional>
        <rng:ref name="xml-id"/>
      </rng:optional>
@@ -7099,7 +7091,7 @@
        <rng:optional>
          <rng:ref name="number-text-with-fillchar"/>
        </rng:optional>
	<!-- https://issues.oasis-open.org/browse/OFFICE-3765 -->
	      <!-- https://issues.oasis-open.org/browse/OFFICE-3765 -->
      </rng:oneOrMore>
      <rng:zeroOrMore>
        <rng:ref name="style-map"/>
@@ -7368,12 +7360,12 @@
          <rng:ref name="positiveInteger"/>
        </rng:attribute>
      </rng:optional>
<!-- https://issues.oasis-open.org/browse/OFFICE-1828 exponent-interval -->
      <!-- https://issues.oasis-open.org/browse/OFFICE-1828 exponent-interval -->
      <rng:optional>
        <rng:attribute name="number:forced-exponent-sign">
          <rng:ref name="boolean"/>
        </rng:attribute>
<!-- https://issues.oasis-open.org/browse/OFFICE-3860 added number:forced-exponent-sign -->
        <!-- https://issues.oasis-open.org/browse/OFFICE-3860 added number:forced-exponent-sign -->
      </rng:optional>
    </rng:interleave>
  </rng:define>
@@ -7425,7 +7417,7 @@
        <rng:optional>
          <rng:ref name="number-text-with-fillchar"/>
        </rng:optional>
	<!-- https://issues.oasis-open.org/browse/OFFICE-3765 -->
	      <!-- https://issues.oasis-open.org/browse/OFFICE-3765 -->
      </rng:zeroOrMore>
      <rng:zeroOrMore>
        <rng:ref name="style-map"/>
@@ -7461,7 +7453,7 @@
        <rng:optional>
          <rng:ref name="number-text-with-fillchar"/>
        </rng:optional>
	<!-- https://issues.oasis-open.org/browse/OFFICE-3765 -->
	      <!-- https://issues.oasis-open.org/browse/OFFICE-3765 -->
      </rng:oneOrMore>
      <rng:zeroOrMore>
        <rng:ref name="style-map"/>
@@ -9800,10 +9792,10 @@
            <rng:value>none</rng:value>
            <rng:value>cubic-spline</rng:value>
            <rng:value>b-spline</rng:value>
	    <rng:value>step-start</rng:value>
	    <rng:value>step-end</rng:value>
	    <rng:value>step-center-x</rng:value>
	    <rng:value>step-center-y</rng:value>
            <rng:value>step-start</rng:value>
            <rng:value>step-end</rng:value>
            <rng:value>step-center-x</rng:value>
            <rng:value>step-center-y</rng:value>
          </rng:choice>
        </rng:attribute>
      </rng:optional>
@@ -10104,17 +10096,17 @@
      </rng:optional>
      <!-- https://issues.oasis-open.org/browse/OFFICE-3958 -->
      <rng:optional>
          <rng:attribute name="chart:regression-period">
        <rng:attribute name="chart:regression-period">
          <rng:ref name="positiveInteger"/>
        </rng:attribute>
      </rng:optional>
      <rng:optional>
          <rng:attribute name="chart:regression-moving-type">
            <rng:choice>
              <rng:value>prior</rng:value>
              <rng:value>central</rng:value>
              <rng:value>averaged-abscissa</rng:value>
            </rng:choice>
        <rng:attribute name="chart:regression-moving-type">
          <rng:choice>
            <rng:value>prior</rng:value>
            <rng:value>central</rng:value>
            <rng:value>averaged-abscissa</rng:value>
          </rng:choice>
        </rng:attribute>
      </rng:optional>
      <!-- https://issues.oasis-open.org/browse/OFFICE-3959 -->
@@ -10711,7 +10703,7 @@
    <rng:element name="style:footer-first">
      <rng:ref name="common-style-header-footer-attlist"/>
      <rng:ref name="header-footer-content"/>
       <!-- https://issues.oasis-open.org/browse/OFFICE-3789 -->
      <!-- https://issues.oasis-open.org/browse/OFFICE-3789 -->
    </rng:element>
  </rng:define>
  <rng:define name="style-footer-left">
@@ -11124,7 +11116,7 @@
        <rng:attribute name="draw:luminance">
          <rng:ref name="signedZeroToHundredPercent"/>
        </rng:attribute>
	<!-- https://issues.oasis-open.org/browse/OFFICE-3821 -->
	      <!-- https://issues.oasis-open.org/browse/OFFICE-3821 -->
      </rng:optional>
      <rng:optional>
        <rng:attribute name="draw:contrast">
@@ -11806,7 +11798,7 @@
    <rng:element name="style:header-first">
      <rng:ref name="common-style-header-footer-attlist"/>
      <rng:ref name="header-footer-content"/>
       <!-- https://issues.oasis-open.org/browse/OFFICE-3789 -->
      <!-- https://issues.oasis-open.org/browse/OFFICE-3789 -->
    </rng:element>
  </rng:define>
  <rng:define name="style-header-footer-properties">
@@ -11984,7 +11976,7 @@
        <rng:optional>
          <rng:ref name="style-header-first"/>
        </rng:optional>
       <!-- https://issues.oasis-open.org/browse/OFFICE-3789 -->
        <!-- https://issues.oasis-open.org/browse/OFFICE-3789 -->
      </rng:optional>
      <rng:optional>
        <rng:ref name="style-footer"/>
@@ -11994,7 +11986,7 @@
        <rng:optional>
          <rng:ref name="style-footer-first"/>
        </rng:optional>
       <!-- https://issues.oasis-open.org/browse/OFFICE-3789 -->
        <!-- https://issues.oasis-open.org/browse/OFFICE-3789 -->
      </rng:optional>
      <rng:optional>
        <rng:ref name="draw-layer-set"/>
@@ -15568,7 +15560,7 @@
    </rng:element>
  </rng:define>
  <rng:define name="table-source-cell-range-attlist">
  <!-- OFFICE-3665 -->
    <!-- OFFICE-3665 -->
    <rng:interleave>
      <rng:choice>
        <rng:attribute name="table:cell-range-address">
@@ -16907,7 +16899,7 @@
        <rng:ref name="text-index-entry-tab-stop"/>
        <rng:ref name="text-index-entry-link-start"/>
        <rng:ref name="text-index-entry-link-end"/>
	<!-- https://issues.oasis-open.org/browse/OFFICE-3941 -->
	      <!-- https://issues.oasis-open.org/browse/OFFICE-3941 -->
      </rng:choice>
    </rng:zeroOrMore>
  </rng:define>
@@ -18150,7 +18142,7 @@
          <rng:ref name="text-index-entry-tab-stop"/>
          <rng:ref name="text-index-entry-link-start"/>
          <rng:ref name="text-index-entry-link-end"/>
	  <!-- https://issues.oasis-open.org/browse/OFFICE-3941 -->
	        <!-- https://issues.oasis-open.org/browse/OFFICE-3941 -->
        </rng:choice>
      </rng:zeroOrMore>
    </rng:element>
diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx
index 5ae9b3e..a1cc861 100644
--- a/test/source/bootstrapfixture.cxx
+++ b/test/source/bootstrapfixture.cxx
@@ -176,11 +176,11 @@ void test::BootstrapFixture::validate(const OUString& rPath, test::ValidationFor
        // invoke without -e so that we know when something new is written
        // in loext namespace that isn't yet in the custom schema
        aValidator += " -M "
            + m_directories.getPathFromSrc(u"/schema/libreoffice/OpenDocument-manifest-schema-v1.3+libreoffice.rng")
            + m_directories.getPathFromSrc(u"/schema/libreoffice/OpenDocument-v1.3+libreoffice-manifest-schema.rng")
            + " -D "
            + m_directories.getPathFromSrc(u"/schema/libreoffice/OpenDocument-dsig-schema-v1.3+libreoffice.rng")
            + m_directories.getPathFromSrc(u"/schema/libreoffice/OpenDocument-v1.3+libreoffice-dsig-schema.rng")
            + " -O "
            + m_directories.getPathFromSrc(u"/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng")
            + m_directories.getPathFromSrc(u"/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng")
            + " -m "
            + m_directories.getPathFromSrc(u"/schema/mathml2/mathml2.xsd");
    }