--- rxvt-unicode/src/table/iso8859_10.h 2003/11/24 17:28:08 1.1 +++ rxvt-unicode/src/table/iso8859_10.h 2004/08/04 03:29:28 1.4 @@ -21,19 +21,8 @@ 0xaa, 0xba, 0x00, 0x00, 0x00, 0x00, 0xab, 0xbb, 0xd7, 0xf7, 0xae, 0xbe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd9, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xac, 0xbc }; -static const uint16_t iso8859_10_t_0[] = { - 0x00a0, 0x0104, 0x0112, 0x0122, 0x012a, 0x0128, 0x0136, 0x00a7, 0x013b, 0x0110, 0x0160, 0x0166, - 0x017d, 0x00ad, 0x016a, 0x014a, 0x00b0, 0x0105, 0x0113, 0x0123, 0x012b, 0x0129, 0x0137, 0x00b7, - 0x013c, 0x0111, 0x0161, 0x0167, 0x017e, 0x2015, 0x016b, 0x014b, 0x0100, 0x00c1, 0x00c2, 0x00c3, - 0x00c4, 0x00c5, 0x00c6, 0x012e, 0x010c, 0x00c9, 0x0118, 0x00cb, 0x0116, 0x00cd, 0x00ce, 0x00cf, - 0x00d0, 0x0145, 0x014c, 0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x0168, 0x00d8, 0x0172, 0x00da, 0x00db, - 0x00dc, 0x00dd, 0x00de, 0x00df, 0x0101, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x012f, - 0x010d, 0x00e9, 0x0119, 0x00eb, 0x0117, 0x00ed, 0x00ee, 0x00ef, 0x00f0, 0x0146, 0x014d, 0x00f3, - 0x00f4, 0x00f5, 0x00f6, 0x0169, 0x00f8, 0x0173, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x0138 -}; -struct rxvt_codeset_conv_iso8859_10 : rxvt_codeset_conv { - uint32_t from_unicode (uint32_t unicode) const { +static uint32_t cs_iso8859_10_from_unicode (unicode_t unicode) { if (unicode <= 0x009f) return unicode; if (unicode == 0x2015) return 0x00bd; if (0x00a0 <= unicode && unicode <= 0x00fe) @@ -41,17 +30,11 @@ if (0x0100 <= unicode && unicode <= 0x017e) return iso8859_10_f_256[unicode - 0x0100] == 0 ? NOCHAR : iso8859_10_f_256[unicode - 0x0100]; return NOCHAR; - } - uint32_t to_unicode (uint32_t enc) const { - if (enc <= 0x009f) return enc; - if (0x00a0 <= enc && enc <= 0x00ff) - return iso8859_10_t_0[enc - 0x00a0]; - return NOCHAR; - } -} rxvt_codeset_conv_iso8859_10; +} #else -#define rxvt_codeset_conv_iso8859_10 rxvt_codeset_conv_unknown +#define cs_iso8859_10_from_unicode cs_unknown_from_unicode +#define cs_iso8859_10_to_unicode cs_unknown_to_unicode #endif