summaryrefslogtreecommitdiff
path: root/lisp/composite.el
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2010-05-20 03:27:49 +0200
committerJuanma Barranquero <lekktu@gmail.com>2010-05-20 03:27:49 +0200
commit07d7c3bdc994e1def11a20b9f0a173fefaafb9bd (patch)
tree1d88ccf16d547d6858e060a4e80f98b9d2c3831f /lisp/composite.el
parent7bce851099c56c9aa40ff3f37f929c786995e434 (diff)
downloademacs-07d7c3bdc994e1def11a20b9f0a173fefaafb9bd.tar.gz
* composite.el: Require cl when compiling; fix typos in docstrings.
Diffstat (limited to 'lisp/composite.el')
-rw-r--r--lisp/composite.el8
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/composite.el b/lisp/composite.el
index 0afb2864879..d886be5a463 100644
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -28,6 +28,8 @@
;;; Code:
+(eval-when-compile (require 'cl))
+
(defconst reference-point-alist
'((tl . 0) (tc . 1) (tr . 2)
(Bl . 3) (Bc . 4) (Br . 5)
@@ -77,7 +79,7 @@ follows (the point `*' corresponds to both reference points):
+----+-----+ <--- new descent
A composition rule may have the form \(GLOBAL-REF-POINT
-NEW-REF-POINT XOFF YOFF), where XOFF and YOFF specifies how much
+NEW-REF-POINT XOFF YOFF), where XOFF and YOFF specify how much
to shift NEW-REF-POINT from GLOBAL-REF-POINT. In this case, XOFF
and YOFF are integers in the range -100..100 representing the
shifting percentage against the font size.")
@@ -537,7 +539,7 @@ character. If the preceding character is not a base character,
each combining character is composed as a spacing character by
a padding space before and/or after the character.
-All non-spacing characters has this function in
+All non-spacing characters have this function in
`composition-function-table' unless overwritten."
(let* ((header (lgstring-header gstring))
(nchars (lgstring-char-len gstring))
@@ -669,7 +671,7 @@ All non-spacing characters has this function in
Non-spacing characters are composed with the preceding base
character. If the preceding character is not a base character,
each non-spacing character is composed as a spacing character by
-a prepending a space before it."
+prepending a space before it."
(let* ((header (lgstring-header gstring))
(nchars (lgstring-char-len gstring))
(nglyphs (lgstring-glyph-len gstring))