diff options
author | Michael Stahl <Michael.Stahl@cib.de> | 2020-04-29 14:39:15 +0200 |
---|---|---|
committer | Michael Stahl <michael.stahl@cib.de> | 2020-05-18 15:24:20 +0200 |
commit | 34ec838f0607564097cb08ce65165279e31888aa (patch) | |
tree | 801a37bb7aefb01e8daafa3ba0c33f92efb3fb5c | |
parent | cce42f7de6bdc406f40a0a16ad15285adc4a4c62 (diff) |
schema: update ODF 1.3 rng drafts to cs01
... but remove unintentional changes from manifest-schema.
Change-Id: I4d8de0fb896fcebed7cb0553a7a7c8cec6491d39
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93175
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Tested-by: Jenkins
-rw-r--r-- | schema/odf1.3/OpenDocument-dsig-schema-v1.3.rng | 41 | ||||
-rw-r--r-- | schema/odf1.3/OpenDocument-manifest-schema-v1.3.rng | 42 | ||||
-rw-r--r-- | schema/odf1.3/OpenDocument-schema-v1.3.rng | 13 | ||||
-rw-r--r-- | schema/odf1.3/OpenDocument-v1.3-metadata.owl | 39 | ||||
-rw-r--r-- | schema/odf1.3/OpenDocument-v1.3-package-metadata.owl | 39 |
5 files changed, 75 insertions, 99 deletions
diff --git a/schema/odf1.3/OpenDocument-dsig-schema-v1.3.rng b/schema/odf1.3/OpenDocument-dsig-schema-v1.3.rng index 7fd47cf2352e..be2e9788ca08 100644 --- a/schema/odf1.3/OpenDocument-dsig-schema-v1.3.rng +++ b/schema/odf1.3/OpenDocument-dsig-schema-v1.3.rng @@ -1,36 +1,27 @@ <?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/ + 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 - 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. + 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. + +--> - The limited permissions granted above are perpetual and will not be revoked by - OASIS or its successors or assigns. +<!-- https://issues.oasis-open.org/browse/OFFICE-2153 --> - 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> diff --git a/schema/odf1.3/OpenDocument-manifest-schema-v1.3.rng b/schema/odf1.3/OpenDocument-manifest-schema-v1.3.rng index 48c11a0f7010..09f6bd35bc23 100644 --- a/schema/odf1.3/OpenDocument-manifest-schema-v1.3.rng +++ b/schema/odf1.3/OpenDocument-manifest-schema-v1.3.rng @@ -1,36 +1,26 @@ <?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/ + 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 - 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. + Manifest Relax-NG Schema - 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. + 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. +--> - The limited permissions granted above are perpetual and will not be revoked by - OASIS or its successors or assigns. +<!-- https://issues.oasis-open.org/browse/OFFICE-2153 --> - 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> diff --git a/schema/odf1.3/OpenDocument-schema-v1.3.rng b/schema/odf1.3/OpenDocument-schema-v1.3.rng index e8fac152483f..4b49c3e35dc5 100644 --- a/schema/odf1.3/OpenDocument-schema-v1.3.rng +++ b/schema/odf1.3/OpenDocument-schema-v1.3.rng @@ -1,5 +1,14 @@ <?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/ + 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 @@ -9790,6 +9799,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:choice> </rng:attribute> </rng:optional> diff --git a/schema/odf1.3/OpenDocument-v1.3-metadata.owl b/schema/odf1.3/OpenDocument-v1.3-metadata.owl index 7fe1d94939b8..7237de119cb5 100644 --- a/schema/odf1.3/OpenDocument-v1.3-metadata.owl +++ b/schema/odf1.3/OpenDocument-v1.3-metadata.owl @@ -1,36 +1,27 @@ <?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/ + 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. + 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. - 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. +<!-- https://issues.oasis-open.org/browse/OFFICE-2153 --> - 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. ---> <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/odf1.3/OpenDocument-v1.3-package-metadata.owl b/schema/odf1.3/OpenDocument-v1.3-package-metadata.owl index 9281dff7752f..60a9cb297834 100644 --- a/schema/odf1.3/OpenDocument-v1.3-package-metadata.owl +++ b/schema/odf1.3/OpenDocument-v1.3-package-metadata.owl @@ -1,36 +1,27 @@ <?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/ + 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. + 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. - 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. +<!-- https://issues.oasis-open.org/browse/OFFICE-2153 --> - 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. ---> <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#"> |