CTEXT_ISO8859_9,
CTEXT_GB2312,
CTEXT_KSC5601,
- CTEXT_JISX0208
+ CTEXT_JISX0208,
+ CTEXT_JISX0212
};
static long int ctext_to_ucs(int subcharset, unsigned long bytes)
{
case CTEXT_JISX0208:
return jisx0208_to_unicode(((bytes >> 8) & 0xFF) - 0x21,
((bytes ) & 0xFF) - 0x21);
+ case CTEXT_JISX0212:
+ return jisx0212_to_unicode(((bytes >> 8) & 0xFF) - 0x21,
+ ((bytes ) & 0xFF) - 0x21);
default: return ERROR;
}
}
*subcharset = CTEXT_JISX0208;
*bytes = ((r+0x21) << 8) | (c+0x21);
return 1;
+ } else if (unicode_to_jisx0212(ucs, &r, &c)) {
+ *subcharset = CTEXT_JISX0212;
+ *bytes = ((r+0x21) << 8) | (c+0x21);
+ return 1;
} else {
return 0;
}
}
#define SEQ(str,cont,cs) \
- {str,~(63<<(6*((cont&~RO)))),(cs)<<(6*((cont&~RO))),(cont),(cs)}
+ {str,~(63<<(6*(((cont)&~RO)))),(cs)<<(6*(((cont)&~RO))),(cont),(cs)}
/*
* Compound text defines restrictions on which container can take
* which character sets. Things labelled `left half of' can only go
SEQ("\033$(A", 0|RO, CTEXT_GB2312),
SEQ("\033$(B", 0|RO, CTEXT_JISX0208),
SEQ("\033$(C", 0|RO, CTEXT_KSC5601),
+ SEQ("\033$(D", 0|RO, CTEXT_JISX0212),
SEQ("\033$)A", 1, CTEXT_GB2312),
SEQ("\033$)B", 1, CTEXT_JISX0208),
SEQ("\033$)C", 1, CTEXT_KSC5601),
+ SEQ("\033$)D", 1, CTEXT_JISX0212),
SEQ("\033(B", 0, CTEXT_ASCII),
SEQ("\033(J", 0, CTEXT_JISX0201_LEFT),
+ SEQ("\033)I", 1, CTEXT_JISX0201_RIGHT),
SEQ("\033-A", 1, CTEXT_ISO8859_1),
SEQ("\033-B", 1, CTEXT_ISO8859_2),
SEQ("\033-C", 1, CTEXT_ISO8859_3),
SEQ("\033-F", 1, CTEXT_ISO8859_7),
SEQ("\033-G", 1, CTEXT_ISO8859_6),
SEQ("\033-H", 1, CTEXT_ISO8859_8),
- SEQ("\033)I", 1, CTEXT_JISX0201_RIGHT),
SEQ("\033-L", 1, CTEXT_ISO8859_5),
SEQ("\033-M", 1, CTEXT_ISO8859_9),
};
static struct iso2022 ctext = {
ctext_escapes, lenof(ctext_escapes),
- "\1\1\1\1\1\1\1\1\1\1\1\1\2\2\2", /* must match the enum above */
- "", 0x80000000 | (CTEXT_ASCII<<0) | (CTEXT_ASCII<<6), "", TRUE,
+ "\1\1\1\1\1\1\1\1\1\1\1\1\2\2\2\2", /* must match the enum above */
+ "", 0x80000000 | (CTEXT_ASCII<<0) | (CTEXT_ISO8859_1<<6), "", TRUE,
ctext_to_ucs, ctext_from_ucs
};
const charset_spec charset_CS_CTEXT = {