Kaydet (Commit) 85b25ae7 authored tarafından Michael Stahl's avatar Michael Stahl

schema: fix some obvious issues in ODF 1.3 schemas

editorial changes:

* maintain alphabetical sorting (by moving some of the new named patterns)
* consistent indentation

substantive changes:

* manifest schema: for no apparent reason, the QName pattern lost its +

* OFFICE-2118: Fatal: reference to the undefined pattern "table-data-pilot-groups"
* OFFICE-3857: Fatal: more than one attribute accepts the same name "scale-to"
* OFFICE-3933: the removal part of the diff was not applied
* OFFICE-3883: applied one line off, with missing rng: namespace prefix
* OFFICE-3928:
  - removed combine=interleave attribute (was in 1.1 but no longer used in 1.2 schema)
  - added missing rng: prefix to <empty>

Change-Id: I80871dec69b1dbc7b1438366d895c443a44fb72c
Reviewed-on: https://gerrit.libreoffice.org/56398
Tested-by: Jenkins
Reviewed-by: 's avatarMichael Stahl <Michael.Stahl@cib.de>
üst 72225e1a
......@@ -181,7 +181,7 @@
<rng:attribute name="manifest:key-derivation-name">
<rng:value>PGP</rng:value>
</rng:attribute>
<rng:interleave>
<rng:interleave>
<rng:attribute name="manifest:key-derivation-name">
<rng:choice>
<rng:value>PBKDF2</rng:value>
......@@ -221,7 +221,7 @@
</rng:define>
<rng:define name="namespacedToken">
<rng:data type="QName">
<rng:param name="pattern">[^:]:[^:]</rng:param>
<rng:param name="pattern">[^:]+:[^:]+</rng:param>
</rng:data>
</rng:define>
<rng:define name="nonNegativeInteger">
......
......@@ -181,7 +181,7 @@
<rng:attribute name="manifest:key-derivation-name">
<rng:value>PGP</rng:value>
</rng:attribute>
<rng:interleave>
<rng:interleave>
<rng:attribute name="manifest:key-derivation-name">
<rng:choice>
<rng:value>PBKDF2</rng:value>
......@@ -221,7 +221,7 @@
</rng:define>
<rng:define name="namespacedToken">
<rng:data type="QName">
<rng:param name="pattern">[^:]:[^:]</rng:param>
<rng:param name="pattern">[^:]+:[^:]+</rng:param>
</rng:data>
</rng:define>
<rng:define name="nonNegativeInteger">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment