sboag 01/03/11 15:55:40 Modified: java/src/org/apache/xalan/serialize Encodings.java Log: Applied patch submitted by [EMAIL PROTECTED] (H�vard Wigtil). Also added "XXX-X" variants for all "XXX_X" java encoding names. I'm not totally confident that this is the right thing to do, but I can't see that it will hurt, except to make the table a bit larger. I would prefer to be safe and make sure we handle the encoding. See my comments in http://nagoya.apache.org/bugzilla/show_bug.cgi?id=718. Revision Changes Path 1.7 +29 -1 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.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Encodings.java 2001/01/29 12:44:51 1.6 +++ Encodings.java 2001/03/11 23:55:39 1.7 @@ -67,7 +67,7 @@ * to override encoding names and provide the last printable character * for each encoding. * - * @version $Revision: 1.6 $ $Date: 2001/01/29 12:44:51 $ + * @version $Revision: 1.7 $ $Date: 2001/03/11 23:55:39 $ * @author <a href="mailto:[EMAIL PROTECTED]">Assaf Arkin</a> */ public class Encodings extends Object @@ -273,17 +273,30 @@ // <preferred MIME name>, <Java encoding name> // new EncodingInfo( "ISO 8859-1", "CP1252"); // Close enough, I guess new EncodingInfo("WINDOWS-1250", "Cp1250", 0x00FF), // Peter Smolik + // Patch attributed to [EMAIL PROTECTED] (H�vard Wigtil) + new EncodingInfo("WINDOWS-1252", "Cp1252", 0x00FF), new EncodingInfo("UTF-8", "UTF8", 0xFFFF), new EncodingInfo("US-ASCII", "ISO8859_1", 0x7F), new EncodingInfo("ISO-8859-1", "ISO8859_1", 0x00FF), + // Patch attributed to [EMAIL PROTECTED] (H�vard Wigtil) + new EncodingInfo("ISO-8859-1", "ISO8859-1", 0x00FF), new EncodingInfo("ISO-8859-2", "ISO8859_2", 0x00FF), + // I'm going to apply "ISO8859-X" variant to all these, to be safe. + new EncodingInfo("ISO-8859-2", "ISO8859-2", 0x00FF), new EncodingInfo("ISO-8859-3", "ISO8859_3", 0x00FF), + new EncodingInfo("ISO-8859-3", "ISO8859-3", 0x00FF), new EncodingInfo("ISO-8859-4", "ISO8859_4", 0x00FF), + new EncodingInfo("ISO-8859-4", "ISO8859-4", 0x00FF), new EncodingInfo("ISO-8859-5", "ISO8859_5", 0x00FF), + new EncodingInfo("ISO-8859-5", "ISO8859-5", 0x00FF), new EncodingInfo("ISO-8859-6", "ISO8859_6", 0x00FF), + new EncodingInfo("ISO-8859-6", "ISO8859-6", 0x00FF), new EncodingInfo("ISO-8859-7", "ISO8859_7", 0x00FF), + new EncodingInfo("ISO-8859-7", "ISO8859-7", 0x00FF), new EncodingInfo("ISO-8859-8", "ISO8859_8", 0x00FF), + new EncodingInfo("ISO-8859-8", "ISO8859-8", 0x00FF), new EncodingInfo("ISO-8859-9", "ISO8859_9", 0x00FF), + new EncodingInfo("ISO-8859-9", "ISO8859-9", 0x00FF), new EncodingInfo("US-ASCII", "8859_1", 0x00FF), // ? new EncodingInfo("ISO-8859-1", "8859_1", 0x00FF), new EncodingInfo("ISO-8859-2", "8859_2", 0x00FF), @@ -294,6 +307,15 @@ new EncodingInfo("ISO-8859-7", "8859_7", 0x00FF), new EncodingInfo("ISO-8859-8", "8859_8", 0x00FF), new EncodingInfo("ISO-8859-9", "8859_9", 0x00FF), + new EncodingInfo("ISO-8859-1", "8859-1", 0x00FF), + new EncodingInfo("ISO-8859-2", "8859-2", 0x00FF), + new EncodingInfo("ISO-8859-3", "8859-3", 0x00FF), + new EncodingInfo("ISO-8859-4", "8859-4", 0x00FF), + new EncodingInfo("ISO-8859-5", "8859-5", 0x00FF), + new EncodingInfo("ISO-8859-6", "8859-6", 0x00FF), + new EncodingInfo("ISO-8859-7", "8859-7", 0x00FF), + new EncodingInfo("ISO-8859-8", "8859-8", 0x00FF), + new EncodingInfo("ISO-8859-9", "8859-9", 0x00FF), new EncodingInfo("ISO-2022-JP", "JIS", 0xFFFF), new EncodingInfo("SHIFT_JIS", "SJIS", 0xFFFF), new EncodingInfo("EUC-JP", "EUC_JP", 0xFFFF), @@ -301,6 +323,11 @@ new EncodingInfo("EUC-CN", "EUC_CN", 0xFFFF), new EncodingInfo("EUC-TW", "EUC_TW", 0xFFFF), new EncodingInfo("GB2312", "EUC_CN", 0xFFFF), + new EncodingInfo("EUC-JP", "EUC-JP", 0xFFFF), + new EncodingInfo("EUC-KR", "EUC-KR", 0xFFFF), + new EncodingInfo("EUC-CN", "EUC-CN", 0xFFFF), + new EncodingInfo("EUC-TW", "EUC-TW", 0xFFFF), + new EncodingInfo("GB2312", "EUC-CN", 0xFFFF), new EncodingInfo("GB2312", "GB2312", 0xFFFF), new EncodingInfo("BIG5", "Big5", 0xFFFF), new EncodingInfo("EUC-JP", "EUCJIS", 0xFFFF), @@ -325,6 +352,7 @@ new EncodingInfo("EBCDIC-CP-YU", "Cp870", 0x00FF), new EncodingInfo("EBCDIC-CP-IS", "Cp871", 0x00FF), new EncodingInfo("EBCDIC-CP-AR2", "Cp918", 0x00FF), + new EncodingInfo("MacRoman", "MacTEC", 0xFF), new EncodingInfo("ASCII", "ASCII", 0x7F), new EncodingInfo("ISO-Latin-1", "ASCII", 0xFF), new EncodingInfo("UTF-8", "UTF8", 0xFFFF),
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
