diff options
author | Michael Stahl <michael.stahl@allotropia.de> | 2021-06-04 19:55:55 +0200 |
---|---|---|
committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-06-10 19:07:36 +0200 |
commit | 7f3c9da5a0a8f27e3fe63c39a30fc08e34246420 (patch) | |
tree | c6dbe5cdd34e2417a6cf51350e5f3f54238c9069 /schema/odf1.3 | |
parent | 363b98b268f317e7f2f9af392085856b938fb5f9 (diff) |
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>
Diffstat (limited to 'schema/odf1.3')
-rw-r--r-- | schema/odf1.3/OpenDocument-v1.3-dsig-schema.rng (renamed from schema/odf1.3/OpenDocument-dsig-schema-v1.3.rng) | 22 | ||||
-rw-r--r-- | schema/odf1.3/OpenDocument-v1.3-manifest-schema.rng (renamed from schema/odf1.3/OpenDocument-manifest-schema-v1.3.rng) | 25 | ||||
-rw-r--r-- | schema/odf1.3/OpenDocument-v1.3-metadata.owl | 21 | ||||
-rw-r--r-- | schema/odf1.3/OpenDocument-v1.3-package-metadata.owl | 21 | ||||
-rw-r--r-- | schema/odf1.3/OpenDocument-v1.3-schema.rng (renamed from schema/odf1.3/OpenDocument-schema-v1.3.rng) | 80 |
5 files changed, 66 insertions, 103 deletions
diff --git a/schema/odf1.3/OpenDocument-dsig-schema-v1.3.rng b/schema/odf1.3/OpenDocument-v1.3-dsig-schema.rng index be2e9788ca08..954add387957 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. - + Open Document Format for Office Applications (OpenDocument) Version 1.3 + 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 index 09f6bd35bc23..3ff6d39b628d 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 7237de119cb5..24a0b9f05fa8 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. + Open Document Format for Office Applications (OpenDocument) Version 1.3 + 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 60a9cb297834..2f0c35725f09 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. + Open Document Format for Office Applications (OpenDocument) Version 1.3 + 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 index 6c15e2f820e3..bbffe383781c 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. + Open Document Format for Office Applications (OpenDocument) Version 1.3 + 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> |