diff options
| author | Glenn Adams <gadams@apache.org> | 2012-02-26 23:22:16 +0000 |
|---|---|---|
| committer | Glenn Adams <gadams@apache.org> | 2012-02-26 23:22:16 +0000 |
| commit | 5501667c970065533d12598605fcf458f306825c (patch) | |
| tree | 3071c285d7c3d178751575ccadcce8eee3cd9b45 /src/documentation/intermediate-format-ng | |
| parent | d6d8e57b17eb2e36631115517afa003ad3afa1a1 (diff) | |
| download | xmlgraphics-fop-5501667c970065533d12598605fcf458f306825c.tar.gz xmlgraphics-fop-5501667c970065533d12598605fcf458f306825c.zip | |
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
Diffstat (limited to 'src/documentation/intermediate-format-ng')
| -rw-r--r-- | src/documentation/intermediate-format-ng/fop-intermediate-format-ng-content.xsd | 7 | ||||
| -rw-r--r-- | src/documentation/intermediate-format-ng/fop-intermediate-format-ng-datatypes.xsd | 18 |
2 files changed, 20 insertions, 5 deletions
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 695d724fe..16fd0aa1f 100644 --- 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 29443ea99..e25556f9b 100644 --- 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> |