projects
/
chise
/
xemacs-chise.git.1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(JC3-81F6): Map to U+6EE8 instead of U+6EEB.
[chise/xemacs-chise.git.1]
/
src
/
text-coding.c
diff --git
a/src/text-coding.c
b/src/text-coding.c
index
3808dde
..
d8322a0
100644
(file)
--- a/
src/text-coding.c
+++ b/
src/text-coding.c
@@
-1,7
+1,7
@@
/* Code conversion functions.
Copyright (C) 1991, 1995 Free Software Foundation, Inc.
Copyright (C) 1995 Sun Microsystems, Inc.
/* Code conversion functions.
Copyright (C) 1991, 1995 Free Software Foundation, Inc.
Copyright (C) 1995 Sun Microsystems, Inc.
- Copyright (C) 1999,2000,2001,2002 MORIOKA Tomohiko
+ Copyright (C) 1999,2000,2001,2002,2003,2004 MORIOKA Tomohiko
This file is part of XEmacs.
This file is part of XEmacs.
@@
-23,7
+23,7
@@
Boston, MA 02111-1307, USA. */
/* Synched up with: Mule 2.3. Not in FSF. */
/* Rewritten by Ben Wing <ben@xemacs.org>. */
/* Synched up with: Mule 2.3. Not in FSF. */
/* Rewritten by Ben Wing <ben@xemacs.org>. */
-/* Rewritten by MORIOKA Tomohiko <tomo@m17n.org> for XEmacs UTF-2000. */
+/* Rewritten by MORIOKA Tomohiko <tomo@m17n.org> for XEmacs CHISE. */
#include <config.h>
#include "lisp.h"
#include <config.h>
#include "lisp.h"
@@
-3328,7
+3328,7
@@
decode_add_er_char (struct decoding_stream *str, Emchar c,
make_int (base)));
Emchar chr
= NILP (char_type)
make_int (base)));
Emchar chr
= NILP (char_type)
- ? DECODE_CHAR (ccs, code)
+ ? DECODE_CHAR (ccs, code, 0)
: decode_builtin_char (ccs, code);
DECODE_ADD_UCS_CHAR (chr, dst);
: decode_builtin_char (ccs, code);
DECODE_ADD_UCS_CHAR (chr, dst);
@@
-3340,11
+3340,11
@@
decode_add_er_char (struct decoding_stream *str, Emchar c,
string, Qnil, Qnil)))
{
int code
string, Qnil, Qnil)))
{
int code
- = XINT (Fstring_to_number
- (Fsubstring (string,
- Fmatch_beginning (make_int (1)),
- Fmatch_end (make_int (1))),
- make_int (16)));
+ = XUINT (Fstring_to_number
+ (Fsubstring (string,
+ Fmatch_beginning (make_int (1)),
+ Fmatch_end (make_int (1))),
+ make_int (16)));
DECODE_ADD_UCS_CHAR (code, dst);
}
DECODE_ADD_UCS_CHAR (code, dst);
}
@@
-3394,7
+3394,7
@@
char_encode_as_entity_reference (Emchar ch, char* buf)
if ( (code_point >= 0)
&& (NILP (char_type)
if ( (code_point >= 0)
&& (NILP (char_type)
- || DECODE_CHAR (ccs, code_point) != ch) )
+ || DECODE_CHAR (ccs, code_point, 0) != ch) )
{
Lisp_Object ret;
{
Lisp_Object ret;
@@
-3474,7
+3474,8
@@
COMPOSE_ADD_CHAR (struct decoding_stream *str,
else if (!CONSP (str->combining_table))
{
Lisp_Object ret
else if (!CONSP (str->combining_table))
{
Lisp_Object ret
- = Fget_char_attribute (make_char (character), Qcomposition, Qnil);
+ = Fchar_feature (make_char (character), Qcomposition, Qnil,
+ Qnil, Qnil);
if (NILP (ret))
decode_add_er_char (str, character, dst);
if (NILP (ret))
decode_add_er_char (str, character, dst);
@@
-3493,11
+3494,12
@@
COMPOSE_ADD_CHAR (struct decoding_stream *str,
if (CHARP (ret))
{
Emchar char2 = XCHARVAL (ret);
if (CHARP (ret))
{
Emchar char2 = XCHARVAL (ret);
- ret = Fget_char_attribute (make_char (character), Qcomposition,
- Qnil);
- if (NILP (ret))
+ Lisp_Object ret2 = Fchar_feature (ret, Qcomposition, Qnil,
+ Qnil, Qnil);
+
+ if (NILP (ret2))
{
{
- decode_add_er_char (str, character, dst);
+ decode_add_er_char (str, char2, dst);
str->combined_char_count = 0;
str->combining_table = Qnil;
}
str->combined_char_count = 0;
str->combining_table = Qnil;
}
@@
-3505,13
+3507,23
@@
COMPOSE_ADD_CHAR (struct decoding_stream *str,
{
str->combined_chars[0] = char2;
str->combined_char_count = 1;
{
str->combined_chars[0] = char2;
str->combined_char_count = 1;
- str->combining_table = ret;
+ str->combining_table = ret2;
}
}
else
{
}
}
else
{
+ ret = Fchar_feature (make_char (character), Qcomposition, Qnil,
+ Qnil, Qnil);
+
COMPOSE_FLUSH_CHARS (str, dst);
COMPOSE_FLUSH_CHARS (str, dst);
- decode_add_er_char (str, character, dst);
+ if (NILP (ret))
+ decode_add_er_char (str, character, dst);
+ else
+ {
+ str->combined_chars[0] = character;
+ str->combined_char_count = 1;
+ str->combining_table = ret;
+ }
}
}
}
}
}
}
@@
-3940,10
+3952,11
@@
decode_coding_big5 (Lstream *decoding, const Extbyte *src,
{
#ifdef UTF2000
int code_point = (cpos << 8) | c;
{
#ifdef UTF2000
int code_point = (cpos << 8) | c;
- Emchar char_id = decode_defined_char (ccs, code_point);
+ Emchar char_id = decode_defined_char (ccs, code_point, 0);
if (char_id < 0)
if (char_id < 0)
- char_id = DECODE_CHAR (Vcharset_chinese_big5, code_point);
+ char_id
+ = DECODE_CHAR (Vcharset_chinese_big5, code_point, 0);
DECODE_ADD_UCS_CHAR (char_id, dst);
#else
unsigned char b1, b2, b3;
DECODE_ADD_UCS_CHAR (char_id, dst);
#else
unsigned char b1, b2, b3;
@@
-4524,13
+4537,13
@@
decode_coding_utf8 (Lstream *decoding, const Extbyte *src,
if (!NILP (ccs))
{
if (!NILP (ccs))
{
- char_id = decode_defined_char (ccs, cpos);
+ char_id = decode_defined_char (ccs, cpos, 0);
if (char_id < 0)
char_id = cpos;
}
else
if (char_id < 0)
char_id = cpos;
}
else
- ccs = char_id;
+ char_id = cpos;
COMPOSE_ADD_CHAR (str, char_id, dst);
cpos = 0;
counter = 0;
COMPOSE_ADD_CHAR (str, char_id, dst);
cpos = 0;
counter = 0;
@@
-4596,14
+4609,16
@@
char_encode_utf8 (struct encoding_stream *str, Emchar ch,
Lisp_Object ret;
if ( !NILP (map)
Lisp_Object ret;
if ( !NILP (map)
- && INTP (ret = Fget_char_attribute (make_char (ch),
- map, Qnil)) )
+ && INTP (ret = Fchar_feature (make_char (ch),
+ map, Qnil,
+ Qnil, Qnil)) )
code_point = XINT (ret);
else if ( !NILP (map =
CODING_SYSTEM_ISO2022_INITIAL_CHARSET
(str->codesys, 2))
code_point = XINT (ret);
else if ( !NILP (map =
CODING_SYSTEM_ISO2022_INITIAL_CHARSET
(str->codesys, 2))
- && INTP (ret = Fget_char_attribute (make_char (ch),
- map, Qnil)) )
+ && INTP (ret = Fchar_feature (make_char (ch),
+ map, Qnil,
+ Qnil, Qnil)) )
code_point = XINT (ret);
else if (CODING_SYSTEM_USE_ENTITY_REFERENCE (str->codesys))
{
code_point = XINT (ret);
else if (CODING_SYSTEM_USE_ENTITY_REFERENCE (str->codesys))
{
@@
-5685,7
+5700,7
@@
decode_coding_iso2022 (Lstream *decoding, const Extbyte *src,
COMPOSE_ADD_CHAR (str,
DECODE_CHAR (charset,
((cpos & 0x7F7F7F) << 8)
COMPOSE_ADD_CHAR (str,
DECODE_CHAR (charset,
((cpos & 0x7F7F7F) << 8)
- | (c & 0x7F)),
+ | (c & 0x7F), 0),
dst);
cpos = 0;
counter = 0;
dst);
cpos = 0;
counter = 0;