You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by il...@apache.org on 2002/10/20 04:11:04 UTC
cvs commit: xml-xalan/java/src/org/apache/xalan/serialize Encodings.properties Encodings.java
ilene 2002/10/19 19:11:04
Modified: java/src/org/apache/xalan/serialize Encodings.properties
Encodings.java
Log:
Committing Gordon Chiu's (grchiu@ca.ibm.com) patch for bugzilla #13754.
Revision Changes Path
1.2 +89 -89 xml-xalan/java/src/org/apache/xalan/serialize/Encodings.properties
Index: Encodings.properties
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/serialize/Encodings.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Encodings.properties 9 May 2002 22:16:42 -0000 1.1
+++ Encodings.properties 20 Oct 2002 02:11:04 -0000 1.2
@@ -1,89 +1,89 @@
-# <PREFERRED name MIME>, <JAVA name encoding>
-# Peter Smolik
-WINDOWS-1250 Cp1250 0x00FF
-# Patch attributed to havardw@underdusken.no (H�vard Wigtil)
-WINDOWS-1251 Cp1251 0x00FF
-WINDOWS-1252 Cp1252 0x00FF
-US-ASCII ISO8859_1 0x007F
-ISO-8859-1 ISO8859_1 0x00FF
-# Patch attributed to havardw@underdusken.no (H�vard Wigtil)
-ISO-8859-1 ISO8859-1 0x00FF
-ISO-8859-2 ISO8859_2 0x00FF
-# I'm going to apply "ISO8859-X" variant to all these, to be safe.
-ISO-8859-2 ISO8859-2 0x00FF
-ISO-8859-3 ISO8859_3 0x00FF
-ISO-8859-3 ISO8859-3 0x00FF
-ISO-8859-4 ISO8859_4 0x00FF
-ISO-8859-4 ISO8859-4 0x00FF
-ISO-8859-5 ISO8859_5 0x00FF
-ISO-8859-5 ISO8859-5 0x00FF
-ISO-8859-6 ISO8859_6 0x00FF
-ISO-8859-6 ISO8859-6 0x00FF
-ISO-8859-7 ISO8859_7 0x00FF
-ISO-8859-7 ISO8859-7 0x00FF
-ISO-8859-8 ISO8859_8 0x00FF
-ISO-8859-8 ISO8859-8 0x00FF
-ISO-8859-9 ISO8859_9 0x00FF
-ISO-8859-9 ISO8859-9 0x00FF
-# # ?
-US-ASCII 8859_1 0x00FF
-ISO-8859-1 8859_1 0x00FF
-ISO-8859-2 8859_2 0x00FF
-ISO-8859-3 8859_3 0x00FF
-ISO-8859-4 8859_4 0x00FF
-ISO-8859-5 8859_5 0x00FF
-ISO-8859-6 8859_6 0x00FF
-ISO-8859-7 8859_7 0x00FF
-ISO-8859-8 8859_8 0x00FF
-ISO-8859-9 8859_9 0x00FF
-ISO-8859-1 8859-1 0x00FF
-ISO-8859-2 8859-2 0x00FF
-ISO-8859-3 8859-3 0x00FF
-ISO-8859-4 8859-4 0x00FF
-ISO-8859-5 8859-5 0x00FF
-ISO-8859-6 8859-6 0x00FF
-ISO-8859-7 8859-7 0x00FF
-ISO-8859-8 8859-8 0x00FF
-ISO-8859-9 8859-9 0x00FF
-ISO-2022-JP JIS 0xFFFF
-ISO-2022-KR ISO2022KR 0xFFFF
-SHIFT_JIS SJIS 0xFFFF
-EUC-JP EUC_JP 0xFFFF
-EUC-KR EUC_KR 0xFFFF
-EUC-CN EUC_CN 0xFFFF
-EUC-TW EUC_TW 0xFFFF
-GB2312 EUC_CN 0xFFFF
-EUC-JP EUC-JP 0xFFFF
-EUC-KR EUC-KR 0xFFFF
-EUC-CN EUC-CN 0xFFFF
-EUC-TW EUC-TW 0xFFFF
-GB2312 EUC-CN 0xFFFF
-GB2312 GB2312 0xFFFF
-BIG5 Big5 0xFFFF
-EUC-JP EUCJIS 0xFFFF
-EUC-KR KSC5601 0xFFFF
-KOI8-R KOI8_R 0xFFFF
-EBCDIC-CP-US Cp037 0x00FF
-EBCDIC-CP-CA Cp037 0x00FF
-EBCDIC-CP-NL Cp037 0x00FF
-EBCDIC-CP-DK Cp277 0x00FF
-EBCDIC-CP-NO Cp277 0x00FF
-EBCDIC-CP-FI Cp278 0x00FF
-EBCDIC-CP-SE Cp278 0x00FF
-EBCDIC-CP-IT Cp280 0x00FF
-EBCDIC-CP-ES Cp284 0x00FF
-EBCDIC-CP-GB Cp285 0x00FF
-EBCDIC-CP-FR Cp297 0x00FF
-EBCDIC-CP-AR1 Cp420 0x00FF
-EBCDIC-CP-HE Cp424 0x00FF
-EBCDIC-CP-CH Cp500 0x00FF
-EBCDIC-CP-ROECE Cp870 0x00FF
-EBCDIC-CP-YU Cp870 0x00FF
-EBCDIC-CP-IS Cp871 0x00FF
-EBCDIC-CP-AR2 Cp918 0x00FF
-MacRoman MacTEC 0x00FF
-ASCII ASCII 0x007F
-ISO-Latin-1 ASCII 0x00FF
-UNICODE Unicode 0xFFFF
-UTF-8 UTF8 0xFFFF
-UTF-16 Unicode 0xFFFF
\ No newline at end of file
+# <JAVA name encoding>, <PREFERRED name MIME>
+# Peter Smolik
+Cp1250 WINDOWS-1250 0x00FF
+# Patch attributed to havardw@underdusken.no (H�vard Wigtil)
+Cp1251 WINDOWS-1251 0x00FF
+Cp1252 WINDOWS-1252 0x00FF
+ISO8859_1 US-ASCII 0x007F
+ISO8859_1 ISO-8859-1 0x00FF
+# Patch attributed to havardw@underdusken.no (H�vard Wigtil)
+ISO8859-1 ISO-8859-1 0x00FF
+ISO8859_2 ISO-8859-2 0x00FF
+# I'm going to apply "ISO8859-X" variant to all these, to be safe.
+ISO8859-2 ISO-8859-2 0x00FF
+ISO8859_3 ISO-8859-3 0x00FF
+ISO8859-3 ISO-8859-3 0x00FF
+ISO8859_4 ISO-8859-4 0x00FF
+ISO8859-4 ISO-8859-4 0x00FF
+ISO8859_5 ISO-8859-5 0x00FF
+ISO8859-5 ISO-8859-5 0x00FF
+ISO8859_6 ISO-8859-6 0x00FF
+ISO8859-6 ISO-8859-6 0x00FF
+ISO8859_7 ISO-8859-7 0x00FF
+ISO8859-7 ISO-8859-7 0x00FF
+ISO8859_8 ISO-8859-8 0x00FF
+ISO8859-8 ISO-8859-8 0x00FF
+ISO8859_9 ISO-8859-9 0x00FF
+ISO8859-9 ISO-8859-9 0x00FF
+# # ?
+8859_1 US-ASCII 0x00FF
+8859_1 ISO-8859-1 0x00FF
+8859_2 ISO-8859-2 0x00FF
+8859_3 ISO-8859-3 0x00FF
+8859_4 ISO-8859-4 0x00FF
+8859_5 ISO-8859-5 0x00FF
+8859_6 ISO-8859-6 0x00FF
+8859_7 ISO-8859-7 0x00FF
+8859_8 ISO-8859-8 0x00FF
+8859_9 ISO-8859-9 0x00FF
+8859-1 ISO-8859-1 0x00FF
+8859-2 ISO-8859-2 0x00FF
+8859-3 ISO-8859-3 0x00FF
+8859-4 ISO-8859-4 0x00FF
+8859-5 ISO-8859-5 0x00FF
+8859-6 ISO-8859-6 0x00FF
+8859-7 ISO-8859-7 0x00FF
+8859-8 ISO-8859-8 0x00FF
+8859-9 ISO-8859-9 0x00FF
+JIS ISO-2022-JP 0xFFFF
+ISO2022KR ISO-2022-KR 0xFFFF
+SJIS SHIFT_JIS 0xFFFF
+EUC_JP EUC-JP 0xFFFF
+EUC_KR EUC-KR 0xFFFF
+EUC_CN EUC-CN 0xFFFF
+EUC_TW EUC-TW 0xFFFF
+EUC_CN GB2312 0xFFFF
+EUC-JP EUC-JP 0xFFFF
+EUC-KR EUC-KR 0xFFFF
+EUC-CN EUC-CN 0xFFFF
+EUC-TW EUC-TW 0xFFFF
+EUC-CN GB2312 0xFFFF
+GB2312 GB2312 0xFFFF
+Big5 BIG5 0xFFFF
+EUCJIS EUC-JP 0xFFFF
+KSC5601 EUC-KR 0xFFFF
+KOI8_R KOI8-R 0xFFFF
+Cp037 EBCDIC-CP-US 0x00FF
+Cp037 EBCDIC-CP-CA 0x00FF
+Cp037 EBCDIC-CP-NL 0x00FF
+Cp277 EBCDIC-CP-DK 0x00FF
+Cp277 EBCDIC-CP-NO 0x00FF
+Cp278 EBCDIC-CP-FI 0x00FF
+Cp278 EBCDIC-CP-SE 0x00FF
+Cp280 EBCDIC-CP-IT 0x00FF
+Cp284 EBCDIC-CP-ES 0x00FF
+Cp285 EBCDIC-CP-GB 0x00FF
+Cp297 EBCDIC-CP-FR 0x00FF
+Cp420 EBCDIC-CP-AR1 0x00FF
+Cp424 EBCDIC-CP-HE 0x00FF
+Cp500 EBCDIC-CP-CH 0x00FF
+Cp870 EBCDIC-CP-ROECE 0x00FF
+Cp870 EBCDIC-CP-YU 0x00FF
+Cp871 EBCDIC-CP-IS 0x00FF
+Cp918 EBCDIC-CP-AR2 0x00FF
+MacTEC MacRoman 0x00FF
+ASCII ASCII 0x007F
+ASCII ISO-Latin-1 0x00FF
+Unicode UNICODE 0xFFFF
+UTF8 UTF-8 0xFFFF
+Unicode UTF-16 0xFFFF
\ No newline at end of file
1.12 +6 -6 xml-xalan/java/src/org/apache/xalan/serialize/Encodings.java
Index: Encodings.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/serialize/Encodings.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Encodings.java 25 Jul 2002 16:11:22 -0000 1.11
+++ Encodings.java 20 Oct 2002 02:11:04 -0000 1.12
@@ -385,22 +385,22 @@
EncodingInfo[] ret = new EncodingInfo[totalEntries];
Enumeration keys = props.keys();
for (int i = 0; i < totalEntries; ++i) {
- String mimeName = (String) keys.nextElement();
- String val = props.getProperty(mimeName);
+ String javaName = (String) keys.nextElement();
+ String val = props.getProperty(javaName);
int pos = val.indexOf(' ');
- String javaName;
+ String mimeName;
int lastPrintable;
if (pos < 0)
{
// Maybe report/log this problem?
// "Last printable character not defined for encoding " +
// mimeName + " (" + val + ")" ...
- javaName = val;
+ mimeName = val;
lastPrintable = 0x00FF;
}
else
{
- javaName = val.substring(0, pos);
+ mimeName = val.substring(0, pos);
lastPrintable =
Integer.decode(val.substring(pos).trim()).intValue();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org