comparison src/coding.c @ 50047:8e17fbb2ac77

(CODING_ADD_COMPOSITION_COMPONENT): If the number of 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.

50046:59eb19bd5433

    data[2] = cmp_data->char_offset + end;			\
  } while (0)

/* Record one COMPONENT (alternate character or composition rule).  */

#define CODING_ADD_COMPOSITION_COMPONENT(coding, component)	\
  (coding->cmp_data->data[coding->cmp_data->used++] = component)


/* Get one byte from a data pointed by SRC and increment SRC.  If SRC
   is not less than SRC_END, return -1 without incrementing Src.  */

       != CODING_SPEC_ISO_NO_REQUESTED_DESIGNATION))

#define SHIFT_OUT_OK(idx) \
  (CODING_SPEC_ISO_INITIAL_DESIGNATION (coding_system_table[idx], 1) >= 0)

/* See the above "GENERAL NOTES on `detect_coding_XXX ()' functions".
   Check if a text is encoded in ISO2022.  If it is, return an
   integer in which appropriate flag bits any of:
	CODING_CATEGORY_MASK_ISO_7
	CODING_CATEGORY_MASK_ISO_7_TIGHT

	      break;
	    }
	  else if (c >= '0' && c <= '4')
	    {
	      /* ESC <Fp> for start/end composition.  */
	      mask_found |= CODING_CATEGORY_MASK_ISO;
	      break;
	    }
	  else
	    /* Invalid escape sequence.  Just ignore.  */
	    break;

	  else
	    {
	      int len = data[0] - 4, j;
	      Lisp_Object args[MAX_COMPOSITION_COMPONENTS * 2 - 1];

	      for (j = 0; j < len; j++)
		args[j] = make_number (data[4 + j]);
	      components = (method == COMPOSITION_WITH_ALTCHARS
			    ? Fstring (len, args) : Fvector (len, args));
	    }

50047:8e17fbb2ac77

    data[2] = cmp_data->char_offset + end;			\
  } while (0)

/* Record one COMPONENT (alternate character or composition rule).  */

#define CODING_ADD_COMPOSITION_COMPONENT(coding, 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
   is not less than SRC_END, return -1 without incrementing Src.  */

       != CODING_SPEC_ISO_NO_REQUESTED_DESIGNATION))

#define SHIFT_OUT_OK(idx) \
  (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".
   Check if a text is encoded in ISO2022.  If it is, return an
   integer in which appropriate flag bits any of:
	CODING_CATEGORY_MASK_ISO_7
	CODING_CATEGORY_MASK_ISO_7_TIGHT

	      break;
	    }
	  else if (c >= '0' && c <= '4')
	    {
	      /* ESC <Fp> for start/end composition.  */
	      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;
	    }
	  else
	    /* Invalid escape sequence.  Just ignore.  */
	    break;

	  else
	    {
	      int len = data[0] - 4, j;
	      Lisp_Object args[MAX_COMPOSITION_COMPONENTS * 2 - 1];

	      if (method == COMPOSITION_WITH_RULE_ALTCHARS
		  && len % 2 == 0)
		len --;
	      for (j = 0; j < len; j++)
		args[j] = make_number (data[4 + j]);
	      components = (method == COMPOSITION_WITH_ALTCHARS
			    ? Fstring (len, args) : Fvector (len, args));
	    }