diff options
| author | Eli Zaretskii | 2015-06-13 13:23:42 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2015-06-13 13:23:42 +0300 |
| commit | f75d189ed87d4a5bcad5eb1b9c54382e6b7802dc (patch) | |
| tree | bafc72c0ab803339ebce7f7cc40cdd0437a5f92a /doc | |
| parent | 2f6956a0383f56c55d308d8ba8f10c052cd89c3e (diff) | |
| download | emacs-f75d189ed87d4a5bcad5eb1b9c54382e6b7802dc.tar.gz emacs-f75d189ed87d4a5bcad5eb1b9c54382e6b7802dc.zip | |
Improve documentation of ':lang' in font specs
* src/font.c (Ffont_spec): Doc fix: elaborate on the values and
use of the ':lang' property of the font spec.
* doc/emacs/frames.texi (Fonts): Document the language names that
can be in the STYLE part of XLFD.
* doc/lispref/display.texi (Low-Level Font): Document the ':lang'
property.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/frames.texi | 5 | ||||
| -rw-r--r-- | doc/lispref/display.texi | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi index f401c8f645f..de72d87cf48 100644 --- a/doc/emacs/frames.texi +++ b/doc/emacs/frames.texi | |||
| @@ -703,7 +703,10 @@ The font width---normally @samp{normal}, @samp{condensed}, | |||
| 703 | other values. | 703 | other values. |
| 704 | @item style | 704 | @item style |
| 705 | An optional additional style name. Usually it is empty---most XLFDs | 705 | An optional additional style name. Usually it is empty---most XLFDs |
| 706 | have two hyphens in a row at this point. | 706 | have two hyphens in a row at this point. The style name can also |
| 707 | specify a two-letter ISO-639 language name, like @samp{ja} or | ||
| 708 | @samp{ko}; some fonts that support CJK scripts have that spelled out | ||
| 709 | in the style name part. | ||
| 707 | @item pixels | 710 | @item pixels |
| 708 | The font height, in pixels. | 711 | The font height, in pixels. |
| 709 | @item height | 712 | @item height |
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 357a3c33fa3..b4e20371f35 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi | |||
| @@ -3419,6 +3419,15 @@ The charset registry and encoding of the font, such as | |||
| 3419 | @item :script | 3419 | @item :script |
| 3420 | The script that the font must support (a symbol). | 3420 | The script that the font must support (a symbol). |
| 3421 | 3421 | ||
| 3422 | @item :lang | ||
| 3423 | The language that the font should support. The value should be a | ||
| 3424 | symbol whose name is a two-letter ISO-639 language name. On X, the | ||
| 3425 | value is matched against the ``Additional Style'' field of the XLFD | ||
| 3426 | name of a font, if it is non-empty. On MS-Windows, fonts matching the | ||
| 3427 | spec are required to support codepages needed for the language. | ||
| 3428 | Currently, only a small set of CJK languages is supported with this | ||
| 3429 | property: @samp{ja}, @samp{ko}, and @samp{zh}. | ||
| 3430 | |||
| 3422 | @item :otf | 3431 | @item :otf |
| 3423 | @cindex OpenType font | 3432 | @cindex OpenType font |
| 3424 | The font must be an OpenType font that supports these OpenType | 3433 | The font must be an OpenType font that supports these OpenType |