neilg 2002/12/09 10:51:29
Modified: java/src/org/apache/xerces/impl XMLScanner.java
XML11DocumentScannerImpl.java
XML11DTDScannerImpl.java
Log:
handle the version pseudoattribute correctly in both XML 1.0 and 1.1 contexts
Revision Changes Path
1.24 +6 -3 xml-xerces/java/src/org/apache/xerces/impl/XMLScanner.java
Index: XMLScanner.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XMLScanner.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- XMLScanner.java 7 Dec 2002 00:15:59 -0000 1.23
+++ XMLScanner.java 9 Dec 2002 18:51:29 -0000 1.24
@@ -388,8 +388,7 @@
}
version = fString.toString();
state = STATE_ENCODING;
- if (!(version.equals("1.0") ||
- version.equals("1.1" ))) {
+ if (!versionSupported(version)) {
reportFatalError("VersionNotSupported",
new Object[]{version});
}
@@ -1242,6 +1241,10 @@
protected boolean isValidNameStartChar(int value) {
return (XMLChar.isNameStart(value));
} // isValidNameStartChar(int): boolean
+
+ protected boolean versionSupported(String version ) {
+ return version.equals("1.0");
+ } // version Supported
/**
* Scans surrogates and append them to the specified buffer.
1.4 +5 -1
xml-xerces/java/src/org/apache/xerces/impl/XML11DocumentScannerImpl.java
Index: XML11DocumentScannerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XML11DocumentScannerImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XML11DocumentScannerImpl.java 7 Dec 2002 00:15:58 -0000 1.3
+++ XML11DocumentScannerImpl.java 9 Dec 2002 18:51:29 -0000 1.4
@@ -707,4 +707,8 @@
return (XML11Char.isXML11NameStart(value));
} // isValidNameStartChar(int): boolean
+ protected boolean versionSupported(String version) {
+ return version.equals("1.1");
+ } // versionSupported(String): boolean
+
} // class XML11DocumentScannerImpl
1.4 +8 -1
xml-xerces/java/src/org/apache/xerces/impl/XML11DTDScannerImpl.java
Index: XML11DTDScannerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XML11DTDScannerImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XML11DTDScannerImpl.java 7 Dec 2002 00:15:58 -0000 1.3
+++ XML11DTDScannerImpl.java 9 Dec 2002 18:51:29 -0000 1.4
@@ -254,4 +254,11 @@
return (XML11Char.isXML11NameStart(value));
} // isValidNameStartChar(int): boolean
+ // note that, according to 4.3.4 of the XML 1.1 spec, XML 1.1
+ // documents may invoke 1.0 entities; thus either version decl (or none!)
+ // is allowed to appear in this context
+ protected boolean versionSupported(String version) {
+ return version.equals("1.1") || version.equals ("1.0");
+ } // versionSupported(String): boolean
+
} // class XML11DTDScannerImpl
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
