[Libreoffice-commits] core.git: schema/libreoffice
Michael Stahl (via logerrit)
logerrit at kemper.freedesktop.org
Mon May 18 16:19:31 UTC 2020
schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng | 128 ------------
1 file changed, 128 deletions(-)
New commits:
commit 101594c272a53727566b3533fd083178769a4b49
Author: Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Wed Apr 29 16:22:30 2020 +0200
Commit: Michael Stahl <michael.stahl at cib.de>
CommitDate: Mon May 18 18:18:50 2020 +0200
schema: adapt libreoffice schema to ODF 1.3
Remove everything that's in ODF 1.3; it's no longer necessary and some
of it requires overriding named patterns from the schema so that has to
be removed.
Change-Id: I716957dc8ccc3fa54fc69c96d8a3b577a5c7e126
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93176
Tested-by: Michael Stahl <michael.stahl at cib.de>
Reviewed-by: Michael Stahl <michael.stahl at cib.de>
diff --git a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng b/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
index df9d84f09b7d..2f316b6764a0 100644
--- a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
+++ b/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
@@ -964,43 +964,6 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
</rng:zeroOrMore>
</rng:define>
- <!-- FIXME this is not extensible -->
- <rng:define name="office-annotation">
- <rng:element name="office:annotation">
- <rng:ref name="office-annotation-attlist"/>
- <rng:ref name="draw-caption-attlist"/>
- <rng:ref name="common-draw-position-attlist"/>
- <rng:ref name="common-draw-size-attlist"/>
- <rng:ref name="common-draw-shape-with-text-and-styles-attlist"/>
- <rng:optional>
- <rng:ref name="dc-creator"/>
- </rng:optional>
- <rng:optional>
- <rng:ref name="dc-date"/>
- </rng:optional>
- <rng:optional>
- <rng:ref name="meta-date-string"/>
- </rng:optional>
- <rng:optional>
- <rng:element name="meta:creator-initials">
- <rng:text/>
- </rng:element>
- </rng:optional>
- <!-- https://issues.oasis-open.org/browse/OFFICE-3776 -->
- <rng:optional>
- <rng:element name="loext:sender-initials">
- <rng:text/>
- </rng:element>
- </rng:optional>
- <rng:zeroOrMore>
- <rng:choice>
- <rng:ref name="text-p"/>
- <rng:ref name="text-list"/>
- </rng:choice>
- </rng:zeroOrMore>
- </rng:element>
- </rng:define>
-
<rng:define name="office-annotation-attlist" combine="interleave">
<rng:interleave>
<rng:optional>
@@ -1401,23 +1364,6 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
</rng:element>
</rng:define>
- <!-- https://issues.oasis-open.org/browse/OFFICE-3765 -->
- <rng:define name="number-text-with-fillchar">
- <rng:optional>
- <rng:optional>
- <rng:element name="loext:text">
- <rng:text/>
- </rng:element>
- </rng:optional>
- <rng:element name="loext:fill-character">
- <rng:text/>
- </rng:element>
- </rng:optional>
- <rng:optional>
- <rng:ref name="number-text"/>
- </rng:optional>
- </rng:define>
-
<rng:define name="table-table">
<rng:element name="table:table">
<rng:ref name="table-table-attlist"/>
@@ -1924,32 +1870,6 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
</rng:element>
</rng:define>
- <!-- https://issues.oasis-open.org/browse/OFFICE-3928 -->
- <rng:define name="chart-coordinate-region" combine="choice">
- <rng:element name="chartooo:coordinate-region">
- <rng:ref name="chart-coordinate-region-attlist"/>
- <rng:empty/>
- </rng:element>
- </rng:define>
-
- <rng:define name="common-decimal-places-attlist" combine="interleave">
- <rng:optional>
- <!-- OFFICE-3860 -->
- <rng:attribute name="loext:min-decimal-places">
- <rng:ref name="integer"/>
- </rng:attribute>
- </rng:optional>
- </rng:define>
-
- <!-- https://issues.oasis-open.org/browse/OFFICE-3943 -->
- <rng:define name="common-draw-mime-type-attlist" combine="interleave">
- <rng:optional>
- <rng:attribute name="loext:mime-type">
- <rng:ref name="string"/>
- </rng:attribute>
- </rng:optional>
- </rng:define>
-
<rng:define name="common-draw-rel-size-attlist" combine="interleave">
<!-- OFFICE-3854 -->
<rng:optional>
@@ -1995,22 +1915,6 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
</rng:optional>
</rng:define>
- <rng:define name="style-footer-first" combine="choice">
- <rng:element name="loext:footer-first">
- <!-- https://issues.oasis-open.org/browse/OFFICE-3789 -->
- <rng:ref name="common-style-header-footer-attlist"/>
- <rng:ref name="header-footer-content"/>
- </rng:element>
- </rng:define>
-
- <rng:define name="style-header-first" combine="choice">
- <rng:element name="loext:header-first">
- <!-- https://issues.oasis-open.org/browse/OFFICE-3789 -->
- <rng:ref name="common-style-header-footer-attlist"/>
- <rng:ref name="header-footer-content"/>
- </rng:element>
- </rng:define>
-
<rng:define name="style-list-level-label-alignment-attlist" combine="interleave">
<rng:optional>
<!-- TODO no proposal -->
@@ -2025,15 +1929,6 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
</rng:optional>
</rng:define>
- <rng:define name="style-paragraph-properties-attlist" combine="interleave">
- <rng:optional>
- <!-- https://issues.oasis-open.org/browse/OFFICE-3767 -->
- <rng:attribute name="loext:contextual-spacing">
- <rng:ref name="boolean"/>
- </rng:attribute>
- </rng:optional>
- </rng:define>
-
<rng:define name="style-ruby-properties-attlist" combine="interleave">
<rng:optional>
<!-- TODO proposal, OFFICE-3944 -->
@@ -2135,15 +2030,6 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
</rng:optional>
</rng:define>
- <!-- OFFICE-3860 -->
- <rng:define name="number-scientific-number-attlist" combine="interleave">
- <rng:optional>
- <rng:attribute name="loext:forced-exponent-sign">
- <rng:ref name="boolean"/>
- </rng:attribute>
- </rng:optional>
- </rng:define>
-
<!-- TODO no proposal -->
<rng:define name="style-chart-properties-attlist" combine="interleave">
<rng:optional>
@@ -2269,15 +2155,6 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
</rng:optional>
</rng:define>
- <!-- https://issues.oasis-open.org/browse/OFFICE-1828 -->
- <rng:define name="number-scientific-number-attlist" combine="interleave">
- <rng:optional>
- <rng:attribute name="loext:exponent-interval">
- <rng:ref name="positiveInteger"/>
- </rng:attribute>
- </rng:optional>
- </rng:define>
-
<!-- https://issues.oasis-open.org/browse/OFFICE-2317 -->
<rng:define name="vertJustifyValues">
<rng:choice>
@@ -2319,11 +2196,6 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
<rng:define name="number-fraction-attlist" combine="interleave">
<!-- OFFICE-3695 -->
- <rng:optional>
- <rng:attribute name="loext:max-denominator-value">
- <rng:ref name="positiveInteger"/>
- </rng:attribute>
- </rng:optional>
<!-- TODO no proposal, 1544a26ac9f7dd60605dd21e9cbe29d490aafdce -->
<rng:optional>
<rng:attribute name="loext:max-numerator-digits">
More information about the Libreoffice-commits
mailing list