[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lispref/text.texi,v
From: |
Richard M. Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/lispref/text.texi,v |
Date: |
Sat, 21 Apr 2007 08:59:27 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Richard M. Stallman <rms> 07/04/21 08:59:27
Index: text.texi
===================================================================
RCS file: /cvsroot/emacs/emacs/lispref/text.texi,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -b -r1.138 -r1.139
--- text.texi 19 Apr 2007 06:09:32 -0000 1.138
+++ text.texi 21 Apr 2007 08:59:27 -0000 1.139
@@ -3262,22 +3262,25 @@
@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
+single glyph composed from components. For instance, in Thai a base
consonant is composed with the following combining vowel as a single
-glyph.
+glyph. The value should be a character or a sequence (vector, list,
+or string) of integers.
-The value is a character or a sequence (vector, list, or
-string) of integers.
address@hidden @bullet
address@hidden
+If it is a character, it means to display that character instead of
+the text in the region.
-If it is a character, it is an alternate character to display instead
address@hidden
+If it is a string, it means to display that string's contents 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.
address@hidden
+If it is a vector or list, the elements are characters interleaved
+with internal codes specifying how to compose the following character
+with the previous one.
address@hidden itemize
@end table
@node Format Properties
- [Emacs-diffs] Changes to emacs/lispref/text.texi,v, Richard M. Stallman, 2007/04/06
- [Emacs-diffs] Changes to emacs/lispref/text.texi,v, Karl Berry, 2007/04/07
- [Emacs-diffs] Changes to emacs/lispref/text.texi,v, Richard M. Stallman, 2007/04/08
- [Emacs-diffs] Changes to emacs/lispref/text.texi,v, Richard M. Stallman, 2007/04/11
- [Emacs-diffs] Changes to emacs/lispref/text.texi,v, Karl Berry, 2007/04/11
- [Emacs-diffs] Changes to emacs/lispref/text.texi,v, Kenichi Handa, 2007/04/19
- [Emacs-diffs] Changes to emacs/lispref/text.texi,v,
Richard M. Stallman <=
- [Emacs-diffs] Changes to emacs/lispref/text.texi,v, Miles Bader, 2007/04/27