1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-21 05:00:47 -08:00
Commit graph

358 commits

Author SHA1 Message Date
Eli Zaretskii
da55a2b79a (detect_coding_iso2022, setup_coding_system): Remove
unused variable `i'.
(detect_coding_mask): Remove unused variable `idx'.
(detect_coding): Remove unused variable `i'.
(ccl_coding_driver): Remove unused variable `result'.
(run_pre_post_conversion_on_str): Remove unused variable `prev'.
(decode_coding_string): Remove unused variables `to' and
`gcpro1'.
(encode_coding_string): Remove unused variables `gcpro1' and
`saved_coding_symbol'.
(Ffind_coding_systems_region_internal): Remove function-local
variable args[], leave only the block-local one.
(code_convert_region1): Remove unused variable `len'.
2001-01-02 14:26:22 +00:00
Kenichi Handa
1c3478b085 (setup_coding_system): Initialize
coding->spec.ccl.eight_bit_carryover.
(ccl_coding_driver): Pay attention to carried over 8-bit bytes.
2000-12-28 07:03:56 +00:00
Kenichi Handa
aa72b389be (SAFE_ONE_MORE_BYTE): New macro.
(DECODE_EMACS_MULE_COMPOSITION_CHAR): New macro.
(DECODE_EMACS_MULE_COMPOSITION_RULE): New macro.
(decode_composition_emacs_mule): New function.
(decode_coding_emacs_mule): Decode composition sequence by calling
decode_composition_emacs_mule.
(ENCODE_COMPOSITION_EMACS_MULE): New macro.
(encode_coding_emacs_mule): Changed from macro to function.  If
a text contains compostions, encode them correctly.
(setup_coding_system): Set coding->commong_flags for emacs-mule so
that decoding and encoding are required.
2000-12-28 01:05:02 +00:00
Kenichi Handa
80e0ca99ce (ccl_coding_driver): Initialize ccl->cr_consumed. 2000-12-21 23:22:16 +00:00
Kenichi Handa
64c1e55fbe (detect_coding): Call detect_coding_mask with a correct MULTIBYTEP
argument.
(code_convert_region): Don't override coding->src_multibyte and
coding->dst_multibyte.
2000-12-15 08:30:40 +00:00
Kenichi Handa
c07c8e12b4 (setup_coding_system): Clear all members of the struct
coding_system at first.
2000-12-15 04:45:53 +00:00
Kenichi Handa
764ca8dad8 (decode_coding_string): Set coding->src_multibyte and
coding->dst_multibyte before calling detect_coding and detect_eol.
Update them after some coding system is detected.
2000-12-14 01:27:43 +00:00
Kenichi Handa
0a28aafbbc (ONE_MORE_BYTE_CHECK_MULTIBYTE): New macro.
(detect_coding_emacs_mule, detect_coding_iso2022,)
(detect_coding_sjis, detect_coding_big5, detect_coding_utf_8)
(detect_coding_utf_16, detect_coding_ccl): Make them static.  New
argument MULTIBYTEP.  Callers changed.
(detect_coding_mask, detect_coding_system): New argument
MULTIBYTEP.  Callers changed.
2000-12-13 23:24:37 +00:00
Kenichi Handa
9b96232f57 (setup_coding_system): Be sure to initialize coding->category_idx. 2000-12-05 12:34:56 +00:00
Kenichi Handa
109a5acb02 (Ffind_coding_systems_region_internal): Be sure to
include no-conversion.
2000-11-28 00:00:00 +00:00
Eli Zaretskii
2bcdf6628b (decode_coding_emacs_mule): Fix the case of
CODING_EOL_LF, which used an uninitialized value of c.
2000-11-23 20:37:45 +00:00
Kenichi Handa
e7c9eef9a6 (decode_coding): Fix previous change (check also
CODING_MODE_LAST_BLOCK).
2000-10-26 01:22:29 +00:00
Eli Zaretskii
4af310dbf1 (decode_coding_emacs_mule): If coding->eol_type is CR
or CRLF, decode EOLs.
2000-10-24 09:04:35 +00:00
Eli Zaretskii
d9aef30f82 Fix a typo in a comment. 2000-10-22 14:00:19 +00:00
Kenichi Handa
e2c06b17a9 (decode_coding_string): Set coding->src_multibyte and
coding->dst_multibyte before using CODING_REQUIRE_DECODING.
(encode_coding_string): Set coding->src_multibyte and
coding->dst_multibyte before using CODING_REQUIRE_ENCODING.
2000-10-13 08:21:20 +00:00
Kenichi Handa
62b3ef1d94 (code_convert_region): Be sure to initialize coding->category_idx. 2000-10-13 08:01:24 +00:00
Kenichi Handa
fd6f711b51 (detect_coding_sjis): Check the byte sequence more regidly. 2000-09-07 13:01:44 +00:00
Kenichi Handa
fc53a2147a (encode_coding_sjis_big5): Fix previous change. 2000-09-07 12:41:37 +00:00
Kenichi Handa
39658efc40 (encode_coding_sjis_big5): Use translation table for
encoding, not decoding.   Check for the charset katakana-jisx0201,
not latin-jisx0201.
(ONE_MORE_CHAR): Call translate_char with CHARSET arg -1.
2000-09-07 12:04:09 +00:00
Kenichi Handa
78a629d2f5 (encode_eol): Fix bug for the case of dst_bytes being zero. Set
coding->produced_char correctly.
2000-08-23 02:47:42 +00:00
Kenichi Handa
13004bef1e (encode_coding_string): Fix previous change. 2000-08-18 10:48:26 +00:00
Kenichi Handa
2391eaa401 (decode_coding_string): Set members consumed,
consumed_char, produced, produced_char of *coding correctly.  If
decode_coding doesn't consume any byte, don't try anymore.
(encode_coding_string): Likewise.
2000-08-18 06:41:15 +00:00
Kenichi Handa
bb10be8b6f (encode_coding): Fix the bug of not flushing ISO escape sequence at
the end of the source block.
2000-08-16 11:19:34 +00:00
Kenichi Handa
73be902c32 (MINIMUM_CONVERSION_BUFFER_SIZE): Macro deleted.
(conversion_buffer, conversion_buffer_size): Variables deleted.
(get_conversion_buffer): Function deleted.
(struct conversion_buffer): New structure.
(MAX_ALLOCA): New macro.
(allocate_conversion_buffer): New macro.
(extend_conversion_buffer, free_conversion_buffer): New functions.
(ccl_coding_driver): Set coding->result.
(decode_coding): Set coding->result to CODING_FINISH_NORMAL if
this is the last block of source.
(encode_coding): Likewise.  Handle the source block as the last
one only when the whole source text is consumed.
(decode_coding_string): Handle the case that the output buffer is
too small to decode the whole source text.  Use
allocate_conversion_buffer, extend_conversion_buffer and
free_conversion_buffer, not get_conversion_buffer.
(encode_coding_string): Likewise.
(init_coding): Function deleted.
(init_coding_once): Delete code to initialize
conversion_buffer_size.
2000-08-16 01:37:20 +00:00
Kenichi Handa
7272d75c04 (ccl_coding_driver): Initialize ccl->multibyte. 2000-08-11 05:45:37 +00:00
Ken Raeburn
975f250a8e *coding.c (find_safe_codings): CHAR_TABLE_SET index must be a lisp object.
(Ffind_coding_systems_region_internal): First argument to Fappend must be an
integer, not a lisp object.
2000-08-08 14:34:05 +00:00
Kenichi Handa
78108bcdcc (coding_restore_composition): Pay attention to the case that
cmp_data is not set properly (because of invalid code in the
source text).
(run_pre_post_conversion_on_str): Include text properties in the
resulting string.
(decode_coding_string): Set members of coding correctly.
2000-08-04 05:53:01 +00:00
Kenichi Handa
e7046a1877 (decode_coding_iso2022): More strict check for handling single
shifting.
2000-08-04 02:05:39 +00:00
Kenichi Handa
05e6f5dcf6 (Qsafe_charsets): This variable deleted.
(Qsafe_chars, Vchar_coding_system_table, Qchar_coding_system): New
variables.
(coding_safe_chars): New function.
(CODING_SAFE_CHAR_P): New macro.
(CHARSET_OK): New arg C.  Call CODING_SAFE_CHAR_P instead of
checking safe_charsets member of the coding system.  Caller
changed.
(detect_coding_iso2022): New local variable safe_chars.
(DECODE_DESIGNATION): Call CODING_SAFE_CHAR_P instead of checking
safe_charsets member of the coding system.
(decode_coding_iso2022): New local variable safe_chars.
(ENCODE_ISO_CHARACTER_DIMENSION1): Don't check unsafe chars here.
(ENCODE_ISO_CHARACTER_DIMENSION2): Likewise.
(ENCODE_ISO_CHARACTER): Arguments changed.  Caller changed.
(ENCODE_UNSAFE_CHARACTER): New macro.
(encode_coding_iso2022): New local variable safe_chars.  Check
unsafe chars.
(setup_coding_system): Delete the code to initialize
coding->safe_charses
(intersection, find_safe_codings): New functions.
(Ffind_coding_systems_region_internal): New function.
(syms_of_coding): Defsubr it.  Initialize Qsafe_chars,
Qsafe_cding_system.  Make Vchar_coding_system_table a Lisp
variable and initialize it.
2000-07-27 06:01:19 +00:00
Eli Zaretskii
e215fa58c7 (syms_of_coding): Doc fix for inhibit-iso-escape-detection. 2000-07-23 14:53:26 +00:00
Kenichi Handa
e077cc80af (code_convert_region): Delete text properties before shrinking the
conversion region.
2000-07-19 03:44:55 +00:00
Gerd Moellmann
22ab2303d9 (syms_of_coding): Fix typo in spelling of variable
`inhibit-iso-escape-detection'.
2000-07-18 14:37:54 +00:00
Kenichi Handa
9614806534 (setup_coding_system): Don't override the explicitly specified
designations.
2000-07-18 04:32:08 +00:00
Kenichi Handa
74383408f3 (inhibit_iso_escape_detection): New variable.
(syms_of_coding): Make it a Lisp variable.
(detect_coding_iso2022): If inhibit_iso_escape_detection is
nonzero, ignore ISO2022's escape sequence.
2000-07-14 01:56:14 +00:00
Kenichi Handa
4956c22544 (code_convert_region): Even if the length of text is
zero, try to convert it if coding->type is coding_type_ccl.
(decode_coding_string, encode_coding_string): Likewise.
2000-06-30 02:56:45 +00:00
Andreas Schwab
86af83a969 (decode_coding_string): Re-fetch STRING_BYTES after
Fstring_as_unibyte.
2000-06-26 12:24:46 +00:00
Eli Zaretskii
74b01b80ee (decode_eol_post_ccl): Special handling for undecided
and inconsistent EOL types.
2000-06-23 05:32:45 +00:00
Kenichi Handa
aaaf0b1e09 (setup_coding_system) <4>: Reset member `cr_carryover'.
(ccl_coding_driver): On encoding, initialize ccl->eol_type.
(decode_eol_post_ccl): New function.
(decode_coding): Don't detect EOL format here for CCL based coding
systems.
(decode_coding) <coding_type_ccl>: Handle carryovered CR.  Call
decode_eol_post_ccl after running the CCL program.
(code_convert_region): Don't detect EOL format here for CCL based
coding systems.
(decode_coding_string): Likewise.
2000-06-19 05:18:09 +00:00
Kenichi Handa
8a33cf7b21 (decode_coding_emacs_mule): Always set src_base at the
start of the while loop.
2000-06-15 11:02:26 +00:00
Kenichi Handa
e17de82124 (detect_coding_iso2022): Fix code for checking
CODING_CATEGORY_MASK_ISO_8_2.
2000-05-30 07:40:59 +00:00
Kenichi Handa
33fb63eb13 (DECODE_COMPOSITION_START): If coding->cmp_data is not
yet allocated, finish decoding with result
CODING_FINISH_INSUFFICIENT_CMP.
(coding_allocate_composition_data): Make it non-static.
(coding_restore_composition): Likewise.
2000-05-29 11:25:30 +00:00
Dave Love
fa46990ee0 (shrink_decoding_region): Initialize eol_conversion. 2000-05-26 13:42:03 +00:00
Dave Love
c2f94ebcc5 Fix junk from last checkin. 2000-05-25 11:47:09 +00:00
Dave Love
005f0d3535 (encode_eol): Add null statement after label. 2000-05-25 11:07:47 +00:00
Kenichi Handa
6bac5b12e8 (run_pre_post_conversion_on_str): Set point to the
beginning of buffer before calling coding->post_read_conversion.
(decode_coding_string): Give correct args to
run_pre_post_conversion_on_str.
(encode_coding_string): Likewise.
2000-05-25 04:44:33 +00:00
Kenichi Handa
ff2b1ea945 (encode_eol): Fix a bug of DOS style EOL encoding. 2000-05-23 00:17:27 +00:00
Kenichi Handa
b73bfc1c35 (ONE_MORE_BYTE, TWO_MORE_BYTES): Set coding->resutl to
CODING_FINISH_INSUFFICIENT_SRC if there's not enough source.
(ONE_MORE_CHAR, EMIT_CHAR, EMIT_ONE_BYTE, EMIT_TWO_BYTE,
EMIT_BYTES): New macros.
(THREE_MORE_BYTES, DECODE_CHARACTER_ASCII,
DECODE_CHARACTER_DIMENSION1, DECODE_CHARACTER_DIMENSION2): These
macros deleted.
(CHECK_CODE_RANGE_A0_FF): This macro deleted.
(detect_coding_emacs_mule): Use UNIBYTE_STR_AS_MULTIBYTE_P to
check the validity of multibyte sequence.
(decode_coding_emacs_mule): New function.
(encode_coding_emacs_mule): New macro.
(detect_coding_iso2022): Use ONE_MORE_BYTE to fetch a byte from
the source.
(DECODE_ISO_CHARACTER): Just return a character code.
(DECODE_COMPOSITION_START): Set coding->result instead of result.
(decode_coding_iso2022, decode_coding_sjis_big5, decode_eol): Use
EMIT_CHAR to produced decoded characters.  Exit the loop only by
macros ONE_MORE_BYTE or EMIT_CHAR.  Don't handle the case of last
block here.
(ENCODE_ISO_CHARACTER): Don't translate character here.  Produce
only position codes for an invalid character.
(encode_designation_at_bol): Return new destination pointer.  5th
arg DSTP is changed to DST.
(encode_coding_iso2022, decode_coding_sjis_big5): Get a character
from the source by ONE_MORE_CHAR.  Don't handle the case of last
block here.
(DECODE_SJIS_BIG5_CHARACTER, ENCODE_SJIS_BIG5_CHARACTER): These
macros deleted.
(detect_coding_sjis, detect_coding_big5, detect_coding_utf_8,
detect_coding_utf_16, detect_coding_ccl): Use ONE_MORE_BYTE and
TWO_MORE_BYTES to fetch a byte from the source.
(encode_eol): Pay attention to coding->src_multibyte.
(detect_coding, detect_eol): Preserve members src_multibyte and
dst_multibyte.
(DECODING_BUFFER_MAG): Return 2 even for coding_type_raw_text.
(encoding_buffer_size): Set magnification to 3 for all coding
systems that require encoding.
(ccl_coding_driver): For decoding, be sure that the result is
valid multibyte sequence.
(decode_coding): Initialize coding->errors and coding->result.
For emacs-mule, call decode_coding_emacs_mule.  For no-conversion
and raw-text, always call decode_eol.  Handle the case of last
block here.  If not coding->dst_multibyte, convert the resulting
sequence to unibyte.
(encode_coding): Initialize coding->errors and coding->result.
For emacs-mule, call encode_coding_emacs_mule.  For no-conversion
and raw-text, always call encode_eol.  Handle the case of last
block here.
(shrink_decoding_region, shrink_encoding_region): Detect cases
that we can't skip data more rigidly.
(code_convert_region): Setup src_multibyte and dst_multibyte
members of coding.  For decoding, if the buffer is multibyte,
convert the source sequence to unibyte in advance.  For encoding,
if the buffer is multibyte, convert the resulting sequence to
multibyte afterward.
(run_pre_post_conversion_on_str): New function.
(code_convert_string): Deleted and divided into the following two.
(decode_coding_string, encode_coding_string): New functions.
(code_convert_string1, code_convert_string_norecord): Call one of
above.
(Fdecode_sjis_char, Fdecode_big5_char): Use MAKE_CHAR instead of
MAKE_NON_ASCII_CHAR.
(Fset_terminal_coding_system_internal,
Fset_safe_terminal_coding_system_internal): Setup src_multibyte
and dst_multibyte members.
(init_coding_once): Initialize iso_code_class with new enum
ISO_control_0 and ISO_control_1.
2000-05-19 23:54:56 +00:00
Ken Raeburn
8000e212ef * coding.h (code_convert_string): Declare.
* coding.c (code_convert_string_norecord): Pass an int, not a lisp object, as
the fourth argument to code_convert_string.
2000-04-08 19:34:29 +00:00
Kenichi Handa
fa42c37fe3 Add comments on coding-category-utf-8,
coding-category-utf-16-be, and coding-category-utf-16-le.
(coding_category_name): Include "coding-category-utf-8",
"coding-category-utf-16-be", and "coding-category-utf-16-le".
(UTF_8_1_OCTET_P) (UTF_8_EXTRA_OCTET_P) (UTF_8_2_OCTET_LEADING_P)
(UTF_8_3_OCTET_LEADING_P) (UTF_8_4_OCTET_LEADING_P)
(UTF_8_5_OCTET_LEADING_P) (UTF_8_6_OCTET_LEADING_P): New macros.
(detect_coding_utf_8): New function.
(UTF_16_INVALID_P) (TF_16_HIGH_SURROGATE_P)
(UTF_16_LOW_SURROGATE_P): New macros.
(detect_coding_utf_16): New function.
(detect_coding_mask): Fix bug of returning wrong mask bits in the
case that detect_coding_XXX returns a mask not set in
priorities[i].
(detect_eol_type_in_2_octet_form): New function.
(detect_eol): If cooding->category_idx is for UTF-16, call
detect_eol_type_in_2_octet_form instead of dectect_eol_type.
(detect_coding_system): Don't include `nil' coding-system in the
result.
(Fupdate_coding_systems_internal): Update all coding-categories.
2000-03-07 06:17:54 +00:00
Kenichi Handa
91bee88126 (coding_save_composition): Be sure to allocate
composition data area in coding even if there's no composition in
the current run.
2000-03-02 06:09:15 +00:00