From: Kenichi Handa <handa@m17n.org>
Date: Tue, 6 Jun 2006 03:48:41 +0000 (+0000)
Subject: (enum composition_method) [USE_FONT_BACKEND]: New
X-Git-Tag: emacs-pretest-23.0.90~8295^2~946
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=028b54a0b3ed3681ee922e520084d7fdbff9a9f9;p=emacs.git

(enum composition_method) [USE_FONT_BACKEND]: New
enumeration COMPOSITION_WITH_GLYPH_STRING.
---

diff --git a/src/composite.h b/src/composite.h
index 47a86310413..08463afd899 100644
--- a/src/composite.h
+++ b/src/composite.h
@@ -4,7 +4,7 @@
    Copyright (C) 1997
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
-   Copyright (C) 2003
+   Copyright (C) 2003, 2006
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H13PRO009
 
@@ -28,7 +28,7 @@ Boston, MA 02110-1301, USA.  */
 #ifndef EMACS_COMPOSITE_H
 #define EMACS_COMPOSITE_H
 
-/* Methods to display a sequence of components a composition.  */
+/* Methods to display a sequence of components of a composition.  */
 enum composition_method {
   /* Compose relatively without alternate characters.  */
   COMPOSITION_RELATIVE,
@@ -40,6 +40,10 @@ enum composition_method {
   COMPOSITION_WITH_ALTCHARS,
   /* Compose by specified composition rules with alternate characters.  */
   COMPOSITION_WITH_RULE_ALTCHARS,
+#ifdef USE_FONT_BACKEND
+  /* Compose by specified lispy glyph-string.  */
+  COMPOSITION_WITH_GLYPH_STRING,
+#endif  /* USE_FONT_BACKEND */
   /* This is not a method.  */
   COMPOSITION_NO
 };