From 0f9bb15622b649db81974057f66669674ea47923 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexander=20K=C3=B6plinger?= Date: Thu, 4 Jan 2018 16:29:43 +0100 Subject: [PATCH] [I18N] Add CP737 (Greek) and CP775 (Baltic) (#6361) * [I18N] Add CP737 (Greek) and CP775 (Baltic) Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=45901 * Bump API snapshot submodule --- external/api-snapshot | 2 +- mcs/class/I18N/Common/Handlers.cs | 4 + mcs/class/I18N/Rare/CP737.cs | 462 +++++++++++++++++++++ mcs/class/I18N/Rare/CP775.cs | 451 ++++++++++++++++++++ mcs/class/I18N/Rare/I18N.Rare.dll.sources | 2 + mcs/class/I18N/Rare/ibm-737.ucm | 411 ++++++++++++++++++ mcs/class/I18N/Rare/ibm-775.ucm | 408 ++++++++++++++++++ mcs/class/I18N/tools/cvt.sh | 16 +- mcs/class/corlib/ReferenceSources/EncodingTable.cs | 4 +- 9 files changed, 1755 insertions(+), 5 deletions(-) create mode 100644 mcs/class/I18N/Rare/CP737.cs create mode 100644 mcs/class/I18N/Rare/CP775.cs create mode 100644 mcs/class/I18N/Rare/ibm-737.ucm create mode 100644 mcs/class/I18N/Rare/ibm-775.ucm diff --git a/external/api-snapshot b/external/api-snapshot index 5be0f0676d4..d543cf2a1a4 160000 --- a/external/api-snapshot +++ b/external/api-snapshot @@ -1 +1 @@ -Subproject commit 5be0f0676d46bd8cd286589f85fffe4a1e185198 +Subproject commit d543cf2a1a490a5ea47371a260e17a055b49265e diff --git a/mcs/class/I18N/Common/Handlers.cs b/mcs/class/I18N/Common/Handlers.cs index 2b50d3e954d..92299449d2d 100644 --- a/mcs/class/I18N/Common/Handlers.cs +++ b/mcs/class/I18N/Common/Handlers.cs @@ -158,6 +158,10 @@ public sealed class Handlers "I18N.Rare.ENCibm500", "I18N.Rare.CP708", "I18N.Rare.ENCasmo_708", + "I18N.Rare.CP737", + "I18N.Rare.ENCibm_737", + "I18N.Rare.CP775", + "I18N.Rare.ENCibm_775", "I18N.Rare.CP852", "I18N.Rare.ENCibm852", "I18N.Rare.CP855", diff --git a/mcs/class/I18N/Rare/CP737.cs b/mcs/class/I18N/Rare/CP737.cs new file mode 100644 index 00000000000..483a61425af --- /dev/null +++ b/mcs/class/I18N/Rare/CP737.cs @@ -0,0 +1,462 @@ +/* + * CP737.cs - Greek (DOS) code page. + * + * Copyright (c) 2002 Southern Storm Software, Pty Ltd + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +// Generated from "ibm-737.ucm". + +// WARNING: Modifying this file directly might be a bad idea. +// You should edit the code generator tools/ucm2cp.c instead for your changes +// to appear in all relevant classes. +namespace I18N.Rare +{ + +using System; +using System.Text; +using I18N.Common; + +[Serializable] +public class CP737 : ByteEncoding +{ + public CP737() + : base(737, ToChars, "Greek (DOS)", + "ibm737", "ibm737", "ibm737", + false, false, false, false, 1253) + {} + + private static readonly char[] ToChars = { + '\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', + '\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', + '\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', + '\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', + '\u0018', '\u0019', '\u001C', '\u001B', '\u007F', '\u001D', + '\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', + '\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', + '\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', + '\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', + '\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', + '\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', + '\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', + '\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', + '\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', + '\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', + '\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', + '\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', + '\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', + '\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', + '\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', + '\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', + '\u007E', '\u001A', '\u0391', '\u0392', '\u0393', '\u0394', + '\u0395', '\u0396', '\u0397', '\u0398', '\u0399', '\u039A', + '\u039B', '\u039C', '\u039D', '\u039E', '\u039F', '\u03A0', + '\u03A1', '\u03A3', '\u03A4', '\u03A5', '\u03A6', '\u03A7', + '\u03A8', '\u03A9', '\u03B1', '\u03B2', '\u03B3', '\u03B4', + '\u03B5', '\u03B6', '\u03B7', '\u03B8', '\u03B9', '\u03BA', + '\u03BB', '\u03BC', '\u03BD', '\u03BE', '\u03BF', '\u03C0', + '\u03C1', '\u03C3', '\u03C2', '\u03C4', '\u03C5', '\u03C6', + '\u03C7', '\u03C8', '\u2591', '\u2592', '\u2593', '\u2502', + '\u2524', '\u2561', '\u2562', '\u2556', '\u2555', '\u2563', + '\u2551', '\u2557', '\u255D', '\u255C', '\u255B', '\u2510', + '\u2514', '\u2534', '\u252C', '\u251C', '\u2500', '\u253C', + '\u255E', '\u255F', '\u255A', '\u2554', '\u2569', '\u2566', + '\u2560', '\u2550', '\u256C', '\u2567', '\u2568', '\u2564', + '\u2565', '\u2559', '\u2558', '\u2552', '\u2553', '\u256B', + '\u256A', '\u2518', '\u250C', '\u2588', '\u2584', '\u258C', + '\u2590', '\u2580', '\u03C9', '\u03AC', '\u03AD', '\u03AE', + '\u03CA', '\u03AF', '\u03CC', '\u03CD', '\u03CB', '\u03CE', + '\u0386', '\u0388', '\u0389', '\u038A', '\u038C', '\u038E', + '\u038F', '\u00B1', '\u2265', '\u2264', '\u03AA', '\u03AB', + '\u00F7', '\u2248', '\u00B0', '\u2219', '\u00B7', '\u221A', + '\u207F', '\u00B2', '\u25A0', '\u00A0', + }; + + // Get the number of bytes needed to encode a character buffer. + public unsafe override int GetByteCountImpl (char* chars, int count) + { + if (this.EncoderFallback != null) { + //Calculate byte count by actually doing encoding and discarding the data. + return GetBytesImpl(chars, count, null, 0); + } + else + { + return count; + } + } + + // Get the number of bytes needed to encode a character buffer. + public override int GetByteCount (String s) + { + if (this.EncoderFallback != null) + { + //Calculate byte count by actually doing encoding and discarding the data. + unsafe + { + fixed (char *s_ptr = s) + { + return GetBytesImpl(s_ptr, s.Length, null, 0); + } + } + } + else + { + //byte count equals character count because no EncoderFallback set + return s.Length; + } + } + + //ToBytes is just an alias for GetBytesImpl, but doesn't return byte count + protected unsafe override void ToBytes(char* chars, int charCount, + byte* bytes, int byteCount) + { + //Calling ToBytes with null destination buffer doesn't make any sense + if (bytes == null) + throw new ArgumentNullException("bytes"); + GetBytesImpl(chars, charCount, bytes, byteCount); + } + + public unsafe override int GetBytesImpl (char* chars, int charCount, + byte* bytes, int byteCount) + { + int ch; + int charIndex = 0; + int byteIndex = 0; + EncoderFallbackBuffer buffer = null; + while (charCount > 0) + { + ch = (int)(chars[charIndex]); + if(ch >= 26) switch(ch) + { + case 0x001B: + case 0x001D: + case 0x001E: + case 0x001F: + case 0x0020: + case 0x0021: + case 0x0022: + case 0x0023: + case 0x0024: + case 0x0025: + case 0x0026: + case 0x0027: + case 0x0028: + case 0x0029: + case 0x002A: + case 0x002B: + case 0x002C: + case 0x002D: + case 0x002E: + case 0x002F: + case 0x0030: + case 0x0031: + case 0x0032: + case 0x0033: + case 0x0034: + case 0x0035: + case 0x0036: + case 0x0037: + case 0x0038: + case 0x0039: + case 0x003A: + case 0x003B: + case 0x003C: + case 0x003D: + case 0x003E: + case 0x003F: + case 0x0040: + case 0x0041: + case 0x0042: + case 0x0043: + case 0x0044: + case 0x0045: + case 0x0046: + case 0x0047: + case 0x0048: + case 0x0049: + case 0x004A: + case 0x004B: + case 0x004C: + case 0x004D: + case 0x004E: + case 0x004F: + case 0x0050: + case 0x0051: + case 0x0052: + case 0x0053: + case 0x0054: + case 0x0055: + case 0x0056: + case 0x0057: + case 0x0058: + case 0x0059: + case 0x005A: + case 0x005B: + case 0x005C: + case 0x005D: + case 0x005E: + case 0x005F: + case 0x0060: + case 0x0061: + case 0x0062: + case 0x0063: + case 0x0064: + case 0x0065: + case 0x0066: + case 0x0067: + case 0x0068: + case 0x0069: + case 0x006A: + case 0x006B: + case 0x006C: + case 0x006D: + case 0x006E: + case 0x006F: + case 0x0070: + case 0x0071: + case 0x0072: + case 0x0073: + case 0x0074: + case 0x0075: + case 0x0076: + case 0x0077: + case 0x0078: + case 0x0079: + case 0x007A: + case 0x007B: + case 0x007C: + case 0x007D: + case 0x007E: + break; + case 0x001A: ch = 0x7F; break; + case 0x001C: ch = 0x1A; break; + case 0x007F: ch = 0x1C; break; + case 0x00A0: ch = 0xFF; break; + case 0x00A7: ch = 0x15; break; + case 0x00B0: ch = 0xF8; break; + case 0x00B1: ch = 0xF1; break; + case 0x00B2: ch = 0xFD; break; + case 0x00B6: ch = 0x14; break; + case 0x00B7: ch = 0xFA; break; + case 0x00F7: ch = 0xF6; break; + case 0x0386: ch = 0xEA; break; + case 0x0388: ch = 0xEB; break; + case 0x0389: ch = 0xEC; break; + case 0x038A: ch = 0xED; break; + case 0x038C: ch = 0xEE; break; + case 0x038E: ch = 0xEF; break; + case 0x038F: ch = 0xF0; break; + case 0x0391: + case 0x0392: + case 0x0393: + case 0x0394: + case 0x0395: + case 0x0396: + case 0x0397: + case 0x0398: + case 0x0399: + case 0x039A: + case 0x039B: + case 0x039C: + case 0x039D: + case 0x039E: + case 0x039F: + case 0x03A0: + case 0x03A1: + ch -= 0x0311; + break; + case 0x03A3: + case 0x03A4: + case 0x03A5: + case 0x03A6: + case 0x03A7: + case 0x03A8: + case 0x03A9: + ch -= 0x0312; + break; + case 0x03AA: ch = 0xF4; break; + case 0x03AB: ch = 0xF5; break; + case 0x03AC: ch = 0xE1; break; + case 0x03AD: ch = 0xE2; break; + case 0x03AE: ch = 0xE3; break; + case 0x03AF: ch = 0xE5; break; + case 0x03B1: + case 0x03B2: + case 0x03B3: + case 0x03B4: + case 0x03B5: + case 0x03B6: + case 0x03B7: + case 0x03B8: + case 0x03B9: + case 0x03BA: + case 0x03BB: + case 0x03BC: + case 0x03BD: + case 0x03BE: + case 0x03BF: + case 0x03C0: + case 0x03C1: + ch -= 0x0319; + break; + case 0x03C2: ch = 0xAA; break; + case 0x03C3: ch = 0xA9; break; + case 0x03C4: + case 0x03C5: + case 0x03C6: + case 0x03C7: + case 0x03C8: + ch -= 0x0319; + break; + case 0x03C9: ch = 0xE0; break; + case 0x03CA: ch = 0xE4; break; + case 0x03CB: ch = 0xE8; break; + case 0x03CC: ch = 0xE6; break; + case 0x03CD: ch = 0xE7; break; + case 0x03CE: ch = 0xE9; break; + case 0x03D5: ch = 0xAD; break; + case 0x2022: ch = 0x07; break; + case 0x203C: ch = 0x13; break; + case 0x207F: ch = 0xFC; break; + case 0x2190: ch = 0x1B; break; + case 0x2191: ch = 0x18; break; + case 0x2192: ch = 0x1A; break; + case 0x2193: ch = 0x19; break; + case 0x2194: ch = 0x1D; break; + case 0x2195: ch = 0x12; break; + case 0x21A8: ch = 0x17; break; + case 0x2219: ch = 0xF9; break; + case 0x221A: ch = 0xFB; break; + case 0x221F: ch = 0x1C; break; + case 0x2248: ch = 0xF7; break; + case 0x2264: ch = 0xF3; break; + case 0x2265: ch = 0xF2; break; + case 0x2302: ch = 0x7F; break; + case 0x2500: ch = 0xC4; break; + case 0x2502: ch = 0xB3; break; + case 0x250C: ch = 0xDA; break; + case 0x2510: ch = 0xBF; break; + case 0x2514: ch = 0xC0; break; + case 0x2518: ch = 0xD9; break; + case 0x251C: ch = 0xC3; break; + case 0x2524: ch = 0xB4; break; + case 0x252C: ch = 0xC2; break; + case 0x2534: ch = 0xC1; break; + case 0x253C: ch = 0xC5; break; + case 0x2550: ch = 0xCD; break; + case 0x2551: ch = 0xBA; break; + case 0x2552: ch = 0xD5; break; + case 0x2553: ch = 0xD6; break; + case 0x2554: ch = 0xC9; break; + case 0x2555: ch = 0xB8; break; + case 0x2556: ch = 0xB7; break; + case 0x2557: ch = 0xBB; break; + case 0x2558: ch = 0xD4; break; + case 0x2559: ch = 0xD3; break; + case 0x255A: ch = 0xC8; break; + case 0x255B: ch = 0xBE; break; + case 0x255C: ch = 0xBD; break; + case 0x255D: ch = 0xBC; break; + case 0x255E: ch = 0xC6; break; + case 0x255F: ch = 0xC7; break; + case 0x2560: ch = 0xCC; break; + case 0x2561: ch = 0xB5; break; + case 0x2562: ch = 0xB6; break; + case 0x2563: ch = 0xB9; break; + case 0x2564: ch = 0xD1; break; + case 0x2565: ch = 0xD2; break; + case 0x2566: ch = 0xCB; break; + case 0x2567: ch = 0xCF; break; + case 0x2568: ch = 0xD0; break; + case 0x2569: ch = 0xCA; break; + case 0x256A: ch = 0xD8; break; + case 0x256B: ch = 0xD7; break; + case 0x256C: ch = 0xCE; break; + case 0x2580: ch = 0xDF; break; + case 0x2584: ch = 0xDC; break; + case 0x2588: ch = 0xDB; break; + case 0x258C: ch = 0xDD; break; + case 0x2590: ch = 0xDE; break; + case 0x2591: ch = 0xB0; break; + case 0x2592: ch = 0xB1; break; + case 0x2593: ch = 0xB2; break; + case 0x25A0: ch = 0xFE; break; + case 0x25AC: ch = 0x16; break; + case 0x25B2: ch = 0x1E; break; + case 0x25BA: ch = 0x10; break; + case 0x25BC: ch = 0x1F; break; + case 0x25C4: ch = 0x11; break; + case 0x25CB: ch = 0x09; break; + case 0x25D8: ch = 0x08; break; + case 0x25D9: ch = 0x0A; break; + case 0x263A: ch = 0x01; break; + case 0x263B: ch = 0x02; break; + case 0x263C: ch = 0x0F; break; + case 0x2640: ch = 0x0C; break; + case 0x2642: ch = 0x0B; break; + case 0x2660: ch = 0x06; break; + case 0x2663: ch = 0x05; break; + case 0x2665: ch = 0x03; break; + case 0x2666: ch = 0x04; break; + case 0x266A: ch = 0x0D; break; + case 0x266C: ch = 0x0E; break; + case 0xFFE8: ch = 0xB3; break; + case 0xFFE9: ch = 0x1B; break; + case 0xFFEA: ch = 0x18; break; + case 0xFFEB: ch = 0x1A; break; + case 0xFFEC: ch = 0x19; break; + case 0xFFED: ch = 0xFE; break; + case 0xFFEE: ch = 0x09; break; + default: + { + if(ch >= 0xFF01 && ch <= 0xFF5E) + { + ch -= 0xFEE0; + } + else + { + HandleFallback (ref buffer, chars, ref charIndex, ref charCount, bytes, ref byteIndex, ref byteCount); + charIndex++; + charCount--; + continue; + } + } + break; + } + //Write encoded byte to buffer, if buffer is defined and fallback was not used + if (bytes != null) + bytes[byteIndex] = (byte)ch; + byteIndex++; + byteCount--; + charIndex++; + charCount--; + } + return byteIndex; + } +}; // class CP737 + +[Serializable] +public class ENCibm737 : CP737 +{ + public ENCibm737() : base() {} + +}; // class ENCibm737 + +}; // namespace I18N.Rare diff --git a/mcs/class/I18N/Rare/CP775.cs b/mcs/class/I18N/Rare/CP775.cs new file mode 100644 index 00000000000..50458ad6cea --- /dev/null +++ b/mcs/class/I18N/Rare/CP775.cs @@ -0,0 +1,451 @@ +/* + * CP775.cs - Baltic (DOS) code page. + * + * Copyright (c) 2002 Southern Storm Software, Pty Ltd + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +// Generated from "ibm-775.ucm". + +// WARNING: Modifying this file directly might be a bad idea. +// You should edit the code generator tools/ucm2cp.c instead for your changes +// to appear in all relevant classes. +namespace I18N.Rare +{ + +using System; +using System.Text; +using I18N.Common; + +[Serializable] +public class CP775 : ByteEncoding +{ + public CP775() + : base(775, ToChars, "Baltic (DOS)", + "ibm775", "ibm775", "ibm775", + false, false, false, false, 1257) + {} + + private static readonly char[] ToChars = { + '\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', + '\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', + '\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', + '\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', + '\u0018', '\u0019', '\u001C', '\u001B', '\u007F', '\u001D', + '\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', + '\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', + '\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', + '\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', + '\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', + '\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', + '\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', + '\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', + '\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', + '\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', + '\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', + '\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', + '\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', + '\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', + '\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', + '\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', + '\u007E', '\u001A', '\u0106', '\u00FC', '\u00E9', '\u0101', + '\u00E4', '\u0123', '\u00E5', '\u0107', '\u0142', '\u0113', + '\u0156', '\u0157', '\u012B', '\u0179', '\u00C4', '\u00C5', + '\u00C9', '\u00E6', '\u00C6', '\u014D', '\u00F6', '\u0122', + '\u00A2', '\u015A', '\u015B', '\u00D6', '\u00DC', '\u00F8', + '\u00A3', '\u00D8', '\u00D7', '\u00A4', '\u0100', '\u012A', + '\u00F3', '\u017B', '\u017C', '\u017A', '\u201D', '\u00A6', + '\u00A9', '\u00AE', '\u00AC', '\u00BD', '\u00BC', '\u0141', + '\u00AB', '\u00BB', '\u2591', '\u2592', '\u2593', '\u2502', + '\u2524', '\u0104', '\u010C', '\u0118', '\u0116', '\u2563', + '\u2551', '\u2557', '\u255D', '\u012E', '\u0160', '\u2510', + '\u2514', '\u2534', '\u252C', '\u251C', '\u2500', '\u253C', + '\u0172', '\u016A', '\u255A', '\u2554', '\u2569', '\u2566', + '\u2560', '\u2550', '\u256C', '\u017D', '\u0105', '\u010D', + '\u0119', '\u0117', '\u012F', '\u0161', '\u0173', '\u016B', + '\u017E', '\u2518', '\u250C', '\u2588', '\u2584', '\u258C', + '\u2590', '\u2580', '\u00D3', '\u00DF', '\u014C', '\u0143', + '\u00F5', '\u00D5', '\u00B5', '\u0144', '\u0136', '\u0137', + '\u013B', '\u013C', '\u0146', '\u0112', '\u0145', '\u2019', + '\u00AD', '\u00B1', '\u201C', '\u00BE', '\u00B6', '\u00A7', + '\u00F7', '\u201E', '\u00B0', '\u2219', '\u00B7', '\u00B9', + '\u00B3', '\u00B2', '\u25A0', '\u00A0', + }; + + // Get the number of bytes needed to encode a character buffer. + public unsafe override int GetByteCountImpl (char* chars, int count) + { + if (this.EncoderFallback != null) { + //Calculate byte count by actually doing encoding and discarding the data. + return GetBytesImpl(chars, count, null, 0); + } + else + { + return count; + } + } + + // Get the number of bytes needed to encode a character buffer. + public override int GetByteCount (String s) + { + if (this.EncoderFallback != null) + { + //Calculate byte count by actually doing encoding and discarding the data. + unsafe + { + fixed (char *s_ptr = s) + { + return GetBytesImpl(s_ptr, s.Length, null, 0); + } + } + } + else + { + //byte count equals character count because no EncoderFallback set + return s.Length; + } + } + + //ToBytes is just an alias for GetBytesImpl, but doesn't return byte count + protected unsafe override void ToBytes(char* chars, int charCount, + byte* bytes, int byteCount) + { + //Calling ToBytes with null destination buffer doesn't make any sense + if (bytes == null) + throw new ArgumentNullException("bytes"); + GetBytesImpl(chars, charCount, bytes, byteCount); + } + + public unsafe override int GetBytesImpl (char* chars, int charCount, + byte* bytes, int byteCount) + { + int ch; + int charIndex = 0; + int byteIndex = 0; + EncoderFallbackBuffer buffer = null; + while (charCount > 0) + { + ch = (int)(chars[charIndex]); + if(ch >= 26) switch(ch) + { + case 0x001B: + case 0x001D: + case 0x001E: + case 0x001F: + case 0x0020: + case 0x0021: + case 0x0022: + case 0x0023: + case 0x0024: + case 0x0025: + case 0x0026: + case 0x0027: + case 0x0028: + case 0x0029: + case 0x002A: + case 0x002B: + case 0x002C: + case 0x002D: + case 0x002E: + case 0x002F: + case 0x0030: + case 0x0031: + case 0x0032: + case 0x0033: + case 0x0034: + case 0x0035: + case 0x0036: + case 0x0037: + case 0x0038: + case 0x0039: + case 0x003A: + case 0x003B: + case 0x003C: + case 0x003D: + case 0x003E: + case 0x003F: + case 0x0040: + case 0x0041: + case 0x0042: + case 0x0043: + case 0x0044: + case 0x0045: + case 0x0046: + case 0x0047: + case 0x0048: + case 0x0049: + case 0x004A: + case 0x004B: + case 0x004C: + case 0x004D: + case 0x004E: + case 0x004F: + case 0x0050: + case 0x0051: + case 0x0052: + case 0x0053: + case 0x0054: + case 0x0055: + case 0x0056: + case 0x0057: + case 0x0058: + case 0x0059: + case 0x005A: + case 0x005B: + case 0x005C: + case 0x005D: + case 0x005E: + case 0x005F: + case 0x0060: + case 0x0061: + case 0x0062: + case 0x0063: + case 0x0064: + case 0x0065: + case 0x0066: + case 0x0067: + case 0x0068: + case 0x0069: + case 0x006A: + case 0x006B: + case 0x006C: + case 0x006D: + case 0x006E: + case 0x006F: + case 0x0070: + case 0x0071: + case 0x0072: + case 0x0073: + case 0x0074: + case 0x0075: + case 0x0076: + case 0x0077: + case 0x0078: + case 0x0079: + case 0x007A: + case 0x007B: + case 0x007C: + case 0x007D: + case 0x007E: + break; + case 0x001A: ch = 0x7F; break; + case 0x001C: ch = 0x1A; break; + case 0x007F: ch = 0x1C; break; + case 0x00A0: ch = 0xFF; break; + case 0x00A2: ch = 0x96; break; + case 0x00A3: ch = 0x9C; break; + case 0x00A4: ch = 0x9F; break; + case 0x00A6: ch = 0xA7; break; + case 0x00A7: ch = 0xF5; break; + case 0x00A9: ch = 0xA8; break; + case 0x00AB: ch = 0xAE; break; + case 0x00AC: ch = 0xAA; break; + case 0x00AD: ch = 0xF0; break; + case 0x00AE: ch = 0xA9; break; + case 0x00B0: ch = 0xF8; break; + case 0x00B1: ch = 0xF1; break; + case 0x00B2: ch = 0xFD; break; + case 0x00B3: ch = 0xFC; break; + case 0x00B5: ch = 0xE6; break; + case 0x00B6: ch = 0xF4; break; + case 0x00B7: ch = 0xFA; break; + case 0x00B9: ch = 0xFB; break; + case 0x00BB: ch = 0xAF; break; + case 0x00BC: ch = 0xAC; break; + case 0x00BD: ch = 0xAB; break; + case 0x00BE: ch = 0xF3; break; + case 0x00C4: ch = 0x8E; break; + case 0x00C5: ch = 0x8F; break; + case 0x00C6: ch = 0x92; break; + case 0x00C9: ch = 0x90; break; + case 0x00D3: ch = 0xE0; break; + case 0x00D5: ch = 0xE5; break; + case 0x00D6: ch = 0x99; break; + case 0x00D7: ch = 0x9E; break; + case 0x00D8: ch = 0x9D; break; + case 0x00DC: ch = 0x9A; break; + case 0x00DF: ch = 0xE1; break; + case 0x00E4: ch = 0x84; break; + case 0x00E5: ch = 0x86; break; + case 0x00E6: ch = 0x91; break; + case 0x00E9: ch = 0x82; break; + case 0x00F3: ch = 0xA2; break; + case 0x00F5: ch = 0xE4; break; + case 0x00F6: ch = 0x94; break; + case 0x00F7: ch = 0xF6; break; + case 0x00F8: ch = 0x9B; break; + case 0x00FC: ch = 0x81; break; + case 0x0100: ch = 0xA0; break; + case 0x0101: ch = 0x83; break; + case 0x0104: ch = 0xB5; break; + case 0x0105: ch = 0xD0; break; + case 0x0106: ch = 0x80; break; + case 0x0107: ch = 0x87; break; + case 0x010C: ch = 0xB6; break; + case 0x010D: ch = 0xD1; break; + case 0x0112: ch = 0xED; break; + case 0x0113: ch = 0x89; break; + case 0x0116: ch = 0xB8; break; + case 0x0117: ch = 0xD3; break; + case 0x0118: ch = 0xB7; break; + case 0x0119: ch = 0xD2; break; + case 0x0122: ch = 0x95; break; + case 0x0123: ch = 0x85; break; + case 0x012A: ch = 0xA1; break; + case 0x012B: ch = 0x8C; break; + case 0x012E: ch = 0xBD; break; + case 0x012F: ch = 0xD4; break; + case 0x0136: ch = 0xE8; break; + case 0x0137: ch = 0xE9; break; + case 0x013B: ch = 0xEA; break; + case 0x013C: ch = 0xEB; break; + case 0x0141: ch = 0xAD; break; + case 0x0142: ch = 0x88; break; + case 0x0143: ch = 0xE3; break; + case 0x0144: ch = 0xE7; break; + case 0x0145: ch = 0xEE; break; + case 0x0146: ch = 0xEC; break; + case 0x014C: ch = 0xE2; break; + case 0x014D: ch = 0x93; break; + case 0x0156: ch = 0x8A; break; + case 0x0157: ch = 0x8B; break; + case 0x015A: ch = 0x97; break; + case 0x015B: ch = 0x98; break; + case 0x0160: ch = 0xBE; break; + case 0x0161: ch = 0xD5; break; + case 0x016A: ch = 0xC7; break; + case 0x016B: ch = 0xD7; break; + case 0x0172: ch = 0xC6; break; + case 0x0173: ch = 0xD6; break; + case 0x0179: ch = 0x8D; break; + case 0x017A: ch = 0xA5; break; + case 0x017B: ch = 0xA3; break; + case 0x017C: ch = 0xA4; break; + case 0x017D: ch = 0xCF; break; + case 0x017E: ch = 0xD8; break; + case 0x2019: ch = 0xEF; break; + case 0x201C: ch = 0xF2; break; + case 0x201D: ch = 0xA6; break; + case 0x201E: ch = 0xF7; break; + case 0x2022: ch = 0x07; break; + case 0x203C: ch = 0x13; break; + case 0x2190: ch = 0x1B; break; + case 0x2191: ch = 0x18; break; + case 0x2192: ch = 0x1A; break; + case 0x2193: ch = 0x19; break; + case 0x2194: ch = 0x1D; break; + case 0x2195: ch = 0x12; break; + case 0x21A8: ch = 0x17; break; + case 0x2219: ch = 0xF9; break; + case 0x221F: ch = 0x1C; break; + case 0x2302: ch = 0x7F; break; + case 0x2500: ch = 0xC4; break; + case 0x2502: ch = 0xB3; break; + case 0x250C: ch = 0xDA; break; + case 0x2510: ch = 0xBF; break; + case 0x2514: ch = 0xC0; break; + case 0x2518: ch = 0xD9; break; + case 0x251C: ch = 0xC3; break; + case 0x2524: ch = 0xB4; break; + case 0x252C: ch = 0xC2; break; + case 0x2534: ch = 0xC1; break; + case 0x253C: ch = 0xC5; break; + case 0x2550: ch = 0xCD; break; + case 0x2551: ch = 0xBA; break; + case 0x2554: ch = 0xC9; break; + case 0x2557: ch = 0xBB; break; + case 0x255A: ch = 0xC8; break; + case 0x255D: ch = 0xBC; break; + case 0x2560: ch = 0xCC; break; + case 0x2563: ch = 0xB9; break; + case 0x2566: ch = 0xCB; break; + case 0x2569: ch = 0xCA; break; + case 0x256C: ch = 0xCE; break; + case 0x2580: ch = 0xDF; break; + case 0x2584: ch = 0xDC; break; + case 0x2588: ch = 0xDB; break; + case 0x258C: ch = 0xDD; break; + case 0x2590: ch = 0xDE; break; + case 0x2591: ch = 0xB0; break; + case 0x2592: ch = 0xB1; break; + case 0x2593: ch = 0xB2; break; + case 0x25A0: ch = 0xFE; break; + case 0x25AC: ch = 0x16; break; + case 0x25B2: ch = 0x1E; break; + case 0x25BA: ch = 0x10; break; + case 0x25BC: ch = 0x1F; break; + case 0x25C4: ch = 0x11; break; + case 0x25CB: ch = 0x09; break; + case 0x25D8: ch = 0x08; break; + case 0x25D9: ch = 0x0A; break; + case 0x263A: ch = 0x01; break; + case 0x263B: ch = 0x02; break; + case 0x263C: ch = 0x0F; break; + case 0x2640: ch = 0x0C; break; + case 0x2642: ch = 0x0B; break; + case 0x2660: ch = 0x06; break; + case 0x2663: ch = 0x05; break; + case 0x2665: ch = 0x03; break; + case 0x2666: ch = 0x04; break; + case 0x266A: ch = 0x0D; break; + case 0x266B: ch = 0x0E; break; + case 0xFFE8: ch = 0xB3; break; + case 0xFFE9: ch = 0x1B; break; + case 0xFFEA: ch = 0x18; break; + case 0xFFEB: ch = 0x1A; break; + case 0xFFEC: ch = 0x19; break; + case 0xFFED: ch = 0xFE; break; + case 0xFFEE: ch = 0x09; break; + default: + { + if(ch >= 0xFF01 && ch <= 0xFF5E) + { + ch -= 0xFEE0; + } + else + { + HandleFallback (ref buffer, chars, ref charIndex, ref charCount, bytes, ref byteIndex, ref byteCount); + charIndex++; + charCount--; + continue; + } + } + break; + } + //Write encoded byte to buffer, if buffer is defined and fallback was not used + if (bytes != null) + bytes[byteIndex] = (byte)ch; + byteIndex++; + byteCount--; + charIndex++; + charCount--; + } + return byteIndex; + } +}; // class CP775 + +[Serializable] +public class ENCibm775 : CP775 +{ + public ENCibm775() : base() {} + +}; // class ENCibm775 + +}; // namespace I18N.Rare diff --git a/mcs/class/I18N/Rare/I18N.Rare.dll.sources b/mcs/class/I18N/Rare/I18N.Rare.dll.sources index 8359d47c7ec..be0f2cca9ab 100755 --- a/mcs/class/I18N/Rare/I18N.Rare.dll.sources +++ b/mcs/class/I18N/Rare/I18N.Rare.dll.sources @@ -31,6 +31,8 @@ CP21025.cs CP37.cs CP500.cs CP708.cs +CP737.cs +CP775.cs CP852.cs CP855.cs CP857.cs diff --git a/mcs/class/I18N/Rare/ibm-737.ucm b/mcs/class/I18N/Rare/ibm-737.ucm new file mode 100644 index 00000000000..40ef5b94ad5 --- /dev/null +++ b/mcs/class/I18N/Rare/ibm-737.ucm @@ -0,0 +1,411 @@ +# *************************************************************************** +# * +# * Copyright (C) 1995-2002, International Business Machines +# * Corporation and others. All Rights Reserved. +# * +# *************************************************************************** +# +# File created by rptp2ucm (compiled on Dec 3 2002) +# from source files 34B002E1.RPMAP100 and 02E134B0.TPMAP100 +# + "ibm-737_P100-1997" + "AXXXX" + 1 + 1 + "SBCS" + \x7F + "ASCII" + "ibm-737_VSUB" + +CHARMAP + \x00 |0 + \x01 |0 + \x02 |0 + \x03 |0 + \x04 |0 + \x05 |0 + \x06 |0 + \x07 |0 + \x08 |0 + \x09 |0 + \x0A |0 + \x0B |0 + \x0C |0 + \x0D |0 + \x0E |0 + \x0F |0 + \x10 |0 + \x11 |0 + \x12 |0 + \x13 |0 + \x14 |0 + \x15 |0 + \x16 |0 + \x17 |0 + \x18 |0 + \x19 |0 + \x7F |0 + \x1B |0 + \x1A |0 + \x1D |0 + \x1E |0 + \x1F |0 + \x20 |0 + \x21 |0 + \x22 |0 + \x23 |0 + \x24 |0 + \x25 |0 + \x26 |0 + \x27 |0 + \x28 |0 + \x29 |0 + \x2A |0 + \x2B |0 + \x2C |0 + \x2D |0 + \x2E |0 + \x2F |0 + \x30 |0 + \x31 |0 + \x32 |0 + \x33 |0 + \x34 |0 + \x35 |0 + \x36 |0 + \x37 |0 + \x38 |0 + \x39 |0 + \x3A |0 + \x3B |0 + \x3C |0 + \x3D |0 + \x3E |0 + \x3F |0 + \x40 |0 + \x41 |0 + \x42 |0 + \x43 |0 + \x44 |0 + \x45 |0 + \x46 |0 + \x47 |0 + \x48 |0 + \x49 |0 + \x4A |0 + \x4B |0 + \x4C |0 + \x4D |0 + \x4E |0 + \x4F |0 + \x50 |0 + \x51 |0 + \x52 |0 + \x53 |0 + \x54 |0 + \x55 |0 + \x56 |0 + \x57 |0 + \x58 |0 + \x59 |0 + \x5A |0 + \x5B |0 + \x5C |0 + \x5D |0 + \x5E |0 + \x5F |0 + \x60 |0 + \x61 |0 + \x62 |0 + \x63 |0 + \x64 |0 + \x65 |0 + \x66 |0 + \x67 |0 + \x68 |0 + \x69 |0 + \x6A |0 + \x6B |0 + \x6C |0 + \x6D |0 + \x6E |0 + \x6F |0 + \x70 |0 + \x71 |0 + \x72 |0 + \x73 |0 + \x74 |0 + \x75 |0 + \x76 |0 + \x77 |0 + \x78 |0 + \x79 |0 + \x7A |0 + \x7B |0 + \x7C |0 + \x7D |0 + \x7E |0 + \x1C |0 + \xFF |0 + \x15 |1 + \xF8 |0 + \xF1 |0 + \xFD |0 + \x14 |1 + \xFA |0 + \xF6 |0 + \xEA |0 + \xEB |0 + \xEC |0 + \xED |0 + \xEE |0 + \xEF |0 + \xF0 |0 + \x80 |0 + \x81 |0 + \x82 |0 + \x83 |0 + \x84 |0 + \x85 |0 + \x86 |0 + \x87 |0 + \x88 |0 + \x89 |0 + \x8A |0 + \x8B |0 + \x8C |0 + \x8D |0 + \x8E |0 + \x8F |0 + \x90 |0 + \x91 |0 + \x92 |0 + \x93 |0 + \x94 |0 + \x95 |0 + \x96 |0 + \x97 |0 + \xF4 |0 + \xF5 |0 + \xE1 |0 + \xE2 |0 + \xE3 |0 + \xE5 |0 + \x98 |0 + \x99 |0 + \x9A |0 + \x9B |0 + \x9C |0 + \x9D |0 + \x9E |0 + \x9F |0 + \xA0 |0 + \xA1 |0 + \xA2 |0 + \xA3 |0 + \xA4 |0 + \xA5 |0 + \xA6 |0 + \xA7 |0 + \xA8 |0 + \xAA |0 + \xA9 |0 + \xAB |0 + \xAC |0 + \xAD |0 + \xAE |0 + \xAF |0 + \xE0 |0 + \xE4 |0 + \xE8 |0 + \xE6 |0 + \xE7 |0 + \xE9 |0 + \xAD |1 + \x07 |1 + \x13 |1 + \xFC |0 + \x1B |1 + \x18 |1 + \x1A |1 + \x19 |1 + \x1D |1 + \x12 |1 + \x17 |1 + \xF9 |0 + \xFB |0 + \x1C |1 + \xF7 |0 + \xF3 |0 + \xF2 |0 + \x7F |2 + \xC4 |0 + \xB3 |0 + \xDA |0 + \xBF |0 + \xC0 |0 + \xD9 |0 + \xC3 |0 + \xB4 |0 + \xC2 |0 + \xC1 |0 + \xC5 |0 + \xCD |0 + \xBA |0 + \xD5 |0 + \xD6 |0 + \xC9 |0 + \xB8 |0 + \xB7 |0 + \xBB |0 + \xD4 |0 + \xD3 |0 + \xC8 |0 + \xBE |0 + \xBD |0 + \xBC |0 + \xC6 |0 + \xC7 |0 + \xCC |0 + \xB5 |0 + \xB6 |0 + \xB9 |0 + \xD1 |0 + \xD2 |0 + \xCB |0 + \xCF |0 + \xD0 |0 + \xCA |0 + \xD8 |0 + \xD7 |0 + \xCE |0 + \xDF |0 + \xDC |0 + \xDB |0 + \xDD |0 + \xDE |0 + \xB0 |0 + \xB1 |0 + \xB2 |0 + \xFE |0 + \x16 |1 + \x1E |1 + \x10 |1 + \x1F |1 + \x11 |1 + \x09 |1 + \x08 |1 + \x0A |1 + \x01 |1 + \x02 |1 + \x0F |1 + \x0C |1 + \x0B |1 + \x06 |1 + \x05 |1 + \x03 |1 + \x04 |1 + \x0D |1 + \x0E |1 + \x21 |1 + \x22 |1 + \x23 |1 + \x24 |1 + \x25 |1 + \x26 |1 + \x27 |1 + \x28 |1 + \x29 |1 + \x2A |1 + \x2B |1 + \x2C |1 + \x2D |1 + \x2E |1 + \x2F |1 + \x30 |1 + \x31 |1 + \x32 |1 + \x33 |1 + \x34 |1 + \x35 |1 + \x36 |1 + \x37 |1 + \x38 |1 + \x39 |1 + \x3A |1 + \x3B |1 + \x3C |1 + \x3D |1 + \x3E |1 + \x3F |1 + \x40 |1 + \x41 |1 + \x42 |1 + \x43 |1 + \x44 |1 + \x45 |1 + \x46 |1 + \x47 |1 + \x48 |1 + \x49 |1 + \x4A |1 + \x4B |1 + \x4C |1 + \x4D |1 + \x4E |1 + \x4F |1 + \x50 |1 + \x51 |1 + \x52 |1 + \x53 |1 + \x54 |1 + \x55 |1 + \x56 |1 + \x57 |1 + \x58 |1 + \x59 |1 + \x5A |1 + \x5B |1 + \x5C |1 + \x5D |1 + \x5E |1 + \x5F |1 + \x60 |1 + \x61 |1 + \x62 |1 + \x63 |1 + \x64 |1 + \x65 |1 + \x66 |1 + \x67 |1 + \x68 |1 + \x69 |1 + \x6A |1 + \x6B |1 + \x6C |1 + \x6D |1 + \x6E |1 + \x6F |1 + \x70 |1 + \x71 |1 + \x72 |1 + \x73 |1 + \x74 |1 + \x75 |1 + \x76 |1 + \x77 |1 + \x78 |1 + \x79 |1 + \x7A |1 + \x7B |1 + \x7C |1 + \x7D |1 + \x7E |1 + \xB3 |1 + \x1B |1 + \x18 |1 + \x1A |1 + \x19 |1 + \xFE |1 + \x09 |1 +END CHARMAP diff --git a/mcs/class/I18N/Rare/ibm-775.ucm b/mcs/class/I18N/Rare/ibm-775.ucm new file mode 100644 index 00000000000..3124e9b849b --- /dev/null +++ b/mcs/class/I18N/Rare/ibm-775.ucm @@ -0,0 +1,408 @@ +# *************************************************************************** +# * +# * Copyright (C) 1995-2004, International Business Machines +# * Corporation and others. All Rights Reserved. +# * +# *************************************************************************** +# +# File created by rptp2ucm (compiled on Jan 14 2004) +# from source files 34B00307.RPMAP100 and 030734B0.TPMAP100 +# + "ibm-775_P100-1996" + "AXXXX" + 1 + 1 + "SBCS" + \x7F + "ASCII" + "ibm-775_VSUB" + +CHARMAP + \x00 |0 + \x01 |0 + \x02 |0 + \x03 |0 + \x04 |0 + \x05 |0 + \x06 |0 + \x07 |0 + \x08 |0 + \x09 |0 + \x0A |0 + \x0B |0 + \x0C |0 + \x0D |0 + \x0E |0 + \x0F |0 + \x10 |0 + \x11 |0 + \x12 |0 + \x13 |0 + \x14 |0 + \x15 |0 + \x16 |0 + \x17 |0 + \x18 |0 + \x19 |0 + \x7F |0 + \x1B |0 + \x1A |0 + \x1D |0 + \x1E |0 + \x1F |0 + \x20 |0 + \x21 |0 + \x22 |0 + \x23 |0 + \x24 |0 + \x25 |0 + \x26 |0 + \x27 |0 + \x28 |0 + \x29 |0 + \x2A |0 + \x2B |0 + \x2C |0 + \x2D |0 + \x2E |0 + \x2F |0 + \x30 |0 + \x31 |0 + \x32 |0 + \x33 |0 + \x34 |0 + \x35 |0 + \x36 |0 + \x37 |0 + \x38 |0 + \x39 |0 + \x3A |0 + \x3B |0 + \x3C |0 + \x3D |0 + \x3E |0 + \x3F |0 + \x40 |0 + \x41 |0 + \x42 |0 + \x43 |0 + \x44 |0 + \x45 |0 + \x46 |0 + \x47 |0 + \x48 |0 + \x49 |0 + \x4A |0 + \x4B |0 + \x4C |0 + \x4D |0 + \x4E |0 + \x4F |0 + \x50 |0 + \x51 |0 + \x52 |0 + \x53 |0 + \x54 |0 + \x55 |0 + \x56 |0 + \x57 |0 + \x58 |0 + \x59 |0 + \x5A |0 + \x5B |0 + \x5C |0 + \x5D |0 + \x5E |0 + \x5F |0 + \x60 |0 + \x61 |0 + \x62 |0 + \x63 |0 + \x64 |0 + \x65 |0 + \x66 |0 + \x67 |0 + \x68 |0 + \x69 |0 + \x6A |0 + \x6B |0 + \x6C |0 + \x6D |0 + \x6E |0 + \x6F |0 + \x70 |0 + \x71 |0 + \x72 |0 + \x73 |0 + \x74 |0 + \x75 |0 + \x76 |0 + \x77 |0 + \x78 |0 + \x79 |0 + \x7A |0 + \x7B |0 + \x7C |0 + \x7D |0 + \x7E |0 + \x1C |0 + \xFF |0 + \x96 |0 + \x9C |0 + \x9F |0 + \xA7 |0 + \xF5 |0 + \xA8 |0 + \xAE |0 + \xAA |0 + \xF0 |0 + \xA9 |0 + \xF8 |0 + \xF1 |0 + \xFD |0 + \xFC |0 + \xE6 |0 + \xF4 |0 + \xFA |0 + \xFB |0 + \xAF |0 + \xAC |0 + \xAB |0 + \xF3 |0 + \x8E |0 + \x8F |0 + \x92 |0 + \x90 |0 + \xE0 |0 + \xE5 |0 + \x99 |0 + \x9E |0 + \x9D |0 + \x9A |0 + \xE1 |0 + \x84 |0 + \x86 |0 + \x91 |0 + \x82 |0 + \xA2 |0 + \xE4 |0 + \x94 |0 + \xF6 |0 + \x9B |0 + \x81 |0 + \xA0 |0 + \x83 |0 + \xB5 |0 + \xD0 |0 + \x80 |0 + \x87 |0 + \xB6 |0 + \xD1 |0 + \xED |0 + \x89 |0 + \xB8 |0 + \xD3 |0 + \xB7 |0 + \xD2 |0 + \x95 |0 + \x85 |0 + \xA1 |0 + \x8C |0 + \xBD |0 + \xD4 |0 + \xE8 |0 + \xE9 |0 + \xEA |0 + \xEB |0 + \xAD |0 + \x88 |0 + \xE3 |0 + \xE7 |0 + \xEE |0 + \xEC |0 + \xE2 |0 + \x93 |0 + \x8A |0 + \x8B |0 + \x97 |0 + \x98 |0 + \xBE |0 + \xD5 |0 + \xC7 |0 + \xD7 |0 + \xC6 |0 + \xD6 |0 + \x8D |0 + \xA5 |0 + \xA3 |0 + \xA4 |0 + \xCF |0 + \xD8 |0 + \xEF |0 + \xF2 |0 + \xA6 |0 + \xF7 |0 + \x07 |1 + \x13 |1 + \x1B |1 + \x18 |1 + \x1A |1 + \x19 |1 + \x1D |1 + \x12 |1 + \x17 |1 + \xF9 |0 + \x1C |1 + \x7F |2 + \xC4 |0 + \xB3 |0 + \xDA |0 + \xBF |0 + \xC0 |0 + \xD9 |0 + \xC3 |0 + \xB4 |0 + \xC2 |0 + \xC1 |0 + \xC5 |0 + \xCD |0 + \xBA |0 + \xC9 |0 + \xBB |0 + \xC8 |0 + \xBC |0 + \xCC |0 + \xB9 |0 + \xCB |0 + \xCA |0 + \xCE |0 + \xDF |0 + \xDC |0 + \xDB |0 + \xDD |0 + \xDE |0 + \xB0 |0 + \xB1 |0 + \xB2 |0 + \xFE |0 + \x16 |1 + \x1E |1 + \x10 |1 + \x1F |1 + \x11 |1 + \x09 |1 + \x08 |1 + \x0A |1 + \x01 |1 + \x02 |1 + \x0F |1 + \x0C |1 + \x0B |1 + \x06 |1 + \x05 |1 + \x03 |1 + \x04 |1 + \x0D |1 + \x0E |1 + \x21 |1 + \x22 |1 + \x23 |1 + \x24 |1 + \x25 |1 + \x26 |1 + \x27 |1 + \x28 |1 + \x29 |1 + \x2A |1 + \x2B |1 + \x2C |1 + \x2D |1 + \x2E |1 + \x2F |1 + \x30 |1 + \x31 |1 + \x32 |1 + \x33 |1 + \x34 |1 + \x35 |1 + \x36 |1 + \x37 |1 + \x38 |1 + \x39 |1 + \x3A |1 + \x3B |1 + \x3C |1 + \x3D |1 + \x3E |1 + \x3F |1 + \x40 |1 + \x41 |1 + \x42 |1 + \x43 |1 + \x44 |1 + \x45 |1 + \x46 |1 + \x47 |1 + \x48 |1 + \x49 |1 + \x4A |1 + \x4B |1 + \x4C |1 + \x4D |1 + \x4E |1 + \x4F |1 + \x50 |1 + \x51 |1 + \x52 |1 + \x53 |1 + \x54 |1 + \x55 |1 + \x56 |1 + \x57 |1 + \x58 |1 + \x59 |1 + \x5A |1 + \x5B |1 + \x5C |1 + \x5D |1 + \x5E |1 + \x5F |1 + \x60 |1 + \x61 |1 + \x62 |1 + \x63 |1 + \x64 |1 + \x65 |1 + \x66 |1 + \x67 |1 + \x68 |1 + \x69 |1 + \x6A |1 + \x6B |1 + \x6C |1 + \x6D |1 + \x6E |1 + \x6F |1 + \x70 |1 + \x71 |1 + \x72 |1 + \x73 |1 + \x74 |1 + \x75 |1 + \x76 |1 + \x77 |1 + \x78 |1 + \x79 |1 + \x7A |1 + \x7B |1 + \x7C |1 + \x7D |1 + \x7E |1 + \xB3 |1 + \x1B |1 + \x18 |1 + \x1A |1 + \x19 |1 + \xFE |1 + \x09 |1 +END CHARMAP diff --git a/mcs/class/I18N/tools/cvt.sh b/mcs/class/I18N/tools/cvt.sh index f23a3ba0045..5a3ab482558 100755 --- a/mcs/class/I18N/tools/cvt.sh +++ b/mcs/class/I18N/tools/cvt.sh @@ -67,6 +67,20 @@ ${UCM2CP} --region Rare --page 708 --wpage 1256 \ --no-browser-save --no-mailnews-display \ --no-mailnews-save Rare/ibm-1089.ucm >Rare/CP708.cs +${UCM2CP} --region Rare --page 737 --wpage 1253 \ + --name 'Greek (DOS)' \ + --webname ibm737 --bodyname ibm737 \ + --headername ibm737 --no-browser-display \ + --no-browser-save --no-mailnews-display \ + --no-mailnews-save Rare/ibm-737.ucm >Rare/CP737.cs + +${UCM2CP} --region Rare --page 775 --wpage 1257 \ + --name 'Baltic (DOS)' \ + --webname ibm775 --bodyname ibm775 \ + --headername ibm775 --no-browser-display \ + --no-browser-save --no-mailnews-display \ + --no-mailnews-save Rare/ibm-775.ucm >Rare/CP775.cs + ${UCM2CP} --region West --page 850 --wpage 1252 \ --name 'Western European (DOS)' \ --webname ibm850 --bodyname ibm850 \ @@ -481,8 +495,6 @@ exit 0 # 709 Arabic - ASMO 449+, BCON V4 # 710 Arabic - Transparent Arabic # 720 Arabic - Transparent ASMO -# 737 OEM - Greek (formerly 437G) -# 775 OEM - Baltic # 936 Chinese Simplified (GB2312) # 949 Korean # 950 Chinese Traditional (Big5) diff --git a/mcs/class/corlib/ReferenceSources/EncodingTable.cs b/mcs/class/corlib/ReferenceSources/EncodingTable.cs index 4f768cfbf44..fe5b7f8a91b 100644 --- a/mcs/class/corlib/ReferenceSources/EncodingTable.cs +++ b/mcs/class/corlib/ReferenceSources/EncodingTable.cs @@ -535,8 +535,8 @@ ENC ("x-x-big5", 950), MapCodePageDataItem( 500, 1252, "IBM500", 0), // "IBM EBCDIC (International)" MapCodePageDataItem( 708, 1256, "ASMO-708", MIMECONTF_BROWSER | MIMECONTF_SAVABLE_BROWSER), // "Arabic (ASMO 708)" // MapCodePageDataItem( 720, 1256, "DOS-720", MIMECONTF_BROWSER | MIMECONTF_SAVABLE_BROWSER), // "Arabic (DOS)" -// MapCodePageDataItem( 737, 1253, "ibm737", 0), // "Greek (DOS)" -// MapCodePageDataItem( 775, 1257, "ibm775", 0), // "Baltic (DOS)" + MapCodePageDataItem( 737, 1253, "ibm737", 0), // "Greek (DOS)" + MapCodePageDataItem( 775, 1257, "ibm775", 0), // "Baltic (DOS)" MapCodePageDataItem( 850, 1252, "ibm850", 0), // "Western European (DOS)" MapCodePageDataItem( 852, 1250, "ibm852", MIMECONTF_BROWSER | MIMECONTF_SAVABLE_BROWSER), // "Central European (DOS)" MapCodePageDataItem( 855, 1252, "IBM855", 0), // "OEM Cyrillic" -- 2.11.4.GIT