projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(char_byte_table): New type.
[chise/xemacs-chise.git-]
/
src
/
text-coding.c
diff --git
a/src/text-coding.c
b/src/text-coding.c
index
3a7a784
..
50a17fc
100644
(file)
--- a/
src/text-coding.c
+++ b/
src/text-coding.c
@@
-2558,12
+2558,15
@@
reset_encoding_stream (struct encoding_stream *str)
case CODESYS_UTF8:
str->encode_char = &char_encode_utf8;
str->finish = &char_finish_utf8;
case CODESYS_UTF8:
str->encode_char = &char_encode_utf8;
str->finish = &char_finish_utf8;
+ break;
case CODESYS_UCS4:
str->encode_char = &char_encode_ucs4;
str->finish = &char_finish_ucs4;
case CODESYS_UCS4:
str->encode_char = &char_encode_ucs4;
str->finish = &char_finish_ucs4;
+ break;
case CODESYS_SHIFT_JIS:
str->encode_char = &char_encode_shift_jis;
str->finish = &char_finish_shift_jis;
case CODESYS_SHIFT_JIS:
str->encode_char = &char_encode_shift_jis;
str->finish = &char_finish_shift_jis;
+ break;
default:
break;
}
default:
break;
}
@@
-3424,10
+3427,10
@@
void
char_encode_ucs4 (struct encoding_stream *str, Emchar ch,
unsigned_char_dynarr *dst, unsigned int *flags)
{
char_encode_ucs4 (struct encoding_stream *str, Emchar ch,
unsigned_char_dynarr *dst, unsigned int *flags)
{
- Dynarr_add (dst, ch >> 24);
- Dynarr_add (dst, (ch >> 16) & 255);
- Dynarr_add (dst, (ch >> 8) & 255);
- Dynarr_add (dst, ch & 255);
+ Dynarr_add (dst, ch >> 24);
+ Dynarr_add (dst, ch >> 16);
+ Dynarr_add (dst, ch >> 8);
+ Dynarr_add (dst, ch );
}
void
}
void
@@
-4784,23
+4787,27
@@
char_encode_iso2022 (struct encoding_stream *str, Emchar ch,
{
int reg;
{
int reg;
- BREAKUP_CHAR (ch, charset, byte1, byte2);
- ensure_correct_direction (XCHARSET_DIRECTION (charset),
- codesys, dst, flags, 0);
-
/* Now determine which register to use. */
reg = -1;
for (i = 0; i < 4; i++)
{
/* Now determine which register to use. */
reg = -1;
for (i = 0; i < 4; i++)
{
- if (EQ (charset, str->iso2022.charset[i]) ||
- EQ (charset,
- CODING_SYSTEM_ISO2022_INITIAL_CHARSET (codesys, i)))
+ if ((CHARSETP (charset = str->iso2022.charset[i])
+ && (byte1 = charset_get_byte1 (charset, ch))) ||
+ (CHARSETP
+ (charset
+ = CODING_SYSTEM_ISO2022_INITIAL_CHARSET (codesys, i))
+ && (byte1 = charset_get_byte1 (charset, ch))))
{
reg = i;
{
reg = i;
+ byte2 = charset_get_byte2 (charset, ch);
break;
}
}
break;
}
}
-
+ if (reg == -1)
+ BREAKUP_CHAR (ch, charset, byte1, byte2);
+ ensure_correct_direction (XCHARSET_DIRECTION (charset),
+ codesys, dst, flags, 0);
+
if (reg == -1)
{
if (XCHARSET_GRAPHIC (charset) != 0)
if (reg == -1)
{
if (XCHARSET_GRAPHIC (charset) != 0)