diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/font.c | 37 | ||||
| -rw-r--r-- | src/xfaces.c | 28 |
2 files changed, 40 insertions, 25 deletions
diff --git a/src/font.c b/src/font.c index 56a921da944..dcbcbc46be6 100644 --- a/src/font.c +++ b/src/font.c @@ -4199,26 +4199,33 @@ merge_font_spec (Lisp_Object from, Lisp_Object to) DEFUN ("font-get", Ffont_get, Sfont_get, 2, 2, 0, doc: /* Return the value of FONT's property KEY. FONT is a font-spec, a font-entity, or a font-object. -KEY is any symbol, but these are reserved for specific meanings: - :family, :weight, :slant, :width, :foundry, :adstyle, :registry, - :size, :name, :script, :otf +KEY can be any symbol, but these are reserved for specific meanings: + :foundry, :family, :adstyle, :registry, :weight, :slant, :width, + :size, :dpi, :spacing, :avgwidth, :script, :lang, :otf See the documentation of `font-spec' for their meanings. -In addition, if FONT is a font-entity or a font-object, values of -:script and :otf are different from those of a font-spec as below: -The value of :script may be a list of scripts that are supported by the font. +If FONT is a font-entity or a font-object, then values of +:script and :otf properties are different from those of a font-spec +as below: -The value of :otf is a cons (GSUB . GPOS) where GSUB and GPOS are lists -representing the OpenType features supported by the font by this form: - ((SCRIPT (LANGSYS FEATURE ...) ...) ...) -SCRIPT, LANGSYS, and FEATURE are all symbols representing OpenType -Layout tags. + The value of :script may be a list of scripts that are supported by + the font. + + The value of :otf is a cons (GSUB . GPOS) where GSUB and GPOS are + lists representing the OpenType features supported by the font, of + this form: ((SCRIPT (LANGSYS FEATURE ...) ...) ...), where + SCRIPT, LANGSYS, and FEATURE are all symbols representing OpenType + Layout tags. See `otf-script-alist' for the OpenType script tags. In addition to the keys listed above, the following keys are reserved for the specific meanings as below: -The value of :combining-capability is non-nil if the font-backend of -FONT supports rendering of combining characters for non-OTF fonts. */) + The value of :type is a symbol that identifies the font backend to be + used, such as `ftcrhb' or `xfthb' on X , `harfbuzz' or `uniscribe' on + MS-Windows, `ns' on Cocoa/GNUstep, etc. + + The value of :combining-capability is non-nil if the font-backend of + FONT supports rendering of combining characters for non-OTF fonts. */) (Lisp_Object font, Lisp_Object key) { int idx; @@ -4346,7 +4353,9 @@ accepted by the function `font-spec' (which see), VAL must be what allowed in `font-spec'. If FONT is a font-entity or a font-object, KEY must not be the one -accepted by `font-spec'. */) +accepted by `font-spec'. + +See also `font-get' for KEYs that have special meanings. */) (Lisp_Object font, Lisp_Object prop, Lisp_Object val) { int idx; diff --git a/src/xfaces.c b/src/xfaces.c index f7ee19195f4..22bd5a81b5b 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -1463,9 +1463,9 @@ enum xlfd_swidth }; /* Order by which font selection chooses fonts. The default values - mean `first, find a best match for the font width, then for the - font height, then for weight, then for slant.' This variable can be - set via set-face-font-sort-order. */ + mean "first, find a best match for the font width, then for the + font height, then for weight, then for slant." This variable can be + set via 'internal-set-font-selection-order'. */ static int font_sort_order[4]; @@ -1516,16 +1516,22 @@ If FAMILY is omitted or nil, list all families. Otherwise, FAMILY must be a string, possibly containing wildcards `?' and `*'. If FRAME is omitted or nil, use the selected frame. + Each element of the result is a vector [FAMILY WIDTH POINT-SIZE WEIGHT SLANT FIXED-P FULL REGISTRY-AND-ENCODING]. -FAMILY is the font family name. POINT-SIZE is the size of the -font in 1/10 pt. WIDTH, WEIGHT, and SLANT are symbols describing the -width, weight and slant of the font. These symbols are the same as for -face attributes. FIXED-P is non-nil if the font is fixed-pitch. -FULL is the full name of the font, and REGISTRY-AND-ENCODING is a string -giving the registry and encoding of the font. -The result list is sorted according to the current setting of -the face font sort order. */) + +FAMILY is the font family name. +POINT-SIZE is the size of the font in 1/10 pt. +WIDTH, WEIGHT, and SLANT are symbols describing the width, weight + and slant of the font. These symbols are the same as for face + attributes, see `set-face-attribute'. +FIXED-P is non-nil if the font is fixed-pitch. +FULL is the full name of the font. +REGISTRY-AND-ENCODING is a string giving the registry and encoding of + the font. + +The resulting list is sorted according to the current setting of +the face font sort order, see `face-font-selection-order'. */) (Lisp_Object family, Lisp_Object frame) { Lisp_Object font_spec, list, *drivers, vec; |