2 files changed, 35 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3d86f4d1052..974fb70c9e8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-18  Kenichi Handa  <handa@m17n.org>
+
+        * font.c (font_check_otf_features): Fix handling of `nil' element.
+        (Ffont_spec): Describe :lang and :otf in the docstring.
+
 2009-02-16  Andreas Schwab  <schwab@suse.de>
 
         * coding.c (Fcheck_coding_systems_region): Fix test for unibyte
diff --git a/src/font.c b/src/font.c
index 0bd18d4c5cd..df59a3b3376 100644
--- a/src/font.c
+++ b/src/font.c
@@ -2424,7 +2424,10 @@ font_check_otf_features (script, langsys, features, table)
   for (negative = 0; CONSP (features); features = XCDR (features))
     {
       if (NILP (XCAR (features)))
-        negative = 1;
+        {
+          negative = 1;
+          continue;
+        }
       if (NILP (Fmemq (XCAR (features), table)) != negative)
         return 0;
     }
@@ -3921,8 +3924,8 @@ encoding of a font, e.g. ``iso8859-1''.
 `:size'
 
 VALUE must be a non-negative integer or a floating point number
-specifying the font size.  It specifies the font size in pixels
-(if VALUE is an integer), or in points (if VALUE is a float).
+specifying the font size.  It specifies the font size in pixels (if
+VALUE is an integer), or in points (if VALUE is a float).
 
 `:name'
 
@@ -3933,6 +3936,30 @@ VALUE must be a string of XLFD-style or fontconfig-style font name.
 VALUE must be a symbol representing a script that the font must
 support.  It may be a symbol representing a subgroup of a script
 listed in the variable `script-representative-chars'.
+
+`:lang'
+
+VALUE must be a symbol of two-letter ISO-639 language names,
+e.g. `ja'.
+
+`:otf'
+
+VALUE must be a list (SCRIPT-TAG LANGSYS-TAG GSUB [ GPOS ]) to specify
+required OpenType features.
+
+  SCRIPT-TAG: OpenType script tag symbol (e.g. `deva').
+  LANGSYS-TAG: OpenType language system tag symbol,
+     or nil for the default language system.
+  GSUB: List of OpenType GSUB feature tag symbols, or nil if none required.
+  GPOS: List of OpenType GPOS feature tag symbols, or nil if none required.
+
+GSUB and GPOS may contain `nil' element.  In such a case, the font
+must not have any of the remaining elements.
+
+For instance, if the VALUE is `(thai nil nil (mark))', the font must
+be an OpenTyep font, and whose GPOS table of `thai' script's default
+language system must contain `mark' feature.
+
 usage: (font-spec ARGS...)  */)
      (nargs, args)
      int nargs;