neilg 2002/11/27 12:12:13
Modified: java/src/org/apache/xerces/util EncodingMap.java
XMLChar.java
Log:
fix for bug 14882
Revision Changes Path
1.14 +6 -1 xml-xerces/java/src/org/apache/xerces/util/EncodingMap.java
Index: EncodingMap.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/util/EncodingMap.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- EncodingMap.java 7 Nov 2002 15:52:12 -0000 1.13
+++ EncodingMap.java 27 Nov 2002 20:12:13 -0000 1.14
@@ -718,6 +718,10 @@
fIANA2JavaMap.put("ISO-IR-159", "JIS0212");
fIANA2JavaMap.put("CSISO159JISX02121990", "JIS0212");
fIANA2JavaMap.put("GB18030", "GB18030");
+ fIANA2JavaMap.put("GBK", "GBK");
+ fIANA2JavaMap.put("CP936", "GBK");
+ fIANA2JavaMap.put("MS936", "GBK");
+ fIANA2JavaMap.put("WINDOWS-936", "GBK");
fIANA2JavaMap.put("SHIFT_JIS", "SJIS");
fIANA2JavaMap.put("CSSHIFTJIS", "SJIS");
fIANA2JavaMap.put("MS_KANJI", "SJIS");
@@ -946,6 +950,7 @@
fJava2IANAMap.put("KOI8_R", "KOI8-R");
fJava2IANAMap.put("KSC5601", "EUC-KR");
fJava2IANAMap.put("GB18030", "GB18030");
+ fJava2IANAMap.put("GBK", "GBK");
fJava2IANAMap.put("SJIS", "SHIFT_JIS");
fJava2IANAMap.put("MS932", "WINDOWS-31J");
fJava2IANAMap.put("UTF8", "UTF-8");
1.10 +2 -12 xml-xerces/java/src/org/apache/xerces/util/XMLChar.java
Index: XMLChar.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/util/XMLChar.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XMLChar.java 31 Jul 2002 14:08:12 -0000 1.9
+++ XMLChar.java 27 Nov 2002 20:12:13 -0000 1.10
@@ -489,17 +489,6 @@
} // isSpace(int):boolean
/**
- * Returns true if the specified character is a space character
- * as amdended in the XML 1.1 specification.
- *
- * @param c The character to check.
- */
- public static boolean isXML11Space(int c) {
- return (c < 0x10000 && (CHARS[c] & MASK_SPACE) != 0) ||
- c == 0x85 || c == 0x2028;
- } // isXML11Space(int):boolean
-
- /**
* Returns true if the specified character is a valid name start
* character as defined by production [5] in the XML 1.0
* specification.
@@ -688,5 +677,6 @@
}
return false;
} // isValidIANAEncoding(String):boolean
+
} // class XMLChar
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
