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>

4 files changed, 444 insertions, 464 deletions

diff --git a/schema/libreoffice/OpenDocument-manifest-schema-v1.3+libreoffice.rng b/schema/libreoffice/OpenDocument-manifest-schema-v1.3+libreoffice.rng
index 814b5f121be9..48c11a0f7010 100644
--- a/schema/libreoffice/OpenDocument-manifest-schema-v1.3+libreoffice.rng
+++ b/schema/libreoffice/OpenDocument-manifest-schema-v1.3+libreoffice.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">
diff --git a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng b/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
index 889cc2e161ab..384b88162e1c 100644
--- a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
+++ b/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
@@ -492,7 +492,7 @@
       </rng:optional>
       <rng:ref name="chart-plot-area"/>
       <rng:zeroOrMore>
-	<rng:ref name="shape"/>
+        <rng:ref name="shape"/>
       </rng:zeroOrMore>
       <!-- https://issues.oasis-open.org/browse/OFFICE-2123 -->
       <rng:optional>
@@ -536,6 +536,17 @@
       </rng:optional>
     </rng:interleave>
   </rng:define>
+  <rng:define name="chart-coordinate-region">
+    <rng:element name="chart:coordinate-region">
+      <rng:ref name="chart-coordinate-region-attlist"/>
+      <rng:empty/>
+    </rng:element>
+  </rng:define>
+  <rng:define name="chart-coordinate-region-attlist">
+    <rng:ref name="common-draw-position-attlist"/>
+    <rng:ref name="common-draw-size-attlist"/>
+  </rng:define>
+	<!-- https://issues.oasis-open.org/browse/OFFICE-3928 -->
   <rng:define name="chart-data-label">
     <rng:element name="chart:data-label">
       <rng:ref name="chart-data-label-attlist"/>
@@ -751,8 +762,8 @@
           </rng:attribute>
           <rng:attribute name="style:legend-expansion-aspect-ratio">
             <rng:ref name="double"/>
-          <ref name="common-draw-size-attlist"/>
           </rng:attribute>
+          <rng:ref name="common-draw-size-attlist"/>
 	  <!-- https://issues.oasis-open.org/browse/OFFICE-3883 -->
         </rng:group>
         <rng:empty/>
@@ -782,8 +793,8 @@
       <rng:ref name="chart-plot-area-attlist"/>
       <rng:optional>
 	<!-- https://issues.oasis-open.org/browse/OFFICE-3928 -->
-            <rng:ref name="chart-coordinate-region"/>
-        </rng:optional>
+        <rng:ref name="chart-coordinate-region"/>
+      </rng:optional>
       <rng:zeroOrMore>
         <rng:ref name="dr3d-light"/>
       </rng:zeroOrMore>
@@ -841,16 +852,6 @@
       </rng:optional>
     </rng:interleave>
   </rng:define>
-  <rng:define name="chart-coordinate-region">
-    <rng:element name="chart:coordinate-region">
-        <rng:ref name="chart-coordinate-region-attlist"/>
-        <empty/>
-    </rng:element>
-  </rng:define>
-  <rng:define name="chart-coordinate-region-attlist" combine="interleave">
-    <rng:ref name="common-draw-position-attlist"/>
-    <rng:ref name="common-draw-size-attlist"/>
-  </rng:define>
   <rng:define name="chart-regression-curve">
     <rng:element name="chart:regression-curve">
       <rng:ref name="chart-regression-curve-attlist"/>
@@ -1525,8 +1526,9 @@
     </rng:optional>
     <rng:optional>
       <rng:attribute name="number:min-decimal-places">
-	<rng:ref name="integer"/>
+        <rng:ref name="integer"/>
       </rng:attribute>
+      <!-- OFFICE-3860 -->
     </rng:optional>
   </rng:define>
   <rng:define name="common-delay-for-repeat">
@@ -1700,6 +1702,14 @@
       </rng:attribute>
     </rng:optional>
   </rng:define>
+  <rng:define name="common-draw-mime-type-attlist">
+    <rng:optional>
+      <rng:attribute name="draw:mime-type">
+        <rng:ref name="string"/>
+      </rng:attribute>
+    </rng:optional>
+  </rng:define>
+  <!-- https://issues.oasis-open.org/browse/OFFICE-3943 -->
   <rng:define name="common-draw-name-attlist">
     <rng:optional>
       <rng:attribute name="draw:name">
@@ -4976,28 +4986,11 @@
   <rng:define name="draw-fill-image">
     <rng:element name="draw:fill-image">
       <rng:ref name="draw-fill-image-attlist"/>
-      <rng:attribute name="xlink:type">
-        <rng:value>simple</rng:value>
-      </rng:attribute>
-      <rng:attribute name="xlink:href">
-        <rng:ref name="anyIRI"/>
-      </rng:attribute>
-      <rng:optional>
-        <rng:attribute name="xlink:show">
-          <rng:value>embed</rng:value>
-        </rng:attribute>
-      </rng:optional>
-      <rng:optional>
-        <rng:attribute name="xlink:actuate">
-          <rng:value>onLoad</rng:value>
-        </rng:attribute>
-      </rng:optional>
-      <rng:empty/>
       <rng:choice>
         <rng:group>
           <rng:ref name="common-draw-data-attlist"/>
-	  <rng:empty/>
-	</rng:group>
+          <rng:empty/>
+        </rng:group>
         <rng:ref name="office-binary-data"/>
       </rng:choice>
       <!-- https://issues.oasis-open.org/browse/OFFICE-3933 -->
@@ -5328,19 +5321,12 @@
         </rng:attribute>
       </rng:optional>
       <rng:ref name="common-draw-mime-type-attlist"/>
+  <!-- https://issues.oasis-open.org/browse/OFFICE-3943 -->
       <rng:optional>
         <rng:ref name="xml-id"/>
       </rng:optional>
     </rng:interleave>
   </rng:define>
-  <rng:define name="common-draw-mime-type-attlist">
-       <rng:optional>
-            <rng:attribute name="draw:mime-type">
-                <rng:ref name="string"/>
-            </rng:attribute>
-        </rng:optional>    
-  </rng:define>
-  <!-- https://issues.oasis-open.org/browse/OFFICE-3943 -->
   <rng:define name="draw-image-map">
     <rng:element name="draw:image-map">
       <rng:zeroOrMore>
@@ -5693,7 +5679,7 @@
   </rng:define>
   <rng:define name="draw-plugin-attlist">
     <rng:interleave>
-     <rng:ref name="common-draw-mime-type-attlist"/>
+      <rng:ref name="common-draw-mime-type-attlist"/>
       <rng:optional>
         <rng:ref name="xml-id"/>
       </rng:optional>
@@ -7190,6 +7176,12 @@
       </rng:attribute>
     </rng:optional>
   </rng:define>
+  <rng:define name="number-fill-character">
+    <rng:element name="number:fill-character">
+      <rng:text/>
+    </rng:element>
+  </rng:define>
+  <!-- https://issues.oasis-open.org/browse/OFFICE-3765 -->
   <rng:define name="number-fraction">
     <rng:element name="number:fraction">
       <rng:ref name="number-fraction-attlist"/>
@@ -7374,8 +7366,9 @@
     </rng:optional>
     <rng:optional>
       <rng:attribute name="number:forced-exponent-sign">
-	<rng:ref name="boolean"/>
+        <rng:ref name="boolean"/>
       </rng:attribute>
+      <!-- OFFICE-3860 -->
     </rng:optional>
   </rng:define>
   <rng:define name="number-seconds">
@@ -7401,23 +7394,6 @@
       </rng:optional>
     </rng:interleave>
   </rng:define>
-  <rng:define name="number-text-with-fillchar">
-		<rng:optional>
-			<rng:ref name="number-text"/>
-		</rng:optional>
-		<rng:optional>
-			<rng:ref name="number-fill-character"/>
-			<rng:optional>
-				<rng:ref name="number-text"/>
-			</rng:optional>
-		</rng:optional>
-	</rng:define>
-	<rng:define name="number-fill-character">
-		<rng:element name="number:fill-character">
-			<rng:text/>
-		</rng:element>
-	</rng:define>
-  <!-- https://issues.oasis-open.org/browse/OFFICE-3765 -->
   <rng:define name="number-text">
     <rng:element name="number:text">
       <rng:text/>
@@ -7450,6 +7426,18 @@
       </rng:zeroOrMore>
     </rng:element>
   </rng:define>
+  <rng:define name="number-text-with-fillchar">
+    <rng:optional>
+      <rng:ref name="number-text"/>
+    </rng:optional>
+    <rng:optional>
+      <rng:ref name="number-fill-character"/>
+      <rng:optional>
+        <rng:ref name="number-text"/>
+      </rng:optional>
+    </rng:optional>
+  </rng:define>
+  <!-- https://issues.oasis-open.org/browse/OFFICE-3765 -->
   <rng:define name="number-time-style">
     <rng:element name="number:time-style">
       <rng:ref name="number-time-style-attlist"/>
@@ -7521,9 +7509,9 @@
         <rng:ref name="meta-date-string"/>
       </rng:optional>
       <rng:optional>
-	<rng:element name="meta:creator-initials">
-	  <rng:text/>
-	</rng:element>
+        <rng:element name="meta:creator-initials">
+          <rng:text/>
+        </rng:element>
       </rng:optional>
       <!-- https://issues.oasis-open.org/browse/OFFICE-3776 -->
       <rng:zeroOrMore>
@@ -8289,27 +8277,6 @@
   </rng:define>
   <rng:define name="paragraph-content">
     <rng:choice>
-      <rng:element name="text:drop-down">
-<rng:attribute name="text:name">
-<rng:ref name="string"/>
-</rng:attribute>
-<rng:zeroOrMore>
-<rng:element name="text:label">
-<rng:optional>
-<rng:attribute name="text:value">
-<rng:ref name="string"/>
-</rng:attribute>
-</rng:optional>
-<rng:optional>
-<rng:attribute name="text:current-selected">
-<rng:ref name="boolean"/>
-</rng:attribute>
-</rng:optional>
-</rng:element>
-</rng:zeroOrMore>
-<rng:text/>
-      </rng:element>
-      
       <rng:text/>
       <rng:element name="text:s">
         <rng:optional>
@@ -8582,6 +8549,27 @@
         <rng:ref name="common-field-description-attlist"/>
         <rng:text/>
       </rng:element>
+      <rng:element name="text:drop-down">
+        <rng:attribute name="text:name">
+          <rng:ref name="string"/>
+        </rng:attribute>
+        <rng:zeroOrMore>
+          <rng:element name="text:label">
+            <rng:optional>
+              <rng:attribute name="text:value">
+                <rng:ref name="string"/>
+              </rng:attribute>
+            </rng:optional>
+            <rng:optional>
+              <rng:attribute name="text:current-selected">
+                <rng:ref name="boolean"/>
+              </rng:attribute>
+            </rng:optional>
+          </rng:element>
+        </rng:zeroOrMore>
+        <rng:text/>
+      </rng:element>
+      <!-- OFFICE-3881 -->
       <rng:element name="text:initial-creator">
         <rng:ref name="common-field-fixed-attlist"/>
         <rng:text/>
@@ -10095,14 +10083,14 @@
             <rng:value>logarithmic</rng:value>
             <rng:value>exponential</rng:value>
             <rng:value>power</rng:value>
-	    <rng:value>polynomial</rng:value>
+            <rng:value>polynomial</rng:value>
           </rng:choice>
         </rng:attribute>
       </rng:optional>
-    <rng:optional>
-      <rng:attribute name="chart:regression-max-degree">
+      <rng:optional>
+        <rng:attribute name="chart:regression-max-degree">
           <rng:ref name="positiveInteger"/>
-        </rng:attribute>        
+        </rng:attribute>
       </rng:optional>
       <rng:optional>
         <rng:attribute name="chart:regression-force-intercept">
@@ -10154,9 +10142,9 @@
         </rng:attribute>
       </rng:optional>
       <rng:optional>
-    <rng:attribute name="chart:data-label-series">
-      <rng:ref name="boolean"/>
-    </rng:attribute>
+        <rng:attribute name="chart:data-label-series">
+          <rng:ref name="boolean"/>
+        </rng:attribute>
       </rng:optional>
       <!-- https://issues.oasis-open.org/browse/OFFICE-2117 -->
     </rng:interleave>
@@ -10703,31 +10691,25 @@
       </rng:optional>
     </rng:interleave>
   </rng:define>
-  <rng:define name="style-header-first">
-   <rng:element name="style:header-first">
-       <rng:ref name="common-style-header-footer-attlist"/>
-       <rng:ref name="header-footer-content"/>
-   </rng:element>
-</rng:define>
   <rng:define name="style-footer">
     <rng:element name="style:footer">
       <rng:ref name="common-style-header-footer-attlist"/>
       <rng:ref name="header-footer-content"/>
     </rng:element>
   </rng:define>
+  <rng:define name="style-footer-first">
+    <rng:element name="style:footer-first">
+      <rng:ref name="common-style-header-footer-attlist"/>
+      <rng:ref name="header-footer-content"/>
+       <!-- https://issues.oasis-open.org/browse/OFFICE-3789 -->
+    </rng:element>
+  </rng:define>
   <rng:define name="style-footer-left">
     <rng:element name="style:footer-left">
       <rng:ref name="common-style-header-footer-attlist"/>
       <rng:ref name="header-footer-content"/>
     </rng:element>
   </rng:define>
-  <rng:define name="style-footer-first">
-   <rng:element name="style:footer-first">
-       <rng:ref name="common-style-header-footer-attlist"/>
-       <rng:ref name="header-footer-content"/>
-       <!-- https://issues.oasis-open.org/browse/OFFICE-3789 -->
-   </rng:element>
-</rng:define>
   <rng:define name="style-footer-style">
     <rng:element name="style:footer-style">
       <rng:optional>
@@ -11810,6 +11792,13 @@
       <rng:ref name="header-footer-content"/>
     </rng:element>
   </rng:define>
+  <rng:define name="style-header-first">
+    <rng:element name="style:header-first">
+      <rng:ref name="common-style-header-footer-attlist"/>
+      <rng:ref name="header-footer-content"/>
+       <!-- https://issues.oasis-open.org/browse/OFFICE-3789 -->
+    </rng:element>
+  </rng:define>
   <rng:define name="style-header-footer-properties">
     <rng:element name="style:header-footer-properties">
       <rng:ref name="style-header-footer-properties-content-strict"/>
@@ -11982,18 +11971,20 @@
         <rng:optional>
           <rng:ref name="style-header-left"/>
         </rng:optional>
-	<rng:optional>
-	  <rng:ref name="style-header-first"/>
-	</rng:optional>
+        <rng:optional>
+          <rng:ref name="style-header-first"/>
+        </rng:optional>
+       <!-- https://issues.oasis-open.org/browse/OFFICE-3789 -->
       </rng:optional>
       <rng:optional>
         <rng:ref name="style-footer"/>
         <rng:optional>
           <rng:ref name="style-footer-left"/>
         </rng:optional>
-	<rng:optional>
-	  <rng:ref name="style-footer-first"/>
-	</rng:optional>
+        <rng:optional>
+          <rng:ref name="style-footer-first"/>
+        </rng:optional>
+       <!-- https://issues.oasis-open.org/browse/OFFICE-3789 -->
       </rng:optional>
       <rng:optional>
         <rng:ref name="draw-layer-set"/>
@@ -12162,41 +12153,31 @@
           </rng:choice>
         </rng:attribute>
       </rng:optional>
-      <rng:optional>
-        <rng:attribute name="style:scale-to">
-          <rng:ref name="percent"/>
-        </rng:attribute>
-      </rng:optional>
-      <rng:optional>
-        <rng:attribute name="style:scale-to-pages">
-          <rng:ref name="positiveInteger"/>
-        </rng:attribute>
-      </rng:optional>
       <rng:choice>
 	<!-- https://issues.oasis-open.org/browse/OFFICE-3857 -->
-<rng:optional>
-<rng:attribute name="style:scale-to">
-<rng:ref name="percent"/>
-</rng:attribute>
-</rng:optional>
-<rng:optional>
-<rng:attribute name="style:scale-to-pages">
-<rng:ref name="positiveInteger"/>
-</rng:attribute>
-</rng:optional>
-<rng:group>
-<rng:optional>
-<rng:attribute name="style:scale-to-X">
-<rng:ref name="positiveInteger"/>
-</rng:attribute>
-</rng:optional>
-<rng:optional>
-<rng:attribute name="style:scale-to-Y">
-<rng:ref name="positiveInteger"/>
-</rng:attribute>
-</rng:optional>
-</rng:group>
-</rng:choice>
+        <rng:optional>
+          <rng:attribute name="style:scale-to">
+            <rng:ref name="percent"/>
+          </rng:attribute>
+        </rng:optional>
+        <rng:optional>
+          <rng:attribute name="style:scale-to-pages">
+            <rng:ref name="positiveInteger"/>
+          </rng:attribute>
+        </rng:optional>
+        <rng:group>
+          <rng:optional>
+            <rng:attribute name="style:scale-to-X">
+              <rng:ref name="positiveInteger"/>
+            </rng:attribute>
+          </rng:optional>
+          <rng:optional>
+            <rng:attribute name="style:scale-to-Y">
+              <rng:ref name="positiveInteger"/>
+            </rng:attribute>
+          </rng:optional>
+        </rng:group>
+      </rng:choice>
       <rng:optional>
         <rng:attribute name="style:table-centering">
           <rng:choice>
@@ -12293,9 +12274,9 @@
   <rng:define name="style-paragraph-properties-attlist">
     <rng:interleave>
       <rng:optional>
-	<rng:attribute name="style:contextual-spacing">
-	  <rng:ref name="boolean"/>
-	</rng:attribute>
+        <rng:attribute name="style:contextual-spacing">
+          <rng:ref name="boolean"/>
+        </rng:attribute>
       </rng:optional>
       <!-- https://issues.oasis-open.org/browse/OFFICE-3767 -->
       <rng:optional>
@@ -13071,9 +13052,9 @@
         </rng:attribute>
       </rng:optional>
       <rng:optional>
-	<rng:attribute name="table:tab-color">
-	  <rng:ref name="color"/>
-	</rng:attribute>
+        <rng:attribute name="table:tab-color">
+          <rng:ref name="color"/>
+        </rng:attribute>
       </rng:optional>
       <!-- https://issues.oasis-open.org/browse/OFFICE-2173 -->
     </rng:interleave>
@@ -14290,62 +14271,70 @@
       <rng:ref name="string"/>
     </rng:attribute>
   </rng:define>
+  <rng:define name="table-data-pilot-groups">
+    <rng:element name="table:data-pilot-groups">
+      <rng:ref name="table-data-pilot-groups-attlist"/>
+      <rng:oneOrMore>
+        <rng:ref name="table-data-pilot-group"/>
+      </rng:oneOrMore>
+    </rng:element>
+  </rng:define>
   <rng:define name="table-data-pilot-groups-attlist">
-		<rng:interleave>
-			<rng:attribute name="table:source-field-name">
-				<rng:ref name="string"/>
-			</rng:attribute>
-			<rng:optional>
-				<rng:choice>
-					<rng:attribute name="table:date-start">
-						<rng:choice>
-							<rng:ref name="dateOrDateTime"/>
-							<rng:value>auto</rng:value>
-						</rng:choice>
-					</rng:attribute>
-					<rng:attribute name="table:start">
-						<rng:choice>
-							<rng:ref name="double"/>
-							<rng:value>auto</rng:value>
-						</rng:choice>
-					</rng:attribute>
-				</rng:choice>
-			</rng:optional>
-			<rng:optional>
-				<rng:choice>
-					<rng:attribute name="table:date-end">
-						<rng:choice>
-							<rng:ref name="dateOrDateTime"/>
-							<rng:value>auto</rng:value>
-						</rng:choice>
-					</rng:attribute>
-					<rng:attribute name="table:end">
-						<rng:choice>
-							<rng:ref name="double"/>
-							<rng:value>auto</rng:value>
-						</rng:choice>
-					</rng:attribute>
-				</rng:choice>
-			</rng:optional>
-			<rng:optional>
-				<rng:attribute name="table:step">
-					<rng:ref name="double"/>
-				</rng:attribute>
-			</rng:optional>
-			<rng:optional>
-				<rng:attribute name="table:grouped-by">
-					<rng:choice>
-						<rng:value>seconds</rng:value>
-						<rng:value>minutes</rng:value>
-						<rng:value>hours</rng:value>
-						<rng:value>days</rng:value>
-						<rng:value>months</rng:value>
-						<rng:value>quarters</rng:value>
-						<rng:value>years</rng:value>
-					</rng:choice>
-				</rng:attribute>
-			</rng:optional>
-		</rng:interleave>
+    <rng:interleave>
+      <rng:attribute name="table:source-field-name">
+        <rng:ref name="string"/>
+      </rng:attribute>
+      <rng:optional>
+        <rng:choice>
+          <rng:attribute name="table:date-start">
+            <rng:choice>
+              <rng:ref name="dateOrDateTime"/>
+              <rng:value>auto</rng:value>
+            </rng:choice>
+          </rng:attribute>
+          <rng:attribute name="table:start">
+            <rng:choice>
+              <rng:ref name="double"/>
+              <rng:value>auto</rng:value>
+            </rng:choice>
+          </rng:attribute>
+        </rng:choice>
+      </rng:optional>
+      <rng:optional>
+        <rng:choice>
+          <rng:attribute name="table:date-end">
+            <rng:choice>
+              <rng:ref name="dateOrDateTime"/>
+              <rng:value>auto</rng:value>
+            </rng:choice>
+          </rng:attribute>
+          <rng:attribute name="table:end">
+            <rng:choice>
+              <rng:ref name="double"/>
+              <rng:value>auto</rng:value>
+            </rng:choice>
+          </rng:attribute>
+        </rng:choice>
+      </rng:optional>
+      <rng:optional>
+        <rng:attribute name="table:step">
+          <rng:ref name="double"/>
+        </rng:attribute>
+      </rng:optional>
+      <rng:optional>
+        <rng:attribute name="table:grouped-by">
+          <rng:choice>
+            <rng:value>seconds</rng:value>
+            <rng:value>minutes</rng:value>
+            <rng:value>hours</rng:value>
+            <rng:value>days</rng:value>
+            <rng:value>months</rng:value>
+            <rng:value>quarters</rng:value>
+            <rng:value>years</rng:value>
+          </rng:choice>
+        </rng:attribute>
+      </rng:optional>
+    </rng:interleave>
   </rng:define>
   <!-- https://issues.oasis-open.org/browse/OFFICE-2118 -->
   <rng:define name="table-data-pilot-layout-info">
@@ -15569,23 +15558,24 @@
     </rng:element>
   </rng:define>
   <rng:define name="table-source-cell-range-attlist">
-   <rng:interleave>
-	             <rng:choice>
-		        <rng:attribute name="table:cell-range-address">
-		        	<rng:ref name="cellRangeAddress"/>
-		        </rng:attribute>
-			<rng:group>
-			  <rng:attribute name="table:name">
-			    <rng:ref name="string"/>
-			  </rng:attribute>
-			  <rng:optional>
-			    <rng:attribute name="table:cell-range-address">
-			      <rng:ref name="cellRangeAddress"/>
-			    </rng:attribute>
-			  </rng:optional>
-			</rng:group>
-		    </rng:choice>
-		</rng:interleave>
+  <!-- OFFICE-3665 -->
+    <rng:interleave>
+      <rng:choice>
+        <rng:attribute name="table:cell-range-address">
+          <rng:ref name="cellRangeAddress"/>
+        </rng:attribute>
+        <rng:group>
+          <rng:attribute name="table:name">
+            <rng:ref name="string"/>
+          </rng:attribute>
+          <rng:optional>
+            <rng:attribute name="table:cell-range-address">
+              <rng:ref name="cellRangeAddress"/>
+            </rng:attribute>
+          </rng:optional>
+        </rng:group>
+      </rng:choice>
+    </rng:interleave>
   </rng:define>
   <rng:define name="table-source-range-address">
     <rng:element name="table:source-range-address">
@@ -16883,8 +16873,8 @@
         <rng:ref name="text-index-entry-text"/>
         <rng:ref name="text-index-entry-span"/>
         <rng:ref name="text-index-entry-tab-stop"/>
-	<rng:ref name="text-index-entry-link-start"/>
-	<rng:ref name="text-index-entry-link-end"/>
+        <rng:ref name="text-index-entry-link-start"/>
+        <rng:ref name="text-index-entry-link-end"/>
 	<!-- https://issues.oasis-open.org/browse/OFFICE-3941 -->
       </rng:choice>
     </rng:zeroOrMore>
@@ -18126,8 +18116,8 @@
           <rng:ref name="text-index-entry-text"/>
           <rng:ref name="text-index-entry-span"/>
           <rng:ref name="text-index-entry-tab-stop"/>
-	  <rng:ref name="text-index-entry-link-start"/>
-	  <rng:ref name="text-index-entry-link-end"/>
+          <rng:ref name="text-index-entry-link-start"/>
+          <rng:ref name="text-index-entry-link-end"/>
 	  <!-- https://issues.oasis-open.org/browse/OFFICE-3941 -->
         </rng:choice>
       </rng:zeroOrMore>
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">
diff --git a/schema/odf1.3/OpenDocument-schema-v1.3.rng b/schema/odf1.3/OpenDocument-schema-v1.3.rng
index 889cc2e161ab..384b88162e1c 100644
--- a/schema/odf1.3/OpenDocument-schema-v1.3.rng
+++ b/schema/odf1.3/OpenDocument-schema-v1.3.rng
@@ -492,7 +492,7 @@
       </rng:optional>
       <rng:ref name="chart-plot-area"/>
       <rng:zeroOrMore>
-	<rng:ref name="shape"/>
+        <rng:ref name="shape"/>
       </rng:zeroOrMore>
       <!-- https://issues.oasis-open.org/browse/OFFICE-2123 -->
       <rng:optional>
@@ -536,6 +536,17 @@
       </rng:optional>
     </rng:interleave>
   </rng:define>
+  <rng:define name="chart-coordinate-region">
+    <rng:element name="chart:coordinate-region">
+      <rng:ref name="chart-coordinate-region-attlist"/>
+      <rng:empty/>
+    </rng:element>
+  </rng:define>
+  <rng:define name="chart-coordinate-region-attlist">
+    <rng:ref name="common-draw-position-attlist"/>
+    <rng:ref name="common-draw-size-attlist"/>
+  </rng:define>
+	<!-- https://issues.oasis-open.org/browse/OFFICE-3928 -->
   <rng:define name="chart-data-label">
     <rng:element name="chart:data-label">
       <rng:ref name="chart-data-label-attlist"/>
@@ -751,8 +762,8 @@
           </rng:attribute>
           <rng:attribute name="style:legend-expansion-aspect-ratio">
             <rng:ref name="double"/>
-          <ref name="common-draw-size-attlist"/>
           </rng:attribute>
+          <rng:ref name="common-draw-size-attlist"/>
 	  <!-- https://issues.oasis-open.org/browse/OFFICE-3883 -->
         </rng:group>
         <rng:empty/>
@@ -782,8 +793,8 @@
       <rng:ref name="chart-plot-area-attlist"/>
       <rng:optional>
 	<!-- https://issues.oasis-open.org/browse/OFFICE-3928 -->
-            <rng:ref name="chart-coordinate-region"/>
-        </rng:optional>
+        <rng:ref name="chart-coordinate-region"/>
+      </rng:optional>
       <rng:zeroOrMore>
         <rng:ref name="dr3d-light"/>
       </rng:zeroOrMore>
@@ -841,16 +852,6 @@
       </rng:optional>
     </rng:interleave>
   </rng:define>
-  <rng:define name="chart-coordinate-region">
-    <rng:element name="chart:coordinate-region">
-        <rng:ref name="chart-coordinate-region-attlist"/>
-        <empty/>
-    </rng:element>
-  </rng:define>
-  <rng:define name="chart-coordinate-region-attlist" combine="interleave">
-    <rng:ref name="common-draw-position-attlist"/>
-    <rng:ref name="common-draw-size-attlist"/>
-  </rng:define>
   <rng:define name="chart-regression-curve">
     <rng:element name="chart:regression-curve">
       <rng:ref name="chart-regression-curve-attlist"/>
@@ -1525,8 +1526,9 @@
     </rng:optional>
     <rng:optional>
       <rng:attribute name="number:min-decimal-places">
-	<rng:ref name="integer"/>
+        <rng:ref name="integer"/>
       </rng:attribute>
+      <!-- OFFICE-3860 -->
     </rng:optional>
   </rng:define>
   <rng:define name="common-delay-for-repeat">
@@ -1700,6 +1702,14 @@
       </rng:attribute>
     </rng:optional>
   </rng:define>
+  <rng:define name="common-draw-mime-type-attlist">
+    <rng:optional>
+      <rng:attribute name="draw:mime-type">
+        <rng:ref name="string"/>
+      </rng:attribute>
+    </rng:optional>
+  </rng:define>
+  <!-- https://issues.oasis-open.org/browse/OFFICE-3943 -->
   <rng:define name="common-draw-name-attlist">
     <rng:optional>
       <rng:attribute name="draw:name">
@@ -4976,28 +4986,11 @@
   <rng:define name="draw-fill-image">
     <rng:element name="draw:fill-image">
       <rng:ref name="draw-fill-image-attlist"/>
-      <rng:attribute name="xlink:type">
-        <rng:value>simple</rng:value>
-      </rng:attribute>
-      <rng:attribute name="xlink:href">
-        <rng:ref name="anyIRI"/>
-      </rng:attribute>
-      <rng:optional>
-        <rng:attribute name="xlink:show">
-          <rng:value>embed</rng:value>
-        </rng:attribute>
-      </rng:optional>
-      <rng:optional>
-        <rng:attribute name="xlink:actuate">
-          <rng:value>onLoad</rng:value>
-        </rng:attribute>
-      </rng:optional>
-      <rng:empty/>
       <rng:choice>
         <rng:group>
           <rng:ref name="common-draw-data-attlist"/>
-	  <rng:empty/>
-	</rng:group>
+          <rng:empty/>
+        </rng:group>
         <rng:ref name="office-binary-data"/>
       </rng:choice>
       <!-- https://issues.oasis-open.org/browse/OFFICE-3933 -->
@@ -5328,19 +5321,12 @@
         </rng:attribute>
       </rng:optional>
       <rng:ref name="common-draw-mime-type-attlist"/>
+  <!-- https://issues.oasis-open.org/browse/OFFICE-3943 -->
       <rng:optional>
         <rng:ref name="xml-id"/>
       </rng:optional>
     </rng:interleave>
   </rng:define>
-  <rng:define name="common-draw-mime-type-attlist">
-       <rng:optional>
-            <rng:attribute name="draw:mime-type">
-                <rng:ref name="string"/>
-            </rng:attribute>
-        </rng:optional>    
-  </rng:define>
-  <!-- https://issues.oasis-open.org/browse/OFFICE-3943 -->
   <rng:define name="draw-image-map">
     <rng:element name="draw:image-map">
       <rng:zeroOrMore>
@@ -5693,7 +5679,7 @@
   </rng:define>
   <rng:define name="draw-plugin-attlist">
     <rng:interleave>
-     <rng:ref name="common-draw-mime-type-attlist"/>
+      <rng:ref name="common-draw-mime-type-attlist"/>
       <rng:optional>
         <rng:ref name="xml-id"/>
       </rng:optional>
@@ -7190,6 +7176,12 @@
       </rng:attribute>
     </rng:optional>
   </rng:define>
+  <rng:define name="number-fill-character">
+    <rng:element name="number:fill-character">
+      <rng:text/>
+    </rng:element>
+  </rng:define>
+  <!-- https://issues.oasis-open.org/browse/OFFICE-3765 -->
   <rng:define name="number-fraction">
     <rng:element name="number:fraction">
       <rng:ref name="number-fraction-attlist"/>
@@ -7374,8 +7366,9 @@
     </rng:optional>
     <rng:optional>
       <rng:attribute name="number:forced-exponent-sign">
-	<rng:ref name="boolean"/>
+        <rng:ref name="boolean"/>
       </rng:attribute>
+      <!-- OFFICE-3860 -->
     </rng:optional>
   </rng:define>
   <rng:define name="number-seconds">
@@ -7401,23 +7394,6 @@
       </rng:optional>
     </rng:interleave>
   </rng:define>
-  <rng:define name="number-text-with-fillchar">
-		<rng:optional>
-			<rng:ref name="number-text"/>
-		</rng:optional>
-		<rng:optional>
-			<rng:ref name="number-fill-character"/>
-			<rng:optional>
-				<rng:ref name="number-text"/>
-			</rng:optional>
-		</rng:optional>
-	</rng:define>
-	<rng:define name="number-fill-character">
-		<rng:element name="number:fill-character">
-			<rng:text/>
-		</rng:element>
-	</rng:define>
-  <!-- https://issues.oasis-open.org/browse/OFFICE-3765 -->
   <rng:define name="number-text">
     <rng:element name="number:text">
       <rng:text/>
@@ -7450,6 +7426,18 @@
       </rng:zeroOrMore>
     </rng:element>
   </rng:define>
+  <rng:define name="number-text-with-fillchar">
+    <rng:optional>
+      <rng:ref name="number-text"/>
+    </rng:optional>
+    <rng:optional>
+      <rng:ref name="number-fill-character"/>
+      <rng:optional>
+        <rng:ref name="number-text"/>
+      </rng:optional>
+    </rng:optional>
+  </rng:define>
+  <!-- https://issues.oasis-open.org/browse/OFFICE-3765 -->
   <rng:define name="number-time-style">
     <rng:element name="number:time-style">
       <rng:ref name="number-time-style-attlist"/>
@@ -7521,9 +7509,9 @@
         <rng:ref name="meta-date-string"/>
       </rng:optional>
       <rng:optional>
-	<rng:element name="meta:creator-initials">
-	  <rng:text/>
-	</rng:element>
+        <rng:element name="meta:creator-initials">
+          <rng:text/>
+        </rng:element>
       </rng:optional>
       <!-- https://issues.oasis-open.org/browse/OFFICE-3776 -->
       <rng:zeroOrMore>
@@ -8289,27 +8277,6 @@
   </rng:define>
   <rng:define name="paragraph-content">
     <rng:choice>
-      <rng:element name="text:drop-down">
-<rng:attribute name="text:name">
-<rng:ref name="string"/>
-</rng:attribute>
-<rng:zeroOrMore>
-<rng:element name="text:label">
-<rng:optional>
-<rng:attribute name="text:value">
-<rng:ref name="string"/>
-</rng:attribute>
-</rng:optional>
-<rng:optional>
-<rng:attribute name="text:current-selected">
-<rng:ref name="boolean"/>
-</rng:attribute>
-</rng:optional>
-</rng:element>
-</rng:zeroOrMore>
-<rng:text/>
-      </rng:element>
-      
       <rng:text/>
       <rng:element name="text:s">
         <rng:optional>
@@ -8582,6 +8549,27 @@
         <rng:ref name="common-field-description-attlist"/>
         <rng:text/>
       </rng:element>
+      <rng:element name="text:drop-down">
+        <rng:attribute name="text:name">
+          <rng:ref name="string"/>
+        </rng:attribute>
+        <rng:zeroOrMore>
+          <rng:element name="text:label">
+            <rng:optional>
+              <rng:attribute name="text:value">
+                <rng:ref name="string"/>
+              </rng:attribute>
+            </rng:optional>
+            <rng:optional>
+              <rng:attribute name="text:current-selected">
+                <rng:ref name="boolean"/>
+              </rng:attribute>
+            </rng:optional>
+          </rng:element>
+        </rng:zeroOrMore>
+        <rng:text/>
+      </rng:element>
+      <!-- OFFICE-3881 -->
       <rng:element name="text:initial-creator">
         <rng:ref name="common-field-fixed-attlist"/>
         <rng:text/>
@@ -10095,14 +10083,14 @@
             <rng:value>logarithmic</rng:value>
             <rng:value>exponential</rng:value>
             <rng:value>power</rng:value>
-	    <rng:value>polynomial</rng:value>
+            <rng:value>polynomial</rng:value>
           </rng:choice>
         </rng:attribute>
       </rng:optional>
-    <rng:optional>
-      <rng:attribute name="chart:regression-max-degree">
+      <rng:optional>
+        <rng:attribute name="chart:regression-max-degree">
           <rng:ref name="positiveInteger"/>
-        </rng:attribute>        
+        </rng:attribute>
       </rng:optional>
       <rng:optional>
         <rng:attribute name="chart:regression-force-intercept">
@@ -10154,9 +10142,9 @@
         </rng:attribute>
       </rng:optional>
       <rng:optional>
-    <rng:attribute name="chart:data-label-series">
-      <rng:ref name="boolean"/>
-    </rng:attribute>
+        <rng:attribute name="chart:data-label-series">
+          <rng:ref name="boolean"/>
+        </rng:attribute>
       </rng:optional>
       <!-- https://issues.oasis-open.org/browse/OFFICE-2117 -->
     </rng:interleave>
@@ -10703,31 +10691,25 @@
       </rng:optional>
     </rng:interleave>
   </rng:define>
-  <rng:define name="style-header-first">
-   <rng:element name="style:header-first">
-       <rng:ref name="common-style-header-footer-attlist"/>
-       <rng:ref name="header-footer-content"/>
-   </rng:element>
-</rng:define>
   <rng:define name="style-footer">
     <rng:element name="style:footer">
       <rng:ref name="common-style-header-footer-attlist"/>
       <rng:ref name="header-footer-content"/>
     </rng:element>
   </rng:define>
+  <rng:define name="style-footer-first">
+    <rng:element name="style:footer-first">
+      <rng:ref name="common-style-header-footer-attlist"/>
+      <rng:ref name="header-footer-content"/>
+       <!-- https://issues.oasis-open.org/browse/OFFICE-3789 -->
+    </rng:element>
+  </rng:define>
   <rng:define name="style-footer-left">
     <rng:element name="style:footer-left">
       <rng:ref name="common-style-header-footer-attlist"/>
       <rng:ref name="header-footer-content"/>
     </rng:element>
   </rng:define>
-  <rng:define name="style-footer-first">
-   <rng:element name="style:footer-first">
-       <rng:ref name="common-style-header-footer-attlist"/>
-       <rng:ref name="header-footer-content"/>
-       <!-- https://issues.oasis-open.org/browse/OFFICE-3789 -->
-   </rng:element>
-</rng:define>
   <rng:define name="style-footer-style">
     <rng:element name="style:footer-style">
       <rng:optional>
@@ -11810,6 +11792,13 @@
       <rng:ref name="header-footer-content"/>
     </rng:element>
   </rng:define>
+  <rng:define name="style-header-first">
+    <rng:element name="style:header-first">
+      <rng:ref name="common-style-header-footer-attlist"/>
+      <rng:ref name="header-footer-content"/>
+       <!-- https://issues.oasis-open.org/browse/OFFICE-3789 -->
+    </rng:element>
+  </rng:define>
   <rng:define name="style-header-footer-properties">
     <rng:element name="style:header-footer-properties">
       <rng:ref name="style-header-footer-properties-content-strict"/>
@@ -11982,18 +11971,20 @@
         <rng:optional>
           <rng:ref name="style-header-left"/>
         </rng:optional>
-	<rng:optional>
-	  <rng:ref name="style-header-first"/>
-	</rng:optional>
+        <rng:optional>
+          <rng:ref name="style-header-first"/>
+        </rng:optional>
+       <!-- https://issues.oasis-open.org/browse/OFFICE-3789 -->
       </rng:optional>
       <rng:optional>
         <rng:ref name="style-footer"/>
         <rng:optional>
           <rng:ref name="style-footer-left"/>
         </rng:optional>
-	<rng:optional>
-	  <rng:ref name="style-footer-first"/>
-	</rng:optional>
+        <rng:optional>
+          <rng:ref name="style-footer-first"/>
+        </rng:optional>
+       <!-- https://issues.oasis-open.org/browse/OFFICE-3789 -->
       </rng:optional>
       <rng:optional>
         <rng:ref name="draw-layer-set"/>
@@ -12162,41 +12153,31 @@
           </rng:choice>
         </rng:attribute>
       </rng:optional>
-      <rng:optional>
-        <rng:attribute name="style:scale-to">
-          <rng:ref name="percent"/>
-        </rng:attribute>
-      </rng:optional>
-      <rng:optional>
-        <rng:attribute name="style:scale-to-pages">
-          <rng:ref name="positiveInteger"/>
-        </rng:attribute>
-      </rng:optional>
       <rng:choice>
 	<!-- https://issues.oasis-open.org/browse/OFFICE-3857 -->
-<rng:optional>
-<rng:attribute name="style:scale-to">
-<rng:ref name="percent"/>
-</rng:attribute>
-</rng:optional>
-<rng:optional>
-<rng:attribute name="style:scale-to-pages">
-<rng:ref name="positiveInteger"/>
-</rng:attribute>
-</rng:optional>
-<rng:group>
-<rng:optional>
-<rng:attribute name="style:scale-to-X">
-<rng:ref name="positiveInteger"/>
-</rng:attribute>
-</rng:optional>
-<rng:optional>
-<rng:attribute name="style:scale-to-Y">
-<rng:ref name="positiveInteger"/>
-</rng:attribute>
-</rng:optional>
-</rng:group>
-</rng:choice>
+        <rng:optional>
+          <rng:attribute name="style:scale-to">
+            <rng:ref name="percent"/>
+          </rng:attribute>
+        </rng:optional>
+        <rng:optional>
+          <rng:attribute name="style:scale-to-pages">
+            <rng:ref name="positiveInteger"/>
+          </rng:attribute>
+        </rng:optional>
+        <rng:group>
+          <rng:optional>
+            <rng:attribute name="style:scale-to-X">
+              <rng:ref name="positiveInteger"/>
+            </rng:attribute>
+          </rng:optional>
+          <rng:optional>
+            <rng:attribute name="style:scale-to-Y">
+              <rng:ref name="positiveInteger"/>
+            </rng:attribute>
+          </rng:optional>
+        </rng:group>
+      </rng:choice>
       <rng:optional>
         <rng:attribute name="style:table-centering">
           <rng:choice>
@@ -12293,9 +12274,9 @@
   <rng:define name="style-paragraph-properties-attlist">
     <rng:interleave>
       <rng:optional>
-	<rng:attribute name="style:contextual-spacing">
-	  <rng:ref name="boolean"/>
-	</rng:attribute>
+        <rng:attribute name="style:contextual-spacing">
+          <rng:ref name="boolean"/>
+        </rng:attribute>
       </rng:optional>
       <!-- https://issues.oasis-open.org/browse/OFFICE-3767 -->
       <rng:optional>
@@ -13071,9 +13052,9 @@
         </rng:attribute>
       </rng:optional>
       <rng:optional>
-	<rng:attribute name="table:tab-color">
-	  <rng:ref name="color"/>
-	</rng:attribute>
+        <rng:attribute name="table:tab-color">
+          <rng:ref name="color"/>
+        </rng:attribute>
       </rng:optional>
       <!-- https://issues.oasis-open.org/browse/OFFICE-2173 -->
     </rng:interleave>
@@ -14290,62 +14271,70 @@
       <rng:ref name="string"/>
     </rng:attribute>
   </rng:define>
+  <rng:define name="table-data-pilot-groups">
+    <rng:element name="table:data-pilot-groups">
+      <rng:ref name="table-data-pilot-groups-attlist"/>
+      <rng:oneOrMore>
+        <rng:ref name="table-data-pilot-group"/>
+      </rng:oneOrMore>
+    </rng:element>
+  </rng:define>
   <rng:define name="table-data-pilot-groups-attlist">
-		<rng:interleave>
-			<rng:attribute name="table:source-field-name">
-				<rng:ref name="string"/>
-			</rng:attribute>
-			<rng:optional>
-				<rng:choice>
-					<rng:attribute name="table:date-start">
-						<rng:choice>
-							<rng:ref name="dateOrDateTime"/>
-							<rng:value>auto</rng:value>
-						</rng:choice>
-					</rng:attribute>
-					<rng:attribute name="table:start">
-						<rng:choice>
-							<rng:ref name="double"/>
-							<rng:value>auto</rng:value>
-						</rng:choice>
-					</rng:attribute>
-				</rng:choice>
-			</rng:optional>
-			<rng:optional>
-				<rng:choice>
-					<rng:attribute name="table:date-end">
-						<rng:choice>
-							<rng:ref name="dateOrDateTime"/>
-							<rng:value>auto</rng:value>
-						</rng:choice>
-					</rng:attribute>
-					<rng:attribute name="table:end">
-						<rng:choice>
-							<rng:ref name="double"/>
-							<rng:value>auto</rng:value>
-						</rng:choice>
-					</rng:attribute>
-				</rng:choice>
-			</rng:optional>
-			<rng:optional>
-				<rng:attribute name="table:step">
-					<rng:ref name="double"/>
-				</rng:attribute>
-			</rng:optional>
-			<rng:optional>
-				<rng:attribute name="table:grouped-by">
-					<rng:choice>
-						<rng:value>seconds</rng:value>
-						<rng:value>minutes</rng:value>
-						<rng:value>hours</rng:value>
-						<rng:value>days</rng:value>
-						<rng:value>months</rng:value>
-						<rng:value>quarters</rng:value>
-						<rng:value>years</rng:value>
-					</rng:choice>
-				</rng:attribute>
-			</rng:optional>
-		</rng:interleave>
+    <rng:interleave>
+      <rng:attribute name="table:source-field-name">
+        <rng:ref name="string"/>
+      </rng:attribute>
+      <rng:optional>
+        <rng:choice>
+          <rng:attribute name="table:date-start">
+            <rng:choice>
+              <rng:ref name="dateOrDateTime"/>
+              <rng:value>auto</rng:value>
+            </rng:choice>
+          </rng:attribute>
+          <rng:attribute name="table:start">
+            <rng:choice>
+              <rng:ref name="double"/>
+              <rng:value>auto</rng:value>
+            </rng:choice>
+          </rng:attribute>
+        </rng:choice>
+      </rng:optional>
+      <rng:optional>
+        <rng:choice>
+          <rng:attribute name="table:date-end">
+            <rng:choice>
+              <rng:ref name="dateOrDateTime"/>
+              <rng:value>auto</rng:value>
+            </rng:choice>
+          </rng:attribute>
+          <rng:attribute name="table:end">
+            <rng:choice>
+              <rng:ref name="double"/>
+              <rng:value>auto</rng:value>
+            </rng:choice>
+          </rng:attribute>
+        </rng:choice>
+      </rng:optional>
+      <rng:optional>
+        <rng:attribute name="table:step">
+          <rng:ref name="double"/>
+        </rng:attribute>
+      </rng:optional>
+      <rng:optional>
+        <rng:attribute name="table:grouped-by">
+          <rng:choice>
+            <rng:value>seconds</rng:value>
+            <rng:value>minutes</rng:value>
+            <rng:value>hours</rng:value>
+            <rng:value>days</rng:value>
+            <rng:value>months</rng:value>
+            <rng:value>quarters</rng:value>
+            <rng:value>years</rng:value>
+          </rng:choice>
+        </rng:attribute>
+      </rng:optional>
+    </rng:interleave>
   </rng:define>
   <!-- https://issues.oasis-open.org/browse/OFFICE-2118 -->
   <rng:define name="table-data-pilot-layout-info">
@@ -15569,23 +15558,24 @@
     </rng:element>
   </rng:define>
   <rng:define name="table-source-cell-range-attlist">
-   <rng:interleave>
-	             <rng:choice>
-		        <rng:attribute name="table:cell-range-address">
-		        	<rng:ref name="cellRangeAddress"/>
-		        </rng:attribute>
-			<rng:group>
-			  <rng:attribute name="table:name">
-			    <rng:ref name="string"/>
-			  </rng:attribute>
-			  <rng:optional>
-			    <rng:attribute name="table:cell-range-address">
-			      <rng:ref name="cellRangeAddress"/>
-			    </rng:attribute>
-			  </rng:optional>
-			</rng:group>
-		    </rng:choice>
-		</rng:interleave>
+  <!-- OFFICE-3665 -->
+    <rng:interleave>
+      <rng:choice>
+        <rng:attribute name="table:cell-range-address">
+          <rng:ref name="cellRangeAddress"/>
+        </rng:attribute>
+        <rng:group>
+          <rng:attribute name="table:name">
+            <rng:ref name="string"/>
+          </rng:attribute>
+          <rng:optional>
+            <rng:attribute name="table:cell-range-address">
+              <rng:ref name="cellRangeAddress"/>
+            </rng:attribute>
+          </rng:optional>
+        </rng:group>
+      </rng:choice>
+    </rng:interleave>
   </rng:define>
   <rng:define name="table-source-range-address">
     <rng:element name="table:source-range-address">
@@ -16883,8 +16873,8 @@
         <rng:ref name="text-index-entry-text"/>
         <rng:ref name="text-index-entry-span"/>
         <rng:ref name="text-index-entry-tab-stop"/>
-	<rng:ref name="text-index-entry-link-start"/>
-	<rng:ref name="text-index-entry-link-end"/>
+        <rng:ref name="text-index-entry-link-start"/>
+        <rng:ref name="text-index-entry-link-end"/>
 	<!-- https://issues.oasis-open.org/browse/OFFICE-3941 -->
       </rng:choice>
     </rng:zeroOrMore>
@@ -18126,8 +18116,8 @@
           <rng:ref name="text-index-entry-text"/>
           <rng:ref name="text-index-entry-span"/>
           <rng:ref name="text-index-entry-tab-stop"/>
-	  <rng:ref name="text-index-entry-link-start"/>
-	  <rng:ref name="text-index-entry-link-end"/>
+          <rng:ref name="text-index-entry-link-start"/>
+          <rng:ref name="text-index-entry-link-end"/>
 	  <!-- https://issues.oasis-open.org/browse/OFFICE-3941 -->
         </rng:choice>
       </rng:zeroOrMore>