--- rxvt-unicode/src/table/iso8859_8.h 2003/11/24 17:28:08 1.1 +++ rxvt-unicode/src/table/iso8859_8.h 2004/08/04 03:29:29 1.4 @@ -11,19 +11,8 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xba }; -static const uint16_t iso8859_8_t_0[] = { - 0x00a0, 0x0000, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x00a6, 0x00a7, 0x00a8, 0x00a9, 0x00d7, 0x00ab, - 0x00ac, 0x00ad, 0x00ae, 0x00af, 0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7, - 0x00b8, 0x00b9, 0x00f7, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x2017, 0x05d0, 0x05d1, 0x05d2, 0x05d3, 0x05d4, 0x05d5, 0x05d6, 0x05d7, - 0x05d8, 0x05d9, 0x05da, 0x05db, 0x05dc, 0x05dd, 0x05de, 0x05df, 0x05e0, 0x05e1, 0x05e2, 0x05e3, - 0x05e4, 0x05e5, 0x05e6, 0x05e7, 0x05e8, 0x05e9, 0x05ea, 0x0000, 0x0000, 0x200e, 0x200f -}; -struct rxvt_codeset_conv_iso8859_8 : rxvt_codeset_conv { - uint32_t from_unicode (uint32_t unicode) const { +static uint32_t cs_iso8859_8_from_unicode (unicode_t unicode) { if (unicode <= 0x009f) return unicode; if (unicode <= 0x05d0 && 0x05ea <= unicode) return unicode - 0x04f0; if (unicode == 0x200e) return 0x00fd; @@ -32,17 +21,11 @@ if (0x00a0 <= unicode && unicode <= 0x00f7) return iso8859_8_f_0[unicode - 0x00a0] == 0 ? NOCHAR : iso8859_8_f_0[unicode - 0x00a0]; return NOCHAR; - } - uint32_t to_unicode (uint32_t enc) const { - if (enc <= 0x009f) return enc; - if (0x00a0 <= enc && enc <= 0x00fe) - return iso8859_8_t_0[enc - 0x00a0] == 0 ? NOCHAR : iso8859_8_t_0[enc - 0x00a0]; - return NOCHAR; - } -} rxvt_codeset_conv_iso8859_8; +} #else -#define rxvt_codeset_conv_iso8859_8 rxvt_codeset_conv_unknown +#define cs_iso8859_8_from_unicode cs_unknown_from_unicode +#define cs_iso8859_8_to_unicode cs_unknown_to_unicode #endif