comparison src/composite.c @ 109976:26e31bcc4b06

Allow composition striding over PT.

109974:19fca2eb1b9f

}

static Lisp_Object _work_val;
static int _work_char;

/* 1 iff the character C is composable.  */
#define CHAR_COMPOSABLE_P(C)						\
  ((C) == 0x200C || (C) == 0x200D					\
   || (_work_val = CHAR_TABLE_REF (Vunicode_category_table, (C)),	\
       (SYMBOLP (_work_val)						\
	&& (_work_char = SDATA (SYMBOL_NAME (_work_val))[0]) != 'C'	\

      && find_composition (charpos, endpos, &start, &end, &prop, string)
      && COMPOSITION_VALID_P (start, end, prop))
    {
      cmp_it->stop_pos = endpos = start;
      cmp_it->ch = -1;
    }
  if (NILP (string))
    {
      /* A composition never strides over PT.  */
      if (PT > charpos)
	{
	  if (PT < endpos)
	    cmp_it->stop_pos = endpos = PT;
	}
      else if (PT < charpos && PT > endpos)
	{
	  cmp_it->stop_pos = endpos = PT - 1;
	}
    }
  if (NILP (current_buffer->enable_multibyte_characters)
      || NILP (Vauto_composition_mode))
    return;
  if (bytepos < 0)

   CMP_IT->stop_pos, and return 0.  */

int
composition_reseat_it (struct composition_it *cmp_it, EMACS_INT charpos, EMACS_INT bytepos, EMACS_INT endpos, struct window *w, struct face *face, Lisp_Object string)
{
  if (endpos <= charpos)
    {
      if (NILP (string))
	{
	  if (endpos < 0)
	    endpos = BEGV;
	  if (endpos < PT && PT < charpos)
	    endpos = PT;
	}
      else if (endpos < 0)
	endpos = 0;
    }
  else
    {
      if (NILP (string) && charpos < PT && PT < endpos)
	endpos = PT;
    }

  if (cmp_it->ch == -2)
    {
      composition_compute_stop_pos (cmp_it, charpos, bytepos, endpos, string);
      if (cmp_it->ch == -2 || cmp_it->stop_pos != charpos)

	  while (1)
	    {
	      elt = XCAR (val);
	      if (cmp_it->lookback > 0)
		{
		  cpos -= cmp_it->lookback;
		  if (STRINGP (string))
		    bpos = string_char_to_byte (string, cpos);
		  else
		    bpos = CHAR_TO_BYTE (cpos);
		}

  Lisp_Object gstring, header;
  EMACS_INT frompos, topos;

  CHECK_NATNUM (from);
  CHECK_NATNUM (to);
  if (XINT (to) > XINT (from) + MAX_COMPOSITION_COMPONENTS)
    to = make_number (XINT (from) + MAX_COMPOSITION_COMPONENTS);
  if (! FONT_OBJECT_P (font_object))
    {
      struct coding_system *coding;
      struct terminal *terminal = get_terminal (font_object, 1);

109976:26e31bcc4b06

}

static Lisp_Object _work_val;
static int _work_char;

/* 1 iff the character C is composable.  Characters of general
   category Z? or C? are not composable except for ZWNJ and ZWJ. */

#define CHAR_COMPOSABLE_P(C)						\
  ((C) == 0x200C || (C) == 0x200D					\
   || (_work_val = CHAR_TABLE_REF (Vunicode_category_table, (C)),	\
       (SYMBOLP (_work_val)						\
	&& (_work_char = SDATA (SYMBOL_NAME (_work_val))[0]) != 'C'	\

      && find_composition (charpos, endpos, &start, &end, &prop, string)
      && COMPOSITION_VALID_P (start, end, prop))
    {
      cmp_it->stop_pos = endpos = start;
      cmp_it->ch = -1;
    }
  if (NILP (current_buffer->enable_multibyte_characters)
      || NILP (Vauto_composition_mode))
    return;
  if (bytepos < 0)

   CMP_IT->stop_pos, and return 0.  */

int
composition_reseat_it (struct composition_it *cmp_it, EMACS_INT charpos, EMACS_INT bytepos, EMACS_INT endpos, struct window *w, struct face *face, Lisp_Object string)
{
  if (endpos < 0)
    endpos = NILP (string) ? BEGV : 0;

  if (cmp_it->ch == -2)
    {
      composition_compute_stop_pos (cmp_it, charpos, bytepos, endpos, string);
      if (cmp_it->ch == -2 || cmp_it->stop_pos != charpos)

	  while (1)
	    {
	      elt = XCAR (val);
	      if (cmp_it->lookback > 0)
		{
		  cpos = charpos - cmp_it->lookback;
		  if (STRINGP (string))
		    bpos = string_char_to_byte (string, cpos);
		  else
		    bpos = CHAR_TO_BYTE (cpos);
		}

  Lisp_Object gstring, header;
  EMACS_INT frompos, topos;

  CHECK_NATNUM (from);
  CHECK_NATNUM (to);
  if (! FONT_OBJECT_P (font_object))
    {
      struct coding_system *coding;
      struct terminal *terminal = get_terminal (font_object, 1);