diff options
| author | Kenichi Handa | 2009-06-16 00:33:58 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2009-06-16 00:33:58 +0000 |
| commit | b6cac59cc6486819db57809fd25573b2baa09970 (patch) | |
| tree | 8e5e256a3361145be420e4ddddf82ceccf76dfe4 | |
| parent | 977b85f4d91050c0e35bcd88768d906c1df25af7 (diff) | |
| download | emacs-b6cac59cc6486819db57809fd25573b2baa09970.tar.gz emacs-b6cac59cc6486819db57809fd25573b2baa09970.zip | |
(compose-region): Improve the docstring.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/composite.el | 13 |
2 files changed, 15 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a90a46acb36..8068e0d72eb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2009-06-16 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * composite.el (compose-region): Improve the docstring. | ||
| 4 | |||
| 1 | 2009-06-15 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2009-06-15 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * vc.el (vc-default-revision-granularity): Remove to let the normal | 7 | * vc.el (vc-default-revision-granularity): Remove to let the normal |
diff --git a/lisp/composite.el b/lisp/composite.el index ce34336cede..77eea9cb4ec 100644 --- a/lisp/composite.el +++ b/lisp/composite.el | |||
| @@ -185,8 +185,17 @@ RULE is a cons of global and new reference point symbols | |||
| 185 | (defun compose-region (start end &optional components modification-func) | 185 | (defun compose-region (start end &optional components modification-func) |
| 186 | "Compose characters in the current region. | 186 | "Compose characters in the current region. |
| 187 | 187 | ||
| 188 | Characters are composed relatively, i.e. composed by overstricking or | 188 | Characters are composed relatively, i.e. composed by overstriking |
| 189 | stacking depending on ascent, descent and other properties. | 189 | or stacking depending on ascent, descent and other metrics of |
| 190 | glyphs. | ||
| 191 | |||
| 192 | For instance, if the region has three characters \"XYZ\", X is | ||
| 193 | regarded as BASE glyph, and Y is displayed: | ||
| 194 | (1) above BASE if Y's descent value is not positive | ||
| 195 | (2) below BASE if Y's ascent value is not positive | ||
| 196 | (3) on BASE (i.e. at the BASE position) otherwise | ||
| 197 | and Z is displayed with the same rule while regarding the whole | ||
| 198 | XY glyphs as BASE. | ||
| 190 | 199 | ||
| 191 | When called from a program, expects these four arguments. | 200 | When called from a program, expects these four arguments. |
| 192 | 201 | ||