diff --git a/ReadSharp/Encodings/Encoder.cs b/ReadSharp/Encodings/Encoder.cs index ff0d89b..4975458 100644 --- a/ReadSharp/Encodings/Encoder.cs +++ b/ReadSharp/Encodings/Encoder.cs @@ -12,16 +12,41 @@ namespace ReadSharp.Encodings /// private static Dictionary customEncodings = new Dictionary() { - { "windows-1250", "Windows1250" } + { "windows-1250", "Windows1250" }, + { "windows-1251", "Windows1251" }, + { "windows-1252", "Windows1252" }, + { "windows-1253", "Windows1253" }, + { "windows-1254", "Windows1254" }, + { "windows-1255", "Windows1255" }, + { "windows-1256", "Windows1256" }, + { "windows-1257", "Windows1257" }, + { "windows-1258", "Windows1258" }, + { "iso-8859-1", "Iso88591" }, + { "iso-8859-2", "Iso88592" }, + { "iso-8859-3", "Iso88593" }, + { "iso-8859-4", "Iso88594" }, + { "iso-8859-5", "Iso88595" }, + { "iso-8859-6", "Iso88596" }, + { "iso-8859-7", "Iso88597" }, + { "iso-8859-8", "Iso88598" }, + { "iso-8859-9", "Iso88599" }, + { "iso-8859-13", "Iso885913" }, + { "iso-8859-15", "Iso885915" } }; + /// + /// try custom encoder + /// + private bool tryCustomEncoder; + + /// /// Initializes a new instance of the class. /// - public Encoder() + public Encoder(bool tryCustomEncoder = false) { - + this.tryCustomEncoder = tryCustomEncoder; } @@ -50,7 +75,7 @@ namespace ReadSharp.Encodings finally { // use a custom encoder - if (correctEncoding == null) + if (tryCustomEncoder && correctEncoding == null) { try { diff --git a/ReadSharp/Encodings/Iso88597.cs b/ReadSharp/Encodings/Iso88597.cs index fe50d0f..ad8035d 100644 --- a/ReadSharp/Encodings/Iso88597.cs +++ b/ReadSharp/Encodings/Iso88597.cs @@ -6,11 +6,11 @@ namespace ReadSharp.Encodings { /// /// A custom encoding class that provides encoding capabilities for the - /// 'Hebrew (ISO-Visual)' encoding under Silverlight.
+ /// 'Greek (ISO)' encoding under Silverlight.
/// This class was generated by a tool. For more information, visit /// http://www.hardcodet.net/2010/03/silverlight-text-encoding-class-generator /// - public class Iso88598 : Encoding + public class Iso88597 : Encoding { /// /// Gets the name registered with the @@ -23,7 +23,7 @@ namespace ReadSharp.Encodings { get { - return "iso-8859-8"; + return "iso-8859-7"; } } @@ -63,7 +63,7 @@ namespace ReadSharp.Encodings public byte? FallbackByte { get; private set; } - public Iso88598() + public Iso88597() { FallbackCharacter = '?'; } @@ -426,101 +426,101 @@ namespace ReadSharp.Encodings (char)158 /* byte 158 */ , (char)159 /* byte 159 */ , (char)160 /* byte 160 */ , - (char)63388 /* byte 161 */ , - (char)162 /* byte 162 */ , + (char)701 /* byte 161 */ , + (char)700 /* byte 162 */ , (char)163 /* byte 163 */ , - (char)164 /* byte 164 */ , - (char)165 /* byte 165 */ , + (char)63426 /* byte 164 */ , + (char)63427 /* byte 165 */ , (char)166 /* byte 166 */ , (char)167 /* byte 167 */ , (char)168 /* byte 168 */ , (char)169 /* byte 169 */ , - (char)215 /* byte 170 */ , + (char)63428 /* byte 170 */ , (char)171 /* byte 171 */ , (char)172 /* byte 172 */ , (char)173 /* byte 173 */ , - (char)174 /* byte 174 */ , - (char)8254 /* byte 175 */ , + (char)63429 /* byte 174 */ , + (char)8213 /* byte 175 */ , (char)176 /* byte 176 */ , (char)177 /* byte 177 */ , (char)178 /* byte 178 */ , (char)179 /* byte 179 */ , - (char)180 /* byte 180 */ , - (char)181 /* byte 181 */ , - (char)182 /* byte 182 */ , + (char)900 /* byte 180 */ , + (char)901 /* byte 181 */ , + (char)902 /* byte 182 */ , (char)183 /* byte 183 */ , - (char)184 /* byte 184 */ , - (char)185 /* byte 185 */ , - (char)247 /* byte 186 */ , + (char)904 /* byte 184 */ , + (char)905 /* byte 185 */ , + (char)906 /* byte 186 */ , (char)187 /* byte 187 */ , - (char)188 /* byte 188 */ , + (char)908 /* byte 188 */ , (char)189 /* byte 189 */ , - (char)190 /* byte 190 */ , - (char)63389 /* byte 191 */ , - (char)63390 /* byte 192 */ , - (char)63391 /* byte 193 */ , - (char)63392 /* byte 194 */ , - (char)63393 /* byte 195 */ , - (char)63394 /* byte 196 */ , - (char)63395 /* byte 197 */ , - (char)63396 /* byte 198 */ , - (char)63397 /* byte 199 */ , - (char)63398 /* byte 200 */ , - (char)63399 /* byte 201 */ , - (char)63400 /* byte 202 */ , - (char)63401 /* byte 203 */ , - (char)63402 /* byte 204 */ , - (char)63403 /* byte 205 */ , - (char)63404 /* byte 206 */ , - (char)63405 /* byte 207 */ , - (char)63406 /* byte 208 */ , - (char)63407 /* byte 209 */ , - (char)63408 /* byte 210 */ , - (char)63409 /* byte 211 */ , - (char)63410 /* byte 212 */ , - (char)63411 /* byte 213 */ , - (char)63412 /* byte 214 */ , - (char)63413 /* byte 215 */ , - (char)63414 /* byte 216 */ , - (char)63415 /* byte 217 */ , - (char)63416 /* byte 218 */ , - (char)63417 /* byte 219 */ , - (char)63418 /* byte 220 */ , - (char)63419 /* byte 221 */ , - (char)63420 /* byte 222 */ , - (char)8215 /* byte 223 */ , - (char)1488 /* byte 224 */ , - (char)1489 /* byte 225 */ , - (char)1490 /* byte 226 */ , - (char)1491 /* byte 227 */ , - (char)1492 /* byte 228 */ , - (char)1493 /* byte 229 */ , - (char)1494 /* byte 230 */ , - (char)1495 /* byte 231 */ , - (char)1496 /* byte 232 */ , - (char)1497 /* byte 233 */ , - (char)1498 /* byte 234 */ , - (char)1499 /* byte 235 */ , - (char)1500 /* byte 236 */ , - (char)1501 /* byte 237 */ , - (char)1502 /* byte 238 */ , - (char)1503 /* byte 239 */ , - (char)1504 /* byte 240 */ , - (char)1505 /* byte 241 */ , - (char)1506 /* byte 242 */ , - (char)1507 /* byte 243 */ , - (char)1508 /* byte 244 */ , - (char)1509 /* byte 245 */ , - (char)1510 /* byte 246 */ , - (char)1511 /* byte 247 */ , - (char)1512 /* byte 248 */ , - (char)1513 /* byte 249 */ , - (char)1514 /* byte 250 */ , - (char)63421 /* byte 251 */ , - (char)63422 /* byte 252 */ , - (char)63423 /* byte 253 */ , - (char)63424 /* byte 254 */ , - (char)63425 /* byte 255 */ + (char)910 /* byte 190 */ , + (char)911 /* byte 191 */ , + (char)912 /* byte 192 */ , + (char)913 /* byte 193 */ , + (char)914 /* byte 194 */ , + (char)915 /* byte 195 */ , + (char)916 /* byte 196 */ , + (char)917 /* byte 197 */ , + (char)918 /* byte 198 */ , + (char)919 /* byte 199 */ , + (char)920 /* byte 200 */ , + (char)921 /* byte 201 */ , + (char)922 /* byte 202 */ , + (char)923 /* byte 203 */ , + (char)924 /* byte 204 */ , + (char)925 /* byte 205 */ , + (char)926 /* byte 206 */ , + (char)927 /* byte 207 */ , + (char)928 /* byte 208 */ , + (char)929 /* byte 209 */ , + (char)63430 /* byte 210 */ , + (char)931 /* byte 211 */ , + (char)932 /* byte 212 */ , + (char)933 /* byte 213 */ , + (char)934 /* byte 214 */ , + (char)935 /* byte 215 */ , + (char)936 /* byte 216 */ , + (char)937 /* byte 217 */ , + (char)938 /* byte 218 */ , + (char)939 /* byte 219 */ , + (char)940 /* byte 220 */ , + (char)941 /* byte 221 */ , + (char)942 /* byte 222 */ , + (char)943 /* byte 223 */ , + (char)944 /* byte 224 */ , + (char)945 /* byte 225 */ , + (char)946 /* byte 226 */ , + (char)947 /* byte 227 */ , + (char)948 /* byte 228 */ , + (char)949 /* byte 229 */ , + (char)950 /* byte 230 */ , + (char)951 /* byte 231 */ , + (char)952 /* byte 232 */ , + (char)953 /* byte 233 */ , + (char)954 /* byte 234 */ , + (char)955 /* byte 235 */ , + (char)956 /* byte 236 */ , + (char)957 /* byte 237 */ , + (char)958 /* byte 238 */ , + (char)959 /* byte 239 */ , + (char)960 /* byte 240 */ , + (char)961 /* byte 241 */ , + (char)962 /* byte 242 */ , + (char)963 /* byte 243 */ , + (char)964 /* byte 244 */ , + (char)965 /* byte 245 */ , + (char)966 /* byte 246 */ , + (char)967 /* byte 247 */ , + (char)968 /* byte 248 */ , + (char)969 /* byte 249 */ , + (char)970 /* byte 250 */ , + (char)971 /* byte 251 */ , + (char)972 /* byte 252 */ , + (char)973 /* byte 253 */ , + (char)974 /* byte 254 */ , + (char)63431 /* byte 255 */ }; #endregion @@ -694,101 +694,101 @@ namespace ReadSharp.Encodings { (char)158, 158 }, { (char)159, 159 }, { (char)160, 160 }, - { (char)63388, 161 }, - { (char)162, 162 }, + { (char)701, 161 }, + { (char)700, 162 }, { (char)163, 163 }, - { (char)164, 164 }, - { (char)165, 165 }, + { (char)63426, 164 }, + { (char)63427, 165 }, { (char)166, 166 }, { (char)167, 167 }, { (char)168, 168 }, { (char)169, 169 }, - { (char)215, 170 }, + { (char)63428, 170 }, { (char)171, 171 }, { (char)172, 172 }, { (char)173, 173 }, - { (char)174, 174 }, - { (char)8254, 175 }, + { (char)63429, 174 }, + { (char)8213, 175 }, { (char)176, 176 }, { (char)177, 177 }, { (char)178, 178 }, { (char)179, 179 }, - { (char)180, 180 }, - { (char)181, 181 }, - { (char)182, 182 }, + { (char)900, 180 }, + { (char)901, 181 }, + { (char)902, 182 }, { (char)183, 183 }, - { (char)184, 184 }, - { (char)185, 185 }, - { (char)247, 186 }, + { (char)904, 184 }, + { (char)905, 185 }, + { (char)906, 186 }, { (char)187, 187 }, - { (char)188, 188 }, + { (char)908, 188 }, { (char)189, 189 }, - { (char)190, 190 }, - { (char)63389, 191 }, - { (char)63390, 192 }, - { (char)63391, 193 }, - { (char)63392, 194 }, - { (char)63393, 195 }, - { (char)63394, 196 }, - { (char)63395, 197 }, - { (char)63396, 198 }, - { (char)63397, 199 }, - { (char)63398, 200 }, - { (char)63399, 201 }, - { (char)63400, 202 }, - { (char)63401, 203 }, - { (char)63402, 204 }, - { (char)63403, 205 }, - { (char)63404, 206 }, - { (char)63405, 207 }, - { (char)63406, 208 }, - { (char)63407, 209 }, - { (char)63408, 210 }, - { (char)63409, 211 }, - { (char)63410, 212 }, - { (char)63411, 213 }, - { (char)63412, 214 }, - { (char)63413, 215 }, - { (char)63414, 216 }, - { (char)63415, 217 }, - { (char)63416, 218 }, - { (char)63417, 219 }, - { (char)63418, 220 }, - { (char)63419, 221 }, - { (char)63420, 222 }, - { (char)8215, 223 }, - { (char)1488, 224 }, - { (char)1489, 225 }, - { (char)1490, 226 }, - { (char)1491, 227 }, - { (char)1492, 228 }, - { (char)1493, 229 }, - { (char)1494, 230 }, - { (char)1495, 231 }, - { (char)1496, 232 }, - { (char)1497, 233 }, - { (char)1498, 234 }, - { (char)1499, 235 }, - { (char)1500, 236 }, - { (char)1501, 237 }, - { (char)1502, 238 }, - { (char)1503, 239 }, - { (char)1504, 240 }, - { (char)1505, 241 }, - { (char)1506, 242 }, - { (char)1507, 243 }, - { (char)1508, 244 }, - { (char)1509, 245 }, - { (char)1510, 246 }, - { (char)1511, 247 }, - { (char)1512, 248 }, - { (char)1513, 249 }, - { (char)1514, 250 }, - { (char)63421, 251 }, - { (char)63422, 252 }, - { (char)63423, 253 }, - { (char)63424, 254 }, - { (char)63425, 255 } + { (char)910, 190 }, + { (char)911, 191 }, + { (char)912, 192 }, + { (char)913, 193 }, + { (char)914, 194 }, + { (char)915, 195 }, + { (char)916, 196 }, + { (char)917, 197 }, + { (char)918, 198 }, + { (char)919, 199 }, + { (char)920, 200 }, + { (char)921, 201 }, + { (char)922, 202 }, + { (char)923, 203 }, + { (char)924, 204 }, + { (char)925, 205 }, + { (char)926, 206 }, + { (char)927, 207 }, + { (char)928, 208 }, + { (char)929, 209 }, + { (char)63430, 210 }, + { (char)931, 211 }, + { (char)932, 212 }, + { (char)933, 213 }, + { (char)934, 214 }, + { (char)935, 215 }, + { (char)936, 216 }, + { (char)937, 217 }, + { (char)938, 218 }, + { (char)939, 219 }, + { (char)940, 220 }, + { (char)941, 221 }, + { (char)942, 222 }, + { (char)943, 223 }, + { (char)944, 224 }, + { (char)945, 225 }, + { (char)946, 226 }, + { (char)947, 227 }, + { (char)948, 228 }, + { (char)949, 229 }, + { (char)950, 230 }, + { (char)951, 231 }, + { (char)952, 232 }, + { (char)953, 233 }, + { (char)954, 234 }, + { (char)955, 235 }, + { (char)956, 236 }, + { (char)957, 237 }, + { (char)958, 238 }, + { (char)959, 239 }, + { (char)960, 240 }, + { (char)961, 241 }, + { (char)962, 242 }, + { (char)963, 243 }, + { (char)964, 244 }, + { (char)965, 245 }, + { (char)966, 246 }, + { (char)967, 247 }, + { (char)968, 248 }, + { (char)969, 249 }, + { (char)970, 250 }, + { (char)971, 251 }, + { (char)972, 252 }, + { (char)973, 253 }, + { (char)974, 254 }, + { (char)63431, 255 } }; #endregion diff --git a/ReadSharp/Encodings/Iso88598.cs b/ReadSharp/Encodings/Iso88598.cs index e2e2679..fe50d0f 100644 --- a/ReadSharp/Encodings/Iso88598.cs +++ b/ReadSharp/Encodings/Iso88598.cs @@ -1,11 +1,796 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; namespace ReadSharp.Encodings { - class Iso88598 + /// + /// A custom encoding class that provides encoding capabilities for the + /// 'Hebrew (ISO-Visual)' encoding under Silverlight.
+ /// This class was generated by a tool. For more information, visit + /// http://www.hardcodet.net/2010/03/silverlight-text-encoding-class-generator + /// + public class Iso88598 : Encoding { + /// + /// Gets the name registered with the + /// Internet Assigned Numbers Authority (IANA) for the current encoding. + /// + /// + /// The IANA name for the current . + /// + public override string WebName + { + get + { + return "iso-8859-8"; + } + } + + + private char? fallbackCharacter; + + /// + /// A character that can be set in order to make the encoding class + /// more fault tolerant. If this property is set, the encoding class will + /// use this property instead of throwing an exception if an unsupported + /// byte value is being passed for decoding. + /// + public char? FallbackCharacter + { + get { return fallbackCharacter; } + set + { + fallbackCharacter = value; + + if (value.HasValue && !charToByte.ContainsKey(value.Value)) + { + string msg = "Cannot use the character [{0}] (int value {1}) as fallback value " + + "- the fallback character itself is not supported by the encoding."; + msg = String.Format(msg, value.Value, (int)value.Value); + throw new EncoderFallbackException(msg); + } + + FallbackByte = value.HasValue ? charToByte[value.Value] : (byte?)null; + } + } + + /// + /// A byte value that corresponds to the . + /// It is used in encoding scenarios in case an unsupported character is + /// being passed for encoding. + /// + public byte? FallbackByte { get; private set; } + + + public Iso88598() + { + FallbackCharacter = '?'; + } + + /// + /// Encodes a set of characters from the specified character array into the specified byte array. + /// + /// + /// The actual number of bytes written into . + /// + /// The character array containing the set of characters to encode. + /// The index of the first character to encode. + /// The number of characters to encode. + /// The byte array to contain the resulting sequence of bytes. + /// The index at which to start writing the resulting sequence of bytes. + /// + public override int GetBytes(char[] chars, int charIndex, int charCount, byte[] bytes, int byteIndex) + { + return FallbackByte.HasValue + ? GetBytesWithFallBack(chars, charIndex, charCount, bytes, byteIndex) + : GetBytesWithoutFallback(chars, charIndex, charCount, bytes, byteIndex); + } + + + private int GetBytesWithFallBack(char[] chars, int charIndex, int charCount, byte[] bytes, int byteIndex) + { + for (int i = 0; i < charCount; i++) + { + var character = chars[i + charIndex]; + byte byteValue; + bool status = charToByte.TryGetValue(character, out byteValue); + + bytes[byteIndex + i] = status ? byteValue : FallbackByte.Value; + } + + return charCount; + } + + private int GetBytesWithoutFallback(char[] chars, int charIndex, int charCount, byte[] bytes, int byteIndex) + { + for (int i = 0; i < charCount; i++) + { + var character = chars[i + charIndex]; + byte byteValue; + bool status = charToByte.TryGetValue(character, out byteValue); + + if (!status) + { + //throw exception + string msg = + "The encoding [{0}] cannot encode the character [{1}] (int value {2}). Set the FallbackCharacter property in order to suppress this exception and encode a default character instead."; + msg = String.Format(msg, WebName, character, (int)character); + throw new EncoderFallbackException(msg); + } + + bytes[byteIndex + i] = byteValue; + } + + return charCount; + } + + + + /// + /// Decodes a sequence of bytes from the specified byte array into the specified character array. + /// + /// + /// The actual number of characters written into . + /// + /// The byte array containing the sequence of bytes to decode. + /// The index of the first byte to decode. + /// The number of bytes to decode. + /// The character array to contain the resulting set of characters. + /// The index at which to start writing the resulting set of characters. + /// + public override int GetChars(byte[] bytes, int byteIndex, int byteCount, char[] chars, int charIndex) + { + return FallbackCharacter.HasValue + ? GetCharsWithFallback(bytes, byteIndex, byteCount, chars, charIndex) + : GetCharsWithoutFallback(bytes, byteIndex, byteCount, chars, charIndex); + } + + + private int GetCharsWithFallback(byte[] bytes, int byteIndex, int byteCount, char[] chars, int charIndex) + { + for (int i = 0; i < byteCount; i++) + { + byte lookupIndex = bytes[i + byteIndex]; + + //if the byte value is not in our lookup array, fall back to default character + char result = lookupIndex >= byteToChar.Length + ? FallbackCharacter.Value + : byteToChar[lookupIndex]; + + chars[charIndex + i] = result; + } + + return byteCount; + } + + + + private int GetCharsWithoutFallback(byte[] bytes, int byteIndex, int byteCount, char[] chars, int charIndex) + { + for (int i = 0; i < byteCount; i++) + { + byte lookupIndex = bytes[i + byteIndex]; + if (lookupIndex >= byteToChar.Length) + { + //throw exception + string msg = "The encoding [{0}] cannot decode byte value [{1}]. Set the FallbackCharacter property in order to suppress this exception and decode the value as a default character instead."; + msg = String.Format(msg, WebName, lookupIndex); + throw new EncoderFallbackException(msg); + } + + + chars[charIndex + i] = byteToChar[lookupIndex]; + } + + return byteCount; + } + + + + /// + /// Calculates the number of bytes produced by encoding a set of characters + /// from the specified character array. + /// + /// + /// The number of bytes produced by encoding the specified characters. This class + /// alwas returns the value of . + /// + public override int GetByteCount(char[] chars, int index, int count) + { + return count; + } + + + /// + /// Calculates the number of characters produced by decoding a sequence + /// of bytes from the specified byte array. + /// + /// + /// The number of characters produced by decoding the specified sequence of bytes. This class + /// alwas returns the value of . + /// + public override int GetCharCount(byte[] bytes, int index, int count) + { + return count; + } + + + /// + /// Calculates the maximum number of bytes produced by encoding the specified number of characters. + /// + /// + /// The maximum number of bytes produced by encoding the specified number of characters. This + /// class alwas returns the value of . + /// + /// The number of characters to encode. + /// + public override int GetMaxByteCount(int charCount) + { + return charCount; + } + + /// + /// Calculates the maximum number of characters produced by decoding the specified number of bytes. + /// + /// + /// The maximum number of characters produced by decoding the specified number of bytes. This class + /// alwas returns the value of . + /// + /// The number of bytes to decode. + public override int GetMaxCharCount(int byteCount) + { + return byteCount; + } + + + /// + /// Gets the number of characters that are supported by this encoding. + /// This property returns a maximum value of 256, as the encoding class + /// only supports single byte encodings (1 byte == 256 possible values). + /// + public static int CharacterCount + { + get { return byteToChar.Length; } + } + + + #region Character Table + + /// + /// This table contains characters in an array. The index within the + /// array corresponds to the encoding's mapping of bytes to characters + /// (e.g. if a byte value of 5 is used to encode the character 'x', this + /// character will be stored at the array index 5. + /// + private static char[] byteToChar = new char[] + { + (char)0 /* byte 0 */ , + (char)1 /* byte 1 */ , + (char)2 /* byte 2 */ , + (char)3 /* byte 3 */ , + (char)4 /* byte 4 */ , + (char)5 /* byte 5 */ , + (char)6 /* byte 6 */ , + (char)7 /* byte 7 */ , + (char)8 /* byte 8 */ , + (char)9 /* byte 9 */ , + (char)10 /* byte 10 */ , + (char)11 /* byte 11 */ , + (char)12 /* byte 12 */ , + (char)13 /* byte 13 */ , + (char)14 /* byte 14 */ , + (char)15 /* byte 15 */ , + (char)16 /* byte 16 */ , + (char)17 /* byte 17 */ , + (char)18 /* byte 18 */ , + (char)19 /* byte 19 */ , + (char)20 /* byte 20 */ , + (char)21 /* byte 21 */ , + (char)22 /* byte 22 */ , + (char)23 /* byte 23 */ , + (char)24 /* byte 24 */ , + (char)25 /* byte 25 */ , + (char)26 /* byte 26 */ , + (char)27 /* byte 27 */ , + (char)28 /* byte 28 */ , + (char)29 /* byte 29 */ , + (char)30 /* byte 30 */ , + (char)31 /* byte 31 */ , + (char)32 /* byte 32 */ , + (char)33 /* byte 33 */ , + (char)34 /* byte 34 */ , + (char)35 /* byte 35 */ , + (char)36 /* byte 36 */ , + (char)37 /* byte 37 */ , + (char)38 /* byte 38 */ , + (char)39 /* byte 39 */ , + (char)40 /* byte 40 */ , + (char)41 /* byte 41 */ , + (char)42 /* byte 42 */ , + (char)43 /* byte 43 */ , + (char)44 /* byte 44 */ , + (char)45 /* byte 45 */ , + (char)46 /* byte 46 */ , + (char)47 /* byte 47 */ , + (char)48 /* byte 48 */ , + (char)49 /* byte 49 */ , + (char)50 /* byte 50 */ , + (char)51 /* byte 51 */ , + (char)52 /* byte 52 */ , + (char)53 /* byte 53 */ , + (char)54 /* byte 54 */ , + (char)55 /* byte 55 */ , + (char)56 /* byte 56 */ , + (char)57 /* byte 57 */ , + (char)58 /* byte 58 */ , + (char)59 /* byte 59 */ , + (char)60 /* byte 60 */ , + (char)61 /* byte 61 */ , + (char)62 /* byte 62 */ , + (char)63 /* byte 63 */ , + (char)64 /* byte 64 */ , + (char)65 /* byte 65 */ , + (char)66 /* byte 66 */ , + (char)67 /* byte 67 */ , + (char)68 /* byte 68 */ , + (char)69 /* byte 69 */ , + (char)70 /* byte 70 */ , + (char)71 /* byte 71 */ , + (char)72 /* byte 72 */ , + (char)73 /* byte 73 */ , + (char)74 /* byte 74 */ , + (char)75 /* byte 75 */ , + (char)76 /* byte 76 */ , + (char)77 /* byte 77 */ , + (char)78 /* byte 78 */ , + (char)79 /* byte 79 */ , + (char)80 /* byte 80 */ , + (char)81 /* byte 81 */ , + (char)82 /* byte 82 */ , + (char)83 /* byte 83 */ , + (char)84 /* byte 84 */ , + (char)85 /* byte 85 */ , + (char)86 /* byte 86 */ , + (char)87 /* byte 87 */ , + (char)88 /* byte 88 */ , + (char)89 /* byte 89 */ , + (char)90 /* byte 90 */ , + (char)91 /* byte 91 */ , + (char)92 /* byte 92 */ , + (char)93 /* byte 93 */ , + (char)94 /* byte 94 */ , + (char)95 /* byte 95 */ , + (char)96 /* byte 96 */ , + (char)97 /* byte 97 */ , + (char)98 /* byte 98 */ , + (char)99 /* byte 99 */ , + (char)100 /* byte 100 */ , + (char)101 /* byte 101 */ , + (char)102 /* byte 102 */ , + (char)103 /* byte 103 */ , + (char)104 /* byte 104 */ , + (char)105 /* byte 105 */ , + (char)106 /* byte 106 */ , + (char)107 /* byte 107 */ , + (char)108 /* byte 108 */ , + (char)109 /* byte 109 */ , + (char)110 /* byte 110 */ , + (char)111 /* byte 111 */ , + (char)112 /* byte 112 */ , + (char)113 /* byte 113 */ , + (char)114 /* byte 114 */ , + (char)115 /* byte 115 */ , + (char)116 /* byte 116 */ , + (char)117 /* byte 117 */ , + (char)118 /* byte 118 */ , + (char)119 /* byte 119 */ , + (char)120 /* byte 120 */ , + (char)121 /* byte 121 */ , + (char)122 /* byte 122 */ , + (char)123 /* byte 123 */ , + (char)124 /* byte 124 */ , + (char)125 /* byte 125 */ , + (char)126 /* byte 126 */ , + (char)127 /* byte 127 */ , + (char)128 /* byte 128 */ , + (char)129 /* byte 129 */ , + (char)130 /* byte 130 */ , + (char)131 /* byte 131 */ , + (char)132 /* byte 132 */ , + (char)133 /* byte 133 */ , + (char)134 /* byte 134 */ , + (char)135 /* byte 135 */ , + (char)136 /* byte 136 */ , + (char)137 /* byte 137 */ , + (char)138 /* byte 138 */ , + (char)139 /* byte 139 */ , + (char)140 /* byte 140 */ , + (char)141 /* byte 141 */ , + (char)142 /* byte 142 */ , + (char)143 /* byte 143 */ , + (char)144 /* byte 144 */ , + (char)145 /* byte 145 */ , + (char)146 /* byte 146 */ , + (char)147 /* byte 147 */ , + (char)148 /* byte 148 */ , + (char)149 /* byte 149 */ , + (char)150 /* byte 150 */ , + (char)151 /* byte 151 */ , + (char)152 /* byte 152 */ , + (char)153 /* byte 153 */ , + (char)154 /* byte 154 */ , + (char)155 /* byte 155 */ , + (char)156 /* byte 156 */ , + (char)157 /* byte 157 */ , + (char)158 /* byte 158 */ , + (char)159 /* byte 159 */ , + (char)160 /* byte 160 */ , + (char)63388 /* byte 161 */ , + (char)162 /* byte 162 */ , + (char)163 /* byte 163 */ , + (char)164 /* byte 164 */ , + (char)165 /* byte 165 */ , + (char)166 /* byte 166 */ , + (char)167 /* byte 167 */ , + (char)168 /* byte 168 */ , + (char)169 /* byte 169 */ , + (char)215 /* byte 170 */ , + (char)171 /* byte 171 */ , + (char)172 /* byte 172 */ , + (char)173 /* byte 173 */ , + (char)174 /* byte 174 */ , + (char)8254 /* byte 175 */ , + (char)176 /* byte 176 */ , + (char)177 /* byte 177 */ , + (char)178 /* byte 178 */ , + (char)179 /* byte 179 */ , + (char)180 /* byte 180 */ , + (char)181 /* byte 181 */ , + (char)182 /* byte 182 */ , + (char)183 /* byte 183 */ , + (char)184 /* byte 184 */ , + (char)185 /* byte 185 */ , + (char)247 /* byte 186 */ , + (char)187 /* byte 187 */ , + (char)188 /* byte 188 */ , + (char)189 /* byte 189 */ , + (char)190 /* byte 190 */ , + (char)63389 /* byte 191 */ , + (char)63390 /* byte 192 */ , + (char)63391 /* byte 193 */ , + (char)63392 /* byte 194 */ , + (char)63393 /* byte 195 */ , + (char)63394 /* byte 196 */ , + (char)63395 /* byte 197 */ , + (char)63396 /* byte 198 */ , + (char)63397 /* byte 199 */ , + (char)63398 /* byte 200 */ , + (char)63399 /* byte 201 */ , + (char)63400 /* byte 202 */ , + (char)63401 /* byte 203 */ , + (char)63402 /* byte 204 */ , + (char)63403 /* byte 205 */ , + (char)63404 /* byte 206 */ , + (char)63405 /* byte 207 */ , + (char)63406 /* byte 208 */ , + (char)63407 /* byte 209 */ , + (char)63408 /* byte 210 */ , + (char)63409 /* byte 211 */ , + (char)63410 /* byte 212 */ , + (char)63411 /* byte 213 */ , + (char)63412 /* byte 214 */ , + (char)63413 /* byte 215 */ , + (char)63414 /* byte 216 */ , + (char)63415 /* byte 217 */ , + (char)63416 /* byte 218 */ , + (char)63417 /* byte 219 */ , + (char)63418 /* byte 220 */ , + (char)63419 /* byte 221 */ , + (char)63420 /* byte 222 */ , + (char)8215 /* byte 223 */ , + (char)1488 /* byte 224 */ , + (char)1489 /* byte 225 */ , + (char)1490 /* byte 226 */ , + (char)1491 /* byte 227 */ , + (char)1492 /* byte 228 */ , + (char)1493 /* byte 229 */ , + (char)1494 /* byte 230 */ , + (char)1495 /* byte 231 */ , + (char)1496 /* byte 232 */ , + (char)1497 /* byte 233 */ , + (char)1498 /* byte 234 */ , + (char)1499 /* byte 235 */ , + (char)1500 /* byte 236 */ , + (char)1501 /* byte 237 */ , + (char)1502 /* byte 238 */ , + (char)1503 /* byte 239 */ , + (char)1504 /* byte 240 */ , + (char)1505 /* byte 241 */ , + (char)1506 /* byte 242 */ , + (char)1507 /* byte 243 */ , + (char)1508 /* byte 244 */ , + (char)1509 /* byte 245 */ , + (char)1510 /* byte 246 */ , + (char)1511 /* byte 247 */ , + (char)1512 /* byte 248 */ , + (char)1513 /* byte 249 */ , + (char)1514 /* byte 250 */ , + (char)63421 /* byte 251 */ , + (char)63422 /* byte 252 */ , + (char)63423 /* byte 253 */ , + (char)63424 /* byte 254 */ , + (char)63425 /* byte 255 */ + }; + + #endregion + + + #region Byte Lookup Dictionary + + /// + /// This dictionary is used to resolve byte values for a given character. + /// + private static Dictionary charToByte = new Dictionary + { + { (char)0, 0 }, + { (char)1, 1 }, + { (char)2, 2 }, + { (char)3, 3 }, + { (char)4, 4 }, + { (char)5, 5 }, + { (char)6, 6 }, + { (char)7, 7 }, + { (char)8, 8 }, + { (char)9, 9 }, + { (char)10, 10 }, + { (char)11, 11 }, + { (char)12, 12 }, + { (char)13, 13 }, + { (char)14, 14 }, + { (char)15, 15 }, + { (char)16, 16 }, + { (char)17, 17 }, + { (char)18, 18 }, + { (char)19, 19 }, + { (char)20, 20 }, + { (char)21, 21 }, + { (char)22, 22 }, + { (char)23, 23 }, + { (char)24, 24 }, + { (char)25, 25 }, + { (char)26, 26 }, + { (char)27, 27 }, + { (char)28, 28 }, + { (char)29, 29 }, + { (char)30, 30 }, + { (char)31, 31 }, + { (char)32, 32 }, + { (char)33, 33 }, + { (char)34, 34 }, + { (char)35, 35 }, + { (char)36, 36 }, + { (char)37, 37 }, + { (char)38, 38 }, + { (char)39, 39 }, + { (char)40, 40 }, + { (char)41, 41 }, + { (char)42, 42 }, + { (char)43, 43 }, + { (char)44, 44 }, + { (char)45, 45 }, + { (char)46, 46 }, + { (char)47, 47 }, + { (char)48, 48 }, + { (char)49, 49 }, + { (char)50, 50 }, + { (char)51, 51 }, + { (char)52, 52 }, + { (char)53, 53 }, + { (char)54, 54 }, + { (char)55, 55 }, + { (char)56, 56 }, + { (char)57, 57 }, + { (char)58, 58 }, + { (char)59, 59 }, + { (char)60, 60 }, + { (char)61, 61 }, + { (char)62, 62 }, + { (char)63, 63 }, + { (char)64, 64 }, + { (char)65, 65 }, + { (char)66, 66 }, + { (char)67, 67 }, + { (char)68, 68 }, + { (char)69, 69 }, + { (char)70, 70 }, + { (char)71, 71 }, + { (char)72, 72 }, + { (char)73, 73 }, + { (char)74, 74 }, + { (char)75, 75 }, + { (char)76, 76 }, + { (char)77, 77 }, + { (char)78, 78 }, + { (char)79, 79 }, + { (char)80, 80 }, + { (char)81, 81 }, + { (char)82, 82 }, + { (char)83, 83 }, + { (char)84, 84 }, + { (char)85, 85 }, + { (char)86, 86 }, + { (char)87, 87 }, + { (char)88, 88 }, + { (char)89, 89 }, + { (char)90, 90 }, + { (char)91, 91 }, + { (char)92, 92 }, + { (char)93, 93 }, + { (char)94, 94 }, + { (char)95, 95 }, + { (char)96, 96 }, + { (char)97, 97 }, + { (char)98, 98 }, + { (char)99, 99 }, + { (char)100, 100 }, + { (char)101, 101 }, + { (char)102, 102 }, + { (char)103, 103 }, + { (char)104, 104 }, + { (char)105, 105 }, + { (char)106, 106 }, + { (char)107, 107 }, + { (char)108, 108 }, + { (char)109, 109 }, + { (char)110, 110 }, + { (char)111, 111 }, + { (char)112, 112 }, + { (char)113, 113 }, + { (char)114, 114 }, + { (char)115, 115 }, + { (char)116, 116 }, + { (char)117, 117 }, + { (char)118, 118 }, + { (char)119, 119 }, + { (char)120, 120 }, + { (char)121, 121 }, + { (char)122, 122 }, + { (char)123, 123 }, + { (char)124, 124 }, + { (char)125, 125 }, + { (char)126, 126 }, + { (char)127, 127 }, + { (char)128, 128 }, + { (char)129, 129 }, + { (char)130, 130 }, + { (char)131, 131 }, + { (char)132, 132 }, + { (char)133, 133 }, + { (char)134, 134 }, + { (char)135, 135 }, + { (char)136, 136 }, + { (char)137, 137 }, + { (char)138, 138 }, + { (char)139, 139 }, + { (char)140, 140 }, + { (char)141, 141 }, + { (char)142, 142 }, + { (char)143, 143 }, + { (char)144, 144 }, + { (char)145, 145 }, + { (char)146, 146 }, + { (char)147, 147 }, + { (char)148, 148 }, + { (char)149, 149 }, + { (char)150, 150 }, + { (char)151, 151 }, + { (char)152, 152 }, + { (char)153, 153 }, + { (char)154, 154 }, + { (char)155, 155 }, + { (char)156, 156 }, + { (char)157, 157 }, + { (char)158, 158 }, + { (char)159, 159 }, + { (char)160, 160 }, + { (char)63388, 161 }, + { (char)162, 162 }, + { (char)163, 163 }, + { (char)164, 164 }, + { (char)165, 165 }, + { (char)166, 166 }, + { (char)167, 167 }, + { (char)168, 168 }, + { (char)169, 169 }, + { (char)215, 170 }, + { (char)171, 171 }, + { (char)172, 172 }, + { (char)173, 173 }, + { (char)174, 174 }, + { (char)8254, 175 }, + { (char)176, 176 }, + { (char)177, 177 }, + { (char)178, 178 }, + { (char)179, 179 }, + { (char)180, 180 }, + { (char)181, 181 }, + { (char)182, 182 }, + { (char)183, 183 }, + { (char)184, 184 }, + { (char)185, 185 }, + { (char)247, 186 }, + { (char)187, 187 }, + { (char)188, 188 }, + { (char)189, 189 }, + { (char)190, 190 }, + { (char)63389, 191 }, + { (char)63390, 192 }, + { (char)63391, 193 }, + { (char)63392, 194 }, + { (char)63393, 195 }, + { (char)63394, 196 }, + { (char)63395, 197 }, + { (char)63396, 198 }, + { (char)63397, 199 }, + { (char)63398, 200 }, + { (char)63399, 201 }, + { (char)63400, 202 }, + { (char)63401, 203 }, + { (char)63402, 204 }, + { (char)63403, 205 }, + { (char)63404, 206 }, + { (char)63405, 207 }, + { (char)63406, 208 }, + { (char)63407, 209 }, + { (char)63408, 210 }, + { (char)63409, 211 }, + { (char)63410, 212 }, + { (char)63411, 213 }, + { (char)63412, 214 }, + { (char)63413, 215 }, + { (char)63414, 216 }, + { (char)63415, 217 }, + { (char)63416, 218 }, + { (char)63417, 219 }, + { (char)63418, 220 }, + { (char)63419, 221 }, + { (char)63420, 222 }, + { (char)8215, 223 }, + { (char)1488, 224 }, + { (char)1489, 225 }, + { (char)1490, 226 }, + { (char)1491, 227 }, + { (char)1492, 228 }, + { (char)1493, 229 }, + { (char)1494, 230 }, + { (char)1495, 231 }, + { (char)1496, 232 }, + { (char)1497, 233 }, + { (char)1498, 234 }, + { (char)1499, 235 }, + { (char)1500, 236 }, + { (char)1501, 237 }, + { (char)1502, 238 }, + { (char)1503, 239 }, + { (char)1504, 240 }, + { (char)1505, 241 }, + { (char)1506, 242 }, + { (char)1507, 243 }, + { (char)1508, 244 }, + { (char)1509, 245 }, + { (char)1510, 246 }, + { (char)1511, 247 }, + { (char)1512, 248 }, + { (char)1513, 249 }, + { (char)1514, 250 }, + { (char)63421, 251 }, + { (char)63422, 252 }, + { (char)63423, 253 }, + { (char)63424, 254 }, + { (char)63425, 255 } + }; + + #endregion } } diff --git a/ReadSharp/ReadSharp.csproj b/ReadSharp/ReadSharp.csproj index efb83ce..91bf9fe 100644 --- a/ReadSharp/ReadSharp.csproj +++ b/ReadSharp/ReadSharp.csproj @@ -40,7 +40,26 @@ + + + + + + + + + + + + + + + + + + + diff --git a/ReadSharp/Reader.cs b/ReadSharp/Reader.cs index 106f358..c9d095f 100644 --- a/ReadSharp/Reader.cs +++ b/ReadSharp/Reader.cs @@ -59,7 +59,7 @@ namespace ReadSharp ); // initialize custom encoder - _encoder = new Encodings.Encoder(); + _encoder = new Encodings.Encoder(true); // override user agent if (!string.IsNullOrEmpty(userAgent))