comparison mac/src/macterm.c @ 38931:dc047d3af2cd

2001-08-24 Andrew Choi <[e-mail]> * src/macterm.c (init_font_name_table): Add an additional entry to the font table with the script code smRoman for each Apple Japanese font. (XLoadQueryFont): Recognize a font as having the smRoman script code even when FontToScript returns smJapanese if it is one of those created above.

38930:9cf07e15b208

                    {
                      font_name_table_size = 16;
                      font_name_table = (char **)
			xmalloc (font_name_table_size * sizeof (char *));
                    }
                  else if (font_name_count >= font_name_table_size)
                    {
                      font_name_table_size += 16;
                      font_name_table = (char **)
			xrealloc (font_name_table,
				  font_name_table_size * sizeof (char *));

                  font_name_table[font_name_count++]
		    = mac_to_x_fontname (name,
					 assc_entry->fontSize,
					 assc_entry->fontStyle,
					 scriptcode);
                }
            }

          HUnlock (font_handle);
          font_handle_2 = GetNextFOND (font_handle);

  font->mac_fontnum = fontnum;
  font->mac_fontsize = size;
  font->mac_fontface = fontface;
  font->mac_scriptcode = FontToScript (fontnum);

  is_two_byte_font = font->mac_scriptcode == smJapanese ||
                     font->mac_scriptcode == smTradChinese ||
                     font->mac_scriptcode == smSimpChinese ||
                     font->mac_scriptcode == smKorean;

38931:dc047d3af2cd

                    {
                      font_name_table_size = 16;
                      font_name_table = (char **)
			xmalloc (font_name_table_size * sizeof (char *));
                    }
                  else if (font_name_count >= font_name_table_size ||
                	   /* fonts in Japanese scripts require two
			      entries.  */
                	   scriptcode == smJapanese &&
                	   font_name_count + 1 >= font_name_table_size)
                    {
                      font_name_table_size += 16;
                      font_name_table = (char **)
			xrealloc (font_name_table,
				  font_name_table_size * sizeof (char *));

                  font_name_table[font_name_count++]
		    = mac_to_x_fontname (name,
					 assc_entry->fontSize,
					 assc_entry->fontStyle,
					 scriptcode);
		  /* Both jisx0208.1983-sjis and jisx0201.1976-sjis
		     parts are contained in Apple Japanese (SJIS)
		     font.  */
		  if (smJapanese == scriptcode)
		    {
		      font_name_table[font_name_count++]
		        = mac_to_x_fontname (name,
					     assc_entry->fontSize,
					     assc_entry->fontStyle,
					     smRoman);
		    }
                }
            }

          HUnlock (font_handle);
          font_handle_2 = GetNextFOND (font_handle);

  font->mac_fontnum = fontnum;
  font->mac_fontsize = size;
  font->mac_fontface = fontface;
  font->mac_scriptcode = FontToScript (fontnum);

  /* Apple Japanese (SJIS) font is listed as both
     "*-jisx0208.1983-sjis" (Japanese script) and "*-mac-roman" (Roman
     script) in init_font_name_table().  The latter should be treated
     as a one-byte font.  */
  {
    char cs[32];

    if (sscanf (name, 
		"-%*[^-]-%*[^-]-%*[^-]-%*c-%*[^-]--%*[^-]-%*[^-]-%*[^-]-%*[^-]-%*c-%*[^-]-%31s",
		cs) == 1
	&& 0 == strcmp (cs, "mac-roman"))  
      font->mac_scriptcode = smRoman;
  }
  
  is_two_byte_font = font->mac_scriptcode == smJapanese ||
                     font->mac_scriptcode == smTradChinese ||
                     font->mac_scriptcode == smSimpChinese ||
                     font->mac_scriptcode == smKorean;