comparison src/macterm.c @ 65643:44af31946762

(xlfdpat_block_match_1): Fix assertion. (init_font_name_table) [TARGET_API_MAC_CARBON]: Don't add style variants for a scalable font multiple times.

65642:abfd35943fc4

static INLINE int
xlfdpat_exact_p (pat)
     struct xlfdpat *pat;
{
  return (pat)->blocks == NULL;
}

/* Return the first string in STRING + 0, ..., STRING + START_MAX such
   that the pattern in *BLK matches with its prefix.  Return NULL
   there is no such strings.  STRING must be lowered in advance.  */

  int start, infinity;
  unsigned char *p, *s;

  xassert (blk->len > 0);
  xassert (start_max + blk->len <= strlen (string));
  xassert (blk->pattern[blk->len - 1] != '?');

  /* See the comments in the function `boyer_moore' (search.c) for the
     use of `infinity'.  */
  infinity = start_max + blk->len + 1;
  blk->skip[blk->last_char] = infinity;

      while (FMGetNextFontFamilyInstance (&ffii, &font, &style, &size)
	     == noErr)
	{
	  Lisp_Object rest = XCDR (XCDR (text_encoding_info));

	  for (; !NILP (rest); rest = XCDR (rest))
	    {
	      char *cs = SDATA (XCAR (rest));

	      if (size == 0)
		{
		  add_font_name_table_entry (mac_to_x_fontname (name, size,
								style, cs));
		  add_font_name_table_entry (mac_to_x_fontname (name, size,
								italic, cs));
		  add_font_name_table_entry (mac_to_x_fontname (name, size,
								bold, cs));
		  add_font_name_table_entry (mac_to_x_fontname (name, size,
								italic | bold,
								cs));
		}
	      else
		{
		  add_font_name_table_entry (mac_to_x_fontname (name, size,
								style, cs));
		}
	    }
	}
    }

  UNGCPRO;

65643:44af31946762

static INLINE int
xlfdpat_exact_p (pat)
     struct xlfdpat *pat;
{
  return pat->blocks == NULL;
}

/* Return the first string in STRING + 0, ..., STRING + START_MAX such
   that the pattern in *BLK matches with its prefix.  Return NULL
   there is no such strings.  STRING must be lowered in advance.  */

  int start, infinity;
  unsigned char *p, *s;

  xassert (blk->len > 0);
  xassert (start_max + blk->len <= strlen (string));
  xassert (blk->last_char != '?');

  /* See the comments in the function `boyer_moore' (search.c) for the
     use of `infinity'.  */
  infinity = start_max + blk->len + 1;
  blk->skip[blk->last_char] = infinity;

      while (FMGetNextFontFamilyInstance (&ffii, &font, &style, &size)
	     == noErr)
	{
	  Lisp_Object rest = XCDR (XCDR (text_encoding_info));

	  if (size > 0 || style == normal)
	    for (; !NILP (rest); rest = XCDR (rest))
	      {
		char *cs = SDATA (XCAR (rest));

		if (size == 0)
		  {
		    add_font_name_table_entry (mac_to_x_fontname (name, size,
								  style, cs));
		    add_font_name_table_entry (mac_to_x_fontname (name, size,
								  italic, cs));
		    add_font_name_table_entry (mac_to_x_fontname (name, size,
								  bold, cs));
		    add_font_name_table_entry (mac_to_x_fontname (name, size,
								  italic | bold,
								  cs));
		  }
		else
		  {
		    add_font_name_table_entry (mac_to_x_fontname (name, size,
								  style, cs));
		  }
	      }
	}
    }

  UNGCPRO;