update IF schema to reflect new @{dx,dp} usage on text element

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1293963 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-content.xsd b/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-content.xsd
index 695d724fe42aa3613bcd61ea0b50dfcf30cbacbe..16fd0aa1fb592b246d17e4fb8dd2f318dedab2d7 100644 (file)
--- a/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-content.xsd
+++ b/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-content.xsd
@@ -66,11 +66,8 @@
               <xs:attribute name="y" use="required" type="mf:lengthType"/>
               <xs:attribute name="letter-spacing" type="mf:lengthType"/>
               <xs:attribute name="word-spacing" type="mf:lengthType"/>
-              <xs:attribute name="dx">
-                <xs:simpleType>
-                  <xs:list itemType="mf:lengthType"/>
-                </xs:simpleType>
-              </xs:attribute>
+              <xs:attribute name="dx" type="mf:lengthListType"/>
+              <xs:attribute name="dp" type="mf:dpListType"/>
             </xs:extension>
           </xs:simpleContent>
         </xs:complexType>

diff --git a/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-datatypes.xsd b/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-datatypes.xsd
index 29443ea9981f2cf6fe77e04b2e5c6845d8fdb112..e25556f9b527c193c43a5eb47cb05b6fcb70799e 100644 (file)
--- a/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-datatypes.xsd
+++ b/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-datatypes.xsd
@@ -103,4 +103,22 @@
       <xs:length value="4"/>
     </xs:restriction>
   </xs:simpleType>
+  <xs:simpleType name="dpListType">
+    <xs:list itemType="mf:dpItemType"/>
+  </xs:simpleType>
+  <xs:simpleType name="dpItemType">
+    <xs:union>
+      <xs:simpleType>
+        <xs:restriction base="mf:lengthType"/>
+      </xs:simpleType>
+      <xs:simpleType>
+        <xs:restriction base="mf:dpZeroesType"/>
+      </xs:simpleType>
+    </xs:union>
+  </xs:simpleType>
+  <xs:simpleType name="dpZeroesType">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="Z(\d)+"/>
+    </xs:restriction>
+  </xs:simpleType>
 </xs:schema>