mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-21 05:00:47 -08:00
Code Issues Projects Releases Wiki Activity

(CODING_ADD_COMPOSITION_COMPONENT): If the number of

Browse source 
composition components reaches the limit, terminate composing.
(COMPOSITION_OK): New macro.
(detect_coding_iso2022): Use it if an escapse sequence for
composition is found.
(coding_restore_composition): Adjust the number of composition
components if it is not sane.
This commit is contained in:
Kenichi Handa 2003-03-07 02:18:35 +00:00
parent cb681b3455
commit b6871cc7dd
1 changed files with 40 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/coding.c
View file

@ -689,7 +689,15 @@ detect_coding_emacs_mule (src, src_end, multibytep)
/* Record one COMPONENT (alternate character or composition rule). */ /* Record one COMPONENT (alternate character or composition rule). */
#define CODING_ADD_COMPOSITION_COMPONENT(coding, component) \ #define CODING_ADD_COMPOSITION_COMPONENT(coding, component) \
(coding->cmp_data->data[coding->cmp_data->used++] = component) do { \
coding->cmp_data->data[coding->cmp_data->used++] = component; \
if (coding->cmp_data->used - coding->cmp_data_start \
== COMPOSITION_DATA_MAX_BUNCH_LENGTH) \
{ \
CODING_ADD_COMPOSITION_END (coding, coding->produced_char); \
coding->composing = COMPOSITION_NO; \
} \
} while (0)
/* Get one byte from a data pointed by SRC and increment SRC. If SRC /* Get one byte from a data pointed by SRC and increment SRC. If SRC
@ -1329,6 +1337,9 @@ enum iso_code_class_type iso_code_class[256];
#define SHIFT_OUT_OK(idx) \ #define SHIFT_OUT_OK(idx) \
(CODING_SPEC_ISO_INITIAL_DESIGNATION (coding_system_table[idx], 1) >= 0) (CODING_SPEC_ISO_INITIAL_DESIGNATION (coding_system_table[idx], 1) >= 0)
#define COMPOSITION_OK(idx) \
(coding_system_table[idx]->composing != COMPOSITION_DISABLED)
/* See the above "GENERAL NOTES on `detect_coding_XXX ()' functions". /* See the above "GENERAL NOTES on `detect_coding_XXX ()' functions".
Check if a text is encoded in ISO2022. If it is, return an Check if a text is encoded in ISO2022. If it is, return an
integer in which appropriate flag bits any of: integer in which appropriate flag bits any of:
@ -1406,7 +1417,30 @@ detect_coding_iso2022 (src, src_end, multibytep)
else if (c >= '0' && c <= '4') else if (c >= '0' && c <= '4')
{ {
/* ESC <Fp> for start/end composition. */ /* ESC <Fp> for start/end composition. */
mask_found |= CODING_CATEGORY_MASK_ISO; if (COMPOSITION_OK (CODING_CATEGORY_IDX_ISO_7))
mask_found |= CODING_CATEGORY_MASK_ISO_7;
else
mask &= ~CODING_CATEGORY_MASK_ISO_7;
if (COMPOSITION_OK (CODING_CATEGORY_IDX_ISO_7_TIGHT))
mask_found |= CODING_CATEGORY_MASK_ISO_7_TIGHT;
else
mask &= ~CODING_CATEGORY_MASK_ISO_7_TIGHT;
if (COMPOSITION_OK (CODING_CATEGORY_IDX_ISO_8_1))
mask_found |= CODING_CATEGORY_MASK_ISO_8_1;
else
mask &= ~CODING_CATEGORY_MASK_ISO_8_1;
if (COMPOSITION_OK (CODING_CATEGORY_IDX_ISO_8_2))
mask_found |= CODING_CATEGORY_MASK_ISO_8_2;
else
mask &= ~CODING_CATEGORY_MASK_ISO_8_2;
if (COMPOSITION_OK (CODING_CATEGORY_IDX_ISO_7_ELSE))
mask_found |= CODING_CATEGORY_MASK_ISO_7_ELSE;
else
mask &= ~CODING_CATEGORY_MASK_ISO_7_ELSE;
if (COMPOSITION_OK (CODING_CATEGORY_IDX_ISO_8_ELSE))
mask_found |= CODING_CATEGORY_MASK_ISO_8_ELSE;
else
mask &= ~CODING_CATEGORY_MASK_ISO_8_ELSE;
break; break;
} }
else else
@ -5289,6 +5323,9 @@ coding_restore_composition (coding, obj)
int len = data[0] - 4, j; int len = data[0] - 4, j;
Lisp_Object args[MAX_COMPOSITION_COMPONENTS * 2 - 1]; Lisp_Object args[MAX_COMPOSITION_COMPONENTS * 2 - 1];
if (method == COMPOSITION_WITH_RULE_ALTCHARS
&& len % 2 == 0)
len --;
for (j = 0; j < len; j++) for (j = 0; j < len; j++)
args[j] = make_number (data[4 + j]); args[j] = make_number (data[4 + j]);
components = (method == COMPOSITION_WITH_ALTCHARS components = (method == COMPOSITION_WITH_ALTCHARS