Module Name: xsrc
Committed By: mrg
Date: Tue Jun 20 02:21:56 UTC 2023
Modified Files:
xsrc/external/mit/fontconfig/dist/doc: FcLangSetGetLangs.3
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel:
fclangsetgetlangs.html
xsrc/external/mit/fontconfig/dist/src: fccache.c fccfg.c fcint.h
fcname.c
xsrc/external/mit/fontconfig/include: fcalias.h fcaliastail.h
fcobjshash.h
Removed Files:
xsrc/external/mit/fontconfig/dist/conf.d: 10-no-sub-pixel.conf
Log Message:
merge fontconfig 2.14.2.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.6 -r0 \
xsrc/external/mit/fontconfig/dist/conf.d/10-no-sub-pixel.conf
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/fontconfig/dist/src/fccache.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/fontconfig/dist/src/fccfg.c
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/fontconfig/dist/src/fcint.h \
xsrc/external/mit/fontconfig/dist/src/fcname.c
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/fontconfig/include/fcalias.h \
xsrc/external/mit/fontconfig/include/fcaliastail.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/fontconfig/include/fcobjshash.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3
diff -u xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3:1.7 xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3:1.8
--- xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3:1.7 Sat Jan 21 02:10:38 2023
+++ xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3 Tue Jun 20 02:21:56 2023
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcLangSetGetLangs" "3" "21 10月 2022" "Fontconfig 2.14.1" ""
+.TH "FcLangSetGetLangs" "3" "27 1月 2023" "Fontconfig 2.14.2" ""
.SH NAME
FcLangSetGetLangs \- get the list of languages in the langset
.SH SYNOPSIS
Index: xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html
diff -u xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html:1.5 xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html:1.6
--- xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html:1.5 Fri Mar 8 09:49:07 2019
+++ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html Tue Jun 20 02:21:56 2023
@@ -103,7 +103,7 @@ WIDTH="100%"
><PRE
CLASS="FUNCSYNOPSISINFO"
>#include <fontconfig/fontconfig.h>
- </PRE
+ </PRE
></TD
></TR
></TABLE
@@ -140,7 +140,7 @@ CLASS="PARAMETER"
>langset</I
></TT
>.
- </P
+ </P
></DIV
><DIV
CLASS="NAVFOOTER"
Index: xsrc/external/mit/fontconfig/dist/src/fccache.c
diff -u xsrc/external/mit/fontconfig/dist/src/fccache.c:1.11 xsrc/external/mit/fontconfig/dist/src/fccache.c:1.12
--- xsrc/external/mit/fontconfig/dist/src/fccache.c:1.11 Thu Jan 19 06:14:18 2023
+++ xsrc/external/mit/fontconfig/dist/src/fccache.c Tue Jun 20 02:21:56 2023
@@ -295,7 +295,7 @@ FcDirCacheUnlink (const FcChar8 *dir, Fc
ret = FcFalse;
goto bail;
}
-
+
while ((cache_dir = FcStrListNext (list)))
{
if (sysroot)
@@ -395,7 +395,7 @@ FcDirCacheProcess (FcConfig *config, con
list = FcStrListCreate (config->cacheDirs);
if (!list)
return FcFalse;
-
+
while ((cache_dir = FcStrListNext (list)))
{
FcChar8 *cache_hashed;
@@ -814,20 +814,17 @@ FcCacheFini (void)
{
int i;
- for (i = 0; i < FC_CACHE_MAX_LEVEL; i++)
+ if (FcDebug() & FC_DBG_CACHE)
{
- if (FcDebug() & FC_DBG_CACHE)
+ for (i = 0; i < FC_CACHE_MAX_LEVEL; i++)
{
if (fcCacheChains[i] != NULL)
{
FcCacheSkip *s = fcCacheChains[i];
- printf("Fontconfig error: not freed %p (dir: %s, refcount %" FC_ATOMIC_INT_FORMAT ")\n", s->cache, FcCacheDir(s->cache), s->ref.count);
+ fprintf(stderr, "Fontconfig error: not freed %p (dir: %s, refcount %" FC_ATOMIC_INT_FORMAT ")\n", s->cache, FcCacheDir(s->cache), s->ref.count);
}
}
- else
- assert (fcCacheChains[i] == NULL);
}
- assert (fcCacheMaxLevel == 0);
free_lock ();
}
@@ -1039,7 +1036,7 @@ FcDirCacheMapFd (FcConfig *config, int f
/* Mark allocated caches so they're freed rather than unmapped */
if (allocated)
cache->magic = FC_CACHE_MAGIC_ALLOC;
-
+
return cache;
}
@@ -1731,7 +1728,7 @@ FcCacheCopySet args1(const FcCache *c)
for (i = 0; i < old->nfont; i++)
{
FcPattern *font = FcFontSetFont (old, i);
-
+
FcPatternReference (font);
if (!FcFontSetAdd (new, font))
{
Index: xsrc/external/mit/fontconfig/dist/src/fccfg.c
diff -u xsrc/external/mit/fontconfig/dist/src/fccfg.c:1.5 xsrc/external/mit/fontconfig/dist/src/fccfg.c:1.6
--- xsrc/external/mit/fontconfig/dist/src/fccfg.c:1.5 Thu Jan 19 06:14:18 2023
+++ xsrc/external/mit/fontconfig/dist/src/fccfg.c Tue Jun 20 02:21:56 2023
@@ -362,40 +362,43 @@ FcConfigDestroy (FcConfig *config)
FcExprPage *page;
FcMatchKind k;
- if (FcRefDec (&config->ref) != 1)
- return;
+ if (config)
+ {
+ if (FcRefDec (&config->ref) != 1)
+ return;
- (void) fc_atomic_ptr_cmpexch (&_fcConfig, config, NULL);
+ (void) fc_atomic_ptr_cmpexch (&_fcConfig, config, NULL);
- FcStrSetDestroy (config->configDirs);
- FcStrSetDestroy (config->configMapDirs);
- FcStrSetDestroy (config->fontDirs);
- FcStrSetDestroy (config->cacheDirs);
- FcStrSetDestroy (config->configFiles);
- FcStrSetDestroy (config->acceptGlobs);
- FcStrSetDestroy (config->rejectGlobs);
- FcFontSetDestroy (config->acceptPatterns);
- FcFontSetDestroy (config->rejectPatterns);
+ FcStrSetDestroy (config->configDirs);
+ FcStrSetDestroy (config->configMapDirs);
+ FcStrSetDestroy (config->fontDirs);
+ FcStrSetDestroy (config->cacheDirs);
+ FcStrSetDestroy (config->configFiles);
+ FcStrSetDestroy (config->acceptGlobs);
+ FcStrSetDestroy (config->rejectGlobs);
+ FcFontSetDestroy (config->acceptPatterns);
+ FcFontSetDestroy (config->rejectPatterns);
- for (k = FcMatchKindBegin; k < FcMatchKindEnd; k++)
- FcPtrListDestroy (config->subst[k]);
- FcPtrListDestroy (config->rulesetList);
- FcStrSetDestroy (config->availConfigFiles);
- for (set = FcSetSystem; set <= FcSetApplication; set++)
- if (config->fonts[set])
- FcFontSetDestroy (config->fonts[set]);
-
- page = config->expr_pool;
- while (page)
- {
- FcExprPage *next = page->next_page;
- free (page);
- page = next;
- }
- if (config->sysRoot)
+ for (k = FcMatchKindBegin; k < FcMatchKindEnd; k++)
+ FcPtrListDestroy (config->subst[k]);
+ FcPtrListDestroy (config->rulesetList);
+ FcStrSetDestroy (config->availConfigFiles);
+ for (set = FcSetSystem; set <= FcSetApplication; set++)
+ if (config->fonts[set])
+ FcFontSetDestroy (config->fonts[set]);
+
+ page = config->expr_pool;
+ while (page)
+ {
+ FcExprPage *next = page->next_page;
+ free (page);
+ page = next;
+ }
+ if (config->sysRoot)
FcStrFree (config->sysRoot);
- free (config);
+ free (config);
+ }
}
/*
@@ -421,7 +424,7 @@ FcConfigAddCache (FcConfig *config, FcCa
if (fs)
{
int nref = 0;
-
+
for (i = 0; i < fs->nfont; i++)
{
FcPattern *font = FcFontSetFont (fs, i);
@@ -505,7 +508,7 @@ FcConfigAddDirList (FcConfig *config, Fc
dirlist = FcStrListCreate (dirSet);
if (!dirlist)
return FcFalse;
-
+
while ((dir = FcStrListNext (dirlist)))
{
if (FcDebug () & FC_DBG_FONTSET)
@@ -534,7 +537,7 @@ FcConfigBuildFonts (FcConfig *config)
config = FcConfigReference (config);
if (!config)
return FcFalse;
-
+
fonts = FcFontSetCreate ();
if (!fonts)
{
@@ -1331,7 +1334,7 @@ FcConfigEvaluate (FcPattern *p, FcPatter
v.u.b = FcConfigCompareValue (&vl, e->op, &vr);
FcValueDestroy (vl);
FcValueDestroy (vr);
- break;
+ break;
case FcOpOr:
case FcOpAnd:
case FcOpPlus:
@@ -1347,7 +1350,7 @@ FcConfigEvaluate (FcPattern *p, FcPatter
switch ((int) vle.type) {
case FcTypeDouble:
switch ((int) op) {
- case FcOpPlus:
+ case FcOpPlus:
v.type = FcTypeDouble;
v.u.d = vle.u.d + vre.u.d;
break;
@@ -1396,7 +1399,7 @@ FcConfigEvaluate (FcPattern *p, FcPatter
str = FcStrPlus (vle.u.s, vre.u.s);
v.u.s = FcStrdup (str);
FcStrFree (str);
-
+
if (!v.u.s)
v.type = FcTypeVoid;
break;
@@ -2829,7 +2832,7 @@ FcConfigAppFontAddFile (FcConfig *con
}
FcConfigSetFonts (config, set, FcSetApplication);
}
-
+
if (!FcFileScanConfig (set, subdirs, file, config))
{
FcStrSetDestroy (subdirs);
@@ -2920,8 +2923,13 @@ FcConfigGlobAdd (FcConfig *config,
FcBool accept)
{
FcStrSet *set = accept ? config->acceptGlobs : config->rejectGlobs;
+ FcChar8 *realglob = FcStrCopyFilename(glob);
+ if (!realglob)
+ return FcFalse;
- return FcStrSetAdd (set, glob);
+ FcBool ret = FcStrSetAdd (set, realglob);
+ FcStrFree(realglob);
+ return ret;
}
static FcBool
Index: xsrc/external/mit/fontconfig/dist/src/fcint.h
diff -u xsrc/external/mit/fontconfig/dist/src/fcint.h:1.10 xsrc/external/mit/fontconfig/dist/src/fcint.h:1.11
--- xsrc/external/mit/fontconfig/dist/src/fcint.h:1.10 Thu Jan 19 06:14:18 2023
+++ xsrc/external/mit/fontconfig/dist/src/fcint.h Tue Jun 20 02:21:56 2023
@@ -199,7 +199,7 @@ typedef struct _FcValueList {
} FcValueList;
#define FcValueListNext(vl) FcPointerMember(vl,next,FcValueList)
-
+
typedef int FcObject;
/* The 1024 is to leave some room for future added internal objects, such
@@ -238,7 +238,7 @@ struct _FcPattern {
FcFontSetFonts(fs)[i], \
FcPattern) : \
fs->fonts[i])
-
+
typedef enum _FcOp {
FcOpInteger, FcOpDouble, FcOpString, FcOpMatrix, FcOpRange, FcOpBool, FcOpCharSet, FcOpLangSet,
FcOpNil,
@@ -909,6 +909,9 @@ FcGetDefaultLang (void);
FcPrivate FcChar8 *
FcGetPrgname (void);
+FcPrivate FcChar8 *
+FcGetDesktopName (void);
+
FcPrivate void
FcDefaultFini (void);
Index: xsrc/external/mit/fontconfig/dist/src/fcname.c
diff -u xsrc/external/mit/fontconfig/dist/src/fcname.c:1.10 xsrc/external/mit/fontconfig/dist/src/fcname.c:1.11
--- xsrc/external/mit/fontconfig/dist/src/fcname.c:1.10 Thu Jan 19 06:14:18 2023
+++ xsrc/external/mit/fontconfig/dist/src/fcname.c Tue Jun 20 02:21:56 2023
@@ -143,6 +143,7 @@ static const FcConstant _FcBaseConstants
{ (FcChar8 *) "light", "weight", FC_WEIGHT_LIGHT, },
{ (FcChar8 *) "book", "weight", FC_WEIGHT_BOOK, },
{ (FcChar8 *) "regular", "weight", FC_WEIGHT_REGULAR, },
+ { (FcChar8 *) "normal", "weight", FC_WEIGHT_NORMAL, },
{ (FcChar8 *) "medium", "weight", FC_WEIGHT_MEDIUM, },
{ (FcChar8 *) "demibold", "weight", FC_WEIGHT_DEMIBOLD, },
{ (FcChar8 *) "semibold", "weight", FC_WEIGHT_DEMIBOLD, },
@@ -151,6 +152,8 @@ static const FcConstant _FcBaseConstants
{ (FcChar8 *) "ultrabold", "weight", FC_WEIGHT_EXTRABOLD, },
{ (FcChar8 *) "black", "weight", FC_WEIGHT_BLACK, },
{ (FcChar8 *) "heavy", "weight", FC_WEIGHT_HEAVY, },
+ { (FcChar8 *) "extrablack", "weight", FC_WEIGHT_EXTRABLACK, },
+ { (FcChar8 *) "ultrablack", "weight", FC_WEIGHT_ULTRABLACK, },
{ (FcChar8 *) "roman", "slant", FC_SLANT_ROMAN, },
{ (FcChar8 *) "italic", "slant", FC_SLANT_ITALIC, },
@@ -228,6 +231,19 @@ FcNameGetConstant (const FcChar8 *string
return 0;
}
+const FcConstant *
+FcNameGetConstantFor (const FcChar8 *string, const char *object)
+{
+ unsigned int i;
+
+ for (i = 0; i < NUM_FC_CONSTANTS; i++)
+ if (!FcStrCmpIgnoreCase (string, _FcBaseConstants[i].name) &&
+ !FcStrCmpIgnoreCase ((const FcChar8 *)object, (const FcChar8 *)_FcBaseConstants[i].object))
+ return &_FcBaseConstants[i];
+
+ return 0;
+}
+
FcBool
FcNameConstant (const FcChar8 *string, int *result)
{
@@ -246,13 +262,19 @@ FcNameConstantWithObjectCheck (const FcC
{
const FcConstant *c;
- if ((c = FcNameGetConstant(string)))
+ if ((c = FcNameGetConstantFor(string, object)))
+ {
+ *result = c->value;
+ return FcTrue;
+ }
+ else if ((c = FcNameGetConstant(string)))
{
if (strcmp (c->object, object) != 0)
{
fprintf (stderr, "Fontconfig error: Unexpected constant name `%s' used for object `%s': should be `%s'\n", string, object, c->object);
return FcFalse;
}
+ /* Unlikely to reach out */
*result = c->value;
return FcTrue;
}
@@ -655,7 +677,7 @@ FcNameUnparseEscaped (FcPattern *pat, Fc
if (!strcmp (o->object, FC_FAMILY) ||
!strcmp (o->object, FC_SIZE))
continue;
-
+
e = FcPatternObjectFindElt (pat, id);
if (e)
{
Index: xsrc/external/mit/fontconfig/include/fcalias.h
diff -u xsrc/external/mit/fontconfig/include/fcalias.h:1.9 xsrc/external/mit/fontconfig/include/fcalias.h:1.10
--- xsrc/external/mit/fontconfig/include/fcalias.h:1.9 Thu Jan 19 06:14:18 2023
+++ xsrc/external/mit/fontconfig/include/fcalias.h Tue Jun 20 02:21:56 2023
@@ -272,6 +272,8 @@ extern __typeof (FcNameUnregisterConstan
#define FcNameUnregisterConstants IA__FcNameUnregisterConstants
extern __typeof (FcNameGetConstant) IA__FcNameGetConstant FC_ATTRIBUTE_VISIBILITY_HIDDEN;
#define FcNameGetConstant IA__FcNameGetConstant
+extern __typeof (FcNameGetConstantFor) IA__FcNameGetConstantFor FC_ATTRIBUTE_VISIBILITY_HIDDEN;
+#define FcNameGetConstantFor IA__FcNameGetConstantFor
extern __typeof (FcNameConstant) IA__FcNameConstant FC_ATTRIBUTE_VISIBILITY_HIDDEN;
#define FcNameConstant IA__FcNameConstant
extern __typeof (FcNameParse) IA__FcNameParse FC_ATTRIBUTE_VISIBILITY_HIDDEN;
Index: xsrc/external/mit/fontconfig/include/fcaliastail.h
diff -u xsrc/external/mit/fontconfig/include/fcaliastail.h:1.9 xsrc/external/mit/fontconfig/include/fcaliastail.h:1.10
--- xsrc/external/mit/fontconfig/include/fcaliastail.h:1.9 Thu Jan 19 06:14:18 2023
+++ xsrc/external/mit/fontconfig/include/fcaliastail.h Tue Jun 20 02:21:56 2023
@@ -310,6 +310,8 @@ extern __typeof (FcNameRegisterConstants
extern __typeof (FcNameUnregisterConstants) FcNameUnregisterConstants __attribute((alias("IA__FcNameUnregisterConstants"))) FC_ATTRIBUTE_VISIBILITY_EXPORT;
# undef FcNameGetConstant
extern __typeof (FcNameGetConstant) FcNameGetConstant __attribute((alias("IA__FcNameGetConstant"))) FC_ATTRIBUTE_VISIBILITY_EXPORT;
+# undef FcNameGetConstantFor
+extern __typeof (FcNameGetConstantFor) FcNameGetConstantFor __attribute((alias("IA__FcNameGetConstantFor"))) FC_ATTRIBUTE_VISIBILITY_EXPORT;
# undef FcNameConstant
extern __typeof (FcNameConstant) FcNameConstant __attribute((alias("IA__FcNameConstant"))) FC_ATTRIBUTE_VISIBILITY_EXPORT;
# undef FcNameParse
Index: xsrc/external/mit/fontconfig/include/fcobjshash.h
diff -u xsrc/external/mit/fontconfig/include/fcobjshash.h:1.2 xsrc/external/mit/fontconfig/include/fcobjshash.h:1.3
--- xsrc/external/mit/fontconfig/include/fcobjshash.h:1.2 Thu Jan 19 06:14:18 2023
+++ xsrc/external/mit/fontconfig/include/fcobjshash.h Tue Jun 20 02:21:56 2023
@@ -37,7 +37,7 @@ int name;
int id;
};
#include <string.h>
-/* maximum key range = 59, duplicates = 0 */
+/* maximum key range = 55, duplicates = 0 */
#ifdef __GNUC__
__inline
@@ -51,32 +51,32 @@ FcObjectTypeHash (register const char *s
{
static const unsigned char asso_values[] =
{
- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
- 66, 66, 66, 66, 66, 66, 66, 4, 10, 32,
- 21, 29, 28, 49, 14, 4, 66, 66, 5, 31,
- 18, 22, 27, 66, 15, 9, 8, 23, 23, 13,
- 23, 16, 4, 66, 66, 66, 66, 66, 66, 66,
- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
- 66, 66, 66, 66, 66, 66
+ 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
+ 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
+ 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
+ 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
+ 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
+ 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
+ 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
+ 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
+ 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
+ 61, 61, 61, 61, 61, 61, 61, 2, 19, 30,
+ 14, 31, 34, 51, 13, 7, 61, 61, 18, 5,
+ 10, 40, 17, 61, 18, 2, 6, 38, 28, 46,
+ 23, 8, 3, 61, 61, 61, 61, 61, 61, 61,
+ 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
+ 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
+ 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
+ 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
+ 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
+ 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
+ 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
+ 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
+ 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
+ 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
+ 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
+ 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
+ 61, 61, 61, 61, 61, 61
};
register unsigned int hval = len;
@@ -95,113 +95,115 @@ FcObjectTypeHash (register const char *s
struct FcObjectTypeNamePool_t
{
- char FcObjectTypeNamePool_str7[sizeof("dpi")];
- char FcObjectTypeNamePool_str8[sizeof("size")];
- char FcObjectTypeNamePool_str9[sizeof("file")];
- char FcObjectTypeNamePool_str13[sizeof("hash")];
- char FcObjectTypeNamePool_str14[sizeof("rgba")];
- char FcObjectTypeNamePool_str15[sizeof("spacing")];
- char FcObjectTypeNamePool_str16[sizeof("scalable")];
- char FcObjectTypeNamePool_str17[sizeof("slant")];
- char FcObjectTypeNamePool_str18[sizeof("matrix")];
- char FcObjectTypeNamePool_str19[sizeof("outline")];
- char FcObjectTypeNamePool_str20[sizeof("charset")];
- char FcObjectTypeNamePool_str21[sizeof("antialias")];
- char FcObjectTypeNamePool_str22[sizeof("lang")];
- char FcObjectTypeNamePool_str23[sizeof("embolden")];
- char FcObjectTypeNamePool_str24[sizeof("weight")];
- char FcObjectTypeNamePool_str25[sizeof("color")];
- char FcObjectTypeNamePool_str26[sizeof("charwidth")];
- char FcObjectTypeNamePool_str27[sizeof("variable")];
- char FcObjectTypeNamePool_str28[sizeof("charheight")];
- char FcObjectTypeNamePool_str29[sizeof("hinting")];
- char FcObjectTypeNamePool_str30[sizeof("autohint")];
- char FcObjectTypeNamePool_str31[sizeof("fullname")];
- char FcObjectTypeNamePool_str32[sizeof("postscriptname")];
- char FcObjectTypeNamePool_str33[sizeof("verticallayout")];
- char FcObjectTypeNamePool_str34[sizeof("lcdfilter")];
- char FcObjectTypeNamePool_str35[sizeof("fullnamelang")];
- char FcObjectTypeNamePool_str36[sizeof("hintstyle")];
- char FcObjectTypeNamePool_str37[sizeof("pixelsize")];
+ char FcObjectTypeNamePool_str6[sizeof("hash")];
+ char FcObjectTypeNamePool_str7[sizeof("size")];
+ char FcObjectTypeNamePool_str10[sizeof("dpi")];
+ char FcObjectTypeNamePool_str11[sizeof("charset")];
+ char FcObjectTypeNamePool_str12[sizeof("scalable")];
+ char FcObjectTypeNamePool_str13[sizeof("slant")];
+ char FcObjectTypeNamePool_str14[sizeof("lang")];
+ char FcObjectTypeNamePool_str15[sizeof("desktop")];
+ char FcObjectTypeNamePool_str16[sizeof("spacing")];
+ char FcObjectTypeNamePool_str17[sizeof("antialias")];
+ char FcObjectTypeNamePool_str18[sizeof("postscriptname")];
+ char FcObjectTypeNamePool_str19[sizeof("matrix")];
+ char FcObjectTypeNamePool_str20[sizeof("outline")];
+ char FcObjectTypeNamePool_str21[sizeof("hintstyle")];
+ char FcObjectTypeNamePool_str22[sizeof("file")];
+ char FcObjectTypeNamePool_str23[sizeof("rgba")];
+ char FcObjectTypeNamePool_str24[sizeof("hinting")];
+ char FcObjectTypeNamePool_str25[sizeof("charheight")];
+ char FcObjectTypeNamePool_str26[sizeof("weight")];
+ char FcObjectTypeNamePool_str27[sizeof("autohint")];
+ char FcObjectTypeNamePool_str28[sizeof("variable")];
+ char FcObjectTypeNamePool_str29[sizeof("family")];
+ char FcObjectTypeNamePool_str30[sizeof("lcdfilter")];
+ char FcObjectTypeNamePool_str31[sizeof("namelang")];
+ char FcObjectTypeNamePool_str32[sizeof("width")];
+ char FcObjectTypeNamePool_str33[sizeof("familylang")];
+ char FcObjectTypeNamePool_str34[sizeof("fonthashint")];
+ char FcObjectTypeNamePool_str35[sizeof("minspace")];
+ char FcObjectTypeNamePool_str36[sizeof("fullname")];
+ char FcObjectTypeNamePool_str37[sizeof("order")];
char FcObjectTypeNamePool_str38[sizeof("scale")];
- char FcObjectTypeNamePool_str39[sizeof("globaladvance")];
- char FcObjectTypeNamePool_str40[sizeof("width")];
- char FcObjectTypeNamePool_str41[sizeof("order")];
- char FcObjectTypeNamePool_str42[sizeof("family")];
- char FcObjectTypeNamePool_str43[sizeof("fonthashint")];
- char FcObjectTypeNamePool_str44[sizeof("namelang")];
- char FcObjectTypeNamePool_str45[sizeof("embeddedbitmap")];
- char FcObjectTypeNamePool_str46[sizeof("familylang")];
- char FcObjectTypeNamePool_str47[sizeof("capability")];
- char FcObjectTypeNamePool_str48[sizeof("rasterizer")];
- char FcObjectTypeNamePool_str49[sizeof("index")];
- char FcObjectTypeNamePool_str50[sizeof("style")];
- char FcObjectTypeNamePool_str51[sizeof("foundry")];
- char FcObjectTypeNamePool_str52[sizeof("fontversion")];
- char FcObjectTypeNamePool_str53[sizeof("minspace")];
- char FcObjectTypeNamePool_str54[sizeof("stylelang")];
- char FcObjectTypeNamePool_str55[sizeof("fontvariations")];
- char FcObjectTypeNamePool_str56[sizeof("fontformat")];
- char FcObjectTypeNamePool_str57[sizeof("decorative")];
- char FcObjectTypeNamePool_str58[sizeof("fontfeatures")];
- char FcObjectTypeNamePool_str59[sizeof("symbol")];
+ char FcObjectTypeNamePool_str39[sizeof("verticallayout")];
+ char FcObjectTypeNamePool_str40[sizeof("fullnamelang")];
+ char FcObjectTypeNamePool_str41[sizeof("color")];
+ char FcObjectTypeNamePool_str42[sizeof("index")];
+ char FcObjectTypeNamePool_str43[sizeof("rasterizer")];
+ char FcObjectTypeNamePool_str44[sizeof("style")];
+ char FcObjectTypeNamePool_str45[sizeof("embolden")];
+ char FcObjectTypeNamePool_str46[sizeof("capability")];
+ char FcObjectTypeNamePool_str47[sizeof("embeddedbitmap")];
+ char FcObjectTypeNamePool_str48[sizeof("stylelang")];
+ char FcObjectTypeNamePool_str49[sizeof("fontversion")];
+ char FcObjectTypeNamePool_str50[sizeof("pixelsize")];
+ char FcObjectTypeNamePool_str51[sizeof("symbol")];
+ char FcObjectTypeNamePool_str52[sizeof("fontvariations")];
+ char FcObjectTypeNamePool_str53[sizeof("aspect")];
+ char FcObjectTypeNamePool_str54[sizeof("fontformat")];
+ char FcObjectTypeNamePool_str55[sizeof("globaladvance")];
+ char FcObjectTypeNamePool_str56[sizeof("fontfeatures")];
+ char FcObjectTypeNamePool_str57[sizeof("charwidth")];
+ char FcObjectTypeNamePool_str58[sizeof("decorative")];
+ char FcObjectTypeNamePool_str59[sizeof("foundry")];
char FcObjectTypeNamePool_str60[sizeof("prgname")];
- char FcObjectTypeNamePool_str65[sizeof("aspect")];
};
static const struct FcObjectTypeNamePool_t FcObjectTypeNamePool_contents =
{
- "dpi",
- "size",
- "file",
"hash",
- "rgba",
- "spacing",
+ "size",
+ "dpi",
+ "charset",
"scalable",
"slant",
+ "lang",
+ "desktop",
+ "spacing",
+ "antialias",
+ "postscriptname",
"matrix",
"outline",
- "charset",
- "antialias",
- "lang",
- "embolden",
- "weight",
- "color",
- "charwidth",
- "variable",
- "charheight",
+ "hintstyle",
+ "file",
+ "rgba",
"hinting",
+ "charheight",
+ "weight",
"autohint",
- "fullname",
- "postscriptname",
- "verticallayout",
- "lcdfilter",
- "fullnamelang",
- "hintstyle",
- "pixelsize",
- "scale",
- "globaladvance",
- "width",
- "order",
+ "variable",
"family",
- "fonthashint",
+ "lcdfilter",
"namelang",
- "embeddedbitmap",
+ "width",
"familylang",
- "capability",
- "rasterizer",
+ "fonthashint",
+ "minspace",
+ "fullname",
+ "order",
+ "scale",
+ "verticallayout",
+ "fullnamelang",
+ "color",
"index",
+ "rasterizer",
"style",
- "foundry",
- "fontversion",
- "minspace",
+ "embolden",
+ "capability",
+ "embeddedbitmap",
"stylelang",
+ "fontversion",
+ "pixelsize",
+ "symbol",
"fontvariations",
+ "aspect",
"fontformat",
- "decorative",
+ "globaladvance",
"fontfeatures",
- "symbol",
- "prgname",
- "aspect"
+ "charwidth",
+ "decorative",
+ "foundry",
+ "prgname"
};
#define FcObjectTypeNamePool ((const char *) &FcObjectTypeNamePool_contents)
const struct FcObjectTypeInfo *
@@ -209,122 +211,123 @@ FcObjectTypeLookup (register const char
{
enum
{
- TOTAL_KEYWORDS = 52,
+ TOTAL_KEYWORDS = 53,
MIN_WORD_LENGTH = 3,
MAX_WORD_LENGTH = 14,
- MIN_HASH_VALUE = 7,
- MAX_HASH_VALUE = 65
+ MIN_HASH_VALUE = 6,
+ MAX_HASH_VALUE = 60
};
static const struct FcObjectTypeInfo wordlist[] =
{
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 43 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str7,FC_DPI_OBJECT},
-#line 27 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str8,FC_SIZE_OBJECT},
-#line 38 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str9,FC_FILE_OBJECT},
- {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
#line 62 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str13,FC_HASH_OBJECT},
-#line 44 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str14,FC_RGBA_OBJECT},
-#line 30 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str15,FC_SPACING_OBJECT},
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str6,FC_HASH_OBJECT},
+#line 27 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str7,FC_SIZE_OBJECT},
+ {-1}, {-1},
+#line 43 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str10,FC_DPI_OBJECT},
+#line 50 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str11,FC_CHARSET_OBJECT},
#line 42 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str16,FC_SCALABLE_OBJECT},
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str12,FC_SCALABLE_OBJECT},
#line 24 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str17,FC_SLANT_OBJECT},
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str13,FC_SLANT_OBJECT},
+#line 51 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str14,FC_LANG_OBJECT},
+#line 70 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str15,FC_DESKTOP_NAME_OBJECT},
+#line 30 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str16,FC_SPACING_OBJECT},
+#line 32 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str17,FC_ANTIALIAS_OBJECT},
+#line 63 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str18,FC_POSTSCRIPT_NAME_OBJECT},
#line 49 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str18,FC_MATRIX_OBJECT},
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str19,FC_MATRIX_OBJECT},
#line 41 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str19,FC_OUTLINE_OBJECT},
-#line 50 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str20,FC_CHARSET_OBJECT},
-#line 32 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str21,FC_ANTIALIAS_OBJECT},
-#line 51 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str22,FC_LANG_OBJECT},
-#line 55 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str23,FC_EMBOLDEN_OBJECT},
-#line 25 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str24,FC_WEIGHT_OBJECT},
-#line 64 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str25,FC_COLOR_OBJECT},
-#line 47 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str26,FC_CHARWIDTH_OBJECT},
-#line 67 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str27,FC_VARIABLE_OBJECT},
-#line 48 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str28,FC_CHAR_HEIGHT_OBJECT},
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str20,FC_OUTLINE_OBJECT},
+#line 33 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str21,FC_HINT_STYLE_OBJECT},
+#line 38 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str22,FC_FILE_OBJECT},
+#line 44 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str23,FC_RGBA_OBJECT},
#line 34 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str29,FC_HINTING_OBJECT},
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str24,FC_HINTING_OBJECT},
+#line 48 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str25,FC_CHAR_HEIGHT_OBJECT},
+#line 25 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str26,FC_WEIGHT_OBJECT},
#line 36 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str30,FC_AUTOHINT_OBJECT},
-#line 22 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str31,FC_FULLNAME_OBJECT},
-#line 63 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str32,FC_POSTSCRIPT_NAME_OBJECT},
-#line 35 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str33,FC_VERTICAL_LAYOUT_OBJECT},
-#line 58 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str34,FC_LCD_FILTER_OBJECT},
-#line 23 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str35,FC_FULLNAMELANG_OBJECT},
-#line 33 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str36,FC_HINT_STYLE_OBJECT},
-#line 29 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str37,FC_PIXEL_SIZE_OBJECT},
-#line 45 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str38,FC_SCALE_OBJECT},
-#line 37 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str39,FC_GLOBAL_ADVANCE_OBJECT},
-#line 26 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str40,FC_WIDTH_OBJECT},
-#line 69 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str41,FC_ORDER_OBJECT},
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str27,FC_AUTOHINT_OBJECT},
+#line 67 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str28,FC_VARIABLE_OBJECT},
#line 18 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str42,FC_FAMILY_OBJECT},
-#line 68 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str43,FC_FONT_HAS_HINT_OBJECT},
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str29,FC_FAMILY_OBJECT},
+#line 58 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str30,FC_LCD_FILTER_OBJECT},
#line 59 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str44,FC_NAMELANG_OBJECT},
-#line 56 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_EMBEDDED_BITMAP_OBJECT},
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str31,FC_NAMELANG_OBJECT},
+#line 26 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str32,FC_WIDTH_OBJECT},
#line 19 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str46,FC_FAMILYLANG_OBJECT},
-#line 53 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str47,FC_CAPABILITY_OBJECT},
-#line 40 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str48,FC_RASTERIZER_OBJECT},
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str33,FC_FAMILYLANG_OBJECT},
+#line 68 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str34,FC_FONT_HAS_HINT_OBJECT},
+#line 46 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str35,FC_MINSPACE_OBJECT},
+#line 22 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str36,FC_FULLNAME_OBJECT},
+#line 69 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str37,FC_ORDER_OBJECT},
+#line 45 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str38,FC_SCALE_OBJECT},
+#line 35 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str39,FC_VERTICAL_LAYOUT_OBJECT},
+#line 23 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str40,FC_FULLNAMELANG_OBJECT},
+#line 64 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str41,FC_COLOR_OBJECT},
#line 39 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str49,FC_INDEX_OBJECT},
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str42,FC_INDEX_OBJECT},
+#line 40 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str43,FC_RASTERIZER_OBJECT},
#line 20 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str50,FC_STYLE_OBJECT},
-#line 31 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str51,FC_FOUNDRY_OBJECT},
-#line 52 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str52,FC_FONTVERSION_OBJECT},
-#line 46 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str53,FC_MINSPACE_OBJECT},
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str44,FC_STYLE_OBJECT},
+#line 55 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_EMBOLDEN_OBJECT},
+#line 53 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str46,FC_CAPABILITY_OBJECT},
+#line 56 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str47,FC_EMBEDDED_BITMAP_OBJECT},
#line 21 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str54,FC_STYLELANG_OBJECT},
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str48,FC_STYLELANG_OBJECT},
+#line 52 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str49,FC_FONTVERSION_OBJECT},
+#line 29 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str50,FC_PIXEL_SIZE_OBJECT},
+#line 65 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str51,FC_SYMBOL_OBJECT},
#line 66 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str55,FC_FONT_VARIATIONS_OBJECT},
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str52,FC_FONT_VARIATIONS_OBJECT},
+#line 28 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str53,FC_ASPECT_OBJECT},
#line 54 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str56,FC_FONTFORMAT_OBJECT},
-#line 57 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str57,FC_DECORATIVE_OBJECT},
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str54,FC_FONTFORMAT_OBJECT},
+#line 37 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str55,FC_GLOBAL_ADVANCE_OBJECT},
#line 60 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str58,FC_FONT_FEATURES_OBJECT},
-#line 65 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str59,FC_SYMBOL_OBJECT},
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str56,FC_FONT_FEATURES_OBJECT},
+#line 47 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str57,FC_CHARWIDTH_OBJECT},
+#line 57 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str58,FC_DECORATIVE_OBJECT},
+#line 31 "fcobjshash.gperf"
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str59,FC_FOUNDRY_OBJECT},
#line 61 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str60,FC_PRGNAME_OBJECT},
- {-1}, {-1}, {-1}, {-1},
-#line 28 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str65,FC_ASPECT_OBJECT}
+ {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str60,FC_PRGNAME_OBJECT}
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
