diff options
| author | Vincent Hennebert <vhennebert@apache.org> | 2009-11-09 16:34:47 +0000 |
|---|---|---|
| committer | Vincent Hennebert <vhennebert@apache.org> | 2009-11-09 16:34:47 +0000 |
| commit | 1bc82acecdfd8d7f59641ec40e969c47cc740bd6 (patch) | |
| tree | b565303418eb7559107e514674dca0119ed08ddd /src/documentation/intermediate-format-ng | |
| parent | 560e3f81532f0084b5e69525f4b3f95033bbc073 (diff) | |
| download | xmlgraphics-fop-1bc82acecdfd8d7f59641ec40e969c47cc740bd6.tar.gz xmlgraphics-fop-1bc82acecdfd8d7f59641ec40e969c47cc740bd6.zip | |
Moved declaration of xml:space attribute from <text> to <page-sequence> in the XML Schema, to reflect changes from rev. 834020.
Moved validation of intermediate XML to testParserToIntermediateFormat method, so that any validation error is returned by Junit instead of being swallowed.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@834135 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 | 3 | ||||
| -rw-r--r-- | src/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd | 3 |
2 files changed, 3 insertions, 3 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 c0bdd281b..4e0b7d115 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 @@ -20,8 +20,6 @@ targetNamespace="http://xmlgraphics.apache.org/fop/intermediate" xmlns:mf="http://xmlgraphics.apache.org/fop/intermediate"> <xs:include schemaLocation="fop-intermediate-format-ng-datatypes.xsd"/> - <xs:import namespace="http://www.w3.org/XML/1998/namespace" - schemaLocation="http://www.w3.org/2001/xml.xsd"/> <xs:complexType name="contentType"> <xs:choice maxOccurs="unbounded" minOccurs="0"> <xs:element name="viewport"> @@ -68,7 +66,6 @@ <xs:list itemType="mf:lengthType"/> </xs:simpleType> </xs:attribute> - <xs:attribute ref="xml:space"/> </xs:extension> </xs:simpleContent> </xs:complexType> diff --git a/src/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd b/src/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd index 93aacb62d..9de37a81a 100644 --- a/src/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd +++ b/src/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd @@ -20,6 +20,8 @@ targetNamespace="http://xmlgraphics.apache.org/fop/intermediate" xmlns:mf="http://xmlgraphics.apache.org/fop/intermediate" xmlns:nav="http://xmlgraphics.apache.org/fop/intermediate/document-navigation"> + <xs:import namespace="http://www.w3.org/XML/1998/namespace" + schemaLocation="http://www.w3.org/2001/xml.xsd"/> <xs:import namespace="http://xmlgraphics.apache.org/fop/intermediate/document-navigation" schemaLocation="fop-intermediate-format-ng-nav.xsd"/> <xs:import namespace="adobe:ns:meta/" schemaLocation="xmp-metadata.xsd"/> @@ -61,6 +63,7 @@ <xs:element ref="mf:page" minOccurs="1" maxOccurs="unbounded"/> </xs:sequence> <xs:attribute name="id" type="xs:ID"/> + <xs:attribute ref="xml:space"/> <xs:attributeGroup ref="mf:foreignAtts"/> </xs:complexType> </xs:element> |