commit 819d3a5541b3903bda5d1299d48a6760379cac72
author Behdad Esfahbod <behdad@behdad.org> Tue Sep 12 12:21:05 2017 -0400
committer Behdad Esfahbod <behdad@behdad.org> Wed Sep 20 13:13:35 2017 -0700
tree 618fee6491b524cd321275b36dc7d5fa622f433c
parent 80e155c1c042d080772447d92c146501662ab85e

[varfonts] Add FC_VARIABLE

For now, we mark all fonts as non-variable.

fontconfig/fontconfig.h

diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index f4635aa..c61c502 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -99,6 +99,7 @@
 #define FC_OUTLINE	    "outline"		/* Bool */
 #define FC_SCALABLE	    "scalable"		/* Bool */
 #define FC_COLOR	    "color"		/* Bool */
+#define FC_VARIABLE	    "variable"		/* Bool */
 #define FC_SCALE	    "scale"		/* double (deprecated) */
 #define FC_SYMBOL	    "symbol"		/* Bool */
 #define FC_DPI		    "dpi"		/* double */

src/fcdefault.c

diff --git a/src/fcdefault.c b/src/fcdefault.c
index 10c183a..35973d7 100644
--- a/src/fcdefault.c
+++ b/src/fcdefault.c
@@ -39,6 +39,7 @@
     { FC_EMBEDDED_BITMAP_OBJECT,   FcTrue 	},  /* !FC_LOAD_NO_BITMAP */
     { FC_DECORATIVE_OBJECT,	   FcFalse	},
     { FC_SYMBOL_OBJECT,		   FcFalse	},
+    { FC_VARIABLE_OBJECT,	   FcFalse	},
 };
 
 #define NUM_FC_BOOL_DEFAULTS	(int) (sizeof FcBoolDefaults / sizeof FcBoolDefaults[0])

src/fcfreetype.c

diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index df33cf4..66afdf5 100644
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -1236,6 +1236,9 @@
 	    goto bail1;
     }
 
+    if (!FcPatternAddBool (pat, FC_VARIABLE, FcFalse))
+	goto bail1;
+
     if (id >> 16)
     {
       unsigned int instance_id = (id >> 16) - 1;

src/fcmatch.c

diff --git a/src/fcmatch.c b/src/fcmatch.c
index 113c14a..c386ee4 100644
--- a/src/fcmatch.c
+++ b/src/fcmatch.c
@@ -250,6 +250,7 @@
 typedef enum _FcMatcherPriority {
     PRI1(FILE),
     PRI1(FONTFORMAT),
+    PRI1(VARIABLE),
     PRI1(SCALABLE),
     PRI1(COLOR),
     PRI1(FOUNDRY),

src/fcobjs.h

diff --git a/src/fcobjs.h b/src/fcobjs.h
index c436a5d..5efd8d3 100644
--- a/src/fcobjs.h
+++ b/src/fcobjs.h
@@ -71,4 +71,5 @@
 FC_OBJECT (COLOR,		FcTypeBool,	FcCompareBool)
 FC_OBJECT (SYMBOL,		FcTypeBool,	FcCompareBool)
 FC_OBJECT (FONT_VARIATIONS,	FcTypeString,	NULL)
+FC_OBJECT (VARIABLE,		FcTypeBool,	FcCompareBool)
 /* ^-------------- Add new objects here. */