(struct OpenTypeSpec): New struct.

(OTF_SYM_TAG, OTF_TAG_STR): New macros.
(ftfont_get_open_type_spec): New function.
(ftfont_list) [HAVE_LIBOTF]: Check otf-spec property.

diff --git a/src/ftfont.c b/src/ftfont.c
index 50ad0f460dea3eac3c25fdd8ea4ef1a6d4cd3c0d..4170a2a892a3135d3a433f24c21414c3d182a9e6 100644 (file)
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -335,12 +335,12 @@ struct OpenTypeSpec
     tag = (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3];    \
   } while (0)
 
-#define OTF_TAG_STR(tag, str)                  \
+#define OTF_TAG_STR(tag, p)                    \
   do {                                         \
-    (str)[0] = (char) (tag >> 24);             \
-    (str)[1] = (char) ((tag >> 16) & 0xFF);    \
-    (str)[2] = (char) ((tag >> 8) & 0xFF);     \
-    (str)[3] = (char) (tag & 0xFF);            \
+    (p)[0] = (char) (tag >> 24);               \
+    (p)[1] = (char) ((tag >> 16) & 0xFF);      \
+    (p)[2] = (char) ((tag >> 8) & 0xFF);       \
+    (p)[3] = (char) (tag & 0xFF);              \
   } while (0)
 
 static struct OpenTypeSpec *