diff --git a/Claunia.Encoding/ATASCII.cs b/Claunia.Encoding/ATASCII.cs
index 5e284d4..16a2729 100644
--- a/Claunia.Encoding/ATASCII.cs
+++ b/Claunia.Encoding/ATASCII.cs
@@ -24,10 +24,12 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
+using System.Text;
+
namespace Claunia.Encoding
{
/// Represents an ATARI Standard Code for Information Interchange character encoding of Unicode characters.
- public class Atascii : SingleByteEncoding
+ public class Atascii : SingleByteEncodingWithRunes
{
public override string BodyName => "atascii";
public override int CodePage => 0;
@@ -44,244 +46,285 @@ namespace Claunia.Encoding
public override bool IsSingleByte => true;
/// The ATASCII to Unicode character map.
- protected override char[] CharTable => new[]
+ protected override Rune[] CharTable => new[]
{
// 0x00
- '\u2665', '\u251C', '\uFFFD', '\u2518', '\u2524', '\u2510', '\u2571', '\u2572',
+ new Rune(0x2665), new Rune(0x251C), new Rune(0x1FB87), new Rune(0x2518), new Rune(0x2524), new Rune(0x2510),
+ new Rune(0x2571), new Rune(0x2572),
// 0x08
- '\u25E2', '\u2597', '\u25E3', '\u259D', '\u2598', '\uFFFD', '\u2582', '\u2596',
+ new Rune(0x25E2), new Rune(0x2597), new Rune(0x25E3), new Rune(0x259D), new Rune(0x2598), new Rune(0x1FB82),
+ new Rune(0x2582), new Rune(0x2596),
// 0x10
- '\u2663', '\u250C', '\u2500', '\u253C', '\u25CF', '\u2584', '\u258E', '\u252C',
+ new Rune(0x2663), new Rune(0x250C), new Rune(0x2500), new Rune(0x253C), new Rune(0x25CF), new Rune(0x2584),
+ new Rune(0x258E), new Rune(0x252C),
// 0x18
- '\u2534', '\u258C', '\u2514', '\u001B', '\u2191', '\u2193', '\u2190', '\u2192',
+ new Rune(0x2534), new Rune(0x258C), new Rune(0x2514), new Rune(0x001B), new Rune(0x2191), new Rune(0x2193),
+ new Rune(0x2190), new Rune(0x2192),
// 0x20
- '\u0020', '\u0021', '\u0022', '\u0023', '\u0024', '\u0025', '\u0026', '\u0027',
+ new Rune(0x0020), new Rune(0x0021), new Rune(0x0022), new Rune(0x0023), new Rune(0x0024), new Rune(0x0025),
+ new Rune(0x0026), new Rune(0x0027),
// 0x28
- '\u0028', '\u0029', '\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F',
+ new Rune(0x0028), new Rune(0x0029), new Rune(0x002A), new Rune(0x002B), new Rune(0x002C), new Rune(0x002D),
+ new Rune(0x002E), new Rune(0x002F),
// 0x30
- '\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', '\u0036', '\u0037',
+ new Rune(0x0030), new Rune(0x0031), new Rune(0x0032), new Rune(0x0033), new Rune(0x0034), new Rune(0x0035),
+ new Rune(0x0036), new Rune(0x0037),
// 0x38
- '\u0038', '\u0039', '\u003A', '\u003B', '\u003C', '\u003D', '\u003E', '\u003F',
+ new Rune(0x0038), new Rune(0x0039), new Rune(0x003A), new Rune(0x003B), new Rune(0x003C), new Rune(0x003D),
+ new Rune(0x003E), new Rune(0x003F),
// 0x40
- '\u0040', '\u0041', '\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047',
+ new Rune(0x0040), new Rune(0x0041), new Rune(0x0042), new Rune(0x0043), new Rune(0x0044), new Rune(0x0045),
+ new Rune(0x0046), new Rune(0x0047),
// 0x48
- '\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', '\u004E', '\u004F',
+ new Rune(0x0048), new Rune(0x0049), new Rune(0x004A), new Rune(0x004B), new Rune(0x004C), new Rune(0x004D),
+ new Rune(0x004E), new Rune(0x004F),
// 0x50
- '\u0050', '\u0051', '\u0052', '\u0053', '\u0054', '\u0055', '\u0056', '\u0057',
+ new Rune(0x0050), new Rune(0x0051), new Rune(0x0052), new Rune(0x0053), new Rune(0x0054), new Rune(0x0055),
+ new Rune(0x0056), new Rune(0x0057),
// 0x58
- '\u0058', '\u0059', '\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F',
+ new Rune(0x0058), new Rune(0x0059), new Rune(0x005A), new Rune(0x005B), new Rune(0x005C), new Rune(0x005D),
+ new Rune(0x005E), new Rune(0x005F),
// 0x60
- '\u2666', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', '\u0066', '\u0067',
+ new Rune(0x2666), new Rune(0x0061), new Rune(0x0062), new Rune(0x0063), new Rune(0x0064), new Rune(0x0065),
+ new Rune(0x0066), new Rune(0x0067),
// 0x68
- '\u0068', '\u0069', '\u006A', '\u006B', '\u006C', '\u006D', '\u006E', '\u006F',
+ new Rune(0x0068), new Rune(0x0069), new Rune(0x006A), new Rune(0x006B), new Rune(0x006C), new Rune(0x006D),
+ new Rune(0x006E), new Rune(0x006F),
// 0x70
- '\u0070', '\u0071', '\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077',
+ new Rune(0x0070), new Rune(0x0071), new Rune(0x0072), new Rune(0x0073), new Rune(0x0074), new Rune(0x0075),
+ new Rune(0x0076), new Rune(0x0077),
// 0x78
- '\u0078', '\u0079', '\u007A', '\u2660', '\u007C', '\u21B0', '\u25C0', '\u25B6',
+ new Rune(0x0078), new Rune(0x0079), new Rune(0x007A), new Rune(0x2660), new Rune(0x007C), new Rune(0x1F8B0),
+ new Rune(0x25C0), new Rune(0x25B6),
// 0x80
- '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000',
+ new Rune(0x0000), new Rune(0x0000), new Rune(0x258A), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000),
+ new Rune(0x0000), new Rune(0x0000),
// 0x88
- '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000',
+ new Rune(0x25E4), new Rune(0x259B), new Rune(0x25E5), new Rune(0x2599), new Rune(0x259F), new Rune(0x2586),
+ new Rune(0x0000), new Rune(0x259C),
// 0x90
- '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000',
+ new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x25D8), new Rune(0x2580),
+ new Rune(0x0000), new Rune(0x0000),
// 0x98
- '\u0000', '\u0000', '\u0000', '\u000D', '\u0000', '\u0000', '\u0000', '\u0000',
+ new Rune(0x0000), new Rune(0x2590), new Rune(0x0000), new Rune(0x000D), new Rune(0x0000), new Rune(0x0000),
+ new Rune(0x0000), new Rune(0x0000),
// 0xA0
- '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000',
+ new Rune(0x2588), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000),
+ new Rune(0x0000), new Rune(0x0000),
// 0xA8
- '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000',
+ new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000),
+ new Rune(0x0000), new Rune(0x0000),
// 0xB0
- '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000',
+ new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000),
+ new Rune(0x0000), new Rune(0x0000),
// 0xB8
- '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000',
+ new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000),
+ new Rune(0x0000), new Rune(0x0000),
// 0xC0
- '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000',
+ new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000),
+ new Rune(0x0000), new Rune(0x0000),
// 0xC8
- '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000',
+ new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000),
+ new Rune(0x0000), new Rune(0x0000),
// 0xD0
- '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000',
+ new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000),
+ new Rune(0x0000), new Rune(0x0000),
// 0xD8
- '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000',
+ new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000),
+ new Rune(0x0000), new Rune(0x0000),
// 0xE0
- '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000',
+ new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000),
+ new Rune(0x0000), new Rune(0x0000),
// 0xE8
- '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000',
+ new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000),
+ new Rune(0x0000), new Rune(0x0000),
// 0xF0
- '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000',
+ new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000),
+ new Rune(0x0000), new Rune(0x0000),
// 0xF8
- '\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0007', '\u0000', '\u0000'
+ new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0000), new Rune(0x0007),
+ new Rune(0x0000), new Rune(0x0000)
};
/// Converts a Unicode character to an ATASCII character
/// ATASCII character.
/// Unicode character.
- private protected override byte GetByte(char character)
+ private protected override byte GetByte(Rune character) => character.Value switch
{
- switch(character)
- {
- case '\u2665': return 0x00;
- case '\u251C': return 0x01;
- case '\u2518': return 0x03;
- case '\u2524': return 0x04;
- case '\u2510': return 0x05;
- case '\u2571': return 0x06;
- case '\u2572': return 0x07;
- case '\u25E2': return 0x08;
- case '\u2597': return 0x09;
- case '\u25E3': return 0x0A;
- case '\u259D': return 0x0B;
- case '\u2598': return 0x0C;
- case '\u2582': return 0x0E;
- case '\u2596': return 0x0F;
- case '\u2663': return 0x10;
- case '\u250C': return 0x11;
- case '\u2500': return 0x12;
- case '\u253C': return 0x13;
- case '\u25CF': return 0x14;
- case '\u2584': return 0x15;
- case '\u258E': return 0x16;
- case '\u252C': return 0x17;
- case '\u2534': return 0x18;
- case '\u258C': return 0x19;
- case '\u2514': return 0x1A;
- case '\u001B': return 0x1B;
- case '\u2191': return 0x1C;
- case '\u2193': return 0x1D;
- case '\u2190': return 0x1E;
- case '\u2192': return 0x1F;
- case '\u0020': return 0x20;
- case '\u0021': return 0x21;
- case '\u0022': return 0x22;
- case '\u0023': return 0x23;
- case '\u0024': return 0x24;
- case '\u0025': return 0x25;
- case '\u0026': return 0x26;
- case '\u0027': return 0x27;
- case '\u0028': return 0x28;
- case '\u0029': return 0x29;
- case '\u002A': return 0x2A;
- case '\u002B': return 0x2B;
- case '\u002C': return 0x2C;
- case '\u002D': return 0x2D;
- case '\u002E': return 0x2E;
- case '\u002F': return 0x2F;
- case '\u0030': return 0x30;
- case '\u0031': return 0x31;
- case '\u0032': return 0x32;
- case '\u0033': return 0x33;
- case '\u0034': return 0x34;
- case '\u0035': return 0x35;
- case '\u0036': return 0x36;
- case '\u0037': return 0x37;
- case '\u0038': return 0x38;
- case '\u0039': return 0x39;
- case '\u003A': return 0x3A;
- case '\u003B': return 0x3B;
- case '\u003C': return 0x3C;
- case '\u003D': return 0x3D;
- case '\u003E': return 0x3E;
- case '\u003F': return 0x3F;
- case '\u0040': return 0x40;
- case '\u0041': return 0x41;
- case '\u0042': return 0x42;
- case '\u0043': return 0x43;
- case '\u0044': return 0x44;
- case '\u0045': return 0x45;
- case '\u0046': return 0x46;
- case '\u0047': return 0x47;
- case '\u0048': return 0x48;
- case '\u0049': return 0x49;
- case '\u004A': return 0x4A;
- case '\u004B': return 0x4B;
- case '\u004C': return 0x4C;
- case '\u004D': return 0x4D;
- case '\u004E': return 0x4E;
- case '\u004F': return 0x4F;
- case '\u0050': return 0x50;
- case '\u0051': return 0x51;
- case '\u0052': return 0x52;
- case '\u0053': return 0x53;
- case '\u0054': return 0x54;
- case '\u0055': return 0x55;
- case '\u0056': return 0x56;
- case '\u0057': return 0x57;
- case '\u0058': return 0x58;
- case '\u0059': return 0x59;
- case '\u005A': return 0x5A;
- case '\u005B': return 0x5B;
- case '\u005C': return 0x5C;
- case '\u005D': return 0x5D;
- case '\u005E': return 0x5E;
- case '\u005F': return 0x5F;
- case '\u2666': return 0x60;
- case '\u0061': return 0x61;
- case '\u0062': return 0x62;
- case '\u0063': return 0x63;
- case '\u0064': return 0x64;
- case '\u0065': return 0x65;
- case '\u0066': return 0x66;
- case '\u0067': return 0x67;
- case '\u0068': return 0x68;
- case '\u0069': return 0x69;
- case '\u006A': return 0x6A;
- case '\u006B': return 0x6B;
- case '\u006C': return 0x6C;
- case '\u006D': return 0x6D;
- case '\u006E': return 0x6E;
- case '\u006F': return 0x6F;
- case '\u0070': return 0x70;
- case '\u0071': return 0x71;
- case '\u0072': return 0x72;
- case '\u0073': return 0x73;
- case '\u0074': return 0x74;
- case '\u0075': return 0x75;
- case '\u0076': return 0x76;
- case '\u0077': return 0x77;
- case '\u0078': return 0x78;
- case '\u0079': return 0x79;
- case '\u007A': return 0x7A;
- case '\u2660': return 0x7B;
- case '\u007C': return 0x7C;
- case '\u21B0': return 0x7D;
- case '\u25C0': return 0x7E;
- case '\u25B6': return 0x7F;
- case '\u000D': return 0x9B;
- case '\u0007': return 0xFD;
- default:
- // Fallback to '?'
- return 0x3F;
- }
- }
+ 0x2665 => 0x00,
+ 0x251C => 0x01,
+ 0x1FB87 => 0x02,
+ 0x2518 => 0x03,
+ 0x2524 => 0x04,
+ 0x2510 => 0x05,
+ 0x2571 => 0x06,
+ 0x2572 => 0x07,
+ 0x25E2 => 0x08,
+ 0x2597 => 0x09,
+ 0x25E3 => 0x0A,
+ 0x259D => 0x0B,
+ 0x2598 => 0x0C,
+ 0x1FB82 => 0x0D,
+ 0x2582 => 0x0E,
+ 0x2596 => 0x0F,
+ 0x2663 => 0x10,
+ 0x250C => 0x11,
+ 0x2500 => 0x12,
+ 0x253C => 0x13,
+ 0x25CF => 0x14,
+ 0x2584 => 0x15,
+ 0x258E => 0x16,
+ 0x252C => 0x17,
+ 0x2534 => 0x18,
+ 0x258C => 0x19,
+ 0x2514 => 0x1A,
+ 0x001B => 0x1B,
+ 0x2191 => 0x1C,
+ 0x2193 => 0x1D,
+ 0x2190 => 0x1E,
+ 0x2192 => 0x1F,
+ 0x0020 => 0x20,
+ 0x0021 => 0x21,
+ 0x0022 => 0x22,
+ 0x0023 => 0x23,
+ 0x0024 => 0x24,
+ 0x0025 => 0x25,
+ 0x0026 => 0x26,
+ 0x0027 => 0x27,
+ 0x0028 => 0x28,
+ 0x0029 => 0x29,
+ 0x002A => 0x2A,
+ 0x002B => 0x2B,
+ 0x002C => 0x2C,
+ 0x002D => 0x2D,
+ 0x002E => 0x2E,
+ 0x002F => 0x2F,
+ 0x0030 => 0x30,
+ 0x0031 => 0x31,
+ 0x0032 => 0x32,
+ 0x0033 => 0x33,
+ 0x0034 => 0x34,
+ 0x0035 => 0x35,
+ 0x0036 => 0x36,
+ 0x0037 => 0x37,
+ 0x0038 => 0x38,
+ 0x0039 => 0x39,
+ 0x003A => 0x3A,
+ 0x003B => 0x3B,
+ 0x003C => 0x3C,
+ 0x003D => 0x3D,
+ 0x003E => 0x3E,
+ 0x003F => 0x3F,
+ 0x0040 => 0x40,
+ 0x0041 => 0x41,
+ 0x0042 => 0x42,
+ 0x0043 => 0x43,
+ 0x0044 => 0x44,
+ 0x0045 => 0x45,
+ 0x0046 => 0x46,
+ 0x0047 => 0x47,
+ 0x0048 => 0x48,
+ 0x0049 => 0x49,
+ 0x004A => 0x4A,
+ 0x004B => 0x4B,
+ 0x004C => 0x4C,
+ 0x004D => 0x4D,
+ 0x004E => 0x4E,
+ 0x004F => 0x4F,
+ 0x0050 => 0x50,
+ 0x0051 => 0x51,
+ 0x0052 => 0x52,
+ 0x0053 => 0x53,
+ 0x0054 => 0x54,
+ 0x0055 => 0x55,
+ 0x0056 => 0x56,
+ 0x0057 => 0x57,
+ 0x0058 => 0x58,
+ 0x0059 => 0x59,
+ 0x005A => 0x5A,
+ 0x005B => 0x5B,
+ 0x005C => 0x5C,
+ 0x005D => 0x5D,
+ 0x005E => 0x5E,
+ 0x005F => 0x5F,
+ 0x2666 => 0x60,
+ 0x0061 => 0x61,
+ 0x0062 => 0x62,
+ 0x0063 => 0x63,
+ 0x0064 => 0x64,
+ 0x0065 => 0x65,
+ 0x0066 => 0x66,
+ 0x0067 => 0x67,
+ 0x0068 => 0x68,
+ 0x0069 => 0x69,
+ 0x006A => 0x6A,
+ 0x006B => 0x6B,
+ 0x006C => 0x6C,
+ 0x006D => 0x6D,
+ 0x006E => 0x6E,
+ 0x006F => 0x6F,
+ 0x0070 => 0x70,
+ 0x0071 => 0x71,
+ 0x0072 => 0x72,
+ 0x0073 => 0x73,
+ 0x0074 => 0x74,
+ 0x0075 => 0x75,
+ 0x0076 => 0x76,
+ 0x0077 => 0x77,
+ 0x0078 => 0x78,
+ 0x0079 => 0x79,
+ 0x007A => 0x7A,
+ 0x2660 => 0x7B,
+ 0x007C => 0x7C,
+ 0x1F8B0 => 0x7D,
+ 0x25C0 => 0x7E,
+ 0x25B6 => 0x7F,
+ 0x258A => 0x82,
+ 0x25E4 => 0x88,
+ 0x259B => 0x89,
+ 0x25E5 => 0x8A,
+ 0x2599 => 0x8B,
+ 0x259F => 0x8C,
+ 0x2586 => 0x8D,
+ 0x259C => 0x8F,
+ 0x25D8 => 0x94,
+ 0x2580 => 0x95,
+ 0x2590 => 0x99,
+ 0x000D => 0x9B,
+ 0x2588 => 0xA0,
+ 0x0007 => 0xFD,
+ _ => 0x3F
+ };
}
}
\ No newline at end of file