aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2007-04-26 00:37:14 +0000
committerKenichi Handa2007-04-26 00:37:14 +0000
commitcf385d93cc9c689763b187e69f38e556b490542b (patch)
tree5ff86a96e552b609f0681ce259f0c2010dcf91fd /src
parenteb7297e41fec0e74d40750d4a55e32cc4f412aea (diff)
downloademacs-cf385d93cc9c689763b187e69f38e556b490542b.tar.gz
emacs-cf385d93cc9c689763b187e69f38e556b490542b.zip
(check_otf_features): Define it regardless of
HAVE_LIBOTF.
Diffstat (limited to 'src')
-rw-r--r--src/font.c54
1 files changed, 27 insertions, 27 deletions
diff --git a/src/font.c b/src/font.c
index 1eedbe04bbc..db11387b2f4 100644
--- a/src/font.c
+++ b/src/font.c
@@ -1480,6 +1480,33 @@ check_gstring (gstring)
1480 1480
1481/* OTF handler */ 1481/* OTF handler */
1482 1482
1483static void
1484check_otf_features (otf_features)
1485 Lisp_Object otf_features;
1486{
1487 Lisp_Object val, elt;
1488
1489 CHECK_CONS (otf_features);
1490 CHECK_SYMBOL (XCAR (otf_features));
1491 otf_features = XCDR (otf_features);
1492 CHECK_CONS (otf_features);
1493 CHECK_SYMBOL (XCAR (otf_features));
1494 otf_features = XCDR (otf_features);
1495 for (val = Fcar (otf_features); ! NILP (val); val = Fcdr (val))
1496 {
1497 CHECK_SYMBOL (Fcar (val));
1498 if (SBYTES (SYMBOL_NAME (XCAR (val))) > 4)
1499 error ("Invalid OTF GSUB feature: %s", SYMBOL_NAME (XCAR (val)));
1500 }
1501 otf_features = XCDR (otf_features);
1502 for (val = Fcar (otf_features); ! NILP (val); val = Fcdr (val))
1503 {
1504 CHECK_SYMBOL (Fcar (val));
1505 if (SBYTES (SYMBOL_NAME (XCAR (val))) > 4)
1506 error ("Invalid OTF GPOS feature: %s", SYMBOL_NAME (XCAR (val)));
1507 }
1508}
1509
1483#ifdef HAVE_LIBOTF 1510#ifdef HAVE_LIBOTF
1484#include <otf.h> 1511#include <otf.h>
1485 1512
@@ -1657,33 +1684,6 @@ adjust_anchor (struct font *font, OTF_Anchor *anchor,
1657 } 1684 }
1658} 1685}
1659 1686
1660static void
1661check_otf_features (otf_features)
1662 Lisp_Object otf_features;
1663{
1664 Lisp_Object val, elt;
1665
1666 CHECK_CONS (otf_features);
1667 CHECK_SYMBOL (XCAR (otf_features));
1668 otf_features = XCDR (otf_features);
1669 CHECK_CONS (otf_features);
1670 CHECK_SYMBOL (XCAR (otf_features));
1671 otf_features = XCDR (otf_features);
1672 for (val = Fcar (otf_features); ! NILP (val); val = Fcdr (val))
1673 {
1674 CHECK_SYMBOL (Fcar (val));
1675 if (SBYTES (SYMBOL_NAME (XCAR (val))) > 4)
1676 error ("Invalid OTF GSUB feature: %s", SYMBOL_NAME (XCAR (val)));
1677 }
1678 otf_features = XCDR (otf_features);
1679 for (val = Fcar (otf_features); ! NILP (val); val = Fcdr (val))
1680 {
1681 CHECK_SYMBOL (Fcar (val));
1682 if (SBYTES (SYMBOL_NAME (XCAR (val))) > 4)
1683 error ("Invalid OTF GPOS feature: %s", SYMBOL_NAME (XCAR (val)));
1684 }
1685}
1686
1687Lisp_Object 1687Lisp_Object
1688font_otf_DeviceTable (device_table) 1688font_otf_DeviceTable (device_table)
1689 OTF_DeviceTable *device_table; 1689 OTF_DeviceTable *device_table;