comparison src/fontset.c @ 97556:0fc47f017980

(reorder_font_vector): Use encoding charset of fonts for sorting. (face_for_char): Use deferred log.

97555:12c8fcc4c171

      Lisp_Object font_spec = FONT_DEF_SPEC (font_def);
      int score = RFONT_DEF_SCORE (rfont_def) & 0xFF;

      if (! font_match_p (font_spec, font_object))
	{
	  Lisp_Object repertory = FONT_DEF_REPERTORY (font_def);

	  if (! NILP (repertory))
	    {
	      Lisp_Object tail;

	      for (tail = Vcharset_ordered_list;
		   ! EQ (tail, Vcharset_non_preferred_head) && CONSP (tail);
		   score += 0x100, tail = XCDR (tail))
		if (EQ (repertory, XCAR (tail)))
		  break;
	    }
	  else
	    {
	      Lisp_Object lang = Ffont_get (font_spec, QClang);

	    charset = XCDR (val);
	  id = XINT (CHARSET_SYMBOL_ID (charset));
	}
    }

  font_add_log ("finding a font for", Fcons (make_number (c), charset), Qnil);
  rfont_def = fontset_font (fontset, c, face, id);
  if (VECTORP (rfont_def))
    {
      if (INTEGERP (RFONT_DEF_FACE (rfont_def)))
	face_id = XINT (RFONT_DEF_FACE (rfont_def));

97556:0fc47f017980

      Lisp_Object font_spec = FONT_DEF_SPEC (font_def);
      int score = RFONT_DEF_SCORE (rfont_def) & 0xFF;

      if (! font_match_p (font_spec, font_object))
	{
	  Lisp_Object encoding = FONT_DEF_ENCODING (font_def);

	  if (! NILP (encoding))
	    {
	      Lisp_Object tail;

	      for (tail = Vcharset_ordered_list;
		   ! EQ (tail, Vcharset_non_preferred_head) && CONSP (tail);
		   score += 0x100, tail = XCDR (tail))
		if (EQ (encoding, XCAR (tail)))
		  break;
	    }
	  else
	    {
	      Lisp_Object lang = Ffont_get (font_spec, QClang);

	    charset = XCDR (val);
	  id = XINT (CHARSET_SYMBOL_ID (charset));
	}
    }

  font_deferred_log ("font for", Fcons (make_number (c), charset), Qnil);
  rfont_def = fontset_font (fontset, c, face, id);
  if (VECTORP (rfont_def))
    {
      if (INTEGERP (RFONT_DEF_FACE (rfont_def)))
	face_id = XINT (RFONT_DEF_FACE (rfont_def));