Mercurial > emacs
changeset 90823:b08ad368c328
(check_otf_features): Define it regardless of
HAVE_LIBOTF.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Thu, 26 Apr 2007 00:37:14 +0000 |
| parents | 18bdc5849a88 |
| children | d7ca7ddf2f25 |
| files | src/font.c |
| diffstat | 1 files changed, 27 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/src/font.c Wed Apr 25 13:12:05 2007 +0000 +++ b/src/font.c Thu Apr 26 00:37:14 2007 +0000 @@ -1480,6 +1480,33 @@ /* OTF handler */ +static void +check_otf_features (otf_features) + Lisp_Object otf_features; +{ + Lisp_Object val, elt; + + CHECK_CONS (otf_features); + CHECK_SYMBOL (XCAR (otf_features)); + otf_features = XCDR (otf_features); + CHECK_CONS (otf_features); + CHECK_SYMBOL (XCAR (otf_features)); + otf_features = XCDR (otf_features); + for (val = Fcar (otf_features); ! NILP (val); val = Fcdr (val)) + { + CHECK_SYMBOL (Fcar (val)); + if (SBYTES (SYMBOL_NAME (XCAR (val))) > 4) + error ("Invalid OTF GSUB feature: %s", SYMBOL_NAME (XCAR (val))); + } + otf_features = XCDR (otf_features); + for (val = Fcar (otf_features); ! NILP (val); val = Fcdr (val)) + { + CHECK_SYMBOL (Fcar (val)); + if (SBYTES (SYMBOL_NAME (XCAR (val))) > 4) + error ("Invalid OTF GPOS feature: %s", SYMBOL_NAME (XCAR (val))); + } +} + #ifdef HAVE_LIBOTF #include <otf.h> @@ -1657,33 +1684,6 @@ } } -static void -check_otf_features (otf_features) - Lisp_Object otf_features; -{ - Lisp_Object val, elt; - - CHECK_CONS (otf_features); - CHECK_SYMBOL (XCAR (otf_features)); - otf_features = XCDR (otf_features); - CHECK_CONS (otf_features); - CHECK_SYMBOL (XCAR (otf_features)); - otf_features = XCDR (otf_features); - for (val = Fcar (otf_features); ! NILP (val); val = Fcdr (val)) - { - CHECK_SYMBOL (Fcar (val)); - if (SBYTES (SYMBOL_NAME (XCAR (val))) > 4) - error ("Invalid OTF GSUB feature: %s", SYMBOL_NAME (XCAR (val))); - } - otf_features = XCDR (otf_features); - for (val = Fcar (otf_features); ! NILP (val); val = Fcdr (val)) - { - CHECK_SYMBOL (Fcar (val)); - if (SBYTES (SYMBOL_NAME (XCAR (val))) > 4) - error ("Invalid OTF GPOS feature: %s", SYMBOL_NAME (XCAR (val))); - } -} - Lisp_Object font_otf_DeviceTable (device_table) OTF_DeviceTable *device_table;