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: Michael Stahl <Michael.Stahl@cib.de>

1 files changed, 6 insertions, 6 deletions

diff --git a/schema/odf1.3/OpenDocument-manifest-schema-v1.3.rng b/schema/odf1.3/OpenDocument-manifest-schema-v1.3.rng
index 814b5f121be9..48c11a0f7010 100644
--- a/schema/odf1.3/OpenDocument-manifest-schema-v1.3.rng
+++ b/schema/odf1.3/OpenDocument-manifest-schema-v1.3.rng
@@ -177,11 +177,11 @@
     </rng:element>
   </rng:define>
   <rng:define name="key-derivation-attlist">
- <rng:choice>
+    <rng:choice>
       <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>
@@ -194,7 +194,7 @@
         <rng:attribute name="manifest:iteration-count">
           <rng:ref name="nonNegativeInteger"/>
         </rng:attribute>
-    <rng:optional>
+        <rng:optional>
           <rng:attribute name="manifest:key-size">
             <rng:ref name="nonNegativeInteger"/>
           </rng:attribute>
@@ -205,9 +205,9 @@
   <rng:define name="manifest">
     <rng:element name="manifest:manifest">
       <rng:ref name="manifest-attlist"/>
-       <rng:zeroOrMore>
+      <rng:zeroOrMore>
         <rng:ref name="encrypted-key"/>
-             </rng:zeroOrMore>
+      </rng:zeroOrMore>
     <!-- https://issues.oasis-open.org/browse/OFFICE-3940 -->
       <rng:oneOrMore>
         <rng:ref name="file-entry"/>
@@ -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">