diff options
| author | Xue Fuqiao | 2013-10-25 21:12:58 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-10-25 21:12:58 +0800 |
| commit | 3e1300f765befac6ed9e7f59c022f5f886babfd5 (patch) | |
| tree | 60d1c37d0149761eeec343a181cd562f3709bb65 | |
| parent | 2194b2a4b0425019ee80bb5a26673361cb059678 (diff) | |
| download | emacs-3e1300f765befac6ed9e7f59c022f5f886babfd5.tar.gz emacs-3e1300f765befac6ed9e7f59c022f5f886babfd5.zip | |
* doc/lispref/display.texi (Low-Level Font): Improve indexing.
| -rw-r--r-- | doc/lispref/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/lispref/display.texi | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 367d5b25227..b0df928a3be 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,8 +1,9 @@ | |||
| 1 | 2013-10-25 Xue Fuqiao <xfq.free@gmail.com> | 1 | 2013-10-25 Xue Fuqiao <xfq.free@gmail.com> |
| 2 | 2 | ||
| 3 | * nonascii.texi (Character Properties): Add an index for script symbols. | ||
| 4 | |||
| 5 | * display.texi (Fontsets): Minor wording fix. | 3 | * display.texi (Fontsets): Minor wording fix. |
| 4 | (Low-Level Font): Improve indexing. | ||
| 5 | |||
| 6 | * nonascii.texi (Character Properties): Add an index for script symbols. | ||
| 6 | 7 | ||
| 7 | 2013-10-24 Xue Fuqiao <xfq.free@gmail.com> | 8 | 2013-10-24 Xue Fuqiao <xfq.free@gmail.com> |
| 8 | 9 | ||
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 425c69a691e..b4e9baf877f 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi | |||
| @@ -3199,6 +3199,7 @@ should be one of @code{font-object}, @code{font-spec}, or | |||
| 3199 | @code{font-entity}. | 3199 | @code{font-entity}. |
| 3200 | @end defun | 3200 | @end defun |
| 3201 | 3201 | ||
| 3202 | @cindex font object | ||
| 3202 | A font object is a Lisp object that represents a font that Emacs has | 3203 | A font object is a Lisp object that represents a font that Emacs has |
| 3203 | @dfn{opened}. Font objects cannot be modified in Lisp, but they can | 3204 | @dfn{opened}. Font objects cannot be modified in Lisp, but they can |
| 3204 | be inspected. | 3205 | be inspected. |
| @@ -3212,6 +3213,7 @@ otherwise, @var{string} should be a string, and @var{position} | |||
| 3212 | specifies a position in that string. | 3213 | specifies a position in that string. |
| 3213 | @end defun | 3214 | @end defun |
| 3214 | 3215 | ||
| 3216 | @cindex font spec | ||
| 3215 | A font spec is a Lisp object that contains a set of specifications | 3217 | A font spec is a Lisp object that contains a set of specifications |
| 3216 | that can be used to find a font. More than one font may match the | 3218 | that can be used to find a font. More than one font may match the |
| 3217 | specifications in a font spec. | 3219 | specifications in a font spec. |
| @@ -3277,6 +3279,7 @@ Set the font property @var{property} in the font-spec @var{font-spec} | |||
| 3277 | to @var{value}. | 3279 | to @var{value}. |
| 3278 | @end defun | 3280 | @end defun |
| 3279 | 3281 | ||
| 3282 | @cindex font entity | ||
| 3280 | A font entity is a reference to a font that need not be open. Its | 3283 | A font entity is a reference to a font that need not be open. Its |
| 3281 | properties are intermediate between a font object and a font spec: | 3284 | properties are intermediate between a font object and a font spec: |
| 3282 | like a font object, and unlike a font spec, it refers to a single, | 3285 | like a font object, and unlike a font spec, it refers to a single, |