Commit 68eaeee4 authored by Kenichi Handa's avatar Kenichi Handa
Browse files

*** empty log message ***

parent d0ab1ebe
......@@ -3722,7 +3722,7 @@ DEFUN ("clear-font-cache", Fclear_font_cache, Sclear_font_cache, 0, 0, 0,
return Qnil;
}
/* The following three functions are still expremental. */
/* The following three functions are still experimental. */
DEFUN ("font-make-gstring", Ffont_make_gstring, Sfont_make_gstring, 2, 2, 0,
doc: /* Return a newly created g-string for FONT-OBJECT with NUM glyphs.
......
......@@ -1707,75 +1707,6 @@ enum xlfd_swidth
XLFD_SWIDTH_ULTRA_EXPANDED /* 90: UltraExpanded... */
};
/* Structure used for tables mapping XLFD weight, slant, and width
names to numeric and symbolic values. */
struct table_entry
{
char *name;
int numeric;
Lisp_Object *symbol;
};
/* Table of XLFD slant names and their numeric and symbolic
representations. This table must be sorted by slant names in
ascending order. */
static struct table_entry slant_table[] =
{
{"i", XLFD_SLANT_ITALIC, &Qitalic},
{"o", XLFD_SLANT_OBLIQUE, &Qoblique},
{"ot", XLFD_SLANT_OTHER, &Qitalic},
{"r", XLFD_SLANT_ROMAN, &Qnormal},
{"ri", XLFD_SLANT_REVERSE_ITALIC, &Qreverse_italic},
{"ro", XLFD_SLANT_REVERSE_OBLIQUE, &Qreverse_oblique}
};
/* Table of XLFD weight names. This table must be sorted by weight
names in ascending order. */
static struct table_entry weight_table[] =
{
{"black", XLFD_WEIGHT_ULTRA_BOLD, &Qultra_bold},
{"bold", XLFD_WEIGHT_BOLD, &Qbold},
{"book", XLFD_WEIGHT_SEMI_LIGHT, &Qsemi_light},
{"demi", XLFD_WEIGHT_SEMI_BOLD, &Qsemi_bold},
{"demibold", XLFD_WEIGHT_SEMI_BOLD, &Qsemi_bold},
{"extralight", XLFD_WEIGHT_EXTRA_LIGHT, &Qextra_light},
{"extrabold", XLFD_WEIGHT_EXTRA_BOLD, &Qextra_bold},
{"heavy", XLFD_WEIGHT_EXTRA_BOLD, &Qextra_bold},
{"light", XLFD_WEIGHT_LIGHT, &Qlight},
{"medium", XLFD_WEIGHT_MEDIUM, &Qnormal},
{"normal", XLFD_WEIGHT_MEDIUM, &Qnormal},
{"regular", XLFD_WEIGHT_MEDIUM, &Qnormal},
{"semibold", XLFD_WEIGHT_SEMI_BOLD, &Qsemi_bold},
{"semilight", XLFD_WEIGHT_SEMI_LIGHT, &Qsemi_light},
{"ultralight", XLFD_WEIGHT_ULTRA_LIGHT, &Qultra_light},
{"ultrabold", XLFD_WEIGHT_ULTRA_BOLD, &Qultra_bold}
};
/* Table of XLFD width names. This table must be sorted by width
names in ascending order. */
static struct table_entry swidth_table[] =
{
{"compressed", XLFD_SWIDTH_CONDENSED, &Qcondensed},
{"condensed", XLFD_SWIDTH_CONDENSED, &Qcondensed},
{"demiexpanded", XLFD_SWIDTH_SEMI_EXPANDED, &Qsemi_expanded},
{"expanded", XLFD_SWIDTH_EXPANDED, &Qexpanded},
{"extracondensed", XLFD_SWIDTH_EXTRA_CONDENSED, &Qextra_condensed},
{"extraexpanded", XLFD_SWIDTH_EXTRA_EXPANDED, &Qextra_expanded},
{"medium", XLFD_SWIDTH_MEDIUM, &Qnormal},
{"narrow", XLFD_SWIDTH_CONDENSED, &Qcondensed},
{"normal", XLFD_SWIDTH_MEDIUM, &Qnormal},
{"regular", XLFD_SWIDTH_MEDIUM, &Qnormal},
{"semicondensed", XLFD_SWIDTH_SEMI_CONDENSED, &Qsemi_condensed},
{"semiexpanded", XLFD_SWIDTH_SEMI_EXPANDED, &Qsemi_expanded},
{"ultracondensed", XLFD_SWIDTH_ULTRA_CONDENSED, &Qultra_condensed},
{"ultraexpanded", XLFD_SWIDTH_ULTRA_EXPANDED, &Qultra_expanded},
{"wide", XLFD_SWIDTH_EXTRA_EXPANDED, &Qextra_expanded}
};
/* The frame in effect when sorting font names. Set temporarily in
sort_fonts so that it is available in font comparison functions. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment