# HG changeset patch # User Kenichi Handa # Date 1211422865 0 # Node ID 4eed3c1f3e86c7b1d1e0bb189e7de3ce48c763fe # Parent 43c13e1346d5d2e6bd92d2b735647c052b047451 *** empty log message *** diff -r 43c13e1346d5 -r 4eed3c1f3e86 src/xfaces.c --- a/src/xfaces.c Thu May 22 02:20:16 2008 +0000 +++ b/src/xfaces.c Thu May 22 02:21:05 2008 +0000 @@ -1707,75 +1707,6 @@ 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. */