aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa2009-06-16 00:33:58 +0000
committerKenichi Handa2009-06-16 00:33:58 +0000
commitb6cac59cc6486819db57809fd25573b2baa09970 (patch)
tree8e5e256a3361145be420e4ddddf82ceccf76dfe4
parent977b85f4d91050c0e35bcd88768d906c1df25af7 (diff)
downloademacs-b6cac59cc6486819db57809fd25573b2baa09970.tar.gz
emacs-b6cac59cc6486819db57809fd25573b2baa09970.zip
(compose-region): Improve the docstring.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/composite.el13
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 @@
12009-06-16 Kenichi Handa <handa@m17n.org>
2
3 * composite.el (compose-region): Improve the docstring.
4
12009-06-15 Stefan Monnier <monnier@iro.umontreal.ca> 52009-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
188Characters are composed relatively, i.e. composed by overstricking or 188Characters are composed relatively, i.e. composed by overstriking
189stacking depending on ascent, descent and other properties. 189or stacking depending on ascent, descent and other metrics of
190glyphs.
191
192For instance, if the region has three characters \"XYZ\", X is
193regarded 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
197and Z is displayed with the same rule while regarding the whole
198XY glyphs as BASE.
190 199
191When called from a program, expects these four arguments. 200When called from a program, expects these four arguments.
192 201