schema/libreoffice/OpenDocument-v1.3+libreoffice-dsig-schema.rng | 18 schema/libreoffice/OpenDocument-v1.3+libreoffice-manifest-schema.rng | 17 schema/libreoffice/OpenDocument-v1.3+libreoffice-metadata.owl | 16 schema/libreoffice/OpenDocument-v1.3+libreoffice-package-metadata.owl | 14 schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng | 344 +++++++++- schema/odf1.4/OpenDocument-v1.4-schema.rng | 5 6 files changed, 371 insertions(+), 43 deletions(-)
New commits: commit afa4965e4df6f1f0c43c0a059f216e7f8a21ba82 Author: Xisco Fauli <xiscofa...@libreoffice.org> AuthorDate: Mon Aug 26 13:33:14 2024 +0200 Commit: Xisco Fauli <xiscofa...@libreoffice.org> CommitDate: Tue Sep 24 10:50:07 2024 +0200 schema: update to ODF 1.4 OS * The change in schema/odf1.4/OpenDocument-v1.4-schema.rng is the same as 56d8007a197b095b09423c691a51515567648e80 "tdf#134734 tdf#141059 tdf#122508 cui,sw,xmloff: BackgroundFullSize" Change-Id: I79bdebbee4d250af9c5822bf2f205ef386f1b97d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172392 Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> Tested-by: Jenkins diff --git a/schema/libreoffice/OpenDocument-v1.3+libreoffice-dsig-schema.rng b/schema/libreoffice/OpenDocument-v1.3+libreoffice-dsig-schema.rng index 954add387957..7ad488a7f7e9 100644 --- a/schema/libreoffice/OpenDocument-v1.3+libreoffice-dsig-schema.rng +++ b/schema/libreoffice/OpenDocument-v1.3+libreoffice-dsig-schema.rng @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Open Document Format for Office Applications (OpenDocument) Version 1.3 + Open Document Format for Office Applications (OpenDocument) Version 1.4 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 + 11 March 2024 + Copyright (c) OASIS Open 2024. All Rights Reserved. + Source: https://docs.oasis-open.org/office/OpenDocument/v1.4/csd01/schemas/ + Latest stage of specification: https://docs.oasis-open.org/office/OpenDocument/v1.4/OpenDocument-v1.4-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 + Open Document Format for Office Applications (OpenDocument) Version 1.4 Digital Signatures Relax-NG Schema - OpenDocument-v1.3-dsig-schema.rng + OpenDocument-v1.4-dsig-schema.rng --> <!-- https://issues.oasis-open.org/browse/OFFICE-2153 --> @@ -25,7 +25,7 @@ <!-- 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. --> + <!-- See OpenDocument v1.4 part 2, section 5.3. --> <!-- Office-3874 --> <rng:ref name="dsMarkup"/> </rng:element> @@ -54,7 +54,7 @@ </rng:define> <rng:define name="dsig-document-signatures-attlist"> <rng:attribute name="dsig:version"> - <rng:value>1.3</rng:value> + <rng:value>1.4</rng:value> </rng:attribute> </rng:define> </rng:grammar> diff --git a/schema/libreoffice/OpenDocument-v1.3+libreoffice-manifest-schema.rng b/schema/libreoffice/OpenDocument-v1.3+libreoffice-manifest-schema.rng index 77b87101b04a..c6755b57f30d 100644 --- a/schema/libreoffice/OpenDocument-v1.3+libreoffice-manifest-schema.rng +++ b/schema/libreoffice/OpenDocument-v1.3+libreoffice-manifest-schema.rng @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Open Document Format for Office Applications (OpenDocument) Version 1.3 + Open Document Format for Office Applications (OpenDocument) Version 1.4 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 + 11 March 2024 + Copyright (c) OASIS Open 2024. All Rights Reserved. + Source: https://docs.oasis-open.org/office/OpenDocument/v1.4/csd01/schemas/ + Latest stage of specification: https://docs.oasis-open.org/office/OpenDocument/v1.4/OpenDocument-v1.4-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 + Open Document Format for Office Applications (OpenDocument) Version 1.4 Manifest Relax-NG Schema - OpenDocument-v1.3-manifest-schema.rng + OpenDocument-v1.4-manifest-schema.rng --> <!-- https://issues.oasis-open.org/browse/OFFICE-2153 --> @@ -228,6 +228,7 @@ xmlns:rng="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.o <rng:choice> <rng:value>1.2</rng:value> <rng:value>1.3</rng:value> + <rng:value>1.4</rng:value> </rng:choice> </rng:attribute> </rng:define> diff --git a/schema/libreoffice/OpenDocument-v1.3+libreoffice-metadata.owl b/schema/libreoffice/OpenDocument-v1.3+libreoffice-metadata.owl index e35354ccd2fa..aa777c69b73e 100644 --- a/schema/libreoffice/OpenDocument-v1.3+libreoffice-metadata.owl +++ b/schema/libreoffice/OpenDocument-v1.3+libreoffice-metadata.owl @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Open Document Format for Office Applications (OpenDocument) Version 1.3 + Open Document Format for Office Applications (OpenDocument) Version 1.4 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 + 11 March 2024 + Copyright (c) OASIS Open 2024. All Rights Reserved. + Source: https://docs.oasis-open.org/office/OpenDocument/v1.4/csd01/schemas/ + Latest stage of specification: https://docs.oasis-open.org/office/OpenDocument/v1.4/OpenDocument-v1.4-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 + Open Document Format for Office Applications (OpenDocument) Version 1.4 OWL Schema Metadata Manifest Description - OpenDocument-v1.3-metadata.owl + OpenDocument-v1.4-metadata.owl --> <!-- https://issues.oasis-open.org/browse/OFFICE-2153 --> diff --git a/schema/libreoffice/OpenDocument-v1.3+libreoffice-package-metadata.owl b/schema/libreoffice/OpenDocument-v1.3+libreoffice-package-metadata.owl index 2f0c35725f09..1d9e3e24663e 100644 --- a/schema/libreoffice/OpenDocument-v1.3+libreoffice-package-metadata.owl +++ b/schema/libreoffice/OpenDocument-v1.3+libreoffice-package-metadata.owl @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Open Document Format for Office Applications (OpenDocument) Version 1.3 + Open Document Format for Office Applications (OpenDocument) Version 1.4 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 + 11 March 2024 + Copyright (c) OASIS Open 2024. All Rights Reserved. + Source: https://docs.oasis-open.org/office/OpenDocument/v1.4/csd01/schemas/ + Latest stage of specification: https://docs.oasis-open.org/office/OpenDocument/v1.4/OpenDocument-v1.4-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 + Open Document Format for Office Applications (OpenDocument) Version 1.4 OWL Package Metadata Manifest Description - OpenDocument-v1.3-package-metadata.owl + OpenDocument-v1.4-package-metadata.owl --> <!-- https://issues.oasis-open.org/browse/OFFICE-2153 --> diff --git a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng index ac0882c0ad4f..686ba7981b1b 100644 --- a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.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-v1.3-schema.rng"> + <rng:include href="../odf1.4/OpenDocument-v1.4-schema.rng"> <rng:define name="office-document-common-attrs"> <rng:interleave> @@ -2927,8 +2927,268 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1. </rng:optional> </rng:define> - <!-- TODO no proposal --> - <rng:define name="draw-enhanced-geometry-attlist" combine="interleave"> + <!-- FIXME: tdf#162690 --> + <rng:define name="draw-enhanced-geometry-attlist" combine="choice"> + <rng:interleave> + <rng:optional> + <rng:attribute name="draw:type"> + <rng:ref name="custom-shape-type"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="svg:viewBox"> + <rng:list> + <rng:ref name="integer"/> + <rng:ref name="integer"/> + <rng:ref name="integer"/> + <rng:ref name="integer"/> + </rng:list> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:mirror-vertical"> + <rng:ref name="boolean"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:mirror-horizontal"> + <rng:ref name="boolean"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:text-rotate-angle"> + <rng:ref name="angle"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:extrusion-allowed"> + <rng:ref name="boolean"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:text-path-allowed"> + <rng:ref name="boolean"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:concentric-gradient-fill-allowed"> + <rng:ref name="boolean"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:extrusion"> + <rng:ref name="boolean"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:extrusion-brightness"> + <rng:ref name="zeroToHundredPercent"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:extrusion-depth"> + <rng:list> + <rng:ref name="length"/> + <rng:ref name="double"/> + </rng:list> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:extrusion-diffusion"> + <rng:ref name="percent"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:extrusion-number-of-line-segments"> + <rng:ref name="integer"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:extrusion-light-face"> + <rng:ref name="boolean"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:extrusion-first-light-harsh"> + <rng:ref name="boolean"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:extrusion-second-light-harsh"> + <rng:ref name="boolean"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:extrusion-first-light-level"> + <rng:ref name="zeroToHundredPercent"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:extrusion-second-light-level"> + <rng:ref name="zeroToHundredPercent"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:extrusion-first-light-direction"> + <rng:ref name="vector3D"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:extrusion-second-light-direction"> + <rng:ref name="vector3D"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:extrusion-metal"> + <rng:ref name="boolean"/> + </rng:attribute> + </rng:optional> + <!-- https://issues.oasis-open.org/browse/OFFICE-4123 --> + <rng:optional> + <rng:attribute name="draw:extrusion-metal-type"> + <rng:ref name="namespacedToken"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="dr3d:shade-mode"> + <rng:choice> + <rng:value>flat</rng:value> + <rng:value>phong</rng:value> + <rng:value>gouraud</rng:value> + <rng:value>draft</rng:value> + </rng:choice> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:extrusion-rotation-angle"> + <rng:list> + <rng:ref name="angle"/> + <rng:ref name="angle"/> + </rng:list> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:extrusion-rotation-center"> + <rng:ref name="vector3D"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:extrusion-shininess"> + <rng:ref name="zeroToHundredPercent"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:extrusion-skew"> + <rng:list> + <rng:ref name="double"/> + <rng:ref name="angle"/> + </rng:list> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:extrusion-specularity"> + <rng:ref name="zeroToHundredPercent"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="dr3d:projection"> + <rng:choice> + <rng:value>parallel</rng:value> + <rng:value>perspective</rng:value> + </rng:choice> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:extrusion-viewpoint"> + <rng:ref name="point3D"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:extrusion-origin"> + <rng:list> + <rng:ref name="extrusionOrigin"/> + <rng:ref name="extrusionOrigin"/> + </rng:list> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:extrusion-color"> + <rng:ref name="boolean"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:enhanced-path"> + <rng:ref name="string"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:path-stretchpoint-x"> + <rng:ref name="double"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:path-stretchpoint-y"> + <rng:ref name="double"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:text-areas"> + <rng:ref name="string"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:glue-points"> + <rng:ref name="string"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:glue-point-type"> + <rng:choice> + <rng:value>none</rng:value> + <rng:value>segments</rng:value> + <rng:value>rectangle</rng:value> + </rng:choice> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:glue-point-leaving-directions"> + <rng:ref name="string"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:text-path"> + <rng:ref name="boolean"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:text-path-mode"> + <rng:choice> + <rng:value>normal</rng:value> + <rng:value>path</rng:value> + <rng:value>shape</rng:value> + </rng:choice> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:text-path-scale"> + <rng:choice> + <rng:value>path</rng:value> + <rng:value>shape</rng:value> + </rng:choice> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:text-path-same-letter-heights"> + <rng:ref name="boolean"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:modifiers"> + <rng:ref name="string"/> + </rng:attribute> + </rng:optional> + + <!-- TODO no proposal --> <rng:optional> <rng:attribute name="drawooo:sub-view-size"> <rng:ref name="string"/> @@ -2939,24 +3199,22 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1. <rng:ref name="string"/> </rng:attribute> </rng:optional> - </rng:define> - <!-- https://issues.oasis-open.org/browse/OFFICE-4123 --> - <rng:define name="draw-enhanced-geometry-attlist" combine="interleave"> + <!-- FIXME: tdf#162686 --> <rng:optional> <rng:attribute name="loext:extrusion-metal-type"> <rng:ref name="namespacedToken"/> </rng:attribute> </rng:optional> - </rng:define> - <!-- https://issues.oasis-open.org/browse/OFFICE-4122 --> - <rng:define name="draw-enhanced-geometry-attlist" combine="interleave"> + <!-- FIXME: tdf#162686 --> <rng:optional> <rng:attribute name="loext:extrusion-specularity-loext"> <rng:ref name="percent"/> </rng:attribute> </rng:optional> + + </rng:interleave> </rng:define> <!-- TODO no proposal --> @@ -3559,6 +3817,74 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1. </rng:optional> </rng:define> + <!-- FIXME: tdf#131862 --> + <rng:define name="chart-plot-area-attlist" combine="interleave"> + <rng:optional> + <rng:attribute name="table:cell-range-address"> + <rng:ref name="cellRangeAddressList"/> + </rng:attribute> + </rng:optional> + </rng:define> + + <!-- FIXME: tdf#162691 Copied from OpenDocument-v1.3-schema.rng --> + <rng:define name="draw-handle-attlist" combine="choice"> + <rng:interleave> + <rng:optional> + <rng:attribute name="draw:handle-mirror-vertical"> + <rng:ref name="boolean"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:handle-mirror-horizontal"> + <rng:ref name="boolean"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:handle-switched"> + <rng:ref name="boolean"/> + </rng:attribute> + </rng:optional> + <rng:attribute name="draw:handle-position"> + <rng:ref name="string"/> + </rng:attribute> + <rng:optional> + <rng:attribute name="draw:handle-range-x-minimum"> + <rng:ref name="string"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:handle-range-x-maximum"> + <rng:ref name="string"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:handle-range-y-minimum"> + <rng:ref name="string"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:handle-range-y-maximum"> + <rng:ref name="string"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:handle-polar"> + <rng:ref name="string"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:handle-radius-range-minimum"> + <rng:ref name="string"/> + </rng:attribute> + </rng:optional> + <rng:optional> + <rng:attribute name="draw:handle-radius-range-maximum"> + <rng:ref name="string"/> + </rng:attribute> + </rng:optional> + </rng:interleave> + </rng:define> + <!-- TODO no proposal --> <rng:define name="style-style-attlist" combine="interleave"> <rng:optional> diff --git a/schema/odf1.4/OpenDocument-v1.4-schema.rng b/schema/odf1.4/OpenDocument-v1.4-schema.rng index e1047fb1f2bd..169c5c8f6cd4 100644 --- a/schema/odf1.4/OpenDocument-v1.4-schema.rng +++ b/schema/odf1.4/OpenDocument-v1.4-schema.rng @@ -9783,13 +9783,14 @@ <rng:value>right</rng:value> <rng:value>top</rng:value> <rng:value>bottom</rng:value> + <!-- FIXME msv ignores the 2nd list? --> <rng:list> - <rng:ref name="horiBackPos"/> <rng:ref name="vertBackPos"/> + <rng:ref name="horiBackPos"/> </rng:list> <rng:list> - <rng:ref name="vertBackPos"/> <rng:ref name="horiBackPos"/> + <rng:ref name="vertBackPos"/> </rng:list> </rng:choice> </rng:attribute>