(Special Properties): Document composition property.

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index a92e799ef8353493f19c5042e79d18315ab464e7..8c9535d2d6031343cae0fa2f8f3d4f04cdeb1d07 100644 (file)
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-19  Kenichi Handa  <handa@m17n.org>
+
+       * text.texi (Special Properties): Document composition property.
+
 2007-04-19  Glenn Morris  <rgm@gnu.org>
 
        * files.texi (File Name Expansion): Mention "superroot".

diff --git a/lispref/text.texi b/lispref/text.texi
index 148bf0025a2925d4d6f218b666aa3f7cea9a7ef1..38f2074e603490c3125d5884e72ad818435c238d 100644 (file)
--- a/lispref/text.texi
+++ b/lispref/text.texi
@@ -3241,7 +3241,6 @@ functions (which may be the same function).  In any case, all the
 It is possible with @code{char-after} to examine characters at various
 buffer positions without moving point to those positions.  Only an
 actual change in the value of point runs these hook functions.
-@end table
 
 @defvar inhibit-point-motion-hooks
 When this variable is non-@code{nil}, @code{point-left} and
@@ -3260,6 +3259,27 @@ string to display.  Tooltip mode (@pxref{Tooltips,,, emacs, The GNU Emacs
 Manual}) provides an example.
 @end defvar
 
+@item composition
+@kindex composition @r{(text property)}
+This text property is used to display a sequence of characters as a
+single glyph composed from components.  For instance, Thai base
+consonant is composed with the following combining vowel as a single
+glyph.
+
+The value is a character or a sequence (vector, list, or
+string) of integers.
+
+If it is a character, it is an alternate character to display instead
+of the text in the region.
+
+If it is a string, it is an alternate character sequences to
+display.
+
+If it is a vector or list, it is a sequence of alternate
+characters interleaved with internal codes specifying how to
+compose the following character with the previous one.
+@end table
+
 @node Format Properties
 @subsection Formatted Text Properties