comparison src/composite.c @ 98214:5803b1114219

(fill_gstring_header): Don't check FROM and TO here. (composition_compute_stop_pos): Fix handling of static composition. (Fcomposition_get_gstring): Check FROM and TO at first.

98213:52d26067a946

  else
    {
      CHECK_STRING (string);
      if (! STRING_MULTIBYTE (current_buffer->enable_multibyte_characters))
	error ("Attempt to shape unibyte text");
      CHECK_NATNUM (start);
      from = XINT (start);
      CHECK_NATNUM (end);
      to = XINT (end);
      if (from < 0 || from > to || to > SCHARS (string))
	args_out_of_range_3 (string, start, end);
      from_byte = string_char_to_byte (string, from);
    }

      if (STRINGP (string))
	FETCH_STRING_CHAR_ADVANCE (c, string, charpos, bytepos);
      else
	FETCH_CHAR_ADVANCE (c, charpos, bytepos);
      if (c == '\n')
	break;
      val = CHAR_TABLE_REF (Vcomposition_function_table, c);
      if (! NILP (val))
	{
	  Lisp_Object elt;

	      return;
	    }
	}
    }
  cmp_it->stop_pos = charpos;
  cmp_it->ch = -2;
}

/* Check if the character at CHARPOS (and BYTEPOS) is composed
   (possibly with the following charaters) on window W.  ENDPOS limits
   characters to be composed.  FACE, in non-NULL, is a base face of

     Lisp_Object font_object, from, to, string;
{
  Lisp_Object gstring, header;
  EMACS_INT frompos, topos;

  if (! NILP (font_object))
    CHECK_FONT_OBJECT (font_object);
  header = fill_gstring_header (Qnil, from, to, font_object, string);
  gstring = gstring_lookup_cache (header);
  if (! NILP (gstring))
    return gstring;

  /* Maybe we should check this at the function's entry.  --Stef  */
  CHECK_NATNUM (from); frompos = XINT (from);
  CHECK_NATNUM (to);   topos = XINT (to);

  if (LGSTRING_GLYPH_LEN (gstring_work) < topos - frompos)
    gstring_work = Fmake_vector (make_number (topos - frompos + 2), Qnil);
  LGSTRING_SET_HEADER (gstring_work, header);
  LGSTRING_SET_ID (gstring_work, Qnil);
  fill_gstring_body (gstring_work);

98214:5803b1114219

  else
    {
      CHECK_STRING (string);
      if (! STRING_MULTIBYTE (current_buffer->enable_multibyte_characters))
	error ("Attempt to shape unibyte text");
      /* FROM and TO are checked by the caller.  */
      from = XINT (start);
      to = XINT (end);
      if (from < 0 || from > to || to > SCHARS (string))
	args_out_of_range_3 (string, start, end);
      from_byte = string_char_to_byte (string, from);
    }

      if (STRINGP (string))
	FETCH_STRING_CHAR_ADVANCE (c, string, charpos, bytepos);
      else
	FETCH_CHAR_ADVANCE (c, charpos, bytepos);
      if (c == '\n')
	{
	  cmp_it->ch = -2;
	  break;
	}
      val = CHAR_TABLE_REF (Vcomposition_function_table, c);
      if (! NILP (val))
	{
	  Lisp_Object elt;

	      return;
	    }
	}
    }
  cmp_it->stop_pos = charpos;
}

/* Check if the character at CHARPOS (and BYTEPOS) is composed
   (possibly with the following charaters) on window W.  ENDPOS limits
   characters to be composed.  FACE, in non-NULL, is a base face of

     Lisp_Object font_object, from, to, string;
{
  Lisp_Object gstring, header;
  EMACS_INT frompos, topos;

  CHECK_NATNUM (from);
  CHECK_NATNUM (to);
  if (! NILP (font_object))
    CHECK_FONT_OBJECT (font_object);
  header = fill_gstring_header (Qnil, from, to, font_object, string);
  gstring = gstring_lookup_cache (header);
  if (! NILP (gstring))
    return gstring;

  frompos = XINT (from);
  topos = XINT (to);
  if (LGSTRING_GLYPH_LEN (gstring_work) < topos - frompos)
    gstring_work = Fmake_vector (make_number (topos - frompos + 2), Qnil);
  LGSTRING_SET_HEADER (gstring_work, header);
  LGSTRING_SET_ID (gstring_work, Qnil);
  fill_gstring_body (gstring_work);