comparison src/font.c @ 96049:380525b11593

(font_parse_fcname): For known key symbols, intern using correct symbol name.

96048:62044a08f171

    {
      if (*p == '\\' && p[1])
	p++;
      else if (*p == ':')
	{
	  family_end = p;
	  props_beg = p + 1;
	  break;
	}
      else if (*p == '-')
	{
	  int decimal = 0, size_found = 1;

      if (size_beg)
	{
	  double point_size = strtod (size_beg, &size_end);
	  ASET (font, FONT_SIZE_INDEX, make_float (point_size));
	  if (*size_end == ':' && size_end[1])
	    props_beg = size_end + 1;
	}
      if (props_beg)
	{
	  /* Now parse ":KEY=VAL" patterns.  Store known keys and values in
	     extra, copy unknown ones to COPY.  It is stored in extra slot by
	     the key QCfc_unknown_spec.  */
	  char *copy_start, *copy;

	  copy_start = copy = alloca (name + len - props_beg + 2);
	  if (! copy)
	    return -1;

	  p = props_beg;
	  while (*p)
	    {
	      Lisp_Object val;
	      int word_len, prop;

	      for (q = p + 1; *q && *q != '=' && *q != ':'; q++);
	      word_len = q - p;
	      if (*q != '=')
		{
		  /* Must be an enumerated value.  */
		  val = font_intern_prop (p, q - p, 1);

#define PROP_MATCH(STR,N) ((word_len == N) && memcmp (p, STR, N) == 0)

		  if (PROP_MATCH ("light", 5)

		      bcopy (p, copy, word_len);
		      copy += word_len;
		    }
#undef PROP_MATCH
		}
	      else /* KEY=VAL pairs  */
		{
		  Lisp_Object key;
		  char *keyhead = p;

		  if (word_len == 9 && memcmp (p, "pixelsize=", 10) == 0)
		    prop = FONT_SIZE_INDEX;
		  else
		    {
		      key = font_intern_prop (p, q - p, 1);
		      prop = get_font_prop_index (key);

			      font_prop_validate (prop, Qnil, val));
		      else if (prop >= 0)
			Ffont_put (font, key, val);
		      else
			{
			  *copy++ = ':';
			  bcopy (keyhead, copy, q - keyhead);
			  copy += q - keyhead;
			}
		    }
		}
	      p = *q ? q + 1 : q;
	    }
	  if (copy_start != copy)
	    font_put_extra (font, QCfc_unknown_spec,
			    make_unibyte_string (copy_start, copy - copy_start));
	}

96049:380525b11593

    {
      if (*p == '\\' && p[1])
	p++;
      else if (*p == ':')
	{
	  props_beg = family_end = p;
	  break;
	}
      else if (*p == '-')
	{
	  int decimal = 0, size_found = 1;

      if (size_beg)
	{
	  double point_size = strtod (size_beg, &size_end);
	  ASET (font, FONT_SIZE_INDEX, make_float (point_size));
	  if (*size_end == ':' && size_end[1])
	    props_beg = size_end;
	}
      if (props_beg)
	{
	  /* Now parse ":KEY=VAL" patterns.  Store known keys and values in
	     extra, copy unknown ones to COPY.  It is stored in extra slot by
	     the key QCfc_unknown_spec.  */
	  char *copy_start, *copy;
	  Lisp_Object val;

	  copy_start = copy = alloca (name + len - props_beg + 2);
	  if (! copy)
	    return -1;

	  for (p = props_beg; *p; p = q)
	    {
	      for (q = p + 1; *q && *q != '=' && *q != ':'; q++);
	      if (*q != '=')
		{
		  /* Must be an enumerated value.  */
		  int word_len;
		  p = p + 1;
		  word_len = q - p;
		  val = font_intern_prop (p, q - p, 1);

#define PROP_MATCH(STR,N) ((word_len == N) && memcmp (p, STR, N) == 0)

		  if (PROP_MATCH ("light", 5)

		      bcopy (p, copy, word_len);
		      copy += word_len;
		    }
#undef PROP_MATCH
		}
	      else
		{
		  /* KEY=VAL pairs  */
		  Lisp_Object key;
		  char *keyhead = p;
		  int prop;

		  if (q - p == 10 && memcmp (p + 1, "pixelsize", 9) == 0)
		    prop = FONT_SIZE_INDEX;
		  else
		    {
		      key = font_intern_prop (p, q - p, 1);
		      prop = get_font_prop_index (key);

			      font_prop_validate (prop, Qnil, val));
		      else if (prop >= 0)
			Ffont_put (font, key, val);
		      else
			{
			  bcopy (keyhead, copy, q - keyhead);
			  copy += q - keyhead;
			}
		    }
		}
	    }
	  if (copy_start != copy)
	    font_put_extra (font, QCfc_unknown_spec,
			    make_unibyte_string (copy_start, copy - copy_start));
	}