summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBowon Ryu <bowon.ryu@samsung.com>2019-02-14 19:04:20 +0900
committerBowon Ryu <bowon.ryu@samsung.com>2019-02-14 19:07:29 +0900
commit0b1836619d3b81654b014252fbb0e7b24373d456 (patch)
tree0e89e2d626ec4cbe098275438a153322f1e778cb
parent2436b197a5828780064f226b2847ca23748a45f8 (diff)
parent2ed73cdd0f0785ca235adf7800e6e43137117a4c (diff)
downloadfontconfig-0b1836619d3b81654b014252fbb0e7b24373d456.tar.gz
fontconfig-0b1836619d3b81654b014252fbb0e7b24373d456.tar.bz2
fontconfig-0b1836619d3b81654b014252fbb0e7b24373d456.zip
Merge branch 'upstream' into tizen
Change-Id: Ib7fd24e86a79df725eff04fed366a7d111f781be
-rw-r--r--Makefile.in17
-rw-r--r--README84
-rw-r--r--aclocal.m4189
-rwxr-xr-xcompile8
-rw-r--r--conf.d/90-synthetic.conf4
-rw-r--r--conf.d/Makefile.in15
-rwxr-xr-xconfig.guess554
-rw-r--r--config.h.in6
-rwxr-xr-xconfig.sub321
-rwxr-xr-xconfigure397
-rw-r--r--configure.ac43
-rwxr-xr-xdepcomp8
-rw-r--r--doc/FcAtomicCreate.32
-rw-r--r--doc/FcAtomicDeleteNew.32
-rw-r--r--doc/FcAtomicDestroy.32
-rw-r--r--doc/FcAtomicLock.32
-rw-r--r--doc/FcAtomicNewFile.32
-rw-r--r--doc/FcAtomicOrigFile.32
-rw-r--r--doc/FcAtomicReplaceOrig.32
-rw-r--r--doc/FcAtomicUnlock.32
-rw-r--r--doc/FcBlanksAdd.32
-rw-r--r--doc/FcBlanksCreate.32
-rw-r--r--doc/FcBlanksDestroy.32
-rw-r--r--doc/FcBlanksIsMember.32
-rw-r--r--doc/FcCacheCopySet.32
-rw-r--r--doc/FcCacheCreateTagFile.32
-rw-r--r--doc/FcCacheDir.32
-rw-r--r--doc/FcCacheNumFont.32
-rw-r--r--doc/FcCacheNumSubdir.32
-rw-r--r--doc/FcCacheSubdir.32
-rw-r--r--doc/FcCharSetAddChar.32
-rw-r--r--doc/FcCharSetCopy.32
-rw-r--r--doc/FcCharSetCount.32
-rw-r--r--doc/FcCharSetCoverage.32
-rw-r--r--doc/FcCharSetCreate.32
-rw-r--r--doc/FcCharSetDelChar.32
-rw-r--r--doc/FcCharSetDestroy.32
-rw-r--r--doc/FcCharSetEqual.32
-rw-r--r--doc/FcCharSetFirstPage.32
-rw-r--r--doc/FcCharSetHasChar.32
-rw-r--r--doc/FcCharSetIntersect.32
-rw-r--r--doc/FcCharSetIntersectCount.32
-rw-r--r--doc/FcCharSetIsSubset.32
-rw-r--r--doc/FcCharSetMerge.32
-rw-r--r--doc/FcCharSetNew.32
-rw-r--r--doc/FcCharSetNextPage.32
-rw-r--r--doc/FcCharSetSubtract.32
-rw-r--r--doc/FcCharSetSubtractCount.32
-rw-r--r--doc/FcCharSetUnion.32
-rw-r--r--doc/FcConfigAppFontAddDir.32
-rw-r--r--doc/FcConfigAppFontAddFile.32
-rw-r--r--doc/FcConfigAppFontClear.32
-rw-r--r--doc/FcConfigBuildFonts.32
-rw-r--r--doc/FcConfigCreate.32
-rw-r--r--doc/FcConfigDestroy.32
-rw-r--r--doc/FcConfigEnableHome.32
-rw-r--r--doc/FcConfigFileInfoIterGet.32
-rw-r--r--doc/FcConfigFileInfoIterInit.32
-rw-r--r--doc/FcConfigFileInfoIterNext.32
-rw-r--r--doc/FcConfigFilename.32
-rw-r--r--doc/FcConfigGetBlanks.32
-rw-r--r--doc/FcConfigGetCache.32
-rw-r--r--doc/FcConfigGetCacheDirs.32
-rw-r--r--doc/FcConfigGetConfigDirs.32
-rw-r--r--doc/FcConfigGetConfigFiles.32
-rw-r--r--doc/FcConfigGetCurrent.32
-rw-r--r--doc/FcConfigGetFontDirs.32
-rw-r--r--doc/FcConfigGetFonts.32
-rw-r--r--doc/FcConfigGetRescanInterval.32
-rw-r--r--doc/FcConfigGetSysRoot.32
-rw-r--r--doc/FcConfigHome.32
-rw-r--r--doc/FcConfigParseAndLoad.32
-rw-r--r--doc/FcConfigParseAndLoadFromMemory.32
-rw-r--r--doc/FcConfigReference.32
-rw-r--r--doc/FcConfigSetCurrent.32
-rw-r--r--doc/FcConfigSetRescanInterval.32
-rw-r--r--doc/FcConfigSetSysRoot.32
-rw-r--r--doc/FcConfigSubstitute.32
-rw-r--r--doc/FcConfigSubstituteWithPat.32
-rw-r--r--doc/FcConfigUptoDate.32
-rw-r--r--doc/FcDefaultSubstitute.32
-rw-r--r--doc/FcDirCacheClean.32
-rw-r--r--doc/FcDirCacheCreateUUID.34
-rw-r--r--doc/FcDirCacheDeleteUUID.317
-rw-r--r--doc/FcDirCacheLoad.32
-rw-r--r--doc/FcDirCacheLoadFile.32
-rw-r--r--doc/FcDirCacheRead.32
-rw-r--r--doc/FcDirCacheRescan.32
-rw-r--r--doc/FcDirCacheUnlink.32
-rw-r--r--doc/FcDirCacheUnload.32
-rw-r--r--doc/FcDirCacheValid.32
-rw-r--r--doc/FcDirSave.32
-rw-r--r--doc/FcDirScan.32
-rw-r--r--doc/FcFileIsDir.32
-rw-r--r--doc/FcFileScan.32
-rw-r--r--doc/FcFini.32
-rw-r--r--doc/FcFontList.32
-rw-r--r--doc/FcFontMatch.32
-rw-r--r--doc/FcFontRenderPrepare.32
-rw-r--r--doc/FcFontSetAdd.32
-rw-r--r--doc/FcFontSetCreate.32
-rw-r--r--doc/FcFontSetDestroy.32
-rw-r--r--doc/FcFontSetList.32
-rw-r--r--doc/FcFontSetMatch.32
-rw-r--r--doc/FcFontSetPrint.32
-rw-r--r--doc/FcFontSetSort.32
-rw-r--r--doc/FcFontSetSortDestroy.32
-rw-r--r--doc/FcFontSort.32
-rw-r--r--doc/FcFreeTypeCharIndex.32
-rw-r--r--doc/FcFreeTypeCharSet.32
-rw-r--r--doc/FcFreeTypeCharSetAndSpacing.32
-rw-r--r--doc/FcFreeTypeQuery.32
-rw-r--r--doc/FcFreeTypeQueryAll.32
-rw-r--r--doc/FcFreeTypeQueryFace.32
-rw-r--r--doc/FcGetDefaultLangs.32
-rw-r--r--doc/FcGetLangs.32
-rw-r--r--doc/FcGetVersion.32
-rw-r--r--doc/FcInit.32
-rw-r--r--doc/FcInitBringUptoDate.32
-rw-r--r--doc/FcInitLoadConfig.32
-rw-r--r--doc/FcInitLoadConfigAndFonts.32
-rw-r--r--doc/FcInitReinitialize.32
-rw-r--r--doc/FcIsLower.32
-rw-r--r--doc/FcIsUpper.32
-rw-r--r--doc/FcLangGetCharSet.32
-rw-r--r--doc/FcLangNormalize.32
-rw-r--r--doc/FcLangSetAdd.32
-rw-r--r--doc/FcLangSetCompare.32
-rw-r--r--doc/FcLangSetContains.32
-rw-r--r--doc/FcLangSetCopy.32
-rw-r--r--doc/FcLangSetCreate.32
-rw-r--r--doc/FcLangSetDel.32
-rw-r--r--doc/FcLangSetDestroy.32
-rw-r--r--doc/FcLangSetEqual.32
-rw-r--r--doc/FcLangSetGetLangs.32
-rw-r--r--doc/FcLangSetHasLang.32
-rw-r--r--doc/FcLangSetHash.32
-rw-r--r--doc/FcLangSetSubtract.32
-rw-r--r--doc/FcLangSetUnion.32
-rw-r--r--doc/FcMatrixCopy.32
-rw-r--r--doc/FcMatrixEqual.32
-rw-r--r--doc/FcMatrixInit.32
-rw-r--r--doc/FcMatrixMultiply.32
-rw-r--r--doc/FcMatrixRotate.32
-rw-r--r--doc/FcMatrixScale.32
-rw-r--r--doc/FcMatrixShear.32
-rw-r--r--doc/FcNameConstant.32
-rw-r--r--doc/FcNameGetConstant.32
-rw-r--r--doc/FcNameGetObjectType.32
-rw-r--r--doc/FcNameParse.32
-rw-r--r--doc/FcNameRegisterConstants.32
-rw-r--r--doc/FcNameRegisterObjectTypes.32
-rw-r--r--doc/FcNameUnparse.32
-rw-r--r--doc/FcNameUnregisterConstants.32
-rw-r--r--doc/FcNameUnregisterObjectTypes.32
-rw-r--r--doc/FcObjectSetAdd.32
-rw-r--r--doc/FcObjectSetBuild.32
-rw-r--r--doc/FcObjectSetCreate.32
-rw-r--r--doc/FcObjectSetDestroy.32
-rw-r--r--doc/FcPatternAdd-Type.32
-rw-r--r--doc/FcPatternAdd.32
-rw-r--r--doc/FcPatternAddWeak.32
-rw-r--r--doc/FcPatternBuild.32
-rw-r--r--doc/FcPatternCreate.32
-rw-r--r--doc/FcPatternDel.32
-rw-r--r--doc/FcPatternDestroy.32
-rw-r--r--doc/FcPatternDuplicate.32
-rw-r--r--doc/FcPatternEqual.32
-rw-r--r--doc/FcPatternEqualSubset.32
-rw-r--r--doc/FcPatternFilter.32
-rw-r--r--doc/FcPatternFindIter.317
-rw-r--r--doc/FcPatternFormat.32
-rw-r--r--doc/FcPatternGet-Type.32
-rw-r--r--doc/FcPatternGet.32
-rw-r--r--doc/FcPatternGetWithBinding.32
-rw-r--r--doc/FcPatternHash.32
-rw-r--r--doc/FcPatternIterEqual.317
-rw-r--r--doc/FcPatternIterGetObject.318
-rw-r--r--doc/FcPatternIterGetValue.320
-rw-r--r--doc/FcPatternIterIsValid.317
-rw-r--r--doc/FcPatternIterNext.318
-rw-r--r--doc/FcPatternIterStart.318
-rw-r--r--doc/FcPatternIterValueCount.317
-rw-r--r--doc/FcPatternObjectCount.316
-rw-r--r--doc/FcPatternPrint.32
-rw-r--r--doc/FcPatternReference.32
-rw-r--r--doc/FcPatternRemove.32
-rw-r--r--doc/FcRangeCopy.32
-rw-r--r--doc/FcRangeCreateDouble.32
-rw-r--r--doc/FcRangeCreateInteger.32
-rw-r--r--doc/FcRangeDestroy.32
-rw-r--r--doc/FcRangeGetDouble.32
-rw-r--r--doc/FcStrBasename.32
-rw-r--r--doc/FcStrCmp.32
-rw-r--r--doc/FcStrCmpIgnoreCase.32
-rw-r--r--doc/FcStrCopy.32
-rw-r--r--doc/FcStrCopyFilename.32
-rw-r--r--doc/FcStrDirname.32
-rw-r--r--doc/FcStrDowncase.32
-rw-r--r--doc/FcStrFree.32
-rw-r--r--doc/FcStrListCreate.32
-rw-r--r--doc/FcStrListDone.32
-rw-r--r--doc/FcStrListFirst.32
-rw-r--r--doc/FcStrListNext.32
-rw-r--r--doc/FcStrPlus.32
-rw-r--r--doc/FcStrSetAdd.32
-rw-r--r--doc/FcStrSetAddFilename.32
-rw-r--r--doc/FcStrSetCreate.32
-rw-r--r--doc/FcStrSetDel.32
-rw-r--r--doc/FcStrSetDestroy.32
-rw-r--r--doc/FcStrSetEqual.32
-rw-r--r--doc/FcStrSetMember.32
-rw-r--r--doc/FcStrStr.32
-rw-r--r--doc/FcStrStrIgnoreCase.32
-rw-r--r--doc/FcToLower.32
-rw-r--r--doc/FcUcs4ToUtf8.32
-rw-r--r--doc/FcUtf16Len.32
-rw-r--r--doc/FcUtf16ToUcs4.32
-rw-r--r--doc/FcUtf8Len.32
-rw-r--r--doc/FcUtf8ToUcs4.32
-rw-r--r--doc/FcValueDestroy.32
-rw-r--r--doc/FcValueEqual.32
-rw-r--r--doc/FcValuePrint.32
-rw-r--r--doc/FcValueSave.32
-rw-r--r--doc/FcWeightFromOpenType.32
-rw-r--r--doc/FcWeightFromOpenTypeDouble.32
-rw-r--r--doc/FcWeightToOpenType.32
-rw-r--r--doc/FcWeightToOpenTypeDouble.32
-rw-r--r--doc/Makefile.in48
-rw-r--r--doc/fccache.fncs12
-rw-r--r--doc/fccache.sgml57
-rw-r--r--doc/fcpattern.fncs111
-rw-r--r--doc/fcpattern.sgml505
-rw-r--r--doc/fontconfig-devel.pdfbin406260 -> 420848 bytes
-rw-r--r--doc/fontconfig-devel.txt5367
-rw-r--r--doc/fontconfig-devel/fcatomiccreate.html12
-rw-r--r--doc/fontconfig-devel/fcatomicdeletenew.html12
-rw-r--r--doc/fontconfig-devel/fcatomicdestroy.html12
-rw-r--r--doc/fontconfig-devel/fcatomiclock.html12
-rw-r--r--doc/fontconfig-devel/fcatomicnewfile.html12
-rw-r--r--doc/fontconfig-devel/fcatomicorigfile.html12
-rw-r--r--doc/fontconfig-devel/fcatomicreplaceorig.html12
-rw-r--r--doc/fontconfig-devel/fcatomicunlock.html12
-rw-r--r--doc/fontconfig-devel/fcblanksadd.html12
-rw-r--r--doc/fontconfig-devel/fcblankscreate.html12
-rw-r--r--doc/fontconfig-devel/fcblanksdestroy.html12
-rw-r--r--doc/fontconfig-devel/fcblanksismember.html12
-rw-r--r--doc/fontconfig-devel/fccachecopyset.html12
-rw-r--r--doc/fontconfig-devel/fccachecreatetagfile.html14
-rw-r--r--doc/fontconfig-devel/fccachedir.html12
-rw-r--r--doc/fontconfig-devel/fccachenumfont.html12
-rw-r--r--doc/fontconfig-devel/fccachenumsubdir.html12
-rw-r--r--doc/fontconfig-devel/fccachesubdir.html12
-rw-r--r--doc/fontconfig-devel/fccharsetaddchar.html12
-rw-r--r--doc/fontconfig-devel/fccharsetcopy.html12
-rw-r--r--doc/fontconfig-devel/fccharsetcount.html12
-rw-r--r--doc/fontconfig-devel/fccharsetcoverage.html12
-rw-r--r--doc/fontconfig-devel/fccharsetcreate.html12
-rw-r--r--doc/fontconfig-devel/fccharsetdelchar.html14
-rw-r--r--doc/fontconfig-devel/fccharsetdestroy.html12
-rw-r--r--doc/fontconfig-devel/fccharsetequal.html12
-rw-r--r--doc/fontconfig-devel/fccharsetfirstpage.html12
-rw-r--r--doc/fontconfig-devel/fccharsethaschar.html12
-rw-r--r--doc/fontconfig-devel/fccharsetintersect.html12
-rw-r--r--doc/fontconfig-devel/fccharsetintersectcount.html12
-rw-r--r--doc/fontconfig-devel/fccharsetissubset.html12
-rw-r--r--doc/fontconfig-devel/fccharsetmerge.html12
-rw-r--r--doc/fontconfig-devel/fccharsetnew.html12
-rw-r--r--doc/fontconfig-devel/fccharsetnextpage.html12
-rw-r--r--doc/fontconfig-devel/fccharsetsubtract.html12
-rw-r--r--doc/fontconfig-devel/fccharsetsubtractcount.html12
-rw-r--r--doc/fontconfig-devel/fccharsetunion.html12
-rw-r--r--doc/fontconfig-devel/fcconfigappfontadddir.html12
-rw-r--r--doc/fontconfig-devel/fcconfigappfontaddfile.html12
-rw-r--r--doc/fontconfig-devel/fcconfigappfontclear.html12
-rw-r--r--doc/fontconfig-devel/fcconfigbuildfonts.html12
-rw-r--r--doc/fontconfig-devel/fcconfigcreate.html12
-rw-r--r--doc/fontconfig-devel/fcconfigdestroy.html12
-rw-r--r--doc/fontconfig-devel/fcconfigenablehome.html12
-rw-r--r--doc/fontconfig-devel/fcconfigfileinfoiterget.html14
-rw-r--r--doc/fontconfig-devel/fcconfigfileinfoiterinit.html14
-rw-r--r--doc/fontconfig-devel/fcconfigfileinfoiternext.html14
-rw-r--r--doc/fontconfig-devel/fcconfigfilename.html12
-rw-r--r--doc/fontconfig-devel/fcconfiggetblanks.html12
-rw-r--r--doc/fontconfig-devel/fcconfiggetcache.html12
-rw-r--r--doc/fontconfig-devel/fcconfiggetcachedirs.html12
-rw-r--r--doc/fontconfig-devel/fcconfiggetconfigdirs.html12
-rw-r--r--doc/fontconfig-devel/fcconfiggetconfigfiles.html12
-rw-r--r--doc/fontconfig-devel/fcconfiggetcurrent.html12
-rw-r--r--doc/fontconfig-devel/fcconfiggetfontdirs.html12
-rw-r--r--doc/fontconfig-devel/fcconfiggetfonts.html12
-rw-r--r--doc/fontconfig-devel/fcconfiggetrescaninterval.html12
-rw-r--r--doc/fontconfig-devel/fcconfiggetsysroot.html14
-rw-r--r--doc/fontconfig-devel/fcconfighome.html12
-rw-r--r--doc/fontconfig-devel/fcconfigparseandload.html12
-rw-r--r--doc/fontconfig-devel/fcconfigparseandloadfrommemory.html14
-rw-r--r--doc/fontconfig-devel/fcconfigreference.html12
-rw-r--r--doc/fontconfig-devel/fcconfigsetcurrent.html12
-rw-r--r--doc/fontconfig-devel/fcconfigsetrescaninterval.html12
-rw-r--r--doc/fontconfig-devel/fcconfigsetsysroot.html14
-rw-r--r--doc/fontconfig-devel/fcconfigsubstitute.html12
-rw-r--r--doc/fontconfig-devel/fcconfigsubstitutewithpat.html12
-rw-r--r--doc/fontconfig-devel/fcconfiguptodate.html12
-rw-r--r--doc/fontconfig-devel/fcdefaultsubstitute.html8
-rw-r--r--doc/fontconfig-devel/fcdircacheclean.html14
-rw-r--r--doc/fontconfig-devel/fcdircachecreateuuid.html35
-rw-r--r--doc/fontconfig-devel/fcdircachedeleteuuid.html214
-rw-r--r--doc/fontconfig-devel/fcdircacheload.html12
-rw-r--r--doc/fontconfig-devel/fcdircacheloadfile.html12
-rw-r--r--doc/fontconfig-devel/fcdircacheread.html12
-rw-r--r--doc/fontconfig-devel/fcdircacherescan.html14
-rw-r--r--doc/fontconfig-devel/fcdircacheunlink.html12
-rw-r--r--doc/fontconfig-devel/fcdircacheunload.html12
-rw-r--r--doc/fontconfig-devel/fcdircachevalid.html12
-rw-r--r--doc/fontconfig-devel/fcdirsave.html12
-rw-r--r--doc/fontconfig-devel/fcdirscan.html12
-rw-r--r--doc/fontconfig-devel/fcfileisdir.html12
-rw-r--r--doc/fontconfig-devel/fcfilescan.html12
-rw-r--r--doc/fontconfig-devel/fcfontlist.html12
-rw-r--r--doc/fontconfig-devel/fcfontmatch.html12
-rw-r--r--doc/fontconfig-devel/fcfontrenderprepare.html12
-rw-r--r--doc/fontconfig-devel/fcfontsetadd.html12
-rw-r--r--doc/fontconfig-devel/fcfontsetcreate.html12
-rw-r--r--doc/fontconfig-devel/fcfontsetdestroy.html12
-rw-r--r--doc/fontconfig-devel/fcfontsetlist.html12
-rw-r--r--doc/fontconfig-devel/fcfontsetmatch.html12
-rw-r--r--doc/fontconfig-devel/fcfontsetprint.html12
-rw-r--r--doc/fontconfig-devel/fcfontsetsort.html12
-rw-r--r--doc/fontconfig-devel/fcfontsetsortdestroy.html12
-rw-r--r--doc/fontconfig-devel/fcfontsort.html12
-rw-r--r--doc/fontconfig-devel/fcfreetypecharindex.html12
-rw-r--r--doc/fontconfig-devel/fcfreetypecharset.html12
-rw-r--r--doc/fontconfig-devel/fcfreetypecharsetandspacing.html12
-rw-r--r--doc/fontconfig-devel/fcfreetypequery.html12
-rw-r--r--doc/fontconfig-devel/fcfreetypequeryall.html14
-rw-r--r--doc/fontconfig-devel/fcfreetypequeryface.html12
-rw-r--r--doc/fontconfig-devel/fcgetdefaultlangs.html14
-rw-r--r--doc/fontconfig-devel/fcgetlangs.html12
-rw-r--r--doc/fontconfig-devel/fcislower.html12
-rw-r--r--doc/fontconfig-devel/fcisupper.html12
-rw-r--r--doc/fontconfig-devel/fclanggetcharset.html12
-rw-r--r--doc/fontconfig-devel/fclangnormalize.html14
-rw-r--r--doc/fontconfig-devel/fclangsetadd.html12
-rw-r--r--doc/fontconfig-devel/fclangsetcompare.html12
-rw-r--r--doc/fontconfig-devel/fclangsetcontains.html12
-rw-r--r--doc/fontconfig-devel/fclangsetcopy.html12
-rw-r--r--doc/fontconfig-devel/fclangsetcreate.html12
-rw-r--r--doc/fontconfig-devel/fclangsetdel.html14
-rw-r--r--doc/fontconfig-devel/fclangsetdestroy.html12
-rw-r--r--doc/fontconfig-devel/fclangsetequal.html12
-rw-r--r--doc/fontconfig-devel/fclangsetgetlangs.html12
-rw-r--r--doc/fontconfig-devel/fclangsethash.html12
-rw-r--r--doc/fontconfig-devel/fclangsethaslang.html12
-rw-r--r--doc/fontconfig-devel/fclangsetsubtract.html14
-rw-r--r--doc/fontconfig-devel/fclangsetunion.html14
-rw-r--r--doc/fontconfig-devel/fcmatrixcopy.html12
-rw-r--r--doc/fontconfig-devel/fcmatrixequal.html12
-rw-r--r--doc/fontconfig-devel/fcmatrixinit.html12
-rw-r--r--doc/fontconfig-devel/fcmatrixmultiply.html12
-rw-r--r--doc/fontconfig-devel/fcmatrixrotate.html12
-rw-r--r--doc/fontconfig-devel/fcmatrixscale.html12
-rw-r--r--doc/fontconfig-devel/fcmatrixshear.html12
-rw-r--r--doc/fontconfig-devel/fcnameconstant.html12
-rw-r--r--doc/fontconfig-devel/fcnamegetconstant.html12
-rw-r--r--doc/fontconfig-devel/fcnamegetobjecttype.html12
-rw-r--r--doc/fontconfig-devel/fcnameparse.html8
-rw-r--r--doc/fontconfig-devel/fcnameregisterconstants.html12
-rw-r--r--doc/fontconfig-devel/fcnameregisterobjecttypes.html12
-rw-r--r--doc/fontconfig-devel/fcnameunparse.html8
-rw-r--r--doc/fontconfig-devel/fcnameunregisterconstants.html12
-rw-r--r--doc/fontconfig-devel/fcnameunregisterobjecttypes.html12
-rw-r--r--doc/fontconfig-devel/fcobjectsetadd.html12
-rw-r--r--doc/fontconfig-devel/fcobjectsetbuild.html12
-rw-r--r--doc/fontconfig-devel/fcobjectsetcreate.html12
-rw-r--r--doc/fontconfig-devel/fcobjectsetdestroy.html12
-rw-r--r--doc/fontconfig-devel/fcpatternadd-type.html8
-rw-r--r--doc/fontconfig-devel/fcpatternadd.html8
-rw-r--r--doc/fontconfig-devel/fcpatternaddweak.html8
-rw-r--r--doc/fontconfig-devel/fcpatternbuild.html8
-rw-r--r--doc/fontconfig-devel/fcpatterndel.html8
-rw-r--r--doc/fontconfig-devel/fcpatterndestroy.html10
-rw-r--r--doc/fontconfig-devel/fcpatternequal.html18
-rw-r--r--doc/fontconfig-devel/fcpatternequalsubset.html8
-rw-r--r--doc/fontconfig-devel/fcpatternfilter.html8
-rw-r--r--doc/fontconfig-devel/fcpatternfinditer.html240
-rw-r--r--doc/fontconfig-devel/fcpatternformat.html10
-rw-r--r--doc/fontconfig-devel/fcpatternget-type.html8
-rw-r--r--doc/fontconfig-devel/fcpatternget.html8
-rw-r--r--doc/fontconfig-devel/fcpatterngetwithbinding.html10
-rw-r--r--doc/fontconfig-devel/fcpatternhash.html8
-rw-r--r--doc/fontconfig-devel/fcpatterniterequal.html240
-rw-r--r--doc/fontconfig-devel/fcpatternitergetobject.html236
-rw-r--r--doc/fontconfig-devel/fcpatternitergetvalue.html258
-rw-r--r--doc/fontconfig-devel/fcpatterniterisvalid.html230
-rw-r--r--doc/fontconfig-devel/fcpatterniternext.html236
-rw-r--r--doc/fontconfig-devel/fcpatterniterstart.html241
-rw-r--r--doc/fontconfig-devel/fcpatternitervaluecount.html230
-rw-r--r--doc/fontconfig-devel/fcpatternobjectcount.html219
-rw-r--r--doc/fontconfig-devel/fcpatternprint.html18
-rw-r--r--doc/fontconfig-devel/fcpatternremove.html18
-rw-r--r--doc/fontconfig-devel/fcrangecopy.html14
-rw-r--r--doc/fontconfig-devel/fcrangecreatedouble.html14
-rw-r--r--doc/fontconfig-devel/fcrangecreateinteger.html14
-rw-r--r--doc/fontconfig-devel/fcrangedestroy.html14
-rw-r--r--doc/fontconfig-devel/fcrangegetdouble.html14
-rw-r--r--doc/fontconfig-devel/fcstrbasename.html12
-rw-r--r--doc/fontconfig-devel/fcstrcmp.html12
-rw-r--r--doc/fontconfig-devel/fcstrcmpignorecase.html12
-rw-r--r--doc/fontconfig-devel/fcstrcopy.html12
-rw-r--r--doc/fontconfig-devel/fcstrcopyfilename.html12
-rw-r--r--doc/fontconfig-devel/fcstrdirname.html12
-rw-r--r--doc/fontconfig-devel/fcstrdowncase.html12
-rw-r--r--doc/fontconfig-devel/fcstrfree.html12
-rw-r--r--doc/fontconfig-devel/fcstrlistcreate.html12
-rw-r--r--doc/fontconfig-devel/fcstrlistdone.html12
-rw-r--r--doc/fontconfig-devel/fcstrlistfirst.html14
-rw-r--r--doc/fontconfig-devel/fcstrlistnext.html12
-rw-r--r--doc/fontconfig-devel/fcstrplus.html12
-rw-r--r--doc/fontconfig-devel/fcstrsetadd.html12
-rw-r--r--doc/fontconfig-devel/fcstrsetaddfilename.html12
-rw-r--r--doc/fontconfig-devel/fcstrsetcreate.html12
-rw-r--r--doc/fontconfig-devel/fcstrsetdel.html12
-rw-r--r--doc/fontconfig-devel/fcstrsetdestroy.html12
-rw-r--r--doc/fontconfig-devel/fcstrsetequal.html12
-rw-r--r--doc/fontconfig-devel/fcstrsetmember.html12
-rw-r--r--doc/fontconfig-devel/fcstrstr.html12
-rw-r--r--doc/fontconfig-devel/fcstrstrignorecase.html12
-rw-r--r--doc/fontconfig-devel/fctolower.html12
-rw-r--r--doc/fontconfig-devel/fcucs4toutf8.html12
-rw-r--r--doc/fontconfig-devel/fcutf16len.html12
-rw-r--r--doc/fontconfig-devel/fcutf16toucs4.html12
-rw-r--r--doc/fontconfig-devel/fcutf8len.html12
-rw-r--r--doc/fontconfig-devel/fcutf8toucs4.html12
-rw-r--r--doc/fontconfig-devel/fcvaluedestroy.html12
-rw-r--r--doc/fontconfig-devel/fcvalueequal.html12
-rw-r--r--doc/fontconfig-devel/fcvalueprint.html12
-rw-r--r--doc/fontconfig-devel/fcvaluesave.html12
-rw-r--r--doc/fontconfig-devel/fcweightfromopentype.html14
-rw-r--r--doc/fontconfig-devel/fcweightfromopentypedouble.html14
-rw-r--r--doc/fontconfig-devel/fcweighttoopentype.html14
-rw-r--r--doc/fontconfig-devel/fcweighttoopentypedouble.html14
-rw-r--r--doc/fontconfig-devel/t1.html4
-rw-r--r--doc/fontconfig-devel/x103.html86
-rw-r--r--doc/fontconfig-user.html42
-rw-r--r--doc/fontconfig-user.pdfbin131754 -> 133232 bytes
-rw-r--r--doc/fontconfig-user.sgml20
-rw-r--r--doc/fontconfig-user.txt1203
-rw-r--r--doc/fonts-conf.522
-rw-r--r--fc-cache/Makefile.in60
-rw-r--r--fc-cache/fc-cache.c2
-rw-r--r--fc-case/CaseFolding.txt87
-rw-r--r--fc-case/Makefile.in15
-rw-r--r--fc-case/fccase.h7
-rw-r--r--fc-cat/Makefile.in59
-rw-r--r--fc-cat/fc-cat.c2
-rw-r--r--fc-conflist/Makefile.in59
-rw-r--r--fc-conflist/fc-conflist.c2
-rw-r--r--fc-lang/Makefile.in15
-rw-r--r--fc-lang/fc-lang.c2
-rw-r--r--fc-list/Makefile.in59
-rw-r--r--fc-list/fc-list.c2
-rw-r--r--fc-match/Makefile.in59
-rw-r--r--fc-match/fc-match.c2
-rw-r--r--fc-pattern/Makefile.in59
-rw-r--r--fc-pattern/fc-pattern.c2
-rw-r--r--fc-query/Makefile.in59
-rw-r--r--fc-query/fc-query.c2
-rw-r--r--fc-scan/Makefile.in59
-rw-r--r--fc-scan/fc-scan.c2
-rw-r--r--fc-validate/Makefile.in59
-rw-r--r--fontconfig.spec2
-rw-r--r--fontconfig/Makefile.in15
-rw-r--r--fontconfig/fontconfig.h39
-rwxr-xr-xinstall-sh45
-rw-r--r--its/Makefile.in15
-rwxr-xr-xmissing14
-rw-r--r--po-conf/fontconfig-conf.pot4
-rw-r--r--po-conf/zh_CN.gmobin3311 -> 3311 bytes
-rw-r--r--po-conf/zh_CN.po2
-rw-r--r--po/fontconfig.pot208
-rw-r--r--po/zh_CN.gmobin14705 -> 14705 bytes
-rw-r--r--po/zh_CN.po206
-rw-r--r--src/Makefile.am18
-rw-r--r--src/Makefile.in220
-rw-r--r--src/fccache.c186
-rw-r--r--src/fccfg.c216
-rw-r--r--src/fcdbg.c15
-rw-r--r--src/fcdefault.c32
-rw-r--r--src/fcdir.c7
-rw-r--r--src/fcformat.c22
-rw-r--r--src/fcfreetype.c325
-rw-r--r--src/fchash.c29
-rw-r--r--src/fcint.h28
-rw-r--r--src/fclang.c10
-rw-r--r--src/fclist.c39
-rw-r--r--src/fcmatch.c54
-rw-r--r--src/fcname.c38
-rw-r--r--src/fcobjshash.h332
-rw-r--r--src/fcpat.c304
-rw-r--r--src/fcptrlist.c2
-rw-r--r--src/fcstat.c9
-rw-r--r--src/fcstdint.h4
-rw-r--r--src/fcstr.c13
-rw-r--r--src/fcxml.c37
-rwxr-xr-xtest-driver8
-rw-r--r--test/Makefile.am52
-rw-r--r--test/Makefile.in251
-rw-r--r--test/out.expected8
-rw-r--r--test/run-test-conf.sh36
-rw-r--r--test/run-test.sh62
-rw-r--r--test/test-90-synthetic.json68
-rw-r--r--test/test-bz106618.c47
-rw-r--r--test/test-bz106632.c316
-rw-r--r--test/test-conf.c328
-rw-r--r--test/test-hash.c187
-rw-r--r--test/test-name-parse.c90
516 files changed, 12583 insertions, 6477 deletions
diff --git a/Makefile.in b/Makefile.in
index 0b80f264..bea1b79a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -199,7 +199,7 @@ am__recursive_targets = \
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
- cscope distdir dist dist-all distcheck
+ cscope distdir distdir-am dist dist-all distcheck
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
$(LISP)config.h.in
# Read a list of newline-separated strings from the standard input,
@@ -329,6 +329,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JSONC_CFLAGS = @JSONC_CFLAGS@
+JSONC_LIBS = @JSONC_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -504,8 +506,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -695,7 +697,10 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
diff --git a/README b/README
index c5e605d6..fbbc140e 100644
--- a/README
+++ b/README
@@ -1,11 +1,89 @@
Fontconfig
Font configuration and customization library
- Version 2.13
- 2018-03-06
+ Version 2.13.1
+ 2018-08-30
Check INSTALL for compilation and installation instructions.
-Report bugs to https://bugs.freedesktop.org in the fontconfig module.
+Report bugs to https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/new.
+
+2.13.1
+
+Akira TAGOH (48):
+ Use the builtin uuid for OSX
+ Fix the build issue again on MinGW with enabling nls
+ Add uuid to Requires.private in .pc only when pkgconfig macro found it
+ Allow the constant names in the range
+ Do not override locale if already set by app
+ Add the value of the constant name to the implicit object in the pattern
+ Add a testcase for FcNameParse
+ Leave the locale setting to applications
+ call setlocale
+ Fix make check fail when srcdir != builddir.
+ Do not ship fcobjshash.h
+ Fix typo in doc
+ Change the emboldening logic again
+ Bug 43367 - RFE: iterator to peek objects in FcPattern
+ Add a testrunner for conf
+ Add a test case for 90-synthetic.conf
+ Bug 106497 - better error description when problem reading font configuration
+ Bug 106459 - fc-cache doesn't use -y option for .uuid files
+ Fix leaks
+ Fix -Wstringop-truncation warning
+ Fix double-free
+ Add a test case for bz#106618
+ Update CaseFolding.txt to Unicode 11
+ Remove .uuid when no font files exists on a directory
+ Fix the leak of file handle
+ Fix memory leak
+ Fix memory leaks
+ Fix memory leak
+ Fix memory leak
+ Fix memory leak
+ Fix unterminated string issue
+ Fix array access in a null pointer dereference
+ Fix access in a null pointer dereference
+ do not pass null pointer to memcpy
+ Fix dereferencing null pointer
+ Fix a typo
+ Fix possibly dereferencing a null pointer
+ Fix allocating insufficient memory for terminating null of the string
+ Make a call fail on ENOMEM
+ Allocate sufficient memory to terminate with null
+ Drop the redundant code
+ Fix memory leak
+ Fix the build issue with gperf
+ Fix missing closing bracket in FcStrIsAbsoluteFilename()
+ Update the issue tracker URL
+ Fix distcheck fail
+ Add .gitlab-ci.yml
+ Bump the libtool revision
+
+Alexander Larsson (3):
+ Add FcCacheAllocate() helper
+ Cache: Rewrite relocated paths in earlier
+ Cache: Remove alias_table
+
+Behdad Esfahbod (4):
+ Minor: fix warnings
+ Fix name scanning
+ Share name-mapping across instances
+ Use FT_HAS_COLOR
+
+Chris Lamb (1):
+ Ensure cache checksums are deterministic
+
+Matthieu Herrb (1):
+ FcCacheFindByStat(): fix checking of nanoseconds field.
+
+Tom Anderson (7):
+ Fix undefined-shift UBSAN errors
+ Use realfilename for FcOpen in _FcConfigParse
+ Add FONTCONFIG_SYSROOT environment variable
+ Fix CFI builds
+ Fix heap use-after-free
+ Return canonicalized paths from FcConfigRealFilename
+ Fix build with CFLAGS="-std=c11 -D_GNU_SOURCE"
2.13
diff --git a/aclocal.m4 b/aclocal.m4
index 8ac4ff44..4125f78f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.15'
+[am__api_version='1.16'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.15.1], [],
+m4_if([$1], [1.16.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.15.1])dnl
+[AM_AUTOMAKE_VERSION([1.16.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -110,7 +110,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -141,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -332,13 +332,12 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -346,49 +345,41 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
+ # TODO: see whether this extra hack can be removed once we start
+ # requiring Autoconf 2.70 or later.
+ AS_CASE([$CONFIG_FILES],
+ [*\'*], [eval set x "$CONFIG_FILES"],
+ [*], [set x $CONFIG_FILES])
shift
- for mf
+ # Used to flag and report bootstrapping failures.
+ am_rc=0
+ for am_mf
do
# Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
+ am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile which includes
+ # dependency-tracking related rules and includes.
+ # Grep'ing the whole file directly is not great: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+ || continue
+ am_dirpart=`AS_DIRNAME(["$am_mf"])`
+ am_filepart=`AS_BASENAME(["$am_mf"])`
+ AM_RUN_LOG([cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles]) || am_rc=$?
done
+ if test $am_rc -ne 0; then
+ AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
+ for automatic dependency tracking. Try re-running configure with the
+ '--disable-dependency-tracking' option to at least be able to build
+ the package (albeit without support for automatic dependency tracking).])
+ fi
+ AS_UNSET([am_dirpart])
+ AS_UNSET([am_filepart])
+ AS_UNSET([am_mf])
+ AS_UNSET([am_rc])
+ rm -f conftest-deps.mk
}
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
@@ -397,18 +388,17 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
# -----------------------------
# This macro should only be invoked once -- use via AC_REQUIRE.
#
-# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each '.P' file that we will
-# need in order to bootstrap the dependency handling code.
+# This code is only required when automatic dependency tracking is enabled.
+# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
+# order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AC_CONFIG_COMMANDS([depfiles],
[test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
+ [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -495,8 +485,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# We need awk for the "check" target (and possibly the TAP driver). The
# system "awk" is bad on some platforms.
@@ -563,7 +553,7 @@ END
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -605,7 +595,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -626,7 +616,7 @@ if test x"${install_sh+set}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2017 Free Software Foundation, Inc.
+# Copyright (C) 2003-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -647,7 +637,7 @@ AC_SUBST([am__leading_dot])])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -655,49 +645,42 @@ AC_SUBST([am__leading_dot])])
# AM_MAKE_INCLUDE()
# -----------------
-# Check to see how make treats includes.
+# Check whether make has an 'include' directive that can support all
+# the idioms we need for our automatic dependency tracking code.
AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
+[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
+cat > confinc.mk << 'END'
am__doit:
- @echo this is the am__doit target
+ @echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
am__include="#"
am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+ AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
+ AS_CASE([$?:`cat confinc.out 2>/dev/null`],
+ ['0:this is the am__doit target'],
+ [AS_CASE([$s],
+ [BSD], [am__include='.include' am__quote='"'],
+ [am__include='include' am__quote=''])])
+ if test "$am__include" != "#"; then
+ _am_result="yes ($s style)"
+ break
+ fi
+done
+rm -f confinc.* confmf.*
+AC_MSG_RESULT([${_am_result}])
+AC_SUBST([am__include])])
+AC_SUBST([am__quote])])
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -736,7 +719,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -765,7 +748,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -812,7 +795,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -831,7 +814,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -912,7 +895,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
-# Copyright (C) 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2009-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -972,7 +955,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1000,7 +983,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2017 Free Software Foundation, Inc.
+# Copyright (C) 2006-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1019,7 +1002,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2017 Free Software Foundation, Inc.
+# Copyright (C) 2004-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/compile b/compile
index 2ab71e4e..99e50524 100755
--- a/compile
+++ b/compile
@@ -1,9 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2016-01-11.22; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2016-01-11.22; # UTC
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -340,7 +340,7 @@ exit $ret
# Local Variables:
# mode: shell-script
# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC0"
diff --git a/conf.d/90-synthetic.conf b/conf.d/90-synthetic.conf
index e344e4a5..6b929dd5 100644
--- a/conf.d/90-synthetic.conf
+++ b/conf.d/90-synthetic.conf
@@ -42,9 +42,9 @@
-->
<match target="font">
- <!-- check to see if the font is just regular -->
+ <!-- check to see if the weight in the font is less than medium which possibly need emboldening -->
<test name="weight" compare="less_eq">
- <const>regular</const>
+ <const>medium</const>
</test>
<!-- check to see if the pattern requests bold -->
<test target="pattern" name="weight" compare="more_eq">
diff --git a/conf.d/Makefile.in b/conf.d/Makefile.in
index ff988eb9..604af41c 100644
--- a/conf.d/Makefile.in
+++ b/conf.d/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -241,6 +241,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JSONC_CFLAGS = @JSONC_CFLAGS@
+JSONC_LIBS = @JSONC_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -448,8 +450,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -515,7 +517,10 @@ ctags CTAGS:
cscope cscopelist:
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
diff --git a/config.guess b/config.guess
index a7448442..256083a7 100755
--- a/config.guess
+++ b/config.guess
@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2017 Free Software Foundation, Inc.
+# Copyright 1992-2018 Free Software Foundation, Inc.
-timestamp='2017-08-08'
+timestamp='2018-03-08'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@ timestamp='2017-08-08'
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -27,7 +27,7 @@ timestamp='2017-08-08'
# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
#
# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
#
# Please send patches to <config-patches@gnu.org>.
@@ -39,7 +39,7 @@ Usage: $0 [OPTION]
Output the configuration name of the system \`$me' is run on.
-Operation modes:
+Options:
-h, --help print this help, then exit
-t, --time-stamp print date of last modification, then exit
-v, --version print version number, then exit
@@ -50,7 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2017 Free Software Foundation, Inc.
+Copyright 1992-2018 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -107,9 +107,9 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
dummy=$tmp/dummy ;
tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,) echo "int x;" > $dummy.c ;
+ ,,) echo "int x;" > "$dummy.c" ;
for c in cc gcc c89 c99 ; do
- if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+ if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
CC_FOR_BUILD="$c"; break ;
fi ;
done ;
@@ -132,14 +132,14 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-case "${UNAME_SYSTEM}" in
+case "$UNAME_SYSTEM" in
Linux|GNU|GNU/*)
# If the system lacks a compiler, then just pick glibc.
# We could probably try harder.
LIBC=gnu
- eval $set_cc_for_build
- cat <<-EOF > $dummy.c
+ eval "$set_cc_for_build"
+ cat <<-EOF > "$dummy.c"
#include <features.h>
#if defined(__UCLIBC__)
LIBC=uclibc
@@ -149,13 +149,20 @@ Linux|GNU|GNU/*)
LIBC=gnu
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
+
+ # If ldd exists, use it to detect musl libc.
+ if command -v ldd >/dev/null && \
+ ldd --version 2>&1 | grep -q ^musl
+ then
+ LIBC=musl
+ fi
;;
esac
# Note: order is significant - the case branches are not exclusive.
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
*:NetBSD:*:*)
# NetBSD (nbsd) targets should (where applicable) match one or
# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
@@ -169,30 +176,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# portion of the name. We always set it to "unknown".
sysctl="sysctl -n hw.machine_arch"
UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
- /sbin/$sysctl 2>/dev/null || \
- /usr/sbin/$sysctl 2>/dev/null || \
+ "/sbin/$sysctl" 2>/dev/null || \
+ "/usr/sbin/$sysctl" 2>/dev/null || \
echo unknown)`
- case "${UNAME_MACHINE_ARCH}" in
+ case "$UNAME_MACHINE_ARCH" in
armeb) machine=armeb-unknown ;;
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
sh5el) machine=sh5le-unknown ;;
earmv*)
- arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
- endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
- machine=${arch}${endian}-unknown
+ arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+ endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
+ machine="${arch}${endian}"-unknown
;;
- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+ *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
esac
# The Operating System including object format, if it has switched
# to ELF recently (or will in the future) and ABI.
- case "${UNAME_MACHINE_ARCH}" in
+ case "$UNAME_MACHINE_ARCH" in
earm*)
os=netbsdelf
;;
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- eval $set_cc_for_build
+ eval "$set_cc_for_build"
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ELF__
then
@@ -208,10 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
;;
esac
# Determine ABI tags.
- case "${UNAME_MACHINE_ARCH}" in
+ case "$UNAME_MACHINE_ARCH" in
earm*)
expr='s/^earmv[0-9]/-eabi/;s/eb$//'
- abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+ abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
;;
esac
# The OS release
@@ -219,49 +226,55 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# thus, need a distinct triplet. However, they do not need
# kernel version information, so it can be replaced with a
# suitable tag, in the style of linux-gnu.
- case "${UNAME_VERSION}" in
+ case "$UNAME_VERSION" in
Debian*)
release='-gnu'
;;
*)
- release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
+ release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
;;
esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "${machine}-${os}${release}${abi}"
+ echo "$machine-${os}${release}${abi}"
exit ;;
*:Bitrig:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+ echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
exit ;;
*:OpenBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+ echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
exit ;;
*:LibertyBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
+ echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
+ exit ;;
+ *:MidnightBSD:*:*)
+ echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
exit ;;
*:ekkoBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
exit ;;
*:SolidBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
exit ;;
macppc:MirBSD:*:*)
- echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+ echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
exit ;;
*:MirBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
exit ;;
*:Sortix:*:*)
- echo ${UNAME_MACHINE}-unknown-sortix
+ echo "$UNAME_MACHINE"-unknown-sortix
exit ;;
*:Redox:*:*)
- echo ${UNAME_MACHINE}-unknown-redox
+ echo "$UNAME_MACHINE"-unknown-redox
exit ;;
+ mips:OSF1:*.*)
+ echo mips-dec-osf1
+ exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
*4.0)
@@ -313,28 +326,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# A Tn.n version is a released field test version.
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+ echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
exitcode=$?
trap '' 0
exit $exitcode ;;
- Alpha\ *:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # Should we change UNAME_MACHINE based on the output of uname instead
- # of the specific Alpha model?
- echo alpha-pc-interix
- exit ;;
- 21064:Windows_NT:50:3)
- echo alpha-dec-winnt3.5
- exit ;;
Amiga*:UNIX_System_V:4.0:*)
echo m68k-unknown-sysv4
exit ;;
*:[Aa]miga[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-amigaos
+ echo "$UNAME_MACHINE"-unknown-amigaos
exit ;;
*:[Mm]orph[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-morphos
+ echo "$UNAME_MACHINE"-unknown-morphos
exit ;;
*:OS/390:*:*)
echo i370-ibm-openedition
@@ -346,7 +350,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
echo powerpc-ibm-os400
exit ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- echo arm-acorn-riscix${UNAME_RELEASE}
+ echo arm-acorn-riscix"$UNAME_RELEASE"
exit ;;
arm*:riscos:*:*|arm*:RISCOS:*:*)
echo arm-unknown-riscos
@@ -373,19 +377,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
sparc) echo sparc-icl-nx7; exit ;;
esac ;;
s390x:SunOS:*:*)
- echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
exit ;;
sun4H:SunOS:5.*:*)
- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
exit ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
exit ;;
i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
- echo i386-pc-auroraux${UNAME_RELEASE}
+ echo i386-pc-auroraux"$UNAME_RELEASE"
exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
- eval $set_cc_for_build
+ eval "$set_cc_for_build"
SUN_ARCH=i386
# If there is a compiler, see if it is configured for 64-bit objects.
# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
@@ -398,13 +402,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
SUN_ARCH=x86_64
fi
fi
- echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
# SunOS6. Hard to guess exactly what SunOS6 will be like, but
# it's likely to be more like Solaris than SunOS4.
- echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
exit ;;
sun4*:SunOS:*:*)
case "`/usr/bin/arch -k`" in
@@ -413,25 +417,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
;;
esac
# Japanese Language versions have a version number like `4.1.3-JL'.
- echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+ echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
exit ;;
sun3*:SunOS:*:*)
- echo m68k-sun-sunos${UNAME_RELEASE}
+ echo m68k-sun-sunos"$UNAME_RELEASE"
exit ;;
sun*:*:4.2BSD:*)
UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
- test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
+ test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
case "`/bin/arch`" in
sun3)
- echo m68k-sun-sunos${UNAME_RELEASE}
+ echo m68k-sun-sunos"$UNAME_RELEASE"
;;
sun4)
- echo sparc-sun-sunos${UNAME_RELEASE}
+ echo sparc-sun-sunos"$UNAME_RELEASE"
;;
esac
exit ;;
aushp:SunOS:*:*)
- echo sparc-auspex-sunos${UNAME_RELEASE}
+ echo sparc-auspex-sunos"$UNAME_RELEASE"
exit ;;
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
@@ -442,44 +446,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# MiNT. But MiNT is downward compatible to TOS, so this should
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint"$UNAME_RELEASE"
exit ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint"$UNAME_RELEASE"
exit ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint"$UNAME_RELEASE"
exit ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE}
+ echo m68k-milan-mint"$UNAME_RELEASE"
exit ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
+ echo m68k-hades-mint"$UNAME_RELEASE"
exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
+ echo m68k-unknown-mint"$UNAME_RELEASE"
exit ;;
m68k:machten:*:*)
- echo m68k-apple-machten${UNAME_RELEASE}
+ echo m68k-apple-machten"$UNAME_RELEASE"
exit ;;
powerpc:machten:*:*)
- echo powerpc-apple-machten${UNAME_RELEASE}
+ echo powerpc-apple-machten"$UNAME_RELEASE"
exit ;;
RISC*:Mach:*:*)
echo mips-dec-mach_bsd4.3
exit ;;
RISC*:ULTRIX:*:*)
- echo mips-dec-ultrix${UNAME_RELEASE}
+ echo mips-dec-ultrix"$UNAME_RELEASE"
exit ;;
VAX*:ULTRIX*:*:*)
- echo vax-dec-ultrix${UNAME_RELEASE}
+ echo vax-dec-ultrix"$UNAME_RELEASE"
exit ;;
2020:CLIX:*:* | 2430:CLIX:*:*)
- echo clipper-intergraph-clix${UNAME_RELEASE}
+ echo clipper-intergraph-clix"$UNAME_RELEASE"
exit ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ eval "$set_cc_for_build"
+ sed 's/^ //' << EOF > "$dummy.c"
#ifdef __cplusplus
#include <stdio.h> /* for printf() prototype */
int main (int argc, char *argv[]) {
@@ -488,23 +492,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
#endif
#if defined (host_mips) && defined (MIPSEB)
#if defined (SYSTYPE_SYSV)
- printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+ printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
#endif
#if defined (SYSTYPE_SVR4)
- printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+ printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
#endif
#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
- printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+ printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
#endif
#endif
exit (-1);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c &&
- dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
- SYSTEM_NAME=`$dummy $dummyarg` &&
+ $CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
+ dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+ SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
{ echo "$SYSTEM_NAME"; exit; }
- echo mips-mips-riscos${UNAME_RELEASE}
+ echo mips-mips-riscos"$UNAME_RELEASE"
exit ;;
Motorola:PowerMAX_OS:*:*)
echo powerpc-motorola-powermax
@@ -530,17 +534,17 @@ EOF
AViiON:dgux:*:*)
# DG/UX returns AViiON for all architectures
UNAME_PROCESSOR=`/usr/bin/uname -p`
- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+ if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
then
- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
- [ ${TARGET_BINARY_INTERFACE}x = x ]
+ if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
+ [ "$TARGET_BINARY_INTERFACE"x = x ]
then
- echo m88k-dg-dgux${UNAME_RELEASE}
+ echo m88k-dg-dgux"$UNAME_RELEASE"
else
- echo m88k-dg-dguxbcs${UNAME_RELEASE}
+ echo m88k-dg-dguxbcs"$UNAME_RELEASE"
fi
else
- echo i586-dg-dgux${UNAME_RELEASE}
+ echo i586-dg-dgux"$UNAME_RELEASE"
fi
exit ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
@@ -557,7 +561,7 @@ EOF
echo m68k-tektronix-bsd
exit ;;
*:IRIX*:*:*)
- echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+ echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
exit ;;
????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
@@ -569,14 +573,14 @@ EOF
if [ -x /usr/bin/oslevel ] ; then
IBM_REV=`/usr/bin/oslevel`
else
- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
fi
- echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+ echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
exit ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ eval "$set_cc_for_build"
+ sed 's/^ //' << EOF > "$dummy.c"
#include <sys/systemcfg.h>
main()
@@ -587,7 +591,7 @@ EOF
exit(0);
}
EOF
- if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+ if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
then
echo "$SYSTEM_NAME"
else
@@ -601,7 +605,7 @@ EOF
exit ;;
*:AIX:*:[4567])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
else
IBM_ARCH=powerpc
@@ -610,18 +614,18 @@ EOF
IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
else
- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
fi
- echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+ echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
exit ;;
*:AIX:*:*)
echo rs6000-ibm-aix
exit ;;
- ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+ ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
echo romp-ibm-bsd4.4
exit ;;
ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
- echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
+ echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to
exit ;; # report: romp-ibm BSD 4.3
*:BOSX:*:*)
echo rs6000-bull-bosx
@@ -636,28 +640,28 @@ EOF
echo m68k-hp-bsd4.4
exit ;;
9000/[34678]??:HP-UX:*:*)
- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- case "${UNAME_MACHINE}" in
- 9000/31? ) HP_ARCH=m68000 ;;
- 9000/[34]?? ) HP_ARCH=m68k ;;
+ HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
+ case "$UNAME_MACHINE" in
+ 9000/31?) HP_ARCH=m68000 ;;
+ 9000/[34]??) HP_ARCH=m68k ;;
9000/[678][0-9][0-9])
if [ -x /usr/bin/getconf ]; then
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
- case "${sc_cpu_version}" in
+ case "$sc_cpu_version" in
523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
532) # CPU_PA_RISC2_0
- case "${sc_kernel_bits}" in
+ case "$sc_kernel_bits" in
32) HP_ARCH=hppa2.0n ;;
64) HP_ARCH=hppa2.0w ;;
'') HP_ARCH=hppa2.0 ;; # HP-UX 10.20
esac ;;
esac
fi
- if [ "${HP_ARCH}" = "" ]; then
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ if [ "$HP_ARCH" = "" ]; then
+ eval "$set_cc_for_build"
+ sed 's/^ //' << EOF > "$dummy.c"
#define _HPUX_SOURCE
#include <stdlib.h>
@@ -690,13 +694,13 @@ EOF
exit (0);
}
EOF
- (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+ (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
test -z "$HP_ARCH" && HP_ARCH=hppa
fi ;;
esac
- if [ ${HP_ARCH} = hppa2.0w ]
+ if [ "$HP_ARCH" = hppa2.0w ]
then
- eval $set_cc_for_build
+ eval "$set_cc_for_build"
# hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
# 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
@@ -715,15 +719,15 @@ EOF
HP_ARCH=hppa64
fi
fi
- echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+ echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
exit ;;
ia64:HP-UX:*:*)
- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- echo ia64-hp-hpux${HPUX_REV}
+ HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
+ echo ia64-hp-hpux"$HPUX_REV"
exit ;;
3050*:HI-UX:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ eval "$set_cc_for_build"
+ sed 's/^ //' << EOF > "$dummy.c"
#include <unistd.h>
int
main ()
@@ -748,11 +752,11 @@ EOF
exit (0);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+ $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
{ echo "$SYSTEM_NAME"; exit; }
echo unknown-hitachi-hiuxwe2
exit ;;
- 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
echo hppa1.1-hp-bsd
exit ;;
9000/8??:4.3bsd:*:*)
@@ -761,7 +765,7 @@ EOF
*9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
echo hppa1.0-hp-mpeix
exit ;;
- hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
echo hppa1.1-hp-osf
exit ;;
hp8??:OSF1:*:*)
@@ -769,9 +773,9 @@ EOF
exit ;;
i*86:OSF1:*:*)
if [ -x /usr/sbin/sysversion ] ; then
- echo ${UNAME_MACHINE}-unknown-osf1mk
+ echo "$UNAME_MACHINE"-unknown-osf1mk
else
- echo ${UNAME_MACHINE}-unknown-osf1
+ echo "$UNAME_MACHINE"-unknown-osf1
fi
exit ;;
parisc*:Lites*:*:*)
@@ -796,128 +800,109 @@ EOF
echo c4-convex-bsd
exit ;;
CRAY*Y-MP:*:*:*)
- echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
exit ;;
CRAY*[A-Z]90:*:*:*)
- echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+ echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-e 's/\.[^.]*$/.X/'
exit ;;
CRAY*TS:*:*:*)
- echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
exit ;;
CRAY*T3E:*:*:*)
- echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
exit ;;
CRAY*SV1:*:*:*)
- echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
exit ;;
*:UNICOS/mp:*:*)
- echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+ FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit ;;
5000:UNIX_System_V:4.*:*)
FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
+ FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
exit ;;
sparc*:BSD/OS:*:*)
- echo sparc-unknown-bsdi${UNAME_RELEASE}
+ echo sparc-unknown-bsdi"$UNAME_RELEASE"
exit ;;
*:BSD/OS:*:*)
- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
exit ;;
*:FreeBSD:*:*)
UNAME_PROCESSOR=`/usr/bin/uname -p`
- case ${UNAME_PROCESSOR} in
+ case "$UNAME_PROCESSOR" in
amd64)
UNAME_PROCESSOR=x86_64 ;;
i386)
UNAME_PROCESSOR=i586 ;;
esac
- echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
exit ;;
i*:CYGWIN*:*)
- echo ${UNAME_MACHINE}-pc-cygwin
+ echo "$UNAME_MACHINE"-pc-cygwin
exit ;;
*:MINGW64*:*)
- echo ${UNAME_MACHINE}-pc-mingw64
+ echo "$UNAME_MACHINE"-pc-mingw64
exit ;;
*:MINGW*:*)
- echo ${UNAME_MACHINE}-pc-mingw32
+ echo "$UNAME_MACHINE"-pc-mingw32
exit ;;
*:MSYS*:*)
- echo ${UNAME_MACHINE}-pc-msys
- exit ;;
- i*:windows32*:*)
- # uname -m includes "-pc" on this system.
- echo ${UNAME_MACHINE}-mingw32
+ echo "$UNAME_MACHINE"-pc-msys
exit ;;
i*:PW*:*)
- echo ${UNAME_MACHINE}-pc-pw32
+ echo "$UNAME_MACHINE"-pc-pw32
exit ;;
*:Interix*:*)
- case ${UNAME_MACHINE} in
+ case "$UNAME_MACHINE" in
x86)
- echo i586-pc-interix${UNAME_RELEASE}
+ echo i586-pc-interix"$UNAME_RELEASE"
exit ;;
authenticamd | genuineintel | EM64T)
- echo x86_64-unknown-interix${UNAME_RELEASE}
+ echo x86_64-unknown-interix"$UNAME_RELEASE"
exit ;;
IA64)
- echo ia64-unknown-interix${UNAME_RELEASE}
+ echo ia64-unknown-interix"$UNAME_RELEASE"
exit ;;
esac ;;
- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- echo i${UNAME_MACHINE}-pc-mks
- exit ;;
- 8664:Windows_NT:*)
- echo x86_64-pc-mks
- exit ;;
- i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
- # UNAME_MACHINE based on the output of uname instead of i386?
- echo i586-pc-interix
- exit ;;
i*:UWIN*:*)
- echo ${UNAME_MACHINE}-pc-uwin
+ echo "$UNAME_MACHINE"-pc-uwin
exit ;;
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
echo x86_64-unknown-cygwin
exit ;;
- p*:CYGWIN*:*)
- echo powerpcle-unknown-cygwin
- exit ;;
prep*:SunOS:5.*:*)
- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
exit ;;
*:GNU:*:*)
# the GNU system
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+ echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
exit ;;
i*86:Minix:*:*)
- echo ${UNAME_MACHINE}-pc-minix
+ echo "$UNAME_MACHINE"-pc-minix
exit ;;
aarch64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
aarch64_be:Linux:*:*)
UNAME_MACHINE=aarch64_be
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -931,63 +916,63 @@ EOF
esac
objdump --private-headers /bin/sh | grep -q ld.so.1
if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
arc:Linux:*:* | arceb:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
arm*:Linux:*:*)
- eval $set_cc_for_build
+ eval "$set_cc_for_build"
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_EABI__
then
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
else
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_PCS_VFP
then
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
else
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
fi
fi
exit ;;
avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
cris:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
exit ;;
crisv32:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
exit ;;
e2k:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
frv:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
hexagon:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
i*86:Linux:*:*)
- echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
exit ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
k1om:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
mips:Linux:*:* | mips64:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ eval "$set_cc_for_build"
+ sed 's/^ //' << EOF > "$dummy.c"
#undef CPU
#undef ${UNAME_MACHINE}
#undef ${UNAME_MACHINE}el
@@ -1001,70 +986,70 @@ EOF
#endif
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
+ test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
;;
mips64el:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
openrisc*:Linux:*:*)
- echo or1k-unknown-linux-${LIBC}
+ echo or1k-unknown-linux-"$LIBC"
exit ;;
or32:Linux:*:* | or1k*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
padre:Linux:*:*)
- echo sparc-unknown-linux-${LIBC}
+ echo sparc-unknown-linux-"$LIBC"
exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-${LIBC}
+ echo hppa64-unknown-linux-"$LIBC"
exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
- PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
- *) echo hppa-unknown-linux-${LIBC} ;;
+ PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
+ PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
+ *) echo hppa-unknown-linux-"$LIBC" ;;
esac
exit ;;
ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-${LIBC}
+ echo powerpc64-unknown-linux-"$LIBC"
exit ;;
ppc:Linux:*:*)
- echo powerpc-unknown-linux-${LIBC}
+ echo powerpc-unknown-linux-"$LIBC"
exit ;;
ppc64le:Linux:*:*)
- echo powerpc64le-unknown-linux-${LIBC}
+ echo powerpc64le-unknown-linux-"$LIBC"
exit ;;
ppcle:Linux:*:*)
- echo powerpcle-unknown-linux-${LIBC}
+ echo powerpcle-unknown-linux-"$LIBC"
exit ;;
riscv32:Linux:*:* | riscv64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+ echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
tile*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+ echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
exit ;;
x86_64:Linux:*:*)
- echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1078,34 +1063,34 @@ EOF
# I am not positive that other SVR4 systems won't match this,
# I just have to hope. -- rms.
# Use sysv4.2uw... so that sysv4* matches it.
- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
exit ;;
i*86:OS/2:*:*)
# If we were able to find `uname', then EMX Unix compatibility
# is probably installed.
- echo ${UNAME_MACHINE}-pc-os2-emx
+ echo "$UNAME_MACHINE"-pc-os2-emx
exit ;;
i*86:XTS-300:*:STOP)
- echo ${UNAME_MACHINE}-unknown-stop
+ echo "$UNAME_MACHINE"-unknown-stop
exit ;;
i*86:atheos:*:*)
- echo ${UNAME_MACHINE}-unknown-atheos
+ echo "$UNAME_MACHINE"-unknown-atheos
exit ;;
i*86:syllable:*:*)
- echo ${UNAME_MACHINE}-pc-syllable
+ echo "$UNAME_MACHINE"-pc-syllable
exit ;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
+ echo i386-unknown-lynxos"$UNAME_RELEASE"
exit ;;
i*86:*DOS:*:*)
- echo ${UNAME_MACHINE}-pc-msdosdjgpp
+ echo "$UNAME_MACHINE"-pc-msdosdjgpp
exit ;;
- i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
- UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+ i*86:*:4.*:*)
+ UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
- echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+ echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
else
- echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+ echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
fi
exit ;;
i*86:*:5:[678]*)
@@ -1115,12 +1100,12 @@ EOF
*Pentium) UNAME_MACHINE=i586 ;;
*Pent*|*Celeron) UNAME_MACHINE=i686 ;;
esac
- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+ echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
exit ;;
i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
- echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+ echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
elif /bin/uname -X 2>/dev/null >/dev/null ; then
UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
@@ -1130,9 +1115,9 @@ EOF
&& UNAME_MACHINE=i686
(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
&& UNAME_MACHINE=i686
- echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+ echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
else
- echo ${UNAME_MACHINE}-pc-sysv32
+ echo "$UNAME_MACHINE"-pc-sysv32
fi
exit ;;
pc:*:*:*)
@@ -1152,9 +1137,9 @@ EOF
exit ;;
i860:*:4.*:*) # i860-SVR4
if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
- echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+ echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
else # Add other i860-SVR4 vendors below as they are discovered.
- echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
+ echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4
fi
exit ;;
mini*:CTIX:SYS*5:*)
@@ -1174,9 +1159,9 @@ EOF
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
&& { echo i486-ncr-sysv4; exit; } ;;
@@ -1185,28 +1170,28 @@ EOF
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- echo m68k-unknown-lynxos${UNAME_RELEASE}
+ echo m68k-unknown-lynxos"$UNAME_RELEASE"
exit ;;
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
exit ;;
TSUNAMI:LynxOS:2.*:*)
- echo sparc-unknown-lynxos${UNAME_RELEASE}
+ echo sparc-unknown-lynxos"$UNAME_RELEASE"
exit ;;
rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ echo rs6000-unknown-lynxos"$UNAME_RELEASE"
exit ;;
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- echo powerpc-unknown-lynxos${UNAME_RELEASE}
+ echo powerpc-unknown-lynxos"$UNAME_RELEASE"
exit ;;
SM[BE]S:UNIX_SV:*:*)
- echo mips-dde-sysv${UNAME_RELEASE}
+ echo mips-dde-sysv"$UNAME_RELEASE"
exit ;;
RM*:ReliantUNIX-*:*:*)
echo mips-sni-sysv4
@@ -1217,7 +1202,7 @@ EOF
*:SINIX-*:*:*)
if uname -p 2>/dev/null >/dev/null ; then
UNAME_MACHINE=`(uname -p) 2>/dev/null`
- echo ${UNAME_MACHINE}-sni-sysv4
+ echo "$UNAME_MACHINE"-sni-sysv4
else
echo ns32k-sni-sysv
fi
@@ -1237,23 +1222,23 @@ EOF
exit ;;
i*86:VOS:*:*)
# From Paul.Green@stratus.com.
- echo ${UNAME_MACHINE}-stratus-vos
+ echo "$UNAME_MACHINE"-stratus-vos
exit ;;
*:VOS:*:*)
# From Paul.Green@stratus.com.
echo hppa1.1-stratus-vos
exit ;;
mc68*:A/UX:*:*)
- echo m68k-apple-aux${UNAME_RELEASE}
+ echo m68k-apple-aux"$UNAME_RELEASE"
exit ;;
news*:NEWS-OS:6*:*)
echo mips-sony-newsos6
exit ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
- echo mips-nec-sysv${UNAME_RELEASE}
+ echo mips-nec-sysv"$UNAME_RELEASE"
else
- echo mips-unknown-sysv${UNAME_RELEASE}
+ echo mips-unknown-sysv"$UNAME_RELEASE"
fi
exit ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
@@ -1272,39 +1257,39 @@ EOF
echo x86_64-unknown-haiku
exit ;;
SX-4:SUPER-UX:*:*)
- echo sx4-nec-superux${UNAME_RELEASE}
+ echo sx4-nec-superux"$UNAME_RELEASE"
exit ;;
SX-5:SUPER-UX:*:*)
- echo sx5-nec-superux${UNAME_RELEASE}
+ echo sx5-nec-superux"$UNAME_RELEASE"
exit ;;
SX-6:SUPER-UX:*:*)
- echo sx6-nec-superux${UNAME_RELEASE}
+ echo sx6-nec-superux"$UNAME_RELEASE"
exit ;;
SX-7:SUPER-UX:*:*)
- echo sx7-nec-superux${UNAME_RELEASE}
+ echo sx7-nec-superux"$UNAME_RELEASE"
exit ;;
SX-8:SUPER-UX:*:*)
- echo sx8-nec-superux${UNAME_RELEASE}
+ echo sx8-nec-superux"$UNAME_RELEASE"
exit ;;
SX-8R:SUPER-UX:*:*)
- echo sx8r-nec-superux${UNAME_RELEASE}
+ echo sx8r-nec-superux"$UNAME_RELEASE"
exit ;;
SX-ACE:SUPER-UX:*:*)
- echo sxace-nec-superux${UNAME_RELEASE}
+ echo sxace-nec-superux"$UNAME_RELEASE"
exit ;;
Power*:Rhapsody:*:*)
- echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ echo powerpc-apple-rhapsody"$UNAME_RELEASE"
exit ;;
*:Rhapsody:*:*)
- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
exit ;;
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- eval $set_cc_for_build
+ eval "$set_cc_for_build"
if test "$UNAME_PROCESSOR" = unknown ; then
UNAME_PROCESSOR=powerpc
fi
- if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+ if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
@@ -1332,7 +1317,7 @@ EOF
# that Apple uses in portable devices.
UNAME_PROCESSOR=x86_64
fi
- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+ echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
UNAME_PROCESSOR=`uname -p`
@@ -1340,22 +1325,25 @@ EOF
UNAME_PROCESSOR=i386
UNAME_MACHINE=pc
fi
- echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+ echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
exit ;;
*:QNX:*:4*)
echo i386-pc-qnx
exit ;;
NEO-*:NONSTOP_KERNEL:*:*)
- echo neo-tandem-nsk${UNAME_RELEASE}
+ echo neo-tandem-nsk"$UNAME_RELEASE"
exit ;;
NSE-*:NONSTOP_KERNEL:*:*)
- echo nse-tandem-nsk${UNAME_RELEASE}
+ echo nse-tandem-nsk"$UNAME_RELEASE"
exit ;;
NSR-*:NONSTOP_KERNEL:*:*)
- echo nsr-tandem-nsk${UNAME_RELEASE}
+ echo nsr-tandem-nsk"$UNAME_RELEASE"
+ exit ;;
+ NSV-*:NONSTOP_KERNEL:*:*)
+ echo nsv-tandem-nsk"$UNAME_RELEASE"
exit ;;
NSX-*:NONSTOP_KERNEL:*:*)
- echo nsx-tandem-nsk${UNAME_RELEASE}
+ echo nsx-tandem-nsk"$UNAME_RELEASE"
exit ;;
*:NonStop-UX:*:*)
echo mips-compaq-nonstopux
@@ -1364,7 +1352,7 @@ EOF
echo bs2000-siemens-sysv
exit ;;
DS/*:UNIX_System_V:*:*)
- echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
exit ;;
*:Plan9:*:*)
# "uname -m" is not consistent, so use $cputype instead. 386
@@ -1375,7 +1363,7 @@ EOF
else
UNAME_MACHINE="$cputype"
fi
- echo ${UNAME_MACHINE}-unknown-plan9
+ echo "$UNAME_MACHINE"-unknown-plan9
exit ;;
*:TOPS-10:*:*)
echo pdp10-unknown-tops10
@@ -1396,14 +1384,14 @@ EOF
echo pdp10-unknown-its
exit ;;
SEI:*:*:SEIUX)
- echo mips-sei-seiux${UNAME_RELEASE}
+ echo mips-sei-seiux"$UNAME_RELEASE"
exit ;;
*:DragonFly:*:*)
- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
exit ;;
*:*VMS:*:*)
UNAME_MACHINE=`(uname -p) 2>/dev/null`
- case "${UNAME_MACHINE}" in
+ case "$UNAME_MACHINE" in
A*) echo alpha-dec-vms ; exit ;;
I*) echo ia64-dec-vms ; exit ;;
V*) echo vax-dec-vms ; exit ;;
@@ -1412,32 +1400,44 @@ EOF
echo i386-pc-xenix
exit ;;
i*86:skyos:*:*)
- echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
+ echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
exit ;;
i*86:rdos:*:*)
- echo ${UNAME_MACHINE}-pc-rdos
+ echo "$UNAME_MACHINE"-pc-rdos
exit ;;
i*86:AROS:*:*)
- echo ${UNAME_MACHINE}-pc-aros
+ echo "$UNAME_MACHINE"-pc-aros
exit ;;
x86_64:VMkernel:*:*)
- echo ${UNAME_MACHINE}-unknown-esx
+ echo "$UNAME_MACHINE"-unknown-esx
exit ;;
amd64:Isilon\ OneFS:*:*)
echo x86_64-unknown-onefs
exit ;;
esac
+echo "$0: unable to guess system type" >&2
+
+case "$UNAME_MACHINE:$UNAME_SYSTEM" in
+ mips:Linux | mips64:Linux)
+ # If we got here on MIPS GNU/Linux, output extra information.
+ cat >&2 <<EOF
+
+NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
+the system type. Please install a C compiler and try again.
+EOF
+ ;;
+esac
+
cat >&2 <<EOF
-$0: unable to guess system type
This script (version $timestamp), has failed to recognize the
operating system you are using. If your script is old, overwrite *all*
copies of config.guess and config.sub with the latest versions from:
- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+ https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
and
- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+ https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
If $0 has already been updated, send the following data and any
information you think might be pertinent to config-patches@gnu.org to
@@ -1460,16 +1460,16 @@ hostinfo = `(hostinfo) 2>/dev/null`
/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
+UNAME_MACHINE = "$UNAME_MACHINE"
+UNAME_RELEASE = "$UNAME_RELEASE"
+UNAME_SYSTEM = "$UNAME_SYSTEM"
+UNAME_VERSION = "$UNAME_VERSION"
EOF
exit 1
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
diff --git a/config.h.in b/config.h.in
index c5bbd66c..d8364333 100644
--- a/config.h.in
+++ b/config.h.in
@@ -179,6 +179,12 @@
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
+/* Define to 1 if you have the `strerror' function. */
+#undef HAVE_STRERROR
+
+/* Define to 1 if you have the `strerror_r' function. */
+#undef HAVE_STRERROR_R
+
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
diff --git a/config.sub b/config.sub
index 932128b3..20f7cf29 100755
--- a/config.sub
+++ b/config.sub
@@ -1,8 +1,8 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2017 Free Software Foundation, Inc.
+# Copyright 1992-2018 Free Software Foundation, Inc.
-timestamp='2017-04-02'
+timestamp='2018-05-05'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@ timestamp='2017-04-02'
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -33,7 +33,7 @@ timestamp='2017-04-02'
# Otherwise, we print the canonical config type on stdout and succeed.
# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
@@ -57,7 +57,7 @@ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
Canonicalize a configuration name.
-Operation modes:
+Options:
-h, --help print this help, then exit
-t, --time-stamp print date of last modification, then exit
-v, --version print version number, then exit
@@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2017 Free Software Foundation, Inc.
+Copyright 1992-2018 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -94,7 +94,7 @@ while test $# -gt 0 ; do
*local*)
# First pass through any local machine types.
- echo $1
+ echo "$1"
exit ;;
* )
@@ -110,28 +110,48 @@ case $# in
exit 1;;
esac
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
- nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
- linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
- knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
- kopensolaris*-gnu* | cloudabi*-eabi* | \
- storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
- ;;
- android-linux)
- os=-linux-android
- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
- ;;
- *)
- basic_machine=`echo $1 | sed 's/-[^-]*$//'`
- if [ $basic_machine != $1 ]
- then os=`echo $1 | sed 's/.*-/-/'`
- else os=; fi
- ;;
+# Spilt fields of configuration type
+IFS="-" read -r field1 field2 field3 field4 <<EOF
+$1
+EOF
+
+# Separate into logical components for further validation
+case $1 in
+ *-*-*-*)
+ basic_machine=$field1-$field2
+ os=-$field3-$field4
+ ;;
+ *-*-*)
+ # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
+ # parts
+ maybe_os=$field2-$field3
+ case $maybe_os in
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \
+ | linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \
+ | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
+ | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
+ | storm-chaos* | os2-emx* | rtmk-nova*)
+ basic_machine=$field1
+ os=-$maybe_os
+ ;;
+ android-linux)
+ basic_machine=$field1-unknown
+ os=-linux-android
+ ;;
+ *)
+ basic_machine=$field1-$field2
+ os=-$field3
+ ;;
+ esac
+ ;;
+ *-*)
+ basic_machine=$field1
+ os=-$field2
+ ;;
+ *)
+ basic_machine=$1
+ os=
+ ;;
esac
### Let's recognize common machines as not being operating systems so
@@ -178,44 +198,44 @@ case $os in
;;
-sco6)
os=-sco5v6
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-sco5)
os=-sco3.2v5
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-sco4)
os=-sco3.2v4
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-sco3.2.[4-9]*)
os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-sco3.2v[4-9]*)
# Don't forget version if it is 3.2v4 or newer.
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-sco5v6*)
# Don't forget version if it is 3.2v4 or newer.
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-sco*)
os=-sco3.2v2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-udk*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-isc)
os=-isc2.2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-clix*)
basic_machine=clipper-intergraph
;;
-isc*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-lynx*178)
os=-lynxos178
@@ -227,10 +247,7 @@ case $os in
os=-lynxos
;;
-ptx*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
- ;;
- -windowsnt*)
- os=`echo $os | sed -e 's/windowsnt/winnt/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
;;
-psos*)
os=-psos
@@ -252,12 +269,12 @@ case $basic_machine in
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
| arc | arceb \
- | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv6m | armv[78][arm] \
| avr | avr32 \
| ba \
| be32 | be64 \
| bfin \
- | c4x | c8051 | clipper \
+ | c4x | c8051 | clipper | csky \
| d10v | d30v | dlx | dsp16xx \
| e2k | epiphany \
| fido | fr30 | frv | ft32 \
@@ -296,10 +313,11 @@ case $basic_machine in
| mt \
| msp430 \
| nds32 | nds32le | nds32be \
+ | nfp \
| nios | nios2 | nios2eb | nios2el \
| ns16k | ns32k \
| open8 | or1k | or1knd | or32 \
- | pdp10 | pdp11 | pj | pjl \
+ | pdp10 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pru \
| pyramid \
@@ -316,7 +334,6 @@ case $basic_machine in
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| visium \
| wasm32 \
- | we32k \
| x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
basic_machine=$basic_machine-unknown
@@ -337,7 +354,11 @@ case $basic_machine in
basic_machine=$basic_machine-unknown
os=-none
;;
- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
+ ;;
+ m9s12z | m68hcs12z | hcs12z | s12z)
+ basic_machine=s12z-unknown
+ os=-none
;;
ms1)
basic_machine=mt-unknown
@@ -366,7 +387,7 @@ case $basic_machine in
;;
# Object if more than one company name word.
*-*-*)
- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
exit 1
;;
# Recognize the basic CPU types with company name.
@@ -382,7 +403,7 @@ case $basic_machine in
| be32-* | be64-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
- | c8051-* | clipper-* | craynv-* | cydra-* \
+ | c8051-* | clipper-* | craynv-* | csky-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| e2k-* | elxsi-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
@@ -423,6 +444,7 @@ case $basic_machine in
| mt-* \
| msp430-* \
| nds32-* | nds32le-* | nds32be-* \
+ | nfp-* \
| nios-* | nios2-* | nios2eb-* | nios2el-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| open8-* \
@@ -461,7 +483,7 @@ case $basic_machine in
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
- basic_machine=i386-unknown
+ basic_machine=i386-pc
os=-bsd
;;
3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
@@ -495,7 +517,7 @@ case $basic_machine in
basic_machine=x86_64-pc
;;
amd64-*)
- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
amdahl)
basic_machine=580-amdahl
@@ -540,7 +562,7 @@ case $basic_machine in
os=-linux
;;
blackfin-*)
- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
os=-linux
;;
bluegene*)
@@ -548,13 +570,13 @@ case $basic_machine in
os=-cnk
;;
c54x-*)
- basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
c55x-*)
- basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
c6x-*)
- basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
c90)
basic_machine=c90-cray
@@ -643,7 +665,7 @@ case $basic_machine in
basic_machine=rs6000-bull
os=-bosx
;;
- dpx2* | dpx2*-bull)
+ dpx2*)
basic_machine=m68k-bull
os=-sysv3
;;
@@ -652,7 +674,7 @@ case $basic_machine in
os=$os"spe"
;;
e500v[12]-*)
- basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
os=$os"spe"
;;
ebmon29k)
@@ -744,9 +766,6 @@ case $basic_machine in
hp9k8[0-9][0-9] | hp8[0-9][0-9])
basic_machine=hppa1.0-hp
;;
- hppa-next)
- os=-nextstep3
- ;;
hppaosf)
basic_machine=hppa1.1-hp
os=-osf
@@ -759,26 +778,26 @@ case $basic_machine in
basic_machine=i370-ibm
;;
i*86v32)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
os=-sysv32
;;
i*86v4*)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
os=-sysv4
;;
i*86v)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
os=-sysv
;;
i*86sol2)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
os=-solaris2
;;
i386mach)
basic_machine=i386-mach
os=-mach
;;
- i386-vsta | vsta)
+ vsta)
basic_machine=i386-unknown
os=-vsta
;;
@@ -797,19 +816,16 @@ case $basic_machine in
os=-sysv
;;
leon-*|leon[3-9]-*)
- basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+ basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
;;
m68knommu)
basic_machine=m68k-unknown
os=-linux
;;
m68knommu-*)
- basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
os=-linux
;;
- m88k-omron*)
- basic_machine=m88k-omron
- ;;
magnum | m3230)
basic_machine=mips-mips
os=-sysv
@@ -841,10 +857,10 @@ case $basic_machine in
os=-mint
;;
mips3*-*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+ basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
;;
mips3*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+ basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
;;
monitor)
basic_machine=m68k-rom68k
@@ -863,7 +879,7 @@ case $basic_machine in
os=-msdos
;;
ms1-*)
- basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+ basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
;;
msys)
basic_machine=i686-pc
@@ -905,7 +921,7 @@ case $basic_machine in
basic_machine=v70-nec
os=-sysv
;;
- next | m*-next )
+ next | m*-next)
basic_machine=m68k-next
case $os in
-nextstep* )
@@ -950,6 +966,9 @@ case $basic_machine in
nsr-tandem)
basic_machine=nsr-tandem
;;
+ nsv-tandem)
+ basic_machine=nsv-tandem
+ ;;
nsx-tandem)
basic_machine=nsx-tandem
;;
@@ -985,7 +1004,7 @@ case $basic_machine in
os=-linux
;;
parisc-*)
- basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
os=-linux
;;
pbd)
@@ -1001,7 +1020,7 @@ case $basic_machine in
basic_machine=i386-pc
;;
pc98-*)
- basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
pentium | p5 | k5 | k6 | nexgen | viac3)
basic_machine=i586-pc
@@ -1016,16 +1035,16 @@ case $basic_machine in
basic_machine=i786-pc
;;
pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
- basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
pentiumpro-* | p6-* | 6x86-* | athlon-*)
- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
pentium4-*)
- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
pn)
basic_machine=pn-gould
@@ -1035,23 +1054,23 @@ case $basic_machine in
ppc | ppcbe) basic_machine=powerpc-unknown
;;
ppc-* | ppcbe-*)
- basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
ppcle | powerpclittle)
basic_machine=powerpcle-unknown
;;
ppcle-* | powerpclittle-*)
- basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
ppc64) basic_machine=powerpc64-unknown
;;
- ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
ppc64le | powerpc64little)
basic_machine=powerpc64le-unknown
;;
ppc64le-* | powerpc64little-*)
- basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
ps2)
basic_machine=i386-ibm
@@ -1105,17 +1124,10 @@ case $basic_machine in
sequent)
basic_machine=i386-sequent
;;
- sh)
- basic_machine=sh-hitachi
- os=-hms
- ;;
sh5el)
basic_machine=sh5le-unknown
;;
- sh64)
- basic_machine=sh64-unknown
- ;;
- sparclite-wrs | simso-wrs)
+ simso-wrs)
basic_machine=sparclite-wrs
os=-vxworks
;;
@@ -1134,7 +1146,7 @@ case $basic_machine in
os=-sysv4
;;
strongarm-* | thumb-*)
- basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
sun2)
basic_machine=m68000-sun
@@ -1248,9 +1260,6 @@ case $basic_machine in
basic_machine=a29k-wrs
os=-vxworks
;;
- wasm32)
- basic_machine=wasm32-unknown
- ;;
w65*)
basic_machine=w65-wdc
os=-none
@@ -1259,6 +1268,9 @@ case $basic_machine in
basic_machine=hppa1.1-winbond
os=-proelf
;;
+ x64)
+ basic_machine=x86_64-pc
+ ;;
xbox)
basic_machine=i686-pc
os=-mingw32
@@ -1267,20 +1279,12 @@ case $basic_machine in
basic_machine=xps100-honeywell
;;
xscale-* | xscalee[bl]-*)
- basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+ basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
;;
ymp)
basic_machine=ymp-cray
os=-unicos
;;
- z8k-*-coff)
- basic_machine=z8k-unknown
- os=-sim
- ;;
- z80-*-coff)
- basic_machine=z80-unknown
- os=-sim
- ;;
none)
basic_machine=none-none
os=-none
@@ -1309,10 +1313,6 @@ case $basic_machine in
vax)
basic_machine=vax-dec
;;
- pdp10)
- # there are many clones, so DEC is not a safe bet
- basic_machine=pdp10-unknown
- ;;
pdp11)
basic_machine=pdp11-dec
;;
@@ -1322,9 +1322,6 @@ case $basic_machine in
sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
- sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
- basic_machine=sparc-sun
- ;;
cydra)
basic_machine=cydra-cydrome
;;
@@ -1344,7 +1341,7 @@ case $basic_machine in
# Make sure to match an already-canonicalized machine name.
;;
*)
- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
exit 1
;;
esac
@@ -1352,10 +1349,10 @@ esac
# Here we canonicalize certain aliases for manufacturers.
case $basic_machine in
*-digital*)
- basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+ basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
;;
*-commodore*)
- basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+ basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
;;
*)
;;
@@ -1363,11 +1360,11 @@ esac
# Decode manufacturer-specific aliases for certain operating systems.
-if [ x"$os" != x"" ]
+if [ x$os != x ]
then
case $os in
- # First match some system type aliases
- # that might get confused with valid system types.
+ # First match some system type aliases that might get confused
+ # with valid system types.
# -solaris* is a basic system type, with this one exception.
-auroraux)
os=-auroraux
@@ -1378,18 +1375,19 @@ case $os in
-solaris)
os=-solaris2
;;
- -svr4*)
- os=-sysv4
- ;;
-unixware*)
os=-sysv4.2uw
;;
-gnu/linux*)
os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
;;
- # First accept the basic system types.
+ # es1800 is here to avoid being matched by es* (a different OS)
+ -es1800*)
+ os=-ose
+ ;;
+ # Now accept the basic system types.
# The portable systems comes first.
- # Each alternative MUST END IN A *, to match a version number.
+ # Each alternative MUST end in a * to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
@@ -1399,25 +1397,26 @@ case $os in
| -aos* | -aros* | -cloudabi* | -sortix* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+ | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
| -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \
| -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ | -morphos* | -superux* | -rtmk* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
- | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
+ | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
+ | -midnightbsd*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1434,12 +1433,12 @@ case $os in
-nto*)
os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
- -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
- | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+ -sim | -xray | -os68k* | -v88r* \
+ | -windows* | -osx | -abug | -netware* | -os9* \
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
;;
-mac*)
- os=`echo $os | sed -e 's|mac|macos|'`
+ os=`echo "$os" | sed -e 's|mac|macos|'`
;;
-linux-dietlibc)
os=-linux-dietlibc
@@ -1448,10 +1447,10 @@ case $os in
os=`echo $os | sed -e 's|linux|linux-gnu|'`
;;
-sunos5*)
- os=`echo $os | sed -e 's|sunos5|solaris2|'`
+ os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
;;
-sunos6*)
- os=`echo $os | sed -e 's|sunos6|solaris3|'`
+ os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
;;
-opened*)
os=-openedition
@@ -1462,12 +1461,6 @@ case $os in
-wince*)
os=-wince
;;
- -osfrose*)
- os=-osfrose
- ;;
- -osf*)
- os=-osf
- ;;
-utek*)
os=-bsd
;;
@@ -1492,7 +1485,7 @@ case $os in
-nova*)
os=-rtmk-nova
;;
- -ns2 )
+ -ns2)
os=-nextstep2
;;
-nsk*)
@@ -1514,7 +1507,7 @@ case $os in
-oss*)
os=-sysv3
;;
- -svr4)
+ -svr4*)
os=-sysv4
;;
-svr3)
@@ -1529,34 +1522,44 @@ case $os in
-ose*)
os=-ose
;;
- -es1800*)
- os=-ose
- ;;
- -xenix)
- os=-xenix
- ;;
-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
os=-mint
;;
- -aros*)
- os=-aros
- ;;
-zvmoe)
os=-zvmoe
;;
-dicos*)
os=-dicos
;;
+ -pikeos*)
+ # Until real need of OS specific support for
+ # particular features comes up, bare metal
+ # configurations are quite functional.
+ case $basic_machine in
+ arm*)
+ os=-eabi
+ ;;
+ *)
+ os=-elf
+ ;;
+ esac
+ ;;
-nacl*)
;;
-ios)
;;
-none)
;;
+ -*-eabi)
+ case $basic_machine in
+ arm*)
+ ;;
+ esac
+ ;;
*)
# Get rid of the `-' at the beginning of $os.
os=`echo $os | sed 's/[^-]*-//'`
- echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+ echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
exit 1
;;
esac
@@ -1652,9 +1655,6 @@ case $basic_machine in
*-be)
os=-beos
;;
- *-haiku)
- os=-haiku
- ;;
*-ibm)
os=-aix
;;
@@ -1694,7 +1694,7 @@ case $basic_machine in
m88k-omron*)
os=-luna
;;
- *-next )
+ *-next)
os=-nextstep
;;
*-sequent)
@@ -1709,9 +1709,6 @@ case $basic_machine in
i370-*)
os=-mvs
;;
- *-next)
- os=-nextstep3
- ;;
*-gould)
os=-sysv
;;
@@ -1821,15 +1818,15 @@ case $basic_machine in
vendor=stratus
;;
esac
- basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+ basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
;;
esac
-echo $basic_machine$os
+echo "$basic_machine$os"
exit
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
diff --git a/configure b/configure
index 830de636..21fa6402 100755
--- a/configure
+++ b/configure
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for fontconfig 2.13.0.
+# Generated by GNU Autoconf 2.69 for fontconfig 2.13.1.
#
-# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig>.
+# Report bugs to <https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/new>.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -275,7 +275,7 @@ fi
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
$as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig
+$0: https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/new
$0: about your system, including any error possibly output
$0: before this message. Then install a modern shell, or
$0: manually run the script under such a shell if you do
@@ -591,9 +591,9 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='fontconfig'
PACKAGE_TARNAME='fontconfig'
-PACKAGE_VERSION='2.13.0'
-PACKAGE_STRING='fontconfig 2.13.0'
-PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig'
+PACKAGE_VERSION='2.13.1'
+PACKAGE_STRING='fontconfig 2.13.1'
+PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/new'
PACKAGE_URL=''
# Factoring default headers for most tests.
@@ -663,6 +663,10 @@ FC_FONTPATH
FC_ADD_FONTS
FC_DEFAULT_FONTS
PREFERRED_HINTING
+ENABLE_JSONC_FALSE
+ENABLE_JSONC_TRUE
+JSONC_LIBS
+JSONC_CFLAGS
LIBXML2_LIBS
LIBXML2_CFLAGS
PKG_EXPAT_LIBS
@@ -758,7 +762,6 @@ am__nodep
AMDEPBACKSLASH
AMDEP_FALSE
AMDEP_TRUE
-am__quote
am__include
DEPDIR
OBJEXT
@@ -832,7 +835,8 @@ PACKAGE_VERSION
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL'
+SHELL
+am__quote'
ac_subst_files=''
ac_user_opts='
enable_option_checking
@@ -892,7 +896,9 @@ UUID_LIBS
EXPAT_CFLAGS
EXPAT_LIBS
LIBXML2_CFLAGS
-LIBXML2_LIBS'
+LIBXML2_LIBS
+JSONC_CFLAGS
+JSONC_LIBS'
# Initialize some variables set by options.
@@ -1433,7 +1439,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures fontconfig 2.13.0 to adapt to many kinds of systems.
+\`configure' configures fontconfig 2.13.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1503,7 +1509,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of fontconfig 2.13.0:";;
+ short | recursive ) echo "Configuration of fontconfig 2.13.1:";;
esac
cat <<\_ACEOF
@@ -1606,11 +1612,14 @@ Some influential environment variables:
C compiler flags for LIBXML2, overriding pkg-config
LIBXML2_LIBS
linker flags for LIBXML2, overriding pkg-config
+ JSONC_CFLAGS
+ C compiler flags for JSONC, overriding pkg-config
+ JSONC_LIBS linker flags for JSONC, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig>.
+Report bugs to <https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/new>.
_ACEOF
ac_status=$?
fi
@@ -1673,7 +1682,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-fontconfig configure 2.13.0
+fontconfig configure 2.13.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1832,9 +1841,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ---------------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig ##
-## ---------------------------------------------------------------------------- ##"
+( $as_echo "## ------------------------------------------------------------------------------ ##
+## Report this to https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/new ##
+## ------------------------------------------------------------------------------ ##"
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -2382,7 +2391,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by fontconfig $as_me 2.13.0, which was
+It was created by fontconfig $as_me 2.13.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2734,7 +2743,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-am__api_version='1.15'
+am__api_version='1.16'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -3249,7 +3258,7 @@ fi
# Define the identity of the package.
PACKAGE='fontconfig'
- VERSION='2.13.0'
+ VERSION='2.13.1'
cat >>confdefs.h <<_ACEOF
@@ -3279,8 +3288,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
# We need awk for the "check" target (and possibly the TAP driver). The
@@ -3331,7 +3340,7 @@ END
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -4238,45 +4247,45 @@ DEPDIR="${am__leading_dot}deps"
ac_config_commands="$ac_config_commands depfiles"
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
+cat > confinc.mk << 'END'
am__doit:
- @echo this is the am__doit target
+ @echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+ { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
+ (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ case $?:`cat confinc.out 2>/dev/null` in #(
+ '0:this is the am__doit target') :
+ case $s in #(
+ BSD) :
+ am__include='.include' am__quote='"' ;; #(
+ *) :
+ am__include='include' am__quote='' ;;
+esac ;; #(
+ *) :
;;
- esac
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
+esac
+ if test "$am__include" != "#"; then
+ _am_result="yes ($s style)"
+ break
+ fi
+done
+rm -f confinc.* confmf.*
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+$as_echo "${_am_result}" >&6; }
# Check whether --enable-dependency-tracking was given.
if test "${enable_dependency_tracking+set}" = set; then :
@@ -13276,11 +13285,11 @@ CC=$lt_save_CC
-LIBT_CURRENT=12
-LIBT_REVISION=1
+LIBT_CURRENT=13
+LIBT_REVISION=0
-LIBT_AGE=11
+LIBT_AGE=12
LIBT_VERSION_INFO="$LIBT_CURRENT:$LIBT_REVISION:$LIBT_AGE"
@@ -16704,7 +16713,7 @@ $as_echo "#define HAVE_MMAP 1" >>confdefs.h
fi
rm -f conftest.mmap conftest.txt
-for ac_func in link mkstemp mkostemp _mktemp_s mkdtemp getopt getopt_long getprogname getexecname rand random lrand48 random_r rand_r readlink fstatvfs fstatfs lstat
+for ac_func in link mkstemp mkostemp _mktemp_s mkdtemp getopt getopt_long getprogname getexecname rand random lrand48 random_r rand_r readlink fstatvfs fstatfs lstat strerror strerror_r
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -17188,6 +17197,10 @@ CFLAGS="$fontconfig_save_cflags"
# Check for uuid
#
if test "$os_win32" != "yes"; then
+ use_pkgconfig_for_uuid=yes
+ if test -n "${UUID_LIBS}"; then
+ save_UUID_LIBS=$UUID_LIBS
+ fi
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UUID" >&5
@@ -17247,39 +17260,50 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$UUID_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (uuid) were not met:
-
-$UUID_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables UUID_CFLAGS
-and UUID_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
+ use_pkgconfig_for_uuid=no
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables UUID_CFLAGS
-and UUID_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+ use_pkgconfig_for_uuid=no
else
UUID_CFLAGS=$pkg_cv_UUID_CFLAGS
UUID_LIBS=$pkg_cv_UUID_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
+ use_pkgconfig_for_uuid=yes
+fi
+ if test "x$use_pkgconfig_for_uuid" = "xno"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking where uuid functions comes from" >&5
+$as_echo_n "checking where uuid functions comes from... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <uuid/uuid.h>
+int
+main ()
+{
+uuid_t a; uuid_generate(a);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: builtin" >&5
+$as_echo "builtin" >&6; }
+ UUID_CFLAGS=""
+ UUID_LIBS=""
+else
+ as_fn_error $? "
+*** uuid is required. install util-linux.
+ " "$LINENO" 5
fi
- PKGCONFIG_REQUIRES_PRIVATELY="$PKGCONFIG_REQUIRES_PRIVATELY uuid"
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ else
+ if test -z "${save_UUID_LIBS+x}" && test "x${UUID_LIBS}" != "x"; then
+ PKGCONFIG_REQUIRES_PRIVATELY="$PKGCONFIG_REQUIRES_PRIVATELY uuid"
+ fi
+ fi
else
UUID_CFLAGS=""
UUID_LIBS=""
@@ -17606,6 +17630,92 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
#
+# Check json-c
+#
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JSONC" >&5
+$as_echo_n "checking for JSONC... " >&6; }
+
+if test -n "$JSONC_CFLAGS"; then
+ pkg_cv_JSONC_CFLAGS="$JSONC_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-c\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "json-c") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_JSONC_CFLAGS=`$PKG_CONFIG --cflags "json-c" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$JSONC_LIBS"; then
+ pkg_cv_JSONC_LIBS="$JSONC_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-c\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "json-c") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_JSONC_LIBS=`$PKG_CONFIG --libs "json-c" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ JSONC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "json-c" 2>&1`
+ else
+ JSONC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "json-c" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$JSONC_PKG_ERRORS" >&5
+
+ use_jsonc=no
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ use_jsonc=no
+else
+ JSONC_CFLAGS=$pkg_cv_JSONC_CFLAGS
+ JSONC_LIBS=$pkg_cv_JSONC_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ use_jsonc=yes
+fi
+
+ if test "x$use_jsonc" = "xyes"; then
+ ENABLE_JSONC_TRUE=
+ ENABLE_JSONC_FALSE='#'
+else
+ ENABLE_JSONC_TRUE='#'
+ ENABLE_JSONC_FALSE=
+fi
+
+
+
+
+#
# Set default hinting
#
@@ -19055,6 +19165,10 @@ if test -z "${FREETYPE_PCF_LONG_FAMILY_NAMES_TRUE}" && test -z "${FREETYPE_PCF_L
as_fn_error $? "conditional \"FREETYPE_PCF_LONG_FAMILY_NAMES\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${ENABLE_JSONC_TRUE}" && test -z "${ENABLE_JSONC_FALSE}"; then
+ as_fn_error $? "conditional \"ENABLE_JSONC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${HAVE_PTHREAD_TRUE}" && test -z "${HAVE_PTHREAD_FALSE}"; then
as_fn_error $? "conditional \"HAVE_PTHREAD\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -19465,7 +19579,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by fontconfig $as_me 2.13.0, which was
+This file was extended by fontconfig $as_me 2.13.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19525,13 +19639,13 @@ $config_headers
Configuration commands:
$config_commands
-Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig>."
+Report bugs to <https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/new>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-fontconfig config.status 2.13.0
+fontconfig config.status 2.13.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -19650,7 +19764,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
#
# INIT-COMMANDS
#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
# The HP-UX ksh and POSIX shell print the target directory to stdout
@@ -20598,29 +20712,35 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
+ # TODO: see whether this extra hack can be removed once we start
+ # requiring Autoconf 2.70 or later.
+ case $CONFIG_FILES in #(
+ *\'*) :
+ eval set x "$CONFIG_FILES" ;; #(
+ *) :
+ set x $CONFIG_FILES ;; #(
+ *) :
+ ;;
+esac
shift
- for mf
+ # Used to flag and report bootstrapping failures.
+ am_rc=0
+ for am_mf
do
# Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
+ am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile which includes
+ # dependency-tracking related rules and includes.
+ # Grep'ing the whole file directly is not great: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
- X"$mf" : 'X\(//\)$' \| \
- X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+ || continue
+ am_dirpart=`$as_dirname -- "$am_mf" ||
+$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$am_mf" : 'X\(//\)[^/]' \| \
+ X"$am_mf" : 'X\(//\)$' \| \
+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$am_mf" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -20638,53 +20758,48 @@ $as_echo X"$mf" |
q
}
s/.*/./; q'`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$file" : 'X\(//\)[^/]' \| \
- X"$file" : 'X\(//\)$' \| \
- X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
+ am_filepart=`$as_basename -- "$am_mf" ||
+$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$am_mf" : 'X\(//\)$' \| \
+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$am_mf" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
}
- /^X\(\/\/\)$/{
+ /^X\/\(\/\/\)$/{
s//\1/
q
}
- /^X\(\/\).*/{
+ /^X\/\(\/\).*/{
s//\1/
q
}
s/.*/./; q'`
- as_dir=$dirpart/$fdir; as_fn_mkdir_p
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
+ { echo "$as_me:$LINENO: cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles" >&5
+ (cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } || am_rc=$?
done
+ if test $am_rc -ne 0; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "Something went wrong bootstrapping makefile fragments
+ for automatic dependency tracking. Try re-running configure with the
+ '--disable-dependency-tracking' option to at least be able to build
+ the package (albeit without support for automatic dependency tracking).
+See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ { am_dirpart=; unset am_dirpart;}
+ { am_filepart=; unset am_filepart;}
+ { am_mf=; unset am_mf;}
+ { am_rc=; unset am_rc;}
+ rm -f conftest-deps.mk
}
;;
"libtool":C)
diff --git a/configure.ac b/configure.ac
index 85f113fe..fb8af467 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ dnl This is the package version number, not the shared library
dnl version. This same version number must appear in fontconfig/fontconfig.h
dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's
dnl not possible to extract the version number here from fontconfig.h
-AC_INIT([fontconfig], [2.13.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig])
+AC_INIT([fontconfig], [2.13.1], [https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/new])
AM_INIT_AUTOMAKE([1.11 parallel-tests dist-bzip2])
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
@@ -72,11 +72,11 @@ dnl libtool versioning
dnl bump revision when fixing bugs
dnl bump current and age, reset revision to zero when adding APIs
dnl bump current, leave age, reset revision to zero when changing/removing APIS
-LIBT_CURRENT=12
-LIBT_REVISION=1
+LIBT_CURRENT=13
+LIBT_REVISION=0
AC_SUBST(LIBT_CURRENT)
AC_SUBST(LIBT_REVISION)
-LIBT_AGE=11
+LIBT_AGE=12
LIBT_VERSION_INFO="$LIBT_CURRENT:$LIBT_REVISION:$LIBT_AGE"
AC_SUBST(LIBT_VERSION_INFO)
@@ -169,7 +169,7 @@ AC_TYPE_PID_T
# Checks for library functions.
AC_FUNC_VPRINTF
AC_FUNC_MMAP
-AC_CHECK_FUNCS([link mkstemp mkostemp _mktemp_s mkdtemp getopt getopt_long getprogname getexecname rand random lrand48 random_r rand_r readlink fstatvfs fstatfs lstat])
+AC_CHECK_FUNCS([link mkstemp mkostemp _mktemp_s mkdtemp getopt getopt_long getprogname getexecname rand random lrand48 random_r rand_r readlink fstatvfs fstatfs lstat strerror strerror_r])
dnl AC_CHECK_FUNCS doesn't check for header files.
dnl posix_fadvise() may be not available in older libc.
@@ -336,8 +336,28 @@ CFLAGS="$fontconfig_save_cflags"
# Check for uuid
#
if test "$os_win32" != "yes"; then
- PKG_CHECK_MODULES([UUID], [uuid])
- PKGCONFIG_REQUIRES_PRIVATELY="$PKGCONFIG_REQUIRES_PRIVATELY uuid"
+ use_pkgconfig_for_uuid=yes
+ if test -n "${UUID_LIBS}"; then
+ save_UUID_LIBS=$UUID_LIBS
+ fi
+ PKG_CHECK_MODULES([UUID], [uuid],
+ [use_pkgconfig_for_uuid=yes],
+ [use_pkgconfig_for_uuid=no])
+ if test "x$use_pkgconfig_for_uuid" = "xno"; then
+ AC_MSG_CHECKING([where uuid functions comes from])
+ AC_TRY_LINK([#include <uuid/uuid.h>],
+ [uuid_t a; uuid_generate(a);],
+ [AC_MSG_RESULT([builtin])
+ UUID_CFLAGS=""
+ UUID_LIBS=""
+ ],[AC_MSG_ERROR([
+*** uuid is required. install util-linux.
+ ])])
+ else
+ if test -z "${save_UUID_LIBS+x}" && test "x${UUID_LIBS}" != "x"; then
+ PKGCONFIG_REQUIRES_PRIVATELY="$PKGCONFIG_REQUIRES_PRIVATELY uuid"
+ fi
+ fi
else
UUID_CFLAGS=""
UUID_LIBS=""
@@ -454,6 +474,15 @@ if test "$enable_libxml2" = "yes"; then
fi
#
+# Check json-c
+#
+PKG_CHECK_MODULES([JSONC], [json-c], [use_jsonc=yes], [use_jsonc=no])
+
+AM_CONDITIONAL(ENABLE_JSONC, test "x$use_jsonc" = "xyes")
+AC_SUBST(JSONC_CFLAGS)
+AC_SUBST(JSONC_LIBS)
+
+#
# Set default hinting
#
diff --git a/depcomp b/depcomp
index b39f98f9..65cbf709 100755
--- a/depcomp
+++ b/depcomp
@@ -1,9 +1,9 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2016-01-11.22; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@ scriptversion=2016-01-11.22; # UTC
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -783,7 +783,7 @@ exit 0
# Local Variables:
# mode: shell-script
# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC0"
diff --git a/doc/FcAtomicCreate.3 b/doc/FcAtomicCreate.3
index 29217729..87d56c28 100644
--- a/doc/FcAtomicCreate.3
+++ b/doc/FcAtomicCreate.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcAtomicCreate" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcAtomicCreate" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcAtomicCreate \- create an FcAtomic object
.SH SYNOPSIS
diff --git a/doc/FcAtomicDeleteNew.3 b/doc/FcAtomicDeleteNew.3
index df56cd68..d5df8890 100644
--- a/doc/FcAtomicDeleteNew.3
+++ b/doc/FcAtomicDeleteNew.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcAtomicDeleteNew" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcAtomicDeleteNew" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcAtomicDeleteNew \- delete new file
.SH SYNOPSIS
diff --git a/doc/FcAtomicDestroy.3 b/doc/FcAtomicDestroy.3
index 1dea61e8..a3f30cc7 100644
--- a/doc/FcAtomicDestroy.3
+++ b/doc/FcAtomicDestroy.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcAtomicDestroy" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcAtomicDestroy" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcAtomicDestroy \- destroy an FcAtomic object
.SH SYNOPSIS
diff --git a/doc/FcAtomicLock.3 b/doc/FcAtomicLock.3
index eca2fffe..192a735c 100644
--- a/doc/FcAtomicLock.3
+++ b/doc/FcAtomicLock.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcAtomicLock" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcAtomicLock" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcAtomicLock \- lock a file
.SH SYNOPSIS
diff --git a/doc/FcAtomicNewFile.3 b/doc/FcAtomicNewFile.3
index 35c58d50..1ae05896 100644
--- a/doc/FcAtomicNewFile.3
+++ b/doc/FcAtomicNewFile.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcAtomicNewFile" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcAtomicNewFile" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcAtomicNewFile \- return new temporary file name
.SH SYNOPSIS
diff --git a/doc/FcAtomicOrigFile.3 b/doc/FcAtomicOrigFile.3
index fb1589dc..d902385c 100644
--- a/doc/FcAtomicOrigFile.3
+++ b/doc/FcAtomicOrigFile.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcAtomicOrigFile" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcAtomicOrigFile" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcAtomicOrigFile \- return original file name
.SH SYNOPSIS
diff --git a/doc/FcAtomicReplaceOrig.3 b/doc/FcAtomicReplaceOrig.3
index e7692a35..c5f8899a 100644
--- a/doc/FcAtomicReplaceOrig.3
+++ b/doc/FcAtomicReplaceOrig.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcAtomicReplaceOrig" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcAtomicReplaceOrig" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcAtomicReplaceOrig \- replace original with new
.SH SYNOPSIS
diff --git a/doc/FcAtomicUnlock.3 b/doc/FcAtomicUnlock.3
index 961688aa..e08f78f5 100644
--- a/doc/FcAtomicUnlock.3
+++ b/doc/FcAtomicUnlock.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcAtomicUnlock" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcAtomicUnlock" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcAtomicUnlock \- unlock a file
.SH SYNOPSIS
diff --git a/doc/FcBlanksAdd.3 b/doc/FcBlanksAdd.3
index 057712f6..bc5e0cb2 100644
--- a/doc/FcBlanksAdd.3
+++ b/doc/FcBlanksAdd.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcBlanksAdd" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcBlanksAdd" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcBlanksAdd \- Add a character to an FcBlanks
.SH SYNOPSIS
diff --git a/doc/FcBlanksCreate.3 b/doc/FcBlanksCreate.3
index 33eb2c56..328b023b 100644
--- a/doc/FcBlanksCreate.3
+++ b/doc/FcBlanksCreate.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcBlanksCreate" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcBlanksCreate" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcBlanksCreate \- Create an FcBlanks
.SH SYNOPSIS
diff --git a/doc/FcBlanksDestroy.3 b/doc/FcBlanksDestroy.3
index 45e9c304..e2a5e18b 100644
--- a/doc/FcBlanksDestroy.3
+++ b/doc/FcBlanksDestroy.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcBlanksDestroy" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcBlanksDestroy" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcBlanksDestroy \- Destroy and FcBlanks
.SH SYNOPSIS
diff --git a/doc/FcBlanksIsMember.3 b/doc/FcBlanksIsMember.3
index 59abcc0e..e735a789 100644
--- a/doc/FcBlanksIsMember.3
+++ b/doc/FcBlanksIsMember.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcBlanksIsMember" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcBlanksIsMember" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcBlanksIsMember \- Query membership in an FcBlanks
.SH SYNOPSIS
diff --git a/doc/FcCacheCopySet.3 b/doc/FcCacheCopySet.3
index d571009d..2a754f5c 100644
--- a/doc/FcCacheCopySet.3
+++ b/doc/FcCacheCopySet.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcCacheCopySet" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcCacheCopySet" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcCacheCopySet \- Returns a copy of the fontset from cache
.SH SYNOPSIS
diff --git a/doc/FcCacheCreateTagFile.3 b/doc/FcCacheCreateTagFile.3
index 8c4a36ee..cce2ebc3 100644
--- a/doc/FcCacheCreateTagFile.3
+++ b/doc/FcCacheCreateTagFile.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcCacheCreateTagFile" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcCacheCreateTagFile" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcCacheCreateTagFile \- Create CACHEDIR.TAG at cache directory.
.SH SYNOPSIS
diff --git a/doc/FcCacheDir.3 b/doc/FcCacheDir.3
index d7690465..a720e272 100644
--- a/doc/FcCacheDir.3
+++ b/doc/FcCacheDir.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcCacheDir" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcCacheDir" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcCacheDir \- Return directory of cache
.SH SYNOPSIS
diff --git a/doc/FcCacheNumFont.3 b/doc/FcCacheNumFont.3
index 76c0a2f7..1c0698e7 100644
--- a/doc/FcCacheNumFont.3
+++ b/doc/FcCacheNumFont.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcCacheNumFont" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcCacheNumFont" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcCacheNumFont \- Returns the number of fonts in cache.
.SH SYNOPSIS
diff --git a/doc/FcCacheNumSubdir.3 b/doc/FcCacheNumSubdir.3
index a5843ec3..5ec1888a 100644
--- a/doc/FcCacheNumSubdir.3
+++ b/doc/FcCacheNumSubdir.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcCacheNumSubdir" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcCacheNumSubdir" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcCacheNumSubdir \- Return the number of subdirectories in cache.
.SH SYNOPSIS
diff --git a/doc/FcCacheSubdir.3 b/doc/FcCacheSubdir.3
index 4580a928..b51c0a10 100644
--- a/doc/FcCacheSubdir.3
+++ b/doc/FcCacheSubdir.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcCacheSubdir" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcCacheSubdir" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcCacheSubdir \- Return the i'th subdirectory.
.SH SYNOPSIS
diff --git a/doc/FcCharSetAddChar.3 b/doc/FcCharSetAddChar.3
index 241be63b..fbae1b2f 100644
--- a/doc/FcCharSetAddChar.3
+++ b/doc/FcCharSetAddChar.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcCharSetAddChar" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcCharSetAddChar" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcCharSetAddChar \- Add a character to a charset
.SH SYNOPSIS
diff --git a/doc/FcCharSetCopy.3 b/doc/FcCharSetCopy.3
index 097a253f..91ddbbe0 100644
--- a/doc/FcCharSetCopy.3
+++ b/doc/FcCharSetCopy.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcCharSetCopy" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcCharSetCopy" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcCharSetCopy \- Copy a charset
.SH SYNOPSIS
diff --git a/doc/FcCharSetCount.3 b/doc/FcCharSetCount.3
index f82901f7..a0c63b80 100644
--- a/doc/FcCharSetCount.3
+++ b/doc/FcCharSetCount.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcCharSetCount" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcCharSetCount" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcCharSetCount \- Count entries in a charset
.SH SYNOPSIS
diff --git a/doc/FcCharSetCoverage.3 b/doc/FcCharSetCoverage.3
index 3ff0d9ba..1a319022 100644
--- a/doc/FcCharSetCoverage.3
+++ b/doc/FcCharSetCoverage.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcCharSetCoverage" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcCharSetCoverage" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcCharSetCoverage \- DEPRECATED return coverage for a Unicode page
.SH SYNOPSIS
diff --git a/doc/FcCharSetCreate.3 b/doc/FcCharSetCreate.3
index 1897930f..69933b72 100644
--- a/doc/FcCharSetCreate.3
+++ b/doc/FcCharSetCreate.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcCharSetCreate" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcCharSetCreate" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcCharSetCreate \- Create an empty character set
.SH SYNOPSIS
diff --git a/doc/FcCharSetDelChar.3 b/doc/FcCharSetDelChar.3
index b2850b82..b2de6496 100644
--- a/doc/FcCharSetDelChar.3
+++ b/doc/FcCharSetDelChar.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcCharSetDelChar" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcCharSetDelChar" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcCharSetDelChar \- Add a character to a charset
.SH SYNOPSIS
diff --git a/doc/FcCharSetDestroy.3 b/doc/FcCharSetDestroy.3
index e074f8d6..295357c3 100644
--- a/doc/FcCharSetDestroy.3
+++ b/doc/FcCharSetDestroy.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcCharSetDestroy" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcCharSetDestroy" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcCharSetDestroy \- Destroy a character set
.SH SYNOPSIS
diff --git a/doc/FcCharSetEqual.3 b/doc/FcCharSetEqual.3
index 637795fb..d5ff9a86 100644
--- a/doc/FcCharSetEqual.3
+++ b/doc/FcCharSetEqual.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcCharSetEqual" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcCharSetEqual" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcCharSetEqual \- Compare two charsets
.SH SYNOPSIS
diff --git a/doc/FcCharSetFirstPage.3 b/doc/FcCharSetFirstPage.3
index 5b5bbd80..5f126c4b 100644
--- a/doc/FcCharSetFirstPage.3
+++ b/doc/FcCharSetFirstPage.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcCharSetFirstPage" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcCharSetFirstPage" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcCharSetFirstPage \- Start enumerating charset contents
.SH SYNOPSIS
diff --git a/doc/FcCharSetHasChar.3 b/doc/FcCharSetHasChar.3
index 6679e7c9..47c2129a 100644
--- a/doc/FcCharSetHasChar.3
+++ b/doc/FcCharSetHasChar.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcCharSetHasChar" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcCharSetHasChar" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcCharSetHasChar \- Check a charset for a char
.SH SYNOPSIS
diff --git a/doc/FcCharSetIntersect.3 b/doc/FcCharSetIntersect.3
index 5ed5c8ae..557a2b72 100644
--- a/doc/FcCharSetIntersect.3
+++ b/doc/FcCharSetIntersect.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcCharSetIntersect" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcCharSetIntersect" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcCharSetIntersect \- Intersect charsets
.SH SYNOPSIS
diff --git a/doc/FcCharSetIntersectCount.3 b/doc/FcCharSetIntersectCount.3
index d08068c8..038589bc 100644
--- a/doc/FcCharSetIntersectCount.3
+++ b/doc/FcCharSetIntersectCount.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcCharSetIntersectCount" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcCharSetIntersectCount" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcCharSetIntersectCount \- Intersect and count charsets
.SH SYNOPSIS
diff --git a/doc/FcCharSetIsSubset.3 b/doc/FcCharSetIsSubset.3
index 90d7e53f..c80bc0ab 100644
--- a/doc/FcCharSetIsSubset.3
+++ b/doc/FcCharSetIsSubset.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcCharSetIsSubset" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcCharSetIsSubset" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcCharSetIsSubset \- Test for charset inclusion
.SH SYNOPSIS
diff --git a/doc/FcCharSetMerge.3 b/doc/FcCharSetMerge.3
index 3c843017..0c85401b 100644
--- a/doc/FcCharSetMerge.3
+++ b/doc/FcCharSetMerge.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcCharSetMerge" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcCharSetMerge" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcCharSetMerge \- Merge charsets
.SH SYNOPSIS
diff --git a/doc/FcCharSetNew.3 b/doc/FcCharSetNew.3
index 687dd2f9..3988181d 100644
--- a/doc/FcCharSetNew.3
+++ b/doc/FcCharSetNew.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcCharSetNew" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcCharSetNew" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcCharSetNew \- DEPRECATED alias for FcCharSetCreate
.SH SYNOPSIS
diff --git a/doc/FcCharSetNextPage.3 b/doc/FcCharSetNextPage.3
index ac5008b4..229ee8c5 100644
--- a/doc/FcCharSetNextPage.3
+++ b/doc/FcCharSetNextPage.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcCharSetNextPage" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcCharSetNextPage" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcCharSetNextPage \- Continue enumerating charset contents
.SH SYNOPSIS
diff --git a/doc/FcCharSetSubtract.3 b/doc/FcCharSetSubtract.3
index 0bf85c1e..7537beef 100644
--- a/doc/FcCharSetSubtract.3
+++ b/doc/FcCharSetSubtract.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcCharSetSubtract" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcCharSetSubtract" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcCharSetSubtract \- Subtract charsets
.SH SYNOPSIS
diff --git a/doc/FcCharSetSubtractCount.3 b/doc/FcCharSetSubtractCount.3
index 09bb9fc6..fbc2f299 100644
--- a/doc/FcCharSetSubtractCount.3
+++ b/doc/FcCharSetSubtractCount.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcCharSetSubtractCount" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcCharSetSubtractCount" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcCharSetSubtractCount \- Subtract and count charsets
.SH SYNOPSIS
diff --git a/doc/FcCharSetUnion.3 b/doc/FcCharSetUnion.3
index 1b80ecdb..f7379bd2 100644
--- a/doc/FcCharSetUnion.3
+++ b/doc/FcCharSetUnion.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcCharSetUnion" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcCharSetUnion" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcCharSetUnion \- Add charsets
.SH SYNOPSIS
diff --git a/doc/FcConfigAppFontAddDir.3 b/doc/FcConfigAppFontAddDir.3
index af8a9d00..ba6c3c72 100644
--- a/doc/FcConfigAppFontAddDir.3
+++ b/doc/FcConfigAppFontAddDir.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcConfigAppFontAddDir" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcConfigAppFontAddDir" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcConfigAppFontAddDir \- Add fonts from directory to font database
.SH SYNOPSIS
diff --git a/doc/FcConfigAppFontAddFile.3 b/doc/FcConfigAppFontAddFile.3
index 54333b47..99db1c3a 100644
--- a/doc/FcConfigAppFontAddFile.3
+++ b/doc/FcConfigAppFontAddFile.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcConfigAppFontAddFile" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcConfigAppFontAddFile" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcConfigAppFontAddFile \- Add font file to font database
.SH SYNOPSIS
diff --git a/doc/FcConfigAppFontClear.3 b/doc/FcConfigAppFontClear.3
index 64f71aa5..1675dddb 100644
--- a/doc/FcConfigAppFontClear.3
+++ b/doc/FcConfigAppFontClear.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcConfigAppFontClear" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcConfigAppFontClear" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcConfigAppFontClear \- Remove all app fonts from font database
.SH SYNOPSIS
diff --git a/doc/FcConfigBuildFonts.3 b/doc/FcConfigBuildFonts.3
index 785da510..0fb537da 100644
--- a/doc/FcConfigBuildFonts.3
+++ b/doc/FcConfigBuildFonts.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcConfigBuildFonts" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcConfigBuildFonts" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcConfigBuildFonts \- Build font database
.SH SYNOPSIS
diff --git a/doc/FcConfigCreate.3 b/doc/FcConfigCreate.3
index 8988b686..1f887036 100644
--- a/doc/FcConfigCreate.3
+++ b/doc/FcConfigCreate.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcConfigCreate" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcConfigCreate" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcConfigCreate \- Create a configuration
.SH SYNOPSIS
diff --git a/doc/FcConfigDestroy.3 b/doc/FcConfigDestroy.3
index 71a65d75..2a484ebc 100644
--- a/doc/FcConfigDestroy.3
+++ b/doc/FcConfigDestroy.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcConfigDestroy" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcConfigDestroy" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcConfigDestroy \- Destroy a configuration
.SH SYNOPSIS
diff --git a/doc/FcConfigEnableHome.3 b/doc/FcConfigEnableHome.3
index 6a21e157..f1a8896a 100644
--- a/doc/FcConfigEnableHome.3
+++ b/doc/FcConfigEnableHome.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcConfigEnableHome" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcConfigEnableHome" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcConfigEnableHome \- controls use of the home directory.
.SH SYNOPSIS
diff --git a/doc/FcConfigFileInfoIterGet.3 b/doc/FcConfigFileInfoIterGet.3
index b930aa8b..0af674e1 100644
--- a/doc/FcConfigFileInfoIterGet.3
+++ b/doc/FcConfigFileInfoIterGet.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcConfigFileInfoIterGet" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcConfigFileInfoIterGet" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcConfigFileInfoIterGet \- Obtain the configuration file information
.SH SYNOPSIS
diff --git a/doc/FcConfigFileInfoIterInit.3 b/doc/FcConfigFileInfoIterInit.3
index 59cea5c1..819fae2b 100644
--- a/doc/FcConfigFileInfoIterInit.3
+++ b/doc/FcConfigFileInfoIterInit.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcConfigFileInfoIterInit" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcConfigFileInfoIterInit" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcConfigFileInfoIterInit \- Initialize the iterator
.SH SYNOPSIS
diff --git a/doc/FcConfigFileInfoIterNext.3 b/doc/FcConfigFileInfoIterNext.3
index 5908aa98..004dfd98 100644
--- a/doc/FcConfigFileInfoIterNext.3
+++ b/doc/FcConfigFileInfoIterNext.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcConfigFileInfoIterNext" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcConfigFileInfoIterNext" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcConfigFileInfoIterNext \- Set the iterator to point to the next list
.SH SYNOPSIS
diff --git a/doc/FcConfigFilename.3 b/doc/FcConfigFilename.3
index 35318a5c..771a48a5 100644
--- a/doc/FcConfigFilename.3
+++ b/doc/FcConfigFilename.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcConfigFilename" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcConfigFilename" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcConfigFilename \- Find a config file
.SH SYNOPSIS
diff --git a/doc/FcConfigGetBlanks.3 b/doc/FcConfigGetBlanks.3
index dbd48f27..fd056732 100644
--- a/doc/FcConfigGetBlanks.3
+++ b/doc/FcConfigGetBlanks.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcConfigGetBlanks" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcConfigGetBlanks" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcConfigGetBlanks \- Get config blanks
.SH SYNOPSIS
diff --git a/doc/FcConfigGetCache.3 b/doc/FcConfigGetCache.3
index 504c928c..73cdba3e 100644
--- a/doc/FcConfigGetCache.3
+++ b/doc/FcConfigGetCache.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcConfigGetCache" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcConfigGetCache" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcConfigGetCache \- DEPRECATED used to return per-user cache filename
.SH SYNOPSIS
diff --git a/doc/FcConfigGetCacheDirs.3 b/doc/FcConfigGetCacheDirs.3
index 26b3720f..36ba9c62 100644
--- a/doc/FcConfigGetCacheDirs.3
+++ b/doc/FcConfigGetCacheDirs.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcConfigGetCacheDirs" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcConfigGetCacheDirs" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcConfigGetCacheDirs \- return the list of directories searched for cache files
.SH SYNOPSIS
diff --git a/doc/FcConfigGetConfigDirs.3 b/doc/FcConfigGetConfigDirs.3
index 10067433..5ce1e34c 100644
--- a/doc/FcConfigGetConfigDirs.3
+++ b/doc/FcConfigGetConfigDirs.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcConfigGetConfigDirs" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcConfigGetConfigDirs" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcConfigGetConfigDirs \- Get config directories
.SH SYNOPSIS
diff --git a/doc/FcConfigGetConfigFiles.3 b/doc/FcConfigGetConfigFiles.3
index 70f650ef..2ef1ef61 100644
--- a/doc/FcConfigGetConfigFiles.3
+++ b/doc/FcConfigGetConfigFiles.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcConfigGetConfigFiles" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcConfigGetConfigFiles" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcConfigGetConfigFiles \- Get config files
.SH SYNOPSIS
diff --git a/doc/FcConfigGetCurrent.3 b/doc/FcConfigGetCurrent.3
index 76326c96..ce7a7f58 100644
--- a/doc/FcConfigGetCurrent.3
+++ b/doc/FcConfigGetCurrent.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcConfigGetCurrent" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcConfigGetCurrent" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcConfigGetCurrent \- Return current configuration
.SH SYNOPSIS
diff --git a/doc/FcConfigGetFontDirs.3 b/doc/FcConfigGetFontDirs.3
index e5e4336e..648545f3 100644
--- a/doc/FcConfigGetFontDirs.3
+++ b/doc/FcConfigGetFontDirs.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcConfigGetFontDirs" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcConfigGetFontDirs" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcConfigGetFontDirs \- Get font directories
.SH SYNOPSIS
diff --git a/doc/FcConfigGetFonts.3 b/doc/FcConfigGetFonts.3
index aa4c46c6..5017b197 100644
--- a/doc/FcConfigGetFonts.3
+++ b/doc/FcConfigGetFonts.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcConfigGetFonts" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcConfigGetFonts" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcConfigGetFonts \- Get config font set
.SH SYNOPSIS
diff --git a/doc/FcConfigGetRescanInterval.3 b/doc/FcConfigGetRescanInterval.3
index 5a44049f..5ed759fe 100644
--- a/doc/FcConfigGetRescanInterval.3
+++ b/doc/FcConfigGetRescanInterval.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcConfigGetRescanInterval" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcConfigGetRescanInterval" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcConfigGetRescanInterval \- Get config rescan interval
.SH SYNOPSIS
diff --git a/doc/FcConfigGetSysRoot.3 b/doc/FcConfigGetSysRoot.3
index 4fd37329..43de435c 100644
--- a/doc/FcConfigGetSysRoot.3
+++ b/doc/FcConfigGetSysRoot.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcConfigGetSysRoot" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcConfigGetSysRoot" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcConfigGetSysRoot \- Obtain the system root directory
.SH SYNOPSIS
diff --git a/doc/FcConfigHome.3 b/doc/FcConfigHome.3
index 437b73e7..864c88b0 100644
--- a/doc/FcConfigHome.3
+++ b/doc/FcConfigHome.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcConfigHome" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcConfigHome" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcConfigHome \- return the current home directory.
.SH SYNOPSIS
diff --git a/doc/FcConfigParseAndLoad.3 b/doc/FcConfigParseAndLoad.3
index 870b7a0f..2184dbfe 100644
--- a/doc/FcConfigParseAndLoad.3
+++ b/doc/FcConfigParseAndLoad.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcConfigParseAndLoad" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcConfigParseAndLoad" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcConfigParseAndLoad \- load a configuration file
.SH SYNOPSIS
diff --git a/doc/FcConfigParseAndLoadFromMemory.3 b/doc/FcConfigParseAndLoadFromMemory.3
index b131004e..bd7ad443 100644
--- a/doc/FcConfigParseAndLoadFromMemory.3
+++ b/doc/FcConfigParseAndLoadFromMemory.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcConfigParseAndLoadFromMemory" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcConfigParseAndLoadFromMemory" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcConfigParseAndLoadFromMemory \- load a configuration from memory
.SH SYNOPSIS
diff --git a/doc/FcConfigReference.3 b/doc/FcConfigReference.3
index 4b715649..b680f10f 100644
--- a/doc/FcConfigReference.3
+++ b/doc/FcConfigReference.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcConfigReference" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcConfigReference" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcConfigReference \- Increment config reference count
.SH SYNOPSIS
diff --git a/doc/FcConfigSetCurrent.3 b/doc/FcConfigSetCurrent.3
index 5c3cd6ed..e462b524 100644
--- a/doc/FcConfigSetCurrent.3
+++ b/doc/FcConfigSetCurrent.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcConfigSetCurrent" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcConfigSetCurrent" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcConfigSetCurrent \- Set configuration as default
.SH SYNOPSIS
diff --git a/doc/FcConfigSetRescanInterval.3 b/doc/FcConfigSetRescanInterval.3
index deb9b309..1004eb3c 100644
--- a/doc/FcConfigSetRescanInterval.3
+++ b/doc/FcConfigSetRescanInterval.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcConfigSetRescanInterval" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcConfigSetRescanInterval" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcConfigSetRescanInterval \- Set config rescan interval
.SH SYNOPSIS
diff --git a/doc/FcConfigSetSysRoot.3 b/doc/FcConfigSetSysRoot.3
index 5cdedd11..e1e1183e 100644
--- a/doc/FcConfigSetSysRoot.3
+++ b/doc/FcConfigSetSysRoot.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcConfigSetSysRoot" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcConfigSetSysRoot" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcConfigSetSysRoot \- Set the system root directory
.SH SYNOPSIS
diff --git a/doc/FcConfigSubstitute.3 b/doc/FcConfigSubstitute.3
index 937f2014..490bb5c8 100644
--- a/doc/FcConfigSubstitute.3
+++ b/doc/FcConfigSubstitute.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcConfigSubstitute" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcConfigSubstitute" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcConfigSubstitute \- Execute substitutions
.SH SYNOPSIS
diff --git a/doc/FcConfigSubstituteWithPat.3 b/doc/FcConfigSubstituteWithPat.3
index 16e335a7..7f691245 100644
--- a/doc/FcConfigSubstituteWithPat.3
+++ b/doc/FcConfigSubstituteWithPat.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcConfigSubstituteWithPat" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcConfigSubstituteWithPat" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcConfigSubstituteWithPat \- Execute substitutions
.SH SYNOPSIS
diff --git a/doc/FcConfigUptoDate.3 b/doc/FcConfigUptoDate.3
index 07ddfd54..05a32a27 100644
--- a/doc/FcConfigUptoDate.3
+++ b/doc/FcConfigUptoDate.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcConfigUptoDate" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcConfigUptoDate" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcConfigUptoDate \- Check timestamps on config files
.SH SYNOPSIS
diff --git a/doc/FcDefaultSubstitute.3 b/doc/FcDefaultSubstitute.3
index bf249594..929f7aff 100644
--- a/doc/FcDefaultSubstitute.3
+++ b/doc/FcDefaultSubstitute.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcDefaultSubstitute" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcDefaultSubstitute" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcDefaultSubstitute \- Perform default substitutions in a pattern
.SH SYNOPSIS
diff --git a/doc/FcDirCacheClean.3 b/doc/FcDirCacheClean.3
index df97549e..6833348c 100644
--- a/doc/FcDirCacheClean.3
+++ b/doc/FcDirCacheClean.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcDirCacheClean" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcDirCacheClean" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcDirCacheClean \- Clean up a cache directory
.SH SYNOPSIS
diff --git a/doc/FcDirCacheCreateUUID.3 b/doc/FcDirCacheCreateUUID.3
index 518519f3..7fe56d37 100644
--- a/doc/FcDirCacheCreateUUID.3
+++ b/doc/FcDirCacheCreateUUID.3
@@ -1,12 +1,12 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcDirCacheCreateUUID" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcDirCacheCreateUUID" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcDirCacheCreateUUID \- Create .uuid file at a directory
.SH SYNOPSIS
.nf
\fB#include <fontconfig/fontconfig.h>
.sp
-FcBool FcDirCacheCreateUUID (FcChar8 *\fIdir\fB, FcBool\fIforce\fB, FcConfig\fIconfig\fB);
+FcBool FcDirCacheCreateUUID (FcChar8 *\fIdir\fB, FcBool\fIforce\fB, FcConfig *\fIconfig\fB);
.fi\fR
.SH "DESCRIPTION"
.PP
diff --git a/doc/FcDirCacheDeleteUUID.3 b/doc/FcDirCacheDeleteUUID.3
new file mode 100644
index 00000000..da1d7b79
--- /dev/null
+++ b/doc/FcDirCacheDeleteUUID.3
@@ -0,0 +1,17 @@
+.\" auto-generated by docbook2man-spec from docbook-utils package
+.TH "FcDirCacheDeleteUUID" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
+.SH NAME
+FcDirCacheDeleteUUID \- Delete .uuid file
+.SH SYNOPSIS
+.nf
+\fB#include <fontconfig/fontconfig.h>
+.sp
+FcBool FcDirCacheDeleteUUID (const FcChar8 *\fIdir\fB, FcConfig *\fIconfig\fB);
+.fi\fR
+.SH "DESCRIPTION"
+.PP
+This is to delete .uuid file containing an UUID at a font directory of
+\fIdir\fR\&.
+.SH "SINCE"
+.PP
+version 2.13.1
diff --git a/doc/FcDirCacheLoad.3 b/doc/FcDirCacheLoad.3
index 41c2802b..4ebcdaa5 100644
--- a/doc/FcDirCacheLoad.3
+++ b/doc/FcDirCacheLoad.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcDirCacheLoad" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcDirCacheLoad" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcDirCacheLoad \- load a directory cache
.SH SYNOPSIS
diff --git a/doc/FcDirCacheLoadFile.3 b/doc/FcDirCacheLoadFile.3
index 3b439b0c..bedd727e 100644
--- a/doc/FcDirCacheLoadFile.3
+++ b/doc/FcDirCacheLoadFile.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcDirCacheLoadFile" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcDirCacheLoadFile" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcDirCacheLoadFile \- load a cache file
.SH SYNOPSIS
diff --git a/doc/FcDirCacheRead.3 b/doc/FcDirCacheRead.3
index 104c9582..42f70a6c 100644
--- a/doc/FcDirCacheRead.3
+++ b/doc/FcDirCacheRead.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcDirCacheRead" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcDirCacheRead" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcDirCacheRead \- read or construct a directory cache
.SH SYNOPSIS
diff --git a/doc/FcDirCacheRescan.3 b/doc/FcDirCacheRescan.3
index 90456531..4f2819c6 100644
--- a/doc/FcDirCacheRescan.3
+++ b/doc/FcDirCacheRescan.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcDirCacheRescan" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcDirCacheRescan" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcDirCacheRescan \- Re-scan a directory cache
.SH SYNOPSIS
diff --git a/doc/FcDirCacheUnlink.3 b/doc/FcDirCacheUnlink.3
index 29bd68d9..ff73c263 100644
--- a/doc/FcDirCacheUnlink.3
+++ b/doc/FcDirCacheUnlink.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcDirCacheUnlink" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcDirCacheUnlink" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcDirCacheUnlink \- Remove all caches related to dir
.SH SYNOPSIS
diff --git a/doc/FcDirCacheUnload.3 b/doc/FcDirCacheUnload.3
index 82428d2c..acc55458 100644
--- a/doc/FcDirCacheUnload.3
+++ b/doc/FcDirCacheUnload.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcDirCacheUnload" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcDirCacheUnload" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcDirCacheUnload \- unload a cache file
.SH SYNOPSIS
diff --git a/doc/FcDirCacheValid.3 b/doc/FcDirCacheValid.3
index 69d09c88..c89a40e1 100644
--- a/doc/FcDirCacheValid.3
+++ b/doc/FcDirCacheValid.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcDirCacheValid" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcDirCacheValid" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcDirCacheValid \- check directory cache
.SH SYNOPSIS
diff --git a/doc/FcDirSave.3 b/doc/FcDirSave.3
index aaecba3f..ed5f8584 100644
--- a/doc/FcDirSave.3
+++ b/doc/FcDirSave.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcDirSave" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcDirSave" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcDirSave \- DEPRECATED: formerly used to save a directory cache
.SH SYNOPSIS
diff --git a/doc/FcDirScan.3 b/doc/FcDirScan.3
index 79a66b00..2dfcc217 100644
--- a/doc/FcDirScan.3
+++ b/doc/FcDirScan.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcDirScan" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcDirScan" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcDirScan \- scan a font directory without caching it
.SH SYNOPSIS
diff --git a/doc/FcFileIsDir.3 b/doc/FcFileIsDir.3
index e1f969fb..7fda5644 100644
--- a/doc/FcFileIsDir.3
+++ b/doc/FcFileIsDir.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcFileIsDir" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcFileIsDir" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcFileIsDir \- check whether a file is a directory
.SH SYNOPSIS
diff --git a/doc/FcFileScan.3 b/doc/FcFileScan.3
index fcdb6134..7e1eb5ce 100644
--- a/doc/FcFileScan.3
+++ b/doc/FcFileScan.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcFileScan" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcFileScan" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcFileScan \- scan a font file
.SH SYNOPSIS
diff --git a/doc/FcFini.3 b/doc/FcFini.3
index 416def87..87cb8294 100644
--- a/doc/FcFini.3
+++ b/doc/FcFini.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcFini" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcFini" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcFini \- finalize fontconfig library
.SH SYNOPSIS
diff --git a/doc/FcFontList.3 b/doc/FcFontList.3
index 92ff7e3e..f3eb232a 100644
--- a/doc/FcFontList.3
+++ b/doc/FcFontList.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcFontList" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcFontList" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcFontList \- List fonts
.SH SYNOPSIS
diff --git a/doc/FcFontMatch.3 b/doc/FcFontMatch.3
index a3e1ddd8..d94d711e 100644
--- a/doc/FcFontMatch.3
+++ b/doc/FcFontMatch.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcFontMatch" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcFontMatch" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcFontMatch \- Return best font
.SH SYNOPSIS
diff --git a/doc/FcFontRenderPrepare.3 b/doc/FcFontRenderPrepare.3
index df8082bf..9cf37b0a 100644
--- a/doc/FcFontRenderPrepare.3
+++ b/doc/FcFontRenderPrepare.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcFontRenderPrepare" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcFontRenderPrepare" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcFontRenderPrepare \- Prepare pattern for loading font file
.SH SYNOPSIS
diff --git a/doc/FcFontSetAdd.3 b/doc/FcFontSetAdd.3
index a95382d3..52dbc3da 100644
--- a/doc/FcFontSetAdd.3
+++ b/doc/FcFontSetAdd.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcFontSetAdd" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcFontSetAdd" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcFontSetAdd \- Add to a font set
.SH SYNOPSIS
diff --git a/doc/FcFontSetCreate.3 b/doc/FcFontSetCreate.3
index 1c864218..fbf9d3d3 100644
--- a/doc/FcFontSetCreate.3
+++ b/doc/FcFontSetCreate.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcFontSetCreate" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcFontSetCreate" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcFontSetCreate \- Create a font set
.SH SYNOPSIS
diff --git a/doc/FcFontSetDestroy.3 b/doc/FcFontSetDestroy.3
index bb206693..5d2d0560 100644
--- a/doc/FcFontSetDestroy.3
+++ b/doc/FcFontSetDestroy.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcFontSetDestroy" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcFontSetDestroy" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcFontSetDestroy \- Destroy a font set
.SH SYNOPSIS
diff --git a/doc/FcFontSetList.3 b/doc/FcFontSetList.3
index e7c76b99..0d92bd19 100644
--- a/doc/FcFontSetList.3
+++ b/doc/FcFontSetList.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcFontSetList" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcFontSetList" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcFontSetList \- List fonts from a set of font sets
.SH SYNOPSIS
diff --git a/doc/FcFontSetMatch.3 b/doc/FcFontSetMatch.3
index c52aecf3..03268eb5 100644
--- a/doc/FcFontSetMatch.3
+++ b/doc/FcFontSetMatch.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcFontSetMatch" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcFontSetMatch" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcFontSetMatch \- Return the best font from a set of font sets
.SH SYNOPSIS
diff --git a/doc/FcFontSetPrint.3 b/doc/FcFontSetPrint.3
index 30cd36e1..a7d46535 100644
--- a/doc/FcFontSetPrint.3
+++ b/doc/FcFontSetPrint.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcFontSetPrint" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcFontSetPrint" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcFontSetPrint \- Print a set of patterns to stdout
.SH SYNOPSIS
diff --git a/doc/FcFontSetSort.3 b/doc/FcFontSetSort.3
index 5d6e7620..580c9a7a 100644
--- a/doc/FcFontSetSort.3
+++ b/doc/FcFontSetSort.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcFontSetSort" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcFontSetSort" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcFontSetSort \- Add to a font set
.SH SYNOPSIS
diff --git a/doc/FcFontSetSortDestroy.3 b/doc/FcFontSetSortDestroy.3
index 58827072..d509446b 100644
--- a/doc/FcFontSetSortDestroy.3
+++ b/doc/FcFontSetSortDestroy.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcFontSetSortDestroy" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcFontSetSortDestroy" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcFontSetSortDestroy \- DEPRECATED destroy a font set
.SH SYNOPSIS
diff --git a/doc/FcFontSort.3 b/doc/FcFontSort.3
index d49b4e96..48715f13 100644
--- a/doc/FcFontSort.3
+++ b/doc/FcFontSort.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcFontSort" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcFontSort" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcFontSort \- Return list of matching fonts
.SH SYNOPSIS
diff --git a/doc/FcFreeTypeCharIndex.3 b/doc/FcFreeTypeCharIndex.3
index a3243e32..39106cb3 100644
--- a/doc/FcFreeTypeCharIndex.3
+++ b/doc/FcFreeTypeCharIndex.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcFreeTypeCharIndex" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcFreeTypeCharIndex" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcFreeTypeCharIndex \- map Unicode to glyph id
.SH SYNOPSIS
diff --git a/doc/FcFreeTypeCharSet.3 b/doc/FcFreeTypeCharSet.3
index 9047f0a2..2dbff357 100644
--- a/doc/FcFreeTypeCharSet.3
+++ b/doc/FcFreeTypeCharSet.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcFreeTypeCharSet" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcFreeTypeCharSet" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcFreeTypeCharSet \- compute Unicode coverage
.SH SYNOPSIS
diff --git a/doc/FcFreeTypeCharSetAndSpacing.3 b/doc/FcFreeTypeCharSetAndSpacing.3
index c4f936d6..b6e9bab1 100644
--- a/doc/FcFreeTypeCharSetAndSpacing.3
+++ b/doc/FcFreeTypeCharSetAndSpacing.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcFreeTypeCharSetAndSpacing" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcFreeTypeCharSetAndSpacing" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcFreeTypeCharSetAndSpacing \- compute Unicode coverage and spacing type
.SH SYNOPSIS
diff --git a/doc/FcFreeTypeQuery.3 b/doc/FcFreeTypeQuery.3
index 0e78c998..3e1f44e0 100644
--- a/doc/FcFreeTypeQuery.3
+++ b/doc/FcFreeTypeQuery.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcFreeTypeQuery" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcFreeTypeQuery" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcFreeTypeQuery \- compute pattern from font file (and index)
.SH SYNOPSIS
diff --git a/doc/FcFreeTypeQueryAll.3 b/doc/FcFreeTypeQueryAll.3
index 0e4965a9..23b15d42 100644
--- a/doc/FcFreeTypeQueryAll.3
+++ b/doc/FcFreeTypeQueryAll.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcFreeTypeQueryAll" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcFreeTypeQueryAll" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcFreeTypeQueryAll \- compute all patterns from font file (and index)
.SH SYNOPSIS
diff --git a/doc/FcFreeTypeQueryFace.3 b/doc/FcFreeTypeQueryFace.3
index d026964a..008e1308 100644
--- a/doc/FcFreeTypeQueryFace.3
+++ b/doc/FcFreeTypeQueryFace.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcFreeTypeQueryFace" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcFreeTypeQueryFace" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcFreeTypeQueryFace \- compute pattern from FT_Face
.SH SYNOPSIS
diff --git a/doc/FcGetDefaultLangs.3 b/doc/FcGetDefaultLangs.3
index 419895ec..86edc525 100644
--- a/doc/FcGetDefaultLangs.3
+++ b/doc/FcGetDefaultLangs.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcGetDefaultLangs" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcGetDefaultLangs" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcGetDefaultLangs \- Get the default languages list
.SH SYNOPSIS
diff --git a/doc/FcGetLangs.3 b/doc/FcGetLangs.3
index b6713eac..2e9e2874 100644
--- a/doc/FcGetLangs.3
+++ b/doc/FcGetLangs.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcGetLangs" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcGetLangs" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcGetLangs \- Get list of languages
.SH SYNOPSIS
diff --git a/doc/FcGetVersion.3 b/doc/FcGetVersion.3
index 212dc1d1..7f71b9e9 100644
--- a/doc/FcGetVersion.3
+++ b/doc/FcGetVersion.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcGetVersion" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcGetVersion" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcGetVersion \- library version number
.SH SYNOPSIS
diff --git a/doc/FcInit.3 b/doc/FcInit.3
index 7e74ac81..ffcffdfd 100644
--- a/doc/FcInit.3
+++ b/doc/FcInit.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcInit" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcInit" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcInit \- initialize fontconfig library
.SH SYNOPSIS
diff --git a/doc/FcInitBringUptoDate.3 b/doc/FcInitBringUptoDate.3
index f82d69e0..2edbe9a8 100644
--- a/doc/FcInitBringUptoDate.3
+++ b/doc/FcInitBringUptoDate.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcInitBringUptoDate" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcInitBringUptoDate" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcInitBringUptoDate \- reload configuration files if needed
.SH SYNOPSIS
diff --git a/doc/FcInitLoadConfig.3 b/doc/FcInitLoadConfig.3
index 45e1c928..3e4bc322 100644
--- a/doc/FcInitLoadConfig.3
+++ b/doc/FcInitLoadConfig.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcInitLoadConfig" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcInitLoadConfig" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcInitLoadConfig \- load configuration
.SH SYNOPSIS
diff --git a/doc/FcInitLoadConfigAndFonts.3 b/doc/FcInitLoadConfigAndFonts.3
index e9001d27..04e08182 100644
--- a/doc/FcInitLoadConfigAndFonts.3
+++ b/doc/FcInitLoadConfigAndFonts.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcInitLoadConfigAndFonts" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcInitLoadConfigAndFonts" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcInitLoadConfigAndFonts \- load configuration and font data
.SH SYNOPSIS
diff --git a/doc/FcInitReinitialize.3 b/doc/FcInitReinitialize.3
index 1e6e57ba..b70dde67 100644
--- a/doc/FcInitReinitialize.3
+++ b/doc/FcInitReinitialize.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcInitReinitialize" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcInitReinitialize" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcInitReinitialize \- re-initialize library
.SH SYNOPSIS
diff --git a/doc/FcIsLower.3 b/doc/FcIsLower.3
index ea77e556..4d4408d6 100644
--- a/doc/FcIsLower.3
+++ b/doc/FcIsLower.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcIsLower" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcIsLower" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcIsLower \- check for lower case ASCII character
.SH SYNOPSIS
diff --git a/doc/FcIsUpper.3 b/doc/FcIsUpper.3
index 5ebe2010..9b955f43 100644
--- a/doc/FcIsUpper.3
+++ b/doc/FcIsUpper.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcIsUpper" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcIsUpper" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcIsUpper \- check for upper case ASCII character
.SH SYNOPSIS
diff --git a/doc/FcLangGetCharSet.3 b/doc/FcLangGetCharSet.3
index fba92436..5329dd68 100644
--- a/doc/FcLangGetCharSet.3
+++ b/doc/FcLangGetCharSet.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcLangGetCharSet" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcLangGetCharSet" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcLangGetCharSet \- Get character map for a language
.SH SYNOPSIS
diff --git a/doc/FcLangNormalize.3 b/doc/FcLangNormalize.3
index 47aa19c1..257e7837 100644
--- a/doc/FcLangNormalize.3
+++ b/doc/FcLangNormalize.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcLangNormalize" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcLangNormalize" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcLangNormalize \- Normalize the language string
.SH SYNOPSIS
diff --git a/doc/FcLangSetAdd.3 b/doc/FcLangSetAdd.3
index d641d500..e59447ec 100644
--- a/doc/FcLangSetAdd.3
+++ b/doc/FcLangSetAdd.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcLangSetAdd" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcLangSetAdd" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcLangSetAdd \- add a language to a langset
.SH SYNOPSIS
diff --git a/doc/FcLangSetCompare.3 b/doc/FcLangSetCompare.3
index 58a26778..442e50f7 100644
--- a/doc/FcLangSetCompare.3
+++ b/doc/FcLangSetCompare.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcLangSetCompare" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcLangSetCompare" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcLangSetCompare \- compare language sets
.SH SYNOPSIS
diff --git a/doc/FcLangSetContains.3 b/doc/FcLangSetContains.3
index 8e43aeac..b693a417 100644
--- a/doc/FcLangSetContains.3
+++ b/doc/FcLangSetContains.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcLangSetContains" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcLangSetContains" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcLangSetContains \- check langset subset relation
.SH SYNOPSIS
diff --git a/doc/FcLangSetCopy.3 b/doc/FcLangSetCopy.3
index 7ed96022..f94578e8 100644
--- a/doc/FcLangSetCopy.3
+++ b/doc/FcLangSetCopy.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcLangSetCopy" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcLangSetCopy" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcLangSetCopy \- copy a langset object
.SH SYNOPSIS
diff --git a/doc/FcLangSetCreate.3 b/doc/FcLangSetCreate.3
index 5ce84c83..446a93b8 100644
--- a/doc/FcLangSetCreate.3
+++ b/doc/FcLangSetCreate.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcLangSetCreate" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcLangSetCreate" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcLangSetCreate \- create a langset object
.SH SYNOPSIS
diff --git a/doc/FcLangSetDel.3 b/doc/FcLangSetDel.3
index 98d48407..a4fa56f9 100644
--- a/doc/FcLangSetDel.3
+++ b/doc/FcLangSetDel.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcLangSetDel" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcLangSetDel" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcLangSetDel \- delete a language from a langset
.SH SYNOPSIS
diff --git a/doc/FcLangSetDestroy.3 b/doc/FcLangSetDestroy.3
index b73fb990..84ab8bab 100644
--- a/doc/FcLangSetDestroy.3
+++ b/doc/FcLangSetDestroy.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcLangSetDestroy" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcLangSetDestroy" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcLangSetDestroy \- destroy a langset object
.SH SYNOPSIS
diff --git a/doc/FcLangSetEqual.3 b/doc/FcLangSetEqual.3
index f5717e38..a623bf82 100644
--- a/doc/FcLangSetEqual.3
+++ b/doc/FcLangSetEqual.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcLangSetEqual" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcLangSetEqual" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcLangSetEqual \- test for matching langsets
.SH SYNOPSIS
diff --git a/doc/FcLangSetGetLangs.3 b/doc/FcLangSetGetLangs.3
index 31347cd5..54ad78c8 100644
--- a/doc/FcLangSetGetLangs.3
+++ b/doc/FcLangSetGetLangs.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcLangSetGetLangs" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcLangSetGetLangs" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcLangSetGetLangs \- get the list of languages in the langset
.SH SYNOPSIS
diff --git a/doc/FcLangSetHasLang.3 b/doc/FcLangSetHasLang.3
index a774fce3..2d9bb193 100644
--- a/doc/FcLangSetHasLang.3
+++ b/doc/FcLangSetHasLang.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcLangSetHasLang" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcLangSetHasLang" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcLangSetHasLang \- test langset for language support
.SH SYNOPSIS
diff --git a/doc/FcLangSetHash.3 b/doc/FcLangSetHash.3
index 3f2efc2c..34ba7886 100644
--- a/doc/FcLangSetHash.3
+++ b/doc/FcLangSetHash.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcLangSetHash" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcLangSetHash" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcLangSetHash \- return a hash value for a langset
.SH SYNOPSIS
diff --git a/doc/FcLangSetSubtract.3 b/doc/FcLangSetSubtract.3
index 27aee0f2..4117a136 100644
--- a/doc/FcLangSetSubtract.3
+++ b/doc/FcLangSetSubtract.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcLangSetSubtract" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcLangSetSubtract" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcLangSetSubtract \- Subtract langsets
.SH SYNOPSIS
diff --git a/doc/FcLangSetUnion.3 b/doc/FcLangSetUnion.3
index ca7d0ad0..fc368629 100644
--- a/doc/FcLangSetUnion.3
+++ b/doc/FcLangSetUnion.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcLangSetUnion" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcLangSetUnion" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcLangSetUnion \- Add langsets
.SH SYNOPSIS
diff --git a/doc/FcMatrixCopy.3 b/doc/FcMatrixCopy.3
index f5fbddd8..51bbd506 100644
--- a/doc/FcMatrixCopy.3
+++ b/doc/FcMatrixCopy.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcMatrixCopy" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcMatrixCopy" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcMatrixCopy \- Copy a matrix
.SH SYNOPSIS
diff --git a/doc/FcMatrixEqual.3 b/doc/FcMatrixEqual.3
index 54e7b0a9..065494e8 100644
--- a/doc/FcMatrixEqual.3
+++ b/doc/FcMatrixEqual.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcMatrixEqual" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcMatrixEqual" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcMatrixEqual \- Compare two matrices
.SH SYNOPSIS
diff --git a/doc/FcMatrixInit.3 b/doc/FcMatrixInit.3
index a0a44af0..7cb5dd76 100644
--- a/doc/FcMatrixInit.3
+++ b/doc/FcMatrixInit.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcMatrixInit" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcMatrixInit" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcMatrixInit \- initialize an FcMatrix structure
.SH SYNOPSIS
diff --git a/doc/FcMatrixMultiply.3 b/doc/FcMatrixMultiply.3
index e3d9dda2..ed817b3e 100644
--- a/doc/FcMatrixMultiply.3
+++ b/doc/FcMatrixMultiply.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcMatrixMultiply" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcMatrixMultiply" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcMatrixMultiply \- Multiply matrices
.SH SYNOPSIS
diff --git a/doc/FcMatrixRotate.3 b/doc/FcMatrixRotate.3
index e52e4852..9a6191ca 100644
--- a/doc/FcMatrixRotate.3
+++ b/doc/FcMatrixRotate.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcMatrixRotate" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcMatrixRotate" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcMatrixRotate \- Rotate a matrix
.SH SYNOPSIS
diff --git a/doc/FcMatrixScale.3 b/doc/FcMatrixScale.3
index e6d68b7d..72c95ea8 100644
--- a/doc/FcMatrixScale.3
+++ b/doc/FcMatrixScale.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcMatrixScale" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcMatrixScale" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcMatrixScale \- Scale a matrix
.SH SYNOPSIS
diff --git a/doc/FcMatrixShear.3 b/doc/FcMatrixShear.3
index ff335d0b..1b696452 100644
--- a/doc/FcMatrixShear.3
+++ b/doc/FcMatrixShear.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcMatrixShear" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcMatrixShear" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcMatrixShear \- Shear a matrix
.SH SYNOPSIS
diff --git a/doc/FcNameConstant.3 b/doc/FcNameConstant.3
index 5730ece6..50d66918 100644
--- a/doc/FcNameConstant.3
+++ b/doc/FcNameConstant.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcNameConstant" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcNameConstant" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcNameConstant \- Get the value for a symbolic constant
.SH SYNOPSIS
diff --git a/doc/FcNameGetConstant.3 b/doc/FcNameGetConstant.3
index 5d310e69..5761d06e 100644
--- a/doc/FcNameGetConstant.3
+++ b/doc/FcNameGetConstant.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcNameGetConstant" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcNameGetConstant" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcNameGetConstant \- Lookup symbolic constant
.SH SYNOPSIS
diff --git a/doc/FcNameGetObjectType.3 b/doc/FcNameGetObjectType.3
index ed1b23bf..3c88e595 100644
--- a/doc/FcNameGetObjectType.3
+++ b/doc/FcNameGetObjectType.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcNameGetObjectType" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcNameGetObjectType" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcNameGetObjectType \- Lookup an object type
.SH SYNOPSIS
diff --git a/doc/FcNameParse.3 b/doc/FcNameParse.3
index 4e7f7c76..cc0abba4 100644
--- a/doc/FcNameParse.3
+++ b/doc/FcNameParse.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcNameParse" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcNameParse" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcNameParse \- Parse a pattern string
.SH SYNOPSIS
diff --git a/doc/FcNameRegisterConstants.3 b/doc/FcNameRegisterConstants.3
index fdf939c9..1a34de21 100644
--- a/doc/FcNameRegisterConstants.3
+++ b/doc/FcNameRegisterConstants.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcNameRegisterConstants" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcNameRegisterConstants" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcNameRegisterConstants \- Register symbolic constants
.SH SYNOPSIS
diff --git a/doc/FcNameRegisterObjectTypes.3 b/doc/FcNameRegisterObjectTypes.3
index ce9ec5b6..0b577062 100644
--- a/doc/FcNameRegisterObjectTypes.3
+++ b/doc/FcNameRegisterObjectTypes.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcNameRegisterObjectTypes" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcNameRegisterObjectTypes" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcNameRegisterObjectTypes \- Register object types
.SH SYNOPSIS
diff --git a/doc/FcNameUnparse.3 b/doc/FcNameUnparse.3
index 6dd14110..a203b8b3 100644
--- a/doc/FcNameUnparse.3
+++ b/doc/FcNameUnparse.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcNameUnparse" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcNameUnparse" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcNameUnparse \- Convert a pattern back into a string that can be parsed
.SH SYNOPSIS
diff --git a/doc/FcNameUnregisterConstants.3 b/doc/FcNameUnregisterConstants.3
index 7a7c8f42..4d7cdfa1 100644
--- a/doc/FcNameUnregisterConstants.3
+++ b/doc/FcNameUnregisterConstants.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcNameUnregisterConstants" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcNameUnregisterConstants" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcNameUnregisterConstants \- Unregister symbolic constants
.SH SYNOPSIS
diff --git a/doc/FcNameUnregisterObjectTypes.3 b/doc/FcNameUnregisterObjectTypes.3
index 3341e836..bdddb008 100644
--- a/doc/FcNameUnregisterObjectTypes.3
+++ b/doc/FcNameUnregisterObjectTypes.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcNameUnregisterObjectTypes" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcNameUnregisterObjectTypes" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcNameUnregisterObjectTypes \- Unregister object types
.SH SYNOPSIS
diff --git a/doc/FcObjectSetAdd.3 b/doc/FcObjectSetAdd.3
index fe2a5ee8..28210c8e 100644
--- a/doc/FcObjectSetAdd.3
+++ b/doc/FcObjectSetAdd.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcObjectSetAdd" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcObjectSetAdd" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcObjectSetAdd \- Add to an object set
.SH SYNOPSIS
diff --git a/doc/FcObjectSetBuild.3 b/doc/FcObjectSetBuild.3
index e4edb0bb..abcb789f 100644
--- a/doc/FcObjectSetBuild.3
+++ b/doc/FcObjectSetBuild.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcObjectSetBuild" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcObjectSetBuild" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcObjectSetBuild, FcObjectSetVaBuild, FcObjectSetVapBuild \- Build object set from args
.SH SYNOPSIS
diff --git a/doc/FcObjectSetCreate.3 b/doc/FcObjectSetCreate.3
index 2dec2c6b..8a2c29b9 100644
--- a/doc/FcObjectSetCreate.3
+++ b/doc/FcObjectSetCreate.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcObjectSetCreate" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcObjectSetCreate" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcObjectSetCreate \- Create an object set
.SH SYNOPSIS
diff --git a/doc/FcObjectSetDestroy.3 b/doc/FcObjectSetDestroy.3
index 1e54be05..20dc60ba 100644
--- a/doc/FcObjectSetDestroy.3
+++ b/doc/FcObjectSetDestroy.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcObjectSetDestroy" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcObjectSetDestroy" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcObjectSetDestroy \- Destroy an object set
.SH SYNOPSIS
diff --git a/doc/FcPatternAdd-Type.3 b/doc/FcPatternAdd-Type.3
index 068f6b50..98fc8f92 100644
--- a/doc/FcPatternAdd-Type.3
+++ b/doc/FcPatternAdd-Type.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcPatternAdd-Type" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcPatternAdd-Type" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcPatternAddInteger, FcPatternAddDouble, FcPatternAddString, FcPatternAddMatrix, FcPatternAddCharSet, FcPatternAddBool, FcPatternAddFTFace, FcPatternAddLangSet, FcPatternAddRange \- Add a typed value to a pattern
.SH SYNOPSIS
diff --git a/doc/FcPatternAdd.3 b/doc/FcPatternAdd.3
index ae920541..01d869e5 100644
--- a/doc/FcPatternAdd.3
+++ b/doc/FcPatternAdd.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcPatternAdd" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcPatternAdd" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcPatternAdd \- Add a value to a pattern
.SH SYNOPSIS
diff --git a/doc/FcPatternAddWeak.3 b/doc/FcPatternAddWeak.3
index d5b38560..61facdac 100644
--- a/doc/FcPatternAddWeak.3
+++ b/doc/FcPatternAddWeak.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcPatternAddWeak" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcPatternAddWeak" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcPatternAddWeak \- Add a value to a pattern with weak binding
.SH SYNOPSIS
diff --git a/doc/FcPatternBuild.3 b/doc/FcPatternBuild.3
index 7b8eaa73..15adc06c 100644
--- a/doc/FcPatternBuild.3
+++ b/doc/FcPatternBuild.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcPatternBuild" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcPatternBuild" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcPatternBuild, FcPatternVaBuild, FcPatternVapBuild \- Create patterns from arguments
.SH SYNOPSIS
diff --git a/doc/FcPatternCreate.3 b/doc/FcPatternCreate.3
index 4e2acad0..a20c11f5 100644
--- a/doc/FcPatternCreate.3
+++ b/doc/FcPatternCreate.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcPatternCreate" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcPatternCreate" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcPatternCreate \- Create a pattern
.SH SYNOPSIS
diff --git a/doc/FcPatternDel.3 b/doc/FcPatternDel.3
index b3fa828f..37b849f3 100644
--- a/doc/FcPatternDel.3
+++ b/doc/FcPatternDel.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcPatternDel" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcPatternDel" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcPatternDel \- Delete a property from a pattern
.SH SYNOPSIS
diff --git a/doc/FcPatternDestroy.3 b/doc/FcPatternDestroy.3
index 618bfd41..4753f207 100644
--- a/doc/FcPatternDestroy.3
+++ b/doc/FcPatternDestroy.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcPatternDestroy" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcPatternDestroy" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcPatternDestroy \- Destroy a pattern
.SH SYNOPSIS
diff --git a/doc/FcPatternDuplicate.3 b/doc/FcPatternDuplicate.3
index 55dd7293..0047ebc2 100644
--- a/doc/FcPatternDuplicate.3
+++ b/doc/FcPatternDuplicate.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcPatternDuplicate" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcPatternDuplicate" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcPatternDuplicate \- Copy a pattern
.SH SYNOPSIS
diff --git a/doc/FcPatternEqual.3 b/doc/FcPatternEqual.3
index 2afd20b8..b001a04d 100644
--- a/doc/FcPatternEqual.3
+++ b/doc/FcPatternEqual.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcPatternEqual" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcPatternEqual" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcPatternEqual \- Compare patterns
.SH SYNOPSIS
diff --git a/doc/FcPatternEqualSubset.3 b/doc/FcPatternEqualSubset.3
index 3cc95f57..5346a4b0 100644
--- a/doc/FcPatternEqualSubset.3
+++ b/doc/FcPatternEqualSubset.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcPatternEqualSubset" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcPatternEqualSubset" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcPatternEqualSubset \- Compare portions of patterns
.SH SYNOPSIS
diff --git a/doc/FcPatternFilter.3 b/doc/FcPatternFilter.3
index e3f35318..9afa8760 100644
--- a/doc/FcPatternFilter.3
+++ b/doc/FcPatternFilter.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcPatternFilter" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcPatternFilter" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcPatternFilter \- Filter the objects of pattern
.SH SYNOPSIS
diff --git a/doc/FcPatternFindIter.3 b/doc/FcPatternFindIter.3
new file mode 100644
index 00000000..2a8f55e5
--- /dev/null
+++ b/doc/FcPatternFindIter.3
@@ -0,0 +1,17 @@
+.\" auto-generated by docbook2man-spec from docbook-utils package
+.TH "FcPatternFindIter" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
+.SH NAME
+FcPatternFindIter \- Set the iterator to point to the object in the pattern
+.SH SYNOPSIS
+.nf
+\fB#include <fontconfig/fontconfig.h>
+.sp
+FcBool FcPatternFindIter (const FcPattern *\fIp\fB, FcPatternIter *\fIiter\fB, const char *\fIobject\fB);
+.fi\fR
+.SH "DESCRIPTION"
+.PP
+Set \fIiter\fR to point to \fIobject\fR in
+\fIp\fR if any and returns FcTrue. returns FcFalse otherwise.
+.SH "SINCE"
+.PP
+version 2.13.1
diff --git a/doc/FcPatternFormat.3 b/doc/FcPatternFormat.3
index 908a0a11..bd3c89ae 100644
--- a/doc/FcPatternFormat.3
+++ b/doc/FcPatternFormat.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcPatternFormat" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcPatternFormat" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcPatternFormat \- Format a pattern into a string according to a format specifier
.SH SYNOPSIS
diff --git a/doc/FcPatternGet-Type.3 b/doc/FcPatternGet-Type.3
index 9f7b38c4..f6d01c23 100644
--- a/doc/FcPatternGet-Type.3
+++ b/doc/FcPatternGet-Type.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcPatternGet-Type" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcPatternGet-Type" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcPatternGetInteger, FcPatternGetDouble, FcPatternGetString, FcPatternGetMatrix, FcPatternGetCharSet, FcPatternGetBool, FcPatternGetFTFace, FcPatternGetLangSet, FcPatternGetRange \- Return a typed value from a pattern
.SH SYNOPSIS
diff --git a/doc/FcPatternGet.3 b/doc/FcPatternGet.3
index ddcd7fd6..9f2af8dd 100644
--- a/doc/FcPatternGet.3
+++ b/doc/FcPatternGet.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcPatternGet" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcPatternGet" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcPatternGet \- Return a value from a pattern
.SH SYNOPSIS
diff --git a/doc/FcPatternGetWithBinding.3 b/doc/FcPatternGetWithBinding.3
index b881b5c1..9b7c6563 100644
--- a/doc/FcPatternGetWithBinding.3
+++ b/doc/FcPatternGetWithBinding.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcPatternGetWithBinding" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcPatternGetWithBinding" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcPatternGetWithBinding \- Return a value with binding from a pattern
.SH SYNOPSIS
diff --git a/doc/FcPatternHash.3 b/doc/FcPatternHash.3
index 473c7e46..ffff86d6 100644
--- a/doc/FcPatternHash.3
+++ b/doc/FcPatternHash.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcPatternHash" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcPatternHash" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcPatternHash \- Compute a pattern hash value
.SH SYNOPSIS
diff --git a/doc/FcPatternIterEqual.3 b/doc/FcPatternIterEqual.3
new file mode 100644
index 00000000..629a54f2
--- /dev/null
+++ b/doc/FcPatternIterEqual.3
@@ -0,0 +1,17 @@
+.\" auto-generated by docbook2man-spec from docbook-utils package
+.TH "FcPatternIterEqual" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
+.SH NAME
+FcPatternIterEqual \- Compare iterators
+.SH SYNOPSIS
+.nf
+\fB#include <fontconfig/fontconfig.h>
+.sp
+FcBool FcPatternIterEqual (const FcPattern *\fIp1\fB, FcPatternIter *\fIi1\fB, const FcPattern *\fIp2\fB, FcPatternIter *\fIi2\fB);
+.fi\fR
+.SH "DESCRIPTION"
+.PP
+Return FcTrue if both \fIi1\fR and \fIi2\fR
+point to same object and contains same values. return FcFalse otherwise.
+.SH "SINCE"
+.PP
+version 2.13.1
diff --git a/doc/FcPatternIterGetObject.3 b/doc/FcPatternIterGetObject.3
new file mode 100644
index 00000000..564f94b2
--- /dev/null
+++ b/doc/FcPatternIterGetObject.3
@@ -0,0 +1,18 @@
+.\" auto-generated by docbook2man-spec from docbook-utils package
+.TH "FcPatternIterGetObject" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
+.SH NAME
+FcPatternIterGetObject \- Returns an object name which the iterator point to
+.SH SYNOPSIS
+.nf
+\fB#include <fontconfig/fontconfig.h>
+.sp
+const char * FcPatternIterGetObject (const FcPattern *\fIp\fB, FcPatternIter *\fIiter\fB);
+.fi\fR
+.SH "DESCRIPTION"
+.PP
+Returns an object name in \fIp\fR which
+\fIiter\fR point to. returns NULL if
+\fIiter\fR isn't valid.
+.SH "SINCE"
+.PP
+version 2.13.1
diff --git a/doc/FcPatternIterGetValue.3 b/doc/FcPatternIterGetValue.3
new file mode 100644
index 00000000..d8f32ccc
--- /dev/null
+++ b/doc/FcPatternIterGetValue.3
@@ -0,0 +1,20 @@
+.\" auto-generated by docbook2man-spec from docbook-utils package
+.TH "FcPatternIterGetValue" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
+.SH NAME
+FcPatternIterGetValue \- Returns a value which the iterator point to
+.SH SYNOPSIS
+.nf
+\fB#include <fontconfig/fontconfig.h>
+.sp
+FcResult FcPatternIterGetValue (const FcPattern *\fIp\fB, FcPatternIter *\fIiter\fB, int\fIid\fB, FcValue *\fIv\fB, FcValueBinding *\fIb\fB);
+.fi\fR
+.SH "DESCRIPTION"
+.PP
+Returns in \fIv\fR the \fIid\fR\&'th value
+which \fIiter\fR point to. also binding to \fIb\fR
+if given.
+The value returned is not a copy, but rather refers to the data stored
+within the pattern directly. Applications must not free this value.
+.SH "SINCE"
+.PP
+version 2.13.1
diff --git a/doc/FcPatternIterIsValid.3 b/doc/FcPatternIterIsValid.3
new file mode 100644
index 00000000..a5558f9e
--- /dev/null
+++ b/doc/FcPatternIterIsValid.3
@@ -0,0 +1,17 @@
+.\" auto-generated by docbook2man-spec from docbook-utils package
+.TH "FcPatternIterIsValid" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
+.SH NAME
+FcPatternIterIsValid \- Check whether the iterator is valid or not
+.SH SYNOPSIS
+.nf
+\fB#include <fontconfig/fontconfig.h>
+.sp
+FcBool FcPatternIterIsValid (const FcPattern *\fIp\fB, FcPatternIter :\fIiter\fB);
+.fi\fR
+.SH "DESCRIPTION"
+.PP
+Returns FcTrue if \fIiter\fR point to the valid entry
+in \fIp\fR\&. returns FcFalse otherwise.
+.SH "SINCE"
+.PP
+version 2.13.1
diff --git a/doc/FcPatternIterNext.3 b/doc/FcPatternIterNext.3
new file mode 100644
index 00000000..ab4d9f90
--- /dev/null
+++ b/doc/FcPatternIterNext.3
@@ -0,0 +1,18 @@
+.\" auto-generated by docbook2man-spec from docbook-utils package
+.TH "FcPatternIterNext" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
+.SH NAME
+FcPatternIterNext \-
+.SH SYNOPSIS
+.nf
+\fB#include <fontconfig/fontconfig.h>
+.sp
+FcBool FcPatternIterNext (const FcPattern *\fIp\fB, FcPatternIter *\fIiter\fB);
+.fi\fR
+.SH "DESCRIPTION"
+.PP
+Set \fIiter\fR to point to the next object in \fIp\fR
+and returns FcTrue if \fIiter\fR has been changed to the next object.
+returns FcFalse otherwise.
+.SH "SINCE"
+.PP
+version 2.13.1
diff --git a/doc/FcPatternIterStart.3 b/doc/FcPatternIterStart.3
new file mode 100644
index 00000000..8eedd78c
--- /dev/null
+++ b/doc/FcPatternIterStart.3
@@ -0,0 +1,18 @@
+.\" auto-generated by docbook2man-spec from docbook-utils package
+.TH "FcPatternIterStart" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
+.SH NAME
+FcPatternIterStart \- Initialize the iterator with the first iterator in the pattern
+.SH SYNOPSIS
+.nf
+\fB#include <fontconfig/fontconfig.h>
+.sp
+void FcPatternIterStart (const FcPattern *\fIp\fB, FcPatternIter *\fIiter\fB);
+.fi\fR
+.SH "DESCRIPTION"
+.PP
+Initialize \fIiter\fR with the first iterator in \fIp\fR\&.
+If there are no objects in \fIp\fR, \fIiter\fR
+will not have any valid data.
+.SH "SINCE"
+.PP
+version 2.13.1
diff --git a/doc/FcPatternIterValueCount.3 b/doc/FcPatternIterValueCount.3
new file mode 100644
index 00000000..db108a16
--- /dev/null
+++ b/doc/FcPatternIterValueCount.3
@@ -0,0 +1,17 @@
+.\" auto-generated by docbook2man-spec from docbook-utils package
+.TH "FcPatternIterValueCount" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
+.SH NAME
+FcPatternIterValueCount \- Returns the number of the values which the iterator point to
+.SH SYNOPSIS
+.nf
+\fB#include <fontconfig/fontconfig.h>
+.sp
+int FcPatternIterValueCount (const FcPattern *\fIp\fB, FcPatternIter *\fIiter\fB);
+.fi\fR
+.SH "DESCRIPTION"
+.PP
+Returns the number of the values in the object which \fIiter\fR
+point to. if \fIiter\fR isn't valid, returns 0.
+.SH "SINCE"
+.PP
+version 2.13.1
diff --git a/doc/FcPatternObjectCount.3 b/doc/FcPatternObjectCount.3
new file mode 100644
index 00000000..9fa71a12
--- /dev/null
+++ b/doc/FcPatternObjectCount.3
@@ -0,0 +1,16 @@
+.\" auto-generated by docbook2man-spec from docbook-utils package
+.TH "FcPatternObjectCount" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
+.SH NAME
+FcPatternObjectCount \- Returns the number of the object
+.SH SYNOPSIS
+.nf
+\fB#include <fontconfig/fontconfig.h>
+.sp
+int FcPatternObjectCount (const FcPattern *\fIp\fB);
+.fi\fR
+.SH "DESCRIPTION"
+.PP
+Returns the number of the object \fIp\fR has.
+.SH "SINCE"
+.PP
+version 2.13.1
diff --git a/doc/FcPatternPrint.3 b/doc/FcPatternPrint.3
index 8ed60f8f..7396e761 100644
--- a/doc/FcPatternPrint.3
+++ b/doc/FcPatternPrint.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcPatternPrint" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcPatternPrint" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcPatternPrint \- Print a pattern for debugging
.SH SYNOPSIS
diff --git a/doc/FcPatternReference.3 b/doc/FcPatternReference.3
index 27b9c666..ae25fb92 100644
--- a/doc/FcPatternReference.3
+++ b/doc/FcPatternReference.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcPatternReference" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcPatternReference" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcPatternReference \- Increment pattern reference count
.SH SYNOPSIS
diff --git a/doc/FcPatternRemove.3 b/doc/FcPatternRemove.3
index 7b9f53a1..5fe9442b 100644
--- a/doc/FcPatternRemove.3
+++ b/doc/FcPatternRemove.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcPatternRemove" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcPatternRemove" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcPatternRemove \- Remove one object of the specified type from the pattern
.SH SYNOPSIS
diff --git a/doc/FcRangeCopy.3 b/doc/FcRangeCopy.3
index 83730030..29562f4a 100644
--- a/doc/FcRangeCopy.3
+++ b/doc/FcRangeCopy.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcRangeCopy" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcRangeCopy" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcRangeCopy \- Copy a range object
.SH SYNOPSIS
diff --git a/doc/FcRangeCreateDouble.3 b/doc/FcRangeCreateDouble.3
index ca8646d9..e9777fa3 100644
--- a/doc/FcRangeCreateDouble.3
+++ b/doc/FcRangeCreateDouble.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcRangeCreateDouble" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcRangeCreateDouble" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcRangeCreateDouble \- create a range object for double
.SH SYNOPSIS
diff --git a/doc/FcRangeCreateInteger.3 b/doc/FcRangeCreateInteger.3
index 9ea17933..8e5f0b93 100644
--- a/doc/FcRangeCreateInteger.3
+++ b/doc/FcRangeCreateInteger.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcRangeCreateInteger" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcRangeCreateInteger" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcRangeCreateInteger \- create a range object for integer
.SH SYNOPSIS
diff --git a/doc/FcRangeDestroy.3 b/doc/FcRangeDestroy.3
index 7a1a0b3a..f0a25836 100644
--- a/doc/FcRangeDestroy.3
+++ b/doc/FcRangeDestroy.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcRangeDestroy" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcRangeDestroy" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcRangeDestroy \- destroy a range object
.SH SYNOPSIS
diff --git a/doc/FcRangeGetDouble.3 b/doc/FcRangeGetDouble.3
index 60f5e94c..80ee398a 100644
--- a/doc/FcRangeGetDouble.3
+++ b/doc/FcRangeGetDouble.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcRangeGetDouble" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcRangeGetDouble" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcRangeGetDouble \- Get the range in double
.SH SYNOPSIS
diff --git a/doc/FcStrBasename.3 b/doc/FcStrBasename.3
index 087f326c..a736554e 100644
--- a/doc/FcStrBasename.3
+++ b/doc/FcStrBasename.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcStrBasename" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcStrBasename" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcStrBasename \- last component of filename
.SH SYNOPSIS
diff --git a/doc/FcStrCmp.3 b/doc/FcStrCmp.3
index f5dbd8d7..5256ec13 100644
--- a/doc/FcStrCmp.3
+++ b/doc/FcStrCmp.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcStrCmp" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcStrCmp" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcStrCmp \- compare UTF-8 strings
.SH SYNOPSIS
diff --git a/doc/FcStrCmpIgnoreCase.3 b/doc/FcStrCmpIgnoreCase.3
index 4afc4719..a6ae2280 100644
--- a/doc/FcStrCmpIgnoreCase.3
+++ b/doc/FcStrCmpIgnoreCase.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcStrCmpIgnoreCase" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcStrCmpIgnoreCase" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcStrCmpIgnoreCase \- compare UTF-8 strings ignoring case
.SH SYNOPSIS
diff --git a/doc/FcStrCopy.3 b/doc/FcStrCopy.3
index 449b7f2c..114add2c 100644
--- a/doc/FcStrCopy.3
+++ b/doc/FcStrCopy.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcStrCopy" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcStrCopy" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcStrCopy \- duplicate a string
.SH SYNOPSIS
diff --git a/doc/FcStrCopyFilename.3 b/doc/FcStrCopyFilename.3
index bf45004d..d22155a1 100644
--- a/doc/FcStrCopyFilename.3
+++ b/doc/FcStrCopyFilename.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcStrCopyFilename" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcStrCopyFilename" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcStrCopyFilename \- create a complete path from a filename
.SH SYNOPSIS
diff --git a/doc/FcStrDirname.3 b/doc/FcStrDirname.3
index 631f0c04..4285304b 100644
--- a/doc/FcStrDirname.3
+++ b/doc/FcStrDirname.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcStrDirname" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcStrDirname" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcStrDirname \- directory part of filename
.SH SYNOPSIS
diff --git a/doc/FcStrDowncase.3 b/doc/FcStrDowncase.3
index 391c2460..10460f68 100644
--- a/doc/FcStrDowncase.3
+++ b/doc/FcStrDowncase.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcStrDowncase" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcStrDowncase" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcStrDowncase \- create a lower case translation of a string
.SH SYNOPSIS
diff --git a/doc/FcStrFree.3 b/doc/FcStrFree.3
index dc4d2539..a04fe105 100644
--- a/doc/FcStrFree.3
+++ b/doc/FcStrFree.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcStrFree" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcStrFree" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcStrFree \- free a string
.SH SYNOPSIS
diff --git a/doc/FcStrListCreate.3 b/doc/FcStrListCreate.3
index c3551fd7..6e58c8c1 100644
--- a/doc/FcStrListCreate.3
+++ b/doc/FcStrListCreate.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcStrListCreate" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcStrListCreate" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcStrListCreate \- create a string iterator
.SH SYNOPSIS
diff --git a/doc/FcStrListDone.3 b/doc/FcStrListDone.3
index 8d6a58ed..e9ed9582 100644
--- a/doc/FcStrListDone.3
+++ b/doc/FcStrListDone.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcStrListDone" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcStrListDone" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcStrListDone \- destroy a string iterator
.SH SYNOPSIS
diff --git a/doc/FcStrListFirst.3 b/doc/FcStrListFirst.3
index a7d907ae..a1d7ce86 100644
--- a/doc/FcStrListFirst.3
+++ b/doc/FcStrListFirst.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcStrListFirst" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcStrListFirst" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcStrListFirst \- get first string in iteration
.SH SYNOPSIS
diff --git a/doc/FcStrListNext.3 b/doc/FcStrListNext.3
index e1542ba1..40a77096 100644
--- a/doc/FcStrListNext.3
+++ b/doc/FcStrListNext.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcStrListNext" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcStrListNext" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcStrListNext \- get next string in iteration
.SH SYNOPSIS
diff --git a/doc/FcStrPlus.3 b/doc/FcStrPlus.3
index b2f5b383..4e0ca5a0 100644
--- a/doc/FcStrPlus.3
+++ b/doc/FcStrPlus.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcStrPlus" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcStrPlus" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcStrPlus \- concatenate two strings
.SH SYNOPSIS
diff --git a/doc/FcStrSetAdd.3 b/doc/FcStrSetAdd.3
index 655e0cc7..707009f9 100644
--- a/doc/FcStrSetAdd.3
+++ b/doc/FcStrSetAdd.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcStrSetAdd" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcStrSetAdd" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcStrSetAdd \- add to a string set
.SH SYNOPSIS
diff --git a/doc/FcStrSetAddFilename.3 b/doc/FcStrSetAddFilename.3
index cac1aebe..dfbdc8f1 100644
--- a/doc/FcStrSetAddFilename.3
+++ b/doc/FcStrSetAddFilename.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcStrSetAddFilename" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcStrSetAddFilename" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcStrSetAddFilename \- add a filename to a string set
.SH SYNOPSIS
diff --git a/doc/FcStrSetCreate.3 b/doc/FcStrSetCreate.3
index 8d0d43c6..01da3fe0 100644
--- a/doc/FcStrSetCreate.3
+++ b/doc/FcStrSetCreate.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcStrSetCreate" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcStrSetCreate" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcStrSetCreate \- create a string set
.SH SYNOPSIS
diff --git a/doc/FcStrSetDel.3 b/doc/FcStrSetDel.3
index 0aa5a17d..10e3d939 100644
--- a/doc/FcStrSetDel.3
+++ b/doc/FcStrSetDel.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcStrSetDel" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcStrSetDel" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcStrSetDel \- delete from a string set
.SH SYNOPSIS
diff --git a/doc/FcStrSetDestroy.3 b/doc/FcStrSetDestroy.3
index fcfbc4ac..32984fd5 100644
--- a/doc/FcStrSetDestroy.3
+++ b/doc/FcStrSetDestroy.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcStrSetDestroy" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcStrSetDestroy" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcStrSetDestroy \- destroy a string set
.SH SYNOPSIS
diff --git a/doc/FcStrSetEqual.3 b/doc/FcStrSetEqual.3
index b8c9f71b..2caceb54 100644
--- a/doc/FcStrSetEqual.3
+++ b/doc/FcStrSetEqual.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcStrSetEqual" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcStrSetEqual" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcStrSetEqual \- check sets for equality
.SH SYNOPSIS
diff --git a/doc/FcStrSetMember.3 b/doc/FcStrSetMember.3
index 4c28dba6..2d664a2b 100644
--- a/doc/FcStrSetMember.3
+++ b/doc/FcStrSetMember.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcStrSetMember" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcStrSetMember" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcStrSetMember \- check set for membership
.SH SYNOPSIS
diff --git a/doc/FcStrStr.3 b/doc/FcStrStr.3
index df9d1687..5b5d920c 100644
--- a/doc/FcStrStr.3
+++ b/doc/FcStrStr.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcStrStr" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcStrStr" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcStrStr \- locate UTF-8 substring
.SH SYNOPSIS
diff --git a/doc/FcStrStrIgnoreCase.3 b/doc/FcStrStrIgnoreCase.3
index eec31279..c9f97977 100644
--- a/doc/FcStrStrIgnoreCase.3
+++ b/doc/FcStrStrIgnoreCase.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcStrStrIgnoreCase" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcStrStrIgnoreCase" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcStrStrIgnoreCase \- locate UTF-8 substring ignoring ASCII case
.SH SYNOPSIS
diff --git a/doc/FcToLower.3 b/doc/FcToLower.3
index 640dc566..e940f83f 100644
--- a/doc/FcToLower.3
+++ b/doc/FcToLower.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcToLower" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcToLower" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcToLower \- convert upper case ASCII to lower case
.SH SYNOPSIS
diff --git a/doc/FcUcs4ToUtf8.3 b/doc/FcUcs4ToUtf8.3
index e19eb143..963213a3 100644
--- a/doc/FcUcs4ToUtf8.3
+++ b/doc/FcUcs4ToUtf8.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcUcs4ToUtf8" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcUcs4ToUtf8" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcUcs4ToUtf8 \- convert UCS4 to UTF-8
.SH SYNOPSIS
diff --git a/doc/FcUtf16Len.3 b/doc/FcUtf16Len.3
index a6f8fef8..ea4b8715 100644
--- a/doc/FcUtf16Len.3
+++ b/doc/FcUtf16Len.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcUtf16Len" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcUtf16Len" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcUtf16Len \- count UTF-16 encoded chars
.SH SYNOPSIS
diff --git a/doc/FcUtf16ToUcs4.3 b/doc/FcUtf16ToUcs4.3
index 3087e2ef..4408953c 100644
--- a/doc/FcUtf16ToUcs4.3
+++ b/doc/FcUtf16ToUcs4.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcUtf16ToUcs4" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcUtf16ToUcs4" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcUtf16ToUcs4 \- convert UTF-16 to UCS4
.SH SYNOPSIS
diff --git a/doc/FcUtf8Len.3 b/doc/FcUtf8Len.3
index fe0af078..7ab77017 100644
--- a/doc/FcUtf8Len.3
+++ b/doc/FcUtf8Len.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcUtf8Len" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcUtf8Len" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcUtf8Len \- count UTF-8 encoded chars
.SH SYNOPSIS
diff --git a/doc/FcUtf8ToUcs4.3 b/doc/FcUtf8ToUcs4.3
index 98cd3c4e..69bf3ee7 100644
--- a/doc/FcUtf8ToUcs4.3
+++ b/doc/FcUtf8ToUcs4.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcUtf8ToUcs4" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcUtf8ToUcs4" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcUtf8ToUcs4 \- convert UTF-8 to UCS4
.SH SYNOPSIS
diff --git a/doc/FcValueDestroy.3 b/doc/FcValueDestroy.3
index 7dded440..212badcf 100644
--- a/doc/FcValueDestroy.3
+++ b/doc/FcValueDestroy.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcValueDestroy" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcValueDestroy" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcValueDestroy \- Free a value
.SH SYNOPSIS
diff --git a/doc/FcValueEqual.3 b/doc/FcValueEqual.3
index 206c92c7..38133640 100644
--- a/doc/FcValueEqual.3
+++ b/doc/FcValueEqual.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcValueEqual" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcValueEqual" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcValueEqual \- Test two values for equality
.SH SYNOPSIS
diff --git a/doc/FcValuePrint.3 b/doc/FcValuePrint.3
index 413bcbe9..a812cc3b 100644
--- a/doc/FcValuePrint.3
+++ b/doc/FcValuePrint.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcValuePrint" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcValuePrint" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcValuePrint \- Print a value to stdout
.SH SYNOPSIS
diff --git a/doc/FcValueSave.3 b/doc/FcValueSave.3
index 38d3254d..41c5ac27 100644
--- a/doc/FcValueSave.3
+++ b/doc/FcValueSave.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcValueSave" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcValueSave" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcValueSave \- Copy a value
.SH SYNOPSIS
diff --git a/doc/FcWeightFromOpenType.3 b/doc/FcWeightFromOpenType.3
index 03b13465..b7d2f940 100644
--- a/doc/FcWeightFromOpenType.3
+++ b/doc/FcWeightFromOpenType.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcWeightFromOpenType" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcWeightFromOpenType" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcWeightFromOpenType \- Convert from OpenType weight values to fontconfig ones
.SH SYNOPSIS
diff --git a/doc/FcWeightFromOpenTypeDouble.3 b/doc/FcWeightFromOpenTypeDouble.3
index 8b6ec750..3c53821e 100644
--- a/doc/FcWeightFromOpenTypeDouble.3
+++ b/doc/FcWeightFromOpenTypeDouble.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcWeightFromOpenTypeDouble" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcWeightFromOpenTypeDouble" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcWeightFromOpenTypeDouble \- Convert from OpenType weight values to fontconfig ones
.SH SYNOPSIS
diff --git a/doc/FcWeightToOpenType.3 b/doc/FcWeightToOpenType.3
index 6476b844..3954c5c3 100644
--- a/doc/FcWeightToOpenType.3
+++ b/doc/FcWeightToOpenType.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcWeightToOpenType" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcWeightToOpenType" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcWeightToOpenType \- Convert from fontconfig weight values to OpenType ones
.SH SYNOPSIS
diff --git a/doc/FcWeightToOpenTypeDouble.3 b/doc/FcWeightToOpenTypeDouble.3
index e74b5e2a..90c69e1f 100644
--- a/doc/FcWeightToOpenTypeDouble.3
+++ b/doc/FcWeightToOpenTypeDouble.3
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcWeightToOpenTypeDouble" "3" "06 3月 2018" "Fontconfig 2.13.0" ""
+.TH "FcWeightToOpenTypeDouble" "3" "30 8月 2018" "Fontconfig 2.13.1" ""
.SH NAME
FcWeightToOpenTypeDouble \- Convert from fontconfig weight values to OpenType ones
.SH SYNOPSIS
diff --git a/doc/Makefile.in b/doc/Makefile.in
index f07dfbe9..b8ae0b4d 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -167,7 +167,8 @@ am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/edit-sgml.Po
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -489,6 +490,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JSONC_CFLAGS = @JSONC_CFLAGS@
+JSONC_LIBS = @JSONC_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -761,8 +764,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -795,7 +798,13 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edit-sgml.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edit-sgml.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -1120,7 +1129,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
fi; \
$$success || exit 1
-check-TESTS:
+check-TESTS: $(check_SCRIPTS)
@list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@@ -1163,7 +1172,10 @@ check-missing-doc.log: check-missing-doc
@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT)
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -1246,7 +1258,7 @@ clean-am: clean-generic clean-libtool clean-local clean-noinstPROGRAMS \
mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/edit-sgml.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -1292,7 +1304,7 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/edit-sgml.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -1315,14 +1327,14 @@ uninstall-man: uninstall-man3 uninstall-man5
.MAKE: all check check-am install install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-TESTS \
- check-am clean clean-generic clean-libtool clean-local \
- clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am \
- install-docDATA install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am \
+.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles check \
+ check-TESTS check-am clean clean-generic clean-libtool \
+ clean-local clean-noinstPROGRAMS cscopelist-am ctags ctags-am \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-docDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
install-htmldocDATA install-info install-info-am install-man \
install-man3 install-man5 install-pdf install-pdf-am \
install-ps install-ps-am install-strip installcheck \
diff --git a/doc/fccache.fncs b/doc/fccache.fncs
index 17e74fe5..972b6423 100644
--- a/doc/fccache.fncs
+++ b/doc/fccache.fncs
@@ -92,7 +92,7 @@ to <parameter>config</parameter>.
@FUNC@ FcDirCacheCreateUUID
@TYPE1@ FcChar8 * @ARG1@ dir
@TYPE2@ FcBool @ARG2@ force
-@TYPE3@ FcConfig @ARG3@ config
+@TYPE3@ FcConfig * @ARG3@ config
@PURPOSE@ Create .uuid file at a directory
@DESC@
This is to create .uuid file containing an UUID at a font directory of
@@ -102,3 +102,13 @@ the cache filename if available.
@SINCE@ 2.12.92
@@
+@RET@ FcBool
+@FUNC@ FcDirCacheDeleteUUID
+@TYPE1@ const FcChar8 * @ARG1@ dir
+@TYPE2@ FcConfig * @ARG2@ config
+@PURPOSE@ Delete .uuid file
+@DESC@
+This is to delete .uuid file containing an UUID at a font directory of
+<parameter>dir</parameter>.
+@SINCE@ 2.13.1
+@@
diff --git a/doc/fccache.sgml b/doc/fccache.sgml
index 729401a8..e29738c6 100644
--- a/doc/fccache.sgml
+++ b/doc/fccache.sgml
@@ -406,7 +406,7 @@ to <parameter>config</parameter>.
<funcdef>FcBool <function>FcDirCacheCreateUUID</function></funcdef>
<paramdef>FcChar8 *<parameter>dir</parameter></paramdef>
<paramdef>FcBool<parameter>force</parameter></paramdef>
- <paramdef>FcConfig<parameter>config</parameter></paramdef>
+ <paramdef>FcConfig *<parameter>config</parameter></paramdef>
</funcprototype>
</funcsynopsis>
</refsynopsisdiv>
@@ -422,3 +422,58 @@ the cache filename if available.
<para>version 2.12.92</para>
</refsect1>
</refentry>
+<!--
+ fontconfig/doc/func.sgml
+
+ Copyright © 2003 Keith Packard
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of the author(s) not be used in
+ advertising or publicity pertaining to distribution of the software without
+ specific, written prior permission. The authors make no
+ representations about the suitability of this software for any purpose. It
+ is provided "as is" without express or implied warranty.
+
+ THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ PERFORMANCE OF THIS SOFTWARE.
+ -->
+ <refentry id="FcDirCacheDeleteUUID">
+ <refmeta>
+ <refentrytitle>FcDirCacheDeleteUUID</refentrytitle>
+ <manvolnum>3</manvolnum>
+ <refmiscinfo class="software">Fontconfig &version;</refmiscinfo>
+ </refmeta>
+ <refnamediv>
+ <refname>FcDirCacheDeleteUUID</refname>
+ <refpurpose>Delete .uuid file</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <funcsynopsis>
+ <funcsynopsisinfo>
+#include &lt;fontconfig/fontconfig.h&gt;
+ </funcsynopsisinfo>
+ <funcprototype>
+ <funcdef>FcBool <function>FcDirCacheDeleteUUID</function></funcdef>
+ <paramdef>const FcChar8 *<parameter>dir</parameter></paramdef>
+ <paramdef>FcConfig *<parameter>config</parameter></paramdef>
+ </funcprototype>
+ </funcsynopsis>
+ </refsynopsisdiv>
+ <refsect1><title>Description</title>
+ <para>
+This is to delete .uuid file containing an UUID at a font directory of
+<parameter>dir</parameter>.
+ </para>
+ </refsect1>
+ <refsect1><title>Since</title>
+ <para>version 2.13.1</para>
+ </refsect1>
+ </refentry>
diff --git a/doc/fcpattern.fncs b/doc/fcpattern.fncs
index 928f0bcc..3b13c22d 100644
--- a/doc/fcpattern.fncs
+++ b/doc/fcpattern.fncs
@@ -57,6 +57,15 @@ Decrement the pattern reference count. If all references are gone, destroys
the pattern, in the process destroying all related values.
@@
+@RET@ int
+@FUNC@ FcPatternObjectCount
+@TYPE1@ const FcPattern * @ARG1@ p
+@PURPOSE@ Returns the number of the object
+@DESC@
+Returns the number of the object <parameter>p</parameter> has.
+@SINCE@ 2.13.1
+@@
+
@RET@ FcBool
@FUNC@ FcPatternEqual
@TYPE1@ const FcPattern * @ARG1@ pa
@@ -383,7 +392,107 @@ whether the property existed or not.
Removes the value associated with the property `object' at position `id', returning
whether the property existed and had a value at that position or not.
@@
-
+
+@RET@ void
+@FUNC@ FcPatternIterStart
+@TYPE1@ const FcPattern * @ARG1@ p
+@TYPE2@ FcPatternIter * @ARG2@ iter
+@PURPOSE@ Initialize the iterator with the first iterator in the pattern
+@DESC@
+Initialize <parameter>iter</parameter> with the first iterator in <parameter>p</parameter>.
+If there are no objects in <parameter>p</parameter>, <parameter>iter</parameter>
+will not have any valid data.
+@SINCE@ 2.13.1
+@@
+
+@RET@ FcBool
+@FUNC@ FcPatternIterNext
+@TYPE1@ const FcPattern * @ARG1@ p
+@TYPE2@ FcPatternIter * @ARG2@ iter
+@PURPUSE@ Set the iterator to point to the next object in the pattern
+@DESC@
+Set <parameter>iter</parameter> to point to the next object in <parameter>p</parameter>
+and returns FcTrue if <parameter>iter</parameter> has been changed to the next object.
+returns FcFalse otherwise.
+@SINCE@ 2.13.1
+@@
+
+@RET@ FcBool
+@FUNC@ FcPatternIterEqual
+@TYPE1@ const FcPattern * @ARG1@ p1
+@TYPE2@ FcPatternIter * @ARG2@ i1
+@TYPE3@ const FcPattern * @ARG3@ p2
+@TYPE4@ FcPatternIter * @ARG4@ i2
+@PURPOSE@ Compare iterators
+@DESC@
+Return FcTrue if both <parameter>i1</parameter> and <parameter>i2</parameter>
+point to same object and contains same values. return FcFalse otherwise.
+@SINCE@ 2.13.1
+@@
+
+@RET@ FcBool
+@FUNC@ FcPatternFindIter
+@TYPE1@ const FcPattern * @ARG1@ p
+@TYPE2@ FcPatternIter * @ARG2@ iter
+@TYPE3@ const char * @ARG3@ object
+@PURPOSE@ Set the iterator to point to the object in the pattern
+@DESC@
+Set <parameter>iter</parameter> to point to <parameter>object</parameter> in
+<parameter>p</parameter> if any and returns FcTrue. returns FcFalse otherwise.
+@SINCE@ 2.13.1
+@@
+
+@RET@ FcBool
+@FUNC@ FcPatternIterIsValid
+@TYPE1@ const FcPattern * @ARG1@ p
+@TYPE2@ FcPatternIter : @ARG2@ iter
+@PURPOSE@ Check whether the iterator is valid or not
+@DESC@
+Returns FcTrue if <parameter>iter</parameter> point to the valid entry
+in <parameter>p</parameter>. returns FcFalse otherwise.
+@SINCE@ 2.13.1
+@@
+
+@RET@ const char *
+@FUNC@ FcPatternIterGetObject
+@TYPE1@ const FcPattern * @ARG1@ p
+@TYPE2@ FcPatternIter * @ARG2@ iter
+@PURPOSE@ Returns an object name which the iterator point to
+@DESC@
+Returns an object name in <parameter>p</parameter> which
+<parameter>iter</parameter> point to. returns NULL if
+<parameter>iter</parameter> isn't valid.
+@SINCE@ 2.13.1
+@@
+
+@RET@ int
+@FUNC@ FcPatternIterValueCount
+@TYPE1@ const FcPattern * @ARG1@ p
+@TYPE2@ FcPatternIter * @ARG2@ iter
+@PURPOSE@ Returns the number of the values which the iterator point to
+@DESC@
+Returns the number of the values in the object which <parameter>iter</parameter>
+point to. if <parameter>iter</parameter> isn't valid, returns 0.
+@SINCE@ 2.13.1
+@@
+
+@RET@ FcResult
+@FUNC@ FcPatternIterGetValue
+@TYPE1@ const FcPattern * @ARG1@ p
+@TYPE2@ FcPatternIter * @ARG2@ iter
+@TYPE3@ int @ARG3@ id
+@TYPE4@ FcValue * @ARG4@ v
+@TYPE5@ FcValueBinding * @ARG5@ b
+@PURPOSE@ Returns a value which the iterator point to
+@DESC@
+Returns in <parameter>v</parameter> the <parameter>id</parameter>'th value
+which <parameter>iter</parameter> point to. also binding to <parameter>b</parameter>
+if given.
+The value returned is not a copy, but rather refers to the data stored
+within the pattern directly. Applications must not free this value.
+@SINCE@ 2.13.1
+@@
+
@RET@ void
@FUNC@ FcPatternPrint
@TYPE1@ const FcPattern * @ARG1@ p
diff --git a/doc/fcpattern.sgml b/doc/fcpattern.sgml
index 1bd02169..00936456 100644
--- a/doc/fcpattern.sgml
+++ b/doc/fcpattern.sgml
@@ -225,6 +225,59 @@ the pattern, in the process destroying all related values.
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
-->
+ <refentry id="FcPatternObjectCount">
+ <refmeta>
+ <refentrytitle>FcPatternObjectCount</refentrytitle>
+ <manvolnum>3</manvolnum>
+ <refmiscinfo class="software">Fontconfig &version;</refmiscinfo>
+ </refmeta>
+ <refnamediv>
+ <refname>FcPatternObjectCount</refname>
+ <refpurpose>Returns the number of the object</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <funcsynopsis>
+ <funcsynopsisinfo>
+#include &lt;fontconfig/fontconfig.h&gt;
+ </funcsynopsisinfo>
+ <funcprototype>
+ <funcdef>int <function>FcPatternObjectCount</function></funcdef>
+ <paramdef>const FcPattern *<parameter>p</parameter></paramdef>
+ </funcprototype>
+ </funcsynopsis>
+ </refsynopsisdiv>
+ <refsect1><title>Description</title>
+ <para>
+Returns the number of the object <parameter>p</parameter> has.
+ </para>
+ </refsect1>
+ <refsect1><title>Since</title>
+ <para>version 2.13.1</para>
+ </refsect1>
+ </refentry>
+<!--
+ fontconfig/doc/func.sgml
+
+ Copyright © 2003 Keith Packard
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of the author(s) not be used in
+ advertising or publicity pertaining to distribution of the software without
+ specific, written prior permission. The authors make no
+ representations about the suitability of this software for any purpose. It
+ is provided "as is" without express or implied warranty.
+
+ THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ PERFORMANCE OF THIS SOFTWARE.
+ -->
<refentry id="FcPatternEqual">
<refmeta>
<refentrytitle>FcPatternEqual</refentrytitle>
@@ -1094,6 +1147,458 @@ whether the property existed and had a value at that position or not.
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
-->
+ <refentry id="FcPatternIterStart">
+ <refmeta>
+ <refentrytitle>FcPatternIterStart</refentrytitle>
+ <manvolnum>3</manvolnum>
+ <refmiscinfo class="software">Fontconfig &version;</refmiscinfo>
+ </refmeta>
+ <refnamediv>
+ <refname>FcPatternIterStart</refname>
+ <refpurpose>Initialize the iterator with the first iterator in the pattern</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <funcsynopsis>
+ <funcsynopsisinfo>
+#include &lt;fontconfig/fontconfig.h&gt;
+ </funcsynopsisinfo>
+ <funcprototype>
+ <funcdef>void <function>FcPatternIterStart</function></funcdef>
+ <paramdef>const FcPattern *<parameter>p</parameter></paramdef>
+ <paramdef>FcPatternIter *<parameter>iter</parameter></paramdef>
+ </funcprototype>
+ </funcsynopsis>
+ </refsynopsisdiv>
+ <refsect1><title>Description</title>
+ <para>
+Initialize <parameter>iter</parameter> with the first iterator in <parameter>p</parameter>.
+If there are no objects in <parameter>p</parameter>, <parameter>iter</parameter>
+will not have any valid data.
+ </para>
+ </refsect1>
+ <refsect1><title>Since</title>
+ <para>version 2.13.1</para>
+ </refsect1>
+ </refentry>
+<!--
+ fontconfig/doc/func.sgml
+
+ Copyright © 2003 Keith Packard
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of the author(s) not be used in
+ advertising or publicity pertaining to distribution of the software without
+ specific, written prior permission. The authors make no
+ representations about the suitability of this software for any purpose. It
+ is provided "as is" without express or implied warranty.
+
+ THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ PERFORMANCE OF THIS SOFTWARE.
+ -->
+ <refentry id="FcPatternIterNext">
+ <refmeta>
+ <refentrytitle>FcPatternIterNext</refentrytitle>
+ <manvolnum>3</manvolnum>
+ <refmiscinfo class="software">Fontconfig &version;</refmiscinfo>
+ </refmeta>
+ <refnamediv>
+ <refname>FcPatternIterNext</refname>
+ <refpurpose></refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <funcsynopsis>
+ <funcsynopsisinfo>
+#include &lt;fontconfig/fontconfig.h&gt;
+ </funcsynopsisinfo>
+ <funcprototype>
+ <funcdef>FcBool <function>FcPatternIterNext</function></funcdef>
+ <paramdef>const FcPattern *<parameter>p</parameter></paramdef>
+ <paramdef>FcPatternIter *<parameter>iter</parameter></paramdef>
+ </funcprototype>
+ </funcsynopsis>
+ </refsynopsisdiv>
+ <refsect1><title>Description</title>
+ <para>
+Set <parameter>iter</parameter> to point to the next object in <parameter>p</parameter>
+and returns FcTrue if <parameter>iter</parameter> has been changed to the next object.
+returns FcFalse otherwise.
+ </para>
+ </refsect1>
+ <refsect1><title>Since</title>
+ <para>version 2.13.1</para>
+ </refsect1>
+ </refentry>
+<!--
+ fontconfig/doc/func.sgml
+
+ Copyright © 2003 Keith Packard
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of the author(s) not be used in
+ advertising or publicity pertaining to distribution of the software without
+ specific, written prior permission. The authors make no
+ representations about the suitability of this software for any purpose. It
+ is provided "as is" without express or implied warranty.
+
+ THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ PERFORMANCE OF THIS SOFTWARE.
+ -->
+ <refentry id="FcPatternIterEqual">
+ <refmeta>
+ <refentrytitle>FcPatternIterEqual</refentrytitle>
+ <manvolnum>3</manvolnum>
+ <refmiscinfo class="software">Fontconfig &version;</refmiscinfo>
+ </refmeta>
+ <refnamediv>
+ <refname>FcPatternIterEqual</refname>
+ <refpurpose>Compare iterators</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <funcsynopsis>
+ <funcsynopsisinfo>
+#include &lt;fontconfig/fontconfig.h&gt;
+ </funcsynopsisinfo>
+ <funcprototype>
+ <funcdef>FcBool <function>FcPatternIterEqual</function></funcdef>
+ <paramdef>const FcPattern *<parameter>p1</parameter></paramdef>
+ <paramdef>FcPatternIter *<parameter>i1</parameter></paramdef>
+ <paramdef>const FcPattern *<parameter>p2</parameter></paramdef>
+ <paramdef>FcPatternIter *<parameter>i2</parameter></paramdef>
+ </funcprototype>
+ </funcsynopsis>
+ </refsynopsisdiv>
+ <refsect1><title>Description</title>
+ <para>
+Return FcTrue if both <parameter>i1</parameter> and <parameter>i2</parameter>
+point to same object and contains same values. return FcFalse otherwise.
+ </para>
+ </refsect1>
+ <refsect1><title>Since</title>
+ <para>version 2.13.1</para>
+ </refsect1>
+ </refentry>
+<!--
+ fontconfig/doc/func.sgml
+
+ Copyright © 2003 Keith Packard
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of the author(s) not be used in
+ advertising or publicity pertaining to distribution of the software without
+ specific, written prior permission. The authors make no
+ representations about the suitability of this software for any purpose. It
+ is provided "as is" without express or implied warranty.
+
+ THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ PERFORMANCE OF THIS SOFTWARE.
+ -->
+ <refentry id="FcPatternFindIter">
+ <refmeta>
+ <refentrytitle>FcPatternFindIter</refentrytitle>
+ <manvolnum>3</manvolnum>
+ <refmiscinfo class="software">Fontconfig &version;</refmiscinfo>
+ </refmeta>
+ <refnamediv>
+ <refname>FcPatternFindIter</refname>
+ <refpurpose>Set the iterator to point to the object in the pattern</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <funcsynopsis>
+ <funcsynopsisinfo>
+#include &lt;fontconfig/fontconfig.h&gt;
+ </funcsynopsisinfo>
+ <funcprototype>
+ <funcdef>FcBool <function>FcPatternFindIter</function></funcdef>
+ <paramdef>const FcPattern *<parameter>p</parameter></paramdef>
+ <paramdef>FcPatternIter *<parameter>iter</parameter></paramdef>
+ <paramdef>const char *<parameter>object</parameter></paramdef>
+ </funcprototype>
+ </funcsynopsis>
+ </refsynopsisdiv>
+ <refsect1><title>Description</title>
+ <para>
+Set <parameter>iter</parameter> to point to <parameter>object</parameter> in
+<parameter>p</parameter> if any and returns FcTrue. returns FcFalse otherwise.
+ </para>
+ </refsect1>
+ <refsect1><title>Since</title>
+ <para>version 2.13.1</para>
+ </refsect1>
+ </refentry>
+<!--
+ fontconfig/doc/func.sgml
+
+ Copyright © 2003 Keith Packard
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of the author(s) not be used in
+ advertising or publicity pertaining to distribution of the software without
+ specific, written prior permission. The authors make no
+ representations about the suitability of this software for any purpose. It
+ is provided "as is" without express or implied warranty.
+
+ THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ PERFORMANCE OF THIS SOFTWARE.
+ -->
+ <refentry id="FcPatternIterIsValid">
+ <refmeta>
+ <refentrytitle>FcPatternIterIsValid</refentrytitle>
+ <manvolnum>3</manvolnum>
+ <refmiscinfo class="software">Fontconfig &version;</refmiscinfo>
+ </refmeta>
+ <refnamediv>
+ <refname>FcPatternIterIsValid</refname>
+ <refpurpose>Check whether the iterator is valid or not</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <funcsynopsis>
+ <funcsynopsisinfo>
+#include &lt;fontconfig/fontconfig.h&gt;
+ </funcsynopsisinfo>
+ <funcprototype>
+ <funcdef>FcBool <function>FcPatternIterIsValid</function></funcdef>
+ <paramdef>const FcPattern *<parameter>p</parameter></paramdef>
+ <paramdef>FcPatternIter :<parameter>iter</parameter></paramdef>
+ </funcprototype>
+ </funcsynopsis>
+ </refsynopsisdiv>
+ <refsect1><title>Description</title>
+ <para>
+Returns FcTrue if <parameter>iter</parameter> point to the valid entry
+in <parameter>p</parameter>. returns FcFalse otherwise.
+ </para>
+ </refsect1>
+ <refsect1><title>Since</title>
+ <para>version 2.13.1</para>
+ </refsect1>
+ </refentry>
+<!--
+ fontconfig/doc/func.sgml
+
+ Copyright © 2003 Keith Packard
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of the author(s) not be used in
+ advertising or publicity pertaining to distribution of the software without
+ specific, written prior permission. The authors make no
+ representations about the suitability of this software for any purpose. It
+ is provided "as is" without express or implied warranty.
+
+ THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ PERFORMANCE OF THIS SOFTWARE.
+ -->
+ <refentry id="FcPatternIterGetObject">
+ <refmeta>
+ <refentrytitle>FcPatternIterGetObject</refentrytitle>
+ <manvolnum>3</manvolnum>
+ <refmiscinfo class="software">Fontconfig &version;</refmiscinfo>
+ </refmeta>
+ <refnamediv>
+ <refname>FcPatternIterGetObject</refname>
+ <refpurpose>Returns an object name which the iterator point to</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <funcsynopsis>
+ <funcsynopsisinfo>
+#include &lt;fontconfig/fontconfig.h&gt;
+ </funcsynopsisinfo>
+ <funcprototype>
+ <funcdef>const char * <function>FcPatternIterGetObject</function></funcdef>
+ <paramdef>const FcPattern *<parameter>p</parameter></paramdef>
+ <paramdef>FcPatternIter *<parameter>iter</parameter></paramdef>
+ </funcprototype>
+ </funcsynopsis>
+ </refsynopsisdiv>
+ <refsect1><title>Description</title>
+ <para>
+Returns an object name in <parameter>p</parameter> which
+<parameter>iter</parameter> point to. returns NULL if
+<parameter>iter</parameter> isn't valid.
+ </para>
+ </refsect1>
+ <refsect1><title>Since</title>
+ <para>version 2.13.1</para>
+ </refsect1>
+ </refentry>
+<!--
+ fontconfig/doc/func.sgml
+
+ Copyright © 2003 Keith Packard
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of the author(s) not be used in
+ advertising or publicity pertaining to distribution of the software without
+ specific, written prior permission. The authors make no
+ representations about the suitability of this software for any purpose. It
+ is provided "as is" without express or implied warranty.
+
+ THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ PERFORMANCE OF THIS SOFTWARE.
+ -->
+ <refentry id="FcPatternIterValueCount">
+ <refmeta>
+ <refentrytitle>FcPatternIterValueCount</refentrytitle>
+ <manvolnum>3</manvolnum>
+ <refmiscinfo class="software">Fontconfig &version;</refmiscinfo>
+ </refmeta>
+ <refnamediv>
+ <refname>FcPatternIterValueCount</refname>
+ <refpurpose>Returns the number of the values which the iterator point to</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <funcsynopsis>
+ <funcsynopsisinfo>
+#include &lt;fontconfig/fontconfig.h&gt;
+ </funcsynopsisinfo>
+ <funcprototype>
+ <funcdef>int <function>FcPatternIterValueCount</function></funcdef>
+ <paramdef>const FcPattern *<parameter>p</parameter></paramdef>
+ <paramdef>FcPatternIter *<parameter>iter</parameter></paramdef>
+ </funcprototype>
+ </funcsynopsis>
+ </refsynopsisdiv>
+ <refsect1><title>Description</title>
+ <para>
+Returns the number of the values in the object which <parameter>iter</parameter>
+point to. if <parameter>iter</parameter> isn't valid, returns 0.
+ </para>
+ </refsect1>
+ <refsect1><title>Since</title>
+ <para>version 2.13.1</para>
+ </refsect1>
+ </refentry>
+<!--
+ fontconfig/doc/func.sgml
+
+ Copyright © 2003 Keith Packard
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of the author(s) not be used in
+ advertising or publicity pertaining to distribution of the software without
+ specific, written prior permission. The authors make no
+ representations about the suitability of this software for any purpose. It
+ is provided "as is" without express or implied warranty.
+
+ THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ PERFORMANCE OF THIS SOFTWARE.
+ -->
+ <refentry id="FcPatternIterGetValue">
+ <refmeta>
+ <refentrytitle>FcPatternIterGetValue</refentrytitle>
+ <manvolnum>3</manvolnum>
+ <refmiscinfo class="software">Fontconfig &version;</refmiscinfo>
+ </refmeta>
+ <refnamediv>
+ <refname>FcPatternIterGetValue</refname>
+ <refpurpose>Returns a value which the iterator point to</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <funcsynopsis>
+ <funcsynopsisinfo>
+#include &lt;fontconfig/fontconfig.h&gt;
+ </funcsynopsisinfo>
+ <funcprototype>
+ <funcdef>FcResult <function>FcPatternIterGetValue</function></funcdef>
+ <paramdef>const FcPattern *<parameter>p</parameter></paramdef>
+ <paramdef>FcPatternIter *<parameter>iter</parameter></paramdef>
+ <paramdef>int<parameter>id</parameter></paramdef>
+ <paramdef>FcValue *<parameter>v</parameter></paramdef>
+ <paramdef>FcValueBinding *<parameter>b</parameter></paramdef>
+ </funcprototype>
+ </funcsynopsis>
+ </refsynopsisdiv>
+ <refsect1><title>Description</title>
+ <para>
+Returns in <parameter>v</parameter> the <parameter>id</parameter>'th value
+which <parameter>iter</parameter> point to. also binding to <parameter>b</parameter>
+if given.
+The value returned is not a copy, but rather refers to the data stored
+within the pattern directly. Applications must not free this value.
+ </para>
+ </refsect1>
+ <refsect1><title>Since</title>
+ <para>version 2.13.1</para>
+ </refsect1>
+ </refentry>
+<!--
+ fontconfig/doc/func.sgml
+
+ Copyright © 2003 Keith Packard
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of the author(s) not be used in
+ advertising or publicity pertaining to distribution of the software without
+ specific, written prior permission. The authors make no
+ representations about the suitability of this software for any purpose. It
+ is provided "as is" without express or implied warranty.
+
+ THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ PERFORMANCE OF THIS SOFTWARE.
+ -->
<refentry id="FcPatternPrint">
<refmeta>
<refentrytitle>FcPatternPrint</refentrytitle>
diff --git a/doc/fontconfig-devel.pdf b/doc/fontconfig-devel.pdf
index 526ae798..6bc47c47 100644
--- a/doc/fontconfig-devel.pdf
+++ b/doc/fontconfig-devel.pdf
Binary files differ
diff --git a/doc/fontconfig-devel.txt b/doc/fontconfig-devel.txt
index dc638c30..34cafe41 100644
--- a/doc/fontconfig-devel.txt
+++ b/doc/fontconfig-devel.txt
@@ -1,478 +1,460 @@
-Fontconfig Developers Reference, Version 2.13.0
+ Fontconfig Developers Reference, Version 2.13.1
Copyright © 2002 Keith Packard
- Permission to use, copy, modify, distribute, and sell this
- software and its documentation for any purpose is hereby
- granted without fee, provided that the above copyright notice
- appear in all copies and that both that copyright notice and
- this permission notice appear in supporting documentation, and
- that the name of the author(s) not be used in advertising or
- publicity pertaining to distribution of the software without
- specific, written prior permission. The authors make no
- representations about the suitability of this software for any
- purpose. It is provided "as is" without express or implied
- warranty.
-
- THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS, IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY
- SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
- IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
- THIS SOFTWARE.
- _______________________________________________
+ Permission to use, copy, modify, distribute, and sell this software and
+ its documentation for any purpose is hereby granted without fee, provided
+ that the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of the author(s) not be used in
+ advertising or publicity pertaining to distribution of the software
+ without specific, written prior permission. The authors make no
+ representations about the suitability of this software for any purpose. It
+ is provided "as is" without express or implied warranty.
+
+ THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+ USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ PERFORMANCE OF THIS SOFTWARE.
+
+ -------------------------------------------------------
Table of Contents
- DESCRIPTION
- FUNCTIONAL OVERVIEW
- Datatypes
- FUNCTIONS
+
+ [1]DESCRIPTION
+
+ [2]FUNCTIONAL OVERVIEW
+
+ [3]Datatypes
+
+ [4]FUNCTIONS
DESCRIPTION
Fontconfig is a library designed to provide system-wide font
configuration, customization and application access.
- __________________________________________________________
+
+ --------------------------------------------------------------------------
FUNCTIONAL OVERVIEW
- Fontconfig contains two essential modules, the configuration
- module which builds an internal configuration from XML files
- and the matching module which accepts font patterns and returns
- the nearest matching font.
- __________________________________________________________
-
-FONT CONFIGURATION
-
- The configuration module consists of the FcConfig datatype,
- libexpat and FcConfigParse which walks over an XML tree and
- amends a configuration with data found within. From an external
- perspective, configuration of the library consists of
- generating a valid XML tree and feeding that to FcConfigParse.
- The only other mechanism provided to applications for changing
- the running configuration is to add fonts and directories to
- the list of application-provided font files.
-
- The intent is to make font configurations relatively static,
- and shared by as many applications as possible. It is hoped
- that this will lead to more stable font selection when passing
- names from one application to another. XML was chosen as a
- configuration file format because it provides a format which is
- easy for external agents to edit while retaining the correct
+ Fontconfig contains two essential modules, the configuration module which
+ builds an internal configuration from XML files and the matching module
+ which accepts font patterns and returns the nearest matching font.
+
+ --------------------------------------------------------------------------
+
+ FONT CONFIGURATION
+
+ The configuration module consists of the FcConfig datatype, libexpat and
+ FcConfigParse which walks over an XML tree and amends a configuration with
+ data found within. From an external perspective, configuration of the
+ library consists of generating a valid XML tree and feeding that to
+ FcConfigParse. The only other mechanism provided to applications for
+ changing the running configuration is to add fonts and directories to the
+ list of application-provided font files.
+
+ The intent is to make font configurations relatively static, and shared by
+ as many applications as possible. It is hoped that this will lead to more
+ stable font selection when passing names from one application to another.
+ XML was chosen as a configuration file format because it provides a format
+ which is easy for external agents to edit while retaining the correct
structure and syntax.
- Font configuration is separate from font matching; applications
- needing to do their own matching can access the available fonts
- from the library and perform private matching. The intent is to
- permit applications to pick and choose appropriate
- functionality from the library instead of forcing them to
- choose between this library and a private configuration
- mechanism. The hope is that this will ensure that configuration
- of fonts for all applications can be centralized in one place.
- Centralizing font configuration will simplify and regularize
- font installation and customization.
- __________________________________________________________
-
-FONT PROPERTIES
-
- While font patterns may contain essentially any properties,
- there are some well known properties with associated types.
- Fontconfig uses some of these properties for font matching and
- font completion. Others are provided as a convenience for the
- application's rendering mechanism.
+ Font configuration is separate from font matching; applications needing to
+ do their own matching can access the available fonts from the library and
+ perform private matching. The intent is to permit applications to pick and
+ choose appropriate functionality from the library instead of forcing them
+ to choose between this library and a private configuration mechanism. The
+ hope is that this will ensure that configuration of fonts for all
+ applications can be centralized in one place. Centralizing font
+ configuration will simplify and regularize font installation and
+ customization.
+
+ --------------------------------------------------------------------------
+
+ FONT PROPERTIES
+
+ While font patterns may contain essentially any properties, there are some
+ well known properties with associated types. Fontconfig uses some of these
+ properties for font matching and font completion. Others are provided as a
+ convenience for the application's rendering mechanism.
+
Property Definitions
Property C Preprocessor Symbol Type Description
----------------------------------------------------
family FC_FAMILY String Font family names
- familylang FC_FAMILYLANG String Language corresponding
- to
+ familylang FC_FAMILYLANG String Language corresponding to
each family name
- style FC_STYLE String Font style. Overrides
-weight
+ style FC_STYLE String Font style. Overrides weight
and slant
- stylelang FC_STYLELANG String Language corresponding
- to
+ stylelang FC_STYLELANG String Language corresponding to
each style name
- fullname FC_FULLNAME String Font face full name wh
-ere
- different from family
-and
+ fullname FC_FULLNAME String Font face full name where
+ different from family and
family + style
- fullnamelang FC_FULLNAMELANG String Language corresponding
- to
+ fullnamelang FC_FULLNAMELANG String Language corresponding to
each fullname
- slant FC_SLANT Int Italic, oblique or rom
-an
- weight FC_WEIGHT Int Light, medium, demibol
-d,
+ slant FC_SLANT Int Italic, oblique or roman
+ weight FC_WEIGHT Int Light, medium, demibold,
bold or black
size FC_SIZE Double Point size
- width FC_WIDTH Int Condensed, normal or e
-xpanded
- aspect FC_ASPECT Double Stretches glyphs horiz
-ontally
+ width FC_WIDTH Int Condensed, normal or expanded
+ aspect FC_ASPECT Double Stretches glyphs horizontally
before hinting
pixelsize FC_PIXEL_SIZE Double Pixel size
- spacing FC_SPACING Int Proportional, dual-wid
-th,
+ spacing FC_SPACING Int Proportional, dual-width,
monospace or charcell
foundry FC_FOUNDRY String Font foundry name
antialias FC_ANTIALIAS Bool Whether glyphs can be
antialiased
- hinting FC_HINTING Bool Whether the rasterizer
- should
+ hinting FC_HINTING Bool Whether the rasterizer should
use hinting
- hintstyle FC_HINT_STYLE Int Automatic hinting styl
-e
+ hintstyle FC_HINT_STYLE Int Automatic hinting style
verticallayout FC_VERTICAL_LAYOUT Bool Use vertical layout
- autohint FC_AUTOHINT Bool Use autohinter instead
- of
+ autohint FC_AUTOHINT Bool Use autohinter instead of
normal hinter
- globaladvance FC_GLOBAL_ADVANCE Bool Use font global advanc
-e data (deprecated)
- file FC_FILE String The filename holding t
-he font
- index FC_INDEX Int The index of the font
-within
+ globaladvance FC_GLOBAL_ADVANCE Bool Use font global advance data (deprecated)
+ file FC_FILE String The filename holding the font
+ index FC_INDEX Int The index of the font within
the file
- ftface FC_FT_FACE FT_Face Use the specified Free
-Type
+ ftface FC_FT_FACE FT_Face Use the specified FreeType
face object
- rasterizer FC_RASTERIZER String Which rasterizer is in
- use (deprecated)
- outline FC_OUTLINE Bool Whether the glyphs are
- outlines
- scalable FC_SCALABLE Bool Whether glyphs can be
-scaled
- scale FC_SCALE Double Scale factor for point
-->pixel
- conversions (deprecate
-d)
- symbol FC_SYMBOL Bool Whether font uses MS s
-ymbol-font encoding
- color FC_COLOR Bool Whether any glyphs hav
-e color
+ rasterizer FC_RASTERIZER String Which rasterizer is in use (deprecated)
+ outline FC_OUTLINE Bool Whether the glyphs are outlines
+ scalable FC_SCALABLE Bool Whether glyphs can be scaled
+ scale FC_SCALE Double Scale factor for point->pixel
+ conversions (deprecated)
+ symbol FC_SYMBOL Bool Whether font uses MS symbol-font encoding
+ color FC_COLOR Bool Whether any glyphs have color
dpi FC_DPI Double Target dots per inch
- rgba FC_RGBA Int unknown, rgb, bgr, vrg
-b,
- vbgr, none - subpixel
-geometry
+ rgba FC_RGBA Int unknown, rgb, bgr, vrgb,
+ vbgr, none - subpixel geometry
lcdfilter FC_LCD_FILTER Int Type of LCD filter
- minspace FC_MINSPACE Bool Eliminate leading from
- line
+ minspace FC_MINSPACE Bool Eliminate leading from line
spacing
- charset FC_CHARSET CharSet Unicode chars encoded
-by
+ charset FC_CHARSET CharSet Unicode chars encoded by
the font
lang FC_LANG LangSet Set of RFC-3066-style
- languages this font su
-pports
- fontversion FC_FONTVERSION Int Version number of the
-font
- capability FC_CAPABILITY String List of layout capabil
-ities in
+ languages this font supports
+ fontversion FC_FONTVERSION Int Version number of the font
+ capability FC_CAPABILITY String List of layout capabilities in
the font
- fontformat FC_FONTFORMAT String String name of the fon
-t format
+ fontformat FC_FONTFORMAT String String name of the font format
embolden FC_EMBOLDEN Bool Rasterizer should
- synthetically embolden
- the font
- embeddedbitmap FC_EMBEDDED_BITMAP Bool Use the embedded bitma
-p instead
+ synthetically embolden the font
+ embeddedbitmap FC_EMBEDDED_BITMAP Bool Use the embedded bitmap instead
of the outline
- decorative FC_DECORATIVE Bool Whether the style is a
- decorative
+ decorative FC_DECORATIVE Bool Whether the style is a decorative
variant
- fontfeatures FC_FONT_FEATURES String List of extra feature
-tags in
+ fontfeatures FC_FONT_FEATURES String List of extra feature tags in
OpenType to be enabled
- namelang FC_NAMELANG String Language name to be us
-ed for the
- default value of famil
-ylang,
- stylelang and fullname
-lang
- prgname FC_PRGNAME String Name of the running pr
-ogram
- hash FC_HASH String SHA256 hash value of t
-he font data
- with "sha256:" prefix
-(deprecated)
- postscriptname FC_POSTSCRIPT_NAME String Font name in PostScrip
-t
- __________________________________________________________
+ namelang FC_NAMELANG String Language name to be used for the
+ default value of familylang,
+ stylelang and fullnamelang
+ prgname FC_PRGNAME String Name of the running program
+ hash FC_HASH String SHA256 hash value of the font data
+ with "sha256:" prefix (deprecated)
+ postscriptname FC_POSTSCRIPT_NAME String Font name in PostScript
+
+
+ --------------------------------------------------------------------------
Datatypes
- Fontconfig uses abstract data types to hide internal
- implementation details for most data structures. A few
- structures are exposed where appropriate.
- __________________________________________________________
+ Fontconfig uses abstract data types to hide internal implementation
+ details for most data structures. A few structures are exposed where
+ appropriate.
+
+ --------------------------------------------------------------------------
+
+ FcChar8, FcChar16, FcChar32, FcBool
+
+ These are primitive data types; the FcChar* types hold precisely the
+ number of bits stated (if supported by the C implementation). FcBool holds
+ one of two C preprocessor symbols: FcFalse or FcTrue.
-FcChar8, FcChar16, FcChar32, FcBool
+ --------------------------------------------------------------------------
- These are primitive data types; the FcChar* types hold
- precisely the number of bits stated (if supported by the C
- implementation). FcBool holds one of two C preprocessor
- symbols: FcFalse or FcTrue.
- __________________________________________________________
+ FcMatrix
-FcMatrix
+ An FcMatrix holds an affine transformation, usually used to reshape
+ glyphs. A small set of matrix operations are provided to manipulate these.
- An FcMatrix holds an affine transformation, usually used to
- reshape glyphs. A small set of matrix operations are provided
- to manipulate these.
- typedef struct _FcMatrix {
- double xx, xy, yx, yy;
- } FcMatrix;
- __________________________________________________________
+ typedef struct _FcMatrix {
+ double xx, xy, yx, yy;
+ } FcMatrix;
-FcCharSet
- An FcCharSet is an abstract type that holds the set of encoded
- Unicode chars in a font. Operations to build and compare these
- sets are provided.
- __________________________________________________________
+ --------------------------------------------------------------------------
-FcLangSet
+ FcCharSet
- An FcLangSet is an abstract type that holds the set of
- languages supported by a font. Operations to build and compare
- these sets are provided. These are computed for a font based on
- orthographic information built into the fontconfig library.
- Fontconfig has orthographies for all of the ISO 639-1 languages
- except for MS, NA, PA, PS, QU, RN, RW, SD, SG, SN, SU and ZA.
- If you have orthographic information for any of these
- languages, please submit them.
- __________________________________________________________
+ An FcCharSet is an abstract type that holds the set of encoded Unicode
+ chars in a font. Operations to build and compare these sets are provided.
-FcLangResult
+ --------------------------------------------------------------------------
- An FcLangResult is an enumeration used to return the results of
- comparing two language strings or FcLangSet objects.
- FcLangEqual means the objects match language and territory.
- FcLangDifferentTerritory means the objects match in language
- but differ in territory. FcLangDifferentLang means the objects
- differ in language.
- __________________________________________________________
+ FcLangSet
-FcType
+ An FcLangSet is an abstract type that holds the set of languages supported
+ by a font. Operations to build and compare these sets are provided. These
+ are computed for a font based on orthographic information built into the
+ fontconfig library. Fontconfig has orthographies for all of the ISO 639-1
+ languages except for MS, NA, PA, PS, QU, RN, RW, SD, SG, SN, SU and ZA. If
+ you have orthographic information for any of these languages, please
+ submit them.
+
+ --------------------------------------------------------------------------
+
+ FcLangResult
+
+ An FcLangResult is an enumeration used to return the results of comparing
+ two language strings or FcLangSet objects. FcLangEqual means the objects
+ match language and territory. FcLangDifferentTerritory means the objects
+ match in language but differ in territory. FcLangDifferentLang means the
+ objects differ in language.
+
+ --------------------------------------------------------------------------
+
+ FcType
Tags the kind of data stored in an FcValue.
- __________________________________________________________
-
-FcValue
-
- An FcValue object holds a single value with one of a number of
- different types. The 'type' tag indicates which member is
- valid.
- typedef struct _FcValue {
- FcType type;
- union {
- const FcChar8 *s;
- int i;
- FcBool b;
- double d;
- const FcMatrix *m;
- const FcCharSet *c;
- void *f;
- const FcLangSet *l;
- } u;
- } FcValue;
-
- FcValue Members
-
- Type Union member Datatype
- --------------------------------
- FcTypeVoid (none) (none)
- FcTypeInteger i int
- FcTypeDouble d double
- FcTypeString s FcChar8 *
- FcTypeBool b b
- FcTypeMatrix m FcMatrix *
- FcTypeCharSet c FcCharSet *
- FcTypeFTFace f void * (FT_Face)
- FcTypeLangSet l FcLangSet *
- __________________________________________________________
-
-FcPattern
-
- holds a set of names with associated value lists; each name
- refers to a property of a font. FcPatterns are used as inputs
- to the matching code as well as holding information about
- specific fonts. Each property can hold one or more values;
- conventionally all of the same type, although the interface
- doesn't demand that.
- __________________________________________________________
-
-FcFontSet
-
- typedef struct _FcFontSet {
- int nfont;
- int sfont;
- FcPattern **fonts;
- } FcFontSet;
-
- An FcFontSet contains a list of FcPatterns. Internally
- fontconfig uses this data structure to hold sets of fonts.
- Externally, fontconfig returns the results of listing fonts in
- this format. 'nfont' holds the number of patterns in the
- 'fonts' array; 'sfont' is used to indicate the size of that
- array.
- __________________________________________________________
-
-FcStrSet, FcStrList
-
- FcStrSet holds a list of strings that can be appended to and
- enumerated. Its unique characteristic is that the enumeration
- works even while strings are appended during enumeration.
- FcStrList is used during enumeration to safely and correctly
- walk the list of strings even while that list is edited in the
- middle of enumeration.
- __________________________________________________________
-
-FcObjectSet
-
- typedef struct _FcObjectSet {
- int nobject;
- int sobject;
- const char **objects;
- } FcObjectSet;
-
- holds a set of names and is used to specify which fields from
- fonts are placed in the the list of returned patterns when
- listing fonts.
- __________________________________________________________
-
-FcObjectType
-
- typedef struct _FcObjectType {
- const char *object;
- FcType type;
- } FcObjectType;
-
- marks the type of a pattern element generated when parsing font
- names. Applications can add new object types so that font names
- may contain the new elements.
- __________________________________________________________
-
-FcConstant
-
- typedef struct _FcConstant {
- const FcChar8 *name;
- const char *object;
- int value;
- } FcConstant;
-
- Provides for symbolic constants for new pattern elements. When
- 'name' is seen in a font name, an 'object' element is created
- with value 'value'.
- __________________________________________________________
-
-FcBlanks
-
- holds a list of Unicode chars which are expected to be blank;
- unexpectedly blank chars are assumed to be invalid and are
- elided from the charset associated with the font.
-
- FcBlanks is deprecated and should not be used in newly written
- code. It is still accepted by some functions for compatibility
- with older code but will be removed in the future.
- __________________________________________________________
-
-FcFileCache
-
- holds the per-user cache information for use while loading the
- font database. This is built automatically for the current
- configuration when that is loaded. Applications must always
- pass '0' when one is requested.
- __________________________________________________________
-
-FcConfig
-
- holds a complete configuration of the library; there is one
- default configuration, other can be constructed from XML data
- structures. All public entry points that need global data can
- take an optional FcConfig* argument; passing 0 uses the default
- configuration. FcConfig objects hold two sets of fonts, the
- first contains those specified by the configuration, the second
- set holds those added by the application at run-time.
- Interfaces that need to reference a particular set use one of
+
+ --------------------------------------------------------------------------
+
+ FcValue
+
+ An FcValue object holds a single value with one of a number of different
+ types. The 'type' tag indicates which member is valid.
+
+ typedef struct _FcValue {
+ FcType type;
+ union {
+ const FcChar8 *s;
+ int i;
+ FcBool b;
+ double d;
+ const FcMatrix *m;
+ const FcCharSet *c;
+ void *f;
+ const FcLangSet *l;
+ } u;
+ } FcValue;
+
+
+ FcValue Members
+
+ Type Union member Datatype
+ --------------------------------
+ FcTypeVoid (none) (none)
+ FcTypeInteger i int
+ FcTypeDouble d double
+ FcTypeString s FcChar8 *
+ FcTypeBool b b
+ FcTypeMatrix m FcMatrix *
+ FcTypeCharSet c FcCharSet *
+ FcTypeFTFace f void * (FT_Face)
+ FcTypeLangSet l FcLangSet *
+
+
+ --------------------------------------------------------------------------
+
+ FcPattern
+
+ holds a set of names with associated value lists; each name refers to a
+ property of a font. FcPatterns are used as inputs to the matching code as
+ well as holding information about specific fonts. Each property can hold
+ one or more values; conventionally all of the same type, although the
+ interface doesn't demand that.
+
+ --------------------------------------------------------------------------
+
+ FcFontSet
+
+ typedef struct _FcFontSet {
+ int nfont;
+ int sfont;
+ FcPattern **fonts;
+ } FcFontSet;
+
+
+ An FcFontSet contains a list of FcPatterns. Internally fontconfig uses
+ this data structure to hold sets of fonts. Externally, fontconfig returns
+ the results of listing fonts in this format. 'nfont' holds the number of
+ patterns in the 'fonts' array; 'sfont' is used to indicate the size of
+ that array.
+
+ --------------------------------------------------------------------------
+
+ FcStrSet, FcStrList
+
+ FcStrSet holds a list of strings that can be appended to and enumerated.
+ Its unique characteristic is that the enumeration works even while strings
+ are appended during enumeration. FcStrList is used during enumeration to
+ safely and correctly walk the list of strings even while that list is
+ edited in the middle of enumeration.
+
+ --------------------------------------------------------------------------
+
+ FcObjectSet
+
+ typedef struct _FcObjectSet {
+ int nobject;
+ int sobject;
+ const char **objects;
+ } FcObjectSet;
+
+
+ holds a set of names and is used to specify which fields from fonts are
+ placed in the the list of returned patterns when listing fonts.
+
+ --------------------------------------------------------------------------
+
+ FcObjectType
+
+ typedef struct _FcObjectType {
+ const char *object;
+ FcType type;
+ } FcObjectType;
+
+
+ marks the type of a pattern element generated when parsing font names.
+ Applications can add new object types so that font names may contain the
+ new elements.
+
+ --------------------------------------------------------------------------
+
+ FcConstant
+
+ typedef struct _FcConstant {
+ const FcChar8 *name;
+ const char *object;
+ int value;
+ } FcConstant;
+
+
+ Provides for symbolic constants for new pattern elements. When 'name' is
+ seen in a font name, an 'object' element is created with value 'value'.
+
+ --------------------------------------------------------------------------
+
+ FcBlanks
+
+ holds a list of Unicode chars which are expected to be blank; unexpectedly
+ blank chars are assumed to be invalid and are elided from the charset
+ associated with the font.
+
+ FcBlanks is deprecated and should not be used in newly written code. It is
+ still accepted by some functions for compatibility with older code but
+ will be removed in the future.
+
+ --------------------------------------------------------------------------
+
+ FcFileCache
+
+ holds the per-user cache information for use while loading the font
+ database. This is built automatically for the current configuration when
+ that is loaded. Applications must always pass '0' when one is requested.
+
+ --------------------------------------------------------------------------
+
+ FcConfig
+
+ holds a complete configuration of the library; there is one default
+ configuration, other can be constructed from XML data structures. All
+ public entry points that need global data can take an optional FcConfig*
+ argument; passing 0 uses the default configuration. FcConfig objects hold
+ two sets of fonts, the first contains those specified by the
+ configuration, the second set holds those added by the application at
+ run-time. Interfaces that need to reference a particular set use one of
the FcSetName enumerated values.
- __________________________________________________________
-
-FcSetName
-
- Specifies one of the two sets of fonts available in a
- configuration; FcSetSystem for those fonts specified in the
- configuration and FcSetApplication which holds fonts provided
- by the application.
- __________________________________________________________
-
-FcResult
-
- Used as a return type for functions manipulating FcPattern
- objects.
- FcResult Values
- Result Code Meaning
- -----------------------------------------------------------
- FcResultMatch Object exists with the specified ID
- FcResultNoMatch Object doesn't exist at all
- FcResultTypeMismatch Object exists, but the type doesn't matc
-h
- FcResultNoId Object exists, but has fewer values
- than specified
- FcResultOutOfMemory malloc failed
- __________________________________________________________
-
-FcAtomic
-
- Used for locking access to configuration files. Provides a safe
- way to update configuration files.
- __________________________________________________________
-
-FcCache
-
- Holds information about the fonts contained in a single
- directory. Normal applications need not worry about this as
- caches for font access are automatically managed by the
- library. Applications dealing with cache management may want to
- use some of these objects in their work, however the included
- 'fc-cache' program generally suffices for all of that.
- __________________________________________________________
+
+ --------------------------------------------------------------------------
+
+ FcSetName
+
+ Specifies one of the two sets of fonts available in a configuration;
+ FcSetSystem for those fonts specified in the configuration and
+ FcSetApplication which holds fonts provided by the application.
+
+ --------------------------------------------------------------------------
+
+ FcResult
+
+ Used as a return type for functions manipulating FcPattern objects.
+
+ FcResult Values
+ Result Code Meaning
+ -----------------------------------------------------------
+ FcResultMatch Object exists with the specified ID
+ FcResultNoMatch Object doesn't exist at all
+ FcResultTypeMismatch Object exists, but the type doesn't match
+ FcResultNoId Object exists, but has fewer values
+ than specified
+ FcResultOutOfMemory malloc failed
+
+
+ --------------------------------------------------------------------------
+
+ FcAtomic
+
+ Used for locking access to configuration files. Provides a safe way to
+ update configuration files.
+
+ --------------------------------------------------------------------------
+
+ FcCache
+
+ Holds information about the fonts contained in a single directory. Normal
+ applications need not worry about this as caches for font access are
+ automatically managed by the library. Applications dealing with cache
+ management may want to use some of these objects in their work, however
+ the included 'fc-cache' program generally suffices for all of that.
+
+ --------------------------------------------------------------------------
FUNCTIONS
- These are grouped by functionality, often using the main data
- type being manipulated.
- __________________________________________________________
+ These are grouped by functionality, often using the main data type being
+ manipulated.
+
+ --------------------------------------------------------------------------
-Initialization
+ Initialization
Table of Contents
- FcInitLoadConfig -- load configuration
- FcInitLoadConfigAndFonts -- load configuration and font data
- FcInit -- initialize fontconfig library
- FcFini -- finalize fontconfig library
- FcGetVersion -- library version number
- FcInitReinitialize -- re-initialize library
- FcInitBringUptoDate -- reload configuration files if needed
- These functions provide some control over how the library is
- initialized.
+ [5]FcInitLoadConfig -- load configuration
+
+ [6]FcInitLoadConfigAndFonts -- load configuration and font data
-FcInitLoadConfig
+ [7]FcInit -- initialize fontconfig library
+
+ [8]FcFini -- finalize fontconfig library
+
+ [9]FcGetVersion -- library version number
+
+ [10]FcInitReinitialize -- re-initialize library
+
+ [11]FcInitBringUptoDate -- reload configuration files if needed
+
+ These functions provide some control over how the library is initialized.
+
+ FcInitLoadConfig
Name
- FcInitLoadConfig -- load configuration
+ FcInitLoadConfig -- load configuration
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcConfig * FcInitLoadConfig(void);
@@ -481,71 +463,74 @@ Description
Loads the default configuration file and returns the resulting
configuration. Does not load any font information.
-FcInitLoadConfigAndFonts
+ FcInitLoadConfigAndFonts
Name
- FcInitLoadConfigAndFonts -- load configuration and font data
+ FcInitLoadConfigAndFonts -- load configuration and font data
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcConfig * FcInitLoadConfigAndFonts(void);
Description
- Loads the default configuration file and builds information
- about the available fonts. Returns the resulting configuration.
+ Loads the default configuration file and builds information about the
+ available fonts. Returns the resulting configuration.
-FcInit
+ FcInit
Name
- FcInit -- initialize fontconfig library
+ FcInit -- initialize fontconfig library
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBool FcInit(void);
Description
- Loads the default configuration file and the fonts referenced
- therein and sets the default configuration to that result.
- Returns whether this process succeeded or not. If the default
- configuration has already been loaded, this routine does
- nothing and returns FcTrue.
+ Loads the default configuration file and the fonts referenced therein and
+ sets the default configuration to that result. Returns whether this
+ process succeeded or not. If the default configuration has already been
+ loaded, this routine does nothing and returns FcTrue.
-FcFini
+ FcFini
Name
- FcFini -- finalize fontconfig library
+ FcFini -- finalize fontconfig library
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
void FcFini(void);
Description
- Frees all data structures allocated by previous calls to
- fontconfig functions. Fontconfig returns to an uninitialized
- state, requiring a new call to one of the FcInit functions
- before any other fontconfig function may be called.
+ Frees all data structures allocated by previous calls to fontconfig
+ functions. Fontconfig returns to an uninitialized state, requiring a new
+ call to one of the FcInit functions before any other fontconfig function
+ may be called.
-FcGetVersion
+ FcGetVersion
Name
- FcGetVersion -- library version number
+ FcGetVersion -- library version number
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
int FcGetVersion(void);
@@ -553,515 +538,764 @@ Description
Returns the version number of the library.
-FcInitReinitialize
+ FcInitReinitialize
Name
- FcInitReinitialize -- re-initialize library
+ FcInitReinitialize -- re-initialize library
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBool FcInitReinitialize(void);
Description
- Forces the default configuration file to be reloaded and resets
- the default configuration. Returns FcFalse if the configuration
- cannot be reloaded (due to configuration file errors,
- allocation failures or other issues) and leaves the existing
- configuration unchanged. Otherwise returns FcTrue.
+ Forces the default configuration file to be reloaded and resets the
+ default configuration. Returns FcFalse if the configuration cannot be
+ reloaded (due to configuration file errors, allocation failures or other
+ issues) and leaves the existing configuration unchanged. Otherwise returns
+ FcTrue.
-FcInitBringUptoDate
+ FcInitBringUptoDate
Name
- FcInitBringUptoDate -- reload configuration files if needed
+ FcInitBringUptoDate -- reload configuration files if needed
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBool FcInitBringUptoDate(void);
Description
- Checks the rescan interval in the default configuration,
- checking the configuration if the interval has passed and
- reloading the configuration if when any changes are detected.
- Returns FcFalse if the configuration cannot be reloaded (see
- FcInitReinitialize). Otherwise returns FcTrue.
- __________________________________________________________
+ Checks the rescan interval in the default configuration, checking the
+ configuration if the interval has passed and reloading the configuration
+ if when any changes are detected. Returns FcFalse if the configuration
+ cannot be reloaded (see FcInitReinitialize). Otherwise returns FcTrue.
+
+ --------------------------------------------------------------------------
-FcPattern
+ FcPattern
Table of Contents
- FcPatternCreate -- Create a pattern
- FcPatternDuplicate -- Copy a pattern
- FcPatternReference -- Increment pattern reference count
- FcPatternDestroy -- Destroy a pattern
- FcPatternEqual -- Compare patterns
- FcPatternEqualSubset -- Compare portions of patterns
- FcPatternFilter -- Filter the objects of pattern
- FcPatternHash -- Compute a pattern hash value
- FcPatternAdd -- Add a value to a pattern
- FcPatternAddWeak -- Add a value to a pattern with weak binding
- FcPatternAdd-Type -- Add a typed value to a pattern
- FcPatternGetWithBinding -- Return a value with binding from a
- pattern
- FcPatternGet -- Return a value from a pattern
- FcPatternGet-Type -- Return a typed value from a pattern
- FcPatternBuild -- Create patterns from arguments
- FcPatternDel -- Delete a property from a pattern
- FcPatternRemove -- Remove one object of the specified type from
- the pattern
+ [12]FcPatternCreate -- Create a pattern
+
+ [13]FcPatternDuplicate -- Copy a pattern
+
+ [14]FcPatternReference -- Increment pattern reference count
+
+ [15]FcPatternDestroy -- Destroy a pattern
+
+ [16]FcPatternObjectCount -- Returns the number of the object
+
+ [17]FcPatternEqual -- Compare patterns
+
+ [18]FcPatternEqualSubset -- Compare portions of patterns
+
+ [19]FcPatternFilter -- Filter the objects of pattern
+
+ [20]FcPatternHash -- Compute a pattern hash value
+
+ [21]FcPatternAdd -- Add a value to a pattern
+
+ [22]FcPatternAddWeak -- Add a value to a pattern with weak binding
+
+ [23]FcPatternAdd-Type -- Add a typed value to a pattern
+
+ [24]FcPatternGetWithBinding -- Return a value with binding from a pattern
+
+ [25]FcPatternGet -- Return a value from a pattern
+
+ [26]FcPatternGet-Type -- Return a typed value from a pattern
+
+ [27]FcPatternBuild -- Create patterns from arguments
+
+ [28]FcPatternDel -- Delete a property from a pattern
+
+ [29]FcPatternRemove -- Remove one object of the specified type from the
+ pattern
+
+ [30]FcPatternIterStart -- Initialize the iterator with the first iterator
+ in the pattern
+
+ [31]FcPatternIterNext -- 
+
+ [32]FcPatternIterEqual -- Compare iterators
- FcPatternPrint -- Print a pattern for debugging
- FcDefaultSubstitute -- Perform default substitutions in a
- pattern
+ [33]FcPatternFindIter -- Set the iterator to point to the object in the
+ pattern
+
+ [34]FcPatternIterIsValid -- Check whether the iterator is valid or not
+
+ [35]FcPatternIterGetObject -- Returns an object name which the iterator
+ point to
+
+ [36]FcPatternIterValueCount -- Returns the number of the values which the
+ iterator point to
+
+ [37]FcPatternIterGetValue -- Returns a value which the iterator point to
+
+ [38]FcPatternPrint -- Print a pattern for debugging
- FcNameParse -- Parse a pattern string
- FcNameUnparse -- Convert a pattern back into a string that can
- be parsed
+ [39]FcDefaultSubstitute -- Perform default substitutions in a pattern
- FcPatternFormat -- Format a pattern into a string according to
- a format specifier
+ [40]FcNameParse -- Parse a pattern string
- An FcPattern is an opaque type that holds both patterns to
- match against the available fonts, as well as the information
- about each font.
+ [41]FcNameUnparse -- Convert a pattern back into a string that can be
+ parsed
-FcPatternCreate
+ [42]FcPatternFormat -- Format a pattern into a string according to a
+ format specifier
+
+ An FcPattern is an opaque type that holds both patterns to match against
+ the available fonts, as well as the information about each font.
+
+ FcPatternCreate
Name
- FcPatternCreate -- Create a pattern
+ FcPatternCreate -- Create a pattern
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcPattern * FcPatternCreate(void);
Description
- Creates a pattern with no properties; used to build patterns
- from scratch.
+ Creates a pattern with no properties; used to build patterns from scratch.
-FcPatternDuplicate
+ FcPatternDuplicate
Name
- FcPatternDuplicate -- Copy a pattern
+ FcPatternDuplicate -- Copy a pattern
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcPattern * FcPatternDuplicate(const FcPattern *p);
Description
- Copy a pattern, returning a new pattern that matches p. Each
- pattern may be modified without affecting the other.
+ Copy a pattern, returning a new pattern that matches p. Each pattern may
+ be modified without affecting the other.
-FcPatternReference
+ FcPatternReference
Name
- FcPatternReference -- Increment pattern reference count
+ FcPatternReference -- Increment pattern reference count
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
void FcPatternReference(FcPattern *p);
Description
- Add another reference to p. Patterns are freed only when the
- reference count reaches zero.
+ Add another reference to p. Patterns are freed only when the reference
+ count reaches zero.
-FcPatternDestroy
+ FcPatternDestroy
Name
- FcPatternDestroy -- Destroy a pattern
+ FcPatternDestroy -- Destroy a pattern
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
void FcPatternDestroy(FcPattern *p);
Description
- Decrement the pattern reference count. If all references are
- gone, destroys the pattern, in the process destroying all
- related values.
+ Decrement the pattern reference count. If all references are gone,
+ destroys the pattern, in the process destroying all related values.
-FcPatternEqual
+ FcPatternObjectCount
Name
- FcPatternEqual -- Compare patterns
+ FcPatternObjectCount -- Returns the number of the object
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
- FcBool FcPatternEqual(const FcPattern *pa, const FcPattern
- *pb);
+
+ int FcPatternObjectCount(const FcPattern *p);
+
+Description
+
+ Returns the number of the object p has.
+
+Since
+
+ version 2.13.1
+
+ FcPatternEqual
+
+Name
+
+ FcPatternEqual -- Compare patterns
+
+Synopsis
+
+ #include <fontconfig/fontconfig.h>
+
+
+ FcBool FcPatternEqual(const FcPattern *pa, const FcPattern *pb);
Description
Returns whether pa and pb are exactly alike.
-FcPatternEqualSubset
+ FcPatternEqualSubset
Name
- FcPatternEqualSubset -- Compare portions of patterns
+ FcPatternEqualSubset -- Compare portions of patterns
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- FcBool FcPatternEqualSubset(const FcPattern *pa, const
- FcPattern *pb, const FcObjectSet *os);
+ FcBool FcPatternEqualSubset(const FcPattern *pa, const FcPattern *pb,
+ const FcObjectSet *os);
Description
- Returns whether pa and pb have exactly the same values for all
- of the objects in os.
+ Returns whether pa and pb have exactly the same values for all of the
+ objects in os.
-FcPatternFilter
+ FcPatternFilter
Name
- FcPatternFilter -- Filter the objects of pattern
+ FcPatternFilter -- Filter the objects of pattern
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcPattern * FcPatternFilter(FcPattern *p, const FcObjectSet *);
Description
- Returns a new pattern that only has those objects from p that
- are in os. If os is NULL, a duplicate of p is returned.
+ Returns a new pattern that only has those objects from p that are in os.
+ If os is NULL, a duplicate of p is returned.
-FcPatternHash
+ FcPatternHash
Name
- FcPatternHash -- Compute a pattern hash value
+ FcPatternHash -- Compute a pattern hash value
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcChar32 FcPatternHash(const FcPattern *p);
Description
- Returns a 32-bit number which is the same for any two patterns
- which are equal.
+ Returns a 32-bit number which is the same for any two patterns which are
+ equal.
-FcPatternAdd
+ FcPatternAdd
Name
- FcPatternAdd -- Add a value to a pattern
+ FcPatternAdd -- Add a value to a pattern
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- FcBool FcPatternAdd(FcPattern *p, const char *object, FcValue
- value, FcBool append);
+ FcBool FcPatternAdd(FcPattern *p, const char *object, FcValue value,
+ FcBool append);
Description
- Adds a single value to the list of values associated with the
- property named `object. If `append is FcTrue, the value is
- added at the end of any existing list, otherwise it is inserted
- at the beginning. `value' is saved (with FcValueSave) when
- inserted into the pattern so that the library retains no
- reference to any application-supplied data structure.
+ Adds a single value to the list of values associated with the property
+ named `object. If `append is FcTrue, the value is added at the end of any
+ existing list, otherwise it is inserted at the beginning. `value' is saved
+ (with FcValueSave) when inserted into the pattern so that the library
+ retains no reference to any application-supplied data structure.
-FcPatternAddWeak
+ FcPatternAddWeak
Name
- FcPatternAddWeak -- Add a value to a pattern with weak binding
+ FcPatternAddWeak -- Add a value to a pattern with weak binding
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- FcBool FcPatternAddWeak(FcPattern *p, const char *object,
- FcValue value, FcBool append);
+ FcBool FcPatternAddWeak(FcPattern *p, const char *object, FcValue value,
+ FcBool append);
Description
- FcPatternAddWeak is essentially the same as FcPatternAdd except
- that any values added to the list have binding weak instead of
- strong.
+ FcPatternAddWeak is essentially the same as FcPatternAdd except that any
+ values added to the list have binding weak instead of strong.
-FcPatternAdd-Type
+ FcPatternAdd-Type
Name
FcPatternAddInteger, FcPatternAddDouble, FcPatternAddString,
FcPatternAddMatrix, FcPatternAddCharSet, FcPatternAddBool,
- FcPatternAddFTFace, FcPatternAddLangSet,
- FcPatternAddRange -- Add a typed value to a pattern
+ FcPatternAddFTFace, FcPatternAddLangSet, FcPatternAddRange -- Add a typed
+ value to a pattern
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
- FcBool FcPatternAddInteger(FcPattern *p, const char *object,
- int i);
- FcBool FcPatternAddDouble(FcPattern *p, const char *object,
- double d);
+ FcBool FcPatternAddInteger(FcPattern *p, const char *object, int i);
- FcBool FcPatternAddString(FcPattern *p, const char *object,
- const FcChar8 *s);
+ FcBool FcPatternAddDouble(FcPattern *p, const char *object, double d);
- FcBool FcPatternAddMatrix(FcPattern *p, const char *object,
- const FcMatrix *m);
+ FcBool FcPatternAddString(FcPattern *p, const char *object, const FcChar8
+ *s);
- FcBool FcPatternAddCharSet(FcPattern *p, const char *object,
- const FcCharSet *c);
+ FcBool FcPatternAddMatrix(FcPattern *p, const char *object, const FcMatrix
+ *m);
- FcBool FcPatternAddBool(FcPattern *p, const char *object,
- FcBool b);
+ FcBool FcPatternAddCharSet(FcPattern *p, const char *object, const
+ FcCharSet *c);
- FcBool FcPatternAddFTFace(FcPattern *p, const char *object,
- const FT_Facef);
+ FcBool FcPatternAddBool(FcPattern *p, const char *object, FcBool b);
- FcBool FcPatternAddLangSet(FcPattern *p, const char *object,
- const FcLangSet *l);
+ FcBool FcPatternAddFTFace(FcPattern *p, const char *object, const
+ FT_Facef);
- FcBool FcPatternAddRange(FcPattern *p, const char *object,
- const FcRange *r);
+ FcBool FcPatternAddLangSet(FcPattern *p, const char *object, const
+ FcLangSet *l);
+
+ FcBool FcPatternAddRange(FcPattern *p, const char *object, const FcRange
+ *r);
Description
- These are all convenience functions that insert objects of the
- specified type into the pattern. Use these in preference to
- FcPatternAdd as they will provide compile-time typechecking.
- These all append values to any existing list of values.
- FcPatternAddRange are available since 2.11.91.
+ These are all convenience functions that insert objects of the specified
+ type into the pattern. Use these in preference to FcPatternAdd as they
+ will provide compile-time typechecking. These all append values to any
+ existing list of values. FcPatternAddRange are available since 2.11.91.
-FcPatternGetWithBinding
+ FcPatternGetWithBinding
Name
- FcPatternGetWithBinding -- Return a value with binding from a
- pattern
+ FcPatternGetWithBinding -- Return a value with binding from a pattern
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- FcResult FcPatternGetWithBinding(FcPattern *p, const char
- *object, int id, FcValue *v, FcValueBinding *b);
+ FcResult FcPatternGetWithBinding(FcPattern *p, const char *object, int id,
+ FcValue *v, FcValueBinding *b);
Description
- Returns in v the id'th value and b binding for that associated
- with the property object. The Value returned is not a copy, but
- rather refers to the data stored within the pattern directly.
- Applications must not free this value.
+ Returns in v the id'th value and b binding for that associated with the
+ property object. The Value returned is not a copy, but rather refers to
+ the data stored within the pattern directly. Applications must not free
+ this value.
Since
version 2.12.5
-FcPatternGet
+ FcPatternGet
Name
- FcPatternGet -- Return a value from a pattern
+ FcPatternGet -- Return a value from a pattern
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
- FcResult FcPatternGet(FcPattern *p, const char *object, int id,
- FcValue *v);
+
+ FcResult FcPatternGet(FcPattern *p, const char *object, int id, FcValue
+ *v);
Description
- Returns in v the id'th value associated with the property
- object. The value returned is not a copy, but rather refers to
- the data stored within the pattern directly. Applications must
- not free this value.
+ Returns in v the id'th value associated with the property object. The
+ value returned is not a copy, but rather refers to the data stored within
+ the pattern directly. Applications must not free this value.
-FcPatternGet-Type
+ FcPatternGet-Type
Name
FcPatternGetInteger, FcPatternGetDouble, FcPatternGetString,
FcPatternGetMatrix, FcPatternGetCharSet, FcPatternGetBool,
- FcPatternGetFTFace, FcPatternGetLangSet,
- FcPatternGetRange -- Return a typed value from a pattern
+ FcPatternGetFTFace, FcPatternGetLangSet, FcPatternGetRange -- Return a
+ typed value from a pattern
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- FcResult FcPatternGetInteger(FcPattern *p, const char *object,
- int n, int *i);
+ FcResult FcPatternGetInteger(FcPattern *p, const char *object, int n, int
+ *i);
- FcResult FcPatternGetDouble(FcPattern *p, const char *object,
- int n, double *d);
+ FcResult FcPatternGetDouble(FcPattern *p, const char *object, int n,
+ double *d);
- FcResult FcPatternGetString(FcPattern *p, const char *object,
- int n, FcChar8 **s);
+ FcResult FcPatternGetString(FcPattern *p, const char *object, int n,
+ FcChar8 **s);
- FcResult FcPatternGetMatrix(FcPattern *p, const char *object,
- int n, FcMatrix **s);
+ FcResult FcPatternGetMatrix(FcPattern *p, const char *object, int n,
+ FcMatrix **s);
- FcResult FcPatternGetCharSet(FcPattern *p, const char *object,
- int n, FcCharSet **c);
+ FcResult FcPatternGetCharSet(FcPattern *p, const char *object, int n,
+ FcCharSet **c);
- FcResult FcPatternGetBool(FcPattern *p, const char *object, int
- n, FcBool *b);
+ FcResult FcPatternGetBool(FcPattern *p, const char *object, int n, FcBool
+ *b);
- FcResult FcPatternGetFTFace(FcPattern *p, const char *object,
- int n, FT_Face *f);
+ FcResult FcPatternGetFTFace(FcPattern *p, const char *object, int n,
+ FT_Face *f);
- FcResult FcPatternGetLangSet(FcPattern *p, const char *object,
- int n, FcLangSet **l);
+ FcResult FcPatternGetLangSet(FcPattern *p, const char *object, int n,
+ FcLangSet **l);
- FcResult FcPatternGetRange(FcPattern *p, const char *object,
- int n, FcRange **r);
+ FcResult FcPatternGetRange(FcPattern *p, const char *object, int n,
+ FcRange **r);
Description
- These are convenience functions that call FcPatternGet and
- verify that the returned data is of the expected type. They
- return FcResultTypeMismatch if this is not the case. Note that
- these (like FcPatternGet) do not make a copy of any data
- structure referenced by the return value. Use these in
- preference to FcPatternGet to provide compile-time
- typechecking. FcPatternGetRange are available since 2.11.91.
+ These are convenience functions that call FcPatternGet and verify that the
+ returned data is of the expected type. They return FcResultTypeMismatch if
+ this is not the case. Note that these (like FcPatternGet) do not make a
+ copy of any data structure referenced by the return value. Use these in
+ preference to FcPatternGet to provide compile-time typechecking.
+ FcPatternGetRange are available since 2.11.91.
-FcPatternBuild
+ FcPatternBuild
Name
- FcPatternBuild, FcPatternVaBuild, FcPatternVapBuild -- Create
- patterns from arguments
+ FcPatternBuild, FcPatternVaBuild, FcPatternVapBuild -- Create patterns
+ from arguments
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcPattern * FcPatternBuild(FcPattern *pattern, ...);
FcPattern * FcPatternVaBuild(FcPattern *pattern, va_list va);
- void FcPatternVapBuild(FcPattern *result, FcPattern *pattern,
- va_list va);
+ void FcPatternVapBuild(FcPattern *result, FcPattern *pattern, va_list va);
Description
- Builds a pattern using a list of objects, types and values.
- Each value to be entered in the pattern is specified with three
- arguments:
+ Builds a pattern using a list of objects, types and values. Each value to
+ be entered in the pattern is specified with three arguments:
+
+  1. Object name, a string describing the property to be added.
+
+  2. Object type, one of the FcType enumerated values
- 1. Object name, a string describing the property to be added.
- 2. Object type, one of the FcType enumerated values
- 3. Value, not an FcValue, but the raw type as passed to any of
- the FcPatternAdd<type> functions. Must match the type of
- the second argument.
+  3. Value, not an FcValue, but the raw type as passed to any of the
+ FcPatternAdd<type> functions. Must match the type of the second
+ argument.
- The argument list is terminated by a null object name, no
- object type nor value need be passed for this. The values are
- added to `pattern', if `pattern' is null, a new pattern is
- created. In either case, the pattern is returned. Example
-pattern = FcPatternBuild (0, FC_FAMILY, FcTypeString, "Times", (char *)
-0);
+ The argument list is terminated by a null object name, no object type nor
+ value need be passed for this. The values are added to `pattern', if
+ `pattern' is null, a new pattern is created. In either case, the pattern
+ is returned. Example
- FcPatternVaBuild is used when the arguments are already in the
- form of a varargs value. FcPatternVapBuild is a macro version
- of FcPatternVaBuild which returns its result directly in the
- result variable.
+ pattern = FcPatternBuild (0, FC_FAMILY, FcTypeString, "Times", (char *) 0);
-FcPatternDel
+ FcPatternVaBuild is used when the arguments are already in the form of a
+ varargs value. FcPatternVapBuild is a macro version of FcPatternVaBuild
+ which returns its result directly in the result variable.
+
+ FcPatternDel
Name
- FcPatternDel -- Delete a property from a pattern
+ FcPatternDel -- Delete a property from a pattern
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBool FcPatternDel(FcPattern *p, const char *object);
Description
- Deletes all values associated with the property `object',
- returning whether the property existed or not.
+ Deletes all values associated with the property `object', returning
+ whether the property existed or not.
-FcPatternRemove
+ FcPatternRemove
Name
- FcPatternRemove -- Remove one object of the specified type from
+ FcPatternRemove -- Remove one object of the specified type from the
+ pattern
+
+Synopsis
+
+ #include <fontconfig/fontconfig.h>
+
+
+ FcBool FcPatternRemove(FcPattern *p, const char *object, int id);
+
+Description
+
+ Removes the value associated with the property `object' at position `id',
+ returning whether the property existed and had a value at that position or
+ not.
+
+ FcPatternIterStart
+
+Name
+
+ FcPatternIterStart -- Initialize the iterator with the first iterator in
the pattern
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
- FcBool FcPatternRemove(FcPattern *p, const char *object, int
- id);
+
+ void FcPatternIterStart(const FcPattern *p, FcPatternIter *iter);
Description
- Removes the value associated with the property `object' at
- position `id', returning whether the property existed and had a
- value at that position or not.
+ Initialize iter with the first iterator in p. If there are no objects in
+ p, iter will not have any valid data.
+
+Since
-FcPatternPrint
+ version 2.13.1
+
+ FcPatternIterNext
Name
- FcPatternPrint -- Print a pattern for debugging
+ FcPatternIterNext -- 
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
- void FcPatternPrint(const FcPattern *p);
+
+ FcBool FcPatternIterNext(const FcPattern *p, FcPatternIter *iter);
Description
- Prints an easily readable version of the pattern to stdout.
- There is no provision for reparsing data in this format, it's
- just for diagnostics and debugging.
+ Set iter to point to the next object in p and returns FcTrue if iter has
+ been changed to the next object. returns FcFalse otherwise.
+
+Since
+
+ version 2.13.1
-FcDefaultSubstitute
+ FcPatternIterEqual
Name
- FcDefaultSubstitute -- Perform default substitutions in a
+ FcPatternIterEqual -- Compare iterators
+
+Synopsis
+
+ #include <fontconfig/fontconfig.h>
+
+
+ FcBool FcPatternIterEqual(const FcPattern *p1, FcPatternIter *i1, const
+ FcPattern *p2, FcPatternIter *i2);
+
+Description
+
+ Return FcTrue if both i1 and i2 point to same object and contains same
+ values. return FcFalse otherwise.
+
+Since
+
+ version 2.13.1
+
+ FcPatternFindIter
+
+Name
+
+ FcPatternFindIter -- Set the iterator to point to the object in the
pattern
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
+
+ FcBool FcPatternFindIter(const FcPattern *p, FcPatternIter *iter, const
+ char *object);
+
+Description
+
+ Set iter to point to object in p if any and returns FcTrue. returns
+ FcFalse otherwise.
+
+Since
+
+ version 2.13.1
+
+ FcPatternIterIsValid
+
+Name
+
+ FcPatternIterIsValid -- Check whether the iterator is valid or not
+
+Synopsis
+
+ #include <fontconfig/fontconfig.h>
+
+
+ FcBool FcPatternIterIsValid(const FcPattern *p, FcPatternIter :iter);
+
+Description
+
+ Returns FcTrue if iter point to the valid entry in p. returns FcFalse
+ otherwise.
+
+Since
+
+ version 2.13.1
+
+ FcPatternIterGetObject
+
+Name
+
+ FcPatternIterGetObject -- Returns an object name which the iterator point
+ to
+
+Synopsis
+
+ #include <fontconfig/fontconfig.h>
+
+
+ const char * FcPatternIterGetObject(const FcPattern *p, FcPatternIter
+ *iter);
+
+Description
+
+ Returns an object name in p which iter point to. returns NULL if iter
+ isn't valid.
+
+Since
+
+ version 2.13.1
+
+ FcPatternIterValueCount
+
+Name
+
+ FcPatternIterValueCount -- Returns the number of the values which the
+ iterator point to
+
+Synopsis
+
+ #include <fontconfig/fontconfig.h>
+
+
+ int FcPatternIterValueCount(const FcPattern *p, FcPatternIter *iter);
+
+Description
+
+ Returns the number of the values in the object which iter point to. if
+ iter isn't valid, returns 0.
+
+Since
+
+ version 2.13.1
+
+ FcPatternIterGetValue
+
+Name
+
+ FcPatternIterGetValue -- Returns a value which the iterator point to
+
+Synopsis
+
+ #include <fontconfig/fontconfig.h>
+
+
+ FcResult FcPatternIterGetValue(const FcPattern *p, FcPatternIter *iter,
+ intid, FcValue *v, FcValueBinding *b);
+
+Description
+
+ Returns in v the id'th value which iter point to. also binding to b if
+ given. The value returned is not a copy, but rather refers to the data
+ stored within the pattern directly. Applications must not free this value.
+
+Since
+
+ version 2.13.1
+
+ FcPatternPrint
+
+Name
+
+ FcPatternPrint -- Print a pattern for debugging
+
+Synopsis
+
+ #include <fontconfig/fontconfig.h>
+
+
+ void FcPatternPrint(const FcPattern *p);
+
+Description
+
+ Prints an easily readable version of the pattern to stdout. There is no
+ provision for reparsing data in this format, it's just for diagnostics and
+ debugging.
+
+ FcDefaultSubstitute
+
+Name
+
+ FcDefaultSubstitute -- Perform default substitutions in a pattern
+
+Synopsis
+
+ #include <fontconfig/fontconfig.h>
+
void FcDefaultSubstitute(FcPattern *pattern);
@@ -1069,300 +1303,297 @@ Description
Supplies default values for underspecified font patterns:
- * Patterns without a specified style or weight are set to
- Medium
- * Patterns without a specified style or slant are set to
- Roman
- * Patterns without a specified pixel size are given one
- computed from any specified point size (default 12), dpi
- (default 75) and scale (default 1).
+ * Patterns without a specified style or weight are set to Medium
+
+ * Patterns without a specified style or slant are set to Roman
+
+ * Patterns without a specified pixel size are given one computed from
+ any specified point size (default 12), dpi (default 75) and scale
+ (default 1).
-FcNameParse
+ FcNameParse
Name
- FcNameParse -- Parse a pattern string
+ FcNameParse -- Parse a pattern string
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcPattern * FcNameParse(const FcChar8 *name);
Description
- Converts name from the standard text format described above
- into a pattern.
+ Converts name from the standard text format described above into a
+ pattern.
-FcNameUnparse
+ FcNameUnparse
Name
- FcNameUnparse -- Convert a pattern back into a string that can
- be parsed
+ FcNameUnparse -- Convert a pattern back into a string that can be parsed
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcChar8 * FcNameUnparse(FcPattern *pat);
Description
- Converts the given pattern into the standard text format
- described above. The return value is not static, but instead
- refers to newly allocated memory which should be freed by the
- caller using free().
-
-FcPatternFormat
-
-Name
-
- FcPatternFormat -- Format a pattern into a string according to
- a format specifier
-
-Synopsis
-
-#include <fontconfig/fontconfig.h>
-
- FcChar8 * FcPatternFormat(FcPattern *pat, const FcChar8
- *format);
-
-Description
-
- Converts given pattern pat into text described by the format
- specifier format. The return value refers to newly allocated
- memory which should be freed by the caller using free(), or
- NULL if format is invalid.
-
- The format is loosely modeled after printf-style format string.
- The format string is composed of zero or more directives:
- ordinary characters (not "%"), which are copied unchanged to
- the output stream; and tags which are interpreted to construct
- text from the pattern in a variety of ways (explained below).
- Special characters can be escaped using backslash. C-string
- style special characters like \n and \r are also supported
- (this is useful when the format string is not a C string
- literal). It is advisable to always escape curly braces that
- are meant to be copied to the output as ordinary characters.
-
- Each tag is introduced by the character "%", followed by an
- optional minimum field width, followed by tag contents in curly
- braces ({}). If the minimum field width value is provided the
- tag will be expanded and the result padded to achieve the
- minimum width. If the minimum field width is positive, the
- padding will right-align the text. Negative field width will
- left-align. The rest of this section describes various
- supported tag contents and their expansion.
-
- A simple tag is one where the content is an identifier. When
- simple tags are expanded, the named identifier will be looked
- up in pattern and the resulting list of values returned, joined
- together using comma. For example, to print the family name and
- style of the pattern, use the format "%{family} %{style}\n". To
- extend the family column to forty characters use
- "%-40{family}%{style}\n".
-
- Simple tags expand to list of all values for an element. To
- only choose one of the values, one can index using the syntax
- "%{elt[idx]}". For example, to get the first family name only,
- use "%{family[0]}".
-
- If a simple tag ends with "=" and the element is found in the
- pattern, the name of the element followed by "=" will be output
- before the list of values. For example, "%{weight=}" may expand
- to the string "weight=80". Or to the empty string if pattern
- does not have weight set.
-
- If a simple tag starts with ":" and the element is found in the
- pattern, ":" will be printed first. For example, combining this
- with the =, the format "%{:weight=}" may expand to ":weight=80"
- or to the empty string if pattern does not have weight set.
-
- If a simple tag contains the string ":-", the rest of the the
- tag contents will be used as a default string. The default
- string is output if the element is not found in the pattern.
- For example, the format "%{:weight=:-123}" may expand to
- ":weight=80" or to the string ":weight=123" if pattern does not
- have weight set.
-
- A count tag is one that starts with the character "#" followed
- by an element name, and expands to the number of values for the
- element in the pattern. For example, "%{#family}" expands to
- the number of family names pattern has set, which may be zero.
-
- A sub-expression tag is one that expands a sub-expression. The
- tag contents are the sub-expression to expand placed inside
- another set of curly braces. Sub-expression tags are useful for
- aligning an entire sub-expression, or to apply converters
- (explained later) to the entire sub-expression output. For
- example, the format "%40{{%{family} %{style}}}" expands the
- sub-expression to construct the family name followed by the
- style, then takes the entire string and pads it on the left to
- be at least forty characters.
-
- A filter-out tag is one starting with the character "-"
- followed by a comma-separated list of element names, followed
- by a sub-expression enclosed in curly braces. The
- sub-expression will be expanded but with a pattern that has the
- listed elements removed from it. For example, the format
- "%{-size,pixelsize{sub-expr}}" will expand "sub-expr" with
- pattern sans the size and pixelsize elements.
-
- A filter-in tag is one starting with the character "+" followed
- by a comma-separated list of element names, followed by a
- sub-expression enclosed in curly braces. The sub-expression
- will be expanded but with a pattern that only has the listed
- elements from the surrounding pattern. For example, the format
- "%{+family,familylang{sub-expr}}" will expand "sub-expr" with a
- sub-pattern consisting only the family and family lang elements
- of pattern.
-
- A conditional tag is one starting with the character "?"
- followed by a comma-separated list of element conditions,
- followed by two sub-expression enclosed in curly braces. An
- element condition can be an element name, in which case it
- tests whether the element is defined in pattern, or the
- character "!" followed by an element name, in which case the
- test is negated. The conditional passes if all the element
- conditions pass. The tag expands the first sub-expression if
- the conditional passes, and expands the second sub-expression
- otherwise. For example, the format
- "%{?size,dpi,!pixelsize{pass}{fail}}" will expand to "pass" if
- pattern has size and dpi elements but no pixelsize element, and
- to "fail" otherwise.
-
- An enumerate tag is one starting with the string "[]" followed
- by a comma-separated list of element names, followed by a
- sub-expression enclosed in curly braces. The list of values for
- the named elements are walked in parallel and the
- sub-expression expanded each time with a pattern just having a
- single value for those elements, starting from the first value
- and continuing as long as any of those elements has a value.
+ Converts the given pattern into the standard text format described above.
+ The return value is not static, but instead refers to newly allocated
+ memory which should be freed by the caller using free().
+
+ FcPatternFormat
+
+Name
+
+ FcPatternFormat -- Format a pattern into a string according to a format
+ specifier
+
+Synopsis
+
+ #include <fontconfig/fontconfig.h>
+
+
+ FcChar8 * FcPatternFormat(FcPattern *pat, const FcChar8 *format);
+
+Description
+
+ Converts given pattern pat into text described by the format specifier
+ format. The return value refers to newly allocated memory which should be
+ freed by the caller using free(), or NULL if format is invalid.
+
+ The format is loosely modeled after printf-style format string. The
+ format string is composed of zero or more directives: ordinary characters
+ (not "%"), which are copied unchanged to the output stream; and tags which
+ are interpreted to construct text from the pattern in a variety of ways
+ (explained below). Special characters can be escaped using backslash.
+ C-string style special characters like \n and \r are also supported (this
+ is useful when the format string is not a C string literal). It is
+ advisable to always escape curly braces that are meant to be copied to the
+ output as ordinary characters.
+
+ Each tag is introduced by the character "%", followed by an optional
+ minimum field width, followed by tag contents in curly braces ({}). If the
+ minimum field width value is provided the tag will be expanded and the
+ result padded to achieve the minimum width. If the minimum field width is
+ positive, the padding will right-align the text. Negative field width will
+ left-align. The rest of this section describes various supported tag
+ contents and their expansion.
+
+ A simple tag is one where the content is an identifier. When simple tags
+ are expanded, the named identifier will be looked up in pattern and the
+ resulting list of values returned, joined together using comma. For
+ example, to print the family name and style of the pattern, use the format
+ "%{family} %{style}\n". To extend the family column to forty characters
+ use "%-40{family}%{style}\n".
+
+ Simple tags expand to list of all values for an element. To only choose
+ one of the values, one can index using the syntax "%{elt[idx]}". For
+ example, to get the first family name only, use "%{family[0]}".
+
+ If a simple tag ends with "=" and the element is found in the pattern,
+ the name of the element followed by "=" will be output before the list of
+ values. For example, "%{weight=}" may expand to the string "weight=80". Or
+ to the empty string if pattern does not have weight set.
+
+ If a simple tag starts with ":" and the element is found in the pattern,
+ ":" will be printed first. For example, combining this with the =, the
+ format "%{:weight=}" may expand to ":weight=80" or to the empty string if
+ pattern does not have weight set.
+
+ If a simple tag contains the string ":-", the rest of the the tag
+ contents will be used as a default string. The default string is output if
+ the element is not found in the pattern. For example, the format
+ "%{:weight=:-123}" may expand to ":weight=80" or to the string
+ ":weight=123" if pattern does not have weight set.
+
+ A count tag is one that starts with the character "#" followed by an
+ element name, and expands to the number of values for the element in the
+ pattern. For example, "%{#family}" expands to the number of family names
+ pattern has set, which may be zero.
+
+ A sub-expression tag is one that expands a sub-expression. The tag
+ contents are the sub-expression to expand placed inside another set of
+ curly braces. Sub-expression tags are useful for aligning an entire
+ sub-expression, or to apply converters (explained later) to the entire
+ sub-expression output. For example, the format "%40{{%{family} %{style}}}"
+ expands the sub-expression to construct the family name followed by the
+ style, then takes the entire string and pads it on the left to be at least
+ forty characters.
+
+ A filter-out tag is one starting with the character "-" followed by a
+ comma-separated list of element names, followed by a sub-expression
+ enclosed in curly braces. The sub-expression will be expanded but with a
+ pattern that has the listed elements removed from it. For example, the
+ format "%{-size,pixelsize{sub-expr}}" will expand "sub-expr" with pattern
+ sans the size and pixelsize elements.
+
+ A filter-in tag is one starting with the character "+" followed by a
+ comma-separated list of element names, followed by a sub-expression
+ enclosed in curly braces. The sub-expression will be expanded but with a
+ pattern that only has the listed elements from the surrounding pattern.
+ For example, the format "%{+family,familylang{sub-expr}}" will expand
+ "sub-expr" with a sub-pattern consisting only the family and family lang
+ elements of pattern.
+
+ A conditional tag is one starting with the character "?" followed by a
+ comma-separated list of element conditions, followed by two sub-expression
+ enclosed in curly braces. An element condition can be an element name, in
+ which case it tests whether the element is defined in pattern, or the
+ character "!" followed by an element name, in which case the test is
+ negated. The conditional passes if all the element conditions pass. The
+ tag expands the first sub-expression if the conditional passes, and
+ expands the second sub-expression otherwise. For example, the format
+ "%{?size,dpi,!pixelsize{pass}{fail}}" will expand to "pass" if pattern has
+ size and dpi elements but no pixelsize element, and to "fail" otherwise.
+
+ An enumerate tag is one starting with the string "[]" followed by a
+ comma-separated list of element names, followed by a sub-expression
+ enclosed in curly braces. The list of values for the named elements are
+ walked in parallel and the sub-expression expanded each time with a
+ pattern just having a single value for those elements, starting from the
+ first value and continuing as long as any of those elements has a value.
For example, the format "%{[]family,familylang{%{family}
- (%{familylang})\n}}" will expand the pattern "%{family}
- (%{familylang})\n" with a pattern having only the first value
- of the family and familylang elements, then expands it with the
- second values, then the third, etc.
+ (%{familylang})\n}}" will expand the pattern "%{family} (%{familylang})\n"
+ with a pattern having only the first value of the family and familylang
+ elements, then expands it with the second values, then the third, etc.
- As a special case, if an enumerate tag has only one element,
- and that element has only one value in the pattern, and that
- value is of type FcLangSet, the individual languages in the
- language set are enumerated.
+ As a special case, if an enumerate tag has only one element, and that
+ element has only one value in the pattern, and that value is of type
+ FcLangSet, the individual languages in the language set are enumerated.
- A builtin tag is one starting with the character "=" followed
- by a builtin name. The following builtins are defined:
+ A builtin tag is one starting with the character "=" followed by a
+ builtin name. The following builtins are defined:
unparse
- Expands to the result of calling FcNameUnparse() on the
- pattern.
+
+ Expands to the result of calling FcNameUnparse() on the pattern.
fcmatch
- Expands to the output of the default output format of
- the fc-match command on the pattern, without the final
- newline.
+
+ Expands to the output of the default output format of the fc-match
+ command on the pattern, without the final newline.
fclist
- Expands to the output of the default output format of
- the fc-list command on the pattern, without the final
- newline.
+
+ Expands to the output of the default output format of the fc-list
+ command on the pattern, without the final newline.
fccat
- Expands to the output of the default output format of
- the fc-cat command on the pattern, without the final
- newline.
+
+ Expands to the output of the default output format of the fc-cat
+ command on the pattern, without the final newline.
pkgkit
- Expands to the list of PackageKit font() tags for the
- pattern. Currently this includes tags for each family
- name, and each language from the pattern, enumerated and
- sanitized into a set of tags terminated by newline.
- Package management systems can use these tags to tag
- their packages accordingly.
-
- For example, the format "%{+family,style{%{=unparse}}}\n" will
- expand to an unparsed name containing only the family and style
- element values from pattern.
-
- The contents of any tag can be followed by a set of zero or
- more converters. A converter is specified by the character "|"
- followed by the converter name and arguments. The following
- converters are defined:
+
+ Expands to the list of PackageKit font() tags for the pattern.
+ Currently this includes tags for each family name, and each
+ language from the pattern, enumerated and sanitized into a set of
+ tags terminated by newline. Package management systems can use
+ these tags to tag their packages accordingly.
+
+ For example, the format "%{+family,style{%{=unparse}}}\n" will expand to
+ an unparsed name containing only the family and style element values from
+ pattern.
+
+ The contents of any tag can be followed by a set of zero or more
+ converters. A converter is specified by the character "|" followed by the
+ converter name and arguments. The following converters are defined:
basename
- Replaces text with the results of calling
- FcStrBasename() on it.
+
+ Replaces text with the results of calling FcStrBasename() on it.
dirname
- Replaces text with the results of calling FcStrDirname()
- on it.
+
+ Replaces text with the results of calling FcStrDirname() on it.
downcase
- Replaces text with the results of calling
- FcStrDowncase() on it.
+
+ Replaces text with the results of calling FcStrDowncase() on it.
shescape
- Escapes text for one level of shell expansion. (Escapes
- single-quotes, also encloses text in single-quotes.)
+
+ Escapes text for one level of shell expansion. (Escapes
+ single-quotes, also encloses text in single-quotes.)
cescape
- Escapes text such that it can be used as part of a C
- string literal. (Escapes backslash and double-quotes.)
+
+ Escapes text such that it can be used as part of a C string
+ literal. (Escapes backslash and double-quotes.)
xmlescape
- Escapes text such that it can be used in XML and HTML.
- (Escapes less-than, greater-than, and ampersand.)
+
+ Escapes text such that it can be used in XML and HTML. (Escapes
+ less-than, greater-than, and ampersand.)
delete(chars)
- Deletes all occurrences of each of the characters in
- chars from the text. FIXME: This converter is not UTF-8
- aware yet.
+
+ Deletes all occurrences of each of the characters in chars from
+ the text. FIXME: This converter is not UTF-8 aware yet.
escape(chars)
- Escapes all occurrences of each of the characters in
- chars by prepending it by the first character in chars.
- FIXME: This converter is not UTF-8 aware yet.
+
+ Escapes all occurrences of each of the characters in chars by
+ prepending it by the first character in chars. FIXME: This
+ converter is not UTF-8 aware yet.
translate(from,to)
- Translates all occurrences of each of the characters in
- from by replacing them with their corresponding
- character in to. If to has fewer characters than from,
- it will be extended by repeating its last character.
- FIXME: This converter is not UTF-8 aware yet.
- For example, the format "%{family|downcase|delete( )}\n" will
- expand to the values of the family element in pattern,
- lower-cased and with spaces removed.
+ Translates all occurrences of each of the characters in from by
+ replacing them with their corresponding character in to. If to has
+ fewer characters than from, it will be extended by repeating its
+ last character. FIXME: This converter is not UTF-8 aware yet.
+
+ For example, the format "%{family|downcase|delete( )}\n" will expand to
+ the values of the family element in pattern, lower-cased and with spaces
+ removed.
Since
version 2.9.0
- __________________________________________________________
-FcFontSet
+ --------------------------------------------------------------------------
+
+ FcFontSet
Table of Contents
- FcFontSetCreate -- Create a font set
- FcFontSetDestroy -- Destroy a font set
- FcFontSetAdd -- Add to a font set
- FcFontSetList -- List fonts from a set of font sets
- FcFontSetMatch -- Return the best font from a set of font sets
- FcFontSetPrint -- Print a set of patterns to stdout
- FcFontSetSort -- Add to a font set
- FcFontSetSortDestroy -- DEPRECATED destroy a font set
- An FcFontSet simply holds a list of patterns; these are used to
- return the results of listing available fonts.
+ [43]FcFontSetCreate -- Create a font set
+
+ [44]FcFontSetDestroy -- Destroy a font set
+
+ [45]FcFontSetAdd -- Add to a font set
+
+ [46]FcFontSetList -- List fonts from a set of font sets
+
+ [47]FcFontSetMatch -- Return the best font from a set of font sets
+
+ [48]FcFontSetPrint -- Print a set of patterns to stdout
-FcFontSetCreate
+ [49]FcFontSetSort -- Add to a font set
+
+ [50]FcFontSetSortDestroy -- DEPRECATED destroy a font set
+
+ An FcFontSet simply holds a list of patterns; these are used to return the
+ results of listing available fonts.
+
+ FcFontSetCreate
Name
- FcFontSetCreate -- Create a font set
+ FcFontSetCreate -- Create a font set
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcFontSet * FcFontSetCreate(void);
@@ -1370,178 +1601,187 @@ Description
Creates an empty font set.
-FcFontSetDestroy
+ FcFontSetDestroy
Name
- FcFontSetDestroy -- Destroy a font set
+ FcFontSetDestroy -- Destroy a font set
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
void FcFontSetDestroy(FcFontSet *s);
Description
- Destroys a font set. Note that this destroys any referenced
- patterns as well.
+ Destroys a font set. Note that this destroys any referenced patterns as
+ well.
-FcFontSetAdd
+ FcFontSetAdd
Name
- FcFontSetAdd -- Add to a font set
+ FcFontSetAdd -- Add to a font set
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBool FcFontSetAdd(FcFontSet *s, FcPattern *font);
Description
- Adds a pattern to a font set. Note that the pattern is not
- copied before being inserted into the set. Returns FcFalse if
- the pattern cannot be inserted into the set (due to allocation
- failure). Otherwise returns FcTrue.
+ Adds a pattern to a font set. Note that the pattern is not copied before
+ being inserted into the set. Returns FcFalse if the pattern cannot be
+ inserted into the set (due to allocation failure). Otherwise returns
+ FcTrue.
-FcFontSetList
+ FcFontSetList
Name
- FcFontSetList -- List fonts from a set of font sets
+ FcFontSetList -- List fonts from a set of font sets
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- FcFontSet * FcFontSetList(FcConfig *config, FcFontSet **sets,
- intnsets, FcPattern *pattern, FcObjectSet *object_set);
+ FcFontSet * FcFontSetList(FcConfig *config, FcFontSet **sets, intnsets,
+ FcPattern *pattern, FcObjectSet *object_set);
Description
- Selects fonts matching pattern from sets, creates patterns from
- those fonts containing only the objects in object_set and
- returns the set of unique such patterns. If config is NULL, the
- default configuration is checked to be up to date, and used.
+ Selects fonts matching pattern from sets, creates patterns from those
+ fonts containing only the objects in object_set and returns the set of
+ unique such patterns. If config is NULL, the default configuration is
+ checked to be up to date, and used.
-FcFontSetMatch
+ FcFontSetMatch
Name
- FcFontSetMatch -- Return the best font from a set of font sets
+ FcFontSetMatch -- Return the best font from a set of font sets
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
- FcPattern * FcFontSetMatch(FcConfig *config, FcFontSet **sets,
- intnsets, FcPattern *pattern, FcResult *result);
+
+ FcPattern * FcFontSetMatch(FcConfig *config, FcFontSet **sets, intnsets,
+ FcPattern *pattern, FcResult *result);
Description
- Finds the font in sets most closely matching pattern and
- returns the result of FcFontRenderPrepare for that font and the
- provided pattern. This function should be called only after
- FcConfigSubstitute and FcDefaultSubstitute have been called for
- pattern; otherwise the results will not be correct. If config
- is NULL, the current configuration is used. Returns NULL if an
- error occurs during this process.
+ Finds the font in sets most closely matching pattern and returns the
+ result of FcFontRenderPrepare for that font and the provided pattern. This
+ function should be called only after FcConfigSubstitute and
+ FcDefaultSubstitute have been called for pattern; otherwise the results
+ will not be correct. If config is NULL, the current configuration is used.
+ Returns NULL if an error occurs during this process.
-FcFontSetPrint
+ FcFontSetPrint
Name
- FcFontSetPrint -- Print a set of patterns to stdout
+ FcFontSetPrint -- Print a set of patterns to stdout
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
void FcFontSetPrint(FcFontSet *set);
Description
- This function is useful for diagnosing font related issues,
- printing the complete contents of every pattern in set. The
- format of the output is designed to be of help to users and
- developers, and may change at any time.
+ This function is useful for diagnosing font related issues, printing the
+ complete contents of every pattern in set. The format of the output is
+ designed to be of help to users and developers, and may change at any
+ time.
-FcFontSetSort
+ FcFontSetSort
Name
- FcFontSetSort -- Add to a font set
+ FcFontSetSort -- Add to a font set
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- FcFontSetSort(FcConfig *config, FcFontSet **sets, intnsets,
- FcPattern *pattern, FcBool trim, FcCharSet **csp, FcResult
- *result);
+ FcFontSetSort(FcConfig *config, FcFontSet **sets, intnsets, FcPattern
+ *pattern, FcBool trim, FcCharSet **csp, FcResult *result);
Description
- Returns the list of fonts from sets sorted by closeness to
- pattern. If trim is FcTrue, elements in the list which don't
- include Unicode coverage not provided by earlier elements in
- the list are elided. The union of Unicode coverage of all of
- the fonts is returned in csp, if csp is not NULL. This function
- should be called only after FcConfigSubstitute and
- FcDefaultSubstitute have been called for p; otherwise the
- results will not be correct.
+ Returns the list of fonts from sets sorted by closeness to pattern. If
+ trim is FcTrue, elements in the list which don't include Unicode coverage
+ not provided by earlier elements in the list are elided. The union of
+ Unicode coverage of all of the fonts is returned in csp, if csp is not
+ NULL. This function should be called only after FcConfigSubstitute and
+ FcDefaultSubstitute have been called for p; otherwise the results will not
+ be correct.
- The returned FcFontSet references FcPattern structures which
- may be shared by the return value from multiple FcFontSort
- calls, applications cannot modify these patterns. Instead, they
- should be passed, along with pattern to FcFontRenderPrepare
- which combines them into a complete pattern.
+ The returned FcFontSet references FcPattern structures which may be shared
+ by the return value from multiple FcFontSort calls, applications cannot
+ modify these patterns. Instead, they should be passed, along with pattern
+ to FcFontRenderPrepare which combines them into a complete pattern.
The FcFontSet returned by FcFontSetSort is destroyed by calling
FcFontSetDestroy.
-FcFontSetSortDestroy
+ FcFontSetSortDestroy
Name
- FcFontSetSortDestroy -- DEPRECATED destroy a font set
+ FcFontSetSortDestroy -- DEPRECATED destroy a font set
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcFontSetSortDestroy(FcFontSet *set);
Description
- This function is DEPRECATED. FcFontSetSortDestroy destroys set
- by calling FcFontSetDestroy. Applications should use
- FcFontSetDestroy directly instead.
- __________________________________________________________
+ This function is DEPRECATED. FcFontSetSortDestroy destroys set by calling
+ FcFontSetDestroy. Applications should use FcFontSetDestroy directly
+ instead.
+
+ --------------------------------------------------------------------------
-FcObjectSet
+ FcObjectSet
Table of Contents
- FcObjectSetCreate -- Create an object set
- FcObjectSetAdd -- Add to an object set
- FcObjectSetDestroy -- Destroy an object set
- FcObjectSetBuild -- Build object set from args
- An FcObjectSet holds a list of pattern property names; it is
- used to indicate which properties are to be returned in the
- patterns from FcFontList.
+ [51]FcObjectSetCreate -- Create an object set
+
+ [52]FcObjectSetAdd -- Add to an object set
+
+ [53]FcObjectSetDestroy -- Destroy an object set
+
+ [54]FcObjectSetBuild -- Build object set from args
+
+ An FcObjectSet holds a list of pattern property names; it is used to
+ indicate which properties are to be returned in the patterns from
+ FcFontList.
-FcObjectSetCreate
+ FcObjectSetCreate
Name
- FcObjectSetCreate -- Create an object set
+ FcObjectSetCreate -- Create an object set
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcObjectSet * FcObjectSetCreate(void);
@@ -1549,33 +1789,35 @@ Description
Creates an empty set.
-FcObjectSetAdd
+ FcObjectSetAdd
Name
- FcObjectSetAdd -- Add to an object set
+ FcObjectSetAdd -- Add to an object set
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBool FcObjectSetAdd(FcObjectSet *os, const char *object);
Description
- Adds a property name to the set. Returns FcFalse if the
- property name cannot be inserted into the set (due to
- allocation failure). Otherwise returns FcTrue.
+ Adds a property name to the set. Returns FcFalse if the property name
+ cannot be inserted into the set (due to allocation failure). Otherwise
+ returns FcTrue.
-FcObjectSetDestroy
+ FcObjectSetDestroy
Name
- FcObjectSetDestroy -- Destroy an object set
+ FcObjectSetDestroy -- Destroy an object set
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
void FcObjectSetDestroy(FcObjectSet *os);
@@ -1583,406 +1825,441 @@ Description
Destroys an object set.
-FcObjectSetBuild
+ FcObjectSetBuild
Name
- FcObjectSetBuild, FcObjectSetVaBuild,
- FcObjectSetVapBuild -- Build object set from args
+ FcObjectSetBuild, FcObjectSetVaBuild, FcObjectSetVapBuild -- Build object
+ set from args
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcObjectSet * FcObjectSetBuild(const char *first, ...);
- FcObjectSet * FcObjectSetVaBuild(const char *first, va_list
- va);
+ FcObjectSet * FcObjectSetVaBuild(const char *first, va_list va);
- void FcObjectSetVapBuild(FcObjectSet *result, const char
- *first, va_list va);
+ void FcObjectSetVapBuild(FcObjectSet *result, const char *first, va_list
+ va);
Description
- These build an object set from a null-terminated list of
- property names. FcObjectSetVapBuild is a macro version of
- FcObjectSetVaBuild which returns the result in the result
- variable directly.
- __________________________________________________________
+ These build an object set from a null-terminated list of property names.
+ FcObjectSetVapBuild is a macro version of FcObjectSetVaBuild which returns
+ the result in the result variable directly.
+
+ --------------------------------------------------------------------------
-FreeType specific functions
+ FreeType specific functions
Table of Contents
- FcFreeTypeCharIndex -- map Unicode to glyph id
- FcFreeTypeCharSet -- compute Unicode coverage
- FcFreeTypeCharSetAndSpacing -- compute Unicode coverage and
- spacing type
- FcFreeTypeQuery -- compute pattern from font file (and index)
- FcFreeTypeQueryAll -- compute all patterns from font file (and
- index)
+ [55]FcFreeTypeCharIndex -- map Unicode to glyph id
+
+ [56]FcFreeTypeCharSet -- compute Unicode coverage
+
+ [57]FcFreeTypeCharSetAndSpacing -- compute Unicode coverage and spacing
+ type
+
+ [58]FcFreeTypeQuery -- compute pattern from font file (and index)
+
+ [59]FcFreeTypeQueryAll -- compute all patterns from font file (and index)
- FcFreeTypeQueryFace -- compute pattern from FT_Face
+ [60]FcFreeTypeQueryFace -- compute pattern from FT_Face
- While the fontconfig library doesn't insist that FreeType be
- used as the rasterization mechanism for fonts, it does provide
- some convenience functions.
+ While the fontconfig library doesn't insist that FreeType be used as the
+ rasterization mechanism for fonts, it does provide some convenience
+ functions.
-FcFreeTypeCharIndex
+ FcFreeTypeCharIndex
Name
- FcFreeTypeCharIndex -- map Unicode to glyph id
+ FcFreeTypeCharIndex -- map Unicode to glyph id
Synopsis
-#include <fontconfig.h>
-#include <fcfreetype.h>
+ #include <fontconfig.h>
+ #include <fcfreetype.h>
+
FT_UInt FcFreeTypeCharIndex(FT_Face face, FcChar32 ucs4);
Description
- Maps a Unicode char to a glyph index. This function uses
- information from several possible underlying encoding tables to
- work around broken fonts. As a result, this function isn't
- designed to be used in performance sensitive areas; results
- from this function are intended to be cached by higher level
- functions.
+ Maps a Unicode char to a glyph index. This function uses information from
+ several possible underlying encoding tables to work around broken fonts.
+ As a result, this function isn't designed to be used in performance
+ sensitive areas; results from this function are intended to be cached by
+ higher level functions.
-FcFreeTypeCharSet
+ FcFreeTypeCharSet
Name
- FcFreeTypeCharSet -- compute Unicode coverage
+ FcFreeTypeCharSet -- compute Unicode coverage
Synopsis
-#include <fontconfig.h>
-#include <fcfreetype.h>
+ #include <fontconfig.h>
+ #include <fcfreetype.h>
+
FcCharSet * FcFreeTypeCharSet(FT_Face face, FcBlanks *blanks);
Description
- Scans a FreeType face and returns the set of encoded Unicode
- chars. FcBlanks is deprecated, blanks is ignored and accepted
- only for compatibility with older code.
+ Scans a FreeType face and returns the set of encoded Unicode chars.
+ FcBlanks is deprecated, blanks is ignored and accepted only for
+ compatibility with older code.
-FcFreeTypeCharSetAndSpacing
+ FcFreeTypeCharSetAndSpacing
Name
- FcFreeTypeCharSetAndSpacing -- compute Unicode coverage and
- spacing type
+ FcFreeTypeCharSetAndSpacing -- compute Unicode coverage and spacing type
Synopsis
-#include <fontconfig.h>
-#include <fcfreetype.h>
+ #include <fontconfig.h>
+ #include <fcfreetype.h>
+
- FcCharSet * FcFreeTypeCharSetAndSpacing(FT_Face face, FcBlanks
- *blanks, int *spacing);
+ FcCharSet * FcFreeTypeCharSetAndSpacing(FT_Face face, FcBlanks *blanks,
+ int *spacing);
Description
- Scans a FreeType face and returns the set of encoded Unicode
- chars. FcBlanks is deprecated, blanks is ignored and accepted
- only for compatibility with older code. spacing receives the
- computed spacing type of the font, one of FC_MONO for a font
- where all glyphs have the same width, FC_DUAL, where the font
- has glyphs in precisely two widths, one twice as wide as the
- other, or FC_PROPORTIONAL where the font has glyphs of many
- widths.
+ Scans a FreeType face and returns the set of encoded Unicode chars.
+ FcBlanks is deprecated, blanks is ignored and accepted only for
+ compatibility with older code. spacing receives the computed spacing type
+ of the font, one of FC_MONO for a font where all glyphs have the same
+ width, FC_DUAL, where the font has glyphs in precisely two widths, one
+ twice as wide as the other, or FC_PROPORTIONAL where the font has glyphs
+ of many widths.
-FcFreeTypeQuery
+ FcFreeTypeQuery
Name
- FcFreeTypeQuery -- compute pattern from font file (and index)
+ FcFreeTypeQuery -- compute pattern from font file (and index)
Synopsis
-#include <fontconfig.h>
-#include <fcfreetype.h>
+ #include <fontconfig.h>
+ #include <fcfreetype.h>
- FcPattern * FcFreeTypeQuery(const FcChar8 *file, int id,
- FcBlanks *blanks, int *count);
+
+ FcPattern * FcFreeTypeQuery(const FcChar8 *file, int id, FcBlanks *blanks,
+ int *count);
Description
- Constructs a pattern representing the 'id'th face in 'file'.
- The number of faces in 'file' is returned in 'count'. FcBlanks
- is deprecated, blanks is ignored and accepted only for
- compatibility with older code.
+ Constructs a pattern representing the 'id'th face in 'file'. The number of
+ faces in 'file' is returned in 'count'. FcBlanks is deprecated, blanks is
+ ignored and accepted only for compatibility with older code.
-FcFreeTypeQueryAll
+ FcFreeTypeQueryAll
Name
- FcFreeTypeQueryAll -- compute all patterns from font file (and
- index)
+ FcFreeTypeQueryAll -- compute all patterns from font file (and index)
Synopsis
-#include <fontconfig.h>
-#include <fcfreetype.h>
+ #include <fontconfig.h>
+ #include <fcfreetype.h>
- unsigned int FcFreeTypeQueryAll(const FcChar8 *file, int id,
- FcBlanks *blanks, int *count, FcFontSet *set);
+
+ unsigned int FcFreeTypeQueryAll(const FcChar8 *file, int id, FcBlanks
+ *blanks, int *count, FcFontSet *set);
Description
- Constructs patterns found in 'file'. If id is -1, then all
- patterns found in 'file' are added to 'set'. Otherwise, this
- function works exactly like FcFreeTypeQuery(). The number of
- faces in 'file' is returned in 'count'. The number of patterns
- added to 'set' is returned. FcBlanks is deprecated, blanks is
- ignored and accepted only for compatibility with older code.
+ Constructs patterns found in 'file'. If id is -1, then all patterns found
+ in 'file' are added to 'set'. Otherwise, this function works exactly like
+ FcFreeTypeQuery(). The number of faces in 'file' is returned in 'count'.
+ The number of patterns added to 'set' is returned. FcBlanks is deprecated,
+ blanks is ignored and accepted only for compatibility with older code.
Since
version 2.12.91
-FcFreeTypeQueryFace
+ FcFreeTypeQueryFace
Name
- FcFreeTypeQueryFace -- compute pattern from FT_Face
+ FcFreeTypeQueryFace -- compute pattern from FT_Face
Synopsis
-#include <fontconfig.h>
-#include <fcfreetype.h>
+ #include <fontconfig.h>
+ #include <fcfreetype.h>
+
- FcPattern * FcFreeTypeQueryFace(const FT_Face face, const
- FcChar8 *file, int id, FcBlanks *blanks);
+ FcPattern * FcFreeTypeQueryFace(const FT_Face face, const FcChar8 *file,
+ int id, FcBlanks *blanks);
Description
- Constructs a pattern representing 'face'. 'file' and 'id' are
- used solely as data for pattern elements (FC_FILE, FC_INDEX and
- sometimes FC_FAMILY). FcBlanks is deprecated, blanks is ignored
- and accepted only for compatibility with older code.
- __________________________________________________________
+ Constructs a pattern representing 'face'. 'file' and 'id' are used solely
+ as data for pattern elements (FC_FILE, FC_INDEX and sometimes FC_FAMILY).
+ FcBlanks is deprecated, blanks is ignored and accepted only for
+ compatibility with older code.
+
+ --------------------------------------------------------------------------
-FcValue
+ FcValue
Table of Contents
- FcValueDestroy -- Free a value
- FcValueSave -- Copy a value
- FcValuePrint -- Print a value to stdout
- FcValueEqual -- Test two values for equality
- FcValue is a structure containing a type tag and a union of all
- possible datatypes. The tag is an enum of type FcType and is
- intended to provide a measure of run-time typechecking,
- although that depends on careful programming.
+ [61]FcValueDestroy -- Free a value
+
+ [62]FcValueSave -- Copy a value
+
+ [63]FcValuePrint -- Print a value to stdout
+
+ [64]FcValueEqual -- Test two values for equality
+
+ FcValue is a structure containing a type tag and a union of all possible
+ datatypes. The tag is an enum of type FcType and is intended to provide a
+ measure of run-time typechecking, although that depends on careful
+ programming.
-FcValueDestroy
+ FcValueDestroy
Name
- FcValueDestroy -- Free a value
+ FcValueDestroy -- Free a value
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
void FcValueDestroy(FcValue v);
Description
Frees any memory referenced by v. Values of type FcTypeString,
- FcTypeMatrix and FcTypeCharSet reference memory, the other
- types do not.
+ FcTypeMatrix and FcTypeCharSet reference memory, the other types do not.
-FcValueSave
+ FcValueSave
Name
- FcValueSave -- Copy a value
+ FcValueSave -- Copy a value
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcValue FcValueSave(FcValue v);
Description
- Returns a copy of v duplicating any object referenced by it so
- that v may be safely destroyed without harming the new value.
+ Returns a copy of v duplicating any object referenced by it so that v may
+ be safely destroyed without harming the new value.
-FcValuePrint
+ FcValuePrint
Name
- FcValuePrint -- Print a value to stdout
+ FcValuePrint -- Print a value to stdout
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
void FcValuePrint(FcValue v);
Description
- Prints a human-readable representation of v to stdout. The
- format should not be considered part of the library
- specification as it may change in the future.
+ Prints a human-readable representation of v to stdout. The format should
+ not be considered part of the library specification as it may change in
+ the future.
-FcValueEqual
+ FcValueEqual
Name
- FcValueEqual -- Test two values for equality
+ FcValueEqual -- Test two values for equality
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBool FcValueEqual(FcValue v_a, FcValue v_b);
Description
- Compares two values. Integers and Doubles are compared as
- numbers; otherwise the two values have to be the same type to
- be considered equal. Strings are compared ignoring case.
- __________________________________________________________
+ Compares two values. Integers and Doubles are compared as numbers;
+ otherwise the two values have to be the same type to be considered equal.
+ Strings are compared ignoring case.
+
+ --------------------------------------------------------------------------
-FcCharSet
+ FcCharSet
Table of Contents
- FcCharSetCreate -- Create an empty character set
- FcCharSetDestroy -- Destroy a character set
- FcCharSetAddChar -- Add a character to a charset
- FcCharSetDelChar -- Add a character to a charset
- FcCharSetCopy -- Copy a charset
- FcCharSetEqual -- Compare two charsets
- FcCharSetIntersect -- Intersect charsets
- FcCharSetUnion -- Add charsets
- FcCharSetSubtract -- Subtract charsets
- FcCharSetMerge -- Merge charsets
- FcCharSetHasChar -- Check a charset for a char
- FcCharSetCount -- Count entries in a charset
- FcCharSetIntersectCount -- Intersect and count charsets
- FcCharSetSubtractCount -- Subtract and count charsets
- FcCharSetIsSubset -- Test for charset inclusion
- FcCharSetFirstPage -- Start enumerating charset contents
- FcCharSetNextPage -- Continue enumerating charset contents
- FcCharSetCoverage -- DEPRECATED return coverage for a Unicode
- page
- FcCharSetNew -- DEPRECATED alias for FcCharSetCreate
+ [65]FcCharSetCreate -- Create an empty character set
+
+ [66]FcCharSetDestroy -- Destroy a character set
+
+ [67]FcCharSetAddChar -- Add a character to a charset
+
+ [68]FcCharSetDelChar -- Add a character to a charset
+
+ [69]FcCharSetCopy -- Copy a charset
+
+ [70]FcCharSetEqual -- Compare two charsets
+
+ [71]FcCharSetIntersect -- Intersect charsets
- An FcCharSet is a boolean array indicating a set of Unicode
- chars. Those associated with a font are marked constant and
- cannot be edited. FcCharSets may be reference counted
- internally to reduce memory consumption; this may be visible to
- applications as the result of FcCharSetCopy may return it's
- argument, and that CharSet may remain unmodifiable.
+ [72]FcCharSetUnion -- Add charsets
-FcCharSetCreate
+ [73]FcCharSetSubtract -- Subtract charsets
+
+ [74]FcCharSetMerge -- Merge charsets
+
+ [75]FcCharSetHasChar -- Check a charset for a char
+
+ [76]FcCharSetCount -- Count entries in a charset
+
+ [77]FcCharSetIntersectCount -- Intersect and count charsets
+
+ [78]FcCharSetSubtractCount -- Subtract and count charsets
+
+ [79]FcCharSetIsSubset -- Test for charset inclusion
+
+ [80]FcCharSetFirstPage -- Start enumerating charset contents
+
+ [81]FcCharSetNextPage -- Continue enumerating charset contents
+
+ [82]FcCharSetCoverage -- DEPRECATED return coverage for a Unicode page
+
+ [83]FcCharSetNew -- DEPRECATED alias for FcCharSetCreate
+
+ An FcCharSet is a boolean array indicating a set of Unicode chars. Those
+ associated with a font are marked constant and cannot be edited.
+ FcCharSets may be reference counted internally to reduce memory
+ consumption; this may be visible to applications as the result of
+ FcCharSetCopy may return it's argument, and that CharSet may remain
+ unmodifiable.
+
+ FcCharSetCreate
Name
- FcCharSetCreate -- Create an empty character set
+ FcCharSetCreate -- Create an empty character set
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcCharSet * FcCharSetCreate(void);
Description
- FcCharSetCreate allocates and initializes a new empty character
- set object.
+ FcCharSetCreate allocates and initializes a new empty character set
+ object.
-FcCharSetDestroy
+ FcCharSetDestroy
Name
- FcCharSetDestroy -- Destroy a character set
+ FcCharSetDestroy -- Destroy a character set
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
void FcCharSetDestroy(FcCharSet *fcs);
Description
- FcCharSetDestroy decrements the reference count fcs. If the
- reference count becomes zero, all memory referenced is freed.
+ FcCharSetDestroy decrements the reference count fcs. If the reference
+ count becomes zero, all memory referenced is freed.
-FcCharSetAddChar
+ FcCharSetAddChar
Name
- FcCharSetAddChar -- Add a character to a charset
+ FcCharSetAddChar -- Add a character to a charset
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBool FcCharSetAddChar(FcCharSet *fcs, FcChar32 ucs4);
Description
- FcCharSetAddChar adds a single Unicode char to the set,
- returning FcFalse on failure, either as a result of a constant
- set or from running out of memory.
+ FcCharSetAddChar adds a single Unicode char to the set, returning FcFalse
+ on failure, either as a result of a constant set or from running out of
+ memory.
-FcCharSetDelChar
+ FcCharSetDelChar
Name
- FcCharSetDelChar -- Add a character to a charset
+ FcCharSetDelChar -- Add a character to a charset
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBool FcCharSetDelChar(FcCharSet *fcs, FcChar32 ucs4);
Description
- FcCharSetDelChar deletes a single Unicode char from the set,
- returning FcFalse on failure, either as a result of a constant
- set or from running out of memory.
+ FcCharSetDelChar deletes a single Unicode char from the set, returning
+ FcFalse on failure, either as a result of a constant set or from running
+ out of memory.
Since
version 2.9.0
-FcCharSetCopy
+ FcCharSetCopy
Name
- FcCharSetCopy -- Copy a charset
+ FcCharSetCopy -- Copy a charset
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcCharSet * FcCharSetCopy(FcCharSet *src);
Description
- Makes a copy of src; note that this may not actually do
- anything more than increment the reference count on src.
+ Makes a copy of src; note that this may not actually do anything more than
+ increment the reference count on src.
-FcCharSetEqual
+ FcCharSetEqual
Name
- FcCharSetEqual -- Compare two charsets
+ FcCharSetEqual -- Compare two charsets
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBool FcCharSetEqual(const FcCharSet *a, const FcCharSet *b);
@@ -1990,88 +2267,87 @@ Description
Returns whether a and b contain the same set of Unicode chars.
-FcCharSetIntersect
+ FcCharSetIntersect
Name
- FcCharSetIntersect -- Intersect charsets
+ FcCharSetIntersect -- Intersect charsets
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
- FcCharSet * FcCharSetIntersect(const FcCharSet *a, const
- FcCharSet *b);
+
+ FcCharSet * FcCharSetIntersect(const FcCharSet *a, const FcCharSet *b);
Description
Returns a set including only those chars found in both a and b.
-FcCharSetUnion
+ FcCharSetUnion
Name
- FcCharSetUnion -- Add charsets
+ FcCharSetUnion -- Add charsets
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
- FcCharSet * FcCharSetUnion(const FcCharSet *a, const FcCharSet
- *b);
+
+ FcCharSet * FcCharSetUnion(const FcCharSet *a, const FcCharSet *b);
Description
- Returns a set including only those chars found in either a or
- b.
+ Returns a set including only those chars found in either a or b.
-FcCharSetSubtract
+ FcCharSetSubtract
Name
- FcCharSetSubtract -- Subtract charsets
+ FcCharSetSubtract -- Subtract charsets
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
- FcCharSet * FcCharSetSubtract(const FcCharSet *a, const
- FcCharSet *b);
+
+ FcCharSet * FcCharSetSubtract(const FcCharSet *a, const FcCharSet *b);
Description
Returns a set including only those chars found in a but not b.
-FcCharSetMerge
+ FcCharSetMerge
Name
- FcCharSetMerge -- Merge charsets
+ FcCharSetMerge -- Merge charsets
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- FcBool FcCharSetMerge(FcCharSet *a, const FcCharSet *b, FcBool
- *changed);
+ FcBool FcCharSetMerge(FcCharSet *a, const FcCharSet *b, FcBool *changed);
Description
- Adds all chars in b to a. In other words, this is an in-place
- version of FcCharSetUnion. If changed is not NULL, then it
- returns whether any new chars from b were added to a. Returns
- FcFalse on failure, either when a is a constant set or from
- running out of memory.
+ Adds all chars in b to a. In other words, this is an in-place version of
+ FcCharSetUnion. If changed is not NULL, then it returns whether any new
+ chars from b were added to a. Returns FcFalse on failure, either when a is
+ a constant set or from running out of memory.
-FcCharSetHasChar
+ FcCharSetHasChar
Name
- FcCharSetHasChar -- Check a charset for a char
+ FcCharSetHasChar -- Check a charset for a char
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBool FcCharSetHasChar(const FcCharSet *fcs, FcChar32 ucs4);
@@ -2079,15 +2355,16 @@ Description
Returns whether fcs contains the char ucs4.
-FcCharSetCount
+ FcCharSetCount
Name
- FcCharSetCount -- Count entries in a charset
+ FcCharSetCount -- Count entries in a charset
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcChar32 FcCharSetCount(const FcCharSet *a);
@@ -2095,185 +2372,203 @@ Description
Returns the total number of Unicode chars in a.
-FcCharSetIntersectCount
+ FcCharSetIntersectCount
Name
- FcCharSetIntersectCount -- Intersect and count charsets
+ FcCharSetIntersectCount -- Intersect and count charsets
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- FcChar32 FcCharSetIntersectCount(const FcCharSet *a, const
- FcCharSet *b);
+ FcChar32 FcCharSetIntersectCount(const FcCharSet *a, const FcCharSet *b);
Description
Returns the number of chars that are in both a and b.
-FcCharSetSubtractCount
+ FcCharSetSubtractCount
Name
- FcCharSetSubtractCount -- Subtract and count charsets
+ FcCharSetSubtractCount -- Subtract and count charsets
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- FcChar32 FcCharSetSubtractCount(const FcCharSet *a, const
- FcCharSet *b);
+ FcChar32 FcCharSetSubtractCount(const FcCharSet *a, const FcCharSet *b);
Description
Returns the number of chars that are in a but not in b.
-FcCharSetIsSubset
+ FcCharSetIsSubset
Name
- FcCharSetIsSubset -- Test for charset inclusion
+ FcCharSetIsSubset -- Test for charset inclusion
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
- FcBool FcCharSetIsSubset(const FcCharSet *a, const FcCharSet
- *b);
+
+ FcBool FcCharSetIsSubset(const FcCharSet *a, const FcCharSet *b);
Description
Returns whether a is a subset of b.
-FcCharSetFirstPage
+ FcCharSetFirstPage
Name
- FcCharSetFirstPage -- Start enumerating charset contents
+ FcCharSetFirstPage -- Start enumerating charset contents
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcChar32 FcCharSetFirstPage(const FcCharSet *a,
FcChar32[FC_CHARSET_MAP_SIZE] map, FcChar32 *next);
Description
- Builds an array of bits in map marking the first page of
- Unicode coverage of a. *next is set to contains the base code
- point for the next page in a. Returns the base code point for
- the page, or FC_CHARSET_DONE if a contains no pages. As an
- example, if FcCharSetFirstPage returns 0x300 and fills map with
-0xffffffff 0xffffffff 0x01000008 0x44300002 0xffffd7f0 0xfffffffb 0xffff
-7fff 0xffff0003
+ Builds an array of bits in map marking the first page of Unicode coverage
+ of a. *next is set to contains the base code point for the next page in a.
+ Returns the base code point for the page, or FC_CHARSET_DONE if a contains
+ no pages. As an example, if FcCharSetFirstPage returns 0x300 and fills map
+ with
- Then the page contains code points 0x300 through 0x33f (the
- first 64 code points on the page) because map[0] and map[1]
- both have all their bits set. It also contains code points
- 0x343 (0x300 + 32*2 + (4-1)) and 0x35e (0x300 + 32*2 + (31-1))
- because map[2] has the 4th and 31st bits set. The code points
- represented by map[3] and later are left as an excercise for
+0xffffffff 0xffffffff 0x01000008 0x44300002 0xffffd7f0 0xfffffffb 0xffff7fff 0xffff0003
+
+ Then the page contains code points 0x300 through 0x33f (the first 64 code
+ points on the page) because map[0] and map[1] both have all their bits
+ set. It also contains code points 0x343 (0x300 + 32*2 + (4-1)) and 0x35e
+ (0x300 + 32*2 + (31-1)) because map[2] has the 4th and 31st bits set. The
+ code points represented by map[3] and later are left as an excercise for
the reader ;).
-FcCharSetNextPage
+ FcCharSetNextPage
Name
- FcCharSetNextPage -- Continue enumerating charset contents
+ FcCharSetNextPage -- Continue enumerating charset contents
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcChar32 FcCharSetNextPage(const FcCharSet *a,
FcChar32[FC_CHARSET_MAP_SIZE] map, FcChar32 *next);
Description
- Builds an array of bits in map marking the Unicode coverage of
- a for page containing *next (see the FcCharSetFirstPage
- description for details). *next is set to contains the base
- code point for the next page in a. Returns the base of code
- point for the page, or FC_CHARSET_DONE if a does not contain
- *next.
+ Builds an array of bits in map marking the Unicode coverage of a for page
+ containing *next (see the FcCharSetFirstPage description for details).
+ *next is set to contains the base code point for the next page in a.
+ Returns the base of code point for the page, or FC_CHARSET_DONE if a does
+ not contain *next.
-FcCharSetCoverage
+ FcCharSetCoverage
Name
- FcCharSetCoverage -- DEPRECATED return coverage for a Unicode
- page
+ FcCharSetCoverage -- DEPRECATED return coverage for a Unicode page
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcChar32 FcCharSetCoverage(const FcCharSet *a, FcChar32page,
FcChar32[8]result);
Description
- DEPRECATED This function returns a bitmask in result which
- indicates which code points in page are included in a.
- FcCharSetCoverage returns the next page in the charset which
- has any coverage.
+ DEPRECATED This function returns a bitmask in result which indicates which
+ code points in page are included in a. FcCharSetCoverage returns the next
+ page in the charset which has any coverage.
-FcCharSetNew
+ FcCharSetNew
Name
- FcCharSetNew -- DEPRECATED alias for FcCharSetCreate
+ FcCharSetNew -- DEPRECATED alias for FcCharSetCreate
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcCharSet * FcCharSetNew(void);
Description
FcCharSetNew is a DEPRECATED alias for FcCharSetCreate.
- __________________________________________________________
-FcLangSet
+ --------------------------------------------------------------------------
+
+ FcLangSet
Table of Contents
- FcLangSetCreate -- create a langset object
- FcLangSetDestroy -- destroy a langset object
- FcLangSetCopy -- copy a langset object
- FcLangSetAdd -- add a language to a langset
- FcLangSetDel -- delete a language from a langset
- FcLangSetUnion -- Add langsets
- FcLangSetSubtract -- Subtract langsets
- FcLangSetCompare -- compare language sets
- FcLangSetContains -- check langset subset relation
- FcLangSetEqual -- test for matching langsets
- FcLangSetHash -- return a hash value for a langset
- FcLangSetHasLang -- test langset for language support
- FcGetDefaultLangs -- Get the default languages list
- FcLangSetGetLangs -- get the list of languages in the langset
- FcGetLangs -- Get list of languages
- FcLangNormalize -- Normalize the language string
- FcLangGetCharSet -- Get character map for a language
- An FcLangSet is a set of language names (each of which include
- language and an optional territory). They are used when
- selecting fonts to indicate which languages the fonts need to
- support. Each font is marked, using language orthography
- information built into fontconfig, with the set of supported
- languages.
+ [84]FcLangSetCreate -- create a langset object
+
+ [85]FcLangSetDestroy -- destroy a langset object
+
+ [86]FcLangSetCopy -- copy a langset object
+
+ [87]FcLangSetAdd -- add a language to a langset
+
+ [88]FcLangSetDel -- delete a language from a langset
+
+ [89]FcLangSetUnion -- Add langsets
+
+ [90]FcLangSetSubtract -- Subtract langsets
+
+ [91]FcLangSetCompare -- compare language sets
+
+ [92]FcLangSetContains -- check langset subset relation
+
+ [93]FcLangSetEqual -- test for matching langsets
+
+ [94]FcLangSetHash -- return a hash value for a langset
+
+ [95]FcLangSetHasLang -- test langset for language support
+
+ [96]FcGetDefaultLangs -- Get the default languages list
+
+ [97]FcLangSetGetLangs -- get the list of languages in the langset
-FcLangSetCreate
+ [98]FcGetLangs -- Get list of languages
+
+ [99]FcLangNormalize -- Normalize the language string
+
+ [100]FcLangGetCharSet -- Get character map for a language
+
+ An FcLangSet is a set of language names (each of which include language
+ and an optional territory). They are used when selecting fonts to indicate
+ which languages the fonts need to support. Each font is marked, using
+ language orthography information built into fontconfig, with the set of
+ supported languages.
+
+ FcLangSetCreate
Name
- FcLangSetCreate -- create a langset object
+ FcLangSetCreate -- create a langset object
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcLangSet * FcLangSetCreate(void);
@@ -2281,258 +2576,261 @@ Description
FcLangSetCreate creates a new FcLangSet object.
-FcLangSetDestroy
+ FcLangSetDestroy
Name
- FcLangSetDestroy -- destroy a langset object
+ FcLangSetDestroy -- destroy a langset object
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
void FcLangSetDestroy(FcLangSet *ls);
Description
- FcLangSetDestroy destroys a FcLangSet object, freeing all
- memory associated with it.
+ FcLangSetDestroy destroys a FcLangSet object, freeing all memory
+ associated with it.
-FcLangSetCopy
+ FcLangSetCopy
Name
- FcLangSetCopy -- copy a langset object
+ FcLangSetCopy -- copy a langset object
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcLangSet * FcLangSetCopy(const FcLangSet *ls);
Description
- FcLangSetCopy creates a new FcLangSet object and populates it
- with the contents of ls.
+ FcLangSetCopy creates a new FcLangSet object and populates it with the
+ contents of ls.
-FcLangSetAdd
+ FcLangSetAdd
Name
- FcLangSetAdd -- add a language to a langset
+ FcLangSetAdd -- add a language to a langset
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBool FcLangSetAdd(FcLangSet *ls, const FcChar8 *lang);
Description
- lang is added to ls. lang should be of the form Ll-Tt where Ll
- is a two or three letter language from ISO 639 and Tt is a
- territory from ISO 3166.
+ lang is added to ls. lang should be of the form Ll-Tt where Ll is a two or
+ three letter language from ISO 639 and Tt is a territory from ISO 3166.
-FcLangSetDel
+ FcLangSetDel
Name
- FcLangSetDel -- delete a language from a langset
+ FcLangSetDel -- delete a language from a langset
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBool FcLangSetDel(FcLangSet *ls, const FcChar8 *lang);
Description
- lang is removed from ls. lang should be of the form Ll-Tt where
- Ll is a two or three letter language from ISO 639 and Tt is a
- territory from ISO 3166.
+ lang is removed from ls. lang should be of the form Ll-Tt where Ll is a
+ two or three letter language from ISO 639 and Tt is a territory from ISO
+ 3166.
Since
version 2.9.0
-FcLangSetUnion
+ FcLangSetUnion
Name
- FcLangSetUnion -- Add langsets
+ FcLangSetUnion -- Add langsets
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- FcLangSet * FcLangSetUnion(const FcLangSet *ls_a, const
- FcLangSet *ls_b);
+ FcLangSet * FcLangSetUnion(const FcLangSet *ls_a, const FcLangSet *ls_b);
Description
- Returns a set including only those languages found in either
- ls_a or ls_b.
+ Returns a set including only those languages found in either ls_a or ls_b.
Since
version 2.9.0
-FcLangSetSubtract
+ FcLangSetSubtract
Name
- FcLangSetSubtract -- Subtract langsets
+ FcLangSetSubtract -- Subtract langsets
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- FcLangSet * FcLangSetSubtract(const FcLangSet *ls_a, const
- FcLangSet *ls_b);
+ FcLangSet * FcLangSetSubtract(const FcLangSet *ls_a, const FcLangSet
+ *ls_b);
Description
- Returns a set including only those languages found in ls_a but
- not in ls_b.
+ Returns a set including only those languages found in ls_a but not in
+ ls_b.
Since
version 2.9.0
-FcLangSetCompare
+ FcLangSetCompare
Name
- FcLangSetCompare -- compare language sets
+ FcLangSetCompare -- compare language sets
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- FcLangResult FcLangSetCompare(const FcLangSet *ls_a, const
- FcLangSet *ls_b);
+ FcLangResult FcLangSetCompare(const FcLangSet *ls_a, const FcLangSet
+ *ls_b);
Description
- FcLangSetCompare compares language coverage for ls_a and ls_b.
- If they share any language and territory pair, this function
- returns FcLangEqual. If they share a language but differ in
- which territory that language is for, this function returns
- FcLangDifferentTerritory. If they share no languages in common,
- this function returns FcLangDifferentLang.
+ FcLangSetCompare compares language coverage for ls_a and ls_b. If they
+ share any language and territory pair, this function returns FcLangEqual.
+ If they share a language but differ in which territory that language is
+ for, this function returns FcLangDifferentTerritory. If they share no
+ languages in common, this function returns FcLangDifferentLang.
-FcLangSetContains
+ FcLangSetContains
Name
- FcLangSetContains -- check langset subset relation
+ FcLangSetContains -- check langset subset relation
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
- FcBool FcLangSetContains(const FcLangSet *ls_a, const FcLangSet
- *ls_b);
+
+ FcBool FcLangSetContains(const FcLangSet *ls_a, const FcLangSet *ls_b);
Description
- FcLangSetContains returns FcTrue if ls_a contains every
- language in ls_b. ls_a will 'contain' a language from ls_b if
- ls_a has exactly the language, or either the language or ls_a
- has no territory.
+ FcLangSetContains returns FcTrue if ls_a contains every language in ls_b.
+ ls_a will 'contain' a language from ls_b if ls_a has exactly the language,
+ or either the language or ls_a has no territory.
-FcLangSetEqual
+ FcLangSetEqual
Name
- FcLangSetEqual -- test for matching langsets
+ FcLangSetEqual -- test for matching langsets
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
- FcBool FcLangSetEqual(const FcLangSet *ls_a, const FcLangSet
- *ls_b);
+
+ FcBool FcLangSetEqual(const FcLangSet *ls_a, const FcLangSet *ls_b);
Description
- Returns FcTrue if and only if ls_a supports precisely the same
- language and territory combinations as ls_b.
+ Returns FcTrue if and only if ls_a supports precisely the same language
+ and territory combinations as ls_b.
-FcLangSetHash
+ FcLangSetHash
Name
- FcLangSetHash -- return a hash value for a langset
+ FcLangSetHash -- return a hash value for a langset
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcChar32 FcLangSetHash(const FcLangSet *ls);
Description
- This function returns a value which depends solely on the
- languages supported by ls. Any language which equals ls will
- have the same result from FcLangSetHash. However, two langsets
- with the same hash value may not be equal.
+ This function returns a value which depends solely on the languages
+ supported by ls. Any language which equals ls will have the same result
+ from FcLangSetHash. However, two langsets with the same hash value may not
+ be equal.
-FcLangSetHasLang
+ FcLangSetHasLang
Name
- FcLangSetHasLang -- test langset for language support
+ FcLangSetHasLang -- test langset for language support
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- FcLangResult FcLangSetHasLang(const FcLangSet *ls, const
- FcChar8 *lang);
+ FcLangResult FcLangSetHasLang(const FcLangSet *ls, const FcChar8 *lang);
Description
- FcLangSetHasLang checks whether ls supports lang. If ls has a
- matching language and territory pair, this function returns
- FcLangEqual. If ls has a matching language but differs in which
- territory that language is for, this function returns
- FcLangDifferentTerritory. If ls has no matching language, this
- function returns FcLangDifferentLang.
+ FcLangSetHasLang checks whether ls supports lang. If ls has a matching
+ language and territory pair, this function returns FcLangEqual. If ls has
+ a matching language but differs in which territory that language is for,
+ this function returns FcLangDifferentTerritory. If ls has no matching
+ language, this function returns FcLangDifferentLang.
-FcGetDefaultLangs
+ FcGetDefaultLangs
Name
- FcGetDefaultLangs -- Get the default languages list
+ FcGetDefaultLangs -- Get the default languages list
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcStrSet * FcGetDefaultLangs(void);
Description
- Returns a string set of the default languages according to the
- environment variables on the system. This function looks for
- them in order of FC_LANG, LC_ALL, LC_CTYPE and LANG then. If
- there are no valid values in those environment variables, "en"
- will be set as fallback.
+ Returns a string set of the default languages according to the environment
+ variables on the system. This function looks for them in order of FC_LANG,
+ LC_ALL, LC_CTYPE and LANG then. If there are no valid values in those
+ environment variables, "en" will be set as fallback.
Since
version 2.9.91
-FcLangSetGetLangs
+ FcLangSetGetLangs
Name
- FcLangSetGetLangs -- get the list of languages in the langset
+ FcLangSetGetLangs -- get the list of languages in the langset
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcStrSet * FcLangSetGetLangs(const FcLangSet *ls);
@@ -2540,15 +2838,16 @@ Description
Returns a string set of all languages in langset.
-FcGetLangs
+ FcGetLangs
Name
- FcGetLangs -- Get list of languages
+ FcGetLangs -- Get list of languages
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcStrSet * FcGetLangs(void);
@@ -2556,15 +2855,16 @@ Description
Returns a string set of all known languages.
-FcLangNormalize
+ FcLangNormalize
Name
- FcLangNormalize -- Normalize the language string
+ FcLangNormalize -- Normalize the language string
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcChar8 * FcLangNormalize(const FcChar8 *lang);
@@ -2576,46 +2876,55 @@ Since
version 2.10.91
-FcLangGetCharSet
+ FcLangGetCharSet
Name
- FcLangGetCharSet -- Get character map for a language
+ FcLangGetCharSet -- Get character map for a language
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
const FcCharSet * FcLangGetCharSet(const FcChar8 *lang);
Description
Returns the FcCharMap for a language.
- __________________________________________________________
-FcMatrix
+ --------------------------------------------------------------------------
+
+ FcMatrix
Table of Contents
- FcMatrixInit -- initialize an FcMatrix structure
- FcMatrixCopy -- Copy a matrix
- FcMatrixEqual -- Compare two matrices
- FcMatrixMultiply -- Multiply matrices
- FcMatrixRotate -- Rotate a matrix
- FcMatrixScale -- Scale a matrix
- FcMatrixShear -- Shear a matrix
- FcMatrix structures hold an affine transformation in matrix
- form.
+ [101]FcMatrixInit -- initialize an FcMatrix structure
+
+ [102]FcMatrixCopy -- Copy a matrix
+
+ [103]FcMatrixEqual -- Compare two matrices
+
+ [104]FcMatrixMultiply -- Multiply matrices
-FcMatrixInit
+ [105]FcMatrixRotate -- Rotate a matrix
+
+ [106]FcMatrixScale -- Scale a matrix
+
+ [107]FcMatrixShear -- Shear a matrix
+
+ FcMatrix structures hold an affine transformation in matrix form.
+
+ FcMatrixInit
Name
- FcMatrixInit -- initialize an FcMatrix structure
+ FcMatrixInit -- initialize an FcMatrix structure
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
void FcMatrixInit(FcMatrix *matrix);
@@ -2623,15 +2932,16 @@ Description
FcMatrixInit initializes matrix to the identity matrix.
-FcMatrixCopy
+ FcMatrixCopy
Name
- FcMatrixCopy -- Copy a matrix
+ FcMatrixCopy -- Copy a matrix
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
void FcMatrixCopy(const FcMatrix *matrix);
@@ -2639,207 +2949,223 @@ Description
FcMatrixCopy allocates a new FcMatrix and copies mat into it.
-FcMatrixEqual
+ FcMatrixEqual
Name
- FcMatrixEqual -- Compare two matrices
+ FcMatrixEqual -- Compare two matrices
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
- void FcMatrixEqual(const FcMatrix *matrix1, const FcMatrix
- *matrix2);
+
+ void FcMatrixEqual(const FcMatrix *matrix1, const FcMatrix *matrix2);
Description
- FcMatrixEqual compares matrix1 and matrix2 returning FcTrue
- when they are equal and FcFalse when they are not.
+ FcMatrixEqual compares matrix1 and matrix2 returning FcTrue when they are
+ equal and FcFalse when they are not.
-FcMatrixMultiply
+ FcMatrixMultiply
Name
- FcMatrixMultiply -- Multiply matrices
+ FcMatrixMultiply -- Multiply matrices
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- void FcMatrixMultiply(FcMatrix *result, const FcMatrix
- *matrix1, const FcMatrix *matrix2);
+ void FcMatrixMultiply(FcMatrix *result, const FcMatrix *matrix1, const
+ FcMatrix *matrix2);
Description
- FcMatrixMultiply multiplies matrix1 and matrix2 storing the
- result in result.
+ FcMatrixMultiply multiplies matrix1 and matrix2 storing the result in
+ result.
-FcMatrixRotate
+ FcMatrixRotate
Name
- FcMatrixRotate -- Rotate a matrix
+ FcMatrixRotate -- Rotate a matrix
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
void FcMatrixRotate(FcMatrix *matrix, double cos, double sin);
Description
- FcMatrixRotate rotates matrix by the angle who's sine is sin
- and cosine is cos. This is done by multiplying by the matrix:
- cos -sin
- sin cos
+ FcMatrixRotate rotates matrix by the angle who's sine is sin and cosine is
+ cos. This is done by multiplying by the matrix:
-FcMatrixScale
+ cos -sin
+ sin cos
+
+ FcMatrixScale
Name
- FcMatrixScale -- Scale a matrix
+ FcMatrixScale -- Scale a matrix
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
void FcMatrixScale(FcMatrix *matrix, double sx, double dy);
Description
- FcMatrixScale multiplies matrix x values by sx and y values by
- dy. This is done by multiplying by the matrix:
- sx 0
- 0 dy
+ FcMatrixScale multiplies matrix x values by sx and y values by dy. This is
+ done by multiplying by the matrix:
+
+ sx 0
+ 0 dy
-FcMatrixShear
+ FcMatrixShear
Name
- FcMatrixShear -- Shear a matrix
+ FcMatrixShear -- Shear a matrix
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
void FcMatrixShear(FcMatrix *matrix, double sh, double sv);
Description
- FcMatrixShare shears matrix horizontally by sh and vertically
- by sv. This is done by multiplying by the matrix:
- 1 sh
- sv 1
- __________________________________________________________
+ FcMatrixShare shears matrix horizontally by sh and vertically by sv. This
+ is done by multiplying by the matrix:
+
+ 1 sh
+ sv 1
+
+ --------------------------------------------------------------------------
-FcRange
+ FcRange
Table of Contents
- FcRangeCopy -- Copy a range object
- FcRangeCreateDouble -- create a range object for double
- FcRangeCreateInteger -- create a range object for integer
- FcRangeDestroy -- destroy a range object
- FcRangeGetDouble -- Get the range in double
+
+ [108]FcRangeCopy -- Copy a range object
+
+ [109]FcRangeCreateDouble -- create a range object for double
+
+ [110]FcRangeCreateInteger -- create a range object for integer
+
+ [111]FcRangeDestroy -- destroy a range object
+
+ [112]FcRangeGetDouble -- Get the range in double
An FcRange holds two variables to indicate a range in between.
-FcRangeCopy
+ FcRangeCopy
Name
- FcRangeCopy -- Copy a range object
+ FcRangeCopy -- Copy a range object
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcRange * FcRangeCopy(const FcRange *range);
Description
- FcRangeCopy creates a new FcRange object and populates it with
- the contents of range.
+ FcRangeCopy creates a new FcRange object and populates it with the
+ contents of range.
Since
version 2.11.91
-FcRangeCreateDouble
+ FcRangeCreateDouble
Name
- FcRangeCreateDouble -- create a range object for double
+ FcRangeCreateDouble -- create a range object for double
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcRange * FcRangeCreateDouble(doublebegin, doubleend);
Description
- FcRangeCreateDouble creates a new FcRange object with double
- sized value.
+ FcRangeCreateDouble creates a new FcRange object with double sized value.
Since
version 2.11.91
-FcRangeCreateInteger
+ FcRangeCreateInteger
Name
- FcRangeCreateInteger -- create a range object for integer
+ FcRangeCreateInteger -- create a range object for integer
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcRange * FcRangeCreateInteger(intbegin, intend);
Description
- FcRangeCreateInteger creates a new FcRange object with integer
- sized value.
+ FcRangeCreateInteger creates a new FcRange object with integer sized
+ value.
Since
version 2.11.91
-FcRangeDestroy
+ FcRangeDestroy
Name
- FcRangeDestroy -- destroy a range object
+ FcRangeDestroy -- destroy a range object
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
void FcRangeDestroy(FcRange *range);
Description
- FcRangeDestroy destroys a FcRange object, freeing all memory
- associated with it.
+ FcRangeDestroy destroys a FcRange object, freeing all memory associated
+ with it.
Since
version 2.11.91
-FcRangeGetDouble
+ FcRangeGetDouble
Name
- FcRangeGetDouble -- Get the range in double
+ FcRangeGetDouble -- Get the range in double
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- FcBool FcRangeGetDouble(const FcRange *range, double *begin,
- double *end);
+ FcBool FcRangeGetDouble(const FcRange *range, double *begin, double *end);
Description
@@ -2848,72 +3174,99 @@ Description
Since
version 2.11.91
- __________________________________________________________
-FcConfig
+ --------------------------------------------------------------------------
+
+ FcConfig
Table of Contents
- FcConfigCreate -- Create a configuration
- FcConfigReference -- Increment config reference count
- FcConfigDestroy -- Destroy a configuration
- FcConfigSetCurrent -- Set configuration as default
- FcConfigGetCurrent -- Return current configuration
- FcConfigUptoDate -- Check timestamps on config files
- FcConfigHome -- return the current home directory.
- FcConfigEnableHome -- controls use of the home directory.
- FcConfigBuildFonts -- Build font database
- FcConfigGetConfigDirs -- Get config directories
- FcConfigGetFontDirs -- Get font directories
- FcConfigGetConfigFiles -- Get config files
- FcConfigGetCache -- DEPRECATED used to return per-user cache
- filename
-
- FcConfigGetCacheDirs -- return the list of directories searched
- for cache files
-
- FcConfigGetFonts -- Get config font set
- FcConfigGetBlanks -- Get config blanks
- FcConfigGetRescanInterval -- Get config rescan interval
- FcConfigSetRescanInterval -- Set config rescan interval
- FcConfigAppFontAddFile -- Add font file to font database
- FcConfigAppFontAddDir -- Add fonts from directory to font
- database
-
- FcConfigAppFontClear -- Remove all app fonts from font database
- FcConfigSubstituteWithPat -- Execute substitutions
- FcConfigSubstitute -- Execute substitutions
- FcFontMatch -- Return best font
- FcFontSort -- Return list of matching fonts
- FcFontRenderPrepare -- Prepare pattern for loading font file
- FcFontList -- List fonts
- FcConfigFilename -- Find a config file
- FcConfigParseAndLoad -- load a configuration file
- FcConfigParseAndLoadFromMemory -- load a configuration from
- memory
-
- FcConfigGetSysRoot -- Obtain the system root directory
- FcConfigSetSysRoot -- Set the system root directory
- FcConfigFileInfoIterInit -- Initialize the iterator
- FcConfigFileInfoIterNext -- Set the iterator to point to the
- next list
-
- FcConfigFileInfoIterGet -- Obtain the configuration file
- information
-
- An FcConfig object holds the internal representation of a
- configuration. There is a default configuration which
- applications may use by passing 0 to any function using the
- data within an FcConfig.
-
-FcConfigCreate
-
-Name
-
- FcConfigCreate -- Create a configuration
-
-Synopsis
-
-#include <fontconfig/fontconfig.h>
+
+ [113]FcConfigCreate -- Create a configuration
+
+ [114]FcConfigReference -- Increment config reference count
+
+ [115]FcConfigDestroy -- Destroy a configuration
+
+ [116]FcConfigSetCurrent -- Set configuration as default
+
+ [117]FcConfigGetCurrent -- Return current configuration
+
+ [118]FcConfigUptoDate -- Check timestamps on config files
+
+ [119]FcConfigHome -- return the current home directory.
+
+ [120]FcConfigEnableHome -- controls use of the home directory.
+
+ [121]FcConfigBuildFonts -- Build font database
+
+ [122]FcConfigGetConfigDirs -- Get config directories
+
+ [123]FcConfigGetFontDirs -- Get font directories
+
+ [124]FcConfigGetConfigFiles -- Get config files
+
+ [125]FcConfigGetCache -- DEPRECATED used to return per-user cache filename
+
+ [126]FcConfigGetCacheDirs -- return the list of directories searched for
+ cache files
+
+ [127]FcConfigGetFonts -- Get config font set
+
+ [128]FcConfigGetBlanks -- Get config blanks
+
+ [129]FcConfigGetRescanInterval -- Get config rescan interval
+
+ [130]FcConfigSetRescanInterval -- Set config rescan interval
+
+ [131]FcConfigAppFontAddFile -- Add font file to font database
+
+ [132]FcConfigAppFontAddDir -- Add fonts from directory to font database
+
+ [133]FcConfigAppFontClear -- Remove all app fonts from font database
+
+ [134]FcConfigSubstituteWithPat -- Execute substitutions
+
+ [135]FcConfigSubstitute -- Execute substitutions
+
+ [136]FcFontMatch -- Return best font
+
+ [137]FcFontSort -- Return list of matching fonts
+
+ [138]FcFontRenderPrepare -- Prepare pattern for loading font file
+
+ [139]FcFontList -- List fonts
+
+ [140]FcConfigFilename -- Find a config file
+
+ [141]FcConfigParseAndLoad -- load a configuration file
+
+ [142]FcConfigParseAndLoadFromMemory -- load a configuration from memory
+
+ [143]FcConfigGetSysRoot -- Obtain the system root directory
+
+ [144]FcConfigSetSysRoot -- Set the system root directory
+
+ [145]FcConfigFileInfoIterInit -- Initialize the iterator
+
+ [146]FcConfigFileInfoIterNext -- Set the iterator to point to the next
+ list
+
+ [147]FcConfigFileInfoIterGet -- Obtain the configuration file information
+
+ An FcConfig object holds the internal representation of a configuration.
+ There is a default configuration which applications may use by passing 0
+ to any function using the data within an FcConfig.
+
+ FcConfigCreate
+
+Name
+
+ FcConfigCreate -- Create a configuration
+
+Synopsis
+
+ #include <fontconfig/fontconfig.h>
+
FcConfig * FcConfigCreate(void);
@@ -2921,76 +3274,77 @@ Description
Creates an empty configuration.
-FcConfigReference
+ FcConfigReference
Name
- FcConfigReference -- Increment config reference count
+ FcConfigReference -- Increment config reference count
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcConfig * FcConfigReference(FcConfig *config);
Description
- Add another reference to config. Configs are freed only when
- the reference count reaches zero. If config is NULL, the
- current configuration is used. In that case this function will
- be similar to FcConfigGetCurrent() except that it increments
- the reference count before returning and the user is
- responsible for destroying the configuration when not needed
- anymore.
+ Add another reference to config. Configs are freed only when the reference
+ count reaches zero. If config is NULL, the current configuration is used.
+ In that case this function will be similar to FcConfigGetCurrent() except
+ that it increments the reference count before returning and the user is
+ responsible for destroying the configuration when not needed anymore.
-FcConfigDestroy
+ FcConfigDestroy
Name
- FcConfigDestroy -- Destroy a configuration
+ FcConfigDestroy -- Destroy a configuration
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
void FcConfigDestroy(FcConfig *config);
Description
- Decrements the config reference count. If all references are
- gone, destroys the configuration and any data associated with
- it. Note that calling this function with the return from
- FcConfigGetCurrent will cause a new configuration to be created
- for use as current configuration.
+ Decrements the config reference count. If all references are gone,
+ destroys the configuration and any data associated with it. Note that
+ calling this function with the return from FcConfigGetCurrent will cause a
+ new configuration to be created for use as current configuration.
-FcConfigSetCurrent
+ FcConfigSetCurrent
Name
- FcConfigSetCurrent -- Set configuration as default
+ FcConfigSetCurrent -- Set configuration as default
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBool FcConfigSetCurrent(FcConfig *config);
Description
- Sets the current default configuration to config. Implicitly
- calls FcConfigBuildFonts if necessary, and FcConfigReference()
- to inrease the reference count in config since 2.12.0,
- returning FcFalse if that call fails.
+ Sets the current default configuration to config. Implicitly calls
+ FcConfigBuildFonts if necessary, and FcConfigReference() to inrease the
+ reference count in config since 2.12.0, returning FcFalse if that call
+ fails.
-FcConfigGetCurrent
+ FcConfigGetCurrent
Name
- FcConfigGetCurrent -- Return current configuration
+ FcConfigGetCurrent -- Return current configuration
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcConfig * FcConfigGetCurrent(void);
@@ -2998,205 +3352,208 @@ Description
Returns the current default configuration.
-FcConfigUptoDate
+ FcConfigUptoDate
Name
- FcConfigUptoDate -- Check timestamps on config files
+ FcConfigUptoDate -- Check timestamps on config files
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBool FcConfigUptoDate(FcConfig *config);
Description
- Checks all of the files related to config and returns whether
- any of them has been modified since the configuration was
- created. If config is NULL, the current configuration is used.
+ Checks all of the files related to config and returns whether any of them
+ has been modified since the configuration was created. If config is NULL,
+ the current configuration is used.
-FcConfigHome
+ FcConfigHome
Name
- FcConfigHome -- return the current home directory.
+ FcConfigHome -- return the current home directory.
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcChar8 * FcConfigHome(void);
Description
- Return the current user's home directory, if it is available,
- and if using it is enabled, and NULL otherwise. See also
- FcConfigEnableHome).
+ Return the current user's home directory, if it is available, and if using
+ it is enabled, and NULL otherwise. See also FcConfigEnableHome).
-FcConfigEnableHome
+ FcConfigEnableHome
Name
- FcConfigEnableHome -- controls use of the home directory.
+ FcConfigEnableHome -- controls use of the home directory.
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBool FcConfigEnableHome(FcBool enable);
Description
- If enable is FcTrue, then Fontconfig will use various files
- which are specified relative to the user's home directory
- (using the ~ notation in the configuration). When enable is
- FcFalse, then all use of the home directory in these contexts
- will be disabled. The previous setting of the value is
- returned.
+ If enable is FcTrue, then Fontconfig will use various files which are
+ specified relative to the user's home directory (using the ~ notation in
+ the configuration). When enable is FcFalse, then all use of the home
+ directory in these contexts will be disabled. The previous setting of the
+ value is returned.
-FcConfigBuildFonts
+ FcConfigBuildFonts
Name
- FcConfigBuildFonts -- Build font database
+ FcConfigBuildFonts -- Build font database
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBool FcConfigBuildFonts(FcConfig *config);
Description
- Builds the set of available fonts for the given configuration.
- Note that any changes to the configuration after this call have
- indeterminate effects. Returns FcFalse if this operation runs
- out of memory. If config is NULL, the current configuration is
- used.
+ Builds the set of available fonts for the given configuration. Note that
+ any changes to the configuration after this call have indeterminate
+ effects. Returns FcFalse if this operation runs out of memory. If config
+ is NULL, the current configuration is used.
-FcConfigGetConfigDirs
+ FcConfigGetConfigDirs
Name
- FcConfigGetConfigDirs -- Get config directories
+ FcConfigGetConfigDirs -- Get config directories
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcStrList * FcConfigGetConfigDirs(FcConfig *config);
Description
- Returns the list of font directories specified in the
- configuration files for config. Does not include any
- subdirectories. If config is NULL, the current configuration is
- used.
+ Returns the list of font directories specified in the configuration files
+ for config. Does not include any subdirectories. If config is NULL, the
+ current configuration is used.
-FcConfigGetFontDirs
+ FcConfigGetFontDirs
Name
- FcConfigGetFontDirs -- Get font directories
+ FcConfigGetFontDirs -- Get font directories
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcStrList * FcConfigGetFontDirs(FcConfig *config);
Description
- Returns the list of font directories in config. This includes
- the configured font directories along with any directories
- below those in the filesystem. If config is NULL, the current
- configuration is used.
+ Returns the list of font directories in config. This includes the
+ configured font directories along with any directories below those in the
+ filesystem. If config is NULL, the current configuration is used.
-FcConfigGetConfigFiles
+ FcConfigGetConfigFiles
Name
- FcConfigGetConfigFiles -- Get config files
+ FcConfigGetConfigFiles -- Get config files
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcStrList * FcConfigGetConfigFiles(FcConfig *config);
Description
- Returns the list of known configuration files used to generate
- config. If config is NULL, the current configuration is used.
+ Returns the list of known configuration files used to generate config. If
+ config is NULL, the current configuration is used.
-FcConfigGetCache
+ FcConfigGetCache
Name
- FcConfigGetCache -- DEPRECATED used to return per-user cache
- filename
+ FcConfigGetCache -- DEPRECATED used to return per-user cache filename
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcChar8 * FcConfigGetCache(FcConfig *config);
Description
- With fontconfig no longer using per-user cache files, this
- function now simply returns NULL to indicate that no per-user
- file exists.
+ With fontconfig no longer using per-user cache files, this function now
+ simply returns NULL to indicate that no per-user file exists.
-FcConfigGetCacheDirs
+ FcConfigGetCacheDirs
Name
- FcConfigGetCacheDirs -- return the list of directories searched
- for cache files
+ FcConfigGetCacheDirs -- return the list of directories searched for cache
+ files
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcStrList * FcConfigGetCacheDirs(const FcConfig *config);
Description
- FcConfigGetCacheDirs returns a string list containing all of
- the directories that fontconfig will search when attempting to
- load a cache file for a font directory. If config is NULL, the
- current configuration is used.
+ FcConfigGetCacheDirs returns a string list containing all of the
+ directories that fontconfig will search when attempting to load a cache
+ file for a font directory. If config is NULL, the current configuration is
+ used.
-FcConfigGetFonts
+ FcConfigGetFonts
Name
- FcConfigGetFonts -- Get config font set
+ FcConfigGetFonts -- Get config font set
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcFontSet * FcConfigGetFonts(FcConfig *config, FcSetName set);
Description
- Returns one of the two sets of fonts from the configuration as
- specified by set. This font set is owned by the library and
- must not be modified or freed. If config is NULL, the current
- configuration is used.
+ Returns one of the two sets of fonts from the configuration as specified
+ by set. This font set is owned by the library and must not be modified or
+ freed. If config is NULL, the current configuration is used.
-FcConfigGetBlanks
+ FcConfigGetBlanks
Name
- FcConfigGetBlanks -- Get config blanks
+ FcConfigGetBlanks -- Get config blanks
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBlanks * FcConfigGetBlanks(FcConfig *config);
@@ -3204,335 +3561,332 @@ Description
FcBlanks is deprecated. This function always returns NULL.
-FcConfigGetRescanInterval
+ FcConfigGetRescanInterval
Name
- FcConfigGetRescanInterval -- Get config rescan interval
+ FcConfigGetRescanInterval -- Get config rescan interval
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
int FcConfigGetRescanInterval(FcConfig *config);
Description
- Returns the interval between automatic checks of the
- configuration (in seconds) specified in config. The
- configuration is checked during a call to FcFontList when this
- interval has passed since the last check. An interval setting
- of zero disables automatic checks. If config is NULL, the
+ Returns the interval between automatic checks of the configuration (in
+ seconds) specified in config. The configuration is checked during a call
+ to FcFontList when this interval has passed since the last check. An
+ interval setting of zero disables automatic checks. If config is NULL, the
current configuration is used.
-FcConfigSetRescanInterval
+ FcConfigSetRescanInterval
Name
- FcConfigSetRescanInterval -- Set config rescan interval
+ FcConfigSetRescanInterval -- Set config rescan interval
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- FcBool FcConfigSetRescanInterval(FcConfig *config, int
- rescanInterval);
+ FcBool FcConfigSetRescanInterval(FcConfig *config, int rescanInterval);
Description
- Sets the rescan interval. Returns FcFalse if the interval
- cannot be set (due to allocation failure). Otherwise returns
- FcTrue. An interval setting of zero disables automatic checks.
- If config is NULL, the current configuration is used.
+ Sets the rescan interval. Returns FcFalse if the interval cannot be set
+ (due to allocation failure). Otherwise returns FcTrue. An interval setting
+ of zero disables automatic checks. If config is NULL, the current
+ configuration is used.
-FcConfigAppFontAddFile
+ FcConfigAppFontAddFile
Name
- FcConfigAppFontAddFile -- Add font file to font database
+ FcConfigAppFontAddFile -- Add font file to font database
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
- FcBool FcConfigAppFontAddFile(FcConfig *config, const FcChar8
- *file);
+
+ FcBool FcConfigAppFontAddFile(FcConfig *config, const FcChar8 *file);
Description
- Adds an application-specific font to the configuration. Returns
- FcFalse if the fonts cannot be added (due to allocation failure
- or no fonts found). Otherwise returns FcTrue. If config is
- NULL, the current configuration is used.
+ Adds an application-specific font to the configuration. Returns FcFalse if
+ the fonts cannot be added (due to allocation failure or no fonts found).
+ Otherwise returns FcTrue. If config is NULL, the current configuration is
+ used.
-FcConfigAppFontAddDir
+ FcConfigAppFontAddDir
Name
- FcConfigAppFontAddDir -- Add fonts from directory to font
- database
+ FcConfigAppFontAddDir -- Add fonts from directory to font database
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
- FcBool FcConfigAppFontAddDir(FcConfig *config, const FcChar8
- *dir);
+
+ FcBool FcConfigAppFontAddDir(FcConfig *config, const FcChar8 *dir);
Description
- Scans the specified directory for fonts, adding each one found
- to the application-specific set of fonts. Returns FcFalse if
- the fonts cannot be added (due to allocation failure).
- Otherwise returns FcTrue. If config is NULL, the current
- configuration is used.
+ Scans the specified directory for fonts, adding each one found to the
+ application-specific set of fonts. Returns FcFalse if the fonts cannot be
+ added (due to allocation failure). Otherwise returns FcTrue. If config is
+ NULL, the current configuration is used.
-FcConfigAppFontClear
+ FcConfigAppFontClear
Name
- FcConfigAppFontClear -- Remove all app fonts from font database
+ FcConfigAppFontClear -- Remove all app fonts from font database
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
void FcConfigAppFontClear(FcConfig *config);
Description
- Clears the set of application-specific fonts. If config is
- NULL, the current configuration is used.
+ Clears the set of application-specific fonts. If config is NULL, the
+ current configuration is used.
-FcConfigSubstituteWithPat
+ FcConfigSubstituteWithPat
Name
- FcConfigSubstituteWithPat -- Execute substitutions
+ FcConfigSubstituteWithPat -- Execute substitutions
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
- FcBool FcConfigSubstituteWithPat(FcConfig *config, FcPattern
- *p, FcPattern *p_pat, FcMatchKind kind);
+
+ FcBool FcConfigSubstituteWithPat(FcConfig *config, FcPattern *p, FcPattern
+ *p_pat, FcMatchKind kind);
Description
- Performs the sequence of pattern modification operations, if
- kind is FcMatchPattern, then those tagged as pattern operations
- are applied, else if kind is FcMatchFont, those tagged as font
- operations are applied and p_pat is used for <test> elements
- with target=pattern. Returns FcFalse if the substitution cannot
- be performed (due to allocation failure). Otherwise returns
- FcTrue. If config is NULL, the current configuration is used.
+ Performs the sequence of pattern modification operations, if kind is
+ FcMatchPattern, then those tagged as pattern operations are applied, else
+ if kind is FcMatchFont, those tagged as font operations are applied and
+ p_pat is used for <test> elements with target=pattern. Returns FcFalse if
+ the substitution cannot be performed (due to allocation failure).
+ Otherwise returns FcTrue. If config is NULL, the current configuration is
+ used.
-FcConfigSubstitute
+ FcConfigSubstitute
Name
- FcConfigSubstitute -- Execute substitutions
+ FcConfigSubstitute -- Execute substitutions
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- FcBool FcConfigSubstitute(FcConfig *config, FcPattern *p,
- FcMatchKind kind);
+ FcBool FcConfigSubstitute(FcConfig *config, FcPattern *p, FcMatchKind
+ kind);
Description
- Calls FcConfigSubstituteWithPat setting p_pat to NULL. Returns
- FcFalse if the substitution cannot be performed (due to
- allocation failure). Otherwise returns FcTrue. If config is
- NULL, the current configuration is used.
+ Calls FcConfigSubstituteWithPat setting p_pat to NULL. Returns FcFalse if
+ the substitution cannot be performed (due to allocation failure).
+ Otherwise returns FcTrue. If config is NULL, the current configuration is
+ used.
-FcFontMatch
+ FcFontMatch
Name
- FcFontMatch -- Return best font
+ FcFontMatch -- Return best font
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- FcPattern * FcFontMatch(FcConfig *config, FcPattern *p,
- FcResult *result);
+ FcPattern * FcFontMatch(FcConfig *config, FcPattern *p, FcResult *result);
Description
- Finds the font in sets most closely matching pattern and
- returns the result of FcFontRenderPrepare for that font and the
- provided pattern. This function should be called only after
- FcConfigSubstitute and FcDefaultSubstitute have been called for
- p; otherwise the results will not be correct. If config is
- NULL, the current configuration is used.
+ Finds the font in sets most closely matching pattern and returns the
+ result of FcFontRenderPrepare for that font and the provided pattern. This
+ function should be called only after FcConfigSubstitute and
+ FcDefaultSubstitute have been called for p; otherwise the results will not
+ be correct. If config is NULL, the current configuration is used.
-FcFontSort
+ FcFontSort
Name
- FcFontSort -- Return list of matching fonts
+ FcFontSort -- Return list of matching fonts
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- FcFontSet * FcFontSort(FcConfig *config, FcPattern *p, FcBool
- trim, FcCharSet **csp, FcResult *result);
+ FcFontSet * FcFontSort(FcConfig *config, FcPattern *p, FcBool trim,
+ FcCharSet **csp, FcResult *result);
Description
- Returns the list of fonts sorted by closeness to p. If trim is
- FcTrue, elements in the list which don't include Unicode
- coverage not provided by earlier elements in the list are
- elided. The union of Unicode coverage of all of the fonts is
- returned in csp, if csp is not NULL. This function should be
- called only after FcConfigSubstitute and FcDefaultSubstitute
- have been called for p; otherwise the results will not be
- correct.
+ Returns the list of fonts sorted by closeness to p. If trim is FcTrue,
+ elements in the list which don't include Unicode coverage not provided by
+ earlier elements in the list are elided. The union of Unicode coverage of
+ all of the fonts is returned in csp, if csp is not NULL. This function
+ should be called only after FcConfigSubstitute and FcDefaultSubstitute
+ have been called for p; otherwise the results will not be correct.
- The returned FcFontSet references FcPattern structures which
- may be shared by the return value from multiple FcFontSort
- calls, applications must not modify these patterns. Instead,
- they should be passed, along with p to FcFontRenderPrepare
- which combines them into a complete pattern.
+ The returned FcFontSet references FcPattern structures which may be shared
+ by the return value from multiple FcFontSort calls, applications must not
+ modify these patterns. Instead, they should be passed, along with p to
+ FcFontRenderPrepare which combines them into a complete pattern.
The FcFontSet returned by FcFontSort is destroyed by calling
- FcFontSetDestroy. If config is NULL, the current configuration
- is used.
+ FcFontSetDestroy. If config is NULL, the current configuration is used.
-FcFontRenderPrepare
+ FcFontRenderPrepare
Name
- FcFontRenderPrepare -- Prepare pattern for loading font file
+ FcFontRenderPrepare -- Prepare pattern for loading font file
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
- FcPattern * FcFontRenderPrepare(FcConfig *config, FcPattern
- *pat, FcPattern *font);
+
+ FcPattern * FcFontRenderPrepare(FcConfig *config, FcPattern *pat,
+ FcPattern *font);
Description
- Creates a new pattern consisting of elements of font not
- appearing in pat, elements of pat not appearing in font and the
- best matching value from pat for elements appearing in both.
- The result is passed to FcConfigSubstituteWithPat with kind
- FcMatchFont and then returned.
+ Creates a new pattern consisting of elements of font not appearing in pat,
+ elements of pat not appearing in font and the best matching value from pat
+ for elements appearing in both. The result is passed to
+ FcConfigSubstituteWithPat with kind FcMatchFont and then returned.
-FcFontList
+ FcFontList
Name
- FcFontList -- List fonts
+ FcFontList -- List fonts
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- FcFontSet * FcFontList(FcConfig *config, FcPattern *p,
- FcObjectSet *os);
+ FcFontSet * FcFontList(FcConfig *config, FcPattern *p, FcObjectSet *os);
Description
- Selects fonts matching p, creates patterns from those fonts
- containing only the objects in os and returns the set of unique
- such patterns. If config is NULL, the default configuration is
- checked to be up to date, and used.
+ Selects fonts matching p, creates patterns from those fonts containing
+ only the objects in os and returns the set of unique such patterns. If
+ config is NULL, the default configuration is checked to be up to date, and
+ used.
-FcConfigFilename
+ FcConfigFilename
Name
- FcConfigFilename -- Find a config file
+ FcConfigFilename -- Find a config file
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcChar8 * FcConfigFilename(const FcChar8 *name);
Description
- Given the specified external entity name, return the associated
- filename. This provides applications a way to convert various
- configuration file references into filename form.
+ Given the specified external entity name, return the associated filename.
+ This provides applications a way to convert various configuration file
+ references into filename form.
- A null or empty name indicates that the default configuration
- file should be used; which file this references can be
- overridden with the FONTCONFIG_FILE environment variable. Next,
- if the name starts with ~, it refers to a file in the current
- users home directory. Otherwise if the name doesn't start with
- '/', it refers to a file in the default configuration
- directory; the built-in default directory can be overridden
+ A null or empty name indicates that the default configuration file should
+ be used; which file this references can be overridden with the
+ FONTCONFIG_FILE environment variable. Next, if the name starts with ~, it
+ refers to a file in the current users home directory. Otherwise if the
+ name doesn't start with '/', it refers to a file in the default
+ configuration directory; the built-in default directory can be overridden
with the FONTCONFIG_PATH environment variable.
-FcConfigParseAndLoad
+ FcConfigParseAndLoad
Name
- FcConfigParseAndLoad -- load a configuration file
+ FcConfigParseAndLoad -- load a configuration file
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- FcBool FcConfigParseAndLoad(FcConfig *config, const FcChar8
- *file, FcBool complain);
+ FcBool FcConfigParseAndLoad(FcConfig *config, const FcChar8 *file, FcBool
+ complain);
Description
Walks the configuration in 'file' and constructs the internal
- representation in 'config'. Any include files referenced from
- within 'file' will be loaded and parsed. If 'complain' is
- FcFalse, no warning will be displayed if 'file' does not exist.
- Error and warning messages will be output to stderr. Returns
- FcFalse if some error occurred while loading the file, either a
- parse error, semantic error or allocation failure. Otherwise
- returns FcTrue.
+ representation in 'config'. Any include files referenced from within
+ 'file' will be loaded and parsed. If 'complain' is FcFalse, no warning
+ will be displayed if 'file' does not exist. Error and warning messages
+ will be output to stderr. Returns FcFalse if some error occurred while
+ loading the file, either a parse error, semantic error or allocation
+ failure. Otherwise returns FcTrue.
-FcConfigParseAndLoadFromMemory
+ FcConfigParseAndLoadFromMemory
Name
- FcConfigParseAndLoadFromMemory -- load a configuration from
- memory
+ FcConfigParseAndLoadFromMemory -- load a configuration from memory
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- FcBool FcConfigParseAndLoadFromMemory(FcConfig *config, const
- FcChar8 *buffer, FcBool complain);
+ FcBool FcConfigParseAndLoadFromMemory(FcConfig *config, const FcChar8
+ *buffer, FcBool complain);
Description
Walks the configuration in 'memory' and constructs the internal
- representation in 'config'. Any includes files referenced from
- within 'memory' will be loaded and dparsed. If 'complain' is
- FcFalse, no warning will be displayed if 'file' does not exist.
- Error and warning messages will be output to stderr. Returns
- FcFalse if fsome error occurred while loading the file, either
- a parse error, semantic error or allocation failure. Otherwise
- returns FcTrue.
+ representation in 'config'. Any includes files referenced from within
+ 'memory' will be loaded and dparsed. If 'complain' is FcFalse, no warning
+ will be displayed if 'file' does not exist. Error and warning messages
+ will be output to stderr. Returns FcFalse if fsome error occurred while
+ loading the file, either a parse error, semantic error or allocation
+ failure. Otherwise returns FcTrue.
Since
version 2.12.5
-FcConfigGetSysRoot
+ FcConfigGetSysRoot
Name
- FcConfigGetSysRoot -- Obtain the system root directory
+ FcConfigGetSysRoot -- Obtain the system root directory
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
const FcChar8 * FcConfigGetSysRoot(const FcConfig *config);
@@ -3544,388 +3898,403 @@ Since
version 2.10.92
-FcConfigSetSysRoot
+ FcConfigSetSysRoot
Name
- FcConfigSetSysRoot -- Set the system root directory
+ FcConfigSetSysRoot -- Set the system root directory
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- void FcConfigSetSysRoot(FcConfig *config, const FcChar8
- *sysroot);
+ void FcConfigSetSysRoot(FcConfig *config, const FcChar8 *sysroot);
Description
- Set 'sysroot' as the system root directory. fontconfig prepend
- 'sysroot' to the cache directories in order to allow people to
- generate caches at the build time. Note that this causes
- changing current config. i.e. this function calls
- FcConfigSetCurrent() internally.
+ Set 'sysroot' as the system root directory. fontconfig prepend 'sysroot'
+ to the cache directories in order to allow people to generate caches at
+ the build time. Note that this causes changing current config. i.e. this
+ function calls FcConfigSetCurrent() internally.
Since
version 2.10.92
-FcConfigFileInfoIterInit
+ FcConfigFileInfoIterInit
Name
- FcConfigFileInfoIterInit -- Initialize the iterator
+ FcConfigFileInfoIterInit -- Initialize the iterator
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- void FcConfigFileInfoIterInit(FcConfig *config,
- FcConfigFileInfoIter *iter);
+ void FcConfigFileInfoIterInit(FcConfig *config, FcConfigFileInfoIter
+ *iter);
Description
- Initialize 'iter' with the first iterator in the config file
- information list.
+ Initialize 'iter' with the first iterator in the config file information
+ list.
Since
version 2.12.91
-FcConfigFileInfoIterNext
+ FcConfigFileInfoIterNext
Name
- FcConfigFileInfoIterNext -- Set the iterator to point to the
- next list
+ FcConfigFileInfoIterNext -- Set the iterator to point to the next list
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
- FcBool FcConfigFileInfoIterNext(FcConfig *config,
- FcConfigFileInfoIter *iter);
+
+ FcBool FcConfigFileInfoIterNext(FcConfig *config, FcConfigFileInfoIter
+ *iter);
Description
- Set 'iter' to point to the next node in the config file
- information list. If there is no next node, FcFalse is
- returned.
+ Set 'iter' to point to the next node in the config file information list.
+ If there is no next node, FcFalse is returned.
Since
version 2.12.91
-FcConfigFileInfoIterGet
+ FcConfigFileInfoIterGet
Name
- FcConfigFileInfoIterGet -- Obtain the configuration file
- information
+ FcConfigFileInfoIterGet -- Obtain the configuration file information
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- FcBool FcConfigFileInfoIterGet(FcConfig *config,
- FcConfigFileInfoIter *iter, FcChar8 **name, FcChar8
- **description, FcBool *enabled);
+ FcBool FcConfigFileInfoIterGet(FcConfig *config, FcConfigFileInfoIter
+ *iter, FcChar8 **name, FcChar8 **description, FcBool *enabled);
Description
- Obtain the filename, the description and the flag whether it is
- enabled or not for 'iter' where points to current configuration
- file information. If the iterator is invalid, FcFalse is
- returned.
+ Obtain the filename, the description and the flag whether it is enabled or
+ not for 'iter' where points to current configuration file information. If
+ the iterator is invalid, FcFalse is returned.
Since
version 2.12.91
- __________________________________________________________
-FcObjectType
+ --------------------------------------------------------------------------
+
+ FcObjectType
Table of Contents
- FcNameRegisterObjectTypes -- Register object types
- FcNameUnregisterObjectTypes -- Unregister object types
- FcNameGetObjectType -- Lookup an object type
- Provides for application-specified font name object types so
- that new pattern elements can be generated from font names.
+ [148]FcNameRegisterObjectTypes -- Register object types
+
+ [149]FcNameUnregisterObjectTypes -- Unregister object types
+
+ [150]FcNameGetObjectType -- Lookup an object type
+
+ Provides for application-specified font name object types so that new
+ pattern elements can be generated from font names.
-FcNameRegisterObjectTypes
+ FcNameRegisterObjectTypes
Name
- FcNameRegisterObjectTypes -- Register object types
+ FcNameRegisterObjectTypes -- Register object types
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
- FcBool FcNameRegisterObjectTypes(const FcObjectType *types, int
- ntype);
+
+ FcBool FcNameRegisterObjectTypes(const FcObjectType *types, int ntype);
Description
Deprecated. Does nothing. Returns FcFalse.
-FcNameUnregisterObjectTypes
+ FcNameUnregisterObjectTypes
Name
- FcNameUnregisterObjectTypes -- Unregister object types
+ FcNameUnregisterObjectTypes -- Unregister object types
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- FcBool FcNameUnregisterObjectTypes(const FcObjectType *types,
- int ntype);
+ FcBool FcNameUnregisterObjectTypes(const FcObjectType *types, int ntype);
Description
Deprecated. Does nothing. Returns FcFalse.
-FcNameGetObjectType
+ FcNameGetObjectType
Name
- FcNameGetObjectType -- Lookup an object type
+ FcNameGetObjectType -- Lookup an object type
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
const FcObjectType * FcNameGetObjectType(const char *object);
Description
Return the object type for the pattern element named object.
- __________________________________________________________
-FcConstant
+ --------------------------------------------------------------------------
+
+ FcConstant
Table of Contents
- FcNameRegisterConstants -- Register symbolic constants
- FcNameUnregisterConstants -- Unregister symbolic constants
- FcNameGetConstant -- Lookup symbolic constant
- FcNameConstant -- Get the value for a symbolic constant
- Provides for application-specified symbolic constants for font
- names.
+ [151]FcNameRegisterConstants -- Register symbolic constants
+
+ [152]FcNameUnregisterConstants -- Unregister symbolic constants
+
+ [153]FcNameGetConstant -- Lookup symbolic constant
-FcNameRegisterConstants
+ [154]FcNameConstant -- Get the value for a symbolic constant
+
+ Provides for application-specified symbolic constants for font names.
+
+ FcNameRegisterConstants
Name
- FcNameRegisterConstants -- Register symbolic constants
+ FcNameRegisterConstants -- Register symbolic constants
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- FcBool FcNameRegisterConstants(const FcConstant *consts, int
- nconsts);
+ FcBool FcNameRegisterConstants(const FcConstant *consts, int nconsts);
Description
Deprecated. Does nothing. Returns FcFalse.
-FcNameUnregisterConstants
+ FcNameUnregisterConstants
Name
- FcNameUnregisterConstants -- Unregister symbolic constants
+ FcNameUnregisterConstants -- Unregister symbolic constants
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
- FcBool FcNameUnregisterConstants(const FcConstant *consts, int
- nconsts);
+
+ FcBool FcNameUnregisterConstants(const FcConstant *consts, int nconsts);
Description
Deprecated. Does nothing. Returns FcFalse.
-FcNameGetConstant
+ FcNameGetConstant
Name
- FcNameGetConstant -- Lookup symbolic constant
+ FcNameGetConstant -- Lookup symbolic constant
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
const FcConstant * FcNameGetConstant(FcChar8 *string);
Description
- Return the FcConstant structure related to symbolic constant
- string.
+ Return the FcConstant structure related to symbolic constant string.
-FcNameConstant
+ FcNameConstant
Name
- FcNameConstant -- Get the value for a symbolic constant
+ FcNameConstant -- Get the value for a symbolic constant
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBool FcNameConstant(FcChar8 *string, int *result);
Description
- Returns whether a symbolic constant with name string is
- registered, placing the value of the constant in result if
- present.
- __________________________________________________________
+ Returns whether a symbolic constant with name string is registered,
+ placing the value of the constant in result if present.
-FcWeight
+ --------------------------------------------------------------------------
+
+ FcWeight
Table of Contents
- FcWeightFromOpenTypeDouble -- Convert from OpenType weight
- values to fontconfig ones
- FcWeightToOpenTypeDouble -- Convert from fontconfig weight
- values to OpenType ones
+ [155]FcWeightFromOpenTypeDouble -- Convert from OpenType weight values to
+ fontconfig ones
+
+ [156]FcWeightToOpenTypeDouble -- Convert from fontconfig weight values to
+ OpenType ones
- FcWeightFromOpenType -- Convert from OpenType weight values to
- fontconfig ones
+ [157]FcWeightFromOpenType -- Convert from OpenType weight values to
+ fontconfig ones
- FcWeightToOpenType -- Convert from fontconfig weight values to
- OpenType ones
+ [158]FcWeightToOpenType -- Convert from fontconfig weight values to
+ OpenType ones
Maps weights to and from OpenType weights.
-FcWeightFromOpenTypeDouble
+ FcWeightFromOpenTypeDouble
Name
- FcWeightFromOpenTypeDouble -- Convert from OpenType weight
- values to fontconfig ones
+ FcWeightFromOpenTypeDouble -- Convert from OpenType weight values to
+ fontconfig ones
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
double FcWeightFromOpenTypeDouble(doubleot_weight);
Description
- FcWeightFromOpenTypeDouble returns an double value to use with
- FC_WEIGHT, from an double in the 1..1000 range, resembling the
- numbers from OpenType specification's OS/2 usWeight numbers,
- which are also similar to CSS font-weight numbers. If input is
- negative, zero, or greater than 1000, returns -1. This function
- linearly doubleerpolates between various FC_WEIGHT_* constants.
- As such, the returned value does not necessarily match any of
- the predefined constants.
+ FcWeightFromOpenTypeDouble returns an double value to use with FC_WEIGHT,
+ from an double in the 1..1000 range, resembling the numbers from OpenType
+ specification's OS/2 usWeight numbers, which are also similar to CSS
+ font-weight numbers. If input is negative, zero, or greater than 1000,
+ returns -1. This function linearly doubleerpolates between various
+ FC_WEIGHT_* constants. As such, the returned value does not necessarily
+ match any of the predefined constants.
Since
version 2.12.92
-FcWeightToOpenTypeDouble
+ FcWeightToOpenTypeDouble
Name
- FcWeightToOpenTypeDouble -- Convert from fontconfig weight
- values to OpenType ones
+ FcWeightToOpenTypeDouble -- Convert from fontconfig weight values to
+ OpenType ones
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
double FcWeightToOpenTypeDouble(doubleot_weight);
Description
- FcWeightToOpenTypeDouble is the inverse of
- FcWeightFromOpenType. If the input is less than FC_WEIGHT_THIN
- or greater than FC_WEIGHT_EXTRABLACK, returns -1. Otherwise
- returns a number in the range 1 to 1000.
+ FcWeightToOpenTypeDouble is the inverse of FcWeightFromOpenType. If the
+ input is less than FC_WEIGHT_THIN or greater than FC_WEIGHT_EXTRABLACK,
+ returns -1. Otherwise returns a number in the range 1 to 1000.
Since
version 2.12.92
-FcWeightFromOpenType
+ FcWeightFromOpenType
Name
- FcWeightFromOpenType -- Convert from OpenType weight values to
- fontconfig ones
+ FcWeightFromOpenType -- Convert from OpenType weight values to fontconfig
+ ones
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
int FcWeightFromOpenType(intot_weight);
Description
- FcWeightFromOpenType is like FcWeightFromOpenTypeDouble but
- with integer arguments. Use the other function instead.
+ FcWeightFromOpenType is like FcWeightFromOpenTypeDouble but with integer
+ arguments. Use the other function instead.
Since
version 2.11.91
-FcWeightToOpenType
+ FcWeightToOpenType
Name
- FcWeightToOpenType -- Convert from fontconfig weight values to
- OpenType ones
+ FcWeightToOpenType -- Convert from fontconfig weight values to OpenType
+ ones
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
int FcWeightToOpenType(intot_weight);
Description
- FcWeightToOpenType is like FcWeightToOpenTypeDouble but with
- integer arguments. Use the other function instead.
+ FcWeightToOpenType is like FcWeightToOpenTypeDouble but with integer
+ arguments. Use the other function instead.
Since
version 2.11.91
- __________________________________________________________
-FcBlanks
+ --------------------------------------------------------------------------
+
+ FcBlanks
Table of Contents
- FcBlanksCreate -- Create an FcBlanks
- FcBlanksDestroy -- Destroy and FcBlanks
- FcBlanksAdd -- Add a character to an FcBlanks
- FcBlanksIsMember -- Query membership in an FcBlanks
- An FcBlanks object holds a list of Unicode chars which are
- expected to be blank when drawn. When scanning new fonts, any
- glyphs which are empty and not in this list will be assumed to
- be broken and not placed in the FcCharSet associated with the
- font. This provides a significantly more accurate CharSet for
- applications.
+ [159]FcBlanksCreate -- Create an FcBlanks
+
+ [160]FcBlanksDestroy -- Destroy and FcBlanks
+
+ [161]FcBlanksAdd -- Add a character to an FcBlanks
+
+ [162]FcBlanksIsMember -- Query membership in an FcBlanks
- FcBlanks is deprecated and should not be used in newly written
- code. It is still accepted by some functions for compatibility
- with older code but will be removed in the future.
+ An FcBlanks object holds a list of Unicode chars which are expected to be
+ blank when drawn. When scanning new fonts, any glyphs which are empty and
+ not in this list will be assumed to be broken and not placed in the
+ FcCharSet associated with the font. This provides a significantly more
+ accurate CharSet for applications.
-FcBlanksCreate
+ FcBlanks is deprecated and should not be used in newly written code. It is
+ still accepted by some functions for compatibility with older code but
+ will be removed in the future.
+
+ FcBlanksCreate
Name
- FcBlanksCreate -- Create an FcBlanks
+ FcBlanksCreate -- Create an FcBlanks
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBlanks * FcBlanksCreate(void);
@@ -3933,15 +4302,16 @@ Description
FcBlanks is deprecated. This function always returns NULL.
-FcBlanksDestroy
+ FcBlanksDestroy
Name
- FcBlanksDestroy -- Destroy and FcBlanks
+ FcBlanksDestroy -- Destroy and FcBlanks
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
void FcBlanksDestroy(FcBlanks *b);
@@ -3949,15 +4319,16 @@ Description
FcBlanks is deprecated. This function does nothing.
-FcBlanksAdd
+ FcBlanksAdd
Name
- FcBlanksAdd -- Add a character to an FcBlanks
+ FcBlanksAdd -- Add a character to an FcBlanks
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBool FcBlanksAdd(FcBlanks *b, FcChar32 ucs4);
@@ -3965,104 +4336,117 @@ Description
FcBlanks is deprecated. This function always returns FALSE.
-FcBlanksIsMember
+ FcBlanksIsMember
Name
- FcBlanksIsMember -- Query membership in an FcBlanks
+ FcBlanksIsMember -- Query membership in an FcBlanks
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBool FcBlanksIsMember(FcBlanks *b, FcChar32 ucs4);
Description
FcBlanks is deprecated. This function always returns FALSE.
- __________________________________________________________
-FcAtomic
+ --------------------------------------------------------------------------
+
+ FcAtomic
Table of Contents
- FcAtomicCreate -- create an FcAtomic object
- FcAtomicLock -- lock a file
- FcAtomicNewFile -- return new temporary file name
- FcAtomicOrigFile -- return original file name
- FcAtomicReplaceOrig -- replace original with new
- FcAtomicDeleteNew -- delete new file
- FcAtomicUnlock -- unlock a file
- FcAtomicDestroy -- destroy an FcAtomic object
- These functions provide a safe way to update configuration
- files, allowing ongoing reading of the old configuration file
- while locked for writing and ensuring that a consistent and
- complete version of the configuration file is always available.
+ [163]FcAtomicCreate -- create an FcAtomic object
+
+ [164]FcAtomicLock -- lock a file
+
+ [165]FcAtomicNewFile -- return new temporary file name
+
+ [166]FcAtomicOrigFile -- return original file name
+
+ [167]FcAtomicReplaceOrig -- replace original with new
+
+ [168]FcAtomicDeleteNew -- delete new file
+
+ [169]FcAtomicUnlock -- unlock a file
-FcAtomicCreate
+ [170]FcAtomicDestroy -- destroy an FcAtomic object
+
+ These functions provide a safe way to update configuration files, allowing
+ ongoing reading of the old configuration file while locked for writing and
+ ensuring that a consistent and complete version of the configuration file
+ is always available.
+
+ FcAtomicCreate
Name
- FcAtomicCreate -- create an FcAtomic object
+ FcAtomicCreate -- create an FcAtomic object
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcAtomic * FcAtomicCreate(const FcChar8 *file);
Description
- Creates a data structure containing data needed to control
- access to file. Writing is done to a separate file. Once that
- file is complete, the original configuration file is atomically
- replaced so that reading process always see a consistent and
- complete file without the need to lock for reading.
+ Creates a data structure containing data needed to control access to file.
+ Writing is done to a separate file. Once that file is complete, the
+ original configuration file is atomically replaced so that reading process
+ always see a consistent and complete file without the need to lock for
+ reading.
-FcAtomicLock
+ FcAtomicLock
Name
- FcAtomicLock -- lock a file
+ FcAtomicLock -- lock a file
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBool FcAtomicLock(FcAtomic *atomic);
Description
- Attempts to lock the file referenced by atomic. Returns FcFalse
- if the file is already locked, else returns FcTrue and leaves
- the file locked.
+ Attempts to lock the file referenced by atomic. Returns FcFalse if the
+ file is already locked, else returns FcTrue and leaves the file locked.
-FcAtomicNewFile
+ FcAtomicNewFile
Name
- FcAtomicNewFile -- return new temporary file name
+ FcAtomicNewFile -- return new temporary file name
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcChar8 * FcAtomicNewFile(FcAtomic *atomic);
Description
- Returns the filename for writing a new version of the file
- referenced by atomic.
+ Returns the filename for writing a new version of the file referenced by
+ atomic.
-FcAtomicOrigFile
+ FcAtomicOrigFile
Name
- FcAtomicOrigFile -- return original file name
+ FcAtomicOrigFile -- return original file name
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcChar8 * FcAtomicOrigFile(FcAtomic *atomic);
@@ -4070,50 +4454,52 @@ Description
Returns the file referenced by atomic.
-FcAtomicReplaceOrig
+ FcAtomicReplaceOrig
Name
- FcAtomicReplaceOrig -- replace original with new
+ FcAtomicReplaceOrig -- replace original with new
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBool FcAtomicReplaceOrig(FcAtomic *atomic);
Description
- Replaces the original file referenced by atomic with the new
- file. Returns FcFalse if the file cannot be replaced due to
- permission issues in the filesystem. Otherwise returns FcTrue.
+ Replaces the original file referenced by atomic with the new file. Returns
+ FcFalse if the file cannot be replaced due to permission issues in the
+ filesystem. Otherwise returns FcTrue.
-FcAtomicDeleteNew
+ FcAtomicDeleteNew
Name
- FcAtomicDeleteNew -- delete new file
+ FcAtomicDeleteNew -- delete new file
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
void FcAtomicDeleteNew(FcAtomic *atomic);
Description
- Deletes the new file. Used in error recovery to back out
- changes.
+ Deletes the new file. Used in error recovery to back out changes.
-FcAtomicUnlock
+ FcAtomicUnlock
Name
- FcAtomicUnlock -- unlock a file
+ FcAtomicUnlock -- unlock a file
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
void FcAtomicUnlock(FcAtomic *atomic);
@@ -4121,345 +4507,368 @@ Description
Unlocks the file.
-FcAtomicDestroy
+ FcAtomicDestroy
Name
- FcAtomicDestroy -- destroy an FcAtomic object
+ FcAtomicDestroy -- destroy an FcAtomic object
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
void FcAtomicDestroy(FcAtomic *atomic);
Description
Destroys atomic.
- __________________________________________________________
-File and Directory routines
+ --------------------------------------------------------------------------
+
+ File and Directory routines
Table of Contents
- FcFileScan -- scan a font file
- FcFileIsDir -- check whether a file is a directory
- FcDirScan -- scan a font directory without caching it
- FcDirSave -- DEPRECATED: formerly used to save a directory
- cache
- FcDirCacheUnlink -- Remove all caches related to dir
- FcDirCacheValid -- check directory cache
- FcDirCacheLoad -- load a directory cache
- FcDirCacheRescan -- Re-scan a directory cache
- FcDirCacheRead -- read or construct a directory cache
- FcDirCacheLoadFile -- load a cache file
- FcDirCacheUnload -- unload a cache file
+ [171]FcFileScan -- scan a font file
+
+ [172]FcFileIsDir -- check whether a file is a directory
- These routines work with font files and directories, including
- font directory cache files.
+ [173]FcDirScan -- scan a font directory without caching it
-FcFileScan
+ [174]FcDirSave -- DEPRECATED: formerly used to save a directory cache
+
+ [175]FcDirCacheUnlink -- Remove all caches related to dir
+
+ [176]FcDirCacheValid -- check directory cache
+
+ [177]FcDirCacheLoad -- load a directory cache
+
+ [178]FcDirCacheRescan -- Re-scan a directory cache
+
+ [179]FcDirCacheRead -- read or construct a directory cache
+
+ [180]FcDirCacheLoadFile -- load a cache file
+
+ [181]FcDirCacheUnload -- unload a cache file
+
+ These routines work with font files and directories, including font
+ directory cache files.
+
+ FcFileScan
Name
- FcFileScan -- scan a font file
+ FcFileScan -- scan a font file
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
- FcBool FcFileScan(FcFontSet *set, FcStrSet *dirs, FcFileCache
- *cache, FcBlanks *blanks, const FcChar8 *file, FcBool force);
+
+ FcBool FcFileScan(FcFontSet *set, FcStrSet *dirs, FcFileCache *cache,
+ FcBlanks *blanks, const FcChar8 *file, FcBool force);
Description
- Scans a single file and adds all fonts found to set. If force
- is FcTrue, then the file is scanned even if associated
- information is found in cache. If file is a directory, it is
- added to dirs. Whether fonts are found depends on fontconfig
- policy as well as the current configuration. Internally,
- fontconfig will ignore BDF and PCF fonts which are not in
- Unicode (or the effectively equivalent ISO Latin-1) encoding as
- those are not usable by Unicode-based applications. The
- configuration can ignore fonts based on filename or contents of
- the font file itself. Returns FcFalse if any of the fonts
- cannot be added (due to allocation failure). Otherwise returns
- FcTrue.
+ Scans a single file and adds all fonts found to set. If force is FcTrue,
+ then the file is scanned even if associated information is found in cache.
+ If file is a directory, it is added to dirs. Whether fonts are found
+ depends on fontconfig policy as well as the current configuration.
+ Internally, fontconfig will ignore BDF and PCF fonts which are not in
+ Unicode (or the effectively equivalent ISO Latin-1) encoding as those are
+ not usable by Unicode-based applications. The configuration can ignore
+ fonts based on filename or contents of the font file itself. Returns
+ FcFalse if any of the fonts cannot be added (due to allocation failure).
+ Otherwise returns FcTrue.
-FcFileIsDir
+ FcFileIsDir
Name
- FcFileIsDir -- check whether a file is a directory
+ FcFileIsDir -- check whether a file is a directory
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBool FcFileIsDir(const FcChar8 *file);
Description
- Returns FcTrue if file is a directory, otherwise returns
- FcFalse.
+ Returns FcTrue if file is a directory, otherwise returns FcFalse.
-FcDirScan
+ FcDirScan
Name
- FcDirScan -- scan a font directory without caching it
+ FcDirScan -- scan a font directory without caching it
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
- FcBool FcDirScan(FcFontSet *set, FcStrSet *dirs, FcFileCache
- *cache, FcBlanks *blanks, const FcChar8 *dir, FcBool force);
+
+ FcBool FcDirScan(FcFontSet *set, FcStrSet *dirs, FcFileCache *cache,
+ FcBlanks *blanks, const FcChar8 *dir, FcBool force);
Description
- If cache is not zero or if force is FcFalse, this function
- currently returns FcFalse. Otherwise, it scans an entire
- directory and adds all fonts found to set. Any subdirectories
- found are added to dirs. Calling this function does not create
- any cache files. Use FcDirCacheRead() if caching is desired.
+ If cache is not zero or if force is FcFalse, this function currently
+ returns FcFalse. Otherwise, it scans an entire directory and adds all
+ fonts found to set. Any subdirectories found are added to dirs. Calling
+ this function does not create any cache files. Use FcDirCacheRead() if
+ caching is desired.
-FcDirSave
+ FcDirSave
Name
- FcDirSave -- DEPRECATED: formerly used to save a directory
- cache
+ FcDirSave -- DEPRECATED: formerly used to save a directory cache
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- FcBool FcDirSave(FcFontSet *set, FcStrSet *dirs, const FcChar8
- *dir);
+ FcBool FcDirSave(FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir);
Description
- This function now does nothing aside from returning FcFalse. It
- used to creates the per-directory cache file for dir and
- populates it with the fonts in set and subdirectories in dirs.
- All of this functionality is now automatically managed by
- FcDirCacheLoad and FcDirCacheRead.
+ This function now does nothing aside from returning FcFalse. It used to
+ creates the per-directory cache file for dir and populates it with the
+ fonts in set and subdirectories in dirs. All of this functionality is now
+ automatically managed by FcDirCacheLoad and FcDirCacheRead.
-FcDirCacheUnlink
+ FcDirCacheUnlink
Name
- FcDirCacheUnlink -- Remove all caches related to dir
+ FcDirCacheUnlink -- Remove all caches related to dir
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBool FcDirCacheUnlink(const FcChar8 *dir, FcConfig *config);
Description
- Scans the cache directories in config, removing any instances
- of the cache file for dir. Returns FcFalse when some internal
- error occurs (out of memory, etc). Errors actually unlinking
- any files are ignored.
+ Scans the cache directories in config, removing any instances of the cache
+ file for dir. Returns FcFalse when some internal error occurs (out of
+ memory, etc). Errors actually unlinking any files are ignored.
-FcDirCacheValid
+ FcDirCacheValid
Name
- FcDirCacheValid -- check directory cache
+ FcDirCacheValid -- check directory cache
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBool FcDirCacheValid(const FcChar8 *dir);
Description
- Returns FcTrue if dir has an associated valid cache file, else
- returns FcFalse
+ Returns FcTrue if dir has an associated valid cache file, else returns
+ FcFalse
-FcDirCacheLoad
+ FcDirCacheLoad
Name
- FcDirCacheLoad -- load a directory cache
+ FcDirCacheLoad -- load a directory cache
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- FcCache * FcDirCacheLoad(const FcChar8 *dir, FcConfig *config,
- FcChar8 **cache_file);
+ FcCache * FcDirCacheLoad(const FcChar8 *dir, FcConfig *config, FcChar8
+ **cache_file);
Description
- Loads the cache related to dir. If no cache file exists,
- returns NULL. The name of the cache file is returned in
- cache_file, unless that is NULL. See also FcDirCacheRead.
+ Loads the cache related to dir. If no cache file exists, returns NULL. The
+ name of the cache file is returned in cache_file, unless that is NULL. See
+ also FcDirCacheRead.
-FcDirCacheRescan
+ FcDirCacheRescan
Name
- FcDirCacheRescan -- Re-scan a directory cache
+ FcDirCacheRescan -- Re-scan a directory cache
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
- FcCache * FcDirCacheRescan(const FcChar8 *dir, FcConfig
- *config);
+
+ FcCache * FcDirCacheRescan(const FcChar8 *dir, FcConfig *config);
Description
- Re-scan directories only at dir and update the cache. returns
- NULL if failed.
+ Re-scan directories only at dir and update the cache. returns NULL if
+ failed.
Since
version 2.11.1
-FcDirCacheRead
+ FcDirCacheRead
Name
- FcDirCacheRead -- read or construct a directory cache
+ FcDirCacheRead -- read or construct a directory cache
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- FcCache * FcDirCacheRead(const FcChar8 *dir, FcBool force,
- FcConfig *config);
+ FcCache * FcDirCacheRead(const FcChar8 *dir, FcBool force, FcConfig
+ *config);
Description
- This returns a cache for dir. If force is FcFalse, then an
- existing, valid cache file will be used. Otherwise, a new cache
- will be created by scanning the directory and that returned.
+ This returns a cache for dir. If force is FcFalse, then an existing, valid
+ cache file will be used. Otherwise, a new cache will be created by
+ scanning the directory and that returned.
-FcDirCacheLoadFile
+ FcDirCacheLoadFile
Name
- FcDirCacheLoadFile -- load a cache file
+ FcDirCacheLoadFile -- load a cache file
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
- FcCache * FcDirCacheLoadFile(const FcChar8 *cache_file, struct
- stat *file_stat);
+
+ FcCache * FcDirCacheLoadFile(const FcChar8 *cache_file, struct stat
+ *file_stat);
Description
- This function loads a directory cache from cache_file. If
- file_stat is non-NULL, it will be filled with the results of
- stat(2) on the cache file.
+ This function loads a directory cache from cache_file. If file_stat is
+ non-NULL, it will be filled with the results of stat(2) on the cache file.
-FcDirCacheUnload
+ FcDirCacheUnload
Name
- FcDirCacheUnload -- unload a cache file
+ FcDirCacheUnload -- unload a cache file
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
void FcDirCacheUnload(FcCache *cache);
Description
- This function dereferences cache. When no other references to
- it remain, all memory associated with the cache will be freed.
- __________________________________________________________
+ This function dereferences cache. When no other references to it remain,
+ all memory associated with the cache will be freed.
-FcCache routines
+ --------------------------------------------------------------------------
+
+ FcCache routines
Table of Contents
- FcCacheDir -- Return directory of cache
- FcCacheCopySet -- Returns a copy of the fontset from cache
- FcCacheSubdir -- Return the i'th subdirectory.
- FcCacheNumSubdir -- Return the number of subdirectories in
- cache.
- FcCacheNumFont -- Returns the number of fonts in cache.
- FcDirCacheClean -- Clean up a cache directory
- FcCacheCreateTagFile -- Create CACHEDIR.TAG at cache directory.
- FcDirCacheCreateUUID -- Create .uuid file at a directory
+ [182]FcCacheDir -- Return directory of cache
+
+ [183]FcCacheCopySet -- Returns a copy of the fontset from cache
+
+ [184]FcCacheSubdir -- Return the i'th subdirectory.
+
+ [185]FcCacheNumSubdir -- Return the number of subdirectories in cache.
+
+ [186]FcCacheNumFont -- Returns the number of fonts in cache.
+
+ [187]FcDirCacheClean -- Clean up a cache directory
- These routines work with font directory caches, accessing their
- contents in limited ways. It is not expected that normal
- applications will need to use these functions.
+ [188]FcCacheCreateTagFile -- Create CACHEDIR.TAG at cache directory.
-FcCacheDir
+ [189]FcDirCacheCreateUUID -- Create .uuid file at a directory
+
+ [190]FcDirCacheDeleteUUID -- Delete .uuid file
+
+ These routines work with font directory caches, accessing their contents
+ in limited ways. It is not expected that normal applications will need to
+ use these functions.
+
+ FcCacheDir
Name
- FcCacheDir -- Return directory of cache
+ FcCacheDir -- Return directory of cache
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
const FcChar8 * FcCacheDir(const FcCache *cache);
Description
- This function returns the directory from which the cache was
- constructed.
+ This function returns the directory from which the cache was constructed.
-FcCacheCopySet
+ FcCacheCopySet
Name
- FcCacheCopySet -- Returns a copy of the fontset from cache
+ FcCacheCopySet -- Returns a copy of the fontset from cache
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcFontSet * FcCacheCopySet(const FcCache *cache);
Description
- The returned fontset contains each of the font patterns from
- cache. This fontset may be modified, but the patterns from the
- cache are read-only.
+ The returned fontset contains each of the font patterns from cache. This
+ fontset may be modified, but the patterns from the cache are read-only.
-FcCacheSubdir
+ FcCacheSubdir
Name
- FcCacheSubdir -- Return the i'th subdirectory.
+ FcCacheSubdir -- Return the i'th subdirectory.
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
const FcChar8 * FcCacheSubdir(const FcCache *cache, inti);
Description
- The set of subdirectories stored in a cache file are indexed by
- this function, i should range from 0 to n-1, where n is the
- return value from FcCacheNumSubdir.
+ The set of subdirectories stored in a cache file are indexed by this
+ function, i should range from 0 to n-1, where n is the return value from
+ FcCacheNumSubdir.
-FcCacheNumSubdir
+ FcCacheNumSubdir
Name
- FcCacheNumSubdir -- Return the number of subdirectories in
- cache.
+ FcCacheNumSubdir -- Return the number of subdirectories in cache.
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
int FcCacheNumSubdir(const FcCache *cache);
@@ -4467,120 +4876,154 @@ Description
This returns the total number of subdirectories in the cache.
-FcCacheNumFont
+ FcCacheNumFont
Name
- FcCacheNumFont -- Returns the number of fonts in cache.
+ FcCacheNumFont -- Returns the number of fonts in cache.
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
int FcCacheNumFont(const FcCache *cache);
Description
- This returns the number of fonts which would be included in the
- return from FcCacheCopySet.
+ This returns the number of fonts which would be included in the return
+ from FcCacheCopySet.
-FcDirCacheClean
+ FcDirCacheClean
Name
- FcDirCacheClean -- Clean up a cache directory
+ FcDirCacheClean -- Clean up a cache directory
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- FcBool FcDirCacheClean(const FcChar8 *cache_dir,
- FcBoolverbose);
+ FcBool FcDirCacheClean(const FcChar8 *cache_dir, FcBoolverbose);
Description
- This tries to clean up the cache directory of cache_dir. This
- returns FcTrue if the operation is successfully complete.
- otherwise FcFalse.
+ This tries to clean up the cache directory of cache_dir. This returns
+ FcTrue if the operation is successfully complete. otherwise FcFalse.
Since
version 2.9.91
-FcCacheCreateTagFile
+ FcCacheCreateTagFile
Name
- FcCacheCreateTagFile -- Create CACHEDIR.TAG at cache directory.
+ FcCacheCreateTagFile -- Create CACHEDIR.TAG at cache directory.
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
void FcCacheCreateTagFile(const FcConfig *config);
Description
- This tries to create CACHEDIR.TAG file at the cache directory
- registered to config.
+ This tries to create CACHEDIR.TAG file at the cache directory registered
+ to config.
Since
version 2.9.91
-FcDirCacheCreateUUID
+ FcDirCacheCreateUUID
Name
- FcDirCacheCreateUUID -- Create .uuid file at a directory
+ FcDirCacheCreateUUID -- Create .uuid file at a directory
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- FcBool FcDirCacheCreateUUID(FcChar8 *dir, FcBoolforce,
- FcConfigconfig);
+ FcBool FcDirCacheCreateUUID(FcChar8 *dir, FcBoolforce, FcConfig *config);
Description
- This is to create .uuid file containing an UUID at a font
- directory of dir. The UUID will be used to identify the font
- directory and is used to determine the cache filename if
- available.
+ This is to create .uuid file containing an UUID at a font directory of
+ dir. The UUID will be used to identify the font directory and is used to
+ determine the cache filename if available.
Since
version 2.12.92
- __________________________________________________________
-FcStrSet and FcStrList
+ FcDirCacheDeleteUUID
+
+Name
+
+ FcDirCacheDeleteUUID -- Delete .uuid file
+
+Synopsis
+
+ #include <fontconfig/fontconfig.h>
+
+
+ FcBool FcDirCacheDeleteUUID(const FcChar8 *dir, FcConfig *config);
+
+Description
+
+ This is to delete .uuid file containing an UUID at a font directory of
+ dir.
+
+Since
+
+ version 2.13.1
+
+ --------------------------------------------------------------------------
+
+ FcStrSet and FcStrList
Table of Contents
- FcStrSetCreate -- create a string set
- FcStrSetMember -- check set for membership
- FcStrSetEqual -- check sets for equality
- FcStrSetAdd -- add to a string set
- FcStrSetAddFilename -- add a filename to a string set
- FcStrSetDel -- delete from a string set
- FcStrSetDestroy -- destroy a string set
- FcStrListCreate -- create a string iterator
- FcStrListFirst -- get first string in iteration
- FcStrListNext -- get next string in iteration
- FcStrListDone -- destroy a string iterator
- A data structure for enumerating strings, used to list
- directories while scanning the configuration as directories are
- added while scanning.
+ [191]FcStrSetCreate -- create a string set
+
+ [192]FcStrSetMember -- check set for membership
+
+ [193]FcStrSetEqual -- check sets for equality
+
+ [194]FcStrSetAdd -- add to a string set
-FcStrSetCreate
+ [195]FcStrSetAddFilename -- add a filename to a string set
+
+ [196]FcStrSetDel -- delete from a string set
+
+ [197]FcStrSetDestroy -- destroy a string set
+
+ [198]FcStrListCreate -- create a string iterator
+
+ [199]FcStrListFirst -- get first string in iteration
+
+ [200]FcStrListNext -- get next string in iteration
+
+ [201]FcStrListDone -- destroy a string iterator
+
+ A data structure for enumerating strings, used to list directories while
+ scanning the configuration as directories are added while scanning.
+
+ FcStrSetCreate
Name
- FcStrSetCreate -- create a string set
+ FcStrSetCreate -- create a string set
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcStrSet * FcStrSetCreate(void);
@@ -4588,15 +5031,16 @@ Description
Create an empty set.
-FcStrSetMember
+ FcStrSetMember
Name
- FcStrSetMember -- check set for membership
+ FcStrSetMember -- check set for membership
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBool FcStrSetMember(FcStrSet *set, const FcChar8 *s);
@@ -4604,33 +5048,34 @@ Description
Returns whether s is a member of set.
-FcStrSetEqual
+ FcStrSetEqual
Name
- FcStrSetEqual -- check sets for equality
+ FcStrSetEqual -- check sets for equality
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBool FcStrSetEqual(FcStrSet *set_a, FcStrSet *set_b);
Description
- Returns whether set_a contains precisely the same strings as
- set_b. Ordering of strings within the two sets is not
- considered.
+ Returns whether set_a contains precisely the same strings as set_b.
+ Ordering of strings within the two sets is not considered.
-FcStrSetAdd
+ FcStrSetAdd
Name
- FcStrSetAdd -- add to a string set
+ FcStrSetAdd -- add to a string set
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBool FcStrSetAdd(FcStrSet *set, const FcChar8 *s);
@@ -4638,50 +5083,52 @@ Description
Adds a copy of s to set.
-FcStrSetAddFilename
+ FcStrSetAddFilename
Name
- FcStrSetAddFilename -- add a filename to a string set
+ FcStrSetAddFilename -- add a filename to a string set
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBool FcStrSetAddFilename(FcStrSet *set, const FcChar8 *s);
Description
- Adds a copy s to set, The copy is created with
- FcStrCopyFilename so that leading '~' values are replaced with
- the value of the HOME environment variable.
+ Adds a copy s to set, The copy is created with FcStrCopyFilename so that
+ leading '~' values are replaced with the value of the HOME environment
+ variable.
-FcStrSetDel
+ FcStrSetDel
Name
- FcStrSetDel -- delete from a string set
+ FcStrSetDel -- delete from a string set
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBool FcStrSetDel(FcStrSet *set, const FcChar8 *s);
Description
- Removes s from set, returning FcTrue if s was a member else
- FcFalse.
+ Removes s from set, returning FcTrue if s was a member else FcFalse.
-FcStrSetDestroy
+ FcStrSetDestroy
Name
- FcStrSetDestroy -- destroy a string set
+ FcStrSetDestroy -- destroy a string set
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
void FcStrSetDestroy(FcStrSet *set);
@@ -4689,15 +5136,16 @@ Description
Destroys set.
-FcStrListCreate
+ FcStrListCreate
Name
- FcStrListCreate -- create a string iterator
+ FcStrListCreate -- create a string iterator
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcStrList * FcStrListCreate(FcStrSet *set);
@@ -4705,15 +5153,16 @@ Description
Creates an iterator to list the strings in set.
-FcStrListFirst
+ FcStrListFirst
Name
- FcStrListFirst -- get first string in iteration
+ FcStrListFirst -- get first string in iteration
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
void FcStrListFirst(FcStrList *list);
@@ -4725,15 +5174,16 @@ Since
version 2.11.0
-FcStrListNext
+ FcStrListNext
Name
- FcStrListNext -- get next string in iteration
+ FcStrListNext -- get next string in iteration
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcChar8 * FcStrListNext(FcStrList *list);
@@ -4741,159 +5191,178 @@ Description
Returns the next string in list.
-FcStrListDone
+ FcStrListDone
Name
- FcStrListDone -- destroy a string iterator
+ FcStrListDone -- destroy a string iterator
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
void FcStrListDone(FcStrList *list);
Description
Destroys the enumerator list.
- __________________________________________________________
-String utilities
+ --------------------------------------------------------------------------
+
+ String utilities
Table of Contents
- FcUtf8ToUcs4 -- convert UTF-8 to UCS4
- FcUcs4ToUtf8 -- convert UCS4 to UTF-8
- FcUtf8Len -- count UTF-8 encoded chars
- FcUtf16ToUcs4 -- convert UTF-16 to UCS4
- FcUtf16Len -- count UTF-16 encoded chars
- FcIsLower -- check for lower case ASCII character
- FcIsUpper -- check for upper case ASCII character
- FcToLower -- convert upper case ASCII to lower case
- FcStrCopy -- duplicate a string
- FcStrDowncase -- create a lower case translation of a string
- FcStrCopyFilename -- create a complete path from a filename
- FcStrCmp -- compare UTF-8 strings
- FcStrCmpIgnoreCase -- compare UTF-8 strings ignoring case
- FcStrStr -- locate UTF-8 substring
- FcStrStrIgnoreCase -- locate UTF-8 substring ignoring ASCII
- case
- FcStrPlus -- concatenate two strings
- FcStrFree -- free a string
- FcStrDirname -- directory part of filename
- FcStrBasename -- last component of filename
+ [202]FcUtf8ToUcs4 -- convert UTF-8 to UCS4
+
+ [203]FcUcs4ToUtf8 -- convert UCS4 to UTF-8
+
+ [204]FcUtf8Len -- count UTF-8 encoded chars
+
+ [205]FcUtf16ToUcs4 -- convert UTF-16 to UCS4
+
+ [206]FcUtf16Len -- count UTF-16 encoded chars
+
+ [207]FcIsLower -- check for lower case ASCII character
+
+ [208]FcIsUpper -- check for upper case ASCII character
+
+ [209]FcToLower -- convert upper case ASCII to lower case
+
+ [210]FcStrCopy -- duplicate a string
+
+ [211]FcStrDowncase -- create a lower case translation of a string
+
+ [212]FcStrCopyFilename -- create a complete path from a filename
+
+ [213]FcStrCmp -- compare UTF-8 strings
+
+ [214]FcStrCmpIgnoreCase -- compare UTF-8 strings ignoring case
+
+ [215]FcStrStr -- locate UTF-8 substring
+
+ [216]FcStrStrIgnoreCase -- locate UTF-8 substring ignoring ASCII case
+
+ [217]FcStrPlus -- concatenate two strings
+
+ [218]FcStrFree -- free a string
- Fontconfig manipulates many UTF-8 strings represented with the
- FcChar8 type. These functions are exposed to help applications
- deal with these UTF-8 strings in a locale-insensitive manner.
+ [219]FcStrDirname -- directory part of filename
-FcUtf8ToUcs4
+ [220]FcStrBasename -- last component of filename
+
+ Fontconfig manipulates many UTF-8 strings represented with the FcChar8
+ type. These functions are exposed to help applications deal with these
+ UTF-8 strings in a locale-insensitive manner.
+
+ FcUtf8ToUcs4
Name
- FcUtf8ToUcs4 -- convert UTF-8 to UCS4
+ FcUtf8ToUcs4 -- convert UTF-8 to UCS4
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
int FcUtf8ToUcs4(FcChar8 *src, FcChar32 *dst, int len);
Description
- Converts the next Unicode char from src into dst and returns
- the number of bytes containing the char. src must be at least
- len bytes long.
+ Converts the next Unicode char from src into dst and returns the number of
+ bytes containing the char. src must be at least len bytes long.
-FcUcs4ToUtf8
+ FcUcs4ToUtf8
Name
- FcUcs4ToUtf8 -- convert UCS4 to UTF-8
+ FcUcs4ToUtf8 -- convert UCS4 to UTF-8
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
int FcUcs4ToUtf8(FcChar32 src, FcChar8 dst[FC_UTF8_MAX_LEN]);
Description
- Converts the Unicode char from src into dst and returns the
- number of bytes needed to encode the char.
+ Converts the Unicode char from src into dst and returns the number of
+ bytes needed to encode the char.
-FcUtf8Len
+ FcUtf8Len
Name
- FcUtf8Len -- count UTF-8 encoded chars
+ FcUtf8Len -- count UTF-8 encoded chars
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
- FcBool FcUtf8Len(FcChar8 *src, int len, int *nchar, int
- *wchar);
+
+ FcBool FcUtf8Len(FcChar8 *src, int len, int *nchar, int *wchar);
Description
- Counts the number of Unicode chars in len bytes of src. Places
- that count in nchar. wchar contains 1, 2 or 4 depending on the
- number of bytes needed to hold the largest Unicode char
- counted. The return value indicates whether src is a
- well-formed UTF8 string.
+ Counts the number of Unicode chars in len bytes of src. Places that count
+ in nchar. wchar contains 1, 2 or 4 depending on the number of bytes needed
+ to hold the largest Unicode char counted. The return value indicates
+ whether src is a well-formed UTF8 string.
-FcUtf16ToUcs4
+ FcUtf16ToUcs4
Name
- FcUtf16ToUcs4 -- convert UTF-16 to UCS4
+ FcUtf16ToUcs4 -- convert UTF-16 to UCS4
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
- int FcUtf16ToUcs4(FcChar8 *src, FcEndian endian, FcChar32 *dst,
- int len);
+
+ int FcUtf16ToUcs4(FcChar8 *src, FcEndian endian, FcChar32 *dst, int len);
Description
- Converts the next Unicode char from src into dst and returns
- the number of bytes containing the char. src must be at least
- len bytes long. Bytes of src are combined into 16-bit units
- according to endian.
+ Converts the next Unicode char from src into dst and returns the number of
+ bytes containing the char. src must be at least len bytes long. Bytes of
+ src are combined into 16-bit units according to endian.
-FcUtf16Len
+ FcUtf16Len
Name
- FcUtf16Len -- count UTF-16 encoded chars
+ FcUtf16Len -- count UTF-16 encoded chars
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
- FcBool FcUtf16Len(FcChar8 *src, FcEndian endian, int len, int
- *nchar, int *wchar);
+ FcBool FcUtf16Len(FcChar8 *src, FcEndian endian, int len, int *nchar, int
+ *wchar);
Description
- Counts the number of Unicode chars in len bytes of src. Bytes
- of src are combined into 16-bit units according to endian.
- Places that count in nchar. wchar contains 1, 2 or 4 depending
- on the number of bytes needed to hold the largest Unicode char
- counted. The return value indicates whether string is a
- well-formed UTF16 string.
+ Counts the number of Unicode chars in len bytes of src. Bytes of src are
+ combined into 16-bit units according to endian. Places that count in
+ nchar. wchar contains 1, 2 or 4 depending on the number of bytes needed to
+ hold the largest Unicode char counted. The return value indicates whether
+ string is a well-formed UTF16 string.
-FcIsLower
+ FcIsLower
Name
- FcIsLower -- check for lower case ASCII character
+ FcIsLower -- check for lower case ASCII character
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBool FcIsLower(FcChar8c);
@@ -4901,15 +5370,16 @@ Description
This macro checks whether c is an lower case ASCII letter.
-FcIsUpper
+ FcIsUpper
Name
- FcIsUpper -- check for upper case ASCII character
+ FcIsUpper -- check for upper case ASCII character
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcBool FcIsUpper(FcChar8c);
@@ -4917,91 +5387,93 @@ Description
This macro checks whether c is a upper case ASCII letter.
-FcToLower
+ FcToLower
Name
- FcToLower -- convert upper case ASCII to lower case
+ FcToLower -- convert upper case ASCII to lower case
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcChar8 FcToLower(FcChar8c);
Description
- This macro converts upper case ASCII c to the equivalent lower
- case letter.
+ This macro converts upper case ASCII c to the equivalent lower case
+ letter.
-FcStrCopy
+ FcStrCopy
Name
- FcStrCopy -- duplicate a string
+ FcStrCopy -- duplicate a string
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcChar8 * FcStrCopy(const FcChar8 *s);
Description
- Allocates memory, copies s and returns the resulting buffer.
- Yes, this is strdup, but that function isn't available on every
- platform.
+ Allocates memory, copies s and returns the resulting buffer. Yes, this is
+ strdup, but that function isn't available on every platform.
-FcStrDowncase
+ FcStrDowncase
Name
- FcStrDowncase -- create a lower case translation of a string
+ FcStrDowncase -- create a lower case translation of a string
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcChar8 * FcStrDowncase(const FcChar8 *s);
Description
- Allocates memory, copies s, converting upper case letters to
- lower case and returns the allocated buffer.
+ Allocates memory, copies s, converting upper case letters to lower case
+ and returns the allocated buffer.
-FcStrCopyFilename
+ FcStrCopyFilename
Name
- FcStrCopyFilename -- create a complete path from a filename
+ FcStrCopyFilename -- create a complete path from a filename
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcChar8 * FcStrCopyFilename(const FcChar8 *s);
Description
- FcStrCopyFilename constructs an absolute pathname from s. It
- converts any leading '~' characters in to the value of the HOME
- environment variable, and any relative paths are converted to
- absolute paths using the current working directory. Sequences
- of '/' characters are converted to a single '/', and names
- containing the current directory '.' or parent directory '..'
- are correctly reconstructed. Returns NULL if '~' is the leading
- character and HOME is unset or disabled (see
- FcConfigEnableHome).
+ FcStrCopyFilename constructs an absolute pathname from s. It converts any
+ leading '~' characters in to the value of the HOME environment variable,
+ and any relative paths are converted to absolute paths using the current
+ working directory. Sequences of '/' characters are converted to a single
+ '/', and names containing the current directory '.' or parent directory
+ '..' are correctly reconstructed. Returns NULL if '~' is the leading
+ character and HOME is unset or disabled (see FcConfigEnableHome).
-FcStrCmp
+ FcStrCmp
Name
- FcStrCmp -- compare UTF-8 strings
+ FcStrCmp -- compare UTF-8 strings
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
int FcStrCmp(const FcChar8 *s1, const FcChar8 *s2);
@@ -5009,127 +5481,354 @@ Description
Returns the usual <0, 0, >0 result of comparing s1 and s2.
-FcStrCmpIgnoreCase
+ FcStrCmpIgnoreCase
Name
- FcStrCmpIgnoreCase -- compare UTF-8 strings ignoring case
+ FcStrCmpIgnoreCase -- compare UTF-8 strings ignoring case
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
int FcStrCmpIgnoreCase(const FcChar8 *s1, const FcChar8 *s2);
Description
- Returns the usual <0, 0, >0 result of comparing s1 and s2. This
- test is case-insensitive for all proper UTF-8 encoded strings.
+ Returns the usual <0, 0, >0 result of comparing s1 and s2. This test is
+ case-insensitive for all proper UTF-8 encoded strings.
-FcStrStr
+ FcStrStr
Name
- FcStrStr -- locate UTF-8 substring
+ FcStrStr -- locate UTF-8 substring
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcChar8 * FcStrStr(const FcChar8 *s1, const FcChar8 *s2);
Description
- Returns the location of s2 in s1. Returns NULL if s2 is not
- present in s1. This test will operate properly with UTF8
- encoded strings.
+ Returns the location of s2 in s1. Returns NULL if s2 is not present in s1.
+ This test will operate properly with UTF8 encoded strings.
-FcStrStrIgnoreCase
+ FcStrStrIgnoreCase
Name
- FcStrStrIgnoreCase -- locate UTF-8 substring ignoring ASCII
- case
+ FcStrStrIgnoreCase -- locate UTF-8 substring ignoring ASCII case
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
- FcChar8 * FcStrStrIgnoreCase(const FcChar8 *s1, const FcChar8
- *s2);
+
+ FcChar8 * FcStrStrIgnoreCase(const FcChar8 *s1, const FcChar8 *s2);
Description
- Returns the location of s2 in s1, ignoring case. Returns NULL
- if s2 is not present in s1. This test is case-insensitive for
- all proper UTF-8 encoded strings.
+ Returns the location of s2 in s1, ignoring case. Returns NULL if s2 is not
+ present in s1. This test is case-insensitive for all proper UTF-8 encoded
+ strings.
-FcStrPlus
+ FcStrPlus
Name
- FcStrPlus -- concatenate two strings
+ FcStrPlus -- concatenate two strings
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcChar8 * FcStrPlus(const FcChar8 *s1, const FcChar8 *s2);
Description
- This function allocates new storage and places the
- concatenation of s1 and s2 there, returning the new string.
+ This function allocates new storage and places the concatenation of s1 and
+ s2 there, returning the new string.
-FcStrFree
+ FcStrFree
Name
- FcStrFree -- free a string
+ FcStrFree -- free a string
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
void FcStrFree(FcChar8 *s);
Description
- This is just a wrapper around free(3) which helps track memory
- usage of strings within the fontconfig library.
+ This is just a wrapper around free(3) which helps track memory usage of
+ strings within the fontconfig library.
-FcStrDirname
+ FcStrDirname
Name
- FcStrDirname -- directory part of filename
+ FcStrDirname -- directory part of filename
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcChar8 * FcStrDirname(const FcChar8 *file);
Description
- Returns the directory containing file. This is returned in
- newly allocated storage which should be freed when no longer
- needed.
+ Returns the directory containing file. This is returned in newly allocated
+ storage which should be freed when no longer needed.
-FcStrBasename
+ FcStrBasename
Name
- FcStrBasename -- last component of filename
+ FcStrBasename -- last component of filename
Synopsis
-#include <fontconfig/fontconfig.h>
+ #include <fontconfig/fontconfig.h>
+
FcChar8 * FcStrBasename(const FcChar8 *file);
Description
- Returns the filename of file stripped of any leading directory
- names. This is returned in newly allocated storage which should
- be freed when no longer needed.
+ Returns the filename of file stripped of any leading directory names. This
+ is returned in newly allocated storage which should be freed when no
+ longer needed.
+
+References
+
+ Visible links
+ 1. file:///tmp/html-am902r#AEN16
+ 2. file:///tmp/html-am902r#AEN19
+ 3. file:///tmp/html-am902r#AEN31
+ 4. file:///tmp/html-am902r#AEN103
+ 5. file:///tmp/html-am902r#FCINITLOADCONFIG
+ 6. file:///tmp/html-am902r#FCINITLOADCONFIGANDFONTS
+ 7. file:///tmp/html-am902r#FCINIT
+ 8. file:///tmp/html-am902r#FCFINI
+ 9. file:///tmp/html-am902r#FCGETVERSION
+ 10. file:///tmp/html-am902r#FCINITREINITIALIZE
+ 11. file:///tmp/html-am902r#FCINITBRINGUPTODATE
+ 12. file:///tmp/html-am902r#FCPATTERNCREATE
+ 13. file:///tmp/html-am902r#FCPATTERNDUPLICATE
+ 14. file:///tmp/html-am902r#FCPATTERNREFERENCE
+ 15. file:///tmp/html-am902r#FCPATTERNDESTROY
+ 16. file:///tmp/html-am902r#FCPATTERNOBJECTCOUNT
+ 17. file:///tmp/html-am902r#FCPATTERNEQUAL
+ 18. file:///tmp/html-am902r#FCPATTERNEQUALSUBSET
+ 19. file:///tmp/html-am902r#FCPATTERNFILTER
+ 20. file:///tmp/html-am902r#FCPATTERNHASH
+ 21. file:///tmp/html-am902r#FCPATTERNADD
+ 22. file:///tmp/html-am902r#FCPATTERNADDWEAK
+ 23. file:///tmp/html-am902r#FCPATTERNADD-TYPE
+ 24. file:///tmp/html-am902r#FCPATTERNGETWITHBINDING
+ 25. file:///tmp/html-am902r#FCPATTERNGET
+ 26. file:///tmp/html-am902r#FCPATTERNGET-TYPE
+ 27. file:///tmp/html-am902r#FCPATTERNBUILD
+ 28. file:///tmp/html-am902r#FCPATTERNDEL
+ 29. file:///tmp/html-am902r#FCPATTERNREMOVE
+ 30. file:///tmp/html-am902r#FCPATTERNITERSTART
+ 31. file:///tmp/html-am902r#FCPATTERNITERNEXT
+ 32. file:///tmp/html-am902r#FCPATTERNITEREQUAL
+ 33. file:///tmp/html-am902r#FCPATTERNFINDITER
+ 34. file:///tmp/html-am902r#FCPATTERNITERISVALID
+ 35. file:///tmp/html-am902r#FCPATTERNITERGETOBJECT
+ 36. file:///tmp/html-am902r#FCPATTERNITERVALUECOUNT
+ 37. file:///tmp/html-am902r#FCPATTERNITERGETVALUE
+ 38. file:///tmp/html-am902r#FCPATTERNPRINT
+ 39. file:///tmp/html-am902r#FCDEFAULTSUBSTITUTE
+ 40. file:///tmp/html-am902r#FCNAMEPARSE
+ 41. file:///tmp/html-am902r#FCNAMEUNPARSE
+ 42. file:///tmp/html-am902r#FCPATTERNFORMAT
+ 43. file:///tmp/html-am902r#FCFONTSETCREATE
+ 44. file:///tmp/html-am902r#FCFONTSETDESTROY
+ 45. file:///tmp/html-am902r#FCFONTSETADD
+ 46. file:///tmp/html-am902r#FCFONTSETLIST
+ 47. file:///tmp/html-am902r#FCFONTSETMATCH
+ 48. file:///tmp/html-am902r#FCFONTSETPRINT
+ 49. file:///tmp/html-am902r#FCFONTSETSORT
+ 50. file:///tmp/html-am902r#FCFONTSETSORTDESTROY
+ 51. file:///tmp/html-am902r#FCOBJECTSETCREATE
+ 52. file:///tmp/html-am902r#FCOBJECTSETADD
+ 53. file:///tmp/html-am902r#FCOBJECTSETDESTROY
+ 54. file:///tmp/html-am902r#FCOBJECTSETBUILD
+ 55. file:///tmp/html-am902r#FCFREETYPECHARINDEX
+ 56. file:///tmp/html-am902r#FCFREETYPECHARSET
+ 57. file:///tmp/html-am902r#FCFREETYPECHARSETANDSPACING
+ 58. file:///tmp/html-am902r#FCFREETYPEQUERY
+ 59. file:///tmp/html-am902r#FCFREETYPEQUERYALL
+ 60. file:///tmp/html-am902r#FCFREETYPEQUERYFACE
+ 61. file:///tmp/html-am902r#FCVALUEDESTROY
+ 62. file:///tmp/html-am902r#FCVALUESAVE
+ 63. file:///tmp/html-am902r#FCVALUEPRINT
+ 64. file:///tmp/html-am902r#FCVALUEEQUAL
+ 65. file:///tmp/html-am902r#FCCHARSETCREATE
+ 66. file:///tmp/html-am902r#FCCHARSETDESTROY
+ 67. file:///tmp/html-am902r#FCCHARSETADDCHAR
+ 68. file:///tmp/html-am902r#FCCHARSETDELCHAR
+ 69. file:///tmp/html-am902r#FCCHARSETCOPY
+ 70. file:///tmp/html-am902r#FCCHARSETEQUAL
+ 71. file:///tmp/html-am902r#FCCHARSETINTERSECT
+ 72. file:///tmp/html-am902r#FCCHARSETUNION
+ 73. file:///tmp/html-am902r#FCCHARSETSUBTRACT
+ 74. file:///tmp/html-am902r#FCCHARSETMERGE
+ 75. file:///tmp/html-am902r#FCCHARSETHASCHAR
+ 76. file:///tmp/html-am902r#FCCHARSETCOUNT
+ 77. file:///tmp/html-am902r#FCCHARSETINTERSECTCOUNT
+ 78. file:///tmp/html-am902r#FCCHARSETSUBTRACTCOUNT
+ 79. file:///tmp/html-am902r#FCCHARSETISSUBSET
+ 80. file:///tmp/html-am902r#FCCHARSETFIRSTPAGE
+ 81. file:///tmp/html-am902r#FCCHARSETNEXTPAGE
+ 82. file:///tmp/html-am902r#FCCHARSETCOVERAGE
+ 83. file:///tmp/html-am902r#FCCHARSETNEW
+ 84. file:///tmp/html-am902r#FCLANGSETCREATE
+ 85. file:///tmp/html-am902r#FCLANGSETDESTROY
+ 86. file:///tmp/html-am902r#FCLANGSETCOPY
+ 87. file:///tmp/html-am902r#FCLANGSETADD
+ 88. file:///tmp/html-am902r#FCLANGSETDEL
+ 89. file:///tmp/html-am902r#FCLANGSETUNION
+ 90. file:///tmp/html-am902r#FCLANGSETSUBTRACT
+ 91. file:///tmp/html-am902r#FCLANGSETCOMPARE
+ 92. file:///tmp/html-am902r#FCLANGSETCONTAINS
+ 93. file:///tmp/html-am902r#FCLANGSETEQUAL
+ 94. file:///tmp/html-am902r#FCLANGSETHASH
+ 95. file:///tmp/html-am902r#FCLANGSETHASLANG
+ 96. file:///tmp/html-am902r#FCGETDEFAULTLANGS
+ 97. file:///tmp/html-am902r#FCLANGSETGETLANGS
+ 98. file:///tmp/html-am902r#FCGETLANGS
+ 99. file:///tmp/html-am902r#FCLANGNORMALIZE
+ 100. file:///tmp/html-am902r#FCLANGGETCHARSET
+ 101. file:///tmp/html-am902r#FCMATRIXINIT
+ 102. file:///tmp/html-am902r#FCMATRIXCOPY
+ 103. file:///tmp/html-am902r#FCMATRIXEQUAL
+ 104. file:///tmp/html-am902r#FCMATRIXMULTIPLY
+ 105. file:///tmp/html-am902r#FCMATRIXROTATE
+ 106. file:///tmp/html-am902r#FCMATRIXSCALE
+ 107. file:///tmp/html-am902r#FCMATRIXSHEAR
+ 108. file:///tmp/html-am902r#FCRANGECOPY
+ 109. file:///tmp/html-am902r#FCRANGECREATEDOUBLE
+ 110. file:///tmp/html-am902r#FCRANGECREATEINTEGER
+ 111. file:///tmp/html-am902r#FCRANGEDESTROY
+ 112. file:///tmp/html-am902r#FCRANGEGETDOUBLE
+ 113. file:///tmp/html-am902r#FCCONFIGCREATE
+ 114. file:///tmp/html-am902r#FCCONFIGREFERENCE
+ 115. file:///tmp/html-am902r#FCCONFIGDESTROY
+ 116. file:///tmp/html-am902r#FCCONFIGSETCURRENT
+ 117. file:///tmp/html-am902r#FCCONFIGGETCURRENT
+ 118. file:///tmp/html-am902r#FCCONFIGUPTODATE
+ 119. file:///tmp/html-am902r#FCCONFIGHOME
+ 120. file:///tmp/html-am902r#FCCONFIGENABLEHOME
+ 121. file:///tmp/html-am902r#FCCONFIGBUILDFONTS
+ 122. file:///tmp/html-am902r#FCCONFIGGETCONFIGDIRS
+ 123. file:///tmp/html-am902r#FCCONFIGGETFONTDIRS
+ 124. file:///tmp/html-am902r#FCCONFIGGETCONFIGFILES
+ 125. file:///tmp/html-am902r#FCCONFIGGETCACHE
+ 126. file:///tmp/html-am902r#FCCONFIGGETCACHEDIRS
+ 127. file:///tmp/html-am902r#FCCONFIGGETFONTS
+ 128. file:///tmp/html-am902r#FCCONFIGGETBLANKS
+ 129. file:///tmp/html-am902r#FCCONFIGGETRESCANINTERVAL
+ 130. file:///tmp/html-am902r#FCCONFIGSETRESCANINTERVAL
+ 131. file:///tmp/html-am902r#FCCONFIGAPPFONTADDFILE
+ 132. file:///tmp/html-am902r#FCCONFIGAPPFONTADDDIR
+ 133. file:///tmp/html-am902r#FCCONFIGAPPFONTCLEAR
+ 134. file:///tmp/html-am902r#FCCONFIGSUBSTITUTEWITHPAT
+ 135. file:///tmp/html-am902r#FCCONFIGSUBSTITUTE
+ 136. file:///tmp/html-am902r#FCFONTMATCH
+ 137. file:///tmp/html-am902r#FCFONTSORT
+ 138. file:///tmp/html-am902r#FCFONTRENDERPREPARE
+ 139. file:///tmp/html-am902r#FCFONTLIST
+ 140. file:///tmp/html-am902r#FCCONFIGFILENAME
+ 141. file:///tmp/html-am902r#FCCONFIGPARSEANDLOAD
+ 142. file:///tmp/html-am902r#FCCONFIGPARSEANDLOADFROMMEMORY
+ 143. file:///tmp/html-am902r#FCCONFIGGETSYSROOT
+ 144. file:///tmp/html-am902r#FCCONFIGSETSYSROOT
+ 145. file:///tmp/html-am902r#FCCONFIGFILEINFOITERINIT
+ 146. file:///tmp/html-am902r#FCCONFIGFILEINFOITERNEXT
+ 147. file:///tmp/html-am902r#FCCONFIGFILEINFOITERGET
+ 148. file:///tmp/html-am902r#FCNAMEREGISTEROBJECTTYPES
+ 149. file:///tmp/html-am902r#FCNAMEUNREGISTEROBJECTTYPES
+ 150. file:///tmp/html-am902r#FCNAMEGETOBJECTTYPE
+ 151. file:///tmp/html-am902r#FCNAMEREGISTERCONSTANTS
+ 152. file:///tmp/html-am902r#FCNAMEUNREGISTERCONSTANTS
+ 153. file:///tmp/html-am902r#FCNAMEGETCONSTANT
+ 154. file:///tmp/html-am902r#FCNAMECONSTANT
+ 155. file:///tmp/html-am902r#FCWEIGHTFROMOPENTYPEDOUBLE
+ 156. file:///tmp/html-am902r#FCWEIGHTTOOPENTYPEDOUBLE
+ 157. file:///tmp/html-am902r#FCWEIGHTFROMOPENTYPE
+ 158. file:///tmp/html-am902r#FCWEIGHTTOOPENTYPE
+ 159. file:///tmp/html-am902r#FCBLANKSCREATE
+ 160. file:///tmp/html-am902r#FCBLANKSDESTROY
+ 161. file:///tmp/html-am902r#FCBLANKSADD
+ 162. file:///tmp/html-am902r#FCBLANKSISMEMBER
+ 163. file:///tmp/html-am902r#FCATOMICCREATE
+ 164. file:///tmp/html-am902r#FCATOMICLOCK
+ 165. file:///tmp/html-am902r#FCATOMICNEWFILE
+ 166. file:///tmp/html-am902r#FCATOMICORIGFILE
+ 167. file:///tmp/html-am902r#FCATOMICREPLACEORIG
+ 168. file:///tmp/html-am902r#FCATOMICDELETENEW
+ 169. file:///tmp/html-am902r#FCATOMICUNLOCK
+ 170. file:///tmp/html-am902r#FCATOMICDESTROY
+ 171. file:///tmp/html-am902r#FCFILESCAN
+ 172. file:///tmp/html-am902r#FCFILEISDIR
+ 173. file:///tmp/html-am902r#FCDIRSCAN
+ 174. file:///tmp/html-am902r#FCDIRSAVE
+ 175. file:///tmp/html-am902r#FCDIRCACHEUNLINK
+ 176. file:///tmp/html-am902r#FCDIRCACHEVALID
+ 177. file:///tmp/html-am902r#FCDIRCACHELOAD
+ 178. file:///tmp/html-am902r#FCDIRCACHERESCAN
+ 179. file:///tmp/html-am902r#FCDIRCACHEREAD
+ 180. file:///tmp/html-am902r#FCDIRCACHELOADFILE
+ 181. file:///tmp/html-am902r#FCDIRCACHEUNLOAD
+ 182. file:///tmp/html-am902r#FCCACHEDIR
+ 183. file:///tmp/html-am902r#FCCACHECOPYSET
+ 184. file:///tmp/html-am902r#FCCACHESUBDIR
+ 185. file:///tmp/html-am902r#FCCACHENUMSUBDIR
+ 186. file:///tmp/html-am902r#FCCACHENUMFONT
+ 187. file:///tmp/html-am902r#FCDIRCACHECLEAN
+ 188. file:///tmp/html-am902r#FCCACHECREATETAGFILE
+ 189. file:///tmp/html-am902r#FCDIRCACHECREATEUUID
+ 190. file:///tmp/html-am902r#FCDIRCACHEDELETEUUID
+ 191. file:///tmp/html-am902r#FCSTRSETCREATE
+ 192. file:///tmp/html-am902r#FCSTRSETMEMBER
+ 193. file:///tmp/html-am902r#FCSTRSETEQUAL
+ 194. file:///tmp/html-am902r#FCSTRSETADD
+ 195. file:///tmp/html-am902r#FCSTRSETADDFILENAME
+ 196. file:///tmp/html-am902r#FCSTRSETDEL
+ 197. file:///tmp/html-am902r#FCSTRSETDESTROY
+ 198. file:///tmp/html-am902r#FCSTRLISTCREATE
+ 199. file:///tmp/html-am902r#FCSTRLISTFIRST
+ 200. file:///tmp/html-am902r#FCSTRLISTNEXT
+ 201. file:///tmp/html-am902r#FCSTRLISTDONE
+ 202. file:///tmp/html-am902r#FCUTF8TOUCS4
+ 203. file:///tmp/html-am902r#FCUCS4TOUTF8
+ 204. file:///tmp/html-am902r#FCUTF8LEN
+ 205. file:///tmp/html-am902r#FCUTF16TOUCS4
+ 206. file:///tmp/html-am902r#FCUTF16LEN
+ 207. file:///tmp/html-am902r#FCISLOWER
+ 208. file:///tmp/html-am902r#FCISUPPER
+ 209. file:///tmp/html-am902r#FCTOLOWER
+ 210. file:///tmp/html-am902r#FCSTRCOPY
+ 211. file:///tmp/html-am902r#FCSTRDOWNCASE
+ 212. file:///tmp/html-am902r#FCSTRCOPYFILENAME
+ 213. file:///tmp/html-am902r#FCSTRCMP
+ 214. file:///tmp/html-am902r#FCSTRCMPIGNORECASE
+ 215. file:///tmp/html-am902r#FCSTRSTR
+ 216. file:///tmp/html-am902r#FCSTRSTRIGNORECASE
+ 217. file:///tmp/html-am902r#FCSTRPLUS
+ 218. file:///tmp/html-am902r#FCSTRFREE
+ 219. file:///tmp/html-am902r#FCSTRDIRNAME
+ 220. file:///tmp/html-am902r#FCSTRBASENAME
diff --git a/doc/fontconfig-devel/fcatomiccreate.html b/doc/fontconfig-devel/fcatomiccreate.html
index e62a080d..cadefcd9 100644
--- a/doc/fontconfig-devel/fcatomiccreate.html
+++ b/doc/fontconfig-devel/fcatomiccreate.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcAtomic"
-HREF="x103.html#AEN3928"><LINK
+HREF="x103.html#AEN4178"><LINK
REL="PREVIOUS"
TITLE="FUNCTIONS"
HREF="x103.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCATOMICCREATE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3936"
+NAME="AEN4186"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3936"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3939"
+NAME="AEN4189"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3940"
+NAME="AEN4190"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3947"
+NAME="AEN4197"
></A
><H2
>Description</H2
@@ -195,7 +195,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN3928"
+HREF="x103.html#AEN4178"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcatomicdeletenew.html b/doc/fontconfig-devel/fcatomicdeletenew.html
index b2ca1392..1c488ead 100644
--- a/doc/fontconfig-devel/fcatomicdeletenew.html
+++ b/doc/fontconfig-devel/fcatomicdeletenew.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcAtomic"
-HREF="x103.html#AEN3928"><LINK
+HREF="x103.html#AEN4178"><LINK
REL="PREVIOUS"
TITLE="FcAtomicReplaceOrig"
HREF="fcatomicreplaceorig.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCATOMICDELETENEW"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4036"
+NAME="AEN4286"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN4036"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4039"
+NAME="AEN4289"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4040"
+NAME="AEN4290"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4047"
+NAME="AEN4297"
></A
><H2
>Description</H2
@@ -187,7 +187,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN3928"
+HREF="x103.html#AEN4178"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcatomicdestroy.html b/doc/fontconfig-devel/fcatomicdestroy.html
index c25917bb..7d3fcd3e 100644
--- a/doc/fontconfig-devel/fcatomicdestroy.html
+++ b/doc/fontconfig-devel/fcatomicdestroy.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcAtomic"
-HREF="x103.html#AEN3928"><LINK
+HREF="x103.html#AEN4178"><LINK
REL="PREVIOUS"
TITLE="FcAtomicUnlock"
HREF="fcatomicunlock.html"></HEAD
@@ -68,7 +68,7 @@ NAME="FCATOMICDESTROY"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4074"
+NAME="AEN4324"
></A
><H2
>Name</H2
@@ -76,7 +76,7 @@ NAME="AEN4074"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4077"
+NAME="AEN4327"
></A
><H2
>Synopsis</H2
@@ -85,7 +85,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4078"
+NAME="AEN4328"
></A
><TABLE
BORDER="0"
@@ -122,7 +122,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4085"
+NAME="AEN4335"
></A
><H2
>Description</H2
@@ -181,7 +181,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN3928"
+HREF="x103.html#AEN4178"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcatomiclock.html b/doc/fontconfig-devel/fcatomiclock.html
index c2b32553..62a1698b 100644
--- a/doc/fontconfig-devel/fcatomiclock.html
+++ b/doc/fontconfig-devel/fcatomiclock.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcAtomic"
-HREF="x103.html#AEN3928"><LINK
+HREF="x103.html#AEN4178"><LINK
REL="PREVIOUS"
TITLE="FcAtomicCreate"
HREF="fcatomiccreate.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCATOMICLOCK"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3956"
+NAME="AEN4206"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3956"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3959"
+NAME="AEN4209"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3960"
+NAME="AEN4210"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3967"
+NAME="AEN4217"
></A
><H2
>Description</H2
@@ -194,7 +194,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN3928"
+HREF="x103.html#AEN4178"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcatomicnewfile.html b/doc/fontconfig-devel/fcatomicnewfile.html
index 1d9ed1bc..9eddf049 100644
--- a/doc/fontconfig-devel/fcatomicnewfile.html
+++ b/doc/fontconfig-devel/fcatomicnewfile.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcAtomic"
-HREF="x103.html#AEN3928"><LINK
+HREF="x103.html#AEN4178"><LINK
REL="PREVIOUS"
TITLE="FcAtomicLock"
HREF="fcatomiclock.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCATOMICNEWFILE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3976"
+NAME="AEN4226"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3976"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3979"
+NAME="AEN4229"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3980"
+NAME="AEN4230"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3987"
+NAME="AEN4237"
></A
><H2
>Description</H2
@@ -193,7 +193,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN3928"
+HREF="x103.html#AEN4178"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcatomicorigfile.html b/doc/fontconfig-devel/fcatomicorigfile.html
index 73ded289..5130364f 100644
--- a/doc/fontconfig-devel/fcatomicorigfile.html
+++ b/doc/fontconfig-devel/fcatomicorigfile.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcAtomic"
-HREF="x103.html#AEN3928"><LINK
+HREF="x103.html#AEN4178"><LINK
REL="PREVIOUS"
TITLE="FcAtomicNewFile"
HREF="fcatomicnewfile.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCATOMICORIGFILE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3996"
+NAME="AEN4246"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3996"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3999"
+NAME="AEN4249"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4000"
+NAME="AEN4250"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4007"
+NAME="AEN4257"
></A
><H2
>Description</H2
@@ -192,7 +192,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN3928"
+HREF="x103.html#AEN4178"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcatomicreplaceorig.html b/doc/fontconfig-devel/fcatomicreplaceorig.html
index 2135bdf0..fd9cf508 100644
--- a/doc/fontconfig-devel/fcatomicreplaceorig.html
+++ b/doc/fontconfig-devel/fcatomicreplaceorig.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcAtomic"
-HREF="x103.html#AEN3928"><LINK
+HREF="x103.html#AEN4178"><LINK
REL="PREVIOUS"
TITLE="FcAtomicOrigFile"
HREF="fcatomicorigfile.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCATOMICREPLACEORIG"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4016"
+NAME="AEN4266"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN4016"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4019"
+NAME="AEN4269"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4020"
+NAME="AEN4270"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4027"
+NAME="AEN4277"
></A
><H2
>Description</H2
@@ -194,7 +194,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN3928"
+HREF="x103.html#AEN4178"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcatomicunlock.html b/doc/fontconfig-devel/fcatomicunlock.html
index ec53f8f4..fdbb7132 100644
--- a/doc/fontconfig-devel/fcatomicunlock.html
+++ b/doc/fontconfig-devel/fcatomicunlock.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcAtomic"
-HREF="x103.html#AEN3928"><LINK
+HREF="x103.html#AEN4178"><LINK
REL="PREVIOUS"
TITLE="FcAtomicDeleteNew"
HREF="fcatomicdeletenew.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCATOMICUNLOCK"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4055"
+NAME="AEN4305"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN4055"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4058"
+NAME="AEN4308"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4059"
+NAME="AEN4309"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4066"
+NAME="AEN4316"
></A
><H2
>Description</H2
@@ -187,7 +187,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN3928"
+HREF="x103.html#AEN4178"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcblanksadd.html b/doc/fontconfig-devel/fcblanksadd.html
index 21913abf..a986b70e 100644
--- a/doc/fontconfig-devel/fcblanksadd.html
+++ b/doc/fontconfig-devel/fcblanksadd.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcBlanks"
-HREF="x103.html#AEN3844"><LINK
+HREF="x103.html#AEN4094"><LINK
REL="PREVIOUS"
TITLE="FcBlanksDestroy"
HREF="fcblanksdestroy.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCBLANKSADD"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3891"
+NAME="AEN4141"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3891"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3894"
+NAME="AEN4144"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3895"
+NAME="AEN4145"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3904"
+NAME="AEN4154"
></A
><H2
>Description</H2
@@ -193,7 +193,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN3844"
+HREF="x103.html#AEN4094"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcblankscreate.html b/doc/fontconfig-devel/fcblankscreate.html
index 2e4258a1..a4f705fe 100644
--- a/doc/fontconfig-devel/fcblankscreate.html
+++ b/doc/fontconfig-devel/fcblankscreate.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcBlanks"
-HREF="x103.html#AEN3844"><LINK
+HREF="x103.html#AEN4094"><LINK
REL="PREVIOUS"
TITLE="FUNCTIONS"
HREF="x103.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCBLANKSCREATE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3853"
+NAME="AEN4103"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3853"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3856"
+NAME="AEN4106"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3857"
+NAME="AEN4107"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3864"
+NAME="AEN4114"
></A
><H2
>Description</H2
@@ -188,7 +188,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN3844"
+HREF="x103.html#AEN4094"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcblanksdestroy.html b/doc/fontconfig-devel/fcblanksdestroy.html
index bcbd8d3f..04bc6b65 100644
--- a/doc/fontconfig-devel/fcblanksdestroy.html
+++ b/doc/fontconfig-devel/fcblanksdestroy.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcBlanks"
-HREF="x103.html#AEN3844"><LINK
+HREF="x103.html#AEN4094"><LINK
REL="PREVIOUS"
TITLE="FcBlanksCreate"
HREF="fcblankscreate.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCBLANKSDESTROY"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3872"
+NAME="AEN4122"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3872"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3875"
+NAME="AEN4125"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3876"
+NAME="AEN4126"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3883"
+NAME="AEN4133"
></A
><H2
>Description</H2
@@ -188,7 +188,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN3844"
+HREF="x103.html#AEN4094"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcblanksismember.html b/doc/fontconfig-devel/fcblanksismember.html
index c8d63a6d..babdc862 100644
--- a/doc/fontconfig-devel/fcblanksismember.html
+++ b/doc/fontconfig-devel/fcblanksismember.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcBlanks"
-HREF="x103.html#AEN3844"><LINK
+HREF="x103.html#AEN4094"><LINK
REL="PREVIOUS"
TITLE="FcBlanksAdd"
HREF="fcblanksadd.html"></HEAD
@@ -68,7 +68,7 @@ NAME="FCBLANKSISMEMBER"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3912"
+NAME="AEN4162"
></A
><H2
>Name</H2
@@ -76,7 +76,7 @@ NAME="AEN3912"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3915"
+NAME="AEN4165"
></A
><H2
>Synopsis</H2
@@ -85,7 +85,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3916"
+NAME="AEN4166"
></A
><TABLE
BORDER="0"
@@ -127,7 +127,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3925"
+NAME="AEN4175"
></A
><H2
>Description</H2
@@ -182,7 +182,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN3844"
+HREF="x103.html#AEN4094"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fccachecopyset.html b/doc/fontconfig-devel/fccachecopyset.html
index a760a311..89ba30ec 100644
--- a/doc/fontconfig-devel/fccachecopyset.html
+++ b/doc/fontconfig-devel/fccachecopyset.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcCache routines"
-HREF="x103.html#AEN4367"><LINK
+HREF="x103.html#AEN4617"><LINK
REL="PREVIOUS"
TITLE="FcCacheDir"
HREF="fccachedir.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCACHECOPYSET"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4395"
+NAME="AEN4645"
></A
><H2
>Name</H2
@@ -88,7 +88,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4399"
+NAME="AEN4649"
></A
><H2
>Synopsis</H2
@@ -97,7 +97,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4400"
+NAME="AEN4650"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4407"
+NAME="AEN4657"
></A
><H2
>Description</H2
@@ -199,7 +199,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4367"
+HREF="x103.html#AEN4617"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fccachecreatetagfile.html b/doc/fontconfig-devel/fccachecreatetagfile.html
index d4d6a6e2..461fddc8 100644
--- a/doc/fontconfig-devel/fccachecreatetagfile.html
+++ b/doc/fontconfig-devel/fccachecreatetagfile.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcCache routines"
-HREF="x103.html#AEN4367"><LINK
+HREF="x103.html#AEN4617"><LINK
REL="PREVIOUS"
TITLE="FcDirCacheClean"
HREF="fcdircacheclean.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCACHECREATETAGFILE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4506"
+NAME="AEN4756"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN4506"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4509"
+NAME="AEN4759"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4510"
+NAME="AEN4760"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4517"
+NAME="AEN4767"
></A
><H2
>Description</H2
@@ -146,7 +146,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4521"
+NAME="AEN4771"
></A
><H2
>Since</H2
@@ -203,7 +203,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4367"
+HREF="x103.html#AEN4617"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fccachedir.html b/doc/fontconfig-devel/fccachedir.html
index b685c751..297f7249 100644
--- a/doc/fontconfig-devel/fccachedir.html
+++ b/doc/fontconfig-devel/fccachedir.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcCache routines"
-HREF="x103.html#AEN4367"><LINK
+HREF="x103.html#AEN4617"><LINK
REL="PREVIOUS"
TITLE="FUNCTIONS"
HREF="x103.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCACHEDIR"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4375"
+NAME="AEN4625"
></A
><H2
>Name</H2
@@ -88,7 +88,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4379"
+NAME="AEN4629"
></A
><H2
>Synopsis</H2
@@ -97,7 +97,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4380"
+NAME="AEN4630"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4387"
+NAME="AEN4637"
></A
><H2
>Description</H2
@@ -192,7 +192,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4367"
+HREF="x103.html#AEN4617"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fccachenumfont.html b/doc/fontconfig-devel/fccachenumfont.html
index 8b7a90cf..438ecd12 100644
--- a/doc/fontconfig-devel/fccachenumfont.html
+++ b/doc/fontconfig-devel/fccachenumfont.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcCache routines"
-HREF="x103.html#AEN4367"><LINK
+HREF="x103.html#AEN4617"><LINK
REL="PREVIOUS"
TITLE="FcCacheNumSubdir"
HREF="fccachenumsubdir.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCACHENUMFONT"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4461"
+NAME="AEN4711"
></A
><H2
>Name</H2
@@ -88,7 +88,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4465"
+NAME="AEN4715"
></A
><H2
>Synopsis</H2
@@ -97,7 +97,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4466"
+NAME="AEN4716"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4473"
+NAME="AEN4723"
></A
><H2
>Description</H2
@@ -193,7 +193,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4367"
+HREF="x103.html#AEN4617"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fccachenumsubdir.html b/doc/fontconfig-devel/fccachenumsubdir.html
index 8da26e14..a6a20795 100644
--- a/doc/fontconfig-devel/fccachenumsubdir.html
+++ b/doc/fontconfig-devel/fccachenumsubdir.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcCache routines"
-HREF="x103.html#AEN4367"><LINK
+HREF="x103.html#AEN4617"><LINK
REL="PREVIOUS"
TITLE="FcCacheSubdir"
HREF="fccachesubdir.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCACHENUMSUBDIR"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4441"
+NAME="AEN4691"
></A
><H2
>Name</H2
@@ -88,7 +88,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4445"
+NAME="AEN4695"
></A
><H2
>Synopsis</H2
@@ -97,7 +97,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4446"
+NAME="AEN4696"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4453"
+NAME="AEN4703"
></A
><H2
>Description</H2
@@ -192,7 +192,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4367"
+HREF="x103.html#AEN4617"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fccachesubdir.html b/doc/fontconfig-devel/fccachesubdir.html
index adfb6e4a..2baa1243 100644
--- a/doc/fontconfig-devel/fccachesubdir.html
+++ b/doc/fontconfig-devel/fccachesubdir.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcCache routines"
-HREF="x103.html#AEN4367"><LINK
+HREF="x103.html#AEN4617"><LINK
REL="PREVIOUS"
TITLE="FcCacheCopySet"
HREF="fccachecopyset.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCACHESUBDIR"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4416"
+NAME="AEN4666"
></A
><H2
>Name</H2
@@ -88,7 +88,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4420"
+NAME="AEN4670"
></A
><H2
>Synopsis</H2
@@ -97,7 +97,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4421"
+NAME="AEN4671"
></A
><TABLE
BORDER="0"
@@ -139,7 +139,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4430"
+NAME="AEN4680"
></A
><H2
>Description</H2
@@ -215,7 +215,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4367"
+HREF="x103.html#AEN4617"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fccharsetaddchar.html b/doc/fontconfig-devel/fccharsetaddchar.html
index d5454f4a..139cb129 100644
--- a/doc/fontconfig-devel/fccharsetaddchar.html
+++ b/doc/fontconfig-devel/fccharsetaddchar.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcCharSet"
-HREF="x103.html#AEN1619"><LINK
+HREF="x103.html#AEN1869"><LINK
REL="PREVIOUS"
TITLE="FcCharSetDestroy"
HREF="fccharsetdestroy.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCHARSETADDCHAR"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1668"
+NAME="AEN1918"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1668"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1671"
+NAME="AEN1921"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1672"
+NAME="AEN1922"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1681"
+NAME="AEN1931"
></A
><H2
>Description</H2
@@ -197,7 +197,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1619"
+HREF="x103.html#AEN1869"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fccharsetcopy.html b/doc/fontconfig-devel/fccharsetcopy.html
index 404f02e5..b520bf69 100644
--- a/doc/fontconfig-devel/fccharsetcopy.html
+++ b/doc/fontconfig-devel/fccharsetcopy.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcCharSet"
-HREF="x103.html#AEN1619"><LINK
+HREF="x103.html#AEN1869"><LINK
REL="PREVIOUS"
TITLE="FcCharSetDelChar"
HREF="fccharsetdelchar.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCHARSETCOPY"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1715"
+NAME="AEN1965"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1715"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1718"
+NAME="AEN1968"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1719"
+NAME="AEN1969"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1726"
+NAME="AEN1976"
></A
><H2
>Description</H2
@@ -198,7 +198,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1619"
+HREF="x103.html#AEN1869"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fccharsetcount.html b/doc/fontconfig-devel/fccharsetcount.html
index 9f8dc10c..33e0c748 100644
--- a/doc/fontconfig-devel/fccharsetcount.html
+++ b/doc/fontconfig-devel/fccharsetcount.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcCharSet"
-HREF="x103.html#AEN1619"><LINK
+HREF="x103.html#AEN1869"><LINK
REL="PREVIOUS"
TITLE="FcCharSetHasChar"
HREF="fccharsethaschar.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCHARSETCOUNT"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1880"
+NAME="AEN2130"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1880"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1883"
+NAME="AEN2133"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1884"
+NAME="AEN2134"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1891"
+NAME="AEN2141"
></A
><H2
>Description</H2
@@ -192,7 +192,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1619"
+HREF="x103.html#AEN1869"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fccharsetcoverage.html b/doc/fontconfig-devel/fccharsetcoverage.html
index 793120ac..144e1033 100644
--- a/doc/fontconfig-devel/fccharsetcoverage.html
+++ b/doc/fontconfig-devel/fccharsetcoverage.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcCharSet"
-HREF="x103.html#AEN1619"><LINK
+HREF="x103.html#AEN1869"><LINK
REL="PREVIOUS"
TITLE="FcCharSetNextPage"
HREF="fccharsetnextpage.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCHARSETCOVERAGE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2044"
+NAME="AEN2294"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2044"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2047"
+NAME="AEN2297"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2048"
+NAME="AEN2298"
></A
><TABLE
BORDER="0"
@@ -139,7 +139,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2059"
+NAME="AEN2309"
></A
><H2
>Description</H2
@@ -220,7 +220,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1619"
+HREF="x103.html#AEN1869"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fccharsetcreate.html b/doc/fontconfig-devel/fccharsetcreate.html
index 39de2e0b..3d2fcfcb 100644
--- a/doc/fontconfig-devel/fccharsetcreate.html
+++ b/doc/fontconfig-devel/fccharsetcreate.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcCharSet"
-HREF="x103.html#AEN1619"><LINK
+HREF="x103.html#AEN1869"><LINK
REL="PREVIOUS"
TITLE="FUNCTIONS"
HREF="x103.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCHARSETCREATE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1627"
+NAME="AEN1877"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1627"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1630"
+NAME="AEN1880"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1631"
+NAME="AEN1881"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1638"
+NAME="AEN1888"
></A
><H2
>Description</H2
@@ -191,7 +191,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1619"
+HREF="x103.html#AEN1869"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fccharsetdelchar.html b/doc/fontconfig-devel/fccharsetdelchar.html
index c40b8f52..4168ca34 100644
--- a/doc/fontconfig-devel/fccharsetdelchar.html
+++ b/doc/fontconfig-devel/fccharsetdelchar.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcCharSet"
-HREF="x103.html#AEN1619"><LINK
+HREF="x103.html#AEN1869"><LINK
REL="PREVIOUS"
TITLE="FcCharSetAddChar"
HREF="fccharsetaddchar.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCHARSETDELCHAR"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1690"
+NAME="AEN1940"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1690"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1693"
+NAME="AEN1943"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1694"
+NAME="AEN1944"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1703"
+NAME="AEN1953"
></A
><H2
>Description</H2
@@ -150,7 +150,7 @@ running out of memory.
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1707"
+NAME="AEN1957"
></A
><H2
>Since</H2
@@ -207,7 +207,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1619"
+HREF="x103.html#AEN1869"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fccharsetdestroy.html b/doc/fontconfig-devel/fccharsetdestroy.html
index f665c859..c740ae00 100644
--- a/doc/fontconfig-devel/fccharsetdestroy.html
+++ b/doc/fontconfig-devel/fccharsetdestroy.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcCharSet"
-HREF="x103.html#AEN1619"><LINK
+HREF="x103.html#AEN1869"><LINK
REL="PREVIOUS"
TITLE="FcCharSetCreate"
HREF="fccharsetcreate.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCHARSETDESTROY"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1647"
+NAME="AEN1897"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1647"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1650"
+NAME="AEN1900"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1651"
+NAME="AEN1901"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1658"
+NAME="AEN1908"
></A
><H2
>Description</H2
@@ -197,7 +197,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1619"
+HREF="x103.html#AEN1869"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fccharsetequal.html b/doc/fontconfig-devel/fccharsetequal.html
index 447f4374..257ebbeb 100644
--- a/doc/fontconfig-devel/fccharsetequal.html
+++ b/doc/fontconfig-devel/fccharsetequal.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcCharSet"
-HREF="x103.html#AEN1619"><LINK
+HREF="x103.html#AEN1869"><LINK
REL="PREVIOUS"
TITLE="FcCharSetCopy"
HREF="fccharsetcopy.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCHARSETEQUAL"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1736"
+NAME="AEN1986"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1736"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1739"
+NAME="AEN1989"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1740"
+NAME="AEN1990"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1749"
+NAME="AEN1999"
></A
><H2
>Description</H2
@@ -203,7 +203,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1619"
+HREF="x103.html#AEN1869"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fccharsetfirstpage.html b/doc/fontconfig-devel/fccharsetfirstpage.html
index e09cda92..3e35bfec 100644
--- a/doc/fontconfig-devel/fccharsetfirstpage.html
+++ b/doc/fontconfig-devel/fccharsetfirstpage.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcCharSet"
-HREF="x103.html#AEN1619"><LINK
+HREF="x103.html#AEN1869"><LINK
REL="PREVIOUS"
TITLE="FcCharSetIsSubset"
HREF="fccharsetissubset.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCHARSETFIRSTPAGE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1969"
+NAME="AEN2219"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1969"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1972"
+NAME="AEN2222"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1973"
+NAME="AEN2223"
></A
><TABLE
BORDER="0"
@@ -139,7 +139,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1984"
+NAME="AEN2234"
></A
><H2
>Description</H2
@@ -306,7 +306,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1619"
+HREF="x103.html#AEN1869"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fccharsethaschar.html b/doc/fontconfig-devel/fccharsethaschar.html
index a7a48f8e..bedca1dd 100644
--- a/doc/fontconfig-devel/fccharsethaschar.html
+++ b/doc/fontconfig-devel/fccharsethaschar.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcCharSet"
-HREF="x103.html#AEN1619"><LINK
+HREF="x103.html#AEN1869"><LINK
REL="PREVIOUS"
TITLE="FcCharSetMerge"
HREF="fccharsetmerge.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCHARSETHASCHAR"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1857"
+NAME="AEN2107"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1857"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1860"
+NAME="AEN2110"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1861"
+NAME="AEN2111"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1870"
+NAME="AEN2120"
></A
><H2
>Description</H2
@@ -202,7 +202,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1619"
+HREF="x103.html#AEN1869"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fccharsetintersect.html b/doc/fontconfig-devel/fccharsetintersect.html
index 57a6c265..65d1543d 100644
--- a/doc/fontconfig-devel/fccharsetintersect.html
+++ b/doc/fontconfig-devel/fccharsetintersect.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcCharSet"
-HREF="x103.html#AEN1619"><LINK
+HREF="x103.html#AEN1869"><LINK
REL="PREVIOUS"
TITLE="FcCharSetEqual"
HREF="fccharsetequal.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCHARSETINTERSECT"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1759"
+NAME="AEN2009"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1759"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1762"
+NAME="AEN2012"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1763"
+NAME="AEN2013"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1772"
+NAME="AEN2022"
></A
><H2
>Description</H2
@@ -203,7 +203,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1619"
+HREF="x103.html#AEN1869"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fccharsetintersectcount.html b/doc/fontconfig-devel/fccharsetintersectcount.html
index 432d7e76..62f51781 100644
--- a/doc/fontconfig-devel/fccharsetintersectcount.html
+++ b/doc/fontconfig-devel/fccharsetintersectcount.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcCharSet"
-HREF="x103.html#AEN1619"><LINK
+HREF="x103.html#AEN1869"><LINK
REL="PREVIOUS"
TITLE="FcCharSetCount"
HREF="fccharsetcount.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCHARSETINTERSECTCOUNT"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1900"
+NAME="AEN2150"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1900"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1903"
+NAME="AEN2153"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1904"
+NAME="AEN2154"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1913"
+NAME="AEN2163"
></A
><H2
>Description</H2
@@ -202,7 +202,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1619"
+HREF="x103.html#AEN1869"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fccharsetissubset.html b/doc/fontconfig-devel/fccharsetissubset.html
index a162247d..8c5e9780 100644
--- a/doc/fontconfig-devel/fccharsetissubset.html
+++ b/doc/fontconfig-devel/fccharsetissubset.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcCharSet"
-HREF="x103.html#AEN1619"><LINK
+HREF="x103.html#AEN1869"><LINK
REL="PREVIOUS"
TITLE="FcCharSetSubtractCount"
HREF="fccharsetsubtractcount.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCHARSETISSUBSET"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1946"
+NAME="AEN2196"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1946"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1949"
+NAME="AEN2199"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1950"
+NAME="AEN2200"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1959"
+NAME="AEN2209"
></A
><H2
>Description</H2
@@ -202,7 +202,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1619"
+HREF="x103.html#AEN1869"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fccharsetmerge.html b/doc/fontconfig-devel/fccharsetmerge.html
index 9f4401cd..65521866 100644
--- a/doc/fontconfig-devel/fccharsetmerge.html
+++ b/doc/fontconfig-devel/fccharsetmerge.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcCharSet"
-HREF="x103.html#AEN1619"><LINK
+HREF="x103.html#AEN1869"><LINK
REL="PREVIOUS"
TITLE="FcCharSetSubtract"
HREF="fccharsetsubtract.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCHARSETMERGE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1828"
+NAME="AEN2078"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1828"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1831"
+NAME="AEN2081"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1832"
+NAME="AEN2082"
></A
><TABLE
BORDER="0"
@@ -139,7 +139,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1843"
+NAME="AEN2093"
></A
><H2
>Description</H2
@@ -232,7 +232,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1619"
+HREF="x103.html#AEN1869"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fccharsetnew.html b/doc/fontconfig-devel/fccharsetnew.html
index 7a3c2e88..567e2151 100644
--- a/doc/fontconfig-devel/fccharsetnew.html
+++ b/doc/fontconfig-devel/fccharsetnew.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcCharSet"
-HREF="x103.html#AEN1619"><LINK
+HREF="x103.html#AEN1869"><LINK
REL="PREVIOUS"
TITLE="FcCharSetCoverage"
HREF="fccharsetcoverage.html"></HEAD
@@ -68,7 +68,7 @@ NAME="FCCHARSETNEW"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2071"
+NAME="AEN2321"
></A
><H2
>Name</H2
@@ -76,7 +76,7 @@ NAME="AEN2071"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2074"
+NAME="AEN2324"
></A
><H2
>Synopsis</H2
@@ -85,7 +85,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2075"
+NAME="AEN2325"
></A
><TABLE
BORDER="0"
@@ -122,7 +122,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2082"
+NAME="AEN2332"
></A
><H2
>Description</H2
@@ -179,7 +179,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1619"
+HREF="x103.html#AEN1869"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fccharsetnextpage.html b/doc/fontconfig-devel/fccharsetnextpage.html
index 35321fa4..195d5af7 100644
--- a/doc/fontconfig-devel/fccharsetnextpage.html
+++ b/doc/fontconfig-devel/fccharsetnextpage.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcCharSet"
-HREF="x103.html#AEN1619"><LINK
+HREF="x103.html#AEN1869"><LINK
REL="PREVIOUS"
TITLE="FcCharSetFirstPage"
HREF="fccharsetfirstpage.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCHARSETNEXTPAGE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2012"
+NAME="AEN2262"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2012"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2015"
+NAME="AEN2265"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2016"
+NAME="AEN2266"
></A
><TABLE
BORDER="0"
@@ -139,7 +139,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2027"
+NAME="AEN2277"
></A
><H2
>Description</H2
@@ -246,7 +246,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1619"
+HREF="x103.html#AEN1869"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fccharsetsubtract.html b/doc/fontconfig-devel/fccharsetsubtract.html
index 8c3b44ef..9aa00877 100644
--- a/doc/fontconfig-devel/fccharsetsubtract.html
+++ b/doc/fontconfig-devel/fccharsetsubtract.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcCharSet"
-HREF="x103.html#AEN1619"><LINK
+HREF="x103.html#AEN1869"><LINK
REL="PREVIOUS"
TITLE="FcCharSetUnion"
HREF="fccharsetunion.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCHARSETSUBTRACT"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1805"
+NAME="AEN2055"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1805"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1808"
+NAME="AEN2058"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1809"
+NAME="AEN2059"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1818"
+NAME="AEN2068"
></A
><H2
>Description</H2
@@ -202,7 +202,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1619"
+HREF="x103.html#AEN1869"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fccharsetsubtractcount.html b/doc/fontconfig-devel/fccharsetsubtractcount.html
index 3c842742..2f436f8b 100644
--- a/doc/fontconfig-devel/fccharsetsubtractcount.html
+++ b/doc/fontconfig-devel/fccharsetsubtractcount.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcCharSet"
-HREF="x103.html#AEN1619"><LINK
+HREF="x103.html#AEN1869"><LINK
REL="PREVIOUS"
TITLE="FcCharSetIntersectCount"
HREF="fccharsetintersectcount.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCHARSETSUBTRACTCOUNT"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1923"
+NAME="AEN2173"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1923"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1926"
+NAME="AEN2176"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1927"
+NAME="AEN2177"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1936"
+NAME="AEN2186"
></A
><H2
>Description</H2
@@ -202,7 +202,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1619"
+HREF="x103.html#AEN1869"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fccharsetunion.html b/doc/fontconfig-devel/fccharsetunion.html
index 8ae3c76c..cdea732e 100644
--- a/doc/fontconfig-devel/fccharsetunion.html
+++ b/doc/fontconfig-devel/fccharsetunion.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcCharSet"
-HREF="x103.html#AEN1619"><LINK
+HREF="x103.html#AEN1869"><LINK
REL="PREVIOUS"
TITLE="FcCharSetIntersect"
HREF="fccharsetintersect.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCHARSETUNION"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1782"
+NAME="AEN2032"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1782"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1785"
+NAME="AEN2035"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1786"
+NAME="AEN2036"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1795"
+NAME="AEN2045"
></A
><H2
>Description</H2
@@ -202,7 +202,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1619"
+HREF="x103.html#AEN1869"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcconfigappfontadddir.html b/doc/fontconfig-devel/fcconfigappfontadddir.html
index 649cfbc8..ca897ba0 100644
--- a/doc/fontconfig-devel/fcconfigappfontadddir.html
+++ b/doc/fontconfig-devel/fcconfigappfontadddir.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcConfigAppFontAddFile"
HREF="fcconfigappfontaddfile.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCONFIGAPPFONTADDDIR"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3187"
+NAME="AEN3437"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3187"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3190"
+NAME="AEN3440"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3191"
+NAME="AEN3441"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3200"
+NAME="AEN3450"
></A
><H2
>Description</H2
@@ -201,7 +201,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcconfigappfontaddfile.html b/doc/fontconfig-devel/fcconfigappfontaddfile.html
index 240a4eff..f6847816 100644
--- a/doc/fontconfig-devel/fcconfigappfontaddfile.html
+++ b/doc/fontconfig-devel/fcconfigappfontaddfile.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcConfigSetRescanInterval"
HREF="fcconfigsetrescaninterval.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCONFIGAPPFONTADDFILE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3165"
+NAME="AEN3415"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3165"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3168"
+NAME="AEN3418"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3169"
+NAME="AEN3419"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3178"
+NAME="AEN3428"
></A
><H2
>Description</H2
@@ -200,7 +200,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcconfigappfontclear.html b/doc/fontconfig-devel/fcconfigappfontclear.html
index 6b5e8aac..1e570a9f 100644
--- a/doc/fontconfig-devel/fcconfigappfontclear.html
+++ b/doc/fontconfig-devel/fcconfigappfontclear.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcConfigAppFontAddDir"
HREF="fcconfigappfontadddir.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCONFIGAPPFONTCLEAR"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3209"
+NAME="AEN3459"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3209"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3212"
+NAME="AEN3462"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3213"
+NAME="AEN3463"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3220"
+NAME="AEN3470"
></A
><H2
>Description</H2
@@ -193,7 +193,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcconfigbuildfonts.html b/doc/fontconfig-devel/fcconfigbuildfonts.html
index 7d9be3fe..afaa22f6 100644
--- a/doc/fontconfig-devel/fcconfigbuildfonts.html
+++ b/doc/fontconfig-devel/fcconfigbuildfonts.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcConfigEnableHome"
HREF="fcconfigenablehome.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCONFIGBUILDFONTS"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2957"
+NAME="AEN3207"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2957"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2960"
+NAME="AEN3210"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2961"
+NAME="AEN3211"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2968"
+NAME="AEN3218"
></A
><H2
>Description</H2
@@ -195,7 +195,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcconfigcreate.html b/doc/fontconfig-devel/fcconfigcreate.html
index b55d3f2d..dee5ce00 100644
--- a/doc/fontconfig-devel/fcconfigcreate.html
+++ b/doc/fontconfig-devel/fcconfigcreate.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FUNCTIONS"
HREF="x103.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCONFIGCREATE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2796"
+NAME="AEN3046"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2796"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2799"
+NAME="AEN3049"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2800"
+NAME="AEN3050"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2807"
+NAME="AEN3057"
></A
><H2
>Description</H2
@@ -187,7 +187,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcconfigdestroy.html b/doc/fontconfig-devel/fcconfigdestroy.html
index ac22dae3..db6e0648 100644
--- a/doc/fontconfig-devel/fcconfigdestroy.html
+++ b/doc/fontconfig-devel/fcconfigdestroy.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcConfigReference"
HREF="fcconfigreference.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCONFIGDESTROY"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2836"
+NAME="AEN3086"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2836"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2839"
+NAME="AEN3089"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2840"
+NAME="AEN3090"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2847"
+NAME="AEN3097"
></A
><H2
>Description</H2
@@ -190,7 +190,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcconfigenablehome.html b/doc/fontconfig-devel/fcconfigenablehome.html
index 13abce8a..042b2c78 100644
--- a/doc/fontconfig-devel/fcconfigenablehome.html
+++ b/doc/fontconfig-devel/fcconfigenablehome.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcConfigHome"
HREF="fcconfighome.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCONFIGENABLEHOME"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2936"
+NAME="AEN3186"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2936"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2939"
+NAME="AEN3189"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2940"
+NAME="AEN3190"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2947"
+NAME="AEN3197"
></A
><H2
>Description</H2
@@ -201,7 +201,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcconfigfileinfoiterget.html b/doc/fontconfig-devel/fcconfigfileinfoiterget.html
index db6a7167..8d032ba9 100644
--- a/doc/fontconfig-devel/fcconfigfileinfoiterget.html
+++ b/doc/fontconfig-devel/fcconfigfileinfoiterget.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcConfigFileInfoIterNext"
HREF="fcconfigfileinfoiternext.html"></HEAD
@@ -68,7 +68,7 @@ NAME="FCCONFIGFILEINFOITERGET"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3568"
+NAME="AEN3818"
></A
><H2
>Name</H2
@@ -76,7 +76,7 @@ NAME="AEN3568"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3571"
+NAME="AEN3821"
></A
><H2
>Synopsis</H2
@@ -85,7 +85,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3572"
+NAME="AEN3822"
></A
><TABLE
BORDER="0"
@@ -142,7 +142,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3587"
+NAME="AEN3837"
></A
><H2
>Description</H2
@@ -155,7 +155,7 @@ If the iterator is invalid, FcFalse is returned.
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3590"
+NAME="AEN3840"
></A
><H2
>Since</H2
@@ -208,7 +208,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcconfigfileinfoiterinit.html b/doc/fontconfig-devel/fcconfigfileinfoiterinit.html
index 92ecdee8..7fc7f052 100644
--- a/doc/fontconfig-devel/fcconfigfileinfoiterinit.html
+++ b/doc/fontconfig-devel/fcconfigfileinfoiterinit.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcConfigSetSysRoot"
HREF="fcconfigsetsysroot.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCONFIGFILEINFOITERINIT"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3520"
+NAME="AEN3770"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3520"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3523"
+NAME="AEN3773"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3524"
+NAME="AEN3774"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3533"
+NAME="AEN3783"
></A
><H2
>Description</H2
@@ -145,7 +145,7 @@ NAME="AEN3533"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3536"
+NAME="AEN3786"
></A
><H2
>Since</H2
@@ -202,7 +202,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcconfigfileinfoiternext.html b/doc/fontconfig-devel/fcconfigfileinfoiternext.html
index c29378fe..f611a621 100644
--- a/doc/fontconfig-devel/fcconfigfileinfoiternext.html
+++ b/doc/fontconfig-devel/fcconfigfileinfoiternext.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcConfigFileInfoIterInit"
HREF="fcconfigfileinfoiterinit.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCONFIGFILEINFOITERNEXT"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3544"
+NAME="AEN3794"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3544"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3547"
+NAME="AEN3797"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3548"
+NAME="AEN3798"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3557"
+NAME="AEN3807"
></A
><H2
>Description</H2
@@ -146,7 +146,7 @@ If there is no next node, FcFalse is returned.
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3560"
+NAME="AEN3810"
></A
><H2
>Since</H2
@@ -203,7 +203,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcconfigfilename.html b/doc/fontconfig-devel/fcconfigfilename.html
index 22b3d846..09b7c977 100644
--- a/doc/fontconfig-devel/fcconfigfilename.html
+++ b/doc/fontconfig-devel/fcconfigfilename.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcFontList"
HREF="fcfontlist.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCONFIGFILENAME"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3403"
+NAME="AEN3653"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3403"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3406"
+NAME="AEN3656"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3407"
+NAME="AEN3657"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3414"
+NAME="AEN3664"
></A
><H2
>Description</H2
@@ -208,7 +208,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcconfiggetblanks.html b/doc/fontconfig-devel/fcconfiggetblanks.html
index c9819e11..faacc728 100644
--- a/doc/fontconfig-devel/fcconfiggetblanks.html
+++ b/doc/fontconfig-devel/fcconfiggetblanks.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcConfigGetFonts"
HREF="fcconfiggetfonts.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCONFIGGETBLANKS"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3103"
+NAME="AEN3353"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3103"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3106"
+NAME="AEN3356"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3107"
+NAME="AEN3357"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3114"
+NAME="AEN3364"
></A
><H2
>Description</H2
@@ -188,7 +188,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcconfiggetcache.html b/doc/fontconfig-devel/fcconfiggetcache.html
index c3f99083..0819c275 100644
--- a/doc/fontconfig-devel/fcconfiggetcache.html
+++ b/doc/fontconfig-devel/fcconfiggetcache.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcConfigGetConfigFiles"
HREF="fcconfiggetconfigfiles.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCONFIGGETCACHE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3040"
+NAME="AEN3290"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3040"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3043"
+NAME="AEN3293"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3044"
+NAME="AEN3294"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3051"
+NAME="AEN3301"
></A
><H2
>Description</H2
@@ -188,7 +188,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcconfiggetcachedirs.html b/doc/fontconfig-devel/fcconfiggetcachedirs.html
index d04319fd..fa098bd4 100644
--- a/doc/fontconfig-devel/fcconfiggetcachedirs.html
+++ b/doc/fontconfig-devel/fcconfiggetcachedirs.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcConfigGetCache"
HREF="fcconfiggetcache.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCONFIGGETCACHEDIRS"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3059"
+NAME="AEN3309"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3059"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3062"
+NAME="AEN3312"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3063"
+NAME="AEN3313"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3070"
+NAME="AEN3320"
></A
><H2
>Description</H2
@@ -198,7 +198,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcconfiggetconfigdirs.html b/doc/fontconfig-devel/fcconfiggetconfigdirs.html
index c82be445..d1555cca 100644
--- a/doc/fontconfig-devel/fcconfiggetconfigdirs.html
+++ b/doc/fontconfig-devel/fcconfiggetconfigdirs.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcConfigBuildFonts"
HREF="fcconfigbuildfonts.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCONFIGGETCONFIGDIRS"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2977"
+NAME="AEN3227"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2977"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2980"
+NAME="AEN3230"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2981"
+NAME="AEN3231"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2988"
+NAME="AEN3238"
></A
><H2
>Description</H2
@@ -199,7 +199,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcconfiggetconfigfiles.html b/doc/fontconfig-devel/fcconfiggetconfigfiles.html
index de64450c..cc9b5369 100644
--- a/doc/fontconfig-devel/fcconfiggetconfigfiles.html
+++ b/doc/fontconfig-devel/fcconfiggetconfigfiles.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcConfigGetFontDirs"
HREF="fcconfiggetfontdirs.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCONFIGGETCONFIGFILES"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3019"
+NAME="AEN3269"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3019"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3022"
+NAME="AEN3272"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3023"
+NAME="AEN3273"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3030"
+NAME="AEN3280"
></A
><H2
>Description</H2
@@ -198,7 +198,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcconfiggetcurrent.html b/doc/fontconfig-devel/fcconfiggetcurrent.html
index 8f06db7e..3f95dca6 100644
--- a/doc/fontconfig-devel/fcconfiggetcurrent.html
+++ b/doc/fontconfig-devel/fcconfiggetcurrent.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcConfigSetCurrent"
HREF="fcconfigsetcurrent.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCONFIGGETCURRENT"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2876"
+NAME="AEN3126"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2876"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2879"
+NAME="AEN3129"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2880"
+NAME="AEN3130"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2887"
+NAME="AEN3137"
></A
><H2
>Description</H2
@@ -187,7 +187,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcconfiggetfontdirs.html b/doc/fontconfig-devel/fcconfiggetfontdirs.html
index b377038b..c4edaa9e 100644
--- a/doc/fontconfig-devel/fcconfiggetfontdirs.html
+++ b/doc/fontconfig-devel/fcconfiggetfontdirs.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcConfigGetConfigDirs"
HREF="fcconfiggetconfigdirs.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCONFIGGETFONTDIRS"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2998"
+NAME="AEN3248"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2998"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3001"
+NAME="AEN3251"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3002"
+NAME="AEN3252"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3009"
+NAME="AEN3259"
></A
><H2
>Description</H2
@@ -200,7 +200,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcconfiggetfonts.html b/doc/fontconfig-devel/fcconfiggetfonts.html
index f8d3171a..e87592c4 100644
--- a/doc/fontconfig-devel/fcconfiggetfonts.html
+++ b/doc/fontconfig-devel/fcconfiggetfonts.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcConfigGetCacheDirs"
HREF="fcconfiggetcachedirs.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCONFIGGETFONTS"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3080"
+NAME="AEN3330"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3080"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3083"
+NAME="AEN3333"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3084"
+NAME="AEN3334"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3093"
+NAME="AEN3343"
></A
><H2
>Description</H2
@@ -205,7 +205,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcconfiggetrescaninterval.html b/doc/fontconfig-devel/fcconfiggetrescaninterval.html
index 4dd1f63b..f0ceb428 100644
--- a/doc/fontconfig-devel/fcconfiggetrescaninterval.html
+++ b/doc/fontconfig-devel/fcconfiggetrescaninterval.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcConfigGetBlanks"
HREF="fcconfiggetblanks.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCONFIGGETRESCANINTERVAL"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3122"
+NAME="AEN3372"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3122"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3125"
+NAME="AEN3375"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3126"
+NAME="AEN3376"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3133"
+NAME="AEN3383"
></A
><H2
>Description</H2
@@ -201,7 +201,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcconfiggetsysroot.html b/doc/fontconfig-devel/fcconfiggetsysroot.html
index 10ed1625..45e430f3 100644
--- a/doc/fontconfig-devel/fcconfiggetsysroot.html
+++ b/doc/fontconfig-devel/fcconfiggetsysroot.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcConfigParseAndLoadFromMemory"
HREF="fcconfigparseandloadfrommemory.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCONFIGGETSYSROOT"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3474"
+NAME="AEN3724"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3474"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3477"
+NAME="AEN3727"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3478"
+NAME="AEN3728"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3485"
+NAME="AEN3735"
></A
><H2
>Description</H2
@@ -140,7 +140,7 @@ NAME="AEN3485"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3488"
+NAME="AEN3738"
></A
><H2
>Since</H2
@@ -197,7 +197,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcconfighome.html b/doc/fontconfig-devel/fcconfighome.html
index a76e0ae6..b0051214 100644
--- a/doc/fontconfig-devel/fcconfighome.html
+++ b/doc/fontconfig-devel/fcconfighome.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcConfigUptoDate"
HREF="fcconfiguptodate.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCONFIGHOME"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2916"
+NAME="AEN3166"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2916"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2919"
+NAME="AEN3169"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2920"
+NAME="AEN3170"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2927"
+NAME="AEN3177"
></A
><H2
>Description</H2
@@ -192,7 +192,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcconfigparseandload.html b/doc/fontconfig-devel/fcconfigparseandload.html
index 4fcf009b..1159dd9f 100644
--- a/doc/fontconfig-devel/fcconfigparseandload.html
+++ b/doc/fontconfig-devel/fcconfigparseandload.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcConfigFilename"
HREF="fcconfigfilename.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCONFIGPARSEANDLOAD"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3425"
+NAME="AEN3675"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3425"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3428"
+NAME="AEN3678"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3429"
+NAME="AEN3679"
></A
><TABLE
BORDER="0"
@@ -139,7 +139,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3440"
+NAME="AEN3690"
></A
><H2
>Description</H2
@@ -202,7 +202,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcconfigparseandloadfrommemory.html b/doc/fontconfig-devel/fcconfigparseandloadfrommemory.html
index 9b930099..a91eac44 100644
--- a/doc/fontconfig-devel/fcconfigparseandloadfrommemory.html
+++ b/doc/fontconfig-devel/fcconfigparseandloadfrommemory.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcConfigParseAndLoad"
HREF="fcconfigparseandload.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCONFIGPARSEANDLOADFROMMEMORY"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3448"
+NAME="AEN3698"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3448"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3451"
+NAME="AEN3701"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3452"
+NAME="AEN3702"
></A
><TABLE
BORDER="0"
@@ -139,7 +139,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3463"
+NAME="AEN3713"
></A
><H2
>Description</H2
@@ -155,7 +155,7 @@ parse error, semantic error or allocation failure. Otherwise returns FcTrue.
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3466"
+NAME="AEN3716"
></A
><H2
>Since</H2
@@ -212,7 +212,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcconfigreference.html b/doc/fontconfig-devel/fcconfigreference.html
index 5e9c0d55..10e657b8 100644
--- a/doc/fontconfig-devel/fcconfigreference.html
+++ b/doc/fontconfig-devel/fcconfigreference.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcConfigCreate"
HREF="fcconfigcreate.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCONFIGREFERENCE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2815"
+NAME="AEN3065"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2815"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2818"
+NAME="AEN3068"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2819"
+NAME="AEN3069"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2826"
+NAME="AEN3076"
></A
><H2
>Description</H2
@@ -202,7 +202,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcconfigsetcurrent.html b/doc/fontconfig-devel/fcconfigsetcurrent.html
index 33d1c868..8c4bd423 100644
--- a/doc/fontconfig-devel/fcconfigsetcurrent.html
+++ b/doc/fontconfig-devel/fcconfigsetcurrent.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcConfigDestroy"
HREF="fcconfigdestroy.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCONFIGSETCURRENT"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2855"
+NAME="AEN3105"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2855"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2858"
+NAME="AEN3108"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2859"
+NAME="AEN3109"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2866"
+NAME="AEN3116"
></A
><H2
>Description</H2
@@ -199,7 +199,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcconfigsetrescaninterval.html b/doc/fontconfig-devel/fcconfigsetrescaninterval.html
index c1512e54..eecb75e9 100644
--- a/doc/fontconfig-devel/fcconfigsetrescaninterval.html
+++ b/doc/fontconfig-devel/fcconfigsetrescaninterval.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcConfigGetRescanInterval"
HREF="fcconfiggetrescaninterval.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCONFIGSETRESCANINTERVAL"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3143"
+NAME="AEN3393"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3143"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3146"
+NAME="AEN3396"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3147"
+NAME="AEN3397"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3156"
+NAME="AEN3406"
></A
><H2
>Description</H2
@@ -200,7 +200,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcconfigsetsysroot.html b/doc/fontconfig-devel/fcconfigsetsysroot.html
index 39629769..7e88e209 100644
--- a/doc/fontconfig-devel/fcconfigsetsysroot.html
+++ b/doc/fontconfig-devel/fcconfigsetsysroot.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcConfigGetSysRoot"
HREF="fcconfiggetsysroot.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCONFIGSETSYSROOT"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3496"
+NAME="AEN3746"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3496"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3499"
+NAME="AEN3749"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3500"
+NAME="AEN3750"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3509"
+NAME="AEN3759"
></A
><H2
>Description</H2
@@ -148,7 +148,7 @@ this function calls FcConfigSetCurrent() internally.
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3512"
+NAME="AEN3762"
></A
><H2
>Since</H2
@@ -205,7 +205,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcconfigsubstitute.html b/doc/fontconfig-devel/fcconfigsubstitute.html
index 552c09b7..47867596 100644
--- a/doc/fontconfig-devel/fcconfigsubstitute.html
+++ b/doc/fontconfig-devel/fcconfigsubstitute.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcConfigSubstituteWithPat"
HREF="fcconfigsubstitutewithpat.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCONFIGSUBSTITUTE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3257"
+NAME="AEN3507"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3257"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3260"
+NAME="AEN3510"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3261"
+NAME="AEN3511"
></A
><TABLE
BORDER="0"
@@ -139,7 +139,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3272"
+NAME="AEN3522"
></A
><H2
>Description</H2
@@ -204,7 +204,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcconfigsubstitutewithpat.html b/doc/fontconfig-devel/fcconfigsubstitutewithpat.html
index a48d178f..cc3f3c97 100644
--- a/doc/fontconfig-devel/fcconfigsubstitutewithpat.html
+++ b/doc/fontconfig-devel/fcconfigsubstitutewithpat.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcConfigAppFontClear"
HREF="fcconfigappfontclear.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCONFIGSUBSTITUTEWITHPAT"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3229"
+NAME="AEN3479"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3229"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3232"
+NAME="AEN3482"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3233"
+NAME="AEN3483"
></A
><TABLE
BORDER="0"
@@ -144,7 +144,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3246"
+NAME="AEN3496"
></A
><H2
>Description</H2
@@ -222,7 +222,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcconfiguptodate.html b/doc/fontconfig-devel/fcconfiguptodate.html
index 859df9b6..6ca68896 100644
--- a/doc/fontconfig-devel/fcconfiguptodate.html
+++ b/doc/fontconfig-devel/fcconfiguptodate.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcConfigGetCurrent"
HREF="fcconfiggetcurrent.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCCONFIGUPTODATE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2895"
+NAME="AEN3145"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2895"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2898"
+NAME="AEN3148"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2899"
+NAME="AEN3149"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2906"
+NAME="AEN3156"
></A
><H2
>Description</H2
@@ -199,7 +199,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcdefaultsubstitute.html b/doc/fontconfig-devel/fcdefaultsubstitute.html
index c73789ae..69ec3680 100644
--- a/doc/fontconfig-devel/fcdefaultsubstitute.html
+++ b/doc/fontconfig-devel/fcdefaultsubstitute.html
@@ -75,7 +75,7 @@ NAME="FCDEFAULTSUBSTITUTE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN875"
+NAME="AEN1125"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN875"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN878"
+NAME="AEN1128"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN879"
+NAME="AEN1129"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN886"
+NAME="AEN1136"
></A
><H2
>Description</H2
diff --git a/doc/fontconfig-devel/fcdircacheclean.html b/doc/fontconfig-devel/fcdircacheclean.html
index 2797cbe9..07872320 100644
--- a/doc/fontconfig-devel/fcdircacheclean.html
+++ b/doc/fontconfig-devel/fcdircacheclean.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcCache routines"
-HREF="x103.html#AEN4367"><LINK
+HREF="x103.html#AEN4617"><LINK
REL="PREVIOUS"
TITLE="FcCacheNumFont"
HREF="fccachenumfont.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCDIRCACHECLEAN"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4481"
+NAME="AEN4731"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN4481"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4484"
+NAME="AEN4734"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4485"
+NAME="AEN4735"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4494"
+NAME="AEN4744"
></A
><H2
>Description</H2
@@ -151,7 +151,7 @@ This returns FcTrue if the operation is successfully complete. otherwise FcFalse
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4498"
+NAME="AEN4748"
></A
><H2
>Since</H2
@@ -208,7 +208,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4367"
+HREF="x103.html#AEN4617"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcdircachecreateuuid.html b/doc/fontconfig-devel/fcdircachecreateuuid.html
index dc5cf361..024ebf37 100644
--- a/doc/fontconfig-devel/fcdircachecreateuuid.html
+++ b/doc/fontconfig-devel/fcdircachecreateuuid.html
@@ -10,10 +10,13 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcCache routines"
-HREF="x103.html#AEN4367"><LINK
+HREF="x103.html#AEN4617"><LINK
REL="PREVIOUS"
TITLE="FcCacheCreateTagFile"
-HREF="fccachecreatetagfile.html"></HEAD
+HREF="fccachecreatetagfile.html"><LINK
+REL="NEXT"
+TITLE="FcDirCacheDeleteUUID"
+HREF="fcdircachedeleteuuid.html"></HEAD
><BODY
CLASS="REFENTRY"
BGCOLOR="#FFFFFF"
@@ -54,7 +57,11 @@ VALIGN="bottom"
WIDTH="10%"
ALIGN="right"
VALIGN="bottom"
->&nbsp;</TD
+><A
+HREF="fcdircachedeleteuuid.html"
+ACCESSKEY="N"
+>Next &#62;&#62;&#62;</A
+></TD
></TR
></TABLE
><HR
@@ -68,7 +75,7 @@ NAME="FCDIRCACHECREATEUUID"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4529"
+NAME="AEN4779"
></A
><H2
>Name</H2
@@ -76,7 +83,7 @@ NAME="AEN4529"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4532"
+NAME="AEN4782"
></A
><H2
>Synopsis</H2
@@ -85,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4533"
+NAME="AEN4783"
></A
><TABLE
BORDER="0"
@@ -118,7 +125,7 @@ CLASS="PARAMETER"
><I
>force</I
></TT
->, FcConfig<TT
+>, FcConfig *<TT
CLASS="PARAMETER"
><I
>config</I
@@ -132,7 +139,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4544"
+NAME="AEN4794"
></A
><H2
>Description</H2
@@ -151,7 +158,7 @@ the cache filename if available.
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4548"
+NAME="AEN4798"
></A
><H2
>Since</H2
@@ -191,7 +198,11 @@ ACCESSKEY="H"
WIDTH="33%"
ALIGN="right"
VALIGN="top"
->&nbsp;</TD
+><A
+HREF="fcdircachedeleteuuid.html"
+ACCESSKEY="N"
+>Next &#62;&#62;&#62;</A
+></TD
></TR
><TR
><TD
@@ -204,7 +215,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4367"
+HREF="x103.html#AEN4617"
ACCESSKEY="U"
>Up</A
></TD
@@ -212,7 +223,7 @@ ACCESSKEY="U"
WIDTH="33%"
ALIGN="right"
VALIGN="top"
->&nbsp;</TD
+>FcDirCacheDeleteUUID</TD
></TR
></TABLE
></DIV
diff --git a/doc/fontconfig-devel/fcdircachedeleteuuid.html b/doc/fontconfig-devel/fcdircachedeleteuuid.html
new file mode 100644
index 00000000..59a1758a
--- /dev/null
+++ b/doc/fontconfig-devel/fcdircachedeleteuuid.html
@@ -0,0 +1,214 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>FcDirCacheDeleteUUID</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+HREF="t1.html"><LINK
+REL="UP"
+TITLE="FcCache routines"
+HREF="x103.html#AEN4617"><LINK
+REL="PREVIOUS"
+TITLE="FcDirCacheCreateUUID"
+HREF="fcdircachecreateuuid.html"></HEAD
+><BODY
+CLASS="REFENTRY"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="fcdircachecreateuuid.html"
+ACCESSKEY="P"
+>&#60;&#60;&#60; Previous</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+>&nbsp;</TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><H1
+><A
+NAME="FCDIRCACHEDELETEUUID"
+></A
+>FcDirCacheDeleteUUID</H1
+><DIV
+CLASS="REFNAMEDIV"
+><A
+NAME="AEN4806"
+></A
+><H2
+>Name</H2
+>FcDirCacheDeleteUUID&nbsp;--&nbsp;Delete .uuid file</DIV
+><DIV
+CLASS="REFSYNOPSISDIV"
+><A
+NAME="AEN4809"
+></A
+><H2
+>Synopsis</H2
+><DIV
+CLASS="FUNCSYNOPSIS"
+><P
+></P
+><A
+NAME="AEN4810"
+></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="FUNCSYNOPSISINFO"
+>#include &#60;fontconfig/fontconfig.h&#62;
+ </PRE
+></TD
+></TR
+></TABLE
+><P
+><CODE
+><CODE
+CLASS="FUNCDEF"
+>FcBool <TT
+CLASS="FUNCTION"
+>FcDirCacheDeleteUUID</TT
+></CODE
+>(const FcChar8 *<TT
+CLASS="PARAMETER"
+><I
+>dir</I
+></TT
+>, FcConfig *<TT
+CLASS="PARAMETER"
+><I
+>config</I
+></TT
+>);</CODE
+></P
+><P
+></P
+></DIV
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN4819"
+></A
+><H2
+>Description</H2
+><P
+>This is to delete .uuid file containing an UUID at a font directory of
+<TT
+CLASS="PARAMETER"
+><I
+>dir</I
+></TT
+>.
+ </P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN4823"
+></A
+><H2
+>Since</H2
+><P
+>version 2.13.1</P
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="fcdircachecreateuuid.html"
+ACCESSKEY="P"
+>&#60;&#60;&#60; Previous</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="t1.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>&nbsp;</TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>FcDirCacheCreateUUID</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="x103.html#AEN4617"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>&nbsp;</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+> \ No newline at end of file
diff --git a/doc/fontconfig-devel/fcdircacheload.html b/doc/fontconfig-devel/fcdircacheload.html
index 9af0d0e4..dae74d78 100644
--- a/doc/fontconfig-devel/fcdircacheload.html
+++ b/doc/fontconfig-devel/fcdircacheload.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="File and Directory routines"
-HREF="x103.html#AEN4089"><LINK
+HREF="x103.html#AEN4339"><LINK
REL="PREVIOUS"
TITLE="FcDirCacheValid"
HREF="fcdircachevalid.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCDIRCACHELOAD"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4254"
+NAME="AEN4504"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN4254"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4257"
+NAME="AEN4507"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4258"
+NAME="AEN4508"
></A
><TABLE
BORDER="0"
@@ -139,7 +139,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4269"
+NAME="AEN4519"
></A
><H2
>Description</H2
@@ -210,7 +210,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4089"
+HREF="x103.html#AEN4339"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcdircacheloadfile.html b/doc/fontconfig-devel/fcdircacheloadfile.html
index ec38e717..041d7c05 100644
--- a/doc/fontconfig-devel/fcdircacheloadfile.html
+++ b/doc/fontconfig-devel/fcdircacheloadfile.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="File and Directory routines"
-HREF="x103.html#AEN4089"><LINK
+HREF="x103.html#AEN4339"><LINK
REL="PREVIOUS"
TITLE="FcDirCacheRead"
HREF="fcdircacheread.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCDIRCACHELOADFILE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4329"
+NAME="AEN4579"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN4329"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4332"
+NAME="AEN4582"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4333"
+NAME="AEN4583"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4342"
+NAME="AEN4592"
></A
><H2
>Description</H2
@@ -204,7 +204,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4089"
+HREF="x103.html#AEN4339"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcdircacheread.html b/doc/fontconfig-devel/fcdircacheread.html
index 8c2b85b8..eb585767 100644
--- a/doc/fontconfig-devel/fcdircacheread.html
+++ b/doc/fontconfig-devel/fcdircacheread.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="File and Directory routines"
-HREF="x103.html#AEN4089"><LINK
+HREF="x103.html#AEN4339"><LINK
REL="PREVIOUS"
TITLE="FcDirCacheRescan"
HREF="fcdircacherescan.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCDIRCACHEREAD"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4304"
+NAME="AEN4554"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN4304"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4307"
+NAME="AEN4557"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4308"
+NAME="AEN4558"
></A
><TABLE
BORDER="0"
@@ -139,7 +139,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4319"
+NAME="AEN4569"
></A
><H2
>Description</H2
@@ -210,7 +210,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4089"
+HREF="x103.html#AEN4339"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcdircacherescan.html b/doc/fontconfig-devel/fcdircacherescan.html
index 0b4b45f7..a43373a0 100644
--- a/doc/fontconfig-devel/fcdircacherescan.html
+++ b/doc/fontconfig-devel/fcdircacherescan.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="File and Directory routines"
-HREF="x103.html#AEN4089"><LINK
+HREF="x103.html#AEN4339"><LINK
REL="PREVIOUS"
TITLE="FcDirCacheLoad"
HREF="fcdircacheload.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCDIRCACHERESCAN"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4279"
+NAME="AEN4529"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN4279"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4282"
+NAME="AEN4532"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4283"
+NAME="AEN4533"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4292"
+NAME="AEN4542"
></A
><H2
>Description</H2
@@ -151,7 +151,7 @@ returns NULL if failed.
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4296"
+NAME="AEN4546"
></A
><H2
>Since</H2
@@ -208,7 +208,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4089"
+HREF="x103.html#AEN4339"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcdircacheunlink.html b/doc/fontconfig-devel/fcdircacheunlink.html
index 44294931..049a8879 100644
--- a/doc/fontconfig-devel/fcdircacheunlink.html
+++ b/doc/fontconfig-devel/fcdircacheunlink.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="File and Directory routines"
-HREF="x103.html#AEN4089"><LINK
+HREF="x103.html#AEN4339"><LINK
REL="PREVIOUS"
TITLE="FcDirSave"
HREF="fcdirsave.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCDIRCACHEUNLINK"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4210"
+NAME="AEN4460"
></A
><H2
>Name</H2
@@ -88,7 +88,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4214"
+NAME="AEN4464"
></A
><H2
>Synopsis</H2
@@ -97,7 +97,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4215"
+NAME="AEN4465"
></A
><TABLE
BORDER="0"
@@ -139,7 +139,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4224"
+NAME="AEN4474"
></A
><H2
>Description</H2
@@ -210,7 +210,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4089"
+HREF="x103.html#AEN4339"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcdircacheunload.html b/doc/fontconfig-devel/fcdircacheunload.html
index 9a785812..e0869fa6 100644
--- a/doc/fontconfig-devel/fcdircacheunload.html
+++ b/doc/fontconfig-devel/fcdircacheunload.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="File and Directory routines"
-HREF="x103.html#AEN4089"><LINK
+HREF="x103.html#AEN4339"><LINK
REL="PREVIOUS"
TITLE="FcDirCacheLoadFile"
HREF="fcdircacheloadfile.html"></HEAD
@@ -68,7 +68,7 @@ NAME="FCDIRCACHEUNLOAD"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4352"
+NAME="AEN4602"
></A
><H2
>Name</H2
@@ -76,7 +76,7 @@ NAME="AEN4352"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4355"
+NAME="AEN4605"
></A
><H2
>Synopsis</H2
@@ -85,7 +85,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4356"
+NAME="AEN4606"
></A
><TABLE
BORDER="0"
@@ -122,7 +122,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4363"
+NAME="AEN4613"
></A
><H2
>Description</H2
@@ -182,7 +182,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4089"
+HREF="x103.html#AEN4339"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcdircachevalid.html b/doc/fontconfig-devel/fcdircachevalid.html
index 0d3fac1d..bccd5953 100644
--- a/doc/fontconfig-devel/fcdircachevalid.html
+++ b/doc/fontconfig-devel/fcdircachevalid.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="File and Directory routines"
-HREF="x103.html#AEN4089"><LINK
+HREF="x103.html#AEN4339"><LINK
REL="PREVIOUS"
TITLE="FcDirCacheUnlink"
HREF="fcdircacheunlink.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCDIRCACHEVALID"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4234"
+NAME="AEN4484"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN4234"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4237"
+NAME="AEN4487"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4238"
+NAME="AEN4488"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4245"
+NAME="AEN4495"
></A
><H2
>Description</H2
@@ -193,7 +193,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4089"
+HREF="x103.html#AEN4339"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcdirsave.html b/doc/fontconfig-devel/fcdirsave.html
index fdeffa93..8bd923ab 100644
--- a/doc/fontconfig-devel/fcdirsave.html
+++ b/doc/fontconfig-devel/fcdirsave.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="File and Directory routines"
-HREF="x103.html#AEN4089"><LINK
+HREF="x103.html#AEN4339"><LINK
REL="PREVIOUS"
TITLE="FcDirScan"
HREF="fcdirscan.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCDIRSAVE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4184"
+NAME="AEN4434"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN4184"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4187"
+NAME="AEN4437"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4188"
+NAME="AEN4438"
></A
><TABLE
BORDER="0"
@@ -139,7 +139,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4199"
+NAME="AEN4449"
></A
><H2
>Description</H2
@@ -216,7 +216,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4089"
+HREF="x103.html#AEN4339"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcdirscan.html b/doc/fontconfig-devel/fcdirscan.html
index 73576254..9f101846 100644
--- a/doc/fontconfig-devel/fcdirscan.html
+++ b/doc/fontconfig-devel/fcdirscan.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="File and Directory routines"
-HREF="x103.html#AEN4089"><LINK
+HREF="x103.html#AEN4339"><LINK
REL="PREVIOUS"
TITLE="FcFileIsDir"
HREF="fcfileisdir.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCDIRSCAN"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4151"
+NAME="AEN4401"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN4151"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4154"
+NAME="AEN4404"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4155"
+NAME="AEN4405"
></A
><TABLE
BORDER="0"
@@ -154,7 +154,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4172"
+NAME="AEN4422"
></A
><H2
>Description</H2
@@ -237,7 +237,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4089"
+HREF="x103.html#AEN4339"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcfileisdir.html b/doc/fontconfig-devel/fcfileisdir.html
index b70a6a7f..93427e8f 100644
--- a/doc/fontconfig-devel/fcfileisdir.html
+++ b/doc/fontconfig-devel/fcfileisdir.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="File and Directory routines"
-HREF="x103.html#AEN4089"><LINK
+HREF="x103.html#AEN4339"><LINK
REL="PREVIOUS"
TITLE="FcFileScan"
HREF="fcfilescan.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCFILEISDIR"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4131"
+NAME="AEN4381"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN4131"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4134"
+NAME="AEN4384"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4135"
+NAME="AEN4385"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4142"
+NAME="AEN4392"
></A
><H2
>Description</H2
@@ -193,7 +193,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4089"
+HREF="x103.html#AEN4339"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcfilescan.html b/doc/fontconfig-devel/fcfilescan.html
index 2f184323..2b3cf05d 100644
--- a/doc/fontconfig-devel/fcfilescan.html
+++ b/doc/fontconfig-devel/fcfilescan.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="File and Directory routines"
-HREF="x103.html#AEN4089"><LINK
+HREF="x103.html#AEN4339"><LINK
REL="PREVIOUS"
TITLE="FUNCTIONS"
HREF="x103.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCFILESCAN"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4097"
+NAME="AEN4347"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN4097"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4100"
+NAME="AEN4350"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4101"
+NAME="AEN4351"
></A
><TABLE
BORDER="0"
@@ -154,7 +154,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4118"
+NAME="AEN4368"
></A
><H2
>Description</H2
@@ -247,7 +247,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4089"
+HREF="x103.html#AEN4339"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcfontlist.html b/doc/fontconfig-devel/fcfontlist.html
index 85fce299..8385c3b3 100644
--- a/doc/fontconfig-devel/fcfontlist.html
+++ b/doc/fontconfig-devel/fcfontlist.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcFontRenderPrepare"
HREF="fcfontrenderprepare.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCFONTLIST"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3377"
+NAME="AEN3627"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3377"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3380"
+NAME="AEN3630"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3381"
+NAME="AEN3631"
></A
><TABLE
BORDER="0"
@@ -139,7 +139,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3392"
+NAME="AEN3642"
></A
><H2
>Description</H2
@@ -215,7 +215,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcfontmatch.html b/doc/fontconfig-devel/fcfontmatch.html
index 2ac6096e..8357d517 100644
--- a/doc/fontconfig-devel/fcfontmatch.html
+++ b/doc/fontconfig-devel/fcfontmatch.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcConfigSubstitute"
HREF="fcconfigsubstitute.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCFONTMATCH"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3281"
+NAME="AEN3531"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3281"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3284"
+NAME="AEN3534"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3285"
+NAME="AEN3535"
></A
><TABLE
BORDER="0"
@@ -139,7 +139,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3296"
+NAME="AEN3546"
></A
><H2
>Description</H2
@@ -233,7 +233,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcfontrenderprepare.html b/doc/fontconfig-devel/fcfontrenderprepare.html
index d0295970..4ee74d15 100644
--- a/doc/fontconfig-devel/fcfontrenderprepare.html
+++ b/doc/fontconfig-devel/fcfontrenderprepare.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcFontSort"
HREF="fcfontsort.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCFONTRENDERPREPARE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3348"
+NAME="AEN3598"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3348"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3351"
+NAME="AEN3601"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3352"
+NAME="AEN3602"
></A
><TABLE
BORDER="0"
@@ -139,7 +139,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3363"
+NAME="AEN3613"
></A
><H2
>Description</H2
@@ -230,7 +230,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcfontsetadd.html b/doc/fontconfig-devel/fcfontsetadd.html
index ed01d687..55e14efa 100644
--- a/doc/fontconfig-devel/fcfontsetadd.html
+++ b/doc/fontconfig-devel/fcfontsetadd.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcFontSet"
-HREF="x103.html#AEN1066"><LINK
+HREF="x103.html#AEN1316"><LINK
REL="PREVIOUS"
TITLE="FcFontSetDestroy"
HREF="fcfontsetdestroy.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCFONTSETADD"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1112"
+NAME="AEN1362"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1112"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1115"
+NAME="AEN1365"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1116"
+NAME="AEN1366"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1125"
+NAME="AEN1375"
></A
><H2
>Description</H2
@@ -194,7 +194,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1066"
+HREF="x103.html#AEN1316"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcfontsetcreate.html b/doc/fontconfig-devel/fcfontsetcreate.html
index ad9af787..c09cb904 100644
--- a/doc/fontconfig-devel/fcfontsetcreate.html
+++ b/doc/fontconfig-devel/fcfontsetcreate.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcFontSet"
-HREF="x103.html#AEN1066"><LINK
+HREF="x103.html#AEN1316"><LINK
REL="PREVIOUS"
TITLE="FUNCTIONS"
HREF="x103.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCFONTSETCREATE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1074"
+NAME="AEN1324"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1074"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1077"
+NAME="AEN1327"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1078"
+NAME="AEN1328"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1085"
+NAME="AEN1335"
></A
><H2
>Description</H2
@@ -187,7 +187,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1066"
+HREF="x103.html#AEN1316"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcfontsetdestroy.html b/doc/fontconfig-devel/fcfontsetdestroy.html
index 3462714a..44b8a6c4 100644
--- a/doc/fontconfig-devel/fcfontsetdestroy.html
+++ b/doc/fontconfig-devel/fcfontsetdestroy.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcFontSet"
-HREF="x103.html#AEN1066"><LINK
+HREF="x103.html#AEN1316"><LINK
REL="PREVIOUS"
TITLE="FcFontSetCreate"
HREF="fcfontsetcreate.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCFONTSETDESTROY"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1093"
+NAME="AEN1343"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1093"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1096"
+NAME="AEN1346"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1097"
+NAME="AEN1347"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1104"
+NAME="AEN1354"
></A
><H2
>Description</H2
@@ -188,7 +188,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1066"
+HREF="x103.html#AEN1316"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcfontsetlist.html b/doc/fontconfig-devel/fcfontsetlist.html
index 6dd2dca7..d7379623 100644
--- a/doc/fontconfig-devel/fcfontsetlist.html
+++ b/doc/fontconfig-devel/fcfontsetlist.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcFontSet"
-HREF="x103.html#AEN1066"><LINK
+HREF="x103.html#AEN1316"><LINK
REL="PREVIOUS"
TITLE="FcFontSetAdd"
HREF="fcfontsetadd.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCFONTSETLIST"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1133"
+NAME="AEN1383"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1133"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1136"
+NAME="AEN1386"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1137"
+NAME="AEN1387"
></A
><TABLE
BORDER="0"
@@ -149,7 +149,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1152"
+NAME="AEN1402"
></A
><H2
>Description</H2
@@ -232,7 +232,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1066"
+HREF="x103.html#AEN1316"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcfontsetmatch.html b/doc/fontconfig-devel/fcfontsetmatch.html
index 13c0132e..46efd712 100644
--- a/doc/fontconfig-devel/fcfontsetmatch.html
+++ b/doc/fontconfig-devel/fcfontsetmatch.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcFontSet"
-HREF="x103.html#AEN1066"><LINK
+HREF="x103.html#AEN1316"><LINK
REL="PREVIOUS"
TITLE="FcFontSetList"
HREF="fcfontsetlist.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCFONTSETMATCH"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1164"
+NAME="AEN1414"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1164"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1167"
+NAME="AEN1417"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1168"
+NAME="AEN1418"
></A
><TABLE
BORDER="0"
@@ -149,7 +149,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1183"
+NAME="AEN1433"
></A
><H2
>Description</H2
@@ -244,7 +244,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1066"
+HREF="x103.html#AEN1316"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcfontsetprint.html b/doc/fontconfig-devel/fcfontsetprint.html
index 589c2c84..cef24c83 100644
--- a/doc/fontconfig-devel/fcfontsetprint.html
+++ b/doc/fontconfig-devel/fcfontsetprint.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcFontSet"
-HREF="x103.html#AEN1066"><LINK
+HREF="x103.html#AEN1316"><LINK
REL="PREVIOUS"
TITLE="FcFontSetMatch"
HREF="fcfontsetmatch.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCFONTSETPRINT"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1198"
+NAME="AEN1448"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1198"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1201"
+NAME="AEN1451"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1202"
+NAME="AEN1452"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1209"
+NAME="AEN1459"
></A
><H2
>Description</H2
@@ -195,7 +195,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1066"
+HREF="x103.html#AEN1316"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcfontsetsort.html b/doc/fontconfig-devel/fcfontsetsort.html
index 5d214df2..1187c251 100644
--- a/doc/fontconfig-devel/fcfontsetsort.html
+++ b/doc/fontconfig-devel/fcfontsetsort.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcFontSet"
-HREF="x103.html#AEN1066"><LINK
+HREF="x103.html#AEN1316"><LINK
REL="PREVIOUS"
TITLE="FcFontSetPrint"
HREF="fcfontsetprint.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCFONTSETSORT"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1218"
+NAME="AEN1468"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1218"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1221"
+NAME="AEN1471"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1222"
+NAME="AEN1472"
></A
><TABLE
BORDER="0"
@@ -159,7 +159,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1241"
+NAME="AEN1491"
></A
><H2
>Description</H2
@@ -274,7 +274,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1066"
+HREF="x103.html#AEN1316"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcfontsetsortdestroy.html b/doc/fontconfig-devel/fcfontsetsortdestroy.html
index 4fce7596..b3b0284e 100644
--- a/doc/fontconfig-devel/fcfontsetsortdestroy.html
+++ b/doc/fontconfig-devel/fcfontsetsortdestroy.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcFontSet"
-HREF="x103.html#AEN1066"><LINK
+HREF="x103.html#AEN1316"><LINK
REL="PREVIOUS"
TITLE="FcFontSetSort"
HREF="fcfontsetsort.html"></HEAD
@@ -68,7 +68,7 @@ NAME="FCFONTSETSORTDESTROY"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1259"
+NAME="AEN1509"
></A
><H2
>Name</H2
@@ -76,7 +76,7 @@ NAME="AEN1259"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1262"
+NAME="AEN1512"
></A
><H2
>Synopsis</H2
@@ -85,7 +85,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1263"
+NAME="AEN1513"
></A
><TABLE
BORDER="0"
@@ -122,7 +122,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1270"
+NAME="AEN1520"
></A
><H2
>Description</H2
@@ -193,7 +193,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1066"
+HREF="x103.html#AEN1316"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcfontsort.html b/doc/fontconfig-devel/fcfontsort.html
index b751958c..a8710bad 100644
--- a/doc/fontconfig-devel/fcfontsort.html
+++ b/doc/fontconfig-devel/fcfontsort.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConfig"
-HREF="x103.html#AEN2788"><LINK
+HREF="x103.html#AEN3038"><LINK
REL="PREVIOUS"
TITLE="FcFontMatch"
HREF="fcfontmatch.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCFONTSORT"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3311"
+NAME="AEN3561"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3311"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3314"
+NAME="AEN3564"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3315"
+NAME="AEN3565"
></A
><TABLE
BORDER="0"
@@ -149,7 +149,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3330"
+NAME="AEN3580"
></A
><H2
>Description</H2
@@ -260,7 +260,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2788"
+HREF="x103.html#AEN3038"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcfreetypecharindex.html b/doc/fontconfig-devel/fcfreetypecharindex.html
index 855e0700..33c39cb0 100644
--- a/doc/fontconfig-devel/fcfreetypecharindex.html
+++ b/doc/fontconfig-devel/fcfreetypecharindex.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FreeType specific functions"
-HREF="x103.html#AEN1379"><LINK
+HREF="x103.html#AEN1629"><LINK
REL="PREVIOUS"
TITLE="FUNCTIONS"
HREF="x103.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCFREETYPECHARINDEX"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1387"
+NAME="AEN1637"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1387"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1390"
+NAME="AEN1640"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1391"
+NAME="AEN1641"
></A
><TABLE
BORDER="0"
@@ -135,7 +135,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1400"
+NAME="AEN1650"
></A
><H2
>Description</H2
@@ -197,7 +197,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1379"
+HREF="x103.html#AEN1629"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcfreetypecharset.html b/doc/fontconfig-devel/fcfreetypecharset.html
index d328394f..53a59da3 100644
--- a/doc/fontconfig-devel/fcfreetypecharset.html
+++ b/doc/fontconfig-devel/fcfreetypecharset.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FreeType specific functions"
-HREF="x103.html#AEN1379"><LINK
+HREF="x103.html#AEN1629"><LINK
REL="PREVIOUS"
TITLE="FcFreeTypeCharIndex"
HREF="fcfreetypecharindex.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCFREETYPECHARSET"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1408"
+NAME="AEN1658"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1408"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1411"
+NAME="AEN1661"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1412"
+NAME="AEN1662"
></A
><TABLE
BORDER="0"
@@ -135,7 +135,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1421"
+NAME="AEN1671"
></A
><H2
>Description</H2
@@ -200,7 +200,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1379"
+HREF="x103.html#AEN1629"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcfreetypecharsetandspacing.html b/doc/fontconfig-devel/fcfreetypecharsetandspacing.html
index f633d926..643ac84e 100644
--- a/doc/fontconfig-devel/fcfreetypecharsetandspacing.html
+++ b/doc/fontconfig-devel/fcfreetypecharsetandspacing.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FreeType specific functions"
-HREF="x103.html#AEN1379"><LINK
+HREF="x103.html#AEN1629"><LINK
REL="PREVIOUS"
TITLE="FcFreeTypeCharSet"
HREF="fcfreetypecharset.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCFREETYPECHARSETANDSPACING"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1430"
+NAME="AEN1680"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1430"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1433"
+NAME="AEN1683"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1434"
+NAME="AEN1684"
></A
><TABLE
BORDER="0"
@@ -140,7 +140,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1445"
+NAME="AEN1695"
></A
><H2
>Description</H2
@@ -215,7 +215,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1379"
+HREF="x103.html#AEN1629"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcfreetypequery.html b/doc/fontconfig-devel/fcfreetypequery.html
index d63de7d0..f4683a9c 100644
--- a/doc/fontconfig-devel/fcfreetypequery.html
+++ b/doc/fontconfig-devel/fcfreetypequery.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FreeType specific functions"
-HREF="x103.html#AEN1379"><LINK
+HREF="x103.html#AEN1629"><LINK
REL="PREVIOUS"
TITLE="FcFreeTypeCharSetAndSpacing"
HREF="fcfreetypecharsetandspacing.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCFREETYPEQUERY"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1455"
+NAME="AEN1705"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1455"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1458"
+NAME="AEN1708"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1459"
+NAME="AEN1709"
></A
><TABLE
BORDER="0"
@@ -145,7 +145,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1472"
+NAME="AEN1722"
></A
><H2
>Description</H2
@@ -211,7 +211,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1379"
+HREF="x103.html#AEN1629"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcfreetypequeryall.html b/doc/fontconfig-devel/fcfreetypequeryall.html
index 5930c066..343dd169 100644
--- a/doc/fontconfig-devel/fcfreetypequeryall.html
+++ b/doc/fontconfig-devel/fcfreetypequeryall.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FreeType specific functions"
-HREF="x103.html#AEN1379"><LINK
+HREF="x103.html#AEN1629"><LINK
REL="PREVIOUS"
TITLE="FcFreeTypeQuery"
HREF="fcfreetypequery.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCFREETYPEQUERYALL"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1481"
+NAME="AEN1731"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1481"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1484"
+NAME="AEN1734"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1485"
+NAME="AEN1735"
></A
><TABLE
BORDER="0"
@@ -150,7 +150,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1500"
+NAME="AEN1750"
></A
><H2
>Description</H2
@@ -172,7 +172,7 @@ accepted only for compatibility with older code.
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1504"
+NAME="AEN1754"
></A
><H2
>Since</H2
@@ -229,7 +229,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1379"
+HREF="x103.html#AEN1629"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcfreetypequeryface.html b/doc/fontconfig-devel/fcfreetypequeryface.html
index 7694de82..874960a0 100644
--- a/doc/fontconfig-devel/fcfreetypequeryface.html
+++ b/doc/fontconfig-devel/fcfreetypequeryface.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FreeType specific functions"
-HREF="x103.html#AEN1379"><LINK
+HREF="x103.html#AEN1629"><LINK
REL="PREVIOUS"
TITLE="FcFreeTypeQueryAll"
HREF="fcfreetypequeryall.html"></HEAD
@@ -68,7 +68,7 @@ NAME="FCFREETYPEQUERYFACE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1512"
+NAME="AEN1762"
></A
><H2
>Name</H2
@@ -76,7 +76,7 @@ NAME="AEN1512"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1515"
+NAME="AEN1765"
></A
><H2
>Synopsis</H2
@@ -85,7 +85,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1516"
+NAME="AEN1766"
></A
><TABLE
BORDER="0"
@@ -138,7 +138,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1529"
+NAME="AEN1779"
></A
><H2
>Description</H2
@@ -200,7 +200,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1379"
+HREF="x103.html#AEN1629"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcgetdefaultlangs.html b/doc/fontconfig-devel/fcgetdefaultlangs.html
index 322a71de..580deca4 100644
--- a/doc/fontconfig-devel/fcgetdefaultlangs.html
+++ b/doc/fontconfig-devel/fcgetdefaultlangs.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcLangSet"
-HREF="x103.html#AEN2086"><LINK
+HREF="x103.html#AEN2336"><LINK
REL="PREVIOUS"
TITLE="FcLangSetHasLang"
HREF="fclangsethaslang.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCGETDEFAULTLANGS"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2382"
+NAME="AEN2632"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2382"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2385"
+NAME="AEN2635"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2386"
+NAME="AEN2636"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2393"
+NAME="AEN2643"
></A
><H2
>Description</H2
@@ -142,7 +142,7 @@ If there are no valid values in those environment variables, "en" will be set as
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2396"
+NAME="AEN2646"
></A
><H2
>Since</H2
@@ -199,7 +199,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2086"
+HREF="x103.html#AEN2336"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcgetlangs.html b/doc/fontconfig-devel/fcgetlangs.html
index 99fc4a59..beca8920 100644
--- a/doc/fontconfig-devel/fcgetlangs.html
+++ b/doc/fontconfig-devel/fcgetlangs.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcLangSet"
-HREF="x103.html#AEN2086"><LINK
+HREF="x103.html#AEN2336"><LINK
REL="PREVIOUS"
TITLE="FcLangSetGetLangs"
HREF="fclangsetgetlangs.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCGETLANGS"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2424"
+NAME="AEN2674"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2424"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2427"
+NAME="AEN2677"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2428"
+NAME="AEN2678"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2435"
+NAME="AEN2685"
></A
><H2
>Description</H2
@@ -187,7 +187,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2086"
+HREF="x103.html#AEN2336"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcislower.html b/doc/fontconfig-devel/fcislower.html
index 9c2fe9b0..c912a8a5 100644
--- a/doc/fontconfig-devel/fcislower.html
+++ b/doc/fontconfig-devel/fcislower.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="String utilities"
-HREF="x103.html#AEN4792"><LINK
+HREF="x103.html#AEN5067"><LINK
REL="PREVIOUS"
TITLE="FcUtf16Len"
HREF="fcutf16len.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCISLOWER"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4945"
+NAME="AEN5220"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN4945"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4948"
+NAME="AEN5223"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4949"
+NAME="AEN5224"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4956"
+NAME="AEN5231"
></A
><H2
>Description</H2
@@ -193,7 +193,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4792"
+HREF="x103.html#AEN5067"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcisupper.html b/doc/fontconfig-devel/fcisupper.html
index 20d3fa47..6cfe49e5 100644
--- a/doc/fontconfig-devel/fcisupper.html
+++ b/doc/fontconfig-devel/fcisupper.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="String utilities"
-HREF="x103.html#AEN4792"><LINK
+HREF="x103.html#AEN5067"><LINK
REL="PREVIOUS"
TITLE="FcIsLower"
HREF="fcislower.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCISUPPER"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4965"
+NAME="AEN5240"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN4965"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4968"
+NAME="AEN5243"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4969"
+NAME="AEN5244"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4976"
+NAME="AEN5251"
></A
><H2
>Description</H2
@@ -193,7 +193,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4792"
+HREF="x103.html#AEN5067"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fclanggetcharset.html b/doc/fontconfig-devel/fclanggetcharset.html
index 213991ae..00dac8df 100644
--- a/doc/fontconfig-devel/fclanggetcharset.html
+++ b/doc/fontconfig-devel/fclanggetcharset.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcLangSet"
-HREF="x103.html#AEN2086"><LINK
+HREF="x103.html#AEN2336"><LINK
REL="PREVIOUS"
TITLE="FcLangNormalize"
HREF="fclangnormalize.html"></HEAD
@@ -68,7 +68,7 @@ NAME="FCLANGGETCHARSET"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2466"
+NAME="AEN2716"
></A
><H2
>Name</H2
@@ -76,7 +76,7 @@ NAME="AEN2466"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2469"
+NAME="AEN2719"
></A
><H2
>Synopsis</H2
@@ -85,7 +85,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2470"
+NAME="AEN2720"
></A
><TABLE
BORDER="0"
@@ -122,7 +122,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2477"
+NAME="AEN2727"
></A
><H2
>Description</H2
@@ -176,7 +176,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2086"
+HREF="x103.html#AEN2336"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fclangnormalize.html b/doc/fontconfig-devel/fclangnormalize.html
index 56f39aea..a85dfc67 100644
--- a/doc/fontconfig-devel/fclangnormalize.html
+++ b/doc/fontconfig-devel/fclangnormalize.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcLangSet"
-HREF="x103.html#AEN2086"><LINK
+HREF="x103.html#AEN2336"><LINK
REL="PREVIOUS"
TITLE="FcGetLangs"
HREF="fcgetlangs.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCLANGNORMALIZE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2443"
+NAME="AEN2693"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2443"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2446"
+NAME="AEN2696"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2447"
+NAME="AEN2697"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2454"
+NAME="AEN2704"
></A
><H2
>Description</H2
@@ -145,7 +145,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2458"
+NAME="AEN2708"
></A
><H2
>Since</H2
@@ -202,7 +202,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2086"
+HREF="x103.html#AEN2336"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fclangsetadd.html b/doc/fontconfig-devel/fclangsetadd.html
index 1d342818..7ef62d5e 100644
--- a/doc/fontconfig-devel/fclangsetadd.html
+++ b/doc/fontconfig-devel/fclangsetadd.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcLangSet"
-HREF="x103.html#AEN2086"><LINK
+HREF="x103.html#AEN2336"><LINK
REL="PREVIOUS"
TITLE="FcLangSetCopy"
HREF="fclangsetcopy.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCLANGSETADD"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2155"
+NAME="AEN2405"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2155"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2158"
+NAME="AEN2408"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2159"
+NAME="AEN2409"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2168"
+NAME="AEN2418"
></A
><H2
>Description</H2
@@ -210,7 +210,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2086"
+HREF="x103.html#AEN2336"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fclangsetcompare.html b/doc/fontconfig-devel/fclangsetcompare.html
index e504ba64..13b19d95 100644
--- a/doc/fontconfig-devel/fclangsetcompare.html
+++ b/doc/fontconfig-devel/fclangsetcompare.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcLangSet"
-HREF="x103.html#AEN2086"><LINK
+HREF="x103.html#AEN2336"><LINK
REL="PREVIOUS"
TITLE="FcLangSetSubtract"
HREF="fclangsetsubtract.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCLANGSETCOMPARE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2258"
+NAME="AEN2508"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2258"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2261"
+NAME="AEN2511"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2262"
+NAME="AEN2512"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2271"
+NAME="AEN2521"
></A
><H2
>Description</H2
@@ -210,7 +210,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2086"
+HREF="x103.html#AEN2336"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fclangsetcontains.html b/doc/fontconfig-devel/fclangsetcontains.html
index 201fd0b4..877d85f3 100644
--- a/doc/fontconfig-devel/fclangsetcontains.html
+++ b/doc/fontconfig-devel/fclangsetcontains.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcLangSet"
-HREF="x103.html#AEN2086"><LINK
+HREF="x103.html#AEN2336"><LINK
REL="PREVIOUS"
TITLE="FcLangSetCompare"
HREF="fclangsetcompare.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCLANGSETCONTAINS"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2282"
+NAME="AEN2532"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2282"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2285"
+NAME="AEN2535"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2286"
+NAME="AEN2536"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2295"
+NAME="AEN2545"
></A
><H2
>Description</H2
@@ -230,7 +230,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2086"
+HREF="x103.html#AEN2336"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fclangsetcopy.html b/doc/fontconfig-devel/fclangsetcopy.html
index 9e4e779c..28a8d2b6 100644
--- a/doc/fontconfig-devel/fclangsetcopy.html
+++ b/doc/fontconfig-devel/fclangsetcopy.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcLangSet"
-HREF="x103.html#AEN2086"><LINK
+HREF="x103.html#AEN2336"><LINK
REL="PREVIOUS"
TITLE="FcLangSetDestroy"
HREF="fclangsetdestroy.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCLANGSETCOPY"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2134"
+NAME="AEN2384"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2134"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2137"
+NAME="AEN2387"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2138"
+NAME="AEN2388"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2145"
+NAME="AEN2395"
></A
><H2
>Description</H2
@@ -196,7 +196,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2086"
+HREF="x103.html#AEN2336"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fclangsetcreate.html b/doc/fontconfig-devel/fclangsetcreate.html
index e20d97c3..ea53e59f 100644
--- a/doc/fontconfig-devel/fclangsetcreate.html
+++ b/doc/fontconfig-devel/fclangsetcreate.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcLangSet"
-HREF="x103.html#AEN2086"><LINK
+HREF="x103.html#AEN2336"><LINK
REL="PREVIOUS"
TITLE="FUNCTIONS"
HREF="x103.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCLANGSETCREATE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2094"
+NAME="AEN2344"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2094"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2097"
+NAME="AEN2347"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2098"
+NAME="AEN2348"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2105"
+NAME="AEN2355"
></A
><H2
>Description</H2
@@ -190,7 +190,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2086"
+HREF="x103.html#AEN2336"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fclangsetdel.html b/doc/fontconfig-devel/fclangsetdel.html
index 51c51c02..3c6ebe63 100644
--- a/doc/fontconfig-devel/fclangsetdel.html
+++ b/doc/fontconfig-devel/fclangsetdel.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcLangSet"
-HREF="x103.html#AEN2086"><LINK
+HREF="x103.html#AEN2336"><LINK
REL="PREVIOUS"
TITLE="FcLangSetAdd"
HREF="fclangsetadd.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCLANGSETDEL"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2179"
+NAME="AEN2429"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2179"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2182"
+NAME="AEN2432"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2183"
+NAME="AEN2433"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2192"
+NAME="AEN2442"
></A
><H2
>Description</H2
@@ -163,7 +163,7 @@ two or three letter language from ISO 639 and Tt is a territory from ISO
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2198"
+NAME="AEN2448"
></A
><H2
>Since</H2
@@ -220,7 +220,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2086"
+HREF="x103.html#AEN2336"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fclangsetdestroy.html b/doc/fontconfig-devel/fclangsetdestroy.html
index d180c6a5..94a87cd9 100644
--- a/doc/fontconfig-devel/fclangsetdestroy.html
+++ b/doc/fontconfig-devel/fclangsetdestroy.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcLangSet"
-HREF="x103.html#AEN2086"><LINK
+HREF="x103.html#AEN2336"><LINK
REL="PREVIOUS"
TITLE="FcLangSetCreate"
HREF="fclangsetcreate.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCLANGSETDESTROY"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2114"
+NAME="AEN2364"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2114"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2117"
+NAME="AEN2367"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2118"
+NAME="AEN2368"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2125"
+NAME="AEN2375"
></A
><H2
>Description</H2
@@ -191,7 +191,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2086"
+HREF="x103.html#AEN2336"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fclangsetequal.html b/doc/fontconfig-devel/fclangsetequal.html
index a1ea6005..2e913d8d 100644
--- a/doc/fontconfig-devel/fclangsetequal.html
+++ b/doc/fontconfig-devel/fclangsetequal.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcLangSet"
-HREF="x103.html#AEN2086"><LINK
+HREF="x103.html#AEN2336"><LINK
REL="PREVIOUS"
TITLE="FcLangSetContains"
HREF="fclangsetcontains.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCLANGSETEQUAL"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2310"
+NAME="AEN2560"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2310"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2313"
+NAME="AEN2563"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2314"
+NAME="AEN2564"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2323"
+NAME="AEN2573"
></A
><H2
>Description</H2
@@ -203,7 +203,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2086"
+HREF="x103.html#AEN2336"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fclangsetgetlangs.html b/doc/fontconfig-devel/fclangsetgetlangs.html
index ce4bdc35..daa66f8d 100644
--- a/doc/fontconfig-devel/fclangsetgetlangs.html
+++ b/doc/fontconfig-devel/fclangsetgetlangs.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcLangSet"
-HREF="x103.html#AEN2086"><LINK
+HREF="x103.html#AEN2336"><LINK
REL="PREVIOUS"
TITLE="FcGetDefaultLangs"
HREF="fcgetdefaultlangs.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCLANGSETGETLANGS"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2404"
+NAME="AEN2654"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2404"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2407"
+NAME="AEN2657"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2408"
+NAME="AEN2658"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2415"
+NAME="AEN2665"
></A
><H2
>Description</H2
@@ -192,7 +192,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2086"
+HREF="x103.html#AEN2336"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fclangsethash.html b/doc/fontconfig-devel/fclangsethash.html
index 22e1fa08..d6cc7a44 100644
--- a/doc/fontconfig-devel/fclangsethash.html
+++ b/doc/fontconfig-devel/fclangsethash.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcLangSet"
-HREF="x103.html#AEN2086"><LINK
+HREF="x103.html#AEN2336"><LINK
REL="PREVIOUS"
TITLE="FcLangSetEqual"
HREF="fclangsetequal.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCLANGSETHASH"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2333"
+NAME="AEN2583"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2333"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2336"
+NAME="AEN2586"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2337"
+NAME="AEN2587"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2344"
+NAME="AEN2594"
></A
><H2
>Description</H2
@@ -204,7 +204,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2086"
+HREF="x103.html#AEN2336"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fclangsethaslang.html b/doc/fontconfig-devel/fclangsethaslang.html
index 5ffc178f..7deb294a 100644
--- a/doc/fontconfig-devel/fclangsethaslang.html
+++ b/doc/fontconfig-devel/fclangsethaslang.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcLangSet"
-HREF="x103.html#AEN2086"><LINK
+HREF="x103.html#AEN2336"><LINK
REL="PREVIOUS"
TITLE="FcLangSetHash"
HREF="fclangsethash.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCLANGSETHASLANG"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2355"
+NAME="AEN2605"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2355"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2358"
+NAME="AEN2608"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2359"
+NAME="AEN2609"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2368"
+NAME="AEN2618"
></A
><H2
>Description</H2
@@ -226,7 +226,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2086"
+HREF="x103.html#AEN2336"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fclangsetsubtract.html b/doc/fontconfig-devel/fclangsetsubtract.html
index aa8601c0..b6567e2f 100644
--- a/doc/fontconfig-devel/fclangsetsubtract.html
+++ b/doc/fontconfig-devel/fclangsetsubtract.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcLangSet"
-HREF="x103.html#AEN2086"><LINK
+HREF="x103.html#AEN2336"><LINK
REL="PREVIOUS"
TITLE="FcLangSetUnion"
HREF="fclangsetunion.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCLANGSETSUBTRACT"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2232"
+NAME="AEN2482"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2232"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2235"
+NAME="AEN2485"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2236"
+NAME="AEN2486"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2245"
+NAME="AEN2495"
></A
><H2
>Description</H2
@@ -155,7 +155,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2250"
+NAME="AEN2500"
></A
><H2
>Since</H2
@@ -212,7 +212,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2086"
+HREF="x103.html#AEN2336"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fclangsetunion.html b/doc/fontconfig-devel/fclangsetunion.html
index c508ab5a..d6255c50 100644
--- a/doc/fontconfig-devel/fclangsetunion.html
+++ b/doc/fontconfig-devel/fclangsetunion.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcLangSet"
-HREF="x103.html#AEN2086"><LINK
+HREF="x103.html#AEN2336"><LINK
REL="PREVIOUS"
TITLE="FcLangSetDel"
HREF="fclangsetdel.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCLANGSETUNION"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2206"
+NAME="AEN2456"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2206"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2209"
+NAME="AEN2459"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2210"
+NAME="AEN2460"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2219"
+NAME="AEN2469"
></A
><H2
>Description</H2
@@ -155,7 +155,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2224"
+NAME="AEN2474"
></A
><H2
>Since</H2
@@ -212,7 +212,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2086"
+HREF="x103.html#AEN2336"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcmatrixcopy.html b/doc/fontconfig-devel/fcmatrixcopy.html
index 223c1a3b..14324ba3 100644
--- a/doc/fontconfig-devel/fcmatrixcopy.html
+++ b/doc/fontconfig-devel/fcmatrixcopy.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcMatrix"
-HREF="x103.html#AEN2480"><LINK
+HREF="x103.html#AEN2730"><LINK
REL="PREVIOUS"
TITLE="FcMatrixInit"
HREF="fcmatrixinit.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCMATRIXCOPY"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2509"
+NAME="AEN2759"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2509"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2512"
+NAME="AEN2762"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2513"
+NAME="AEN2763"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2520"
+NAME="AEN2770"
></A
><H2
>Description</H2
@@ -196,7 +196,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2480"
+HREF="x103.html#AEN2730"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcmatrixequal.html b/doc/fontconfig-devel/fcmatrixequal.html
index 81b3ce53..81c76acd 100644
--- a/doc/fontconfig-devel/fcmatrixequal.html
+++ b/doc/fontconfig-devel/fcmatrixequal.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcMatrix"
-HREF="x103.html#AEN2480"><LINK
+HREF="x103.html#AEN2730"><LINK
REL="PREVIOUS"
TITLE="FcMatrixCopy"
HREF="fcmatrixcopy.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCMATRIXEQUAL"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2530"
+NAME="AEN2780"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2530"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2533"
+NAME="AEN2783"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2534"
+NAME="AEN2784"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2543"
+NAME="AEN2793"
></A
><H2
>Description</H2
@@ -207,7 +207,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2480"
+HREF="x103.html#AEN2730"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcmatrixinit.html b/doc/fontconfig-devel/fcmatrixinit.html
index 0e637701..59f1d98b 100644
--- a/doc/fontconfig-devel/fcmatrixinit.html
+++ b/doc/fontconfig-devel/fcmatrixinit.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcMatrix"
-HREF="x103.html#AEN2480"><LINK
+HREF="x103.html#AEN2730"><LINK
REL="PREVIOUS"
TITLE="FUNCTIONS"
HREF="x103.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCMATRIXINIT"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2488"
+NAME="AEN2738"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2488"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2491"
+NAME="AEN2741"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2492"
+NAME="AEN2742"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2499"
+NAME="AEN2749"
></A
><H2
>Description</H2
@@ -196,7 +196,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2480"
+HREF="x103.html#AEN2730"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcmatrixmultiply.html b/doc/fontconfig-devel/fcmatrixmultiply.html
index f9069c9b..02d8fb57 100644
--- a/doc/fontconfig-devel/fcmatrixmultiply.html
+++ b/doc/fontconfig-devel/fcmatrixmultiply.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcMatrix"
-HREF="x103.html#AEN2480"><LINK
+HREF="x103.html#AEN2730"><LINK
REL="PREVIOUS"
TITLE="FcMatrixEqual"
HREF="fcmatrixequal.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCMATRIXMULTIPLY"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2554"
+NAME="AEN2804"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2554"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2557"
+NAME="AEN2807"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2558"
+NAME="AEN2808"
></A
><TABLE
BORDER="0"
@@ -139,7 +139,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2569"
+NAME="AEN2819"
></A
><H2
>Description</H2
@@ -217,7 +217,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2480"
+HREF="x103.html#AEN2730"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcmatrixrotate.html b/doc/fontconfig-devel/fcmatrixrotate.html
index d385f620..39d72d57 100644
--- a/doc/fontconfig-devel/fcmatrixrotate.html
+++ b/doc/fontconfig-devel/fcmatrixrotate.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcMatrix"
-HREF="x103.html#AEN2480"><LINK
+HREF="x103.html#AEN2730"><LINK
REL="PREVIOUS"
TITLE="FcMatrixMultiply"
HREF="fcmatrixmultiply.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCMATRIXROTATE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2581"
+NAME="AEN2831"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2581"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2584"
+NAME="AEN2834"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2585"
+NAME="AEN2835"
></A
><TABLE
BORDER="0"
@@ -139,7 +139,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2596"
+NAME="AEN2846"
></A
><H2
>Description</H2
@@ -232,7 +232,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2480"
+HREF="x103.html#AEN2730"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcmatrixscale.html b/doc/fontconfig-devel/fcmatrixscale.html
index 2cb9e85c..217e958c 100644
--- a/doc/fontconfig-devel/fcmatrixscale.html
+++ b/doc/fontconfig-devel/fcmatrixscale.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcMatrix"
-HREF="x103.html#AEN2480"><LINK
+HREF="x103.html#AEN2730"><LINK
REL="PREVIOUS"
TITLE="FcMatrixRotate"
HREF="fcmatrixrotate.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCMATRIXSCALE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2609"
+NAME="AEN2859"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2609"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2612"
+NAME="AEN2862"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2613"
+NAME="AEN2863"
></A
><TABLE
BORDER="0"
@@ -139,7 +139,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2624"
+NAME="AEN2874"
></A
><H2
>Description</H2
@@ -232,7 +232,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2480"
+HREF="x103.html#AEN2730"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcmatrixshear.html b/doc/fontconfig-devel/fcmatrixshear.html
index 493ee61b..781836da 100644
--- a/doc/fontconfig-devel/fcmatrixshear.html
+++ b/doc/fontconfig-devel/fcmatrixshear.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcMatrix"
-HREF="x103.html#AEN2480"><LINK
+HREF="x103.html#AEN2730"><LINK
REL="PREVIOUS"
TITLE="FcMatrixScale"
HREF="fcmatrixscale.html"></HEAD
@@ -68,7 +68,7 @@ NAME="FCMATRIXSHEAR"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2637"
+NAME="AEN2887"
></A
><H2
>Name</H2
@@ -76,7 +76,7 @@ NAME="AEN2637"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2640"
+NAME="AEN2890"
></A
><H2
>Synopsis</H2
@@ -85,7 +85,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2641"
+NAME="AEN2891"
></A
><TABLE
BORDER="0"
@@ -132,7 +132,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2652"
+NAME="AEN2902"
></A
><H2
>Description</H2
@@ -221,7 +221,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2480"
+HREF="x103.html#AEN2730"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcnameconstant.html b/doc/fontconfig-devel/fcnameconstant.html
index d9c926da..0a1cdfd1 100644
--- a/doc/fontconfig-devel/fcnameconstant.html
+++ b/doc/fontconfig-devel/fcnameconstant.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConstant"
-HREF="x103.html#AEN3658"><LINK
+HREF="x103.html#AEN3908"><LINK
REL="PREVIOUS"
TITLE="FcNameGetConstant"
HREF="fcnamegetconstant.html"></HEAD
@@ -68,7 +68,7 @@ NAME="FCNAMECONSTANT"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3728"
+NAME="AEN3978"
></A
><H2
>Name</H2
@@ -76,7 +76,7 @@ NAME="AEN3728"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3731"
+NAME="AEN3981"
></A
><H2
>Synopsis</H2
@@ -85,7 +85,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3732"
+NAME="AEN3982"
></A
><TABLE
BORDER="0"
@@ -127,7 +127,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3741"
+NAME="AEN3991"
></A
><H2
>Description</H2
@@ -192,7 +192,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN3658"
+HREF="x103.html#AEN3908"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcnamegetconstant.html b/doc/fontconfig-devel/fcnamegetconstant.html
index 4b01da12..0b5784dd 100644
--- a/doc/fontconfig-devel/fcnamegetconstant.html
+++ b/doc/fontconfig-devel/fcnamegetconstant.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConstant"
-HREF="x103.html#AEN3658"><LINK
+HREF="x103.html#AEN3908"><LINK
REL="PREVIOUS"
TITLE="FcNameUnregisterConstants"
HREF="fcnameunregisterconstants.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCNAMEGETCONSTANT"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3708"
+NAME="AEN3958"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3708"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3711"
+NAME="AEN3961"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3712"
+NAME="AEN3962"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3719"
+NAME="AEN3969"
></A
><H2
>Description</H2
@@ -192,7 +192,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN3658"
+HREF="x103.html#AEN3908"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcnamegetobjecttype.html b/doc/fontconfig-devel/fcnamegetobjecttype.html
index 560327bf..e27eb5c8 100644
--- a/doc/fontconfig-devel/fcnamegetobjecttype.html
+++ b/doc/fontconfig-devel/fcnamegetobjecttype.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcObjectType"
-HREF="x103.html#AEN3593"><LINK
+HREF="x103.html#AEN3843"><LINK
REL="PREVIOUS"
TITLE="FcNameUnregisterObjectTypes"
HREF="fcnameunregisterobjecttypes.html"></HEAD
@@ -68,7 +68,7 @@ NAME="FCNAMEGETOBJECTTYPE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3643"
+NAME="AEN3893"
></A
><H2
>Name</H2
@@ -76,7 +76,7 @@ NAME="AEN3643"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3646"
+NAME="AEN3896"
></A
><H2
>Synopsis</H2
@@ -85,7 +85,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3647"
+NAME="AEN3897"
></A
><TABLE
BORDER="0"
@@ -122,7 +122,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3654"
+NAME="AEN3904"
></A
><H2
>Description</H2
@@ -181,7 +181,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN3593"
+HREF="x103.html#AEN3843"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcnameparse.html b/doc/fontconfig-devel/fcnameparse.html
index 5f02c2a7..354a4625 100644
--- a/doc/fontconfig-devel/fcnameparse.html
+++ b/doc/fontconfig-devel/fcnameparse.html
@@ -75,7 +75,7 @@ NAME="FCNAMEPARSE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN901"
+NAME="AEN1151"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN901"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN904"
+NAME="AEN1154"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN905"
+NAME="AEN1155"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN912"
+NAME="AEN1162"
></A
><H2
>Description</H2
diff --git a/doc/fontconfig-devel/fcnameregisterconstants.html b/doc/fontconfig-devel/fcnameregisterconstants.html
index 767371f0..b74f770c 100644
--- a/doc/fontconfig-devel/fcnameregisterconstants.html
+++ b/doc/fontconfig-devel/fcnameregisterconstants.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConstant"
-HREF="x103.html#AEN3658"><LINK
+HREF="x103.html#AEN3908"><LINK
REL="PREVIOUS"
TITLE="FUNCTIONS"
HREF="x103.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCNAMEREGISTERCONSTANTS"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3666"
+NAME="AEN3916"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3666"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3669"
+NAME="AEN3919"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3670"
+NAME="AEN3920"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3679"
+NAME="AEN3929"
></A
><H2
>Description</H2
@@ -192,7 +192,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN3658"
+HREF="x103.html#AEN3908"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcnameregisterobjecttypes.html b/doc/fontconfig-devel/fcnameregisterobjecttypes.html
index fb8ffc1c..c91b03f9 100644
--- a/doc/fontconfig-devel/fcnameregisterobjecttypes.html
+++ b/doc/fontconfig-devel/fcnameregisterobjecttypes.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcObjectType"
-HREF="x103.html#AEN3593"><LINK
+HREF="x103.html#AEN3843"><LINK
REL="PREVIOUS"
TITLE="FUNCTIONS"
HREF="x103.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCNAMEREGISTEROBJECTTYPES"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3601"
+NAME="AEN3851"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3601"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3604"
+NAME="AEN3854"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3605"
+NAME="AEN3855"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3614"
+NAME="AEN3864"
></A
><H2
>Description</H2
@@ -192,7 +192,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN3593"
+HREF="x103.html#AEN3843"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcnameunparse.html b/doc/fontconfig-devel/fcnameunparse.html
index eb78eb3f..85801a02 100644
--- a/doc/fontconfig-devel/fcnameunparse.html
+++ b/doc/fontconfig-devel/fcnameunparse.html
@@ -75,7 +75,7 @@ NAME="FCNAMEUNPARSE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN921"
+NAME="AEN1171"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN921"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN924"
+NAME="AEN1174"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN925"
+NAME="AEN1175"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN932"
+NAME="AEN1182"
></A
><H2
>Description</H2
diff --git a/doc/fontconfig-devel/fcnameunregisterconstants.html b/doc/fontconfig-devel/fcnameunregisterconstants.html
index d47d6fc8..690e59cc 100644
--- a/doc/fontconfig-devel/fcnameunregisterconstants.html
+++ b/doc/fontconfig-devel/fcnameunregisterconstants.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcConstant"
-HREF="x103.html#AEN3658"><LINK
+HREF="x103.html#AEN3908"><LINK
REL="PREVIOUS"
TITLE="FcNameRegisterConstants"
HREF="fcnameregisterconstants.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCNAMEUNREGISTERCONSTANTS"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3687"
+NAME="AEN3937"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3687"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3690"
+NAME="AEN3940"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3691"
+NAME="AEN3941"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3700"
+NAME="AEN3950"
></A
><H2
>Description</H2
@@ -192,7 +192,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN3658"
+HREF="x103.html#AEN3908"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcnameunregisterobjecttypes.html b/doc/fontconfig-devel/fcnameunregisterobjecttypes.html
index 2d07cfc2..1d69b3e9 100644
--- a/doc/fontconfig-devel/fcnameunregisterobjecttypes.html
+++ b/doc/fontconfig-devel/fcnameunregisterobjecttypes.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcObjectType"
-HREF="x103.html#AEN3593"><LINK
+HREF="x103.html#AEN3843"><LINK
REL="PREVIOUS"
TITLE="FcNameRegisterObjectTypes"
HREF="fcnameregisterobjecttypes.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCNAMEUNREGISTEROBJECTTYPES"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3622"
+NAME="AEN3872"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3622"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3625"
+NAME="AEN3875"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3626"
+NAME="AEN3876"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3635"
+NAME="AEN3885"
></A
><H2
>Description</H2
@@ -192,7 +192,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN3593"
+HREF="x103.html#AEN3843"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcobjectsetadd.html b/doc/fontconfig-devel/fcobjectsetadd.html
index 3f6880b5..e317cd17 100644
--- a/doc/fontconfig-devel/fcobjectsetadd.html
+++ b/doc/fontconfig-devel/fcobjectsetadd.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcObjectSet"
-HREF="x103.html#AEN1277"><LINK
+HREF="x103.html#AEN1527"><LINK
REL="PREVIOUS"
TITLE="FcObjectSetCreate"
HREF="fcobjectsetcreate.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCOBJECTSETADD"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1304"
+NAME="AEN1554"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1304"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1307"
+NAME="AEN1557"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1308"
+NAME="AEN1558"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1317"
+NAME="AEN1567"
></A
><H2
>Description</H2
@@ -193,7 +193,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1277"
+HREF="x103.html#AEN1527"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcobjectsetbuild.html b/doc/fontconfig-devel/fcobjectsetbuild.html
index b03432af..fa1835fb 100644
--- a/doc/fontconfig-devel/fcobjectsetbuild.html
+++ b/doc/fontconfig-devel/fcobjectsetbuild.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcObjectSet"
-HREF="x103.html#AEN1277"><LINK
+HREF="x103.html#AEN1527"><LINK
REL="PREVIOUS"
TITLE="FcObjectSetDestroy"
HREF="fcobjectsetdestroy.html"></HEAD
@@ -68,7 +68,7 @@ NAME="FCOBJECTSETBUILD"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1344"
+NAME="AEN1594"
></A
><H2
>Name</H2
@@ -76,7 +76,7 @@ NAME="AEN1344"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1349"
+NAME="AEN1599"
></A
><H2
>Synopsis</H2
@@ -85,7 +85,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1350"
+NAME="AEN1600"
></A
><TABLE
BORDER="0"
@@ -172,7 +172,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1375"
+NAME="AEN1625"
></A
><H2
>Description</H2
@@ -233,7 +233,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1277"
+HREF="x103.html#AEN1527"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcobjectsetcreate.html b/doc/fontconfig-devel/fcobjectsetcreate.html
index d9579ef3..93792b6b 100644
--- a/doc/fontconfig-devel/fcobjectsetcreate.html
+++ b/doc/fontconfig-devel/fcobjectsetcreate.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcObjectSet"
-HREF="x103.html#AEN1277"><LINK
+HREF="x103.html#AEN1527"><LINK
REL="PREVIOUS"
TITLE="FUNCTIONS"
HREF="x103.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCOBJECTSETCREATE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1285"
+NAME="AEN1535"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1285"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1288"
+NAME="AEN1538"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1289"
+NAME="AEN1539"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1296"
+NAME="AEN1546"
></A
><H2
>Description</H2
@@ -187,7 +187,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1277"
+HREF="x103.html#AEN1527"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcobjectsetdestroy.html b/doc/fontconfig-devel/fcobjectsetdestroy.html
index ab73493c..95071981 100644
--- a/doc/fontconfig-devel/fcobjectsetdestroy.html
+++ b/doc/fontconfig-devel/fcobjectsetdestroy.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcObjectSet"
-HREF="x103.html#AEN1277"><LINK
+HREF="x103.html#AEN1527"><LINK
REL="PREVIOUS"
TITLE="FcObjectSetAdd"
HREF="fcobjectsetadd.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCOBJECTSETDESTROY"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1325"
+NAME="AEN1575"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1325"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1328"
+NAME="AEN1578"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1329"
+NAME="AEN1579"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1336"
+NAME="AEN1586"
></A
><H2
>Description</H2
@@ -187,7 +187,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1277"
+HREF="x103.html#AEN1527"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcpatternadd-type.html b/doc/fontconfig-devel/fcpatternadd-type.html
index 59f0f11e..f243a69b 100644
--- a/doc/fontconfig-devel/fcpatternadd-type.html
+++ b/doc/fontconfig-devel/fcpatternadd-type.html
@@ -75,7 +75,7 @@ NAME="FCPATTERNADD-TYPE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN474"
+NAME="AEN497"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN474"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN485"
+NAME="AEN508"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN486"
+NAME="AEN509"
></A
><TABLE
BORDER="0"
@@ -339,7 +339,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN569"
+NAME="AEN592"
></A
><H2
>Description</H2
diff --git a/doc/fontconfig-devel/fcpatternadd.html b/doc/fontconfig-devel/fcpatternadd.html
index 62ca7d7b..969330da 100644
--- a/doc/fontconfig-devel/fcpatternadd.html
+++ b/doc/fontconfig-devel/fcpatternadd.html
@@ -75,7 +75,7 @@ NAME="FCPATTERNADD"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN421"
+NAME="AEN444"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN421"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN424"
+NAME="AEN447"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN425"
+NAME="AEN448"
></A
><TABLE
BORDER="0"
@@ -144,7 +144,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN438"
+NAME="AEN461"
></A
><H2
>Description</H2
diff --git a/doc/fontconfig-devel/fcpatternaddweak.html b/doc/fontconfig-devel/fcpatternaddweak.html
index 58090d5b..0c5fac56 100644
--- a/doc/fontconfig-devel/fcpatternaddweak.html
+++ b/doc/fontconfig-devel/fcpatternaddweak.html
@@ -75,7 +75,7 @@ NAME="FCPATTERNADDWEAK"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN447"
+NAME="AEN470"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN447"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN450"
+NAME="AEN473"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN451"
+NAME="AEN474"
></A
><TABLE
BORDER="0"
@@ -144,7 +144,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN464"
+NAME="AEN487"
></A
><H2
>Description</H2
diff --git a/doc/fontconfig-devel/fcpatternbuild.html b/doc/fontconfig-devel/fcpatternbuild.html
index 207a7b5d..5262f2c9 100644
--- a/doc/fontconfig-devel/fcpatternbuild.html
+++ b/doc/fontconfig-devel/fcpatternbuild.html
@@ -75,7 +75,7 @@ NAME="FCPATTERNBUILD"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN762"
+NAME="AEN785"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN762"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN767"
+NAME="AEN790"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN768"
+NAME="AEN791"
></A
><TABLE
BORDER="0"
@@ -179,7 +179,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN793"
+NAME="AEN816"
></A
><H2
>Description</H2
diff --git a/doc/fontconfig-devel/fcpatterndel.html b/doc/fontconfig-devel/fcpatterndel.html
index 0d9df3c8..1b933441 100644
--- a/doc/fontconfig-devel/fcpatterndel.html
+++ b/doc/fontconfig-devel/fcpatterndel.html
@@ -75,7 +75,7 @@ NAME="FCPATTERNDEL"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN812"
+NAME="AEN835"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN812"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN815"
+NAME="AEN838"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN816"
+NAME="AEN839"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN825"
+NAME="AEN848"
></A
><H2
>Description</H2
diff --git a/doc/fontconfig-devel/fcpatterndestroy.html b/doc/fontconfig-devel/fcpatterndestroy.html
index d6127e82..90f8c796 100644
--- a/doc/fontconfig-devel/fcpatterndestroy.html
+++ b/doc/fontconfig-devel/fcpatterndestroy.html
@@ -15,8 +15,8 @@ REL="PREVIOUS"
TITLE="FcPatternReference"
HREF="fcpatternreference.html"><LINK
REL="NEXT"
-TITLE="FcPatternEqual"
-HREF="fcpatternequal.html"></HEAD
+TITLE="FcPatternObjectCount"
+HREF="fcpatternobjectcount.html"></HEAD
><BODY
CLASS="REFENTRY"
BGCOLOR="#FFFFFF"
@@ -58,7 +58,7 @@ WIDTH="10%"
ALIGN="right"
VALIGN="bottom"
><A
-HREF="fcpatternequal.html"
+HREF="fcpatternobjectcount.html"
ACCESSKEY="N"
>Next &#62;&#62;&#62;</A
></TD
@@ -172,7 +172,7 @@ WIDTH="33%"
ALIGN="right"
VALIGN="top"
><A
-HREF="fcpatternequal.html"
+HREF="fcpatternobjectcount.html"
ACCESSKEY="N"
>Next &#62;&#62;&#62;</A
></TD
@@ -196,7 +196,7 @@ ACCESSKEY="U"
WIDTH="33%"
ALIGN="right"
VALIGN="top"
->FcPatternEqual</TD
+>FcPatternObjectCount</TD
></TR
></TABLE
></DIV
diff --git a/doc/fontconfig-devel/fcpatternequal.html b/doc/fontconfig-devel/fcpatternequal.html
index ab944e1e..ab0163ab 100644
--- a/doc/fontconfig-devel/fcpatternequal.html
+++ b/doc/fontconfig-devel/fcpatternequal.html
@@ -12,8 +12,8 @@ REL="UP"
TITLE="FcPattern"
HREF="x103.html#AEN242"><LINK
REL="PREVIOUS"
-TITLE="FcPatternDestroy"
-HREF="fcpatterndestroy.html"><LINK
+TITLE="FcPatternObjectCount"
+HREF="fcpatternobjectcount.html"><LINK
REL="NEXT"
TITLE="FcPatternEqualSubset"
HREF="fcpatternequalsubset.html"></HEAD
@@ -44,7 +44,7 @@ WIDTH="10%"
ALIGN="left"
VALIGN="bottom"
><A
-HREF="fcpatterndestroy.html"
+HREF="fcpatternobjectcount.html"
ACCESSKEY="P"
>&#60;&#60;&#60; Previous</A
></TD
@@ -75,7 +75,7 @@ NAME="FCPATTERNEQUAL"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN328"
+NAME="AEN351"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN328"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN331"
+NAME="AEN354"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN332"
+NAME="AEN355"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN341"
+NAME="AEN364"
></A
><H2
>Description</H2
@@ -168,7 +168,7 @@ WIDTH="33%"
ALIGN="left"
VALIGN="top"
><A
-HREF="fcpatterndestroy.html"
+HREF="fcpatternobjectcount.html"
ACCESSKEY="P"
>&#60;&#60;&#60; Previous</A
></TD
@@ -196,7 +196,7 @@ ACCESSKEY="N"
WIDTH="33%"
ALIGN="left"
VALIGN="top"
->FcPatternDestroy</TD
+>FcPatternObjectCount</TD
><TD
WIDTH="34%"
ALIGN="center"
diff --git a/doc/fontconfig-devel/fcpatternequalsubset.html b/doc/fontconfig-devel/fcpatternequalsubset.html
index 8009ef2a..4b5fb5d4 100644
--- a/doc/fontconfig-devel/fcpatternequalsubset.html
+++ b/doc/fontconfig-devel/fcpatternequalsubset.html
@@ -75,7 +75,7 @@ NAME="FCPATTERNEQUALSUBSET"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN351"
+NAME="AEN374"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN351"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN354"
+NAME="AEN377"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN355"
+NAME="AEN378"
></A
><TABLE
BORDER="0"
@@ -139,7 +139,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN366"
+NAME="AEN389"
></A
><H2
>Description</H2
diff --git a/doc/fontconfig-devel/fcpatternfilter.html b/doc/fontconfig-devel/fcpatternfilter.html
index 0f212e73..7a71c605 100644
--- a/doc/fontconfig-devel/fcpatternfilter.html
+++ b/doc/fontconfig-devel/fcpatternfilter.html
@@ -75,7 +75,7 @@ NAME="FCPATTERNFILTER"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN377"
+NAME="AEN400"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN377"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN380"
+NAME="AEN403"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN381"
+NAME="AEN404"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN390"
+NAME="AEN413"
></A
><H2
>Description</H2
diff --git a/doc/fontconfig-devel/fcpatternfinditer.html b/doc/fontconfig-devel/fcpatternfinditer.html
new file mode 100644
index 00000000..bf65dded
--- /dev/null
+++ b/doc/fontconfig-devel/fcpatternfinditer.html
@@ -0,0 +1,240 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>FcPatternFindIter</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+HREF="t1.html"><LINK
+REL="UP"
+TITLE="FcPattern"
+HREF="x103.html#AEN242"><LINK
+REL="PREVIOUS"
+TITLE="FcPatternIterEqual"
+HREF="fcpatterniterequal.html"><LINK
+REL="NEXT"
+TITLE="FcPatternIterIsValid"
+HREF="fcpatterniterisvalid.html"></HEAD
+><BODY
+CLASS="REFENTRY"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="fcpatterniterequal.html"
+ACCESSKEY="P"
+>&#60;&#60;&#60; Previous</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="fcpatterniterisvalid.html"
+ACCESSKEY="N"
+>Next &#62;&#62;&#62;</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><H1
+><A
+NAME="FCPATTERNFINDITER"
+></A
+>FcPatternFindIter</H1
+><DIV
+CLASS="REFNAMEDIV"
+><A
+NAME="AEN964"
+></A
+><H2
+>Name</H2
+>FcPatternFindIter&nbsp;--&nbsp;Set the iterator to point to the object in the pattern</DIV
+><DIV
+CLASS="REFSYNOPSISDIV"
+><A
+NAME="AEN967"
+></A
+><H2
+>Synopsis</H2
+><DIV
+CLASS="FUNCSYNOPSIS"
+><P
+></P
+><A
+NAME="AEN968"
+></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="FUNCSYNOPSISINFO"
+>#include &#60;fontconfig/fontconfig.h&#62;
+ </PRE
+></TD
+></TR
+></TABLE
+><P
+><CODE
+><CODE
+CLASS="FUNCDEF"
+>FcBool <TT
+CLASS="FUNCTION"
+>FcPatternFindIter</TT
+></CODE
+>(const FcPattern *<TT
+CLASS="PARAMETER"
+><I
+>p</I
+></TT
+>, FcPatternIter *<TT
+CLASS="PARAMETER"
+><I
+>iter</I
+></TT
+>, const char *<TT
+CLASS="PARAMETER"
+><I
+>object</I
+></TT
+>);</CODE
+></P
+><P
+></P
+></DIV
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN979"
+></A
+><H2
+>Description</H2
+><P
+>Set <TT
+CLASS="PARAMETER"
+><I
+>iter</I
+></TT
+> to point to <TT
+CLASS="PARAMETER"
+><I
+>object</I
+></TT
+> in
+<TT
+CLASS="PARAMETER"
+><I
+>p</I
+></TT
+> if any and returns FcTrue. returns FcFalse otherwise.
+ </P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN985"
+></A
+><H2
+>Since</H2
+><P
+>version 2.13.1</P
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="fcpatterniterequal.html"
+ACCESSKEY="P"
+>&#60;&#60;&#60; Previous</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="t1.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="fcpatterniterisvalid.html"
+ACCESSKEY="N"
+>Next &#62;&#62;&#62;</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>FcPatternIterEqual</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="x103.html#AEN242"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>FcPatternIterIsValid</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+> \ No newline at end of file
diff --git a/doc/fontconfig-devel/fcpatternformat.html b/doc/fontconfig-devel/fcpatternformat.html
index 2632be58..4e397a14 100644
--- a/doc/fontconfig-devel/fcpatternformat.html
+++ b/doc/fontconfig-devel/fcpatternformat.html
@@ -68,7 +68,7 @@ NAME="FCPATTERNFORMAT"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN940"
+NAME="AEN1190"
></A
><H2
>Name</H2
@@ -76,7 +76,7 @@ NAME="AEN940"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN943"
+NAME="AEN1193"
></A
><H2
>Synopsis</H2
@@ -85,7 +85,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN944"
+NAME="AEN1194"
></A
><TABLE
BORDER="0"
@@ -127,7 +127,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN953"
+NAME="AEN1203"
></A
><H2
>Description</H2
@@ -537,7 +537,7 @@ lower-cased and with spaces removed.
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1063"
+NAME="AEN1313"
></A
><H2
>Since</H2
diff --git a/doc/fontconfig-devel/fcpatternget-type.html b/doc/fontconfig-devel/fcpatternget-type.html
index 353bf003..9ffb7691 100644
--- a/doc/fontconfig-devel/fcpatternget-type.html
+++ b/doc/fontconfig-devel/fcpatternget-type.html
@@ -75,7 +75,7 @@ NAME="FCPATTERNGET-TYPE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN640"
+NAME="AEN663"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN640"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN651"
+NAME="AEN674"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN652"
+NAME="AEN675"
></A
><TABLE
BORDER="0"
@@ -384,7 +384,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN753"
+NAME="AEN776"
></A
><H2
>Description</H2
diff --git a/doc/fontconfig-devel/fcpatternget.html b/doc/fontconfig-devel/fcpatternget.html
index f1191eee..fb316737 100644
--- a/doc/fontconfig-devel/fcpatternget.html
+++ b/doc/fontconfig-devel/fcpatternget.html
@@ -75,7 +75,7 @@ NAME="FCPATTERNGET"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN612"
+NAME="AEN635"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN612"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN615"
+NAME="AEN638"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN616"
+NAME="AEN639"
></A
><TABLE
BORDER="0"
@@ -144,7 +144,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN629"
+NAME="AEN652"
></A
><H2
>Description</H2
diff --git a/doc/fontconfig-devel/fcpatterngetwithbinding.html b/doc/fontconfig-devel/fcpatterngetwithbinding.html
index 75ac0ae0..3e1da11c 100644
--- a/doc/fontconfig-devel/fcpatterngetwithbinding.html
+++ b/doc/fontconfig-devel/fcpatterngetwithbinding.html
@@ -75,7 +75,7 @@ NAME="FCPATTERNGETWITHBINDING"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN578"
+NAME="AEN601"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN578"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN581"
+NAME="AEN604"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN582"
+NAME="AEN605"
></A
><TABLE
BORDER="0"
@@ -149,7 +149,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN597"
+NAME="AEN620"
></A
><H2
>Description</H2
@@ -184,7 +184,7 @@ within the pattern directly. Applications must not free this value.
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN604"
+NAME="AEN627"
></A
><H2
>Since</H2
diff --git a/doc/fontconfig-devel/fcpatternhash.html b/doc/fontconfig-devel/fcpatternhash.html
index 42219b80..54e575f9 100644
--- a/doc/fontconfig-devel/fcpatternhash.html
+++ b/doc/fontconfig-devel/fcpatternhash.html
@@ -75,7 +75,7 @@ NAME="FCPATTERNHASH"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN402"
+NAME="AEN425"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN402"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN405"
+NAME="AEN428"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN406"
+NAME="AEN429"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN413"
+NAME="AEN436"
></A
><H2
>Description</H2
diff --git a/doc/fontconfig-devel/fcpatterniterequal.html b/doc/fontconfig-devel/fcpatterniterequal.html
new file mode 100644
index 00000000..2e0afd2e
--- /dev/null
+++ b/doc/fontconfig-devel/fcpatterniterequal.html
@@ -0,0 +1,240 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>FcPatternIterEqual</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+HREF="t1.html"><LINK
+REL="UP"
+TITLE="FcPattern"
+HREF="x103.html#AEN242"><LINK
+REL="PREVIOUS"
+TITLE="FcPatternIterNext"
+HREF="fcpatterniternext.html"><LINK
+REL="NEXT"
+TITLE="FcPatternFindIter"
+HREF="fcpatternfinditer.html"></HEAD
+><BODY
+CLASS="REFENTRY"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="fcpatterniternext.html"
+ACCESSKEY="P"
+>&#60;&#60;&#60; Previous</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="fcpatternfinditer.html"
+ACCESSKEY="N"
+>Next &#62;&#62;&#62;</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><H1
+><A
+NAME="FCPATTERNITEREQUAL"
+></A
+>FcPatternIterEqual</H1
+><DIV
+CLASS="REFNAMEDIV"
+><A
+NAME="AEN934"
+></A
+><H2
+>Name</H2
+>FcPatternIterEqual&nbsp;--&nbsp;Compare iterators</DIV
+><DIV
+CLASS="REFSYNOPSISDIV"
+><A
+NAME="AEN937"
+></A
+><H2
+>Synopsis</H2
+><DIV
+CLASS="FUNCSYNOPSIS"
+><P
+></P
+><A
+NAME="AEN938"
+></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="FUNCSYNOPSISINFO"
+>#include &#60;fontconfig/fontconfig.h&#62;
+ </PRE
+></TD
+></TR
+></TABLE
+><P
+><CODE
+><CODE
+CLASS="FUNCDEF"
+>FcBool <TT
+CLASS="FUNCTION"
+>FcPatternIterEqual</TT
+></CODE
+>(const FcPattern *<TT
+CLASS="PARAMETER"
+><I
+>p1</I
+></TT
+>, FcPatternIter *<TT
+CLASS="PARAMETER"
+><I
+>i1</I
+></TT
+>, const FcPattern *<TT
+CLASS="PARAMETER"
+><I
+>p2</I
+></TT
+>, FcPatternIter *<TT
+CLASS="PARAMETER"
+><I
+>i2</I
+></TT
+>);</CODE
+></P
+><P
+></P
+></DIV
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN951"
+></A
+><H2
+>Description</H2
+><P
+>Return FcTrue if both <TT
+CLASS="PARAMETER"
+><I
+>i1</I
+></TT
+> and <TT
+CLASS="PARAMETER"
+><I
+>i2</I
+></TT
+>
+point to same object and contains same values. return FcFalse otherwise.
+ </P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN956"
+></A
+><H2
+>Since</H2
+><P
+>version 2.13.1</P
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="fcpatterniternext.html"
+ACCESSKEY="P"
+>&#60;&#60;&#60; Previous</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="t1.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="fcpatternfinditer.html"
+ACCESSKEY="N"
+>Next &#62;&#62;&#62;</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>FcPatternIterNext</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="x103.html#AEN242"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>FcPatternFindIter</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+> \ No newline at end of file
diff --git a/doc/fontconfig-devel/fcpatternitergetobject.html b/doc/fontconfig-devel/fcpatternitergetobject.html
new file mode 100644
index 00000000..38350834
--- /dev/null
+++ b/doc/fontconfig-devel/fcpatternitergetobject.html
@@ -0,0 +1,236 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>FcPatternIterGetObject</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+HREF="t1.html"><LINK
+REL="UP"
+TITLE="FcPattern"
+HREF="x103.html#AEN242"><LINK
+REL="PREVIOUS"
+TITLE="FcPatternIterIsValid"
+HREF="fcpatterniterisvalid.html"><LINK
+REL="NEXT"
+TITLE="FcPatternIterValueCount"
+HREF="fcpatternitervaluecount.html"></HEAD
+><BODY
+CLASS="REFENTRY"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="fcpatterniterisvalid.html"
+ACCESSKEY="P"
+>&#60;&#60;&#60; Previous</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="fcpatternitervaluecount.html"
+ACCESSKEY="N"
+>Next &#62;&#62;&#62;</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><H1
+><A
+NAME="FCPATTERNITERGETOBJECT"
+></A
+>FcPatternIterGetObject</H1
+><DIV
+CLASS="REFNAMEDIV"
+><A
+NAME="AEN1019"
+></A
+><H2
+>Name</H2
+>FcPatternIterGetObject&nbsp;--&nbsp;Returns an object name which the iterator point to</DIV
+><DIV
+CLASS="REFSYNOPSISDIV"
+><A
+NAME="AEN1022"
+></A
+><H2
+>Synopsis</H2
+><DIV
+CLASS="FUNCSYNOPSIS"
+><P
+></P
+><A
+NAME="AEN1023"
+></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="FUNCSYNOPSISINFO"
+>#include &#60;fontconfig/fontconfig.h&#62;
+ </PRE
+></TD
+></TR
+></TABLE
+><P
+><CODE
+><CODE
+CLASS="FUNCDEF"
+>const char * <TT
+CLASS="FUNCTION"
+>FcPatternIterGetObject</TT
+></CODE
+>(const FcPattern *<TT
+CLASS="PARAMETER"
+><I
+>p</I
+></TT
+>, FcPatternIter *<TT
+CLASS="PARAMETER"
+><I
+>iter</I
+></TT
+>);</CODE
+></P
+><P
+></P
+></DIV
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN1032"
+></A
+><H2
+>Description</H2
+><P
+>Returns an object name in <TT
+CLASS="PARAMETER"
+><I
+>p</I
+></TT
+> which
+<TT
+CLASS="PARAMETER"
+><I
+>iter</I
+></TT
+> point to. returns NULL if
+<TT
+CLASS="PARAMETER"
+><I
+>iter</I
+></TT
+> isn't valid.
+ </P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN1038"
+></A
+><H2
+>Since</H2
+><P
+>version 2.13.1</P
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="fcpatterniterisvalid.html"
+ACCESSKEY="P"
+>&#60;&#60;&#60; Previous</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="t1.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="fcpatternitervaluecount.html"
+ACCESSKEY="N"
+>Next &#62;&#62;&#62;</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>FcPatternIterIsValid</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="x103.html#AEN242"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>FcPatternIterValueCount</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+> \ No newline at end of file
diff --git a/doc/fontconfig-devel/fcpatternitergetvalue.html b/doc/fontconfig-devel/fcpatternitergetvalue.html
new file mode 100644
index 00000000..03a85ad1
--- /dev/null
+++ b/doc/fontconfig-devel/fcpatternitergetvalue.html
@@ -0,0 +1,258 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>FcPatternIterGetValue</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+HREF="t1.html"><LINK
+REL="UP"
+TITLE="FcPattern"
+HREF="x103.html#AEN242"><LINK
+REL="PREVIOUS"
+TITLE="FcPatternIterValueCount"
+HREF="fcpatternitervaluecount.html"><LINK
+REL="NEXT"
+TITLE="FcPatternPrint"
+HREF="fcpatternprint.html"></HEAD
+><BODY
+CLASS="REFENTRY"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="fcpatternitervaluecount.html"
+ACCESSKEY="P"
+>&#60;&#60;&#60; Previous</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="fcpatternprint.html"
+ACCESSKEY="N"
+>Next &#62;&#62;&#62;</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><H1
+><A
+NAME="FCPATTERNITERGETVALUE"
+></A
+>FcPatternIterGetValue</H1
+><DIV
+CLASS="REFNAMEDIV"
+><A
+NAME="AEN1072"
+></A
+><H2
+>Name</H2
+>FcPatternIterGetValue&nbsp;--&nbsp;Returns a value which the iterator point to</DIV
+><DIV
+CLASS="REFSYNOPSISDIV"
+><A
+NAME="AEN1075"
+></A
+><H2
+>Synopsis</H2
+><DIV
+CLASS="FUNCSYNOPSIS"
+><P
+></P
+><A
+NAME="AEN1076"
+></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="FUNCSYNOPSISINFO"
+>#include &#60;fontconfig/fontconfig.h&#62;
+ </PRE
+></TD
+></TR
+></TABLE
+><P
+><CODE
+><CODE
+CLASS="FUNCDEF"
+>FcResult <TT
+CLASS="FUNCTION"
+>FcPatternIterGetValue</TT
+></CODE
+>(const FcPattern *<TT
+CLASS="PARAMETER"
+><I
+>p</I
+></TT
+>, FcPatternIter *<TT
+CLASS="PARAMETER"
+><I
+>iter</I
+></TT
+>, int<TT
+CLASS="PARAMETER"
+><I
+>id</I
+></TT
+>, FcValue *<TT
+CLASS="PARAMETER"
+><I
+>v</I
+></TT
+>, FcValueBinding *<TT
+CLASS="PARAMETER"
+><I
+>b</I
+></TT
+>);</CODE
+></P
+><P
+></P
+></DIV
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN1091"
+></A
+><H2
+>Description</H2
+><P
+>Returns in <TT
+CLASS="PARAMETER"
+><I
+>v</I
+></TT
+> the <TT
+CLASS="PARAMETER"
+><I
+>id</I
+></TT
+>'th value
+which <TT
+CLASS="PARAMETER"
+><I
+>iter</I
+></TT
+> point to. also binding to <TT
+CLASS="PARAMETER"
+><I
+>b</I
+></TT
+>
+if given.
+The value returned is not a copy, but rather refers to the data stored
+within the pattern directly. Applications must not free this value.
+ </P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN1098"
+></A
+><H2
+>Since</H2
+><P
+>version 2.13.1</P
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="fcpatternitervaluecount.html"
+ACCESSKEY="P"
+>&#60;&#60;&#60; Previous</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="t1.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="fcpatternprint.html"
+ACCESSKEY="N"
+>Next &#62;&#62;&#62;</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>FcPatternIterValueCount</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="x103.html#AEN242"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>FcPatternPrint</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+> \ No newline at end of file
diff --git a/doc/fontconfig-devel/fcpatterniterisvalid.html b/doc/fontconfig-devel/fcpatterniterisvalid.html
new file mode 100644
index 00000000..c2d0b6ca
--- /dev/null
+++ b/doc/fontconfig-devel/fcpatterniterisvalid.html
@@ -0,0 +1,230 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>FcPatternIterIsValid</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+HREF="t1.html"><LINK
+REL="UP"
+TITLE="FcPattern"
+HREF="x103.html#AEN242"><LINK
+REL="PREVIOUS"
+TITLE="FcPatternFindIter"
+HREF="fcpatternfinditer.html"><LINK
+REL="NEXT"
+TITLE="FcPatternIterGetObject"
+HREF="fcpatternitergetobject.html"></HEAD
+><BODY
+CLASS="REFENTRY"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="fcpatternfinditer.html"
+ACCESSKEY="P"
+>&#60;&#60;&#60; Previous</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="fcpatternitergetobject.html"
+ACCESSKEY="N"
+>Next &#62;&#62;&#62;</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><H1
+><A
+NAME="FCPATTERNITERISVALID"
+></A
+>FcPatternIterIsValid</H1
+><DIV
+CLASS="REFNAMEDIV"
+><A
+NAME="AEN993"
+></A
+><H2
+>Name</H2
+>FcPatternIterIsValid&nbsp;--&nbsp;Check whether the iterator is valid or not</DIV
+><DIV
+CLASS="REFSYNOPSISDIV"
+><A
+NAME="AEN996"
+></A
+><H2
+>Synopsis</H2
+><DIV
+CLASS="FUNCSYNOPSIS"
+><P
+></P
+><A
+NAME="AEN997"
+></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="FUNCSYNOPSISINFO"
+>#include &#60;fontconfig/fontconfig.h&#62;
+ </PRE
+></TD
+></TR
+></TABLE
+><P
+><CODE
+><CODE
+CLASS="FUNCDEF"
+>FcBool <TT
+CLASS="FUNCTION"
+>FcPatternIterIsValid</TT
+></CODE
+>(const FcPattern *<TT
+CLASS="PARAMETER"
+><I
+>p</I
+></TT
+>, FcPatternIter :<TT
+CLASS="PARAMETER"
+><I
+>iter</I
+></TT
+>);</CODE
+></P
+><P
+></P
+></DIV
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN1006"
+></A
+><H2
+>Description</H2
+><P
+>Returns FcTrue if <TT
+CLASS="PARAMETER"
+><I
+>iter</I
+></TT
+> point to the valid entry
+in <TT
+CLASS="PARAMETER"
+><I
+>p</I
+></TT
+>. returns FcFalse otherwise.
+ </P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN1011"
+></A
+><H2
+>Since</H2
+><P
+>version 2.13.1</P
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="fcpatternfinditer.html"
+ACCESSKEY="P"
+>&#60;&#60;&#60; Previous</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="t1.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="fcpatternitergetobject.html"
+ACCESSKEY="N"
+>Next &#62;&#62;&#62;</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>FcPatternFindIter</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="x103.html#AEN242"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>FcPatternIterGetObject</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+> \ No newline at end of file
diff --git a/doc/fontconfig-devel/fcpatterniternext.html b/doc/fontconfig-devel/fcpatterniternext.html
new file mode 100644
index 00000000..0a73e776
--- /dev/null
+++ b/doc/fontconfig-devel/fcpatterniternext.html
@@ -0,0 +1,236 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>FcPatternIterNext</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+HREF="t1.html"><LINK
+REL="UP"
+TITLE="FcPattern"
+HREF="x103.html#AEN242"><LINK
+REL="PREVIOUS"
+TITLE="FcPatternIterStart"
+HREF="fcpatterniterstart.html"><LINK
+REL="NEXT"
+TITLE="FcPatternIterEqual"
+HREF="fcpatterniterequal.html"></HEAD
+><BODY
+CLASS="REFENTRY"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="fcpatterniterstart.html"
+ACCESSKEY="P"
+>&#60;&#60;&#60; Previous</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="fcpatterniterequal.html"
+ACCESSKEY="N"
+>Next &#62;&#62;&#62;</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><H1
+><A
+NAME="FCPATTERNITERNEXT"
+></A
+>FcPatternIterNext</H1
+><DIV
+CLASS="REFNAMEDIV"
+><A
+NAME="AEN907"
+></A
+><H2
+>Name</H2
+>FcPatternIterNext&nbsp;--&nbsp;</DIV
+><DIV
+CLASS="REFSYNOPSISDIV"
+><A
+NAME="AEN910"
+></A
+><H2
+>Synopsis</H2
+><DIV
+CLASS="FUNCSYNOPSIS"
+><P
+></P
+><A
+NAME="AEN911"
+></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="FUNCSYNOPSISINFO"
+>#include &#60;fontconfig/fontconfig.h&#62;
+ </PRE
+></TD
+></TR
+></TABLE
+><P
+><CODE
+><CODE
+CLASS="FUNCDEF"
+>FcBool <TT
+CLASS="FUNCTION"
+>FcPatternIterNext</TT
+></CODE
+>(const FcPattern *<TT
+CLASS="PARAMETER"
+><I
+>p</I
+></TT
+>, FcPatternIter *<TT
+CLASS="PARAMETER"
+><I
+>iter</I
+></TT
+>);</CODE
+></P
+><P
+></P
+></DIV
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN920"
+></A
+><H2
+>Description</H2
+><P
+>Set <TT
+CLASS="PARAMETER"
+><I
+>iter</I
+></TT
+> to point to the next object in <TT
+CLASS="PARAMETER"
+><I
+>p</I
+></TT
+>
+and returns FcTrue if <TT
+CLASS="PARAMETER"
+><I
+>iter</I
+></TT
+> has been changed to the next object.
+returns FcFalse otherwise.
+ </P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN926"
+></A
+><H2
+>Since</H2
+><P
+>version 2.13.1</P
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="fcpatterniterstart.html"
+ACCESSKEY="P"
+>&#60;&#60;&#60; Previous</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="t1.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="fcpatterniterequal.html"
+ACCESSKEY="N"
+>Next &#62;&#62;&#62;</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>FcPatternIterStart</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="x103.html#AEN242"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>FcPatternIterEqual</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+> \ No newline at end of file
diff --git a/doc/fontconfig-devel/fcpatterniterstart.html b/doc/fontconfig-devel/fcpatterniterstart.html
new file mode 100644
index 00000000..22df7449
--- /dev/null
+++ b/doc/fontconfig-devel/fcpatterniterstart.html
@@ -0,0 +1,241 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>FcPatternIterStart</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+HREF="t1.html"><LINK
+REL="UP"
+TITLE="FcPattern"
+HREF="x103.html#AEN242"><LINK
+REL="PREVIOUS"
+TITLE="FcPatternRemove"
+HREF="fcpatternremove.html"><LINK
+REL="NEXT"
+TITLE="FcPatternIterNext"
+HREF="fcpatterniternext.html"></HEAD
+><BODY
+CLASS="REFENTRY"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="fcpatternremove.html"
+ACCESSKEY="P"
+>&#60;&#60;&#60; Previous</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="fcpatterniternext.html"
+ACCESSKEY="N"
+>Next &#62;&#62;&#62;</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><H1
+><A
+NAME="FCPATTERNITERSTART"
+></A
+>FcPatternIterStart</H1
+><DIV
+CLASS="REFNAMEDIV"
+><A
+NAME="AEN879"
+></A
+><H2
+>Name</H2
+>FcPatternIterStart&nbsp;--&nbsp;Initialize the iterator with the first iterator in the pattern</DIV
+><DIV
+CLASS="REFSYNOPSISDIV"
+><A
+NAME="AEN882"
+></A
+><H2
+>Synopsis</H2
+><DIV
+CLASS="FUNCSYNOPSIS"
+><P
+></P
+><A
+NAME="AEN883"
+></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="FUNCSYNOPSISINFO"
+>#include &#60;fontconfig/fontconfig.h&#62;
+ </PRE
+></TD
+></TR
+></TABLE
+><P
+><CODE
+><CODE
+CLASS="FUNCDEF"
+>void <TT
+CLASS="FUNCTION"
+>FcPatternIterStart</TT
+></CODE
+>(const FcPattern *<TT
+CLASS="PARAMETER"
+><I
+>p</I
+></TT
+>, FcPatternIter *<TT
+CLASS="PARAMETER"
+><I
+>iter</I
+></TT
+>);</CODE
+></P
+><P
+></P
+></DIV
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN892"
+></A
+><H2
+>Description</H2
+><P
+>Initialize <TT
+CLASS="PARAMETER"
+><I
+>iter</I
+></TT
+> with the first iterator in <TT
+CLASS="PARAMETER"
+><I
+>p</I
+></TT
+>.
+If there are no objects in <TT
+CLASS="PARAMETER"
+><I
+>p</I
+></TT
+>, <TT
+CLASS="PARAMETER"
+><I
+>iter</I
+></TT
+>
+will not have any valid data.
+ </P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN899"
+></A
+><H2
+>Since</H2
+><P
+>version 2.13.1</P
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="fcpatternremove.html"
+ACCESSKEY="P"
+>&#60;&#60;&#60; Previous</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="t1.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="fcpatterniternext.html"
+ACCESSKEY="N"
+>Next &#62;&#62;&#62;</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>FcPatternRemove</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="x103.html#AEN242"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>FcPatternIterNext</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+> \ No newline at end of file
diff --git a/doc/fontconfig-devel/fcpatternitervaluecount.html b/doc/fontconfig-devel/fcpatternitervaluecount.html
new file mode 100644
index 00000000..cb9db56b
--- /dev/null
+++ b/doc/fontconfig-devel/fcpatternitervaluecount.html
@@ -0,0 +1,230 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>FcPatternIterValueCount</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+HREF="t1.html"><LINK
+REL="UP"
+TITLE="FcPattern"
+HREF="x103.html#AEN242"><LINK
+REL="PREVIOUS"
+TITLE="FcPatternIterGetObject"
+HREF="fcpatternitergetobject.html"><LINK
+REL="NEXT"
+TITLE="FcPatternIterGetValue"
+HREF="fcpatternitergetvalue.html"></HEAD
+><BODY
+CLASS="REFENTRY"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="fcpatternitergetobject.html"
+ACCESSKEY="P"
+>&#60;&#60;&#60; Previous</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="fcpatternitergetvalue.html"
+ACCESSKEY="N"
+>Next &#62;&#62;&#62;</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><H1
+><A
+NAME="FCPATTERNITERVALUECOUNT"
+></A
+>FcPatternIterValueCount</H1
+><DIV
+CLASS="REFNAMEDIV"
+><A
+NAME="AEN1046"
+></A
+><H2
+>Name</H2
+>FcPatternIterValueCount&nbsp;--&nbsp;Returns the number of the values which the iterator point to</DIV
+><DIV
+CLASS="REFSYNOPSISDIV"
+><A
+NAME="AEN1049"
+></A
+><H2
+>Synopsis</H2
+><DIV
+CLASS="FUNCSYNOPSIS"
+><P
+></P
+><A
+NAME="AEN1050"
+></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="FUNCSYNOPSISINFO"
+>#include &#60;fontconfig/fontconfig.h&#62;
+ </PRE
+></TD
+></TR
+></TABLE
+><P
+><CODE
+><CODE
+CLASS="FUNCDEF"
+>int <TT
+CLASS="FUNCTION"
+>FcPatternIterValueCount</TT
+></CODE
+>(const FcPattern *<TT
+CLASS="PARAMETER"
+><I
+>p</I
+></TT
+>, FcPatternIter *<TT
+CLASS="PARAMETER"
+><I
+>iter</I
+></TT
+>);</CODE
+></P
+><P
+></P
+></DIV
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN1059"
+></A
+><H2
+>Description</H2
+><P
+>Returns the number of the values in the object which <TT
+CLASS="PARAMETER"
+><I
+>iter</I
+></TT
+>
+point to. if <TT
+CLASS="PARAMETER"
+><I
+>iter</I
+></TT
+> isn't valid, returns 0.
+ </P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN1064"
+></A
+><H2
+>Since</H2
+><P
+>version 2.13.1</P
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="fcpatternitergetobject.html"
+ACCESSKEY="P"
+>&#60;&#60;&#60; Previous</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="t1.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="fcpatternitergetvalue.html"
+ACCESSKEY="N"
+>Next &#62;&#62;&#62;</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>FcPatternIterGetObject</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="x103.html#AEN242"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>FcPatternIterGetValue</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+> \ No newline at end of file
diff --git a/doc/fontconfig-devel/fcpatternobjectcount.html b/doc/fontconfig-devel/fcpatternobjectcount.html
new file mode 100644
index 00000000..d8d9fbf1
--- /dev/null
+++ b/doc/fontconfig-devel/fcpatternobjectcount.html
@@ -0,0 +1,219 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>FcPatternObjectCount</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+HREF="t1.html"><LINK
+REL="UP"
+TITLE="FcPattern"
+HREF="x103.html#AEN242"><LINK
+REL="PREVIOUS"
+TITLE="FcPatternDestroy"
+HREF="fcpatterndestroy.html"><LINK
+REL="NEXT"
+TITLE="FcPatternEqual"
+HREF="fcpatternequal.html"></HEAD
+><BODY
+CLASS="REFENTRY"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+></TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="fcpatterndestroy.html"
+ACCESSKEY="P"
+>&#60;&#60;&#60; Previous</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="fcpatternequal.html"
+ACCESSKEY="N"
+>Next &#62;&#62;&#62;</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><H1
+><A
+NAME="FCPATTERNOBJECTCOUNT"
+></A
+>FcPatternObjectCount</H1
+><DIV
+CLASS="REFNAMEDIV"
+><A
+NAME="AEN328"
+></A
+><H2
+>Name</H2
+>FcPatternObjectCount&nbsp;--&nbsp;Returns the number of the object</DIV
+><DIV
+CLASS="REFSYNOPSISDIV"
+><A
+NAME="AEN331"
+></A
+><H2
+>Synopsis</H2
+><DIV
+CLASS="FUNCSYNOPSIS"
+><P
+></P
+><A
+NAME="AEN332"
+></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="FUNCSYNOPSISINFO"
+>#include &#60;fontconfig/fontconfig.h&#62;
+ </PRE
+></TD
+></TR
+></TABLE
+><P
+><CODE
+><CODE
+CLASS="FUNCDEF"
+>int <TT
+CLASS="FUNCTION"
+>FcPatternObjectCount</TT
+></CODE
+>(const FcPattern *<TT
+CLASS="PARAMETER"
+><I
+>p</I
+></TT
+>);</CODE
+></P
+><P
+></P
+></DIV
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN339"
+></A
+><H2
+>Description</H2
+><P
+>Returns the number of the object <TT
+CLASS="PARAMETER"
+><I
+>p</I
+></TT
+> has.
+ </P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN343"
+></A
+><H2
+>Since</H2
+><P
+>version 2.13.1</P
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="fcpatterndestroy.html"
+ACCESSKEY="P"
+>&#60;&#60;&#60; Previous</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="t1.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="fcpatternequal.html"
+ACCESSKEY="N"
+>Next &#62;&#62;&#62;</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>FcPatternDestroy</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="x103.html#AEN242"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>FcPatternEqual</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+> \ No newline at end of file
diff --git a/doc/fontconfig-devel/fcpatternprint.html b/doc/fontconfig-devel/fcpatternprint.html
index c3291ad2..6b4a9b55 100644
--- a/doc/fontconfig-devel/fcpatternprint.html
+++ b/doc/fontconfig-devel/fcpatternprint.html
@@ -12,8 +12,8 @@ REL="UP"
TITLE="FcPattern"
HREF="x103.html#AEN242"><LINK
REL="PREVIOUS"
-TITLE="FcPatternRemove"
-HREF="fcpatternremove.html"><LINK
+TITLE="FcPatternIterGetValue"
+HREF="fcpatternitergetvalue.html"><LINK
REL="NEXT"
TITLE="FcDefaultSubstitute"
HREF="fcdefaultsubstitute.html"></HEAD
@@ -44,7 +44,7 @@ WIDTH="10%"
ALIGN="left"
VALIGN="bottom"
><A
-HREF="fcpatternremove.html"
+HREF="fcpatternitergetvalue.html"
ACCESSKEY="P"
>&#60;&#60;&#60; Previous</A
></TD
@@ -75,7 +75,7 @@ NAME="FCPATTERNPRINT"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN856"
+NAME="AEN1106"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN856"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN859"
+NAME="AEN1109"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN860"
+NAME="AEN1110"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN867"
+NAME="AEN1117"
></A
><H2
>Description</H2
@@ -155,7 +155,7 @@ WIDTH="33%"
ALIGN="left"
VALIGN="top"
><A
-HREF="fcpatternremove.html"
+HREF="fcpatternitergetvalue.html"
ACCESSKEY="P"
>&#60;&#60;&#60; Previous</A
></TD
@@ -183,7 +183,7 @@ ACCESSKEY="N"
WIDTH="33%"
ALIGN="left"
VALIGN="top"
->FcPatternRemove</TD
+>FcPatternIterGetValue</TD
><TD
WIDTH="34%"
ALIGN="center"
diff --git a/doc/fontconfig-devel/fcpatternremove.html b/doc/fontconfig-devel/fcpatternremove.html
index f3d3c5e5..d7afc7cd 100644
--- a/doc/fontconfig-devel/fcpatternremove.html
+++ b/doc/fontconfig-devel/fcpatternremove.html
@@ -15,8 +15,8 @@ REL="PREVIOUS"
TITLE="FcPatternDel"
HREF="fcpatterndel.html"><LINK
REL="NEXT"
-TITLE="FcPatternPrint"
-HREF="fcpatternprint.html"></HEAD
+TITLE="FcPatternIterStart"
+HREF="fcpatterniterstart.html"></HEAD
><BODY
CLASS="REFENTRY"
BGCOLOR="#FFFFFF"
@@ -58,7 +58,7 @@ WIDTH="10%"
ALIGN="right"
VALIGN="bottom"
><A
-HREF="fcpatternprint.html"
+HREF="fcpatterniterstart.html"
ACCESSKEY="N"
>Next &#62;&#62;&#62;</A
></TD
@@ -75,7 +75,7 @@ NAME="FCPATTERNREMOVE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN833"
+NAME="AEN856"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN833"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN836"
+NAME="AEN859"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN837"
+NAME="AEN860"
></A
><TABLE
BORDER="0"
@@ -139,7 +139,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN848"
+NAME="AEN871"
></A
><H2
>Description</H2
@@ -182,7 +182,7 @@ WIDTH="33%"
ALIGN="right"
VALIGN="top"
><A
-HREF="fcpatternprint.html"
+HREF="fcpatterniterstart.html"
ACCESSKEY="N"
>Next &#62;&#62;&#62;</A
></TD
@@ -206,7 +206,7 @@ ACCESSKEY="U"
WIDTH="33%"
ALIGN="right"
VALIGN="top"
->FcPatternPrint</TD
+>FcPatternIterStart</TD
></TR
></TABLE
></DIV
diff --git a/doc/fontconfig-devel/fcrangecopy.html b/doc/fontconfig-devel/fcrangecopy.html
index 21417919..1252e214 100644
--- a/doc/fontconfig-devel/fcrangecopy.html
+++ b/doc/fontconfig-devel/fcrangecopy.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcRange"
-HREF="x103.html#AEN2660"><LINK
+HREF="x103.html#AEN2910"><LINK
REL="PREVIOUS"
TITLE="FUNCTIONS"
HREF="x103.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCRANGECOPY"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2668"
+NAME="AEN2918"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2668"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2671"
+NAME="AEN2921"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2672"
+NAME="AEN2922"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2679"
+NAME="AEN2929"
></A
><H2
>Description</H2
@@ -149,7 +149,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2684"
+NAME="AEN2934"
></A
><H2
>Since</H2
@@ -206,7 +206,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2660"
+HREF="x103.html#AEN2910"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcrangecreatedouble.html b/doc/fontconfig-devel/fcrangecreatedouble.html
index 0dd6ba5a..32acf94a 100644
--- a/doc/fontconfig-devel/fcrangecreatedouble.html
+++ b/doc/fontconfig-devel/fcrangecreatedouble.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcRange"
-HREF="x103.html#AEN2660"><LINK
+HREF="x103.html#AEN2910"><LINK
REL="PREVIOUS"
TITLE="FcRangeCopy"
HREF="fcrangecopy.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCRANGECREATEDOUBLE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2692"
+NAME="AEN2942"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2692"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2695"
+NAME="AEN2945"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2696"
+NAME="AEN2946"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2705"
+NAME="AEN2955"
></A
><H2
>Description</H2
@@ -149,7 +149,7 @@ double sized value.
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2709"
+NAME="AEN2959"
></A
><H2
>Since</H2
@@ -206,7 +206,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2660"
+HREF="x103.html#AEN2910"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcrangecreateinteger.html b/doc/fontconfig-devel/fcrangecreateinteger.html
index de5b45e0..1959aae6 100644
--- a/doc/fontconfig-devel/fcrangecreateinteger.html
+++ b/doc/fontconfig-devel/fcrangecreateinteger.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcRange"
-HREF="x103.html#AEN2660"><LINK
+HREF="x103.html#AEN2910"><LINK
REL="PREVIOUS"
TITLE="FcRangeCreateDouble"
HREF="fcrangecreatedouble.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCRANGECREATEINTEGER"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2717"
+NAME="AEN2967"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2717"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2720"
+NAME="AEN2970"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2721"
+NAME="AEN2971"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2730"
+NAME="AEN2980"
></A
><H2
>Description</H2
@@ -149,7 +149,7 @@ integer sized value.
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2734"
+NAME="AEN2984"
></A
><H2
>Since</H2
@@ -206,7 +206,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2660"
+HREF="x103.html#AEN2910"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcrangedestroy.html b/doc/fontconfig-devel/fcrangedestroy.html
index d50a4e3a..9e27c327 100644
--- a/doc/fontconfig-devel/fcrangedestroy.html
+++ b/doc/fontconfig-devel/fcrangedestroy.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcRange"
-HREF="x103.html#AEN2660"><LINK
+HREF="x103.html#AEN2910"><LINK
REL="PREVIOUS"
TITLE="FcRangeCreateInteger"
HREF="fcrangecreateinteger.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCRANGEDESTROY"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2742"
+NAME="AEN2992"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN2742"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2745"
+NAME="AEN2995"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2746"
+NAME="AEN2996"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2753"
+NAME="AEN3003"
></A
><H2
>Description</H2
@@ -144,7 +144,7 @@ all memory associated with it.
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2757"
+NAME="AEN3007"
></A
><H2
>Since</H2
@@ -201,7 +201,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2660"
+HREF="x103.html#AEN2910"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcrangegetdouble.html b/doc/fontconfig-devel/fcrangegetdouble.html
index 487602fb..9de1d5d6 100644
--- a/doc/fontconfig-devel/fcrangegetdouble.html
+++ b/doc/fontconfig-devel/fcrangegetdouble.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcRange"
-HREF="x103.html#AEN2660"><LINK
+HREF="x103.html#AEN2910"><LINK
REL="PREVIOUS"
TITLE="FcRangeDestroy"
HREF="fcrangedestroy.html"></HEAD
@@ -68,7 +68,7 @@ NAME="FCRANGEGETDOUBLE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN2765"
+NAME="AEN3015"
></A
><H2
>Name</H2
@@ -76,7 +76,7 @@ NAME="AEN2765"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN2768"
+NAME="AEN3018"
></A
><H2
>Synopsis</H2
@@ -85,7 +85,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN2769"
+NAME="AEN3019"
></A
><TABLE
BORDER="0"
@@ -132,7 +132,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2780"
+NAME="AEN3030"
></A
><H2
>Description</H2
@@ -153,7 +153,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN2785"
+NAME="AEN3035"
></A
><H2
>Since</H2
@@ -206,7 +206,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN2660"
+HREF="x103.html#AEN2910"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcstrbasename.html b/doc/fontconfig-devel/fcstrbasename.html
index 732e0145..f1643ad9 100644
--- a/doc/fontconfig-devel/fcstrbasename.html
+++ b/doc/fontconfig-devel/fcstrbasename.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="String utilities"
-HREF="x103.html#AEN4792"><LINK
+HREF="x103.html#AEN5067"><LINK
REL="PREVIOUS"
TITLE="FcStrDirname"
HREF="fcstrdirname.html"></HEAD
@@ -68,7 +68,7 @@ NAME="FCSTRBASENAME"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN5226"
+NAME="AEN5501"
></A
><H2
>Name</H2
@@ -76,7 +76,7 @@ NAME="AEN5226"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN5229"
+NAME="AEN5504"
></A
><H2
>Synopsis</H2
@@ -85,7 +85,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN5230"
+NAME="AEN5505"
></A
><TABLE
BORDER="0"
@@ -122,7 +122,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN5237"
+NAME="AEN5512"
></A
><H2
>Description</H2
@@ -183,7 +183,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4792"
+HREF="x103.html#AEN5067"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcstrcmp.html b/doc/fontconfig-devel/fcstrcmp.html
index a44780eb..1517bd38 100644
--- a/doc/fontconfig-devel/fcstrcmp.html
+++ b/doc/fontconfig-devel/fcstrcmp.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="String utilities"
-HREF="x103.html#AEN4792"><LINK
+HREF="x103.html#AEN5067"><LINK
REL="PREVIOUS"
TITLE="FcStrCopyFilename"
HREF="fcstrcopyfilename.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCSTRCMP"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN5068"
+NAME="AEN5343"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN5068"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN5071"
+NAME="AEN5346"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN5072"
+NAME="AEN5347"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN5081"
+NAME="AEN5356"
></A
><H2
>Description</H2
@@ -203,7 +203,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4792"
+HREF="x103.html#AEN5067"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcstrcmpignorecase.html b/doc/fontconfig-devel/fcstrcmpignorecase.html
index f8e465da..2b80cd44 100644
--- a/doc/fontconfig-devel/fcstrcmpignorecase.html
+++ b/doc/fontconfig-devel/fcstrcmpignorecase.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="String utilities"
-HREF="x103.html#AEN4792"><LINK
+HREF="x103.html#AEN5067"><LINK
REL="PREVIOUS"
TITLE="FcStrCmp"
HREF="fcstrcmp.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCSTRCMPIGNORECASE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN5091"
+NAME="AEN5366"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN5091"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN5094"
+NAME="AEN5369"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN5095"
+NAME="AEN5370"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN5104"
+NAME="AEN5379"
></A
><H2
>Description</H2
@@ -204,7 +204,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4792"
+HREF="x103.html#AEN5067"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcstrcopy.html b/doc/fontconfig-devel/fcstrcopy.html
index ec72b965..02ee3f13 100644
--- a/doc/fontconfig-devel/fcstrcopy.html
+++ b/doc/fontconfig-devel/fcstrcopy.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="String utilities"
-HREF="x103.html#AEN4792"><LINK
+HREF="x103.html#AEN5067"><LINK
REL="PREVIOUS"
TITLE="FcToLower"
HREF="fctolower.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCSTRCOPY"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN5005"
+NAME="AEN5280"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN5005"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN5008"
+NAME="AEN5283"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN5009"
+NAME="AEN5284"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN5016"
+NAME="AEN5291"
></A
><H2
>Description</H2
@@ -197,7 +197,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4792"
+HREF="x103.html#AEN5067"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcstrcopyfilename.html b/doc/fontconfig-devel/fcstrcopyfilename.html
index 1cfb2c3c..555d2b27 100644
--- a/doc/fontconfig-devel/fcstrcopyfilename.html
+++ b/doc/fontconfig-devel/fcstrcopyfilename.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="String utilities"
-HREF="x103.html#AEN4792"><LINK
+HREF="x103.html#AEN5067"><LINK
REL="PREVIOUS"
TITLE="FcStrDowncase"
HREF="fcstrdowncase.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCSTRCOPYFILENAME"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN5046"
+NAME="AEN5321"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN5046"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN5049"
+NAME="AEN5324"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN5050"
+NAME="AEN5325"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN5057"
+NAME="AEN5332"
></A
><H2
>Description</H2
@@ -205,7 +205,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4792"
+HREF="x103.html#AEN5067"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcstrdirname.html b/doc/fontconfig-devel/fcstrdirname.html
index ff73599c..1533eb41 100644
--- a/doc/fontconfig-devel/fcstrdirname.html
+++ b/doc/fontconfig-devel/fcstrdirname.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="String utilities"
-HREF="x103.html#AEN4792"><LINK
+HREF="x103.html#AEN5067"><LINK
REL="PREVIOUS"
TITLE="FcStrFree"
HREF="fcstrfree.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCSTRDIRNAME"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN5206"
+NAME="AEN5481"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN5206"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN5209"
+NAME="AEN5484"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN5210"
+NAME="AEN5485"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN5217"
+NAME="AEN5492"
></A
><H2
>Description</H2
@@ -194,7 +194,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4792"
+HREF="x103.html#AEN5067"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcstrdowncase.html b/doc/fontconfig-devel/fcstrdowncase.html
index 04863a66..bb382c7e 100644
--- a/doc/fontconfig-devel/fcstrdowncase.html
+++ b/doc/fontconfig-devel/fcstrdowncase.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="String utilities"
-HREF="x103.html#AEN4792"><LINK
+HREF="x103.html#AEN5067"><LINK
REL="PREVIOUS"
TITLE="FcStrCopy"
HREF="fcstrcopy.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCSTRDOWNCASE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN5026"
+NAME="AEN5301"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN5026"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN5029"
+NAME="AEN5304"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN5030"
+NAME="AEN5305"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN5037"
+NAME="AEN5312"
></A
><H2
>Description</H2
@@ -193,7 +193,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4792"
+HREF="x103.html#AEN5067"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcstrfree.html b/doc/fontconfig-devel/fcstrfree.html
index d96f4fef..62816bb7 100644
--- a/doc/fontconfig-devel/fcstrfree.html
+++ b/doc/fontconfig-devel/fcstrfree.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="String utilities"
-HREF="x103.html#AEN4792"><LINK
+HREF="x103.html#AEN5067"><LINK
REL="PREVIOUS"
TITLE="FcStrPlus"
HREF="fcstrplus.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCSTRFREE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN5187"
+NAME="AEN5462"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN5187"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN5190"
+NAME="AEN5465"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN5191"
+NAME="AEN5466"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN5198"
+NAME="AEN5473"
></A
><H2
>Description</H2
@@ -188,7 +188,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4792"
+HREF="x103.html#AEN5067"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcstrlistcreate.html b/doc/fontconfig-devel/fcstrlistcreate.html
index 97585de4..901c1a01 100644
--- a/doc/fontconfig-devel/fcstrlistcreate.html
+++ b/doc/fontconfig-devel/fcstrlistcreate.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcStrSet and FcStrList"
-HREF="x103.html#AEN4551"><LINK
+HREF="x103.html#AEN4826"><LINK
REL="PREVIOUS"
TITLE="FcStrSetDestroy"
HREF="fcstrsetdestroy.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCSTRLISTCREATE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4714"
+NAME="AEN4989"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN4714"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4717"
+NAME="AEN4992"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4718"
+NAME="AEN4993"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4725"
+NAME="AEN5000"
></A
><H2
>Description</H2
@@ -192,7 +192,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4551"
+HREF="x103.html#AEN4826"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcstrlistdone.html b/doc/fontconfig-devel/fcstrlistdone.html
index 0b3d78b4..613d86c4 100644
--- a/doc/fontconfig-devel/fcstrlistdone.html
+++ b/doc/fontconfig-devel/fcstrlistdone.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcStrSet and FcStrList"
-HREF="x103.html#AEN4551"><LINK
+HREF="x103.html#AEN4826"><LINK
REL="PREVIOUS"
TITLE="FcStrListNext"
HREF="fcstrlistnext.html"></HEAD
@@ -68,7 +68,7 @@ NAME="FCSTRLISTDONE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4777"
+NAME="AEN5052"
></A
><H2
>Name</H2
@@ -76,7 +76,7 @@ NAME="AEN4777"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4780"
+NAME="AEN5055"
></A
><H2
>Synopsis</H2
@@ -85,7 +85,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4781"
+NAME="AEN5056"
></A
><TABLE
BORDER="0"
@@ -122,7 +122,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4788"
+NAME="AEN5063"
></A
><H2
>Description</H2
@@ -181,7 +181,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4551"
+HREF="x103.html#AEN4826"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcstrlistfirst.html b/doc/fontconfig-devel/fcstrlistfirst.html
index 94531a15..16a4814d 100644
--- a/doc/fontconfig-devel/fcstrlistfirst.html
+++ b/doc/fontconfig-devel/fcstrlistfirst.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcStrSet and FcStrList"
-HREF="x103.html#AEN4551"><LINK
+HREF="x103.html#AEN4826"><LINK
REL="PREVIOUS"
TITLE="FcStrListCreate"
HREF="fcstrlistcreate.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCSTRLISTFIRST"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4734"
+NAME="AEN5009"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN4734"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4737"
+NAME="AEN5012"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4738"
+NAME="AEN5013"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4745"
+NAME="AEN5020"
></A
><H2
>Description</H2
@@ -145,7 +145,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4749"
+NAME="AEN5024"
></A
><H2
>Since</H2
@@ -202,7 +202,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4551"
+HREF="x103.html#AEN4826"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcstrlistnext.html b/doc/fontconfig-devel/fcstrlistnext.html
index 786b86a6..ffc6cece 100644
--- a/doc/fontconfig-devel/fcstrlistnext.html
+++ b/doc/fontconfig-devel/fcstrlistnext.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcStrSet and FcStrList"
-HREF="x103.html#AEN4551"><LINK
+HREF="x103.html#AEN4826"><LINK
REL="PREVIOUS"
TITLE="FcStrListFirst"
HREF="fcstrlistfirst.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCSTRLISTNEXT"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4757"
+NAME="AEN5032"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN4757"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4760"
+NAME="AEN5035"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4761"
+NAME="AEN5036"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4768"
+NAME="AEN5043"
></A
><H2
>Description</H2
@@ -192,7 +192,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4551"
+HREF="x103.html#AEN4826"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcstrplus.html b/doc/fontconfig-devel/fcstrplus.html
index b19194f1..243eb44e 100644
--- a/doc/fontconfig-devel/fcstrplus.html
+++ b/doc/fontconfig-devel/fcstrplus.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="String utilities"
-HREF="x103.html#AEN4792"><LINK
+HREF="x103.html#AEN5067"><LINK
REL="PREVIOUS"
TITLE="FcStrStrIgnoreCase"
HREF="fcstrstrignorecase.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCSTRPLUS"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN5164"
+NAME="AEN5439"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN5164"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN5167"
+NAME="AEN5442"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN5168"
+NAME="AEN5443"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN5177"
+NAME="AEN5452"
></A
><H2
>Description</H2
@@ -204,7 +204,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4792"
+HREF="x103.html#AEN5067"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcstrsetadd.html b/doc/fontconfig-devel/fcstrsetadd.html
index db796849..08799621 100644
--- a/doc/fontconfig-devel/fcstrsetadd.html
+++ b/doc/fontconfig-devel/fcstrsetadd.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcStrSet and FcStrList"
-HREF="x103.html#AEN4551"><LINK
+HREF="x103.html#AEN4826"><LINK
REL="PREVIOUS"
TITLE="FcStrSetEqual"
HREF="fcstrsetequal.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCSTRSETADD"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4624"
+NAME="AEN4899"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN4624"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4627"
+NAME="AEN4902"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4628"
+NAME="AEN4903"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4637"
+NAME="AEN4912"
></A
><H2
>Description</H2
@@ -202,7 +202,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4551"
+HREF="x103.html#AEN4826"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcstrsetaddfilename.html b/doc/fontconfig-devel/fcstrsetaddfilename.html
index 55da4963..7695df13 100644
--- a/doc/fontconfig-devel/fcstrsetaddfilename.html
+++ b/doc/fontconfig-devel/fcstrsetaddfilename.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcStrSet and FcStrList"
-HREF="x103.html#AEN4551"><LINK
+HREF="x103.html#AEN4826"><LINK
REL="PREVIOUS"
TITLE="FcStrSetAdd"
HREF="fcstrsetadd.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCSTRSETADDFILENAME"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4647"
+NAME="AEN4922"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN4647"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4650"
+NAME="AEN4925"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4651"
+NAME="AEN4926"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4660"
+NAME="AEN4935"
></A
><H2
>Description</H2
@@ -204,7 +204,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4551"
+HREF="x103.html#AEN4826"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcstrsetcreate.html b/doc/fontconfig-devel/fcstrsetcreate.html
index 943e4d74..864e57d3 100644
--- a/doc/fontconfig-devel/fcstrsetcreate.html
+++ b/doc/fontconfig-devel/fcstrsetcreate.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcStrSet and FcStrList"
-HREF="x103.html#AEN4551"><LINK
+HREF="x103.html#AEN4826"><LINK
REL="PREVIOUS"
TITLE="FUNCTIONS"
HREF="x103.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCSTRSETCREATE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4559"
+NAME="AEN4834"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN4559"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4562"
+NAME="AEN4837"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4563"
+NAME="AEN4838"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4570"
+NAME="AEN4845"
></A
><H2
>Description</H2
@@ -187,7 +187,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4551"
+HREF="x103.html#AEN4826"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcstrsetdel.html b/doc/fontconfig-devel/fcstrsetdel.html
index 3c7e708a..92354996 100644
--- a/doc/fontconfig-devel/fcstrsetdel.html
+++ b/doc/fontconfig-devel/fcstrsetdel.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcStrSet and FcStrList"
-HREF="x103.html#AEN4551"><LINK
+HREF="x103.html#AEN4826"><LINK
REL="PREVIOUS"
TITLE="FcStrSetAddFilename"
HREF="fcstrsetaddfilename.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCSTRSETDEL"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4670"
+NAME="AEN4945"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN4670"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4673"
+NAME="AEN4948"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4674"
+NAME="AEN4949"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4683"
+NAME="AEN4958"
></A
><H2
>Description</H2
@@ -208,7 +208,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4551"
+HREF="x103.html#AEN4826"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcstrsetdestroy.html b/doc/fontconfig-devel/fcstrsetdestroy.html
index 8ed8af7e..fd178077 100644
--- a/doc/fontconfig-devel/fcstrsetdestroy.html
+++ b/doc/fontconfig-devel/fcstrsetdestroy.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcStrSet and FcStrList"
-HREF="x103.html#AEN4551"><LINK
+HREF="x103.html#AEN4826"><LINK
REL="PREVIOUS"
TITLE="FcStrSetDel"
HREF="fcstrsetdel.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCSTRSETDESTROY"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4694"
+NAME="AEN4969"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN4694"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4697"
+NAME="AEN4972"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4698"
+NAME="AEN4973"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4705"
+NAME="AEN4980"
></A
><H2
>Description</H2
@@ -192,7 +192,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4551"
+HREF="x103.html#AEN4826"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcstrsetequal.html b/doc/fontconfig-devel/fcstrsetequal.html
index 48247c96..a4d62b41 100644
--- a/doc/fontconfig-devel/fcstrsetequal.html
+++ b/doc/fontconfig-devel/fcstrsetequal.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcStrSet and FcStrList"
-HREF="x103.html#AEN4551"><LINK
+HREF="x103.html#AEN4826"><LINK
REL="PREVIOUS"
TITLE="FcStrSetMember"
HREF="fcstrsetmember.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCSTRSETEQUAL"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4601"
+NAME="AEN4876"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN4601"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4604"
+NAME="AEN4879"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4605"
+NAME="AEN4880"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4614"
+NAME="AEN4889"
></A
><H2
>Description</H2
@@ -204,7 +204,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4551"
+HREF="x103.html#AEN4826"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcstrsetmember.html b/doc/fontconfig-devel/fcstrsetmember.html
index 4f281e58..e67be214 100644
--- a/doc/fontconfig-devel/fcstrsetmember.html
+++ b/doc/fontconfig-devel/fcstrsetmember.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcStrSet and FcStrList"
-HREF="x103.html#AEN4551"><LINK
+HREF="x103.html#AEN4826"><LINK
REL="PREVIOUS"
TITLE="FcStrSetCreate"
HREF="fcstrsetcreate.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCSTRSETMEMBER"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4578"
+NAME="AEN4853"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN4578"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4581"
+NAME="AEN4856"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4582"
+NAME="AEN4857"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4591"
+NAME="AEN4866"
></A
><H2
>Description</H2
@@ -203,7 +203,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4551"
+HREF="x103.html#AEN4826"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcstrstr.html b/doc/fontconfig-devel/fcstrstr.html
index a1cae986..c039d7ec 100644
--- a/doc/fontconfig-devel/fcstrstr.html
+++ b/doc/fontconfig-devel/fcstrstr.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="String utilities"
-HREF="x103.html#AEN4792"><LINK
+HREF="x103.html#AEN5067"><LINK
REL="PREVIOUS"
TITLE="FcStrCmpIgnoreCase"
HREF="fcstrcmpignorecase.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCSTRSTR"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN5114"
+NAME="AEN5389"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN5114"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN5117"
+NAME="AEN5392"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN5118"
+NAME="AEN5393"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN5127"
+NAME="AEN5402"
></A
><H2
>Description</H2
@@ -215,7 +215,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4792"
+HREF="x103.html#AEN5067"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcstrstrignorecase.html b/doc/fontconfig-devel/fcstrstrignorecase.html
index ee61f6a8..625f9e71 100644
--- a/doc/fontconfig-devel/fcstrstrignorecase.html
+++ b/doc/fontconfig-devel/fcstrstrignorecase.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="String utilities"
-HREF="x103.html#AEN4792"><LINK
+HREF="x103.html#AEN5067"><LINK
REL="PREVIOUS"
TITLE="FcStrStr"
HREF="fcstrstr.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCSTRSTRIGNORECASE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN5139"
+NAME="AEN5414"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN5139"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN5142"
+NAME="AEN5417"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN5143"
+NAME="AEN5418"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN5152"
+NAME="AEN5427"
></A
><H2
>Description</H2
@@ -215,7 +215,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4792"
+HREF="x103.html#AEN5067"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fctolower.html b/doc/fontconfig-devel/fctolower.html
index 820c93d6..8d021cd4 100644
--- a/doc/fontconfig-devel/fctolower.html
+++ b/doc/fontconfig-devel/fctolower.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="String utilities"
-HREF="x103.html#AEN4792"><LINK
+HREF="x103.html#AEN5067"><LINK
REL="PREVIOUS"
TITLE="FcIsUpper"
HREF="fcisupper.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCTOLOWER"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4985"
+NAME="AEN5260"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN4985"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4988"
+NAME="AEN5263"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4989"
+NAME="AEN5264"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4996"
+NAME="AEN5271"
></A
><H2
>Description</H2
@@ -193,7 +193,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4792"
+HREF="x103.html#AEN5067"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcucs4toutf8.html b/doc/fontconfig-devel/fcucs4toutf8.html
index d3138f6b..232a5670 100644
--- a/doc/fontconfig-devel/fcucs4toutf8.html
+++ b/doc/fontconfig-devel/fcucs4toutf8.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="String utilities"
-HREF="x103.html#AEN4792"><LINK
+HREF="x103.html#AEN5067"><LINK
REL="PREVIOUS"
TITLE="FcUtf8ToUcs4"
HREF="fcutf8toucs4.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCUCS4TOUTF8"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4827"
+NAME="AEN5102"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN4827"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4830"
+NAME="AEN5105"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4831"
+NAME="AEN5106"
></A
><TABLE
BORDER="0"
@@ -134,7 +134,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4840"
+NAME="AEN5115"
></A
><H2
>Description</H2
@@ -204,7 +204,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4792"
+HREF="x103.html#AEN5067"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcutf16len.html b/doc/fontconfig-devel/fcutf16len.html
index dd8be012..f899c570 100644
--- a/doc/fontconfig-devel/fcutf16len.html
+++ b/doc/fontconfig-devel/fcutf16len.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="String utilities"
-HREF="x103.html#AEN4792"><LINK
+HREF="x103.html#AEN5067"><LINK
REL="PREVIOUS"
TITLE="FcUtf16ToUcs4"
HREF="fcutf16toucs4.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCUTF16LEN"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4911"
+NAME="AEN5186"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN4911"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4914"
+NAME="AEN5189"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4915"
+NAME="AEN5190"
></A
><TABLE
BORDER="0"
@@ -149,7 +149,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4930"
+NAME="AEN5205"
></A
><H2
>Description</H2
@@ -249,7 +249,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4792"
+HREF="x103.html#AEN5067"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcutf16toucs4.html b/doc/fontconfig-devel/fcutf16toucs4.html
index e0d64360..3f0130b4 100644
--- a/doc/fontconfig-devel/fcutf16toucs4.html
+++ b/doc/fontconfig-devel/fcutf16toucs4.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="String utilities"
-HREF="x103.html#AEN4792"><LINK
+HREF="x103.html#AEN5067"><LINK
REL="PREVIOUS"
TITLE="FcUtf8Len"
HREF="fcutf8len.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCUTF16TOUCS4"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4880"
+NAME="AEN5155"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN4880"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4883"
+NAME="AEN5158"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4884"
+NAME="AEN5159"
></A
><TABLE
BORDER="0"
@@ -144,7 +144,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4897"
+NAME="AEN5172"
></A
><H2
>Description</H2
@@ -236,7 +236,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4792"
+HREF="x103.html#AEN5067"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcutf8len.html b/doc/fontconfig-devel/fcutf8len.html
index ac3ea388..5eb30917 100644
--- a/doc/fontconfig-devel/fcutf8len.html
+++ b/doc/fontconfig-devel/fcutf8len.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="String utilities"
-HREF="x103.html#AEN4792"><LINK
+HREF="x103.html#AEN5067"><LINK
REL="PREVIOUS"
TITLE="FcUcs4ToUtf8"
HREF="fcucs4toutf8.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCUTF8LEN"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4850"
+NAME="AEN5125"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN4850"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4853"
+NAME="AEN5128"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4854"
+NAME="AEN5129"
></A
><TABLE
BORDER="0"
@@ -144,7 +144,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4867"
+NAME="AEN5142"
></A
><H2
>Description</H2
@@ -232,7 +232,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4792"
+HREF="x103.html#AEN5067"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcutf8toucs4.html b/doc/fontconfig-devel/fcutf8toucs4.html
index f8f42735..1676afdc 100644
--- a/doc/fontconfig-devel/fcutf8toucs4.html
+++ b/doc/fontconfig-devel/fcutf8toucs4.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="String utilities"
-HREF="x103.html#AEN4792"><LINK
+HREF="x103.html#AEN5067"><LINK
REL="PREVIOUS"
TITLE="FUNCTIONS"
HREF="x103.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCUTF8TOUCS4"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN4800"
+NAME="AEN5075"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN4800"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN4803"
+NAME="AEN5078"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN4804"
+NAME="AEN5079"
></A
><TABLE
BORDER="0"
@@ -139,7 +139,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN4815"
+NAME="AEN5090"
></A
><H2
>Description</H2
@@ -220,7 +220,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN4792"
+HREF="x103.html#AEN5067"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcvaluedestroy.html b/doc/fontconfig-devel/fcvaluedestroy.html
index 2096e7f7..0c642edb 100644
--- a/doc/fontconfig-devel/fcvaluedestroy.html
+++ b/doc/fontconfig-devel/fcvaluedestroy.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcValue"
-HREF="x103.html#AEN1533"><LINK
+HREF="x103.html#AEN1783"><LINK
REL="PREVIOUS"
TITLE="FUNCTIONS"
HREF="x103.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCVALUEDESTROY"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1542"
+NAME="AEN1792"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1542"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1545"
+NAME="AEN1795"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1546"
+NAME="AEN1796"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1553"
+NAME="AEN1803"
></A
><H2
>Description</H2
@@ -193,7 +193,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1533"
+HREF="x103.html#AEN1783"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcvalueequal.html b/doc/fontconfig-devel/fcvalueequal.html
index fa2ee9d5..0bb6a1c0 100644
--- a/doc/fontconfig-devel/fcvalueequal.html
+++ b/doc/fontconfig-devel/fcvalueequal.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcValue"
-HREF="x103.html#AEN1533"><LINK
+HREF="x103.html#AEN1783"><LINK
REL="PREVIOUS"
TITLE="FcValuePrint"
HREF="fcvalueprint.html"></HEAD
@@ -68,7 +68,7 @@ NAME="FCVALUEEQUAL"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1603"
+NAME="AEN1853"
></A
><H2
>Name</H2
@@ -76,7 +76,7 @@ NAME="AEN1603"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1606"
+NAME="AEN1856"
></A
><H2
>Synopsis</H2
@@ -85,7 +85,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1607"
+NAME="AEN1857"
></A
><TABLE
BORDER="0"
@@ -127,7 +127,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1616"
+NAME="AEN1866"
></A
><H2
>Description</H2
@@ -183,7 +183,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1533"
+HREF="x103.html#AEN1783"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcvalueprint.html b/doc/fontconfig-devel/fcvalueprint.html
index 3836b8e2..5b66bbbd 100644
--- a/doc/fontconfig-devel/fcvalueprint.html
+++ b/doc/fontconfig-devel/fcvalueprint.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcValue"
-HREF="x103.html#AEN1533"><LINK
+HREF="x103.html#AEN1783"><LINK
REL="PREVIOUS"
TITLE="FcValueSave"
HREF="fcvaluesave.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCVALUEPRINT"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1583"
+NAME="AEN1833"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1583"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1586"
+NAME="AEN1836"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1587"
+NAME="AEN1837"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1594"
+NAME="AEN1844"
></A
><H2
>Description</H2
@@ -194,7 +194,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1533"
+HREF="x103.html#AEN1783"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcvaluesave.html b/doc/fontconfig-devel/fcvaluesave.html
index 8d918be5..21e624a1 100644
--- a/doc/fontconfig-devel/fcvaluesave.html
+++ b/doc/fontconfig-devel/fcvaluesave.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcValue"
-HREF="x103.html#AEN1533"><LINK
+HREF="x103.html#AEN1783"><LINK
REL="PREVIOUS"
TITLE="FcValueDestroy"
HREF="fcvaluedestroy.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCVALUESAVE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN1562"
+NAME="AEN1812"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN1562"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN1565"
+NAME="AEN1815"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN1566"
+NAME="AEN1816"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN1573"
+NAME="AEN1823"
></A
><H2
>Description</H2
@@ -198,7 +198,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN1533"
+HREF="x103.html#AEN1783"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcweightfromopentype.html b/doc/fontconfig-devel/fcweightfromopentype.html
index 09793a50..e147b43b 100644
--- a/doc/fontconfig-devel/fcweightfromopentype.html
+++ b/doc/fontconfig-devel/fcweightfromopentype.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcWeight"
-HREF="x103.html#AEN3746"><LINK
+HREF="x103.html#AEN3996"><LINK
REL="PREVIOUS"
TITLE="FcWeightToOpenTypeDouble"
HREF="fcweighttoopentypedouble.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCWEIGHTFROMOPENTYPE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3801"
+NAME="AEN4051"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3801"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3804"
+NAME="AEN4054"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3805"
+NAME="AEN4055"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3812"
+NAME="AEN4062"
></A
><H2
>Description</H2
@@ -148,7 +148,7 @@ Use the other function instead.
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3817"
+NAME="AEN4067"
></A
><H2
>Since</H2
@@ -205,7 +205,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN3746"
+HREF="x103.html#AEN3996"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcweightfromopentypedouble.html b/doc/fontconfig-devel/fcweightfromopentypedouble.html
index 6b63a44a..d2b77782 100644
--- a/doc/fontconfig-devel/fcweightfromopentypedouble.html
+++ b/doc/fontconfig-devel/fcweightfromopentypedouble.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcWeight"
-HREF="x103.html#AEN3746"><LINK
+HREF="x103.html#AEN3996"><LINK
REL="PREVIOUS"
TITLE="FUNCTIONS"
HREF="x103.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCWEIGHTFROMOPENTYPEDOUBLE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3754"
+NAME="AEN4004"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3754"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3757"
+NAME="AEN4007"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3758"
+NAME="AEN4008"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3765"
+NAME="AEN4015"
></A
><H2
>Description</H2
@@ -149,7 +149,7 @@ necessarily match any of the predefined constants.
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3769"
+NAME="AEN4019"
></A
><H2
>Since</H2
@@ -206,7 +206,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN3746"
+HREF="x103.html#AEN3996"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcweighttoopentype.html b/doc/fontconfig-devel/fcweighttoopentype.html
index 12c3092d..67705f36 100644
--- a/doc/fontconfig-devel/fcweighttoopentype.html
+++ b/doc/fontconfig-devel/fcweighttoopentype.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcWeight"
-HREF="x103.html#AEN3746"><LINK
+HREF="x103.html#AEN3996"><LINK
REL="PREVIOUS"
TITLE="FcWeightFromOpenType"
HREF="fcweightfromopentype.html"></HEAD
@@ -68,7 +68,7 @@ NAME="FCWEIGHTTOOPENTYPE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3825"
+NAME="AEN4075"
></A
><H2
>Name</H2
@@ -76,7 +76,7 @@ NAME="AEN3825"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3828"
+NAME="AEN4078"
></A
><H2
>Synopsis</H2
@@ -85,7 +85,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3829"
+NAME="AEN4079"
></A
><TABLE
BORDER="0"
@@ -122,7 +122,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3836"
+NAME="AEN4086"
></A
><H2
>Description</H2
@@ -141,7 +141,7 @@ Use the other function instead.
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3841"
+NAME="AEN4091"
></A
><H2
>Since</H2
@@ -194,7 +194,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN3746"
+HREF="x103.html#AEN3996"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/fcweighttoopentypedouble.html b/doc/fontconfig-devel/fcweighttoopentypedouble.html
index 680134c4..9056d243 100644
--- a/doc/fontconfig-devel/fcweighttoopentypedouble.html
+++ b/doc/fontconfig-devel/fcweighttoopentypedouble.html
@@ -10,7 +10,7 @@ REL="HOME"
HREF="t1.html"><LINK
REL="UP"
TITLE="FcWeight"
-HREF="x103.html#AEN3746"><LINK
+HREF="x103.html#AEN3996"><LINK
REL="PREVIOUS"
TITLE="FcWeightFromOpenTypeDouble"
HREF="fcweightfromopentypedouble.html"><LINK
@@ -75,7 +75,7 @@ NAME="FCWEIGHTTOOPENTYPEDOUBLE"
><DIV
CLASS="REFNAMEDIV"
><A
-NAME="AEN3777"
+NAME="AEN4027"
></A
><H2
>Name</H2
@@ -83,7 +83,7 @@ NAME="AEN3777"
><DIV
CLASS="REFSYNOPSISDIV"
><A
-NAME="AEN3780"
+NAME="AEN4030"
></A
><H2
>Synopsis</H2
@@ -92,7 +92,7 @@ CLASS="FUNCSYNOPSIS"
><P
></P
><A
-NAME="AEN3781"
+NAME="AEN4031"
></A
><TABLE
BORDER="0"
@@ -129,7 +129,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3788"
+NAME="AEN4038"
></A
><H2
>Description</H2
@@ -149,7 +149,7 @@ returns a number in the range 1 to 1000.
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN3793"
+NAME="AEN4043"
></A
><H2
>Since</H2
@@ -206,7 +206,7 @@ WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
-HREF="x103.html#AEN3746"
+HREF="x103.html#AEN3996"
ACCESSKEY="U"
>Up</A
></TD
diff --git a/doc/fontconfig-devel/t1.html b/doc/fontconfig-devel/t1.html
index 18705b36..3b580b23 100644
--- a/doc/fontconfig-devel/t1.html
+++ b/doc/fontconfig-devel/t1.html
@@ -2,7 +2,7 @@
<HTML
><HEAD
><TITLE
->Fontconfig Developers Reference, Version 2.13.0
+>Fontconfig Developers Reference, Version 2.13.1
</TITLE
><META
NAME="GENERATOR"
@@ -25,7 +25,7 @@ CLASS="TITLEPAGE"
CLASS="TITLE"
><A
NAME="AEN1"
->Fontconfig Developers Reference, Version 2.13.0</A
+>Fontconfig Developers Reference, Version 2.13.1</A
></H1
><A
HREF="ln12.html"
diff --git a/doc/fontconfig-devel/x103.html b/doc/fontconfig-devel/x103.html
index f43badc3..bf12b80c 100644
--- a/doc/fontconfig-devel/x103.html
+++ b/doc/fontconfig-devel/x103.html
@@ -162,6 +162,11 @@ HREF="fcpatterndestroy.html"
>&nbsp;--&nbsp;Destroy a pattern</DT
><DT
><A
+HREF="fcpatternobjectcount.html"
+>FcPatternObjectCount</A
+>&nbsp;--&nbsp;Returns the number of the object</DT
+><DT
+><A
HREF="fcpatternequal.html"
>FcPatternEqual</A
>&nbsp;--&nbsp;Compare patterns</DT
@@ -227,6 +232,46 @@ HREF="fcpatternremove.html"
>&nbsp;--&nbsp;Remove one object of the specified type from the pattern</DT
><DT
><A
+HREF="fcpatterniterstart.html"
+>FcPatternIterStart</A
+>&nbsp;--&nbsp;Initialize the iterator with the first iterator in the pattern</DT
+><DT
+><A
+HREF="fcpatterniternext.html"
+>FcPatternIterNext</A
+>&nbsp;--&nbsp;</DT
+><DT
+><A
+HREF="fcpatterniterequal.html"
+>FcPatternIterEqual</A
+>&nbsp;--&nbsp;Compare iterators</DT
+><DT
+><A
+HREF="fcpatternfinditer.html"
+>FcPatternFindIter</A
+>&nbsp;--&nbsp;Set the iterator to point to the object in the pattern</DT
+><DT
+><A
+HREF="fcpatterniterisvalid.html"
+>FcPatternIterIsValid</A
+>&nbsp;--&nbsp;Check whether the iterator is valid or not</DT
+><DT
+><A
+HREF="fcpatternitergetobject.html"
+>FcPatternIterGetObject</A
+>&nbsp;--&nbsp;Returns an object name which the iterator point to</DT
+><DT
+><A
+HREF="fcpatternitervaluecount.html"
+>FcPatternIterValueCount</A
+>&nbsp;--&nbsp;Returns the number of the values which the iterator point to</DT
+><DT
+><A
+HREF="fcpatternitergetvalue.html"
+>FcPatternIterGetValue</A
+>&nbsp;--&nbsp;Returns a value which the iterator point to</DT
+><DT
+><A
HREF="fcpatternprint.html"
>FcPatternPrint</A
>&nbsp;--&nbsp;Print a pattern for debugging</DT
@@ -262,7 +307,7 @@ CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="AEN1066"
+NAME="AEN1316"
>FcFontSet</A
></H2
><DIV
@@ -324,7 +369,7 @@ CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="AEN1277"
+NAME="AEN1527"
>FcObjectSet</A
></H2
><DIV
@@ -367,7 +412,7 @@ CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="AEN1379"
+NAME="AEN1629"
>FreeType specific functions</A
></H2
><DIV
@@ -420,7 +465,7 @@ CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="AEN1533"
+NAME="AEN1783"
>FcValue</A
></H2
><DIV
@@ -468,7 +513,7 @@ CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="AEN1619"
+NAME="AEN1869"
>FcCharSet</A
></H2
><DIV
@@ -588,7 +633,7 @@ CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="AEN2086"
+NAME="AEN2336"
>FcLangSet</A
></H2
><DIV
@@ -698,7 +743,7 @@ CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="AEN2480"
+NAME="AEN2730"
>FcMatrix</A
></H2
><DIV
@@ -754,7 +799,7 @@ CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="AEN2660"
+NAME="AEN2910"
>FcRange</A
></H2
><DIV
@@ -800,7 +845,7 @@ CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="AEN2788"
+NAME="AEN3038"
>FcConfig</A
></H2
><DIV
@@ -998,7 +1043,7 @@ CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="AEN3593"
+NAME="AEN3843"
>FcObjectType</A
></H2
><DIV
@@ -1035,7 +1080,7 @@ CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="AEN3658"
+NAME="AEN3908"
>FcConstant</A
></H2
><DIV
@@ -1076,7 +1121,7 @@ CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="AEN3746"
+NAME="AEN3996"
>FcWeight</A
></H2
><DIV
@@ -1117,7 +1162,7 @@ CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="AEN3844"
+NAME="AEN4094"
>FcBlanks</A
></H2
><DIV
@@ -1167,7 +1212,7 @@ CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="AEN3928"
+NAME="AEN4178"
>FcAtomic</A
></H2
><DIV
@@ -1230,7 +1275,7 @@ CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="AEN4089"
+NAME="AEN4339"
>File and Directory routines</A
></H2
><DIV
@@ -1312,7 +1357,7 @@ CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="AEN4367"
+NAME="AEN4617"
>FcCache routines</A
></H2
><DIV
@@ -1387,6 +1432,11 @@ HREF="fccachecreatetagfile.html"
HREF="fcdircachecreateuuid.html"
>FcDirCacheCreateUUID</A
>&nbsp;--&nbsp;Create .uuid file at a directory</DT
+><DT
+><A
+HREF="fcdircachedeleteuuid.html"
+>FcDirCacheDeleteUUID</A
+>&nbsp;--&nbsp;Delete .uuid file</DT
></DL
></DIV
><P
@@ -1400,7 +1450,7 @@ CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="AEN4551"
+NAME="AEN4826"
>FcStrSet and FcStrList</A
></H2
><DIV
@@ -1477,7 +1527,7 @@ CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="AEN4792"
+NAME="AEN5067"
>String utilities</A
></H2
><DIV
diff --git a/doc/fontconfig-user.html b/doc/fontconfig-user.html
index 1c639016..bbef7de2 100644
--- a/doc/fontconfig-user.html
+++ b/doc/fontconfig-user.html
@@ -1245,9 +1245,9 @@ CLASS="PROGRAMLISTING"
Names not including any well known alias are given 'sans-serif'
--&#62;
&#60;match target="pattern"&#62;
- &#60;test qual="all" name="family" mode="not_eq"&#62;&#60;string&#62;sans-serif&#60;/string&#62;&#60;/test&#62;
- &#60;test qual="all" name="family" mode="not_eq"&#62;&#60;string&#62;serif&#60;/string&#62;&#60;/test&#62;
- &#60;test qual="all" name="family" mode="not_eq"&#62;&#60;string&#62;monospace&#60;/string&#62;&#60;/test&#62;
+ &#60;test qual="all" name="family" compare="not_eq"&#62;&#60;string&#62;sans-serif&#60;/string&#62;&#60;/test&#62;
+ &#60;test qual="all" name="family" compare="not_eq"&#62;&#60;string&#62;serif&#60;/string&#62;&#60;/test&#62;
+ &#60;test qual="all" name="family" compare="not_eq"&#62;&#60;string&#62;monospace&#60;/string&#62;&#60;/test&#62;
&#60;edit name="family" mode="append_last"&#62;&#60;string&#62;sans-serif&#60;/string&#62;&#60;/edit&#62;
&#60;/match&#62;
@@ -1309,7 +1309,7 @@ CLASS="PROGRAMLISTING"
add 'monospace' as the alternative
--&#62;
&#60;match target="pattern"&#62;
- &#60;test name="family" mode="eq"&#62;
+ &#60;test name="family" compare="eq"&#62;
&#60;string&#62;Courier New&#60;/string&#62;
&#60;/test&#62;
&#60;edit name="family" mode="prepend"&#62;
@@ -1317,7 +1317,7 @@ CLASS="PROGRAMLISTING"
&#60;/edit&#62;
&#60;/match&#62;
&#60;match target="pattern"&#62;
- &#60;test name="family" mode="eq"&#62;
+ &#60;test name="family" compare="eq"&#62;
&#60;string&#62;Courier&#60;/string&#62;
&#60;/test&#62;
&#60;edit name="family" mode="prepend"&#62;
@@ -1505,6 +1505,13 @@ is used to override the default configuration directory.
><P
><I
CLASS="EMPHASIS"
+>FONTCONFIG_SYSROOT</I
+>
+is used to set a default sysroot directory.
+ </P
+><P
+><I
+CLASS="EMPHASIS"
>FC_DEBUG</I
>
is used to output the detailed debugging messages. see <A
@@ -1536,27 +1543,44 @@ CLASS="EMPHASIS"
>
is used to control the use of mmap(2) for the cache files if available. this take a boolean value. fontconfig will checks if the cache files are stored on the filesystem that is safe to use mmap(2). explicitly setting this environment variable will causes skipping this check and enforce to use or not use mmap(2) anyway.
</P
+><P
+><I
+CLASS="EMPHASIS"
+>SOURCE_DATE_EPOCH</I
+>
+is used to ensure <TT
+CLASS="LITERAL"
+>fc-cache(1)</TT
+> generates files in a deterministic manner in order to support reproducible builds. When set to a numeric representation of UNIX timestamp, fontconfig will prefer this value over using the modification timestamps of the input files in order to identify which cache files require regeneration. If <TT
+CLASS="LITERAL"
+>SOURCE_DATE_EPOCH</TT
+> is not set (or is newer than the mtime of the directory), the existing behaviour is unchanged.
+ </P
></DIV
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN278"
+NAME="AEN284"
></A
><H2
>See Also</H2
><P
->fc-cat(1), fc-cache(1), fc-list(1), fc-match(1), fc-query(1)
+>fc-cat(1), fc-cache(1), fc-list(1), fc-match(1), fc-query(1), <A
+HREF="https://reproducible-builds.org/specs/source-date-epoch/"
+TARGET="_top"
+>SOURCE_DATE_EPOCH</A
+>.
</P
></DIV
><DIV
CLASS="REFSECT1"
><A
-NAME="AEN281"
+NAME="AEN288"
></A
><H2
>Version</H2
><P
->Fontconfig version 2.13.0
+>Fontconfig version 2.13.1
</P
></DIV
diff --git a/doc/fontconfig-user.pdf b/doc/fontconfig-user.pdf
index 9e38e169..16b70bbd 100644
--- a/doc/fontconfig-user.pdf
+++ b/doc/fontconfig-user.pdf
Binary files differ
diff --git a/doc/fontconfig-user.sgml b/doc/fontconfig-user.sgml
index e065ff72..89df86ef 100644
--- a/doc/fontconfig-user.sgml
+++ b/doc/fontconfig-user.sgml
@@ -589,9 +589,9 @@ This is an example of a system-wide configuration file
Names not including any well known alias are given 'sans-serif'
--&gt;
&lt;match target="pattern"&gt;
- &lt;test qual="all" name="family" mode="not_eq"&gt;&lt;string&gt;sans-serif&lt;/string&gt;&lt;/test&gt;
- &lt;test qual="all" name="family" mode="not_eq"&gt;&lt;string&gt;serif&lt;/string&gt;&lt;/test&gt;
- &lt;test qual="all" name="family" mode="not_eq"&gt;&lt;string&gt;monospace&lt;/string&gt;&lt;/test&gt;
+ &lt;test qual="all" name="family" compare="not_eq"&gt;&lt;string&gt;sans-serif&lt;/string&gt;&lt;/test&gt;
+ &lt;test qual="all" name="family" compare="not_eq"&gt;&lt;string&gt;serif&lt;/string&gt;&lt;/test&gt;
+ &lt;test qual="all" name="family" compare="not_eq"&gt;&lt;string&gt;monospace&lt;/string&gt;&lt;/test&gt;
&lt;edit name="family" mode="append_last"&gt;&lt;string&gt;sans-serif&lt;/string&gt;&lt;/edit&gt;
&lt;/match&gt;
@@ -653,7 +653,7 @@ This is an example of a system-wide configuration file
add 'monospace' as the alternative
--&gt;
&lt;match target="pattern"&gt;
- &lt;test name="family" mode="eq"&gt;
+ &lt;test name="family" compare="eq"&gt;
&lt;string&gt;Courier New&lt;/string&gt;
&lt;/test&gt;
&lt;edit name="family" mode="prepend"&gt;
@@ -661,7 +661,7 @@ This is an example of a system-wide configuration file
&lt;/edit&gt;
&lt;/match&gt;
&lt;match target="pattern"&gt;
- &lt;test name="family" mode="eq"&gt;
+ &lt;test name="family" compare="eq"&gt;
&lt;string&gt;Courier&lt;/string&gt;
&lt;/test&gt;
&lt;edit name="family" mode="prepend"&gt;
@@ -783,6 +783,10 @@ is used to override the default configuration file.
is used to override the default configuration directory.
</para>
<para>
+<emphasis>FONTCONFIG_SYSROOT</emphasis>
+is used to set a default sysroot directory.
+ </para>
+ <para>
<emphasis>FC_DEBUG</emphasis>
is used to output the detailed debugging messages. see <link linkend="debug">Debugging Applications</link> section for more details.
</para>
@@ -798,10 +802,14 @@ is used to specify the default language as the weak binding in the query. if thi
<emphasis>FONTCONFIG_USE_MMAP</emphasis>
is used to control the use of mmap(2) for the cache files if available. this take a boolean value. fontconfig will checks if the cache files are stored on the filesystem that is safe to use mmap(2). explicitly setting this environment variable will causes skipping this check and enforce to use or not use mmap(2) anyway.
</para>
+ <para>
+<emphasis>SOURCE_DATE_EPOCH</emphasis>
+is used to ensure <literal>fc-cache(1)</literal> generates files in a deterministic manner in order to support reproducible builds. When set to a numeric representation of UNIX timestamp, fontconfig will prefer this value over using the modification timestamps of the input files in order to identify which cache files require regeneration. If <literal>SOURCE_DATE_EPOCH</literal> is not set (or is newer than the mtime of the directory), the existing behaviour is unchanged.
+ </para>
</refsect1>
<refsect1><title>See Also</title>
<para>
-fc-cat(1), fc-cache(1), fc-list(1), fc-match(1), fc-query(1)
+fc-cat(1), fc-cache(1), fc-list(1), fc-match(1), fc-query(1), <ulink url="https://reproducible-builds.org/specs/source-date-epoch/">SOURCE_DATE_EPOCH</ulink>.
</para>
</refsect1>
<refsect1><title>Version</title>
diff --git a/doc/fontconfig-user.txt b/doc/fontconfig-user.txt
index 3e4a10b1..b6aa7a8b 100644
--- a/doc/fontconfig-user.txt
+++ b/doc/fontconfig-user.txt
@@ -1,18 +1,18 @@
- fonts-conf
+ fonts-conf
Name
- fonts.conf -- Font configuration files
+ fonts.conf -- Font configuration files
Synopsis
- /etc/fonts/fonts.conf
- /etc/fonts/fonts.dtd
- /etc/fonts/conf.d
- $XDG_CONFIG_HOME/fontconfig/conf.d
- $XDG_CONFIG_HOME/fontconfig/fonts.conf
- ~/.fonts.conf.d
- ~/.fonts.conf
+ /etc/fonts/fonts.conf
+ /etc/fonts/fonts.dtd
+ /etc/fonts/conf.d
+ $XDG_CONFIG_HOME/fontconfig/conf.d
+ $XDG_CONFIG_HOME/fontconfig/fonts.conf
+ ~/.fonts.conf.d
+ ~/.fonts.conf
Description
@@ -21,48 +21,44 @@ Description
Functional Overview
- Fontconfig contains two essential modules, the configuration
- module which builds an internal configuration from XML files
- and the matching module which accepts font patterns and returns
- the nearest matching font.
-
-Font Configuration
-
- The configuration module consists of the FcConfig datatype,
- libexpat and FcConfigParse which walks over an XML tree and
- amends a configuration with data found within. From an external
- perspective, configuration of the library consists of
- generating a valid XML tree and feeding that to FcConfigParse.
- The only other mechanism provided to applications for changing
- the running configuration is to add fonts and directories to
- the list of application-provided font files.
-
- The intent is to make font configurations relatively static,
- and shared by as many applications as possible. It is hoped
- that this will lead to more stable font selection when passing
- names from one application to another. XML was chosen as a
- configuration file format because it provides a format which is
- easy for external agents to edit while retaining the correct
+ Fontconfig contains two essential modules, the configuration module which
+ builds an internal configuration from XML files and the matching module
+ which accepts font patterns and returns the nearest matching font.
+
+ Font Configuration
+
+ The configuration module consists of the FcConfig datatype, libexpat and
+ FcConfigParse which walks over an XML tree and amends a configuration with
+ data found within. From an external perspective, configuration of the
+ library consists of generating a valid XML tree and feeding that to
+ FcConfigParse. The only other mechanism provided to applications for
+ changing the running configuration is to add fonts and directories to the
+ list of application-provided font files.
+
+ The intent is to make font configurations relatively static, and shared by
+ as many applications as possible. It is hoped that this will lead to more
+ stable font selection when passing names from one application to another.
+ XML was chosen as a configuration file format because it provides a format
+ which is easy for external agents to edit while retaining the correct
structure and syntax.
- Font configuration is separate from font matching; applications
- needing to do their own matching can access the available fonts
- from the library and perform private matching. The intent is to
- permit applications to pick and choose appropriate
- functionality from the library instead of forcing them to
- choose between this library and a private configuration
- mechanism. The hope is that this will ensure that configuration
- of fonts for all applications can be centralized in one place.
- Centralizing font configuration will simplify and regularize
- font installation and customization.
-
-Font Properties
-
- While font patterns may contain essentially any properties,
- there are some well known properties with associated types.
- Fontconfig uses some of these properties for font matching and
- font completion. Others are provided as a convenience for the
- applications' rendering mechanism.
+ Font configuration is separate from font matching; applications needing to
+ do their own matching can access the available fonts from the library and
+ perform private matching. The intent is to permit applications to pick and
+ choose appropriate functionality from the library instead of forcing them
+ to choose between this library and a private configuration mechanism. The
+ hope is that this will ensure that configuration of fonts for all
+ applications can be centralized in one place. Centralizing font
+ configuration will simplify and regularize font installation and
+ customization.
+
+ Font Properties
+
+ While font patterns may contain essentially any properties, there are some
+ well known properties with associated types. Fontconfig uses some of these
+ properties for font matching and font completion. Others are provided as a
+ convenience for the applications' rendering mechanism.
+
Property Type Description
--------------------------------------------------------------
family String Font family names
@@ -77,8 +73,7 @@ Font Properties
width Int Condensed, normal or expanded
aspect Double Stretches glyphs horizontally before hinting
pixelsize Double Pixel size
- spacing Int Proportional, dual-width, monospace or charcel
-l
+ spacing Int Proportional, dual-width, monospace or charcell
foundry String Font foundry name
antialias Bool Whether glyphs can be antialiased
hinting Bool Whether the rasterizer should use hinting
@@ -93,8 +88,7 @@ l
outline Bool Whether the glyphs are outlines
scalable Bool Whether glyphs can be scaled
color Bool Whether any glyphs have color
- scale Double Scale factor for point->pixel conversions (dep
-recated)
+ scale Double Scale factor for point->pixel conversions (deprecated)
dpi Double Target dots per inch
rgba Int unknown, rgb, bgr, vrgb, vbgr,
none - subpixel geometry
@@ -106,491 +100,468 @@ recated)
fontversion Int Version number of the font
capability String List of layout capabilities in the font
fontformat String String name of the font format
- embolden Bool Rasterizer should synthetically embolden the f
-ont
+ embolden Bool Rasterizer should synthetically embolden the font
embeddedbitmap Bool Use the embedded bitmap instead of the outline
decorative Bool Whether the style is a decorative variant
- fontfeatures String List of the feature tags in OpenType to be ena
-bled
- namelang String Language name to be used for the default value
- of
+ fontfeatures String List of the feature tags in OpenType to be enabled
+ namelang String Language name to be used for the default value of
familylang, stylelang, and fullnamelang
prgname String String Name of the running program
postscriptname String Font family name in PostScript
-Font Matching
- Fontconfig performs matching by measuring the distance from a
- provided pattern to all of the available fonts in the system.
- The closest matching font is selected. This ensures that a font
- will always be returned, but doesn't ensure that it is anything
- like the requested pattern.
+ Font Matching
- Font matching starts with an application constructed pattern.
- The desired attributes of the resulting font are collected
- together in a pattern. Each property of the pattern can contain
- one or more values; these are listed in priority order; matches
- earlier in the list are considered "closer" than matches later
- in the list.
+ Fontconfig performs matching by measuring the distance from a provided
+ pattern to all of the available fonts in the system. The closest matching
+ font is selected. This ensures that a font will always be returned, but
+ doesn't ensure that it is anything like the requested pattern.
+
+ Font matching starts with an application constructed pattern. The desired
+ attributes of the resulting font are collected together in a pattern. Each
+ property of the pattern can contain one or more values; these are listed
+ in priority order; matches earlier in the list are considered "closer"
+ than matches later in the list.
The initial pattern is modified by applying the list of editing
- instructions specific to patterns found in the configuration;
- each consists of a match predicate and a set of editing
- operations. They are executed in the order they appeared in the
- configuration. Each match causes the associated sequence of
- editing operations to be applied.
-
- After the pattern has been edited, a sequence of default
- substitutions are performed to canonicalize the set of
- available properties; this avoids the need for the lower layers
- to constantly provide default values for various font
- properties during rendering.
-
- The canonical font pattern is finally matched against all
- available fonts. The distance from the pattern to the font is
- measured for each of several properties: foundry, charset,
- family, lang, spacing, pixelsize, style, slant, weight,
- antialias, rasterizer and outline. This list is in priority
- order -- results of comparing earlier elements of this list
- weigh more heavily than later elements.
-
- There is one special case to this rule; family names are split
- into two bindings; strong and weak. Strong family names are
- given greater precedence in the match than lang elements while
- weak family names are given lower precedence than lang
- elements. This permits the document language to drive font
- selection when any document specified font is unavailable.
-
- The pattern representing that font is augmented to include any
- properties found in the pattern but not found in the font
- itself; this permits the application to pass rendering
- instructions or any other data through the matching system.
- Finally, the list of editing instructions specific to fonts
- found in the configuration are applied to the pattern. This
- modified pattern is returned to the application.
-
- The return value contains sufficient information to locate and
- rasterize the font, including the file name, pixel size and
- other rendering data. As none of the information involved
- pertains to the FreeType library, applications are free to use
- any rasterization engine or even to take the identified font
- file and access it directly.
-
- The match/edit sequences in the configuration are performed in
- two passes because there are essentially two different
- operations necessary -- the first is to modify how fonts are
- selected; aliasing families and adding suitable defaults. The
- second is to modify how the selected fonts are rasterized.
- Those must apply to the selected font, not the original pattern
- as false matches will often occur.
-
-Font Names
-
- Fontconfig provides a textual representation for patterns that
- the library can both accept and generate. The representation is
- in three parts, first a list of family names, second a list of
- point sizes and finally a list of additional properties:
- <families>-<point sizes>:<name1>=<values1>:<name2>=<values2>...
-
- Values in a list are separated with commas. The name needn't
- include either families or point sizes; they can be elided. In
- addition, there are symbolic constants that simultaneously
- indicate both a name and a value. Here are some examples:
- Name Meaning
- ----------------------------------------------------------
- Times-12 12 point Times Roman
- Times-12:bold 12 point Times Bold
- Courier:italic Courier Italic in the default size
- Monospace:matrix=1 .1 0 1 The users preferred monospace font
- with artificial obliquing
-
- The '\', '-', ':' and ',' characters in family names must be
- preceded by a '\' character to avoid having them
- misinterpreted. Similarly, values containing '\', '=', '_', ':'
- and ',' must also have them preceded by a '\' character. The
- '\' characters are stripped out of the family name and values
- as the font name is read.
+ instructions specific to patterns found in the configuration; each
+ consists of a match predicate and a set of editing operations. They are
+ executed in the order they appeared in the configuration. Each match
+ causes the associated sequence of editing operations to be applied.
+
+ After the pattern has been edited, a sequence of default substitutions are
+ performed to canonicalize the set of available properties; this avoids the
+ need for the lower layers to constantly provide default values for various
+ font properties during rendering.
+
+ The canonical font pattern is finally matched against all available fonts.
+ The distance from the pattern to the font is measured for each of several
+ properties: foundry, charset, family, lang, spacing, pixelsize, style,
+ slant, weight, antialias, rasterizer and outline. This list is in priority
+ order -- results of comparing earlier elements of this list weigh more
+ heavily than later elements.
+
+ There is one special case to this rule; family names are split into two
+ bindings; strong and weak. Strong family names are given greater
+ precedence in the match than lang elements while weak family names are
+ given lower precedence than lang elements. This permits the document
+ language to drive font selection when any document specified font is
+ unavailable.
+
+ The pattern representing that font is augmented to include any properties
+ found in the pattern but not found in the font itself; this permits the
+ application to pass rendering instructions or any other data through the
+ matching system. Finally, the list of editing instructions specific to
+ fonts found in the configuration are applied to the pattern. This modified
+ pattern is returned to the application.
+
+ The return value contains sufficient information to locate and rasterize
+ the font, including the file name, pixel size and other rendering data. As
+ none of the information involved pertains to the FreeType library,
+ applications are free to use any rasterization engine or even to take the
+ identified font file and access it directly.
+
+ The match/edit sequences in the configuration are performed in two passes
+ because there are essentially two different operations necessary -- the
+ first is to modify how fonts are selected; aliasing families and adding
+ suitable defaults. The second is to modify how the selected fonts are
+ rasterized. Those must apply to the selected font, not the original
+ pattern as false matches will often occur.
+
+ Font Names
+
+ Fontconfig provides a textual representation for patterns that the library
+ can both accept and generate. The representation is in three parts, first
+ a list of family names, second a list of point sizes and finally a list of
+ additional properties:
+
+ <families>-<point sizes>:<name1>=<values1>:<name2>=<values2>...
+
+
+ Values in a list are separated with commas. The name needn't include
+ either families or point sizes; they can be elided. In addition, there are
+ symbolic constants that simultaneously indicate both a name and a value.
+ Here are some examples:
+
+ Name Meaning
+ ----------------------------------------------------------
+ Times-12 12 point Times Roman
+ Times-12:bold 12 point Times Bold
+ Courier:italic Courier Italic in the default size
+ Monospace:matrix=1 .1 0 1 The users preferred monospace font
+ with artificial obliquing
+
+
+ The '\', '-', ':' and ',' characters in family names must be preceded by a
+ '\' character to avoid having them misinterpreted. Similarly, values
+ containing '\', '=', '_', ':' and ',' must also have them preceded by a
+ '\' character. The '\' characters are stripped out of the family name and
+ values as the font name is read.
Debugging Applications
- To help diagnose font and applications problems, fontconfig is
- built with a large amount of internal debugging left enabled.
- It is controlled by means of the FC_DEBUG environment variable.
- The value of this variable is interpreted as a number, and each
- bit within that value controls different debugging messages.
- Name Value Meaning
- ---------------------------------------------------------
- MATCH 1 Brief information about font matching
- MATCHV 2 Extensive font matching information
- EDIT 4 Monitor match/test/edit execution
- FONTSET 8 Track loading of font information at startup
- CACHE 16 Watch cache files being written
- CACHEV 32 Extensive cache file writing information
- PARSE 64 (no longer in use)
- SCAN 128 Watch font files being scanned to build caches
- SCANV 256 Verbose font file scanning information
- MEMORY 512 Monitor fontconfig memory usage
- CONFIG 1024 Monitor which config files are loaded
- LANGSET 2048 Dump char sets used to construct lang values
- MATCH2 4096 Display font-matching transformation in patterns
-
- Add the value of the desired debug levels together and assign
- that (in base 10) to the FC_DEBUG environment variable before
- running the application. Output from these statements is sent
- to stdout.
+ To help diagnose font and applications problems, fontconfig is built with
+ a large amount of internal debugging left enabled. It is controlled by
+ means of the FC_DEBUG environment variable. The value of this variable is
+ interpreted as a number, and each bit within that value controls different
+ debugging messages.
+
+ Name Value Meaning
+ ---------------------------------------------------------
+ MATCH 1 Brief information about font matching
+ MATCHV 2 Extensive font matching information
+ EDIT 4 Monitor match/test/edit execution
+ FONTSET 8 Track loading of font information at startup
+ CACHE 16 Watch cache files being written
+ CACHEV 32 Extensive cache file writing information
+ PARSE 64 (no longer in use)
+ SCAN 128 Watch font files being scanned to build caches
+ SCANV 256 Verbose font file scanning information
+ MEMORY 512 Monitor fontconfig memory usage
+ CONFIG 1024 Monitor which config files are loaded
+ LANGSET 2048 Dump char sets used to construct lang values
+ MATCH2 4096 Display font-matching transformation in patterns
+
+
+ Add the value of the desired debug levels together and assign that (in
+ base 10) to the FC_DEBUG environment variable before running the
+ application. Output from these statements is sent to stdout.
Lang Tags
- Each font in the database contains a list of languages it
- supports. This is computed by comparing the Unicode coverage of
- the font with the orthography of each language. Languages are
- tagged using an RFC-3066 compatible naming and occur in two
- parts -- the ISO 639 language tag followed a hyphen and then by
- the ISO 3166 country code. The hyphen and country code may be
- elided.
-
- Fontconfig has orthographies for several languages built into
- the library. No provision has been made for adding new ones
- aside from rebuilding the library. It currently supports 122 of
- the 139 languages named in ISO 639-1, 141 of the languages with
- two-letter codes from ISO 639-2 and another 30 languages with
- only three-letter codes. Languages with both two and three
- letter codes are provided with only the two letter code.
-
- For languages used in multiple territories with radically
- different character sets, fontconfig includes per-territory
- orthographies. This includes Azerbaijani, Kurdish, Pashto,
- Tigrinya and Chinese.
+ Each font in the database contains a list of languages it supports. This
+ is computed by comparing the Unicode coverage of the font with the
+ orthography of each language. Languages are tagged using an RFC-3066
+ compatible naming and occur in two parts -- the ISO 639 language tag
+ followed a hyphen and then by the ISO 3166 country code. The hyphen and
+ country code may be elided.
-Configuration File Format
+ Fontconfig has orthographies for several languages built into the library.
+ No provision has been made for adding new ones aside from rebuilding the
+ library. It currently supports 122 of the 139 languages named in ISO
+ 639-1, 141 of the languages with two-letter codes from ISO 639-2 and
+ another 30 languages with only three-letter codes. Languages with both two
+ and three letter codes are provided with only the two letter code.
- Configuration files for fontconfig are stored in XML format;
- this format makes external configuration tools easier to write
- and ensures that they will generate syntactically correct
- configuration files. As XML files are plain text, they can also
- be manipulated by the expert user using a text editor.
-
- The fontconfig document type definition resides in the external
- entity "fonts.dtd"; this is normally stored in the default font
- configuration directory (/etc/fonts). Each configuration file
- should contain the following structure:
- <?xml version="1.0"?>
- <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
- <fontconfig>
- ...
- </fontconfig>
+ For languages used in multiple territories with radically different
+ character sets, fontconfig includes per-territory orthographies. This
+ includes Azerbaijani, Kurdish, Pashto, Tigrinya and Chinese.
-<fontconfig>
+Configuration File Format
- This is the top level element for a font configuration and can
- contain <dir>, <cachedir>, <include>, <match> and <alias>
- elements in any order.
-
-<dir prefix="default">
-
- This element contains a directory name which will be scanned
- for font files to include in the set of available fonts. If
- 'prefix' is set to "xdg", the value in the XDG_DATA_HOME
- environment variable will be added as the path prefix. please
- see XDG Base Directory Specification for more details.
-
-<cachedir prefix="default">
-
- This element contains a directory name that is supposed to be
- stored or read the cache of font information. If multiple
- elements are specified in the configuration file, the directory
- that can be accessed first in the list will be used to store
- the cache files. If it starts with '~', it refers to a
- directory in the users home directory. If 'prefix' is set to
- "xdg", the value in the XDG_CACHE_HOME environment variable
- will be added as the path prefix. please see XDG Base Directory
- Specification for more details. The default directory is
- ``$XDG_CACHE_HOME/fontconfig'' and it contains the cache files
- named ``<hash value>-<architecture>.cache-<version>'', where
- <version> is the fontconfig cache file version number
- (currently 7).
-
-<include ignore_missing="no" prefix="default">
-
- This element contains the name of an additional configuration
- file or directory. If a directory, every file within that
- directory starting with an ASCII digit (U+0030 - U+0039) and
- ending with the string ``.conf'' will be processed in sorted
- order. When the XML datatype is traversed by FcConfigParse, the
- contents of the file(s) will also be incorporated into the
- configuration by passing the filename(s) to
- FcConfigLoadAndParse. If 'ignore_missing' is set to "yes"
- instead of the default "no", a missing file or directory will
- elicit no warning message from the library. If 'prefix' is set
- to "xdg", the value in the XDG_CONFIG_HOME environment variable
- will be added as the path prefix. please see XDG Base Directory
+ Configuration files for fontconfig are stored in XML format; this format
+ makes external configuration tools easier to write and ensures that they
+ will generate syntactically correct configuration files. As XML files are
+ plain text, they can also be manipulated by the expert user using a text
+ editor.
+
+ The fontconfig document type definition resides in the external entity
+ "fonts.dtd"; this is normally stored in the default font configuration
+ directory (/etc/fonts). Each configuration file should contain the
+ following structure:
+
+ <?xml version="1.0"?>
+ <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+ <fontconfig>
+ ...
+ </fontconfig>
+
+
+ <fontconfig>
+
+ This is the top level element for a font configuration and can contain
+ <dir>, <cachedir>, <include>, <match> and <alias> elements in any order.
+
+ <dir prefix="default">
+
+ This element contains a directory name which will be scanned for font
+ files to include in the set of available fonts. If 'prefix' is set to
+ "xdg", the value in the XDG_DATA_HOME environment variable will be added
+ as the path prefix. please see XDG Base Directory Specification for more
+ details.
+
+ <cachedir prefix="default">
+
+ This element contains a directory name that is supposed to be stored or
+ read the cache of font information. If multiple elements are specified in
+ the configuration file, the directory that can be accessed first in the
+ list will be used to store the cache files. If it starts with '~', it
+ refers to a directory in the users home directory. If 'prefix' is set to
+ "xdg", the value in the XDG_CACHE_HOME environment variable will be added
+ as the path prefix. please see XDG Base Directory Specification for more
+ details. The default directory is ``$XDG_CACHE_HOME/fontconfig'' and it
+ contains the cache files named ``<hash
+ value>-<architecture>.cache-<version>'', where <version> is the fontconfig
+ cache file version number (currently 7).
+
+ <include ignore_missing="no" prefix="default">
+
+ This element contains the name of an additional configuration file or
+ directory. If a directory, every file within that directory starting with
+ an ASCII digit (U+0030 - U+0039) and ending with the string ``.conf'' will
+ be processed in sorted order. When the XML datatype is traversed by
+ FcConfigParse, the contents of the file(s) will also be incorporated into
+ the configuration by passing the filename(s) to FcConfigLoadAndParse. If
+ 'ignore_missing' is set to "yes" instead of the default "no", a missing
+ file or directory will elicit no warning message from the library. If
+ 'prefix' is set to "xdg", the value in the XDG_CONFIG_HOME environment
+ variable will be added as the path prefix. please see XDG Base Directory
Specification for more details.
-<config>
-
- This element provides a place to consolidate additional
- configuration information. <config> can contain <blank> and
- <rescan> elements in any order.
-
-<blank>
-
- Fonts often include "broken" glyphs which appear in the
- encoding but are drawn as blanks on the screen. Within the
- <blank> element, place each Unicode characters which is
- supposed to be blank in an <int> element. Characters outside of
- this set which are drawn as blank will be elided from the set
- of characters supported by the font.
-
-<rescan>
-
- The <rescan> element holds an <int> element which indicates the
- default interval between automatic checks for font
- configuration changes. Fontconfig will validate all of the
- configuration files and directories and automatically rebuild
- the internal datastructures when this interval passes.
-
-<selectfont>
+ <config>
+
+ This element provides a place to consolidate additional configuration
+ information. <config> can contain <blank> and <rescan> elements in any
+ order.
+
+ <blank>
+
+ Fonts often include "broken" glyphs which appear in the encoding but are
+ drawn as blanks on the screen. Within the <blank> element, place each
+ Unicode characters which is supposed to be blank in an <int> element.
+ Characters outside of this set which are drawn as blank will be elided
+ from the set of characters supported by the font.
+
+ <rescan>
+
+ The <rescan> element holds an <int> element which indicates the default
+ interval between automatic checks for font configuration changes.
+ Fontconfig will validate all of the configuration files and directories
+ and automatically rebuild the internal datastructures when this interval
+ passes.
+
+ <selectfont>
+
+ This element is used to black/white list fonts from being listed or
+ matched against. It holds acceptfont and rejectfont elements.
+
+ <acceptfont>
+
+ Fonts matched by an acceptfont element are "whitelisted"; such fonts are
+ explicitly included in the set of fonts used to resolve list and match
+ requests; including them in this list protects them from being
+ "blacklisted" by a rejectfont element. Acceptfont elements include glob
+ and pattern elements which are used to match fonts.
+
+ <rejectfont>
- This element is used to black/white list fonts from being
- listed or matched against. It holds acceptfont and rejectfont
- elements.
+ Fonts matched by an rejectfont element are "blacklisted"; such fonts are
+ excluded from the set of fonts used to resolve list and match requests as
+ if they didn't exist in the system. Rejectfont elements include glob and
+ pattern elements which are used to match fonts.
-<acceptfont>
+ <glob>
- Fonts matched by an acceptfont element are "whitelisted"; such
- fonts are explicitly included in the set of fonts used to
- resolve list and match requests; including them in this list
- protects them from being "blacklisted" by a rejectfont element.
- Acceptfont elements include glob and pattern elements which are
- used to match fonts.
+ Glob elements hold shell-style filename matching patterns (including ? and
+ *) which match fonts based on their complete pathnames. This can be used
+ to exclude a set of directories (/usr/share/fonts/uglyfont*), or
+ particular font file types (*.pcf.gz), but the latter mechanism relies
+ rather heavily on filenaming conventions which can't be relied upon. Note
+ that globs only apply to directories, not to individual fonts.
-<rejectfont>
+ <pattern>
- Fonts matched by an rejectfont element are "blacklisted"; such
- fonts are excluded from the set of fonts used to resolve list
- and match requests as if they didn't exist in the system.
- Rejectfont elements include glob and pattern elements which are
- used to match fonts.
+ Pattern elements perform list-style matching on incoming fonts; that is,
+ they hold a list of elements and associated values. If all of those
+ elements have a matching value, then the pattern matches the font. This
+ can be used to select fonts based on attributes of the font (scalable,
+ bold, etc), which is a more reliable mechanism than using file extensions.
+ Pattern elements include patelt elements.
-<glob>
+ <patelt name="property">
- Glob elements hold shell-style filename matching patterns
- (including ? and *) which match fonts based on their complete
- pathnames. This can be used to exclude a set of directories
- (/usr/share/fonts/uglyfont*), or particular font file types
- (*.pcf.gz), but the latter mechanism relies rather heavily on
- filenaming conventions which can't be relied upon. Note that
- globs only apply to directories, not to individual fonts.
-
-<pattern>
-
- Pattern elements perform list-style matching on incoming fonts;
- that is, they hold a list of elements and associated values. If
- all of those elements have a matching value, then the pattern
- matches the font. This can be used to select fonts based on
- attributes of the font (scalable, bold, etc), which is a more
- reliable mechanism than using file extensions. Pattern elements
- include patelt elements.
-
-<patelt name="property">
-
- Patelt elements hold a single pattern element and list of
- values. They must have a 'name' attribute which indicates the
- pattern element name. Patelt elements include int, double,
- string, matrix, bool, charset and const elements.
-
-<match target="pattern">
-
- This element holds first a (possibly empty) list of <test>
- elements and then a (possibly empty) list of <edit> elements.
- Patterns which match all of the tests are subjected to all the
- edits. If 'target' is set to "font" instead of the default
- "pattern", then this element applies to the font name resulting
- from a match rather than a font pattern to be matched. If
- 'target' is set to "scan", then this element applies when the
- font is scanned to build the fontconfig database.
-
-<test qual="any" name="property" target="default" compare="eq">
-
- This element contains a single value which is compared with the
- target ('pattern', 'font', 'scan' or 'default') property
- "property" (substitute any of the property names seen above).
- 'compare' can be one of "eq", "not_eq", "less", "less_eq",
- "more", "more_eq", "contains" or "not_contains". 'qual' may
- either be the default, "any", in which case the match succeeds
- if any value associated with the property matches the test
- value, or "all", in which case all of the values associated
- with the property must match the test value. 'ignore-blanks'
- takes a boolean value. if 'ignore-blanks' is set "true", any
- blanks in the string will be ignored on its comparison. this
- takes effects only when compare="eq" or compare="not_eq". When
- used in a <match target="font"> element, the target= attribute
- in the <test> element selects between matching the original
- pattern or the font. "default" selects whichever target the
- outer <match> element has selected.
-
-<edit name="property" mode="assign" binding="weak">
-
- This element contains a list of expression elements (any of the
- value or operator elements). The expression elements are
- evaluated at run-time and modify the property "property". The
- modification depends on whether "property" was matched by one
- of the associated <test> elements, if so, the modification may
- affect the first matched value. Any values inserted into the
- property are given the indicated binding ("strong", "weak" or
- "same") with "same" binding using the value from the matched
- pattern element. 'mode' is one of:
- Mode With Match Without Match
- ---------------------------------------------------------------------
- "assign" Replace matching value Replace all values
- "assign_replace" Replace all values Replace all values
- "prepend" Insert before matching Insert at head of list
- "prepend_first" Insert at head of list Insert at head of list
- "append" Append after matching Append at end of list
- "append_last" Append at end of list Append at end of list
- "delete" Delete matching value Delete all values
- "delete_all" Delete all values Delete all values
-
-<int>, <double>, <string>, <bool>
-
- These elements hold a single value of the indicated type.
- <bool> elements hold either true or false. An important
- limitation exists in the parsing of floating point numbers --
- fontconfig requires that the mantissa start with a digit, not a
- decimal point, so insert a leading zero for purely fractional
- values (e.g. use 0.5 instead of .5 and -0.5 instead of -.5).
-
-<matrix>
-
- This element holds four numerical expressions of an affine
- transformation. At their simplest these will be four <double>
- elements but they can also be more involved expressions.
-
-<range>
-
- This element holds the two <int> elements of a range
- representation.
-
-<charset>
-
- This element holds at least one <int> element of an Unicode
- code point or more.
-
-<langset>
-
- This element holds at least one <string> element of a
- RFC-3066-style languages or more.
-
-<name>
-
- Holds a property name. Evaluates to the first value from the
- property of the pattern. If the 'target' attribute is not
- present, it will default to 'default', in which case the
- property is returned from the font pattern during a
- target="font" match, and to the pattern during a
- target="pattern" match. The attribute can also take the values
- 'font' or 'pattern' to explicitly choose which pattern to use.
- It is an error to use a target of 'font' in a match that has
- target="pattern".
-
-<const>
-
- Holds the name of a constant; these are always integers and
- serve as symbolic names for common font values:
- Constant Property Value
- -------------------------------------
- thin weight 0
- extralight weight 40
- ultralight weight 40
- light weight 50
- demilight weight 55
- semilight weight 55
- book weight 75
- regular weight 80
- normal weight 80
- medium weight 100
- demibold weight 180
- semibold weight 180
- bold weight 200
- extrabold weight 205
- black weight 210
- heavy weight 210
- roman slant 0
- italic slant 100
- oblique slant 110
- ultracondensed width 50
- extracondensed width 63
- condensed width 75
- semicondensed width 87
- normal width 100
- semiexpanded width 113
- expanded width 125
- extraexpanded width 150
- ultraexpanded width 200
- proportional spacing 0
- dual spacing 90
- mono spacing 100
- charcell spacing 110
- unknown rgba 0
- rgb rgba 1
- bgr rgba 2
- vrgb rgba 3
- vbgr rgba 4
- none rgba 5
- lcdnone lcdfilter 0
- lcddefault lcdfilter 1
- lcdlight lcdfilter 2
- lcdlegacy lcdfilter 3
- hintnone hintstyle 0
- hintslight hintstyle 1
- hintmedium hintstyle 2
- hintfull hintstyle 3
-
-<or>, <and>, <plus>, <minus>, <times>, <divide>
-
- These elements perform the specified operation on a list of
- expression elements. <or> and <and> are boolean, not bitwise.
-
-<eq>, <not_eq>, <less>, <less_eq>, <more>, <more_eq>, <contains>,
-<not_contains
+ Patelt elements hold a single pattern element and list of values. They
+ must have a 'name' attribute which indicates the pattern element name.
+ Patelt elements include int, double, string, matrix, bool, charset and
+ const elements.
+
+ <match target="pattern">
+
+ This element holds first a (possibly empty) list of <test> elements and
+ then a (possibly empty) list of <edit> elements. Patterns which match all
+ of the tests are subjected to all the edits. If 'target' is set to "font"
+ instead of the default "pattern", then this element applies to the font
+ name resulting from a match rather than a font pattern to be matched. If
+ 'target' is set to "scan", then this element applies when the font is
+ scanned to build the fontconfig database.
+
+ <test qual="any" name="property" target="default" compare="eq">
+
+ This element contains a single value which is compared with the target
+ ('pattern', 'font', 'scan' or 'default') property "property" (substitute
+ any of the property names seen above). 'compare' can be one of "eq",
+ "not_eq", "less", "less_eq", "more", "more_eq", "contains" or
+ "not_contains". 'qual' may either be the default, "any", in which case the
+ match succeeds if any value associated with the property matches the test
+ value, or "all", in which case all of the values associated with the
+ property must match the test value. 'ignore-blanks' takes a boolean value.
+ if 'ignore-blanks' is set "true", any blanks in the string will be ignored
+ on its comparison. this takes effects only when compare="eq" or
+ compare="not_eq". When used in a <match target="font"> element, the
+ target= attribute in the <test> element selects between matching the
+ original pattern or the font. "default" selects whichever target the outer
+ <match> element has selected.
+
+ <edit name="property" mode="assign" binding="weak">
+
+ This element contains a list of expression elements (any of the value or
+ operator elements). The expression elements are evaluated at run-time and
+ modify the property "property". The modification depends on whether
+ "property" was matched by one of the associated <test> elements, if so,
+ the modification may affect the first matched value. Any values inserted
+ into the property are given the indicated binding ("strong", "weak" or
+ "same") with "same" binding using the value from the matched pattern
+ element. 'mode' is one of:
+
+ Mode With Match Without Match
+ ---------------------------------------------------------------------
+ "assign" Replace matching value Replace all values
+ "assign_replace" Replace all values Replace all values
+ "prepend" Insert before matching Insert at head of list
+ "prepend_first" Insert at head of list Insert at head of list
+ "append" Append after matching Append at end of list
+ "append_last" Append at end of list Append at end of list
+ "delete" Delete matching value Delete all values
+ "delete_all" Delete all values Delete all values
+
+
+ <int>, <double>, <string>, <bool>
+
+ These elements hold a single value of the indicated type. <bool> elements
+ hold either true or false. An important limitation exists in the parsing
+ of floating point numbers -- fontconfig requires that the mantissa start
+ with a digit, not a decimal point, so insert a leading zero for purely
+ fractional values (e.g. use 0.5 instead of .5 and -0.5 instead of -.5).
+
+ <matrix>
+
+ This element holds four numerical expressions of an affine transformation.
+ At their simplest these will be four <double> elements but they can also
+ be more involved expressions.
+
+ <range>
+
+ This element holds the two <int> elements of a range representation.
+
+ <charset>
+
+ This element holds at least one <int> element of an Unicode code point or
+ more.
+
+ <langset>
+
+ This element holds at least one <string> element of a RFC-3066-style
+ languages or more.
+
+ <name>
+
+ Holds a property name. Evaluates to the first value from the property of
+ the pattern. If the 'target' attribute is not present, it will default to
+ 'default', in which case the property is returned from the font pattern
+ during a target="font" match, and to the pattern during a target="pattern"
+ match. The attribute can also take the values 'font' or 'pattern' to
+ explicitly choose which pattern to use. It is an error to use a target of
+ 'font' in a match that has target="pattern".
+
+ <const>
+
+ Holds the name of a constant; these are always integers and serve as
+ symbolic names for common font values:
+
+ Constant Property Value
+ -------------------------------------
+ thin weight 0
+ extralight weight 40
+ ultralight weight 40
+ light weight 50
+ demilight weight 55
+ semilight weight 55
+ book weight 75
+ regular weight 80
+ normal weight 80
+ medium weight 100
+ demibold weight 180
+ semibold weight 180
+ bold weight 200
+ extrabold weight 205
+ black weight 210
+ heavy weight 210
+ roman slant 0
+ italic slant 100
+ oblique slant 110
+ ultracondensed width 50
+ extracondensed width 63
+ condensed width 75
+ semicondensed width 87
+ normal width 100
+ semiexpanded width 113
+ expanded width 125
+ extraexpanded width 150
+ ultraexpanded width 200
+ proportional spacing 0
+ dual spacing 90
+ mono spacing 100
+ charcell spacing 110
+ unknown rgba 0
+ rgb rgba 1
+ bgr rgba 2
+ vrgb rgba 3
+ vbgr rgba 4
+ none rgba 5
+ lcdnone lcdfilter 0
+ lcddefault lcdfilter 1
+ lcdlight lcdfilter 2
+ lcdlegacy lcdfilter 3
+ hintnone hintstyle 0
+ hintslight hintstyle 1
+ hintmedium hintstyle 2
+ hintfull hintstyle 3
+
+
+ <or>, <and>, <plus>, <minus>, <times>, <divide>
+
+ These elements perform the specified operation on a list of expression
+ elements. <or> and <and> are boolean, not bitwise.
+
+ <eq>, <not_eq>, <less>, <less_eq>, <more>, <more_eq>, <contains>,
+ <not_contains
These elements compare two values, producing a boolean result.
-<not>
+ <not>
Inverts the boolean sense of its one expression element
-<if>
+ <if>
- This element takes three expression elements; if the value of
- the first is true, it produces the value of the second,
- otherwise it produces the value of the third.
+ This element takes three expression elements; if the value of the first is
+ true, it produces the value of the second, otherwise it produces the value
+ of the third.
-<alias>
+ <alias>
- Alias elements provide a shorthand notation for the set of
- common match operations needed to substitute one font family
- for another. They contain a <family> element followed by
- optional <prefer>, <accept> and <default> elements. Fonts
- matching the <family> element are edited to prepend the list of
- <prefer>ed families before the matching <family>, append the
- <accept>able families after the matching <family> and append
- the <default> families to the end of the family list.
+ Alias elements provide a shorthand notation for the set of common match
+ operations needed to substitute one font family for another. They contain
+ a <family> element followed by optional <prefer>, <accept> and <default>
+ elements. Fonts matching the <family> element are edited to prepend the
+ list of <prefer>ed families before the matching <family>, append the
+ <accept>able families after the matching <family> and append the <default>
+ families to the end of the family list.
-<family>
+ <family>
Holds a single font family name
-<prefer>, <accept>, <default>
+ <prefer>, <accept>, <default>
- These hold a list of <family> elements to be used by the
- <alias> element.
+ These hold a list of <family> elements to be used by the <alias> element.
EXAMPLE CONFIGURATION FILE
-System configuration file
+ System configuration file
This is an example of a system-wide configuration file
+
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<!-- /etc/fonts/fonts.conf file to configure system font access -->
@@ -606,30 +577,24 @@ System configuration file
-->
<match target="pattern">
<test qual="any" name="family"><string>mono</string></test>
- <edit name="family" mode="assign"><string>monospace</string></ed
-it>
+ <edit name="family" mode="assign"><string>monospace</string></edit>
</match>
<!--
Names not including any well known alias are given 'sans-serif'
-->
<match target="pattern">
- <test qual="all" name="family" mode="not_eq"><string>sans-serif<
-/string></test>
- <test qual="all" name="family" mode="not_eq"><string>serif</stri
-ng></test>
- <test qual="all" name="family" mode="not_eq"><string>monospace</
-string></test>
- <edit name="family" mode="append_last"><string>sans-serif</strin
-g></edit>
+ <test qual="all" name="family" compare="not_eq"><string>sans-serif</string></test>
+ <test qual="all" name="family" compare="not_eq"><string>serif</string></test>
+ <test qual="all" name="family" compare="not_eq"><string>monospace</string></test>
+ <edit name="family" mode="append_last"><string>sans-serif</string></edit>
</match>
<!--
Load per-user customization file, but don't complain
if it doesn't exist
-->
-<include ignore_missing="yes" prefix="xdg">fontconfig/fonts.conf</includ
-e>
+<include ignore_missing="yes" prefix="xdg">fontconfig/fonts.conf</include>
<!--
Load local customization files, but don't complain
@@ -683,7 +648,7 @@ e>
add 'monospace' as the alternative
-->
<match target="pattern">
- <test name="family" mode="eq">
+ <test name="family" compare="eq">
<string>Courier New</string>
</test>
<edit name="family" mode="prepend">
@@ -691,7 +656,7 @@ e>
</edit>
</match>
<match target="pattern">
- <test name="family" mode="eq">
+ <test name="family" compare="eq">
<string>Courier</string>
</test>
<edit name="family" mode="prepend">
@@ -701,137 +666,147 @@ e>
</fontconfig>
-User configuration file
- This is an example of a per-user configuration file that lives
- in $XDG_CONFIG_HOME/fontconfig/fonts.conf
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- $XDG_CONFIG_HOME/fontconfig/fonts.conf for per-user font configurat
-ion -->
-<fontconfig>
+ User configuration file
-<!--
- Private font directory
--->
-<dir prefix="xdg">fonts</dir>
+ This is an example of a per-user configuration file that lives in
+ $XDG_CONFIG_HOME/fontconfig/fonts.conf
+
+ <?xml version="1.0"?>
+ <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+ <!-- $XDG_CONFIG_HOME/fontconfig/fonts.conf for per-user font configuration -->
+ <fontconfig>
+
+ <!--
+ Private font directory
+ -->
+ <dir prefix="xdg">fonts</dir>
+
+ <!--
+ use rgb sub-pixel ordering to improve glyph appearance on
+ LCD screens. Changes affecting rendering, but not matching
+ should always use target="font".
+ -->
+ <match target="font">
+ <edit name="rgba" mode="assign"><const>rgb</const></edit>
+ </match>
+ <!--
+ use WenQuanYi Zen Hei font when serif is requested for Chinese
+ -->
+ <match>
+ <!--
+ If you don't want to use WenQuanYi Zen Hei font for zh-tw etc,
+ you can use zh-cn instead of zh.
+ Please note, even if you set zh-cn, it still matches zh.
+ if you don't like it, you can use compare="eq"
+ instead of compare="contains".
+ -->
+ <test name="lang" compare="contains">
+ <string>zh</string>
+ </test>
+ <test name="family">
+ <string>serif</string>
+ </test>
+ <edit name="family" mode="prepend">
+ <string>WenQuanYi Zen Hei</string>
+ </edit>
+ </match>
+ <!--
+ use VL Gothic font when sans-serif is requested for Japanese
+ -->
+ <match>
+ <test name="lang" compare="contains">
+ <string>ja</string>
+ </test>
+ <test name="family">
+ <string>sans-serif</string>
+ </test>
+ <edit name="family" mode="prepend">
+ <string>VL Gothic</string>
+ </edit>
+ </match>
+ </fontconfig>
-<!--
- use rgb sub-pixel ordering to improve glyph appearance on
- LCD screens. Changes affecting rendering, but not matching
- should always use target="font".
--->
-<match target="font">
- <edit name="rgba" mode="assign"><const>rgb</const></edit>
-</match>
-<!--
- use WenQuanYi Zen Hei font when serif is requested for Chinese
--->
-<match>
- <!--
- If you don't want to use WenQuanYi Zen Hei font for zh-t
-w etc,
- you can use zh-cn instead of zh.
- Please note, even if you set zh-cn, it still matches zh.
- if you don't like it, you can use compare="eq"
- instead of compare="contains".
- -->
- <test name="lang" compare="contains">
- <string>zh</string>
- </test>
- <test name="family">
- <string>serif</string>
- </test>
- <edit name="family" mode="prepend">
- <string>WenQuanYi Zen Hei</string>
- </edit>
-</match>
-<!--
- use VL Gothic font when sans-serif is requested for Japanese
--->
-<match>
- <test name="lang" compare="contains">
- <string>ja</string>
- </test>
- <test name="family">
- <string>sans-serif</string>
- </test>
- <edit name="family" mode="prepend">
- <string>VL Gothic</string>
- </edit>
-</match>
-</fontconfig>
Files
- fonts.conf contains configuration information for the
- fontconfig library consisting of directories to look at for
- font information as well as instructions on editing program
- specified font patterns before attempting to match the
- available fonts. It is in XML format.
+ fonts.conf contains configuration information for the fontconfig library
+ consisting of directories to look at for font information as well as
+ instructions on editing program specified font patterns before attempting
+ to match the available fonts. It is in XML format.
conf.d is the conventional name for a directory of additional
- configuration files managed by external applications or the
- local administrator. The filenames starting with decimal digits
- are sorted in lexicographic order and used as additional
- configuration files. All of these files are in XML format. The
- master fonts.conf file references this directory in an
- <include> directive.
-
- fonts.dtd is a DTD that describes the format of the
- configuration files.
-
- $XDG_CONFIG_HOME/fontconfig/conf.d and ~/.fonts.conf.d is the
- conventional name for a per-user directory of (typically
- auto-generated) configuration files, although the actual
- location is specified in the global fonts.conf file. please
- note that ~/.fonts.conf.d is deprecated now. it will not be
+ configuration files managed by external applications or the local
+ administrator. The filenames starting with decimal digits are sorted in
+ lexicographic order and used as additional configuration files. All of
+ these files are in XML format. The master fonts.conf file references this
+ directory in an <include> directive.
+
+ fonts.dtd is a DTD that describes the format of the configuration files.
+
+ $XDG_CONFIG_HOME/fontconfig/conf.d and ~/.fonts.conf.d is the conventional
+ name for a per-user directory of (typically auto-generated) configuration
+ files, although the actual location is specified in the global fonts.conf
+ file. please note that ~/.fonts.conf.d is deprecated now. it will not be
read by default in the future version.
$XDG_CONFIG_HOME/fontconfig/fonts.conf and ~/.fonts.conf is the
- conventional location for per-user font configuration, although
- the actual location is specified in the global fonts.conf file.
- please note that ~/.fonts.conf is deprecated now. it will not
- be read by default in the future version.
-
- $XDG_CACHE_HOME/fontconfig/*.cache-* and
- ~/.fontconfig/*.cache-* is the conventional repository of font
- information that isn't found in the per-directory caches. This
- file is automatically maintained by fontconfig. please note
- that ~/.fontconfig/*.cache-* is deprecated now. it will not be
+ conventional location for per-user font configuration, although the actual
+ location is specified in the global fonts.conf file. please note that
+ ~/.fonts.conf is deprecated now. it will not be read by default in the
+ future version.
+
+ $XDG_CACHE_HOME/fontconfig/*.cache-* and ~/.fontconfig/*.cache-* is the
+ conventional repository of font information that isn't found in the
+ per-directory caches. This file is automatically maintained by fontconfig.
+ please note that ~/.fontconfig/*.cache-* is deprecated now. it will not be
read by default in the future version.
Environment variables
- FONTCONFIG_FILE is used to override the default configuration
- file.
+ FONTCONFIG_FILE is used to override the default configuration file.
- FONTCONFIG_PATH is used to override the default configuration
- directory.
+ FONTCONFIG_PATH is used to override the default configuration directory.
- FC_DEBUG is used to output the detailed debugging messages. see
- Debugging Applications section for more details.
-
- FC_DBG_MATCH_FILTER is used to filter out the patterns. this
- takes a comma-separated list of object names and effects only
- when FC_DEBUG has MATCH2. see Debugging Applications section
- for more details.
-
- FC_LANG is used to specify the default language as the weak
- binding in the query. if this isn't set, the default language
- will be determined from current locale.
+ FONTCONFIG_SYSROOT is used to set a default sysroot directory.
- FONTCONFIG_USE_MMAP is used to control the use of mmap(2) for
- the cache files if available. this take a boolean value.
- fontconfig will checks if the cache files are stored on the
- filesystem that is safe to use mmap(2). explicitly setting this
- environment variable will causes skipping this check and
- enforce to use or not use mmap(2) anyway.
+ FC_DEBUG is used to output the detailed debugging messages. see
+ [1]Debugging Applications section for more details.
+
+ FC_DBG_MATCH_FILTER is used to filter out the patterns. this takes a
+ comma-separated list of object names and effects only when FC_DEBUG has
+ MATCH2. see [2]Debugging Applications section for more details.
+
+ FC_LANG is used to specify the default language as the weak binding in the
+ query. if this isn't set, the default language will be determined from
+ current locale.
+
+ FONTCONFIG_USE_MMAP is used to control the use of mmap(2) for the cache
+ files if available. this take a boolean value. fontconfig will checks if
+ the cache files are stored on the filesystem that is safe to use mmap(2).
+ explicitly setting this environment variable will causes skipping this
+ check and enforce to use or not use mmap(2) anyway.
+
+ SOURCE_DATE_EPOCH is used to ensure fc-cache(1) generates files in a
+ deterministic manner in order to support reproducible builds. When set to
+ a numeric representation of UNIX timestamp, fontconfig will prefer this
+ value over using the modification timestamps of the input files in order
+ to identify which cache files require regeneration. If SOURCE_DATE_EPOCH
+ is not set (or is newer than the mtime of the directory), the existing
+ behaviour is unchanged.
See Also
- fc-cat(1), fc-cache(1), fc-list(1), fc-match(1), fc-query(1)
+ fc-cat(1), fc-cache(1), fc-list(1), fc-match(1), fc-query(1),
+ [3]SOURCE_DATE_EPOCH.
Version
- Fontconfig version 2.13.0
+ Fontconfig version 2.13.1
+
+References
+
+ Visible links
+ 1. file:///tmp/html-cm5uzN#DEBUG
+ 2. file:///tmp/html-cm5uzN#DEBUG
+ 3. https://reproducible-builds.org/specs/source-date-epoch/
diff --git a/doc/fonts-conf.5 b/doc/fonts-conf.5
index f7887d29..e6a3cd9e 100644
--- a/doc/fonts-conf.5
+++ b/doc/fonts-conf.5
@@ -1,5 +1,5 @@
.\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FONTS-CONF" "5" "06 3月 2018" "" ""
+.TH "FONTS-CONF" "5" "30 8月 2018" "" ""
.SH NAME
fonts.conf \- Font configuration files
.SH SYNOPSIS
@@ -552,9 +552,9 @@ This is an example of a system-wide configuration file
Names not including any well known alias are given 'sans-serif'
-->
<match target="pattern">
- <test qual="all" name="family" mode="not_eq"><string>sans-serif</string></test>
- <test qual="all" name="family" mode="not_eq"><string>serif</string></test>
- <test qual="all" name="family" mode="not_eq"><string>monospace</string></test>
+ <test qual="all" name="family" compare="not_eq"><string>sans-serif</string></test>
+ <test qual="all" name="family" compare="not_eq"><string>serif</string></test>
+ <test qual="all" name="family" compare="not_eq"><string>monospace</string></test>
<edit name="family" mode="append_last"><string>sans-serif</string></edit>
</match>
@@ -616,7 +616,7 @@ This is an example of a system-wide configuration file
add 'monospace' as the alternative
-->
<match target="pattern">
- <test name="family" mode="eq">
+ <test name="family" compare="eq">
<string>Courier New</string>
</test>
<edit name="family" mode="prepend">
@@ -624,7 +624,7 @@ This is an example of a system-wide configuration file
</edit>
</match>
<match target="pattern">
- <test name="family" mode="eq">
+ <test name="family" compare="eq">
<string>Courier</string>
</test>
<edit name="family" mode="prepend">
@@ -738,6 +738,9 @@ is used to override the default configuration file.
\fBFONTCONFIG_PATH\fR
is used to override the default configuration directory.
.PP
+\fBFONTCONFIG_SYSROOT\fR
+is used to set a default sysroot directory.
+.PP
\fBFC_DEBUG\fR
is used to output the detailed debugging messages. see Debugging Applications section for more details.
.PP
@@ -749,9 +752,12 @@ is used to specify the default language as the weak binding in the query. if thi
.PP
\fBFONTCONFIG_USE_MMAP\fR
is used to control the use of mmap(2) for the cache files if available. this take a boolean value. fontconfig will checks if the cache files are stored on the filesystem that is safe to use mmap(2). explicitly setting this environment variable will causes skipping this check and enforce to use or not use mmap(2) anyway.
+.PP
+\fBSOURCE_DATE_EPOCH\fR
+is used to ensure fc-cache(1) generates files in a deterministic manner in order to support reproducible builds. When set to a numeric representation of UNIX timestamp, fontconfig will prefer this value over using the modification timestamps of the input files in order to identify which cache files require regeneration. If SOURCE_DATE_EPOCH is not set (or is newer than the mtime of the directory), the existing behaviour is unchanged.
.SH "SEE ALSO"
.PP
-fc-cat(1), fc-cache(1), fc-list(1), fc-match(1), fc-query(1)
+fc-cat(1), fc-cache(1), fc-list(1), fc-match(1), fc-query(1), SOURCE_DATE_EPOCH <URL:https://reproducible-builds.org/specs/source-date-epoch/>\&.
.SH "VERSION"
.PP
-Fontconfig version 2.13.0
+Fontconfig version 2.13.1
diff --git a/fc-cache/Makefile.in b/fc-cache/Makefile.in
index 8f3b88ae..75393fa7 100644
--- a/fc-cache/Makefile.in
+++ b/fc-cache/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -157,7 +157,8 @@ am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/fc-cache.Po
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -293,6 +294,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JSONC_CFLAGS = @JSONC_CFLAGS@
+JSONC_LIBS = @JSONC_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -446,8 +449,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -518,7 +521,13 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fc-cache.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fc-cache.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -642,7 +651,10 @@ cscopelist-am: $(am__tagged_files)
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -717,7 +729,7 @@ clean: clean-am
clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/fc-cache.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -763,7 +775,7 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/fc-cache.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -786,21 +798,21 @@ uninstall-man: uninstall-man1
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \
- clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
- ctags ctags-am distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-binPROGRAMS \
- install-data install-data-am install-data-local install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-man1 install-pdf install-pdf-am install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
- uninstall-am uninstall-binPROGRAMS uninstall-local \
- uninstall-man uninstall-man1
+.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles check \
+ check-am clean clean-binPROGRAMS clean-generic clean-libtool \
+ cscopelist-am ctags ctags-am distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-binPROGRAMS install-data install-data-am \
+ install-data-local install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-man1 install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
+ uninstall-local uninstall-man uninstall-man1
.PRECIOUS: Makefile
diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
index dc93c19c..87e30208 100644
--- a/fc-cache/fc-cache.c
+++ b/fc-cache/fc-cache.c
@@ -41,6 +41,7 @@
#include <fcntl.h>
#include <dirent.h>
#include <string.h>
+#include <locale.h>
#if defined (_WIN32)
#define STRICT
@@ -302,6 +303,7 @@ main (int argc, char **argv)
#if HAVE_GETOPT_LONG || HAVE_GETOPT
int c;
+ setlocale (LC_ALL, "");
#if HAVE_GETOPT_LONG
while ((c = getopt_long (argc, argv, "Efrsy:Vvh", longopts, NULL)) != -1)
#else
diff --git a/fc-case/CaseFolding.txt b/fc-case/CaseFolding.txt
index 372ee68b..cce350f4 100644
--- a/fc-case/CaseFolding.txt
+++ b/fc-case/CaseFolding.txt
@@ -1,6 +1,6 @@
-# CaseFolding-9.0.0.txt
-# Date: 2016-03-02, 18:54:54 GMT
-# © 2016 Unicode®, Inc.
+# CaseFolding-11.0.0.txt
+# Date: 2018-01-31, 08:20:09 GMT
+# © 2018 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html
#
@@ -24,7 +24,7 @@
#
# NOTE: case folding does not preserve normalization formats!
#
-# For information on case folding, including how to have case folding
+# For information on case folding, including how to have case folding
# preserve normalization formats, see Section 3.13 Default Case Algorithms in
# The Unicode Standard.
#
@@ -603,6 +603,52 @@
1C86; C; 044A; # CYRILLIC SMALL LETTER TALL HARD SIGN
1C87; C; 0463; # CYRILLIC SMALL LETTER TALL YAT
1C88; C; A64B; # CYRILLIC SMALL LETTER UNBLENDED UK
+1C90; C; 10D0; # GEORGIAN MTAVRULI CAPITAL LETTER AN
+1C91; C; 10D1; # GEORGIAN MTAVRULI CAPITAL LETTER BAN
+1C92; C; 10D2; # GEORGIAN MTAVRULI CAPITAL LETTER GAN
+1C93; C; 10D3; # GEORGIAN MTAVRULI CAPITAL LETTER DON
+1C94; C; 10D4; # GEORGIAN MTAVRULI CAPITAL LETTER EN
+1C95; C; 10D5; # GEORGIAN MTAVRULI CAPITAL LETTER VIN
+1C96; C; 10D6; # GEORGIAN MTAVRULI CAPITAL LETTER ZEN
+1C97; C; 10D7; # GEORGIAN MTAVRULI CAPITAL LETTER TAN
+1C98; C; 10D8; # GEORGIAN MTAVRULI CAPITAL LETTER IN
+1C99; C; 10D9; # GEORGIAN MTAVRULI CAPITAL LETTER KAN
+1C9A; C; 10DA; # GEORGIAN MTAVRULI CAPITAL LETTER LAS
+1C9B; C; 10DB; # GEORGIAN MTAVRULI CAPITAL LETTER MAN
+1C9C; C; 10DC; # GEORGIAN MTAVRULI CAPITAL LETTER NAR
+1C9D; C; 10DD; # GEORGIAN MTAVRULI CAPITAL LETTER ON
+1C9E; C; 10DE; # GEORGIAN MTAVRULI CAPITAL LETTER PAR
+1C9F; C; 10DF; # GEORGIAN MTAVRULI CAPITAL LETTER ZHAR
+1CA0; C; 10E0; # GEORGIAN MTAVRULI CAPITAL LETTER RAE
+1CA1; C; 10E1; # GEORGIAN MTAVRULI CAPITAL LETTER SAN
+1CA2; C; 10E2; # GEORGIAN MTAVRULI CAPITAL LETTER TAR
+1CA3; C; 10E3; # GEORGIAN MTAVRULI CAPITAL LETTER UN
+1CA4; C; 10E4; # GEORGIAN MTAVRULI CAPITAL LETTER PHAR
+1CA5; C; 10E5; # GEORGIAN MTAVRULI CAPITAL LETTER KHAR
+1CA6; C; 10E6; # GEORGIAN MTAVRULI CAPITAL LETTER GHAN
+1CA7; C; 10E7; # GEORGIAN MTAVRULI CAPITAL LETTER QAR
+1CA8; C; 10E8; # GEORGIAN MTAVRULI CAPITAL LETTER SHIN
+1CA9; C; 10E9; # GEORGIAN MTAVRULI CAPITAL LETTER CHIN
+1CAA; C; 10EA; # GEORGIAN MTAVRULI CAPITAL LETTER CAN
+1CAB; C; 10EB; # GEORGIAN MTAVRULI CAPITAL LETTER JIL
+1CAC; C; 10EC; # GEORGIAN MTAVRULI CAPITAL LETTER CIL
+1CAD; C; 10ED; # GEORGIAN MTAVRULI CAPITAL LETTER CHAR
+1CAE; C; 10EE; # GEORGIAN MTAVRULI CAPITAL LETTER XAN
+1CAF; C; 10EF; # GEORGIAN MTAVRULI CAPITAL LETTER JHAN
+1CB0; C; 10F0; # GEORGIAN MTAVRULI CAPITAL LETTER HAE
+1CB1; C; 10F1; # GEORGIAN MTAVRULI CAPITAL LETTER HE
+1CB2; C; 10F2; # GEORGIAN MTAVRULI CAPITAL LETTER HIE
+1CB3; C; 10F3; # GEORGIAN MTAVRULI CAPITAL LETTER WE
+1CB4; C; 10F4; # GEORGIAN MTAVRULI CAPITAL LETTER HAR
+1CB5; C; 10F5; # GEORGIAN MTAVRULI CAPITAL LETTER HOE
+1CB6; C; 10F6; # GEORGIAN MTAVRULI CAPITAL LETTER FI
+1CB7; C; 10F7; # GEORGIAN MTAVRULI CAPITAL LETTER YN
+1CB8; C; 10F8; # GEORGIAN MTAVRULI CAPITAL LETTER ELIFI
+1CB9; C; 10F9; # GEORGIAN MTAVRULI CAPITAL LETTER TURNED GAN
+1CBA; C; 10FA; # GEORGIAN MTAVRULI CAPITAL LETTER AIN
+1CBD; C; 10FD; # GEORGIAN MTAVRULI CAPITAL LETTER AEN
+1CBE; C; 10FE; # GEORGIAN MTAVRULI CAPITAL LETTER HARD SIGN
+1CBF; C; 10FF; # GEORGIAN MTAVRULI CAPITAL LETTER LABIAL SIGN
1E00; C; 1E01; # LATIN CAPITAL LETTER A WITH RING BELOW
1E02; C; 1E03; # LATIN CAPITAL LETTER B WITH DOT ABOVE
1E04; C; 1E05; # LATIN CAPITAL LETTER B WITH DOT BELOW
@@ -1180,6 +1226,7 @@ A7B2; C; 029D; # LATIN CAPITAL LETTER J WITH CROSSED-TAIL
A7B3; C; AB53; # LATIN CAPITAL LETTER CHI
A7B4; C; A7B5; # LATIN CAPITAL LETTER BETA
A7B6; C; A7B7; # LATIN CAPITAL LETTER OMEGA
+A7B8; C; A7B9; # LATIN CAPITAL LETTER U WITH STROKE
AB70; C; 13A0; # CHEROKEE SMALL LETTER A
AB71; C; 13A1; # CHEROKEE SMALL LETTER E
AB72; C; 13A2; # CHEROKEE SMALL LETTER I
@@ -1457,6 +1504,38 @@ FF3A; C; FF5A; # FULLWIDTH LATIN CAPITAL LETTER Z
118BD; C; 118DD; # WARANG CITI CAPITAL LETTER SSUU
118BE; C; 118DE; # WARANG CITI CAPITAL LETTER SII
118BF; C; 118DF; # WARANG CITI CAPITAL LETTER VIYO
+16E40; C; 16E60; # MEDEFAIDRIN CAPITAL LETTER M
+16E41; C; 16E61; # MEDEFAIDRIN CAPITAL LETTER S
+16E42; C; 16E62; # MEDEFAIDRIN CAPITAL LETTER V
+16E43; C; 16E63; # MEDEFAIDRIN CAPITAL LETTER W
+16E44; C; 16E64; # MEDEFAIDRIN CAPITAL LETTER ATIU
+16E45; C; 16E65; # MEDEFAIDRIN CAPITAL LETTER Z
+16E46; C; 16E66; # MEDEFAIDRIN CAPITAL LETTER KP
+16E47; C; 16E67; # MEDEFAIDRIN CAPITAL LETTER P
+16E48; C; 16E68; # MEDEFAIDRIN CAPITAL LETTER T
+16E49; C; 16E69; # MEDEFAIDRIN CAPITAL LETTER G
+16E4A; C; 16E6A; # MEDEFAIDRIN CAPITAL LETTER F
+16E4B; C; 16E6B; # MEDEFAIDRIN CAPITAL LETTER I
+16E4C; C; 16E6C; # MEDEFAIDRIN CAPITAL LETTER K
+16E4D; C; 16E6D; # MEDEFAIDRIN CAPITAL LETTER A
+16E4E; C; 16E6E; # MEDEFAIDRIN CAPITAL LETTER J
+16E4F; C; 16E6F; # MEDEFAIDRIN CAPITAL LETTER E
+16E50; C; 16E70; # MEDEFAIDRIN CAPITAL LETTER B
+16E51; C; 16E71; # MEDEFAIDRIN CAPITAL LETTER C
+16E52; C; 16E72; # MEDEFAIDRIN CAPITAL LETTER U
+16E53; C; 16E73; # MEDEFAIDRIN CAPITAL LETTER YU
+16E54; C; 16E74; # MEDEFAIDRIN CAPITAL LETTER L
+16E55; C; 16E75; # MEDEFAIDRIN CAPITAL LETTER Q
+16E56; C; 16E76; # MEDEFAIDRIN CAPITAL LETTER HP
+16E57; C; 16E77; # MEDEFAIDRIN CAPITAL LETTER NY
+16E58; C; 16E78; # MEDEFAIDRIN CAPITAL LETTER X
+16E59; C; 16E79; # MEDEFAIDRIN CAPITAL LETTER D
+16E5A; C; 16E7A; # MEDEFAIDRIN CAPITAL LETTER OE
+16E5B; C; 16E7B; # MEDEFAIDRIN CAPITAL LETTER N
+16E5C; C; 16E7C; # MEDEFAIDRIN CAPITAL LETTER R
+16E5D; C; 16E7D; # MEDEFAIDRIN CAPITAL LETTER O
+16E5E; C; 16E7E; # MEDEFAIDRIN CAPITAL LETTER AI
+16E5F; C; 16E7F; # MEDEFAIDRIN CAPITAL LETTER Y
1E900; C; 1E922; # ADLAM CAPITAL LETTER ALIF
1E901; C; 1E923; # ADLAM CAPITAL LETTER DAALI
1E902; C; 1E924; # ADLAM CAPITAL LETTER LAAM
diff --git a/fc-case/Makefile.in b/fc-case/Makefile.in
index da345dd0..6485973c 100644
--- a/fc-case/Makefile.in
+++ b/fc-case/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -259,6 +259,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JSONC_CFLAGS = @JSONC_CFLAGS@
+JSONC_LIBS = @JSONC_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -429,8 +431,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_srcdir)/Tools.mk $(am__empty):
@@ -501,7 +503,10 @@ cscopelist-am: $(am__tagged_files)
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
diff --git a/fc-case/fccase.h b/fc-case/fccase.h
index 5be716d0..9cc0b9f2 100644
--- a/fc-case/fccase.h
+++ b/fc-case/fccase.h
@@ -22,7 +22,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#define FC_NUM_CASE_FOLD 288
+#define FC_NUM_CASE_FOLD 291
#define FC_NUM_CASE_FOLD_CHARS 471
#define FC_MAX_CASE_FOLD_CHARS 6
#define FC_MAX_CASE_FOLD_EXPAND 4
@@ -146,6 +146,8 @@ static const FcCaseFold fcCaseFold[FC_NUM_CASE_FOLD] = {
{ 0x00001c86, FC_CASE_FOLD_RANGE, 0x0001, -6204 },
{ 0x00001c87, FC_CASE_FOLD_RANGE, 0x0001, -6180 },
{ 0x00001c88, FC_CASE_FOLD_RANGE, 0x0001, -30269 },
+ { 0x00001c90, FC_CASE_FOLD_RANGE, 0x002b, -3008 },
+ { 0x00001cbd, FC_CASE_FOLD_RANGE, 0x0003, -3008 },
{ 0x00001e00, FC_CASE_FOLD_EVEN_ODD, 0x0095, 1 },
{ 0x00001e96, FC_CASE_FOLD_FULL, 0x0003, 27 },
{ 0x00001e97, FC_CASE_FOLD_FULL, 0x0003, 30 },
@@ -298,7 +300,7 @@ static const FcCaseFold fcCaseFold[FC_NUM_CASE_FOLD] = {
{ 0x0000a7b1, FC_CASE_FOLD_RANGE, 0x0001, 23254 },
{ 0x0000a7b2, FC_CASE_FOLD_RANGE, 0x0001, 23275 },
{ 0x0000a7b3, FC_CASE_FOLD_RANGE, 0x0001, 928 },
- { 0x0000a7b4, FC_CASE_FOLD_EVEN_ODD, 0x0003, 1 },
+ { 0x0000a7b4, FC_CASE_FOLD_EVEN_ODD, 0x0005, 1 },
{ 0x0000ab70, FC_CASE_FOLD_RANGE, 0x0050, 26672 },
{ 0x0000fb00, FC_CASE_FOLD_FULL, 0x0002, 435 },
{ 0x0000fb01, FC_CASE_FOLD_FULL, 0x0002, 437 },
@@ -317,6 +319,7 @@ static const FcCaseFold fcCaseFold[FC_NUM_CASE_FOLD] = {
{ 0x000104b0, FC_CASE_FOLD_RANGE, 0x0024, 40 },
{ 0x00010c80, FC_CASE_FOLD_RANGE, 0x0033, 64 },
{ 0x000118a0, FC_CASE_FOLD_RANGE, 0x0020, 32 },
+ { 0x00016e40, FC_CASE_FOLD_RANGE, 0x0020, 32 },
{ 0x0001e900, FC_CASE_FOLD_RANGE, 0x0022, 34 },
};
diff --git a/fc-cat/Makefile.in b/fc-cat/Makefile.in
index 35c0502c..75f5953f 100644
--- a/fc-cat/Makefile.in
+++ b/fc-cat/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -157,7 +157,8 @@ am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/fc-cat.Po
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -293,6 +294,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JSONC_CFLAGS = @JSONC_CFLAGS@
+JSONC_LIBS = @JSONC_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -446,8 +449,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -518,7 +521,13 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fc-cat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fc-cat.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -642,7 +651,10 @@ cscopelist-am: $(am__tagged_files)
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -715,7 +727,7 @@ clean: clean-am
clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/fc-cat.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -761,7 +773,7 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/fc-cat.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -784,20 +796,21 @@ uninstall-man: uninstall-man1
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \
- clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
- ctags ctags-am distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-binPROGRAMS \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-man1 \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
- uninstall-binPROGRAMS uninstall-man uninstall-man1
+.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles check \
+ check-am clean clean-binPROGRAMS clean-generic clean-libtool \
+ cscopelist-am ctags ctags-am distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-binPROGRAMS install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-man1 install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+ uninstall-am uninstall-binPROGRAMS uninstall-man \
+ uninstall-man1
.PRECIOUS: Makefile
diff --git a/fc-cat/fc-cat.c b/fc-cat/fc-cat.c
index dfe30d76..69611bcc 100644
--- a/fc-cat/fc-cat.c
+++ b/fc-cat/fc-cat.c
@@ -40,6 +40,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
+#include <locale.h>
#ifdef ENABLE_NLS
#include <libintl.h>
@@ -271,6 +272,7 @@ main (int argc, char **argv)
#if HAVE_GETOPT_LONG || HAVE_GETOPT
int c;
+ setlocale (LC_ALL, "");
#if HAVE_GETOPT_LONG
while ((c = getopt_long (argc, argv, "Vvrh", longopts, NULL)) != -1)
#else
diff --git a/fc-conflist/Makefile.in b/fc-conflist/Makefile.in
index 2087171a..212e2e90 100644
--- a/fc-conflist/Makefile.in
+++ b/fc-conflist/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -159,7 +159,8 @@ am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/fc-conflist.Po
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -295,6 +296,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JSONC_CFLAGS = @JSONC_CFLAGS@
+JSONC_LIBS = @JSONC_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -448,8 +451,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -520,7 +523,13 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fc-conflist.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fc-conflist.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -644,7 +653,10 @@ cscopelist-am: $(am__tagged_files)
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -717,7 +729,7 @@ clean: clean-am
clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/fc-conflist.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -763,7 +775,7 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/fc-conflist.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -786,20 +798,21 @@ uninstall-man: uninstall-man1
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \
- clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
- ctags ctags-am distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-binPROGRAMS \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-man1 \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
- uninstall-binPROGRAMS uninstall-man uninstall-man1
+.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles check \
+ check-am clean clean-binPROGRAMS clean-generic clean-libtool \
+ cscopelist-am ctags ctags-am distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-binPROGRAMS install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-man1 install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+ uninstall-am uninstall-binPROGRAMS uninstall-man \
+ uninstall-man1
.PRECIOUS: Makefile
diff --git a/fc-conflist/fc-conflist.c b/fc-conflist/fc-conflist.c
index d02273b7..5c40a0f0 100644
--- a/fc-conflist/fc-conflist.c
+++ b/fc-conflist/fc-conflist.c
@@ -38,6 +38,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
+#include <locale.h>
#ifdef ENABLE_NLS
#include <libintl.h>
@@ -102,6 +103,7 @@ main (int argc, char **argv)
#if HAVE_GETOPT_LONG || HAVE_GETOPT
int c;
+ setlocale (LC_ALL, "");
#if HAVE_GETOPT_LONG
while ((c = getopt_long (argc, argv, "Vh", longopts, NULL)) != -1)
#else
diff --git a/fc-lang/Makefile.in b/fc-lang/Makefile.in
index 5b3895bd..eea0cbb8 100644
--- a/fc-lang/Makefile.in
+++ b/fc-lang/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -259,6 +259,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JSONC_CFLAGS = @JSONC_CFLAGS@
+JSONC_LIBS = @JSONC_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -684,8 +686,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_srcdir)/Tools.mk $(am__empty):
@@ -756,7 +758,10 @@ cscopelist-am: $(am__tagged_files)
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
diff --git a/fc-lang/fc-lang.c b/fc-lang/fc-lang.c
index 4a650e07..503d7125 100644
--- a/fc-lang/fc-lang.c
+++ b/fc-lang/fc-lang.c
@@ -254,7 +254,7 @@ static int compare (const void *a, const void *b)
#define MAX_LANG 1024
#define MAX_LANG_SET_MAP ((MAX_LANG + 31) / 32)
-#define BitSet(map, i) ((map)[(entries[i].id)>>5] |= ((FcChar32) 1 << ((entries[i].id) & 0x1f)))
+#define BitSet(map, i) ((map)[(entries[i].id)>>5] |= ((FcChar32) 1U << ((entries[i].id) & 0x1f)))
int
main (int argc FC_UNUSED, char **argv)
diff --git a/fc-list/Makefile.in b/fc-list/Makefile.in
index dd86470c..e8ac374b 100644
--- a/fc-list/Makefile.in
+++ b/fc-list/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -157,7 +157,8 @@ am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/fc-list.Po
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -293,6 +294,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JSONC_CFLAGS = @JSONC_CFLAGS@
+JSONC_LIBS = @JSONC_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -446,8 +449,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -518,7 +521,13 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fc-list.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fc-list.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -642,7 +651,10 @@ cscopelist-am: $(am__tagged_files)
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -715,7 +727,7 @@ clean: clean-am
clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/fc-list.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -761,7 +773,7 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/fc-list.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -784,20 +796,21 @@ uninstall-man: uninstall-man1
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \
- clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
- ctags ctags-am distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-binPROGRAMS \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-man1 \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
- uninstall-binPROGRAMS uninstall-man uninstall-man1
+.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles check \
+ check-am clean clean-binPROGRAMS clean-generic clean-libtool \
+ cscopelist-am ctags ctags-am distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-binPROGRAMS install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-man1 install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+ uninstall-am uninstall-binPROGRAMS uninstall-man \
+ uninstall-man1
.PRECIOUS: Makefile
diff --git a/fc-list/fc-list.c b/fc-list/fc-list.c
index 5cded50b..2039acd3 100644
--- a/fc-list/fc-list.c
+++ b/fc-list/fc-list.c
@@ -27,6 +27,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
+#include <locale.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
#else
@@ -117,6 +118,7 @@ main (int argc, char **argv)
#if HAVE_GETOPT_LONG || HAVE_GETOPT
int c;
+ setlocale (LC_ALL, "");
#if HAVE_GETOPT_LONG
while ((c = getopt_long (argc, argv, "vbf:qVh", longopts, NULL)) != -1)
#else
diff --git a/fc-match/Makefile.in b/fc-match/Makefile.in
index b611edd9..c87053a1 100644
--- a/fc-match/Makefile.in
+++ b/fc-match/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -157,7 +157,8 @@ am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/fc-match.Po
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -293,6 +294,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JSONC_CFLAGS = @JSONC_CFLAGS@
+JSONC_LIBS = @JSONC_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -446,8 +449,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -518,7 +521,13 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fc-match.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fc-match.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -642,7 +651,10 @@ cscopelist-am: $(am__tagged_files)
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -715,7 +727,7 @@ clean: clean-am
clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/fc-match.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -761,7 +773,7 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/fc-match.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -784,20 +796,21 @@ uninstall-man: uninstall-man1
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \
- clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
- ctags ctags-am distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-binPROGRAMS \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-man1 \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
- uninstall-binPROGRAMS uninstall-man uninstall-man1
+.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles check \
+ check-am clean clean-binPROGRAMS clean-generic clean-libtool \
+ cscopelist-am ctags ctags-am distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-binPROGRAMS install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-man1 install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+ uninstall-am uninstall-binPROGRAMS uninstall-man \
+ uninstall-man1
.PRECIOUS: Makefile
diff --git a/fc-match/fc-match.c b/fc-match/fc-match.c
index 79027079..dee61479 100644
--- a/fc-match/fc-match.c
+++ b/fc-match/fc-match.c
@@ -36,6 +36,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
+#include <locale.h>
#ifdef ENABLE_NLS
#include <libintl.h>
@@ -121,6 +122,7 @@ main (int argc, char **argv)
#if HAVE_GETOPT_LONG || HAVE_GETOPT
int c;
+ setlocale (LC_ALL, "");
#if HAVE_GETOPT_LONG
while ((c = getopt_long (argc, argv, "asvbf:Vh", longopts, NULL)) != -1)
#else
diff --git a/fc-pattern/Makefile.in b/fc-pattern/Makefile.in
index e053e371..7eb31b9d 100644
--- a/fc-pattern/Makefile.in
+++ b/fc-pattern/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -157,7 +157,8 @@ am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/fc-pattern.Po
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -293,6 +294,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JSONC_CFLAGS = @JSONC_CFLAGS@
+JSONC_LIBS = @JSONC_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -446,8 +449,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -518,7 +521,13 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fc-pattern.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fc-pattern.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -642,7 +651,10 @@ cscopelist-am: $(am__tagged_files)
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -715,7 +727,7 @@ clean: clean-am
clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/fc-pattern.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -761,7 +773,7 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/fc-pattern.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -784,20 +796,21 @@ uninstall-man: uninstall-man1
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \
- clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
- ctags ctags-am distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-binPROGRAMS \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-man1 \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
- uninstall-binPROGRAMS uninstall-man uninstall-man1
+.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles check \
+ check-am clean clean-binPROGRAMS clean-generic clean-libtool \
+ cscopelist-am ctags ctags-am distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-binPROGRAMS install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-man1 install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+ uninstall-am uninstall-binPROGRAMS uninstall-man \
+ uninstall-man1
.PRECIOUS: Makefile
diff --git a/fc-pattern/fc-pattern.c b/fc-pattern/fc-pattern.c
index f63761c9..7989b816 100644
--- a/fc-pattern/fc-pattern.c
+++ b/fc-pattern/fc-pattern.c
@@ -36,6 +36,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
+#include <locale.h>
#ifdef ENABLE_NLS
#include <libintl.h>
@@ -111,6 +112,7 @@ main (int argc, char **argv)
#if HAVE_GETOPT_LONG || HAVE_GETOPT
int c;
+ setlocale (LC_ALL, "");
#if HAVE_GETOPT_LONG
while ((c = getopt_long (argc, argv, "cdf:Vh", longopts, NULL)) != -1)
#else
diff --git a/fc-query/Makefile.in b/fc-query/Makefile.in
index ff7722c9..c7e231e4 100644
--- a/fc-query/Makefile.in
+++ b/fc-query/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -157,7 +157,8 @@ am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/fc-query.Po
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -293,6 +294,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JSONC_CFLAGS = @JSONC_CFLAGS@
+JSONC_LIBS = @JSONC_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -446,8 +449,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -518,7 +521,13 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fc-query.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fc-query.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -642,7 +651,10 @@ cscopelist-am: $(am__tagged_files)
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -715,7 +727,7 @@ clean: clean-am
clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/fc-query.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -761,7 +773,7 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/fc-query.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -784,20 +796,21 @@ uninstall-man: uninstall-man1
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \
- clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
- ctags ctags-am distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-binPROGRAMS \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-man1 \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
- uninstall-binPROGRAMS uninstall-man uninstall-man1
+.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles check \
+ check-am clean clean-binPROGRAMS clean-generic clean-libtool \
+ cscopelist-am ctags ctags-am distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-binPROGRAMS install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-man1 install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+ uninstall-am uninstall-binPROGRAMS uninstall-man \
+ uninstall-man1
.PRECIOUS: Makefile
diff --git a/fc-query/fc-query.c b/fc-query/fc-query.c
index 9da090df..fbffb841 100644
--- a/fc-query/fc-query.c
+++ b/fc-query/fc-query.c
@@ -39,6 +39,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
+#include <locale.h>
#ifdef ENABLE_NLS
#include <libintl.h>
@@ -115,6 +116,7 @@ main (int argc, char **argv)
#if HAVE_GETOPT_LONG || HAVE_GETOPT
int c;
+ setlocale (LC_ALL, "");
#if HAVE_GETOPT_LONG
while ((c = getopt_long (argc, argv, "i:bf:Vh", longopts, NULL)) != -1)
#else
diff --git a/fc-scan/Makefile.in b/fc-scan/Makefile.in
index 776561cd..153c33f0 100644
--- a/fc-scan/Makefile.in
+++ b/fc-scan/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -157,7 +157,8 @@ am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/fc-scan.Po
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -293,6 +294,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JSONC_CFLAGS = @JSONC_CFLAGS@
+JSONC_LIBS = @JSONC_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -446,8 +449,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -518,7 +521,13 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fc-scan.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fc-scan.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -642,7 +651,10 @@ cscopelist-am: $(am__tagged_files)
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -715,7 +727,7 @@ clean: clean-am
clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/fc-scan.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -761,7 +773,7 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/fc-scan.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -784,20 +796,21 @@ uninstall-man: uninstall-man1
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \
- clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
- ctags ctags-am distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-binPROGRAMS \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-man1 \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
- uninstall-binPROGRAMS uninstall-man uninstall-man1
+.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles check \
+ check-am clean clean-binPROGRAMS clean-generic clean-libtool \
+ cscopelist-am ctags ctags-am distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-binPROGRAMS install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-man1 install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+ uninstall-am uninstall-binPROGRAMS uninstall-man \
+ uninstall-man1
.PRECIOUS: Makefile
diff --git a/fc-scan/fc-scan.c b/fc-scan/fc-scan.c
index edb967c7..9302ac55 100644
--- a/fc-scan/fc-scan.c
+++ b/fc-scan/fc-scan.c
@@ -39,6 +39,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
+#include <locale.h>
#ifdef ENABLE_NLS
#include <libintl.h>
@@ -110,6 +111,7 @@ main (int argc, char **argv)
#if HAVE_GETOPT_LONG || HAVE_GETOPT
int c;
+ setlocale (LC_ALL, "");
#if HAVE_GETOPT_LONG
while ((c = getopt_long (argc, argv, "bf:Vh", longopts, NULL)) != -1)
#else
diff --git a/fc-validate/Makefile.in b/fc-validate/Makefile.in
index ede28081..dffa1a6c 100644
--- a/fc-validate/Makefile.in
+++ b/fc-validate/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -159,7 +159,8 @@ am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/fc-validate.Po
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -295,6 +296,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JSONC_CFLAGS = @JSONC_CFLAGS@
+JSONC_LIBS = @JSONC_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -448,8 +451,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -520,7 +523,13 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fc-validate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fc-validate.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -644,7 +653,10 @@ cscopelist-am: $(am__tagged_files)
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -717,7 +729,7 @@ clean: clean-am
clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/fc-validate.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -763,7 +775,7 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/fc-validate.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -786,20 +798,21 @@ uninstall-man: uninstall-man1
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \
- clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
- ctags ctags-am distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-binPROGRAMS \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-man1 \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
- uninstall-binPROGRAMS uninstall-man uninstall-man1
+.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles check \
+ check-am clean clean-binPROGRAMS clean-generic clean-libtool \
+ cscopelist-am ctags ctags-am distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-binPROGRAMS install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-man1 install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+ uninstall-am uninstall-binPROGRAMS uninstall-man \
+ uninstall-man1
.PRECIOUS: Makefile
diff --git a/fontconfig.spec b/fontconfig.spec
index e6229143..c3f020f5 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -4,7 +4,7 @@
Summary: Font configuration and customization library
Name: fontconfig
-Version: 2.13.0
+Version: 2.13.1
Release: 1
License: MIT
Group: System Environment/Libraries
diff --git a/fontconfig/Makefile.in b/fontconfig/Makefile.in
index d79df21a..6f3c47d9 100644
--- a/fontconfig/Makefile.in
+++ b/fontconfig/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -237,6 +237,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JSONC_CFLAGS = @JSONC_CFLAGS@
+JSONC_LIBS = @JSONC_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -387,8 +389,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -479,7 +481,10 @@ cscopelist-am: $(am__tagged_files)
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index a89b22f2..bac1dda7 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -53,7 +53,7 @@ typedef int FcBool;
#define FC_MAJOR 2
#define FC_MINOR 13
-#define FC_REVISION 0
+#define FC_REVISION 1
#define FC_VERSION ((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
@@ -248,6 +248,11 @@ typedef enum _FcValueBinding {
typedef struct _FcPattern FcPattern;
+typedef struct _FcPatternIter {
+ void *dummy1;
+ void *dummy2;
+} FcPatternIter;
+
typedef struct _FcLangSet FcLangSet;
typedef struct _FcRange FcRange;
@@ -376,6 +381,10 @@ FcDirCacheCreateUUID (FcChar8 *dir,
FcBool force,
FcConfig *config);
+FcPublic FcBool
+FcDirCacheDeleteUUID (const FcChar8 *dir,
+ FcConfig *config);
+
/* fccfg.c */
FcPublic FcChar8 *
FcConfigHome (void);
@@ -861,6 +870,9 @@ FcValueSave (FcValue v);
FcPublic void
FcPatternDestroy (FcPattern *p);
+int
+FcPatternObjectCount (const FcPattern *pat);
+
FcPublic FcBool
FcPatternEqual (const FcPattern *pa, const FcPattern *pb);
@@ -961,6 +973,31 @@ FcRangeCopy (const FcRange *r);
FcPublic FcBool
FcRangeGetDouble(const FcRange *range, double *begin, double *end);
+FcPublic void
+FcPatternIterStart (const FcPattern *pat, FcPatternIter *iter);
+
+FcPublic FcBool
+FcPatternIterNext (const FcPattern *pat, FcPatternIter *iter);
+
+FcPublic FcBool
+FcPatternIterEqual (const FcPattern *p1, FcPatternIter *i1,
+ const FcPattern *p2, FcPatternIter *i2);
+
+FcPublic FcBool
+FcPatternFindIter (const FcPattern *pat, FcPatternIter *iter, const char *object);
+
+FcPublic FcBool
+FcPatternIterIsValid (const FcPattern *pat, FcPatternIter *iter);
+
+FcPublic const char *
+FcPatternIterGetObject (const FcPattern *pat, FcPatternIter *iter);
+
+FcPublic int
+FcPatternIterValueCount (const FcPattern *pat, FcPatternIter *iter);
+
+FcPublic FcResult
+FcPatternIterGetValue (const FcPattern *pat, FcPatternIter *iter, int id, FcValue *v, FcValueBinding *b);
+
/* fcweight.c */
FcPublic int
diff --git a/install-sh b/install-sh
index 0360b79e..8175c640 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2016-01-11.22; # UTC
+scriptversion=2018-03-11.20; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -271,15 +271,18 @@ do
fi
dst=$dst_arg
- # If destination is a directory, append the input filename; won't work
- # if double slashes aren't ignored.
+ # If destination is a directory, append the input filename.
if test -d "$dst"; then
if test "$is_target_a_directory" = never; then
echo "$0: $dst_arg: Is a directory" >&2
exit 1
fi
dstdir=$dst
- dst=$dstdir/`basename "$src"`
+ dstbase=`basename "$src"`
+ case $dst in
+ */) dst=$dst$dstbase;;
+ *) dst=$dst/$dstbase;;
+ esac
dstdir_status=0
else
dstdir=`dirname "$dst"`
@@ -288,6 +291,11 @@ do
fi
fi
+ case $dstdir in
+ */) dstdirslash=$dstdir;;
+ *) dstdirslash=$dstdir/;;
+ esac
+
obsolete_mkdir_used=false
if test $dstdir_status != 0; then
@@ -324,34 +332,43 @@ do
# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
;;
*)
+ # Note that $RANDOM variable is not portable (e.g. dash); Use it
+ # here however when possible just to lower collision chance.
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+ trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+ # Because "mkdir -p" follows existing symlinks and we likely work
+ # directly in world-writeable /tmp, make sure that the '$tmpdir'
+ # directory is successfully created first before we actually test
+ # 'mkdir -p' feature.
if (umask $mkdir_umask &&
- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+ $mkdirprog $mkdir_mode "$tmpdir" &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
then
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
# other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
- ls_ld_tmpdir=`ls -ld "$tmpdir"`
+ test_tmpdir="$tmpdir/a"
+ ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
case $ls_ld_tmpdir in
d????-?r-*) different_mode=700;;
d????-?--*) different_mode=755;;
*) false;;
esac &&
- $mkdirprog -m$different_mode -p -- "$tmpdir" && {
- ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+ $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
}
}
then posix_mkdir=:
fi
- rmdir "$tmpdir/d" "$tmpdir"
+ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
else
# Remove any dirs left behind by ancient mkdir implementations.
- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+ rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
fi
trap '' 0;;
esac;;
@@ -427,8 +444,8 @@ do
else
# Make a couple of temp file names in the proper directory.
- dsttmp=$dstdir/_inst.$$_
- rmtmp=$dstdir/_rm.$$_
+ dsttmp=${dstdirslash}_inst.$$_
+ rmtmp=${dstdirslash}_rm.$$_
# Trap to clean up those temp files at exit.
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
@@ -493,7 +510,7 @@ do
done
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC0"
diff --git a/its/Makefile.in b/its/Makefile.in
index ce751f16..8492db46 100644
--- a/its/Makefile.in
+++ b/its/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -218,6 +218,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JSONC_CFLAGS = @JSONC_CFLAGS@
+JSONC_LIBS = @JSONC_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -371,8 +373,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -417,7 +419,10 @@ ctags CTAGS:
cscope cscopelist:
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
diff --git a/missing b/missing
index c6e37958..625aeb11 100755
--- a/missing
+++ b/missing
@@ -1,9 +1,9 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2016-01-11.22; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2016-01-11.22; # UTC
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -101,9 +101,9 @@ else
exit $st
fi
-perl_URL=http://www.perl.org/
-flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=http://www.gnu.org/software
+perl_URL=https://www.perl.org/
+flex_URL=https://github.com/westes/flex
+gnu_software_URL=https://www.gnu.org/software
program_details ()
{
@@ -207,7 +207,7 @@ give_advice "$1" | sed -e '1s/^/WARNING: /' \
exit $st
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC0"
diff --git a/po-conf/fontconfig-conf.pot b/po-conf/fontconfig-conf.pot
index e9a16ea3..9cfdd11a 100644
--- a/po-conf/fontconfig-conf.pot
+++ b/po-conf/fontconfig-conf.pot
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: fontconfig 2.13.0\n"
+"Project-Id-Version: fontconfig 2.13.1\n"
"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?"
"product=fontconfig\n"
-"POT-Creation-Date: 2018-03-06 12:50+0900\n"
+"POT-Creation-Date: 2018-08-30 08:06+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po-conf/zh_CN.gmo b/po-conf/zh_CN.gmo
index 42b80774..2f7dbb9a 100644
--- a/po-conf/zh_CN.gmo
+++ b/po-conf/zh_CN.gmo
Binary files differ
diff --git a/po-conf/zh_CN.po b/po-conf/zh_CN.po
index 4c282899..f94f17a7 100644
--- a/po-conf/zh_CN.po
+++ b/po-conf/zh_CN.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: fontconfig 2.12.92\n"
"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?"
"product=fontconfig\n"
-"POT-Creation-Date: 2018-03-06 12:50+0900\n"
+"POT-Creation-Date: 2018-08-30 08:06+0000\n"
"PO-Revision-Date: 2018-02-16 01:19-0600\n"
"Last-Translator: Mingcong Bai <jeffbai@aosc.xyz>\n"
"Language-Team: AOSC\n"
diff --git a/po/fontconfig.pot b/po/fontconfig.pot
index b302227e..5dd58834 100644
--- a/po/fontconfig.pot
+++ b/po/fontconfig.pot
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: fontconfig 2.13.0\n"
+"Project-Id-Version: fontconfig 2.13.1\n"
"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?"
"product=fontconfig\n"
-"POT-Creation-Date: 2018-03-06 12:50+0900\n"
+"POT-Creation-Date: 2018-08-30 08:06+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: fc-cache/fc-cache.c:98
+#: fc-cache/fc-cache.c:99
#, c-format
msgid ""
"usage: %s [-EfrsvVh] [-y SYSROOT] [--error-on-no-fonts] [--force|--really-"
@@ -26,245 +26,245 @@ msgid ""
"[dirs]\n"
msgstr ""
-#: fc-cache/fc-cache.c:101
+#: fc-cache/fc-cache.c:102
#, c-format
msgid "usage: %s [-EfrsvVh] [-y SYSROOT] [dirs]\n"
msgstr ""
-#: fc-cache/fc-cache.c:104
+#: fc-cache/fc-cache.c:105
#, c-format
msgid ""
"Build font information caches in [dirs]\n"
"(all directories in font configuration by default).\n"
msgstr ""
-#: fc-cache/fc-cache.c:108
+#: fc-cache/fc-cache.c:109
#, c-format
msgid " -E, --error-on-no-fonts raise an error if no fonts in a directory\n"
msgstr ""
-#: fc-cache/fc-cache.c:109
+#: fc-cache/fc-cache.c:110
#, c-format
msgid ""
" -f, --force scan directories with apparently valid caches\n"
msgstr ""
-#: fc-cache/fc-cache.c:110
+#: fc-cache/fc-cache.c:111
#, c-format
msgid " -r, --really-force erase all existing caches, then rescan\n"
msgstr ""
-#: fc-cache/fc-cache.c:111
+#: fc-cache/fc-cache.c:112
#, c-format
msgid " -s, --system-only scan system-wide directories only\n"
msgstr ""
-#: fc-cache/fc-cache.c:112
+#: fc-cache/fc-cache.c:113
#, c-format
msgid " -y, --sysroot=SYSROOT prepend SYSROOT to all paths for scanning\n"
msgstr ""
-#: fc-cache/fc-cache.c:113
+#: fc-cache/fc-cache.c:114
#, c-format
msgid " -v, --verbose display status information while busy\n"
msgstr ""
-#: fc-cache/fc-cache.c:114
+#: fc-cache/fc-cache.c:115
#, c-format
msgid " -V, --version display font config version and exit\n"
msgstr ""
-#: fc-cache/fc-cache.c:115
+#: fc-cache/fc-cache.c:116
#, c-format
msgid " -h, --help display this help and exit\n"
msgstr ""
-#: fc-cache/fc-cache.c:117
+#: fc-cache/fc-cache.c:118
#, c-format
msgid " -E (error-on-no-fonts)\n"
msgstr ""
-#: fc-cache/fc-cache.c:118
+#: fc-cache/fc-cache.c:119
#, c-format
msgid " raise an error if no fonts in a directory\n"
msgstr ""
-#: fc-cache/fc-cache.c:119
+#: fc-cache/fc-cache.c:120
#, c-format
msgid " -f (force) scan directories with apparently valid caches\n"
msgstr ""
-#: fc-cache/fc-cache.c:120
+#: fc-cache/fc-cache.c:121
#, c-format
msgid " -r, (really force) erase all existing caches, then rescan\n"
msgstr ""
-#: fc-cache/fc-cache.c:121
+#: fc-cache/fc-cache.c:122
#, c-format
msgid " -s (system) scan system-wide directories only\n"
msgstr ""
-#: fc-cache/fc-cache.c:122
+#: fc-cache/fc-cache.c:123
#, c-format
msgid " -y SYSROOT (sysroot) prepend SYSROOT to all paths for scanning\n"
msgstr ""
-#: fc-cache/fc-cache.c:123
+#: fc-cache/fc-cache.c:124
#, c-format
msgid " -v (verbose) display status information while busy\n"
msgstr ""
-#: fc-cache/fc-cache.c:124 fc-cat/fc-cat.c:178 fc-list/fc-list.c:99
-#: fc-match/fc-match.c:103 fc-pattern/fc-pattern.c:97
+#: fc-cache/fc-cache.c:125 fc-cat/fc-cat.c:179 fc-list/fc-list.c:100
+#: fc-match/fc-match.c:104 fc-pattern/fc-pattern.c:98
#, c-format
msgid " -V (version) display font config version and exit\n"
msgstr ""
-#: fc-cache/fc-cache.c:125 fc-cat/fc-cat.c:179 fc-list/fc-list.c:100
-#: fc-match/fc-match.c:104 fc-pattern/fc-pattern.c:98
+#: fc-cache/fc-cache.c:126 fc-cat/fc-cat.c:180 fc-list/fc-list.c:101
+#: fc-match/fc-match.c:105 fc-pattern/fc-pattern.c:99
#, c-format
msgid " -h (help) display this help and exit\n"
msgstr ""
-#: fc-cache/fc-cache.c:162
+#: fc-cache/fc-cache.c:163
#, c-format
msgid "skipping, looped directory detected\n"
msgstr ""
-#: fc-cache/fc-cache.c:172
+#: fc-cache/fc-cache.c:173
#, c-format
msgid "skipping, no such directory\n"
msgstr ""
-#: fc-cache/fc-cache.c:185
+#: fc-cache/fc-cache.c:186
#, c-format
msgid "\"%s\": not a directory, skipping\n"
msgstr ""
-#: fc-cache/fc-cache.c:210
+#: fc-cache/fc-cache.c:211
#, c-format
msgid "\"%s\": scanning error\n"
msgstr ""
-#: fc-cache/fc-cache.c:219
+#: fc-cache/fc-cache.c:220
#, c-format
msgid "skipping, existing cache is valid: %d fonts, %d dirs\n"
msgstr ""
-#: fc-cache/fc-cache.c:225
+#: fc-cache/fc-cache.c:226
#, c-format
msgid "caching, new cache contents: %d fonts, %d dirs\n"
msgstr ""
-#: fc-cache/fc-cache.c:230
+#: fc-cache/fc-cache.c:231
#, c-format
msgid "%s: failed to write cache\n"
msgstr ""
-#: fc-cache/fc-cache.c:239
+#: fc-cache/fc-cache.c:240
#, c-format
msgid "%s: Can't create subdir set\n"
msgstr ""
-#: fc-cache/fc-cache.c:253
+#: fc-cache/fc-cache.c:254
#, c-format
msgid "%s: Can't create subdir list\n"
msgstr ""
-#: fc-cache/fc-cache.c:359 fc-cat/fc-cat.c:305
+#: fc-cache/fc-cache.c:361 fc-cat/fc-cat.c:307
#, c-format
msgid "%s: Can't initialize font config library\n"
msgstr ""
-#: fc-cache/fc-cache.c:369
+#: fc-cache/fc-cache.c:371
#, c-format
msgid "%s: Can't create list of directories\n"
msgstr ""
-#: fc-cache/fc-cache.c:377
+#: fc-cache/fc-cache.c:379
#, c-format
msgid "%s: Can't add directory\n"
msgstr ""
-#: fc-cache/fc-cache.c:389
+#: fc-cache/fc-cache.c:391
#, c-format
msgid "Out of Memory\n"
msgstr ""
-#: fc-cache/fc-cache.c:421
+#: fc-cache/fc-cache.c:423
msgid "failed"
msgstr ""
-#: fc-cache/fc-cache.c:421
+#: fc-cache/fc-cache.c:423
msgid "succeeded"
msgstr ""
-#: fc-cat/fc-cat.c:159
+#: fc-cat/fc-cat.c:160
#, c-format
msgid "usage: %s [-rv] [--recurse] [--verbose] [*-%s"
msgstr ""
-#: fc-cat/fc-cat.c:163
+#: fc-cat/fc-cat.c:164
#, c-format
msgid "usage: %s [-rvVh] [*-%s"
msgstr ""
-#: fc-cat/fc-cat.c:166
+#: fc-cat/fc-cat.c:167
#, c-format
msgid "Reads font information cache from:\n"
msgstr ""
-#: fc-cat/fc-cat.c:167
+#: fc-cat/fc-cat.c:168
#, c-format
msgid " 1) specified fontconfig cache file\n"
msgstr ""
-#: fc-cat/fc-cat.c:168
+#: fc-cat/fc-cat.c:169
#, c-format
msgid " 2) related to a particular font directory\n"
msgstr ""
-#: fc-cat/fc-cat.c:171
+#: fc-cat/fc-cat.c:172
#, c-format
msgid " -r, --recurse recurse into subdirectories\n"
msgstr ""
-#: fc-cat/fc-cat.c:172
+#: fc-cat/fc-cat.c:173
#, c-format
msgid " -v, --verbose be verbose\n"
msgstr ""
-#: fc-cat/fc-cat.c:173 fc-conflist/fc-conflist.c:87 fc-list/fc-list.c:92
-#: fc-match/fc-match.c:95 fc-pattern/fc-pattern.c:91 fc-query/fc-query.c:94
-#: fc-scan/fc-scan.c:92 fc-validate/fc-validate.c:95
+#: fc-cat/fc-cat.c:174 fc-conflist/fc-conflist.c:88 fc-list/fc-list.c:93
+#: fc-match/fc-match.c:96 fc-pattern/fc-pattern.c:92 fc-query/fc-query.c:95
+#: fc-scan/fc-scan.c:93 fc-validate/fc-validate.c:95
#, c-format
msgid " -V, --version display font config version and exit\n"
msgstr ""
-#: fc-cat/fc-cat.c:174 fc-conflist/fc-conflist.c:88 fc-list/fc-list.c:93
-#: fc-match/fc-match.c:96 fc-pattern/fc-pattern.c:92 fc-query/fc-query.c:95
-#: fc-scan/fc-scan.c:93 fc-validate/fc-validate.c:96
+#: fc-cat/fc-cat.c:175 fc-conflist/fc-conflist.c:89 fc-list/fc-list.c:94
+#: fc-match/fc-match.c:97 fc-pattern/fc-pattern.c:93 fc-query/fc-query.c:96
+#: fc-scan/fc-scan.c:94 fc-validate/fc-validate.c:96
#, c-format
msgid " -h, --help display this help and exit\n"
msgstr ""
-#: fc-cat/fc-cat.c:176
+#: fc-cat/fc-cat.c:177
#, c-format
msgid " -r (recurse) recurse into subdirectories\n"
msgstr ""
-#: fc-cat/fc-cat.c:177
+#: fc-cat/fc-cat.c:178
#, c-format
msgid " -v (verbose) be verbose\n"
msgstr ""
-#: fc-cat/fc-cat.c:314 fc-cat/fc-cat.c:323 fc-cat/fc-cat.c:335
-#: fc-cat/fc-cat.c:343
+#: fc-cat/fc-cat.c:316 fc-cat/fc-cat.c:325 fc-cat/fc-cat.c:337
+#: fc-cat/fc-cat.c:345
#, c-format
msgid "%s: malloc failure\n"
msgstr ""
-#: fc-cat/fc-cat.c:383
+#: fc-cat/fc-cat.c:385
#, c-format
msgid ""
"Directory: %s\n"
@@ -272,243 +272,243 @@ msgid ""
"--------\n"
msgstr ""
-#: fc-conflist/fc-conflist.c:78
+#: fc-conflist/fc-conflist.c:79
#, c-format
msgid "usage: %s [-Vh] [--version] [--help]\n"
msgstr ""
-#: fc-conflist/fc-conflist.c:81
+#: fc-conflist/fc-conflist.c:82
#, c-format
msgid "usage: %s [-Vh]\n"
msgstr ""
-#: fc-conflist/fc-conflist.c:84
+#: fc-conflist/fc-conflist.c:85
#, c-format
msgid "Show the ruleset files information on the system\n"
msgstr ""
-#: fc-conflist/fc-conflist.c:90 fc-validate/fc-validate.c:101
+#: fc-conflist/fc-conflist.c:91 fc-validate/fc-validate.c:101
#, c-format
msgid " -V (version) display font config version and exit\n"
msgstr ""
-#: fc-conflist/fc-conflist.c:91 fc-validate/fc-validate.c:102
+#: fc-conflist/fc-conflist.c:92 fc-validate/fc-validate.c:102
#, c-format
msgid " -h (help) display this help and exit\n"
msgstr ""
-#: fc-list/fc-list.c:79
+#: fc-list/fc-list.c:80
#, c-format
msgid ""
"usage: %s [-vbqVh] [-f FORMAT] [--verbose] [--brief] [--format=FORMAT] [--"
"quiet] [--version] [--help] [pattern] {element ...} \n"
msgstr ""
-#: fc-list/fc-list.c:82
+#: fc-list/fc-list.c:83
#, c-format
msgid "usage: %s [-vbqVh] [-f FORMAT] [pattern] {element ...} \n"
msgstr ""
-#: fc-list/fc-list.c:85
+#: fc-list/fc-list.c:86
#, c-format
msgid "List fonts matching [pattern]\n"
msgstr ""
-#: fc-list/fc-list.c:88 fc-match/fc-match.c:92
+#: fc-list/fc-list.c:89 fc-match/fc-match.c:93
#, c-format
msgid " -v, --verbose display entire font pattern verbosely\n"
msgstr ""
-#: fc-list/fc-list.c:89 fc-match/fc-match.c:93
+#: fc-list/fc-list.c:90 fc-match/fc-match.c:94
#, c-format
msgid " -b, --brief display entire font pattern briefly\n"
msgstr ""
-#: fc-list/fc-list.c:90 fc-match/fc-match.c:94 fc-pattern/fc-pattern.c:90
-#: fc-query/fc-query.c:93 fc-scan/fc-scan.c:91
+#: fc-list/fc-list.c:91 fc-match/fc-match.c:95 fc-pattern/fc-pattern.c:91
+#: fc-query/fc-query.c:94 fc-scan/fc-scan.c:92
#, c-format
msgid " -f, --format=FORMAT use the given output format\n"
msgstr ""
-#: fc-list/fc-list.c:91
+#: fc-list/fc-list.c:92
#, c-format
msgid ""
" -q, --quiet suppress all normal output, exit 1 if no fonts "
"matched\n"
msgstr ""
-#: fc-list/fc-list.c:95 fc-match/fc-match.c:100
+#: fc-list/fc-list.c:96 fc-match/fc-match.c:101
#, c-format
msgid " -v (verbose) display entire font pattern verbosely\n"
msgstr ""
-#: fc-list/fc-list.c:96 fc-match/fc-match.c:101
+#: fc-list/fc-list.c:97 fc-match/fc-match.c:102
#, c-format
msgid " -b (brief) display entire font pattern briefly\n"
msgstr ""
-#: fc-list/fc-list.c:97 fc-match/fc-match.c:102 fc-pattern/fc-pattern.c:96
+#: fc-list/fc-list.c:98 fc-match/fc-match.c:103 fc-pattern/fc-pattern.c:97
#, c-format
msgid " -f FORMAT (format) use the given output format\n"
msgstr ""
-#: fc-list/fc-list.c:98
+#: fc-list/fc-list.c:99
#, c-format
msgid ""
" -q, (quiet) suppress all normal output, exit 1 if no fonts "
"matched\n"
msgstr ""
-#: fc-list/fc-list.c:159 fc-match/fc-match.c:166 fc-pattern/fc-pattern.c:150
+#: fc-list/fc-list.c:161 fc-match/fc-match.c:168 fc-pattern/fc-pattern.c:152
#, c-format
msgid "Unable to parse the pattern\n"
msgstr ""
-#: fc-match/fc-match.c:81
+#: fc-match/fc-match.c:82
#, c-format
msgid ""
"usage: %s [-savbVh] [-f FORMAT] [--sort] [--all] [--verbose] [--brief] [--"
"format=FORMAT] [--version] [--help] [pattern] {element...}\n"
msgstr ""
-#: fc-match/fc-match.c:84
+#: fc-match/fc-match.c:85
#, c-format
msgid "usage: %s [-savVh] [-f FORMAT] [pattern] {element...}\n"
msgstr ""
-#: fc-match/fc-match.c:87 fc-pattern/fc-pattern.c:85
+#: fc-match/fc-match.c:88 fc-pattern/fc-pattern.c:86
#, c-format
msgid "List best font matching [pattern]\n"
msgstr ""
-#: fc-match/fc-match.c:90
+#: fc-match/fc-match.c:91
#, c-format
msgid " -s, --sort display sorted list of matches\n"
msgstr ""
-#: fc-match/fc-match.c:91
+#: fc-match/fc-match.c:92
#, c-format
msgid " -a, --all display unpruned sorted list of matches\n"
msgstr ""
-#: fc-match/fc-match.c:98
+#: fc-match/fc-match.c:99
#, c-format
msgid " -s, (sort) display sorted list of matches\n"
msgstr ""
-#: fc-match/fc-match.c:99
+#: fc-match/fc-match.c:100
#, c-format
msgid " -a (all) display unpruned sorted list of matches\n"
msgstr ""
-#: fc-match/fc-match.c:195
+#: fc-match/fc-match.c:197
#, c-format
msgid "No fonts installed on the system\n"
msgstr ""
-#: fc-pattern/fc-pattern.c:79
+#: fc-pattern/fc-pattern.c:80
#, c-format
msgid ""
"usage: %s [-cdVh] [-f FORMAT] [--config] [--default] [--verbose] [--"
"format=FORMAT] [--version] [--help] [pattern] {element...}\n"
msgstr ""
-#: fc-pattern/fc-pattern.c:82
+#: fc-pattern/fc-pattern.c:83
#, c-format
msgid "usage: %s [-cdVh] [-f FORMAT] [pattern] {element...}\n"
msgstr ""
-#: fc-pattern/fc-pattern.c:88
+#: fc-pattern/fc-pattern.c:89
#, c-format
msgid " -c, --config perform config substitution on pattern\n"
msgstr ""
-#: fc-pattern/fc-pattern.c:89
+#: fc-pattern/fc-pattern.c:90
#, c-format
msgid " -d, --default perform default substitution on pattern\n"
msgstr ""
-#: fc-pattern/fc-pattern.c:94
+#: fc-pattern/fc-pattern.c:95
#, c-format
msgid " -c, (config) perform config substitution on pattern\n"
msgstr ""
-#: fc-pattern/fc-pattern.c:95
+#: fc-pattern/fc-pattern.c:96
#, c-format
msgid " -d, (default) perform default substitution on pattern\n"
msgstr ""
-#: fc-query/fc-query.c:82
+#: fc-query/fc-query.c:83
#, c-format
msgid ""
"usage: %s [-bVh] [-i index] [-f FORMAT] [--index index] [--brief] [--format "
"FORMAT] [--version] [--help] font-file...\n"
msgstr ""
-#: fc-query/fc-query.c:85
+#: fc-query/fc-query.c:86
#, c-format
msgid "usage: %s [-bVh] [-i index] [-f FORMAT] font-file...\n"
msgstr ""
-#: fc-query/fc-query.c:88
+#: fc-query/fc-query.c:89
#, c-format
msgid "Query font files and print resulting pattern(s)\n"
msgstr ""
-#: fc-query/fc-query.c:91 fc-validate/fc-validate.c:92
+#: fc-query/fc-query.c:92 fc-validate/fc-validate.c:92
#, c-format
msgid " -i, --index INDEX display the INDEX face of each font file only\n"
msgstr ""
-#: fc-query/fc-query.c:92 fc-scan/fc-scan.c:90
+#: fc-query/fc-query.c:93 fc-scan/fc-scan.c:91
#, c-format
msgid " -b, --brief display font pattern briefly\n"
msgstr ""
-#: fc-query/fc-query.c:97
+#: fc-query/fc-query.c:98
#, c-format
msgid ""
" -i INDEX (index) display the INDEX face of each font file only\n"
msgstr ""
-#: fc-query/fc-query.c:98 fc-scan/fc-scan.c:95
+#: fc-query/fc-query.c:99 fc-scan/fc-scan.c:96
#, c-format
msgid " -b (brief) display font pattern briefly\n"
msgstr ""
-#: fc-query/fc-query.c:99 fc-scan/fc-scan.c:96
+#: fc-query/fc-query.c:100 fc-scan/fc-scan.c:97
#, c-format
msgid " -f FORMAT (format) use the given output format\n"
msgstr ""
-#: fc-query/fc-query.c:100 fc-scan/fc-scan.c:97
+#: fc-query/fc-query.c:101 fc-scan/fc-scan.c:98
#, c-format
msgid " -V (version) display font config version and exit\n"
msgstr ""
-#: fc-query/fc-query.c:101 fc-scan/fc-scan.c:98
+#: fc-query/fc-query.c:102 fc-scan/fc-scan.c:99
#, c-format
msgid " -h (help) display this help and exit\n"
msgstr ""
-#: fc-query/fc-query.c:158
+#: fc-query/fc-query.c:160
#, c-format
msgid "Can't query face %u of font file %s\n"
msgstr ""
-#: fc-scan/fc-scan.c:81
+#: fc-scan/fc-scan.c:82
#, c-format
msgid ""
"usage: %s [-bVh] [-f FORMAT] [--brief] [--format FORMAT] [--version] [--"
"help] font-file...\n"
msgstr ""
-#: fc-scan/fc-scan.c:84
+#: fc-scan/fc-scan.c:85
#, c-format
msgid "usage: %s [-bVh] [-f FORMAT] font-file...\n"
msgstr ""
-#: fc-scan/fc-scan.c:87
+#: fc-scan/fc-scan.c:88
#, c-format
msgid "Scan font files and directories, and print resulting pattern(s)\n"
msgstr ""
@@ -576,6 +576,6 @@ msgstr ""
msgid "%s:%d Satisfy the coverage for %s language\n"
msgstr ""
-#: src/fccfg.c:2657
+#: src/fccfg.c:2701
msgid "No description"
msgstr ""
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 8eb21750..788f6fb6 100644
--- a/po/zh_CN.gmo
+++ b/po/zh_CN.gmo
Binary files differ
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4bb67c2a..ebb192db 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,7 +12,7 @@ msgstr ""
"Project-Id-Version: fontconfig 2.12.92\n"
"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?"
"product=fontconfig\n"
-"POT-Creation-Date: 2018-03-06 12:50+0900\n"
+"POT-Creation-Date: 2018-08-30 08:06+0000\n"
"PO-Revision-Date: 2018-02-16 01:41-0600\n"
"Last-Translator: Mingcong Bai <jeffbai@aosc.xyz>\n"
"Language-Team: AOSC\n"
@@ -23,7 +23,7 @@ msgstr ""
"X-Generator: Poedit 2.0.5\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: fc-cache/fc-cache.c:98
+#: fc-cache/fc-cache.c:99
#, c-format
msgid ""
"usage: %s [-EfrsvVh] [-y SYSROOT] [--error-on-no-fonts] [--force|--really-"
@@ -34,12 +34,12 @@ msgstr ""
"force] [--sysroot=<系统根>] [--system-only] [--verbose] [--version] [--help] "
"[目录]\n"
-#: fc-cache/fc-cache.c:101
+#: fc-cache/fc-cache.c:102
#, c-format
msgid "usage: %s [-EfrsvVh] [-y SYSROOT] [dirs]\n"
msgstr "用法:%s [-EfrsvVh] [-y <系统根>] [目录]\n"
-#: fc-cache/fc-cache.c:104
+#: fc-cache/fc-cache.c:105
#, c-format
msgid ""
"Build font information caches in [dirs]\n"
@@ -48,233 +48,233 @@ msgstr ""
"在 [目录] 构建字体信息缓存\n"
"(默认为所有字体配置中定义的目录)。\n"
-#: fc-cache/fc-cache.c:108
+#: fc-cache/fc-cache.c:109
#, c-format
msgid " -E, --error-on-no-fonts raise an error if no fonts in a directory\n"
msgstr " -E, --error-on-no-fonts 在目录中无字体时报错\n"
-#: fc-cache/fc-cache.c:109
+#: fc-cache/fc-cache.c:110
#, c-format
msgid ""
" -f, --force scan directories with apparently valid caches\n"
msgstr " -f, --force 强制扫描已有有效缓存的目录\n"
-#: fc-cache/fc-cache.c:110
+#: fc-cache/fc-cache.c:111
#, c-format
msgid " -r, --really-force erase all existing caches, then rescan\n"
msgstr " -r, --really-force 清空所有缓存并重新扫描\n"
-#: fc-cache/fc-cache.c:111
+#: fc-cache/fc-cache.c:112
#, c-format
msgid " -s, --system-only scan system-wide directories only\n"
msgstr " -s, --system-only 仅扫描系统全局目录\n"
-#: fc-cache/fc-cache.c:112
+#: fc-cache/fc-cache.c:113
#, c-format
msgid " -y, --sysroot=SYSROOT prepend SYSROOT to all paths for scanning\n"
msgstr " -y, --sysroot=<系统根> 扫描时将 <系统根> 值附加到路径开头\n"
-#: fc-cache/fc-cache.c:113
+#: fc-cache/fc-cache.c:114
#, c-format
msgid " -v, --verbose display status information while busy\n"
msgstr " -v, --verbose 在程序工作时显示状态信息\n"
-#: fc-cache/fc-cache.c:114
+#: fc-cache/fc-cache.c:115
#, c-format
msgid " -V, --version display font config version and exit\n"
msgstr " -V, --version 显示 Fontconfig 版本并退出\n"
-#: fc-cache/fc-cache.c:115
+#: fc-cache/fc-cache.c:116
#, c-format
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help 显示该帮助信息并退出\n"
-#: fc-cache/fc-cache.c:117
+#: fc-cache/fc-cache.c:118
#, c-format
msgid " -E (error-on-no-fonts)\n"
msgstr " -E (error-on-no-fonts)\n"
-#: fc-cache/fc-cache.c:118
+#: fc-cache/fc-cache.c:119
#, c-format
msgid " raise an error if no fonts in a directory\n"
msgstr " 在目录中无字体时报错\n"
-#: fc-cache/fc-cache.c:119
+#: fc-cache/fc-cache.c:120
#, c-format
msgid " -f (force) scan directories with apparently valid caches\n"
msgstr " -f (force) 强制扫描带有有效缓存的目录\n"
-#: fc-cache/fc-cache.c:120
+#: fc-cache/fc-cache.c:121
#, c-format
msgid " -r, (really force) erase all existing caches, then rescan\n"
msgstr " -r, (really-force) 清空所有缓存并重新扫描\n"
-#: fc-cache/fc-cache.c:121
+#: fc-cache/fc-cache.c:122
#, c-format
msgid " -s (system) scan system-wide directories only\n"
msgstr " -s (system) 仅扫描系统全局目录\n"
-#: fc-cache/fc-cache.c:122
+#: fc-cache/fc-cache.c:123
#, c-format
msgid " -y SYSROOT (sysroot) prepend SYSROOT to all paths for scanning\n"
msgstr " -y <系统根> (sysroot) 扫描时将 <系统根> 值附加到路径开头\n"
-#: fc-cache/fc-cache.c:123
+#: fc-cache/fc-cache.c:124
#, c-format
msgid " -v (verbose) display status information while busy\n"
msgstr " -v (verbose) 在程序工作时显示状态信息\n"
-#: fc-cache/fc-cache.c:124 fc-cat/fc-cat.c:178 fc-list/fc-list.c:99
-#: fc-match/fc-match.c:103 fc-pattern/fc-pattern.c:97
+#: fc-cache/fc-cache.c:125 fc-cat/fc-cat.c:179 fc-list/fc-list.c:100
+#: fc-match/fc-match.c:104 fc-pattern/fc-pattern.c:98
#, c-format
msgid " -V (version) display font config version and exit\n"
msgstr " -V (version) 显示 Fontconfig 版本并退出\n"
-#: fc-cache/fc-cache.c:125 fc-cat/fc-cat.c:179 fc-list/fc-list.c:100
-#: fc-match/fc-match.c:104 fc-pattern/fc-pattern.c:98
+#: fc-cache/fc-cache.c:126 fc-cat/fc-cat.c:180 fc-list/fc-list.c:101
+#: fc-match/fc-match.c:105 fc-pattern/fc-pattern.c:99
#, c-format
msgid " -h (help) display this help and exit\n"
msgstr " -h (help) 显示该帮助信息并退出\n"
-#: fc-cache/fc-cache.c:162
+#: fc-cache/fc-cache.c:163
#, c-format
msgid "skipping, looped directory detected\n"
msgstr "跳过,探测到循环目录\n"
-#: fc-cache/fc-cache.c:172
+#: fc-cache/fc-cache.c:173
#, c-format
msgid "skipping, no such directory\n"
msgstr "跳过,无此目录\n"
-#: fc-cache/fc-cache.c:185
+#: fc-cache/fc-cache.c:186
#, c-format
msgid "\"%s\": not a directory, skipping\n"
msgstr "“%s”:不是一个目录,跳过\n"
-#: fc-cache/fc-cache.c:210
+#: fc-cache/fc-cache.c:211
#, c-format
msgid "\"%s\": scanning error\n"
msgstr "“%s”:扫描错误\n"
-#: fc-cache/fc-cache.c:219
+#: fc-cache/fc-cache.c:220
#, c-format
msgid "skipping, existing cache is valid: %d fonts, %d dirs\n"
msgstr "跳过,当前缓存有效:%d 个字体,%d 个目录\n"
-#: fc-cache/fc-cache.c:225
+#: fc-cache/fc-cache.c:226
#, c-format
msgid "caching, new cache contents: %d fonts, %d dirs\n"
msgstr "正在生成缓存,新增缓存内容:%d 个字体,%d 个目录\n"
-#: fc-cache/fc-cache.c:230
+#: fc-cache/fc-cache.c:231
#, c-format
msgid "%s: failed to write cache\n"
msgstr "%s:无法写入缓存\n"
-#: fc-cache/fc-cache.c:239
+#: fc-cache/fc-cache.c:240
#, c-format
msgid "%s: Can't create subdir set\n"
msgstr "%s:无法创建子目录集\n"
-#: fc-cache/fc-cache.c:253
+#: fc-cache/fc-cache.c:254
#, c-format
msgid "%s: Can't create subdir list\n"
msgstr "%s:无法创建子目录列表\n"
-#: fc-cache/fc-cache.c:359 fc-cat/fc-cat.c:305
+#: fc-cache/fc-cache.c:361 fc-cat/fc-cat.c:307
#, c-format
msgid "%s: Can't initialize font config library\n"
msgstr "%s:无法初始化 Fontconfig 库\n"
-#: fc-cache/fc-cache.c:369
+#: fc-cache/fc-cache.c:371
#, c-format
msgid "%s: Can't create list of directories\n"
msgstr "%s:无法创建目录列表\n"
-#: fc-cache/fc-cache.c:377
+#: fc-cache/fc-cache.c:379
#, c-format
msgid "%s: Can't add directory\n"
msgstr "%s:无法添加目录\n"
-#: fc-cache/fc-cache.c:389
+#: fc-cache/fc-cache.c:391
#, c-format
msgid "Out of Memory\n"
msgstr "内存耗尽\n"
-#: fc-cache/fc-cache.c:421
+#: fc-cache/fc-cache.c:423
msgid "failed"
msgstr "缓存生成失败"
-#: fc-cache/fc-cache.c:421
+#: fc-cache/fc-cache.c:423
msgid "succeeded"
msgstr "缓存生成成功"
-#: fc-cat/fc-cat.c:159
+#: fc-cat/fc-cat.c:160
#, c-format
msgid "usage: %s [-rv] [--recurse] [--verbose] [*-%s"
msgstr "用法:%s [-rv] [--recurse] [--verbose] [*-%s"
-#: fc-cat/fc-cat.c:163
+#: fc-cat/fc-cat.c:164
#, c-format
msgid "usage: %s [-rvVh] [*-%s"
msgstr "用法:%s [-rvVh] [*-%s"
-#: fc-cat/fc-cat.c:166
+#: fc-cat/fc-cat.c:167
#, c-format
msgid "Reads font information cache from:\n"
msgstr "从此处读取字体信息缓存:\n"
-#: fc-cat/fc-cat.c:167
+#: fc-cat/fc-cat.c:168
#, c-format
msgid " 1) specified fontconfig cache file\n"
msgstr "1. 指定的 Fontconfig 缓存文件\n"
-#: fc-cat/fc-cat.c:168
+#: fc-cat/fc-cat.c:169
#, c-format
msgid " 2) related to a particular font directory\n"
msgstr "2. 相对于某个字体目录\n"
-#: fc-cat/fc-cat.c:171
+#: fc-cat/fc-cat.c:172
#, c-format
msgid " -r, --recurse recurse into subdirectories\n"
msgstr " -r, --recurse 递归进入子目录\n"
-#: fc-cat/fc-cat.c:172
+#: fc-cat/fc-cat.c:173
#, c-format
msgid " -v, --verbose be verbose\n"
msgstr " -v, --verbose 输出详尽信息\n"
-#: fc-cat/fc-cat.c:173 fc-conflist/fc-conflist.c:87 fc-list/fc-list.c:92
-#: fc-match/fc-match.c:95 fc-pattern/fc-pattern.c:91 fc-query/fc-query.c:94
-#: fc-scan/fc-scan.c:92 fc-validate/fc-validate.c:95
+#: fc-cat/fc-cat.c:174 fc-conflist/fc-conflist.c:88 fc-list/fc-list.c:93
+#: fc-match/fc-match.c:96 fc-pattern/fc-pattern.c:92 fc-query/fc-query.c:95
+#: fc-scan/fc-scan.c:93 fc-validate/fc-validate.c:95
#, c-format
msgid " -V, --version display font config version and exit\n"
msgstr " -V, --version 显示 Fontconfig 版本并退出\n"
-#: fc-cat/fc-cat.c:174 fc-conflist/fc-conflist.c:88 fc-list/fc-list.c:93
-#: fc-match/fc-match.c:96 fc-pattern/fc-pattern.c:92 fc-query/fc-query.c:95
-#: fc-scan/fc-scan.c:93 fc-validate/fc-validate.c:96
+#: fc-cat/fc-cat.c:175 fc-conflist/fc-conflist.c:89 fc-list/fc-list.c:94
+#: fc-match/fc-match.c:97 fc-pattern/fc-pattern.c:93 fc-query/fc-query.c:96
+#: fc-scan/fc-scan.c:94 fc-validate/fc-validate.c:96
#, c-format
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help 显示该帮助信息并退出\n"
-#: fc-cat/fc-cat.c:176
+#: fc-cat/fc-cat.c:177
#, c-format
msgid " -r (recurse) recurse into subdirectories\n"
msgstr " -r (recurse) 递归进入子目录\n"
-#: fc-cat/fc-cat.c:177
+#: fc-cat/fc-cat.c:178
#, c-format
msgid " -v (verbose) be verbose\n"
msgstr " -v (verbose) 输出详尽信息\n"
-#: fc-cat/fc-cat.c:314 fc-cat/fc-cat.c:323 fc-cat/fc-cat.c:335
-#: fc-cat/fc-cat.c:343
+#: fc-cat/fc-cat.c:316 fc-cat/fc-cat.c:325 fc-cat/fc-cat.c:337
+#: fc-cat/fc-cat.c:345
#, c-format
msgid "%s: malloc failure\n"
msgstr "%s:无法分配内存 (malloc)\n"
-#: fc-cat/fc-cat.c:383
+#: fc-cat/fc-cat.c:385
#, c-format
msgid ""
"Directory: %s\n"
@@ -285,32 +285,32 @@ msgstr ""
"缓存:%s\n"
"--------\n"
-#: fc-conflist/fc-conflist.c:78
+#: fc-conflist/fc-conflist.c:79
#, c-format
msgid "usage: %s [-Vh] [--version] [--help]\n"
msgstr "用法:%s [-Vh] [--version] [--help]\n"
-#: fc-conflist/fc-conflist.c:81
+#: fc-conflist/fc-conflist.c:82
#, c-format
msgid "usage: %s [-Vh]\n"
msgstr "用法:%s [-Vh]\n"
-#: fc-conflist/fc-conflist.c:84
+#: fc-conflist/fc-conflist.c:85
#, c-format
msgid "Show the ruleset files information on the system\n"
msgstr "显示当前系统中的规则集文件\n"
-#: fc-conflist/fc-conflist.c:90 fc-validate/fc-validate.c:101
+#: fc-conflist/fc-conflist.c:91 fc-validate/fc-validate.c:101
#, c-format
msgid " -V (version) display font config version and exit\n"
msgstr " -V (版本) 显示 Fontconfig 版本并退出\n"
-#: fc-conflist/fc-conflist.c:91 fc-validate/fc-validate.c:102
+#: fc-conflist/fc-conflist.c:92 fc-validate/fc-validate.c:102
#, c-format
msgid " -h (help) display this help and exit\n"
msgstr " -h (帮助) 显示该帮助信息并退出\n"
-#: fc-list/fc-list.c:79
+#: fc-list/fc-list.c:80
#, c-format
msgid ""
"usage: %s [-vbqVh] [-f FORMAT] [--verbose] [--brief] [--format=FORMAT] [--"
@@ -319,67 +319,67 @@ msgstr ""
"用法:%s [-vbqVh] [-f <输出格式>] [--verbose] [--brief] [--format=<输出格式"
">] [--quiet] [--version] [--help] [匹配模式] {元素 …} \n"
-#: fc-list/fc-list.c:82
+#: fc-list/fc-list.c:83
#, c-format
msgid "usage: %s [-vbqVh] [-f FORMAT] [pattern] {element ...} \n"
msgstr "用法:%s [-vbqVh] [-f <输出格式>] [匹配模式] {元素 …} \n"
-#: fc-list/fc-list.c:85
+#: fc-list/fc-list.c:86
#, c-format
msgid "List fonts matching [pattern]\n"
msgstr "列出符合 [匹配模式] 的字体\n"
-#: fc-list/fc-list.c:88 fc-match/fc-match.c:92
+#: fc-list/fc-list.c:89 fc-match/fc-match.c:93
#, c-format
msgid " -v, --verbose display entire font pattern verbosely\n"
msgstr " -v, --verbose 详尽显示整个字体匹配模式\n"
-#: fc-list/fc-list.c:89 fc-match/fc-match.c:93
+#: fc-list/fc-list.c:90 fc-match/fc-match.c:94
#, c-format
msgid " -b, --brief display entire font pattern briefly\n"
msgstr " -b, --brief 简略显示整个字体匹配模式\n"
-#: fc-list/fc-list.c:90 fc-match/fc-match.c:94 fc-pattern/fc-pattern.c:90
-#: fc-query/fc-query.c:93 fc-scan/fc-scan.c:91
+#: fc-list/fc-list.c:91 fc-match/fc-match.c:95 fc-pattern/fc-pattern.c:91
+#: fc-query/fc-query.c:94 fc-scan/fc-scan.c:92
#, c-format
msgid " -f, --format=FORMAT use the given output format\n"
msgstr " -f, --format=<输出格式> 使用指定的输出格式\n"
-#: fc-list/fc-list.c:91
+#: fc-list/fc-list.c:92
#, c-format
msgid ""
" -q, --quiet suppress all normal output, exit 1 if no fonts "
"matched\n"
msgstr " -q, --quiet 静默所有正常输出,无匹配字体时返回退出代码 1\n"
-#: fc-list/fc-list.c:95 fc-match/fc-match.c:100
+#: fc-list/fc-list.c:96 fc-match/fc-match.c:101
#, c-format
msgid " -v (verbose) display entire font pattern verbosely\n"
msgstr " -v (verbose) 详尽显示整个字体匹配模式\n"
-#: fc-list/fc-list.c:96 fc-match/fc-match.c:101
+#: fc-list/fc-list.c:97 fc-match/fc-match.c:102
#, c-format
msgid " -b (brief) display entire font pattern briefly\n"
msgstr " -b (brief) 简略显示整个字体匹配模式\n"
-#: fc-list/fc-list.c:97 fc-match/fc-match.c:102 fc-pattern/fc-pattern.c:96
+#: fc-list/fc-list.c:98 fc-match/fc-match.c:103 fc-pattern/fc-pattern.c:97
#, c-format
msgid " -f FORMAT (format) use the given output format\n"
msgstr " -f <输出格式> (format) 使用指定的输出格式\n"
-#: fc-list/fc-list.c:98
+#: fc-list/fc-list.c:99
#, c-format
msgid ""
" -q, (quiet) suppress all normal output, exit 1 if no fonts "
"matched\n"
msgstr " -q, (quiet) 静默所有正常输出,无匹配字体时返回退出代码 1\n"
-#: fc-list/fc-list.c:159 fc-match/fc-match.c:166 fc-pattern/fc-pattern.c:150
+#: fc-list/fc-list.c:161 fc-match/fc-match.c:168 fc-pattern/fc-pattern.c:152
#, c-format
msgid "Unable to parse the pattern\n"
msgstr "无法解析匹配模式\n"
-#: fc-match/fc-match.c:81
+#: fc-match/fc-match.c:82
#, c-format
msgid ""
"usage: %s [-savbVh] [-f FORMAT] [--sort] [--all] [--verbose] [--brief] [--"
@@ -388,42 +388,42 @@ msgstr ""
"用法:%s [-savbVh] [-f <输出格式>] [--sort] [--all] [--verbose] [--brief] [--"
"format=<输出格式>] [--version] [--help] [匹配模式] {元素…}\n"
-#: fc-match/fc-match.c:84
+#: fc-match/fc-match.c:85
#, c-format
msgid "usage: %s [-savVh] [-f FORMAT] [pattern] {element...}\n"
msgstr "用法:%s [-savVh] [-f <输出格式>] [匹配模式] {元素…}\n"
-#: fc-match/fc-match.c:87 fc-pattern/fc-pattern.c:85
+#: fc-match/fc-match.c:88 fc-pattern/fc-pattern.c:86
#, c-format
msgid "List best font matching [pattern]\n"
msgstr "列出符合 [匹配模式] 的最佳字体\n"
-#: fc-match/fc-match.c:90
+#: fc-match/fc-match.c:91
#, c-format
msgid " -s, --sort display sorted list of matches\n"
msgstr " -s, --sort 显示已排序的匹配列表\n"
-#: fc-match/fc-match.c:91
+#: fc-match/fc-match.c:92
#, c-format
msgid " -a, --all display unpruned sorted list of matches\n"
msgstr " -a, --all 显示未修剪而已排序的匹配列表\n"
-#: fc-match/fc-match.c:98
+#: fc-match/fc-match.c:99
#, c-format
msgid " -s, (sort) display sorted list of matches\n"
msgstr " -s, (sort) 显示已排序的匹配列表\n"
-#: fc-match/fc-match.c:99
+#: fc-match/fc-match.c:100
#, c-format
msgid " -a (all) display unpruned sorted list of matches\n"
msgstr " -a (all) 显示未修剪而已排序的匹配列表\n"
-#: fc-match/fc-match.c:195
+#: fc-match/fc-match.c:197
#, c-format
msgid "No fonts installed on the system\n"
msgstr "系统中未安装任何字体\n"
-#: fc-pattern/fc-pattern.c:79
+#: fc-pattern/fc-pattern.c:80
#, c-format
msgid ""
"usage: %s [-cdVh] [-f FORMAT] [--config] [--default] [--verbose] [--"
@@ -432,32 +432,32 @@ msgstr ""
"用法:%s [-cdVh] [-f <输出格式>] [--config] [--default] [--verbose] [--"
"format=<输出格式>] [--version] [--help] [匹配模式] {元素…}\n"
-#: fc-pattern/fc-pattern.c:82
+#: fc-pattern/fc-pattern.c:83
#, c-format
msgid "usage: %s [-cdVh] [-f FORMAT] [pattern] {element...}\n"
msgstr "用法:%s [-cdVh] [-f <输出格式>] [匹配模式] {元素…}\n"
-#: fc-pattern/fc-pattern.c:88
+#: fc-pattern/fc-pattern.c:89
#, c-format
msgid " -c, --config perform config substitution on pattern\n"
msgstr " -c, --config 根据匹配模式进行配置替换\n"
-#: fc-pattern/fc-pattern.c:89
+#: fc-pattern/fc-pattern.c:90
#, c-format
msgid " -d, --default perform default substitution on pattern\n"
msgstr " -d, --default 根据匹配模式进行默认值替换\n"
-#: fc-pattern/fc-pattern.c:94
+#: fc-pattern/fc-pattern.c:95
#, c-format
msgid " -c, (config) perform config substitution on pattern\n"
msgstr " -c, (config) 根据匹配模式进行配置替换\n"
-#: fc-pattern/fc-pattern.c:95
+#: fc-pattern/fc-pattern.c:96
#, c-format
msgid " -d, (default) perform default substitution on pattern\n"
msgstr " -d, (default) 根据匹配模式进行默认值替换\n"
-#: fc-query/fc-query.c:82
+#: fc-query/fc-query.c:83
#, c-format
msgid ""
"usage: %s [-bVh] [-i index] [-f FORMAT] [--index index] [--brief] [--format "
@@ -466,60 +466,60 @@ msgstr ""
"用法:%s [-bVh] [-i index] [-f <输出格式>] [--index index] [--brief] [--"
"format <输出格式>] [--version] [--help] 字体文件…\n"
-#: fc-query/fc-query.c:85
+#: fc-query/fc-query.c:86
#, c-format
msgid "usage: %s [-bVh] [-i index] [-f FORMAT] font-file...\n"
msgstr "用法:%s [-bVh] [-i index] [-f <输出格式>] 字体文件…\n"
-#: fc-query/fc-query.c:88
+#: fc-query/fc-query.c:89
#, c-format
msgid "Query font files and print resulting pattern(s)\n"
msgstr ""
"查询字体文件并输出匹配模式\n"
"\n"
-#: fc-query/fc-query.c:91 fc-validate/fc-validate.c:92
+#: fc-query/fc-query.c:92 fc-validate/fc-validate.c:92
#, c-format
msgid " -i, --index INDEX display the INDEX face of each font file only\n"
msgstr " -i, --index <编号> 仅显示每个字体文件的 <编号> 样式\n"
-#: fc-query/fc-query.c:92 fc-scan/fc-scan.c:90
+#: fc-query/fc-query.c:93 fc-scan/fc-scan.c:91
#, c-format
msgid " -b, --brief display font pattern briefly\n"
msgstr " -b, --brief 简略显示字体匹配模式\n"
-#: fc-query/fc-query.c:97
+#: fc-query/fc-query.c:98
#, c-format
msgid ""
" -i INDEX (index) display the INDEX face of each font file only\n"
msgstr " -i <编号> (index) 仅显示每个字体文件的 <编号> 样式\n"
-#: fc-query/fc-query.c:98 fc-scan/fc-scan.c:95
+#: fc-query/fc-query.c:99 fc-scan/fc-scan.c:96
#, c-format
msgid " -b (brief) display font pattern briefly\n"
msgstr " -b (brief) 简略显示字体匹配模式\n"
-#: fc-query/fc-query.c:99 fc-scan/fc-scan.c:96
+#: fc-query/fc-query.c:100 fc-scan/fc-scan.c:97
#, c-format
msgid " -f FORMAT (format) use the given output format\n"
msgstr " -f <输出格式> (format) 使用指定的输出格式\n"
-#: fc-query/fc-query.c:100 fc-scan/fc-scan.c:97
+#: fc-query/fc-query.c:101 fc-scan/fc-scan.c:98
#, c-format
msgid " -V (version) display font config version and exit\n"
msgstr " -V (version) 显示 Fontconfig 版本并退出\n"
-#: fc-query/fc-query.c:101 fc-scan/fc-scan.c:98
+#: fc-query/fc-query.c:102 fc-scan/fc-scan.c:99
#, c-format
msgid " -h (help) display this help and exit\n"
msgstr " -h (help) 显示此帮助信息并退出\n"
-#: fc-query/fc-query.c:158
+#: fc-query/fc-query.c:160
#, c-format
msgid "Can't query face %u of font file %s\n"
msgstr "无法查询字体文件 %2$s 的样式 %1$u\n"
-#: fc-scan/fc-scan.c:81
+#: fc-scan/fc-scan.c:82
#, c-format
msgid ""
"usage: %s [-bVh] [-f FORMAT] [--brief] [--format FORMAT] [--version] [--"
@@ -528,12 +528,12 @@ msgstr ""
"用法:%s [-bVh] [-f <输出格式>] [--brief] [--format <输出格式>] [--version] "
"[--help] 字体文件…\n"
-#: fc-scan/fc-scan.c:84
+#: fc-scan/fc-scan.c:85
#, c-format
msgid "usage: %s [-bVh] [-f FORMAT] font-file...\n"
msgstr "用法:%s [-bVh] [-f <输出格式>] 字体文件…\n"
-#: fc-scan/fc-scan.c:87
+#: fc-scan/fc-scan.c:88
#, c-format
msgid "Scan font files and directories, and print resulting pattern(s)\n"
msgstr "扫描字体文件和目录并输出匹配模式\n"
@@ -603,6 +603,6 @@ msgstr "%s:%d 尚需 %d 个字形以满足 %s 语言的覆盖需求\n"
msgid "%s:%d Satisfy the coverage for %s language\n"
msgstr "%s:%d 完全满足 %s 语言的覆盖需求\n"
-#: src/fccfg.c:2657
+#: src/fccfg.c:2701
msgid "No description"
msgstr "无描述"
diff --git a/src/Makefile.am b/src/Makefile.am
index 1ff065bf..7b414dff 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -82,7 +82,7 @@ AM_CPPFLAGS = \
-DFC_CACHEDIR='"$(FC_CACHEDIR)"' \
-DFONTCONFIG_PATH='"$(BASECONFIGDIR)"' \
-DFC_TEMPLATEDIR='"$(TEMPLATEDIR)"'
-LDADD = $(INTLLIBS)
+LDADD = $(LIBINTL)
EXTRA_DIST += makealias
@@ -94,7 +94,7 @@ BUILT_SOURCES = $(ALIAS_FILES) \
../fc-case/fccase.h \
../fc-lang/fclang.h \
stamp-fcstdint \
- fcobjshash.h \
+ $(builddir)/fcobjshash.h \
fcobjshash.gperf
noinst_PROGRAMS = fcarch
@@ -111,15 +111,15 @@ fcobjshash.gperf: Makefile stamp-fcobjshash.gperf
stamp-fcobjshash.gperf: fcobjshash.gperf.h fcobjs.h
$(AM_V_GEN) $(CPP) -I$(top_srcdir) $(CPPFLAGS) $< | \
$(SED) 's/^ *//;s/ *, */,/' | \
- $(GREP) '^[^#]' | \
awk ' \
/CUT_OUT_BEGIN/ { no_write=1; next; }; \
/CUT_OUT_END/ { no_write=0; next; }; \
+ /^$$/||/^#/ { next; }; \
{ if (!no_write) print; next; }; \
' - > $@.tmp && \
mv -f $@.tmp fcobjshash.gperf && touch $@ || ( $(RM) $@.tmp && false )
-fcobjshash.h: Makefile fcobjshash.gperf
+$(builddir)/fcobjshash.h: Makefile fcobjshash.gperf
$(AM_V_GEN) $(GPERF) --pic -m 100 fcobjshash.gperf > $@.tmp && \
mv -f $@.tmp $@ || ( $(RM) $@.tmp && false )
@@ -151,7 +151,6 @@ libfontconfig_la_SOURCES = \
fcname.c \
fcobjs.c \
fcobjs.h \
- fcobjshash.h \
fcpat.c \
fcrange.c \
fcserialize.c \
@@ -168,7 +167,7 @@ lib_LTLIBRARIES = libfontconfig.la
libfontconfig_la_LDFLAGS = \
-version-info @LIBT_VERSION_INFO@ -no-undefined $(export_symbols)
-libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) $(UUID_LIBS) $(INTLLIBS)
+libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) $(UUID_LIBS) $(LTLIBINTL)
libfontconfig_la_DEPENDENCIES = $(fontconfig_def_dependency)
@@ -201,12 +200,15 @@ stamp-fcstdint: $(top_builddir)/config.status
$(SHELL) ./config.status src/fcstdint.h
@touch $@
-CLEANFILES = $(ALIAS_FILES) fontconfig.def
+CLEANFILES = \
+ $(ALIAS_FILES) \
+ fontconfig.def \
+ $(builddir)/fcobjshash.h
+
DISTCLEANFILES = \
stamp-fcstdint \
fcstdint.h \
stamp-fcobjshash.gperf \
- fcobjshash.h \
fcobjshash.gperf
fontconfig.def: $(PUBLIC_FILES) $(PUBLIC_FT_FILES)
diff --git a/src/Makefile.in b/src/Makefile.in
index d0d32acc..70b1161b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -137,6 +137,7 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+PROGRAMS = $(noinst_PROGRAMS)
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -182,7 +183,6 @@ libfontconfig_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(AM_CFLAGS) $(CFLAGS) $(libfontconfig_la_LDFLAGS) $(LDFLAGS) \
-o $@
-PROGRAMS = $(noinst_PROGRAMS)
fcarch_SOURCES = fcarch.c
fcarch_OBJECTS = fcarch.$(OBJEXT)
fcarch_LDADD = $(LDADD)
@@ -201,7 +201,22 @@ am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/fcarch.Po ./$(DEPDIR)/fcatomic.Plo \
+ ./$(DEPDIR)/fccache.Plo ./$(DEPDIR)/fccfg.Plo \
+ ./$(DEPDIR)/fccharset.Plo ./$(DEPDIR)/fccompat.Plo \
+ ./$(DEPDIR)/fcdbg.Plo ./$(DEPDIR)/fcdefault.Plo \
+ ./$(DEPDIR)/fcdir.Plo ./$(DEPDIR)/fcformat.Plo \
+ ./$(DEPDIR)/fcfreetype.Plo ./$(DEPDIR)/fcfs.Plo \
+ ./$(DEPDIR)/fchash.Plo ./$(DEPDIR)/fcinit.Plo \
+ ./$(DEPDIR)/fclang.Plo ./$(DEPDIR)/fclist.Plo \
+ ./$(DEPDIR)/fcmatch.Plo ./$(DEPDIR)/fcmatrix.Plo \
+ ./$(DEPDIR)/fcname.Plo ./$(DEPDIR)/fcobjs.Plo \
+ ./$(DEPDIR)/fcpat.Plo ./$(DEPDIR)/fcptrlist.Plo \
+ ./$(DEPDIR)/fcrange.Plo ./$(DEPDIR)/fcserialize.Plo \
+ ./$(DEPDIR)/fcstat.Plo ./$(DEPDIR)/fcstr.Plo \
+ ./$(DEPDIR)/fcweight.Plo ./$(DEPDIR)/fcxml.Plo \
+ ./$(DEPDIR)/ftglue.Plo
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -309,6 +324,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JSONC_CFLAGS = @JSONC_CFLAGS@
+JSONC_LIBS = @JSONC_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -452,14 +469,14 @@ AM_CPPFLAGS = \
-DFONTCONFIG_PATH='"$(BASECONFIGDIR)"' \
-DFC_TEMPLATEDIR='"$(TEMPLATEDIR)"'
-LDADD = $(INTLLIBS)
+LDADD = $(LIBINTL)
noinst_HEADERS = fcint.h fcftint.h fcdeprecate.h fcstdint.h
ALIAS_FILES = fcalias.h fcaliastail.h fcftalias.h fcftaliastail.h
BUILT_SOURCES = $(ALIAS_FILES) \
../fc-case/fccase.h \
../fc-lang/fclang.h \
stamp-fcstdint \
- fcobjshash.h \
+ $(builddir)/fcobjshash.h \
fcobjshash.gperf
libfontconfig_la_SOURCES = \
@@ -487,7 +504,6 @@ libfontconfig_la_SOURCES = \
fcname.c \
fcobjs.c \
fcobjs.h \
- fcobjshash.h \
fcpat.c \
fcrange.c \
fcserialize.c \
@@ -503,7 +519,7 @@ lib_LTLIBRARIES = libfontconfig.la
libfontconfig_la_LDFLAGS = \
-version-info @LIBT_VERSION_INFO@ -no-undefined $(export_symbols)
-libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) $(UUID_LIBS) $(INTLLIBS)
+libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) $(UUID_LIBS) $(LTLIBINTL)
libfontconfig_la_DEPENDENCIES = $(fontconfig_def_dependency)
PUBLIC_FILES = \
$(top_srcdir)/fontconfig/fontconfig.h \
@@ -513,12 +529,15 @@ PUBLIC_FILES = \
PUBLIC_FT_FILES = \
$(top_srcdir)/fontconfig/fcfreetype.h
-CLEANFILES = $(ALIAS_FILES) fontconfig.def
+CLEANFILES = \
+ $(ALIAS_FILES) \
+ fontconfig.def \
+ $(builddir)/fcobjshash.h
+
DISTCLEANFILES = \
stamp-fcstdint \
fcstdint.h \
stamp-fcobjshash.gperf \
- fcobjshash.h \
fcobjshash.gperf
all: $(BUILT_SOURCES)
@@ -543,8 +562,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -556,6 +575,15 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+clean-noinstPROGRAMS:
+ @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+ echo " rm -f" $$list; \
+ rm -f $$list || exit $$?; \
+ test -n "$(EXEEXT)" || exit 0; \
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f" $$list; \
+ rm -f $$list
+
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
@@ -594,15 +622,6 @@ clean-libLTLIBRARIES:
libfontconfig.la: $(libfontconfig_la_OBJECTS) $(libfontconfig_la_DEPENDENCIES) $(EXTRA_libfontconfig_la_DEPENDENCIES)
$(AM_V_CCLD)$(libfontconfig_la_LINK) -rpath $(libdir) $(libfontconfig_la_OBJECTS) $(libfontconfig_la_LIBADD) $(LIBS)
-clean-noinstPROGRAMS:
- @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
-
fcarch$(EXEEXT): $(fcarch_OBJECTS) $(fcarch_DEPENDENCIES) $(EXTRA_fcarch_DEPENDENCIES)
@rm -f fcarch$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(fcarch_OBJECTS) $(fcarch_LDADD) $(LIBS)
@@ -613,35 +632,41 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcarch.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcatomic.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fccache.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fccfg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fccharset.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fccompat.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcdbg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcdefault.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcdir.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcformat.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcfreetype.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcfs.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fchash.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcinit.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fclang.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fclist.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcmatch.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcmatrix.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcname.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcobjs.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcpat.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcptrlist.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcrange.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcserialize.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcstat.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcstr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcweight.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcxml.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftglue.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcarch.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcatomic.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fccache.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fccfg.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fccharset.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fccompat.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcdbg.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcdefault.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcdir.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcformat.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcfreetype.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcfs.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fchash.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcinit.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fclang.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fclist.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcmatch.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcmatrix.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcname.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcobjs.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcpat.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcptrlist.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcrange.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcserialize.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcstat.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcstr.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcweight.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcxml.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftglue.Plo@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -722,7 +747,10 @@ cscopelist-am: $(am__tagged_files)
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -755,7 +783,7 @@ distdir: $(DISTFILES)
check-am: all-am
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS)
+all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(DATA) $(HEADERS)
installdirs:
for dir in "$(DESTDIR)$(libdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
@@ -794,15 +822,43 @@ maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-@ENABLE_SHARED_FALSE@uninstall-local:
@ENABLE_SHARED_FALSE@install-data-local:
+@ENABLE_SHARED_FALSE@uninstall-local:
clean: clean-am
clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
clean-noinstPROGRAMS mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/fcarch.Po
+ -rm -f ./$(DEPDIR)/fcatomic.Plo
+ -rm -f ./$(DEPDIR)/fccache.Plo
+ -rm -f ./$(DEPDIR)/fccfg.Plo
+ -rm -f ./$(DEPDIR)/fccharset.Plo
+ -rm -f ./$(DEPDIR)/fccompat.Plo
+ -rm -f ./$(DEPDIR)/fcdbg.Plo
+ -rm -f ./$(DEPDIR)/fcdefault.Plo
+ -rm -f ./$(DEPDIR)/fcdir.Plo
+ -rm -f ./$(DEPDIR)/fcformat.Plo
+ -rm -f ./$(DEPDIR)/fcfreetype.Plo
+ -rm -f ./$(DEPDIR)/fcfs.Plo
+ -rm -f ./$(DEPDIR)/fchash.Plo
+ -rm -f ./$(DEPDIR)/fcinit.Plo
+ -rm -f ./$(DEPDIR)/fclang.Plo
+ -rm -f ./$(DEPDIR)/fclist.Plo
+ -rm -f ./$(DEPDIR)/fcmatch.Plo
+ -rm -f ./$(DEPDIR)/fcmatrix.Plo
+ -rm -f ./$(DEPDIR)/fcname.Plo
+ -rm -f ./$(DEPDIR)/fcobjs.Plo
+ -rm -f ./$(DEPDIR)/fcpat.Plo
+ -rm -f ./$(DEPDIR)/fcptrlist.Plo
+ -rm -f ./$(DEPDIR)/fcrange.Plo
+ -rm -f ./$(DEPDIR)/fcserialize.Plo
+ -rm -f ./$(DEPDIR)/fcstat.Plo
+ -rm -f ./$(DEPDIR)/fcstr.Plo
+ -rm -f ./$(DEPDIR)/fcweight.Plo
+ -rm -f ./$(DEPDIR)/fcxml.Plo
+ -rm -f ./$(DEPDIR)/ftglue.Plo
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -848,7 +904,35 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/fcarch.Po
+ -rm -f ./$(DEPDIR)/fcatomic.Plo
+ -rm -f ./$(DEPDIR)/fccache.Plo
+ -rm -f ./$(DEPDIR)/fccfg.Plo
+ -rm -f ./$(DEPDIR)/fccharset.Plo
+ -rm -f ./$(DEPDIR)/fccompat.Plo
+ -rm -f ./$(DEPDIR)/fcdbg.Plo
+ -rm -f ./$(DEPDIR)/fcdefault.Plo
+ -rm -f ./$(DEPDIR)/fcdir.Plo
+ -rm -f ./$(DEPDIR)/fcformat.Plo
+ -rm -f ./$(DEPDIR)/fcfreetype.Plo
+ -rm -f ./$(DEPDIR)/fcfs.Plo
+ -rm -f ./$(DEPDIR)/fchash.Plo
+ -rm -f ./$(DEPDIR)/fcinit.Plo
+ -rm -f ./$(DEPDIR)/fclang.Plo
+ -rm -f ./$(DEPDIR)/fclist.Plo
+ -rm -f ./$(DEPDIR)/fcmatch.Plo
+ -rm -f ./$(DEPDIR)/fcmatrix.Plo
+ -rm -f ./$(DEPDIR)/fcname.Plo
+ -rm -f ./$(DEPDIR)/fcobjs.Plo
+ -rm -f ./$(DEPDIR)/fcpat.Plo
+ -rm -f ./$(DEPDIR)/fcptrlist.Plo
+ -rm -f ./$(DEPDIR)/fcrange.Plo
+ -rm -f ./$(DEPDIR)/fcserialize.Plo
+ -rm -f ./$(DEPDIR)/fcstat.Plo
+ -rm -f ./$(DEPDIR)/fcstr.Plo
+ -rm -f ./$(DEPDIR)/fcweight.Plo
+ -rm -f ./$(DEPDIR)/fcxml.Plo
+ -rm -f ./$(DEPDIR)/ftglue.Plo
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -869,17 +953,17 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-local
.MAKE: all check install install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libLTLIBRARIES clean-libtool clean-noinstPROGRAMS \
- cscopelist-am ctags ctags-am distclean distclean-compile \
- distclean-generic distclean-libtool distclean-tags distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-data-local install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am \
- install-libLTLIBRARIES install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+ clean-generic clean-libLTLIBRARIES clean-libtool \
+ clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am \
+ install-data-local install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-libLTLIBRARIES install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \
@@ -925,15 +1009,15 @@ fcobjshash.gperf: Makefile stamp-fcobjshash.gperf
stamp-fcobjshash.gperf: fcobjshash.gperf.h fcobjs.h
$(AM_V_GEN) $(CPP) -I$(top_srcdir) $(CPPFLAGS) $< | \
$(SED) 's/^ *//;s/ *, */,/' | \
- $(GREP) '^[^#]' | \
awk ' \
/CUT_OUT_BEGIN/ { no_write=1; next; }; \
/CUT_OUT_END/ { no_write=0; next; }; \
+ /^$$/||/^#/ { next; }; \
{ if (!no_write) print; next; }; \
' - > $@.tmp && \
mv -f $@.tmp fcobjshash.gperf && touch $@ || ( $(RM) $@.tmp && false )
-fcobjshash.h: Makefile fcobjshash.gperf
+$(builddir)/fcobjshash.h: Makefile fcobjshash.gperf
$(AM_V_GEN) $(GPERF) --pic -m 100 fcobjshash.gperf > $@.tmp && \
mv -f $@.tmp $@ || ( $(RM) $@.tmp && false )
diff --git a/src/fccache.c b/src/fccache.c
index 7abb7507..2b604014 100644
--- a/src/fccache.c
+++ b/src/fccache.c
@@ -51,13 +51,23 @@ FcDirCacheCreateUUID (FcChar8 *dir,
FcBool force,
FcConfig *config)
{
+ const FcChar8 *sysroot = FcConfigGetSysRoot (config);
+ FcChar8 *target;
FcBool ret = FcTrue;
#ifndef _WIN32
FcChar8 *uuidname;
- uuidname = FcStrBuildFilename (dir, ".uuid", NULL);
+ if (sysroot)
+ target = FcStrBuildFilename (sysroot, dir, NULL);
+ else
+ target = FcStrdup (dir);
+ uuidname = FcStrBuildFilename (target, ".uuid", NULL);
+
if (!uuidname)
+ {
+ FcStrFree (target);
return FcFalse;
+ }
if (force || access ((const char *) uuidname, F_OK) < 0)
{
@@ -69,7 +79,7 @@ FcDirCacheCreateUUID (FcChar8 *dir,
struct stat statb;
struct timeval times[2];
- if (FcStat (dir, &statb) != 0)
+ if (FcStat (target, &statb) != 0)
{
ret = FcFalse;
goto bail1;
@@ -96,9 +106,11 @@ FcDirCacheCreateUUID (FcChar8 *dir,
hash_add = FcHashTableReplace;
else
hash_add = FcHashTableAdd;
- if (!hash_add (config->uuid_table, dir, uuid))
+ if (!hash_add (config->uuid_table, target, uuid))
{
ret = FcFalse;
+ FcAtomicDeleteNew (atomic);
+ close (fd);
goto bail3;
}
uuid_unparse (uuid, out);
@@ -124,19 +136,40 @@ FcDirCacheCreateUUID (FcChar8 *dir,
times[0].tv_usec = 0;
times[1].tv_usec = 0;
#endif
- if (utimes ((const char *) dir, times) != 0)
+ if (utimes ((const char *) target, times) != 0)
{
- fprintf (stderr, "Unable to revert mtime: %s\n", dir);
+ fprintf (stderr, "Unable to revert mtime: %s\n", target);
}
}
}
- bail1:
+bail1:
FcStrFree (uuidname);
+ FcStrFree (target);
#endif
return ret;
}
+FcBool
+FcDirCacheDeleteUUID (const FcChar8 *dir,
+ FcConfig *config)
+{
+ const FcChar8 *sysroot = FcConfigGetSysRoot (config);
+ FcChar8 *target;
+ FcBool ret = FcTrue;
+
+ if (sysroot)
+ target = FcStrBuildFilename (sysroot, dir, ".uuid", NULL);
+ else
+ target = FcStrBuildFilename (dir, ".uuid", NULL);
+
+ ret = unlink ((char *) target) == 0;
+ FcHashTableRemove (config->uuid_table, target);
+ FcStrFree(target);
+
+ return ret;
+}
+
#ifndef _WIN32
static void
FcDirCacheReadUUID (FcChar8 *dir,
@@ -144,25 +177,35 @@ FcDirCacheReadUUID (FcChar8 *dir,
{
void *u;
uuid_t uuid;
+ const FcChar8 *sysroot = FcConfigGetSysRoot (config);
+ FcChar8 *target;
- if (!FcHashTableFind (config->uuid_table, dir, &u))
+ if (sysroot)
+ target = FcStrBuildFilename (sysroot, dir, NULL);
+ else
+ target = FcStrdup (dir);
+
+ if (!FcHashTableFind (config->uuid_table, target, &u))
{
- FcChar8 *uuidname = FcStrBuildFilename (dir, ".uuid", NULL);
+ FcChar8 *uuidname = FcStrBuildFilename (target, ".uuid", NULL);
int fd;
if ((fd = FcOpen ((char *) uuidname, O_RDONLY)) >= 0)
{
char suuid[37];
+ ssize_t len;
memset (suuid, 0, sizeof (suuid));
- if (read (fd, suuid, 36) > 0)
+ len = read (fd, suuid, 36);
+ if (len != -1)
{
+ suuid[len] = 0;
memset (uuid, 0, sizeof (uuid));
if (uuid_parse (suuid, uuid) == 0)
{
if (FcDebug () & FC_DBG_CACHE)
printf ("FcDirCacheReadUUID %s -> %s\n", uuidname, suuid);
- FcHashTableAdd (config->uuid_table, dir, uuid);
+ FcHashTableAdd (config->uuid_table, target, uuid);
}
}
close (fd);
@@ -176,6 +219,7 @@ FcDirCacheReadUUID (FcChar8 *dir,
}
else
FcHashUuidFree (u);
+ FcStrFree (target);
}
#endif
@@ -259,19 +303,22 @@ static FcChar8 *
FcDirCacheBasenameUUID (const FcChar8 *dir, FcChar8 cache_base[CACHEBASE_LEN], FcConfig *config)
{
void *u;
- FcChar8 *alias;
+ FcChar8 *target;
+ const FcChar8 *sysroot = FcConfigGetSysRoot (config);
- if (!FcHashTableFind (config->alias_table, dir, (void **)&alias))
- alias = FcStrdup (dir);
- if (FcHashTableFind (config->uuid_table, alias, &u))
+ if (sysroot)
+ target = FcStrBuildFilename (sysroot, dir, NULL);
+ else
+ target = FcStrdup (dir);
+ if (FcHashTableFind (config->uuid_table, target, &u))
{
uuid_unparse (u, (char *) cache_base);
strcat ((char *) cache_base, "-" FC_ARCHITECTURE FC_CACHE_SUFFIX);
FcHashUuidFree (u);
- FcStrFree (alias);
+ FcStrFree (target);
return cache_base;
}
- FcStrFree (alias);
+ FcStrFree (target);
return NULL;
}
#endif
@@ -303,6 +350,7 @@ FcDirCacheUnlink (const FcChar8 *dir, FcConfig *config)
if (!cache_hashed)
break;
(void) unlink ((char *) cache_hashed);
+ FcDirCacheDeleteUUID (dir, config);
FcStrFree (cache_hashed);
}
FcStrListDone (list);
@@ -417,6 +465,7 @@ struct _FcCacheSkip {
FcCache *cache;
FcRef ref;
intptr_t size;
+ void *allocated;
dev_t cache_dev;
ino_t cache_ino;
time_t cache_mtime;
@@ -542,6 +591,7 @@ FcCacheInsert (FcCache *cache, struct stat *cache_stat)
s->cache = cache;
s->size = cache->size;
+ s->allocated = NULL;
FcRefInit (&s->ref, 1);
if (cache_stat)
{
@@ -616,6 +666,7 @@ FcCacheRemoveUnlocked (FcCache *cache)
FcCacheSkip **update[FC_CACHE_MAX_LEVEL];
FcCacheSkip *s, **next;
int i;
+ void *allocated;
/*
* Find links along each chain
@@ -633,6 +684,15 @@ FcCacheRemoveUnlocked (FcCache *cache)
*update[i] = s->next[i];
while (fcCacheMaxLevel > 0 && fcCacheChains[fcCacheMaxLevel - 1] == NULL)
fcCacheMaxLevel--;
+
+ allocated = s->allocated;
+ while (allocated)
+ {
+ /* First element in allocated chunk is the free list */
+ next = *(void **)allocated;
+ free (allocated);
+ allocated = next;
+ }
free (s);
}
@@ -648,7 +708,7 @@ FcCacheFindByStat (struct stat *cache_stat)
s->cache_mtime == cache_stat->st_mtime)
{
#ifdef HAVE_STRUCT_STAT_ST_MTIM
- if (s->cache_mtime != cache_stat->st_mtim.tv_nsec)
+ if (s->cache_mtime_nano != cache_stat->st_mtim.tv_nsec)
continue;
#endif
FcRefInc (&s->ref);
@@ -702,6 +762,30 @@ FcCacheObjectDereference (void *object)
unlock_cache ();
}
+void *
+FcCacheAllocate (FcCache *cache, size_t len)
+{
+ FcCacheSkip *skip;
+ void *allocated = NULL;
+
+ lock_cache ();
+ skip = FcCacheFindByAddrUnlocked (cache);
+ if (skip)
+ {
+ void *chunk = malloc (sizeof (void *) + len);
+ if (chunk)
+ {
+ /* First element in allocated chunk is the free list */
+ *(void **)chunk = skip->allocated;
+ skip->allocated = chunk;
+ /* Return the rest */
+ allocated = ((FcChar8 *)chunk) + sizeof (void *);
+ }
+ }
+ unlock_cache ();
+ return allocated;
+}
+
void
FcCacheFini (void)
{
@@ -795,7 +879,7 @@ FcCacheOffsetsValid (FcCache *cache)
if (fs->nfont > (end - (char *) fs) / sizeof (FcPattern))
return FcFalse;
- if (fs->fonts != 0 && !FcIsEncodedOffset(fs->fonts))
+ if (!FcIsEncodedOffset(fs->fonts))
return FcFalse;
for (i = 0; i < fs->nfont; i++)
@@ -955,7 +1039,6 @@ FcCache *
FcDirCacheLoad (const FcChar8 *dir, FcConfig *config, FcChar8 **cache_file)
{
FcCache *cache = NULL;
- const FcChar8 *d;
#ifndef _WIN32
FcDirCacheReadUUID ((FcChar8 *) dir, config);
@@ -965,10 +1048,6 @@ FcDirCacheLoad (const FcChar8 *dir, FcConfig *config, FcChar8 **cache_file)
&cache, cache_file))
return NULL;
- d = FcCacheDir (cache);
- if (FcStrCmp (dir, d))
- FcHashTableAdd (config->alias_table, (FcChar8 *) d, (FcChar8 *) dir);
-
return cache;
}
@@ -989,6 +1068,55 @@ FcDirCacheLoadFile (const FcChar8 *cache_file, struct stat *file_stat)
return cache;
}
+static int
+FcDirChecksum (struct stat *statb)
+{
+ int ret = (int) statb->st_mtime;
+ char *endptr;
+ char *source_date_epoch;
+ unsigned long long epoch;
+
+ source_date_epoch = getenv("SOURCE_DATE_EPOCH");
+ if (source_date_epoch)
+ {
+ epoch = strtoull(source_date_epoch, &endptr, 10);
+
+ if (endptr == source_date_epoch)
+ fprintf (stderr,
+ "Fontconfig: SOURCE_DATE_EPOCH invalid\n");
+ else if ((errno == ERANGE && (epoch == ULLONG_MAX || epoch == 0))
+ || (errno != 0 && epoch == 0))
+ fprintf (stderr,
+ "Fontconfig: SOURCE_DATE_EPOCH: strtoull: %s: %llu\n",
+ strerror(errno), epoch);
+ else if (*endptr != '\0')
+ fprintf (stderr,
+ "Fontconfig: SOURCE_DATE_EPOCH has trailing garbage\n");
+ else if (epoch > ULONG_MAX)
+ fprintf (stderr,
+ "Fontconfig: SOURCE_DATE_EPOCH must be <= %lu but saw: %llu\n",
+ ULONG_MAX, epoch);
+ else if (epoch < ret)
+ /* Only override if directory is newer */
+ ret = (int) epoch;
+ }
+
+ return ret;
+}
+
+static int64_t
+FcDirChecksumNano (struct stat *statb)
+{
+#ifdef HAVE_STRUCT_STAT_ST_MTIM
+ /* No nanosecond component to parse */
+ if (getenv("SOURCE_DATE_EPOCH"))
+ return 0;
+ return statb->st_mtim.tv_nsec;
+#else
+ return 0;
+#endif
+}
+
/*
* Validate a cache file by reading the header and checking
* the magic number and the size field
@@ -1007,10 +1135,10 @@ FcDirCacheValidateHelper (FcConfig *config, int fd, struct stat *fd_stat, struct
ret = FcFalse;
else if (fd_stat->st_size != c.size)
ret = FcFalse;
- else if (c.checksum != (int) dir_stat->st_mtime)
+ else if (c.checksum != FcDirChecksum (dir_stat))
ret = FcFalse;
#ifdef HAVE_STRUCT_STAT_ST_MTIM
- else if (c.checksum_nano != dir_stat->st_mtim.tv_nsec)
+ else if (c.checksum_nano != FcDirChecksumNano (dir_stat))
ret = FcFalse;
#endif
return ret;
@@ -1086,10 +1214,8 @@ FcDirCacheBuild (FcFontSet *set, const FcChar8 *dir, struct stat *dir_stat, FcSt
cache->magic = FC_CACHE_MAGIC_ALLOC;
cache->version = FC_CACHE_VERSION_NUMBER;
cache->size = serialize->size;
- cache->checksum = (int) dir_stat->st_mtime;
-#ifdef HAVE_STRUCT_STAT_ST_MTIM
- cache->checksum_nano = dir_stat->st_mtim.tv_nsec;
-#endif
+ cache->checksum = FcDirChecksum (dir_stat);
+ cache->checksum_nano = FcDirChecksumNano (dir_stat);
/*
* Serialize directory name
@@ -1225,9 +1351,9 @@ FcDirCacheWrite (FcCache *cache, FcConfig *config)
#endif
FcDirCacheBasenameMD5 (dir, cache_base);
cache_hashed = FcStrBuildFilename (cache_dir, cache_base, NULL);
+ FcStrFree (cache_dir);
if (!cache_hashed)
return FcFalse;
- FcStrFree (cache_dir);
if (FcDebug () & FC_DBG_CACHE)
printf ("FcDirCacheWriteDir dir \"%s\" file \"%s\"\n",
diff --git a/src/fccfg.c b/src/fccfg.c
index eb0b76dc..d7c48e8c 100644
--- a/src/fccfg.c
+++ b/src/fccfg.c
@@ -26,7 +26,6 @@
#include "fcint.h"
#include <dirent.h>
-#include <locale.h>
#include <sys/types.h>
#if defined (_WIN32) && !defined (R_OK)
@@ -39,19 +38,7 @@ static FcConfig *
FcConfigEnsure (void)
{
FcConfig *config;
- FcBool is_locale_initialized;
- static void *static_is_locale_initialized;
-retry_locale:
- is_locale_initialized = (intptr_t) fc_atomic_ptr_get (&static_is_locale_initialized);
- if (!is_locale_initialized)
- {
- is_locale_initialized = FcTrue;
- if (!fc_atomic_ptr_cmpexch (&static_is_locale_initialized, NULL,
- (void *)(intptr_t) is_locale_initialized))
- goto retry_locale;
- setlocale (LC_ALL, "");
- }
-retry_config:
+retry:
config = fc_atomic_ptr_get (&_fcConfig);
if (!config)
{
@@ -59,12 +46,42 @@ retry_config:
if (!fc_atomic_ptr_cmpexch (&_fcConfig, NULL, config)) {
FcConfigDestroy (config);
- goto retry_config;
+ goto retry;
}
}
return config;
}
+static FcChar32
+FcHashAsStrIgnoreCase (const void *data)
+{
+ return FcStrHashIgnoreCase (data);
+}
+
+static int
+FcCompareAsStr (const void *v1, const void *v2)
+{
+ return FcStrCmp (v1, v2);
+}
+
+static void
+FcDestroyAsRule (void *data)
+{
+ FcRuleDestroy (data);
+}
+
+static void
+FcDestroyAsRuleSet (void *data)
+{
+ FcRuleSetDestroy (data);
+}
+
+static void
+FcDestroyAsStr (void *data)
+{
+ FcStrFree (data);
+}
+
FcBool
FcConfigInit (void)
{
@@ -126,7 +143,7 @@ FcConfigCreate (void)
for (k = FcMatchKindBegin; k < FcMatchKindEnd; k++)
{
- config->subst[k] = FcPtrListCreate ((FcDestroyFunc) FcRuleSetDestroy);
+ config->subst[k] = FcPtrListCreate (FcDestroyAsRuleSet);
if (!config->subst[k])
err = FcTrue;
}
@@ -144,25 +161,19 @@ FcConfigCreate (void)
config->sysRoot = NULL;
- config->rulesetList = FcPtrListCreate ((FcDestroyFunc) FcRuleSetDestroy);
+ config->rulesetList = FcPtrListCreate (FcDestroyAsRuleSet);
if (!config->rulesetList)
goto bail9;
config->availConfigFiles = FcStrSetCreate ();
if (!config->availConfigFiles)
goto bail10;
- config->uuid_table = FcHashTableCreate ((FcHashFunc) FcStrHashIgnoreCase,
- (FcCompareFunc) FcStrCmp,
+ config->uuid_table = FcHashTableCreate (FcHashAsStrIgnoreCase,
+ FcCompareAsStr,
FcHashStrCopy,
FcHashUuidCopy,
- (FcDestroyFunc) FcStrFree,
+ FcDestroyAsStr,
FcHashUuidFree);
- config->alias_table = FcHashTableCreate ((FcHashFunc) FcStrHashIgnoreCase,
- (FcCompareFunc) FcStrCmp,
- FcHashStrCopy,
- FcHashStrCopy,
- (FcDestroyFunc) FcStrFree,
- (FcDestroyFunc) FcStrFree);
FcRefInit (&config->ref, 1);
@@ -326,7 +337,6 @@ FcConfigDestroy (FcConfig *config)
FcStrFree (config->sysRoot);
FcHashTableDestroy (config->uuid_table);
- FcHashTableDestroy (config->alias_table);
free (config);
}
@@ -337,11 +347,15 @@ FcConfigDestroy (FcConfig *config)
FcBool
FcConfigAddCache (FcConfig *config, FcCache *cache,
- FcSetName set, FcStrSet *dirSet)
+ FcSetName set, FcStrSet *dirSet, FcChar8 *forDir)
{
FcFontSet *fs;
intptr_t *dirs;
int i;
+ FcBool relocated = FcFalse;
+
+ if (strcmp ((char *)FcCacheDir(cache), (char *)forDir) != 0)
+ relocated = FcTrue;
/*
* Add fonts
@@ -355,23 +369,43 @@ FcConfigAddCache (FcConfig *config, FcCache *cache,
{
FcPattern *font = FcFontSetFont (fs, i);
FcChar8 *font_file;
+ FcChar8 *relocated_font_file = NULL;
- /*
- * Check to see if font is banned by filename
- */
if (FcPatternObjectGetString (font, FC_FILE_OBJECT,
- 0, &font_file) == FcResultMatch &&
- !FcConfigAcceptFilename (config, font_file))
+ 0, &font_file) == FcResultMatch)
{
- continue;
+ if (relocated)
+ {
+ FcChar8 *slash = FcStrLastSlash (font_file);
+ relocated_font_file = FcStrBuildFilename (forDir, slash + 1, NULL);
+ font_file = relocated_font_file;
+ }
+
+ /*
+ * Check to see if font is banned by filename
+ */
+ if (!FcConfigAcceptFilename (config, font_file))
+ {
+ free (relocated_font_file);
+ continue;
+ }
}
-
+
/*
* Check to see if font is banned by pattern
*/
if (!FcConfigAcceptFont (config, font))
+ {
+ free (relocated_font_file);
continue;
-
+ }
+
+ if (relocated_font_file)
+ {
+ font = FcPatternCacheRewriteFile (font, cache, relocated_font_file);
+ free (relocated_font_file);
+ }
+
if (FcFontSetAdd (config->fonts[set], font))
nref++;
}
@@ -387,18 +421,14 @@ FcConfigAddCache (FcConfig *config, FcCache *cache,
for (i = 0; i < cache->dirs_count; i++)
{
const FcChar8 *dir = FcCacheSubdir (cache, i);
- FcChar8 *alias;
- FcChar8 *d = FcStrDirname (dir);
FcChar8 *s = NULL;
- if (FcHashTableFind (config->alias_table, d, (void **)&alias))
+ if (relocated)
{
FcChar8 *base = FcStrBasename (dir);
- dir = s = FcStrBuildFilename (alias, base, NULL);
- FcStrFree (alias);
+ dir = s = FcStrBuildFilename (forDir, base, NULL);
FcStrFree (base);
}
- FcStrFree (d);
if (FcConfigAcceptFilename (config, dir))
FcStrSetAddFilename (dirSet, dir);
if (s)
@@ -426,7 +456,7 @@ FcConfigAddDirList (FcConfig *config, FcSetName set, FcStrSet *dirSet)
cache = FcDirCacheRead (dir, FcFalse, config);
if (!cache)
continue;
- FcConfigAddCache (config, cache, set, dirSet);
+ FcConfigAddCache (config, cache, set, dirSet, dir);
FcDirCacheUnload (cache);
}
FcStrListDone (dirlist);
@@ -718,12 +748,12 @@ FcConfigPromote (FcValue v, FcValue u, FcValuePromotionBuffer *buf)
v.u.l = FcLangSetPromote (v.u.s, buf);
v.type = FcTypeLangSet;
}
- else if (v.type == FcTypeVoid && u.type == FcTypeLangSet)
+ else if (buf && v.type == FcTypeVoid && u.type == FcTypeLangSet)
{
v.u.l = FcLangSetPromote (NULL, buf);
v.type = FcTypeLangSet;
}
- else if (v.type == FcTypeVoid && u.type == FcTypeCharSet)
+ else if (buf && v.type == FcTypeVoid && u.type == FcTypeCharSet)
{
v.u.c = FcCharSetPromote (buf);
v.type = FcTypeCharSet;
@@ -1802,11 +1832,13 @@ FcConfigSubstituteWithPat (FcConfig *config,
if (value[object])
{
FcConfigDel (&elt[object]->values, value[object]);
+ FcValueListDestroy (l);
break;
}
/* fall through ... */
case FcOpDeleteAll:
FcConfigPatternDel (p, r->u.edit->object);
+ FcValueListDestroy (l);
break;
default:
FcValueListDestroy (l);
@@ -2077,7 +2109,8 @@ FcConfigXdgCacheHome (void)
ret = malloc (len + 7 + 1);
if (ret)
{
- memcpy (ret, home, len);
+ if (home)
+ memcpy (ret, home, len);
memcpy (&ret[len], FC_DIR_SEPARATOR_S ".cache", 7);
ret[len + 7] = 0;
}
@@ -2104,7 +2137,8 @@ FcConfigXdgConfigHome (void)
ret = malloc (len + 8 + 1);
if (ret)
{
- memcpy (ret, home, len);
+ if (home)
+ memcpy (ret, home, len);
memcpy (&ret[len], FC_DIR_SEPARATOR_S ".config", 8);
ret[len + 8] = 0;
}
@@ -2131,7 +2165,8 @@ FcConfigXdgDataHome (void)
ret = malloc (len + 13 + 1);
if (ret)
{
- memcpy (ret, home, len);
+ if (home)
+ memcpy (ret, home, len);
memcpy (&ret[len], FC_DIR_SEPARATOR_S ".local" FC_DIR_SEPARATOR_S "share", 13);
ret[len + 13] = 0;
}
@@ -2161,42 +2196,28 @@ FcConfigFilename (const FcChar8 *url)
}
file = 0;
-#ifdef _WIN32
- if (isalpha (*url) &&
- url[1] == ':' &&
- (url[2] == '/' || url[2] == '\\'))
- goto absolute_path;
-#endif
+ if (FcStrIsAbsoluteFilename(url))
+ return FcConfigFileExists (0, url);
- switch (*url) {
- case '~':
+ if (*url == '~')
+ {
dir = FcConfigHome ();
if (dir)
file = FcConfigFileExists (dir, url + 1);
else
file = 0;
- break;
-#ifdef _WIN32
- case '\\':
- absolute_path:
-#endif
- case '/':
- file = FcConfigFileExists (0, url);
- break;
- default:
- path = FcConfigGetPath ();
- if (!path)
- return NULL;
- for (p = path; *p; p++)
- {
- file = FcConfigFileExists (*p, url);
- if (file)
- break;
- }
- FcConfigFreePath (path);
- break;
}
+ path = FcConfigGetPath ();
+ if (!path)
+ return NULL;
+ for (p = path; *p; p++)
+ {
+ file = FcConfigFileExists (*p, url);
+ if (file)
+ break;
+ }
+ FcConfigFreePath (path);
return file;
}
@@ -2222,8 +2243,27 @@ FcConfigRealFilename (FcConfig *config,
if ((len = FcReadLink (nn, buf, sizeof (buf) - 1)) != -1)
{
buf[len] = 0;
- FcStrFree (nn);
- nn = FcStrdup (buf);
+
+ if (!FcStrIsAbsoluteFilename (buf))
+ {
+ FcChar8 *dirname = FcStrDirname (nn);
+ FcStrFree (nn);
+ if (!dirname)
+ return NULL;
+
+ FcChar8 *path = FcStrBuildFilename (dirname, buf, NULL);
+ FcStrFree (dirname);
+ if (!path)
+ return NULL;
+
+ nn = FcStrCanonFilename (path);
+ FcStrFree (path);
+ }
+ else
+ {
+ FcStrFree (nn);
+ nn = FcStrdup (buf);
+ }
}
}
@@ -2421,7 +2461,10 @@ FcConfigGetSysRoot (const FcConfig *config)
return NULL;
}
- return config->sysRoot;
+ if (config->sysRoot)
+ return config->sysRoot;
+
+ return (FcChar8 *) getenv ("FONTCONFIG_SYSROOT");
}
void
@@ -2488,7 +2531,7 @@ FcRuleSetCreate (const FcChar8 *name)
ret->description = NULL;
ret->domain = NULL;
for (k = FcMatchKindBegin; k < FcMatchKindEnd; k++)
- ret->subst[k] = FcPtrListCreate ((FcDestroyFunc) FcRuleDestroy);
+ ret->subst[k] = FcPtrListCreate (FcDestroyAsRule);
FcRefInit (&ret->ref, 1);
}
@@ -2573,12 +2616,13 @@ FcRuleSetAdd (FcRuleSet *rs,
switch (r->type)
{
case FcRuleTest:
- if (r->u.test &&
- r->u.test->kind == FcMatchDefault)
- r->u.test->kind = kind;
-
- if (n < r->u.test->object)
- n = r->u.test->object;
+ if (r->u.test)
+ {
+ if (r->u.test->kind == FcMatchDefault)
+ r->u.test->kind = kind;
+ if (n < r->u.test->object)
+ n = r->u.test->object;
+ }
break;
case FcRuleEdit:
if (n < r->u.edit->object)
diff --git a/src/fcdbg.c b/src/fcdbg.c
index 2e16a312..e2c6b562 100644
--- a/src/fcdbg.c
+++ b/src/fcdbg.c
@@ -187,22 +187,21 @@ FcCharSetPrint (const FcCharSet *c)
void
FcPatternPrint (const FcPattern *p)
{
- int i;
- FcPatternElt *e;
+ FcPatternIter iter;
if (!p)
{
printf ("Null pattern\n");
return;
}
- printf ("Pattern has %d elts (size %d)\n", p->num, p->size);
- for (i = 0; i < p->num; i++)
+ printf ("Pattern has %d elts (size %d)\n", FcPatternObjectCount (p), p->size);
+ FcPatternIterStart (p, &iter);
+ do
{
- e = &FcPatternElts(p)[i];
- printf ("\t%s:", FcObjectName(e->object));
- FcValueListPrint (FcPatternEltValues(e));
+ printf ("\t%s:", FcPatternIterGetObject (p, &iter));
+ FcValueListPrint (FcPatternIterGetValues (p, &iter));
printf ("\n");
- }
+ } while (FcPatternIterNext (p, &iter));
printf ("\n");
}
diff --git a/src/fcdefault.c b/src/fcdefault.c
index 35973d79..f3addca5 100644
--- a/src/fcdefault.c
+++ b/src/fcdefault.c
@@ -238,21 +238,22 @@ FcDefaultFini (void)
void
FcDefaultSubstitute (FcPattern *pattern)
{
+ FcPatternIter iter;
FcValue v, namelang, v2;
int i;
double dpi, size, scale, pixelsize;
- if (FcPatternObjectGet (pattern, FC_WEIGHT_OBJECT, 0, &v) == FcResultNoMatch )
+ if (!FcPatternFindObjectIter (pattern, &iter, FC_WEIGHT_OBJECT))
FcPatternObjectAddInteger (pattern, FC_WEIGHT_OBJECT, FC_WEIGHT_NORMAL);
- if (FcPatternObjectGet (pattern, FC_SLANT_OBJECT, 0, &v) == FcResultNoMatch)
+ if (!FcPatternFindObjectIter (pattern, &iter, FC_SLANT_OBJECT))
FcPatternObjectAddInteger (pattern, FC_SLANT_OBJECT, FC_SLANT_ROMAN);
- if (FcPatternObjectGet (pattern, FC_WIDTH_OBJECT, 0, &v) == FcResultNoMatch)
+ if (!FcPatternFindObjectIter (pattern, &iter, FC_WIDTH_OBJECT))
FcPatternObjectAddInteger (pattern, FC_WIDTH_OBJECT, FC_WIDTH_NORMAL);
for (i = 0; i < NUM_FC_BOOL_DEFAULTS; i++)
- if (FcPatternObjectGet (pattern, FcBoolDefaults[i].field, 0, &v) == FcResultNoMatch)
+ if (!FcPatternFindObjectIter (pattern, &iter, FcBoolDefaults[i].field))
FcPatternObjectAddBool (pattern, FcBoolDefaults[i].field, FcBoolDefaults[i].value);
if (FcPatternObjectGetDouble (pattern, FC_SIZE_OBJECT, 0, &size) != FcResultMatch)
@@ -269,7 +270,7 @@ FcDefaultSubstitute (FcPattern *pattern)
if (FcPatternObjectGetDouble (pattern, FC_DPI_OBJECT, 0, &dpi) != FcResultMatch)
dpi = 75.0;
- if (FcPatternObjectGet (pattern, FC_PIXEL_SIZE_OBJECT, 0, &v) != FcResultMatch)
+ if (!FcPatternFindObjectIter (pattern, &iter, FC_PIXEL_SIZE_OBJECT))
{
(void) FcPatternObjectDel (pattern, FC_SCALE_OBJECT);
FcPatternObjectAddDouble (pattern, FC_SCALE_OBJECT, scale);
@@ -281,25 +282,22 @@ FcDefaultSubstitute (FcPattern *pattern)
}
else
{
+ FcPatternIterGetValue(pattern, &iter, 0, &v, NULL);
size = v.u.d;
size = size / dpi * 72.0 / scale;
}
(void) FcPatternObjectDel (pattern, FC_SIZE_OBJECT);
FcPatternObjectAddDouble (pattern, FC_SIZE_OBJECT, size);
- if (FcPatternObjectGet (pattern, FC_FONTVERSION_OBJECT, 0, &v) == FcResultNoMatch)
- {
+ if (!FcPatternFindObjectIter (pattern, &iter, FC_FONTVERSION_OBJECT))
FcPatternObjectAddInteger (pattern, FC_FONTVERSION_OBJECT, 0x7fffffff);
- }
- if (FcPatternObjectGet (pattern, FC_HINT_STYLE_OBJECT, 0, &v) == FcResultNoMatch)
- {
+ if (!FcPatternFindObjectIter (pattern, &iter, FC_HINT_STYLE_OBJECT))
FcPatternObjectAddInteger (pattern, FC_HINT_STYLE_OBJECT, FC_HINT_FULL);
- }
- if (FcPatternObjectGet (pattern, FC_NAMELANG_OBJECT, 0, &v) == FcResultNoMatch)
- {
+
+ if (!FcPatternFindObjectIter (pattern, &iter, FC_NAMELANG_OBJECT))
FcPatternObjectAddString (pattern, FC_NAMELANG_OBJECT, FcGetDefaultLang ());
- }
+
/* shouldn't be failed. */
FcPatternObjectGet (pattern, FC_NAMELANG_OBJECT, 0, &namelang);
/* Add a fallback to ensure the english name when the requested language
@@ -315,17 +313,17 @@ FcDefaultSubstitute (FcPattern *pattern)
*/
v2.type = FcTypeString;
v2.u.s = (FcChar8 *) "en-us";
- if (FcPatternObjectGet (pattern, FC_FAMILYLANG_OBJECT, 0, &v) == FcResultNoMatch)
+ if (!FcPatternFindObjectIter (pattern, &iter, FC_FAMILYLANG_OBJECT))
{
FcPatternObjectAdd (pattern, FC_FAMILYLANG_OBJECT, namelang, FcTrue);
FcPatternObjectAddWithBinding (pattern, FC_FAMILYLANG_OBJECT, v2, FcValueBindingWeak, FcTrue);
}
- if (FcPatternObjectGet (pattern, FC_STYLELANG_OBJECT, 0, &v) == FcResultNoMatch)
+ if (!FcPatternFindObjectIter (pattern, &iter, FC_STYLELANG_OBJECT))
{
FcPatternObjectAdd (pattern, FC_STYLELANG_OBJECT, namelang, FcTrue);
FcPatternObjectAddWithBinding (pattern, FC_STYLELANG_OBJECT, v2, FcValueBindingWeak, FcTrue);
}
- if (FcPatternObjectGet (pattern, FC_FULLNAMELANG_OBJECT, 0, &v) == FcResultNoMatch)
+ if (!FcPatternFindObjectIter (pattern, &iter, FC_FULLNAMELANG_OBJECT))
{
FcPatternObjectAdd (pattern, FC_FULLNAMELANG_OBJECT, namelang, FcTrue);
FcPatternObjectAddWithBinding (pattern, FC_FULLNAMELANG_OBJECT, v2, FcValueBindingWeak, FcTrue);
diff --git a/src/fcdir.c b/src/fcdir.c
index bfcdf956..93f220c3 100644
--- a/src/fcdir.c
+++ b/src/fcdir.c
@@ -421,6 +421,13 @@ FcDirCacheRead (const FcChar8 *dir, FcBool force, FcConfig *config)
/* Not using existing cache file, construct new cache */
if (!cache)
cache = FcDirCacheScan (dir, config);
+ if (cache)
+ {
+ FcFontSet *fs = FcCacheSet (cache);
+
+ if (cache->dirs_count == 0 && (!fs || fs->nfont == 0))
+ FcDirCacheDeleteUUID (dir, config);
+ }
return cache;
}
diff --git a/src/fcformat.c b/src/fcformat.c
index 59f8681d..c76dc5ef 100644
--- a/src/fcformat.c
+++ b/src/fcformat.c
@@ -544,7 +544,7 @@ interpret_count (FcFormatContext *c,
FcStrBuf *buf)
{
int count;
- FcPatternElt *e;
+ FcPatternIter iter;
FcChar8 buf_static[64];
if (!expect_char (c, '#'))
@@ -554,16 +554,9 @@ interpret_count (FcFormatContext *c,
return FcFalse;
count = 0;
- e = FcPatternObjectFindElt (pat,
- FcObjectFromName ((const char *) c->word));
- if (e)
+ if (FcPatternFindIter (pat, &iter, (const char *) c->word))
{
- FcValueListPtr l;
- count++;
- for (l = FcPatternEltValues(e);
- l->next;
- l = l->next)
- count++;
+ count = FcPatternIterValueCount (pat, &iter);
}
snprintf ((char *) buf_static, sizeof (buf_static), "%d", count);
@@ -695,7 +688,7 @@ interpret_simple (FcFormatContext *c,
FcPattern *pat,
FcStrBuf *buf)
{
- FcPatternElt *e;
+ FcPatternIter iter;
FcBool add_colon = FcFalse;
FcBool add_elt_name = FcFalse;
int idx;
@@ -743,9 +736,7 @@ interpret_simple (FcFormatContext *c,
c->word = orig;
}
- e = FcPatternObjectFindElt (pat,
- FcObjectFromName ((const char *) c->word));
- if (e || else_string)
+ if (FcPatternFindIter (pat, &iter, (const char *) c->word) || else_string)
{
FcValueListPtr l = NULL;
@@ -757,8 +748,7 @@ interpret_simple (FcFormatContext *c,
FcStrBufChar (buf, '=');
}
- if (e)
- l = FcPatternEltValues(e);
+ l = FcPatternIterGetValues (pat, &iter);
if (idx != -1)
{
diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index 36f5aed4..07978cf5 100644
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -1136,30 +1136,65 @@ static const FT_UShort nameid_order[] = {
#define NUM_NAMEID_ORDER (sizeof (nameid_order) / sizeof (nameid_order[0]))
-static FcBool
-FcFreeTypeGetName (const FT_Face face,
- unsigned int platform,
- unsigned int nameid,
- FT_SfntName *sname)
+typedef struct
+{
+ unsigned int platform_id;
+ unsigned int name_id;
+ unsigned int encoding_id;
+ unsigned int language_id;
+ unsigned int idx;
+} FcNameMapping;
+
+static int
+name_mapping_cmp (const void *pa, const void *pb)
{
- int min = 0, max = (int) FT_Get_Sfnt_Name_Count (face) - 1;
+ const FcNameMapping *a = (const FcNameMapping *) pa;
+ const FcNameMapping *b = (const FcNameMapping *) pb;
+
+ if (a->platform_id != b->platform_id) return (int) a->platform_id - (int) b->platform_id;
+ if (a->name_id != b->name_id) return (int) a->name_id - (int) b->name_id;
+ if (a->encoding_id != b->encoding_id) return (int) a->encoding_id - (int) b->encoding_id;
+ if (a->language_id != b->language_id) return (int) a->language_id - (int) b->language_id;
+ if (a->idx != b->idx) return (int) a->idx - (int) b->idx;
+
+ return 0;
+}
+
+static int
+FcFreeTypeGetFirstName (const FT_Face face,
+ unsigned int platform,
+ unsigned int nameid,
+ FcNameMapping *mapping,
+ unsigned int count,
+ FT_SfntName *sname)
+{
+ int min = 0, max = (int) count - 1;
while (min <= max)
{
int mid = (min + max) / 2;
- if (FT_Get_Sfnt_Name (face, mid, sname) != 0)
+ if (FT_Get_Sfnt_Name (face, mapping[mid].idx, sname) != 0)
return FcFalse;
- if (platform < sname->platform_id || (platform == sname->platform_id && nameid < sname->name_id))
+ if (platform < sname->platform_id ||
+ (platform == sname->platform_id &&
+ (nameid < sname->name_id ||
+ (nameid == sname->name_id &&
+ (mid &&
+ platform == mapping[mid - 1].platform_id &&
+ nameid == mapping[mid - 1].name_id
+ )))))
max = mid - 1;
- else if (platform > sname->platform_id || (platform == sname->platform_id && nameid > sname->name_id))
+ else if (platform > sname->platform_id ||
+ (platform == sname->platform_id &&
+ nameid > sname->name_id))
min = mid + 1;
else
- return FcTrue;
+ return mid;
}
- return FcFalse;
+ return -1;
}
static FcPattern *
@@ -1167,7 +1202,8 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
const FcChar8 *file,
unsigned int id,
FcCharSet **cs_share,
- FcLangSet **ls_share)
+ FcLangSet **ls_share,
+ FcNameMapping **nm_share)
{
FcPattern *pat;
int slant = -1;
@@ -1180,6 +1216,7 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
FcBool variable_size = FcFalse;
FcCharSet *cs;
FcLangSet *ls;
+ FcNameMapping *name_mapping = NULL;
#if 0
FcChar8 *family = 0;
#endif
@@ -1203,6 +1240,7 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
TT_Header *head;
const FcChar8 *exclusiveLang = 0;
+ int name_count = 0;
int nfamily = 0;
int nfamily_lang = 0;
int nstyle = 0;
@@ -1229,7 +1267,7 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
if (!FcPatternAddBool (pat, FC_OUTLINE, has_outline))
goto bail1;
- has_color = !!(face->face_flags & FT_FACE_FLAG_COLOR);
+ has_color = FT_HAS_COLOR (face);
if (!FcPatternAddBool (pat, FC_COLOR, has_color))
goto bail1;
@@ -1252,9 +1290,9 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
for (i = 0; i < master->num_axis; i++)
{
- double min_value = master->axis[i].minimum / (double) (1 << 16);
- double def_value = master->axis[i].def / (double) (1 << 16);
- double max_value = master->axis[i].maximum / (double) (1 << 16);
+ double min_value = master->axis[i].minimum / (double) (1U << 16);
+ double def_value = master->axis[i].def / (double) (1U << 16);
+ double max_value = master->axis[i].maximum / (double) (1U << 16);
const char *elt = NULL;
if (min_value > def_value || def_value > max_value || min_value == max_value)
@@ -1311,8 +1349,8 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
for (i = 0; i < master->num_axis; i++)
{
- double value = instance->coords[i] / (double) (1 << 16);
- double default_value = master->axis[i].def / (double) (1 << 16);
+ double value = instance->coords[i] / (double) (1U << 16);
+ double default_value = master->axis[i].def / (double) (1U << 16);
double mult = default_value ? value / default_value : 1;
//printf ("named-instance, axis %d tag %lx value %g\n", i, master->axis[i].tag, value);
switch (master->axis[i].tag)
@@ -1369,6 +1407,41 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
* and style names. FreeType makes quite a hash
* of them
*/
+ name_count = FT_Get_Sfnt_Name_Count (face);
+ if (nm_share)
+ name_mapping = *nm_share;
+ if (!name_mapping)
+ {
+ int i = 0;
+ name_mapping = malloc (name_count * sizeof (FcNameMapping));
+ if (!name_mapping)
+ name_count = 0;
+ for (i = 0; i < name_count; i++)
+ {
+ FcNameMapping *p = &name_mapping[i];
+ FT_SfntName sname;
+ if (FT_Get_Sfnt_Name (face, i, &sname) == 0)
+ {
+ p->platform_id = sname.platform_id;
+ p->name_id = sname.name_id;
+ p->encoding_id = sname.encoding_id;
+ p->language_id = sname.language_id;
+ p->idx = i;
+ }
+ else
+ {
+ p->platform_id =
+ p->name_id =
+ p->encoding_id =
+ p->language_id =
+ p->idx = (unsigned int) -1;
+ }
+ }
+ qsort (name_mapping, name_count, sizeof(FcNameMapping), name_mapping_cmp);
+
+ if (nm_share)
+ *nm_share = name_mapping;
+ }
for (p = 0; p < NUM_PLATFORM_ORDER; p++)
{
int platform = platform_order[p];
@@ -1380,6 +1453,7 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
for (n = 0; n < NUM_NAMEID_ORDER; n++)
{
FT_SfntName sname;
+ int nameidx;
const FcChar8 *lang;
const char *elt = 0, *eltlang = 0;
int *np = 0, *nlangp = 0;
@@ -1401,119 +1475,129 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
lookupid = instance->strid;
}
- if (!FcFreeTypeGetName (face, platform, lookupid, &sname))
+ nameidx = FcFreeTypeGetFirstName (face, platform, lookupid,
+ name_mapping, name_count,
+ &sname);
+ if (nameidx == -1)
continue;
-
- switch (nameid) {
- case TT_NAME_ID_WWS_FAMILY:
- case TT_NAME_ID_PREFERRED_FAMILY:
- case TT_NAME_ID_FONT_FAMILY:
+ do
+ {
+ switch (nameid) {
+ case TT_NAME_ID_WWS_FAMILY:
+ case TT_NAME_ID_PREFERRED_FAMILY:
+ case TT_NAME_ID_FONT_FAMILY:
#if 0
- case TT_NAME_ID_UNIQUE_ID:
+ case TT_NAME_ID_UNIQUE_ID:
#endif
- if (FcDebug () & FC_DBG_SCANV)
- printf ("found family (n %2d p %d e %d l 0x%04x)",
- sname.name_id, sname.platform_id,
- sname.encoding_id, sname.language_id);
-
- elt = FC_FAMILY;
- eltlang = FC_FAMILYLANG;
- np = &nfamily;
- nlangp = &nfamily_lang;
- break;
- case TT_NAME_ID_MAC_FULL_NAME:
- case TT_NAME_ID_FULL_NAME:
- if (FcDebug () & FC_DBG_SCANV)
- printf ("found full (n %2d p %d e %d l 0x%04x)",
- sname.name_id, sname.platform_id,
- sname.encoding_id, sname.language_id);
-
- elt = FC_FULLNAME;
- eltlang = FC_FULLNAMELANG;
- np = &nfullname;
- nlangp = &nfullname_lang;
- break;
- case TT_NAME_ID_WWS_SUBFAMILY:
- case TT_NAME_ID_PREFERRED_SUBFAMILY:
- case TT_NAME_ID_FONT_SUBFAMILY:
- if (variable)
+ if (FcDebug () & FC_DBG_SCANV)
+ printf ("found family (n %2d p %d e %d l 0x%04x)",
+ sname.name_id, sname.platform_id,
+ sname.encoding_id, sname.language_id);
+
+ elt = FC_FAMILY;
+ eltlang = FC_FAMILYLANG;
+ np = &nfamily;
+ nlangp = &nfamily_lang;
+ break;
+ case TT_NAME_ID_MAC_FULL_NAME:
+ case TT_NAME_ID_FULL_NAME:
+ if (FcDebug () & FC_DBG_SCANV)
+ printf ("found full (n %2d p %d e %d l 0x%04x)",
+ sname.name_id, sname.platform_id,
+ sname.encoding_id, sname.language_id);
+
+ elt = FC_FULLNAME;
+ eltlang = FC_FULLNAMELANG;
+ np = &nfullname;
+ nlangp = &nfullname_lang;
+ break;
+ case TT_NAME_ID_WWS_SUBFAMILY:
+ case TT_NAME_ID_PREFERRED_SUBFAMILY:
+ case TT_NAME_ID_FONT_SUBFAMILY:
+ if (variable)
+ break;
+ if (FcDebug () & FC_DBG_SCANV)
+ printf ("found style (n %2d p %d e %d l 0x%04x) ",
+ sname.name_id, sname.platform_id,
+ sname.encoding_id, sname.language_id);
+
+ elt = FC_STYLE;
+ eltlang = FC_STYLELANG;
+ np = &nstyle;
+ nlangp = &nstyle_lang;
+ break;
+ case TT_NAME_ID_TRADEMARK:
+ case TT_NAME_ID_MANUFACTURER:
+ /* If the foundry wasn't found in the OS/2 table, look here */
+ if(!foundry)
+ {
+ FcChar8 *utf8;
+ utf8 = FcSfntNameTranscode (&sname);
+ foundry = FcNoticeFoundry((FT_String *) utf8);
+ free (utf8);
+ }
break;
- if (FcDebug () & FC_DBG_SCANV)
- printf ("found style (n %2d p %d e %d l 0x%04x) ",
- sname.name_id, sname.platform_id,
- sname.encoding_id, sname.language_id);
-
- elt = FC_STYLE;
- eltlang = FC_STYLELANG;
- np = &nstyle;
- nlangp = &nstyle_lang;
- break;
- case TT_NAME_ID_TRADEMARK:
- case TT_NAME_ID_MANUFACTURER:
- /* If the foundry wasn't found in the OS/2 table, look here */
- if(!foundry)
- {
- FcChar8 *utf8;
- utf8 = FcSfntNameTranscode (&sname);
- foundry = FcNoticeFoundry((FT_String *) utf8);
- free (utf8);
}
- break;
- }
- if (elt)
- {
- FcChar8 *utf8, *pp;
-
- utf8 = FcSfntNameTranscode (&sname);
- lang = FcSfntNameLanguage (&sname);
-
- if (FcDebug () & FC_DBG_SCANV)
- printf ("%s\n", utf8);
-
- if (!utf8)
- continue;
-
- /* Trim surrounding whitespace. */
- pp = utf8;
- while (*pp == ' ')
- pp++;
- len = strlen ((const char *) pp);
- memmove (utf8, pp, len + 1);
- pp = utf8 + len;
- while (pp > utf8 && *(pp - 1) == ' ')
- pp--;
- *pp = 0;
-
- if (FcStringInPatternElement (pat, elt, utf8))
+ if (elt)
{
- free (utf8);
- continue;
- }
+ FcChar8 *utf8, *pp;
- /* add new element */
- if (!FcPatternAddString (pat, elt, utf8))
- {
+ utf8 = FcSfntNameTranscode (&sname);
+ lang = FcSfntNameLanguage (&sname);
+
+ if (FcDebug () & FC_DBG_SCANV)
+ printf ("%s\n", utf8);
+
+ if (!utf8)
+ continue;
+
+ /* Trim surrounding whitespace. */
+ pp = utf8;
+ while (*pp == ' ')
+ pp++;
+ len = strlen ((const char *) pp);
+ memmove (utf8, pp, len + 1);
+ pp = utf8 + len;
+ while (pp > utf8 && *(pp - 1) == ' ')
+ pp--;
+ *pp = 0;
+
+ if (FcStringInPatternElement (pat, elt, utf8))
+ {
+ free (utf8);
+ continue;
+ }
+
+ /* add new element */
+ if (!FcPatternAddString (pat, elt, utf8))
+ {
+ free (utf8);
+ goto bail1;
+ }
free (utf8);
- goto bail1;
- }
- free (utf8);
- if (lang)
- {
- /* pad lang list with 'und' to line up with elt */
- while (*nlangp < *np)
+ if (lang)
{
- if (!FcPatternAddString (pat, eltlang, (FcChar8 *) "und"))
+ /* pad lang list with 'und' to line up with elt */
+ while (*nlangp < *np)
+ {
+ if (!FcPatternAddString (pat, eltlang, (FcChar8 *) "und"))
+ goto bail1;
+ ++*nlangp;
+ }
+ if (!FcPatternAddString (pat, eltlang, lang))
goto bail1;
++*nlangp;
}
- if (!FcPatternAddString (pat, eltlang, lang))
- goto bail1;
- ++*nlangp;
+ ++*np;
}
- ++*np;
}
+ while (++nameidx < name_count &&
+ FT_Get_Sfnt_Name (face, name_mapping[nameidx].idx, &sname) == 0 &&
+ platform == sname.platform_id && lookupid == sname.name_id);
}
}
+ if (!nm_share)
+ free (name_mapping);
if (!nfamily && face->family_name &&
FcStrCmpIgnoreBlanksAndCase ((FcChar8 *) face->family_name, (FcChar8 *) "") != 0)
@@ -2035,7 +2119,7 @@ FcFreeTypeQueryFace (const FT_Face face,
unsigned int id,
FcBlanks *blanks FC_UNUSED)
{
- return FcFreeTypeQueryFaceInternal (face, file, id, NULL, NULL);
+ return FcFreeTypeQueryFaceInternal (face, file, id, NULL, NULL, NULL);
}
FcPattern *
@@ -2057,7 +2141,7 @@ FcFreeTypeQuery(const FcChar8 *file,
if (count)
*count = face->num_faces;
- pat = FcFreeTypeQueryFaceInternal (face, file, id, NULL, NULL);
+ pat = FcFreeTypeQueryFaceInternal (face, file, id, NULL, NULL, NULL);
FT_Done_Face (face);
bail:
@@ -2076,6 +2160,7 @@ FcFreeTypeQueryAll(const FcChar8 *file,
FT_Library ftLibrary = NULL;
FcCharSet *cs = NULL;
FcLangSet *ls = NULL;
+ FcNameMapping *nm = NULL;
FT_MM_Var *mm_var = NULL;
FcBool index_set = id != (unsigned int) -1;
unsigned int set_face_num = index_set ? id & 0xFFFF : 0;
@@ -2135,7 +2220,7 @@ FcFreeTypeQueryAll(const FcChar8 *file,
}
id = ((instance_num << 16) + face_num);
- pat = FcFreeTypeQueryFaceInternal (face, (const FcChar8 *) file, id, &cs, &ls);
+ pat = FcFreeTypeQueryFaceInternal (face, (const FcChar8 *) file, id, &cs, &ls, &nm);
if (pat)
{
@@ -2154,6 +2239,8 @@ skip:
instance_num = 0x8000; /* variable font */
else
{
+ free (nm);
+ nm = NULL;
FcLangSetDestroy (ls);
ls = NULL;
FcCharSetDestroy (cs);
@@ -2527,7 +2614,7 @@ GetScriptTags(FT_Face face, FT_ULong tabletag, FT_ULong **stags)
ftglue_stream_frame_exit( stream );
*stags = malloc(script_count * sizeof (FT_ULong));
- if (!stags)
+ if (!*stags)
return 0;
p = 0;
diff --git a/src/fchash.c b/src/fchash.c
index 396f452c..2f06f1a2 100644
--- a/src/fchash.c
+++ b/src/fchash.c
@@ -214,3 +214,32 @@ FcHashTableReplace (FcHashTable *table,
{
return FcHashTableAddInternal (table, key, value, FcTrue);
}
+
+FcBool
+FcHashTableRemove (FcHashTable *table,
+ void *key)
+{
+ FcHashBucket **prev, *bucket;
+ FcChar32 hash = table->hash_func (key);
+ FcBool ret = FcFalse;
+
+retry:
+ for (prev = &table->buckets[hash % FC_HASH_SIZE];
+ (bucket = fc_atomic_ptr_get (prev)); prev = &(bucket->next))
+ {
+ if (!table->compare_func (bucket->key, key))
+ {
+ if (!fc_atomic_ptr_cmpexch (prev, bucket, bucket->next))
+ goto retry;
+ if (table->key_destroy_func)
+ table->key_destroy_func (bucket->key);
+ if (table->value_destroy_func)
+ table->value_destroy_func (bucket->value);
+ free (bucket);
+ ret = FcTrue;
+ break;
+ }
+ }
+
+ return ret;
+}
diff --git a/src/fcint.h b/src/fcint.h
index 5de311f0..de78cd8c 100644
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -242,7 +242,7 @@ typedef enum _FcOp {
} FcOp;
typedef enum _FcOpFlags {
- FcOpFlagIgnoreBlanks = 1 << 0
+ FcOpFlagIgnoreBlanks = 1U << 0
} FcOpFlags;
#define FC_OP_GET_OP(_x_) ((_x_) & 0xffff)
@@ -566,7 +566,6 @@ struct _FcConfig {
FcStrSet *availConfigFiles; /* config files available */
FcPtrList *rulesetList; /* List of rulesets being installed */
FcHashTable *uuid_table; /* UUID table for cachedirs */
- FcHashTable *alias_table; /* alias table for cachedirs */
};
typedef struct _FcFileTime {
@@ -617,9 +616,13 @@ FcCacheObjectReference (void *object);
FcPrivate void
FcCacheObjectDereference (void *object);
+FcPrivate void *
+FcCacheAllocate (FcCache *cache, size_t len);
+
FcPrivate void
FcCacheFini (void);
+
FcPrivate void
FcDirCacheReference (FcCache *cache, int nref);
@@ -708,7 +711,7 @@ FcConfigModifiedTime (FcConfig *config);
FcPrivate FcBool
FcConfigAddCache (FcConfig *config, FcCache *cache,
- FcSetName set, FcStrSet *dirSet);
+ FcSetName set, FcStrSet *dirSet, FcChar8 *forDir);
FcPrivate FcRuleSet *
FcRuleSetCreate (const FcChar8 *name);
@@ -1150,6 +1153,18 @@ FcPatternAppend (FcPattern *p, FcPattern *s);
FcPrivate int
FcPatternPosition (const FcPattern *p, const char *object);
+FcPrivate FcBool
+FcPatternFindObjectIter (const FcPattern *pat, FcPatternIter *iter, FcObject object);
+
+FcPrivate FcObject
+FcPatternIterGetObjectId (const FcPattern *pat, FcPatternIter *iter);
+
+FcPrivate FcValueListPtr
+FcPatternIterGetValues (const FcPattern *pat, FcPatternIter *iter);
+
+FcPrivate FcPattern *
+FcPatternCacheRewriteFile (const FcPattern *pat, FcCache *cache, const FcChar8 *relocated_font_file);
+
FcPrivate FcChar32
FcStringHash (const FcChar8 *s);
@@ -1264,6 +1279,9 @@ FcStrGlobMatch (const FcChar8 *glob,
FcPrivate FcBool
FcStrUsesHome (const FcChar8 *s);
+FcPrivate FcBool
+FcStrIsAbsoluteFilename (const FcChar8 *s);
+
FcPrivate FcChar8 *
FcStrBuildFilename (const FcChar8 *path,
...);
@@ -1341,4 +1359,8 @@ FcHashTableReplace (FcHashTable *table,
void *key,
void *value);
+FcPrivate FcBool
+FcHashTableRemove (FcHashTable *table,
+ void *key);
+
#endif /* _FC_INT_H_ */
diff --git a/src/fclang.c b/src/fclang.c
index eadf34bf..687e2a73 100644
--- a/src/fclang.c
+++ b/src/fclang.c
@@ -59,7 +59,7 @@ FcLangSetBitSet (FcLangSet *ls,
if (bucket >= ls->map_size)
return; /* shouldn't happen really */
- ls->map[bucket] |= ((FcChar32) 1 << (id & 0x1f));
+ ls->map[bucket] |= ((FcChar32) 1U << (id & 0x1f));
}
static FcBool
@@ -87,7 +87,7 @@ FcLangSetBitReset (FcLangSet *ls,
if (bucket >= ls->map_size)
return; /* shouldn't happen really */
- ls->map[bucket] &= ~((FcChar32) 1 << (id & 0x1f));
+ ls->map[bucket] &= ~((FcChar32) 1U << (id & 0x1f));
}
FcLangSet *
@@ -157,7 +157,7 @@ FcFreeTypeLangSet (const FcCharSet *charset,
if (map[i])
{
for (j = 0; j < 32; j++)
- if (map[i] & (1 << j))
+ if (map[i] & (1U << j))
printf (" %04x", ucs4 + i * 32 + j);
}
}
@@ -848,7 +848,7 @@ FcNameUnparseLangSet (FcStrBuf *buf, const FcLangSet *ls)
if ((bits = ls->map[i]))
{
for (bit = 0; bit <= 31; bit++)
- if (bits & (1 << bit))
+ if (bits & (1U << bit))
{
int id = (i << 5) | bit;
if (!first)
@@ -982,7 +982,7 @@ FcLangSetContains (const FcLangSet *lsa, const FcLangSet *lsb)
if (missing)
{
for (j = 0; j < 32; j++)
- if (missing & (1 << j))
+ if (missing & (1U << j))
{
if (!FcLangSetContainsLang (lsa,
fcLangCharSets[fcLangCharSetIndicesInv[i*32 + j]].lang))
diff --git a/src/fclist.c b/src/fclist.c
index 5f92a725..494bdead 100644
--- a/src/fclist.c
+++ b/src/fclist.c
@@ -448,41 +448,6 @@ FcListAppend (FcListHashTable *table,
e = FcPatternObjectFindElt (font, FcObjectFromName (os->objects[o]));
if (e)
{
- if (FcRefIsConst (&font->ref) && !strcmp (os->objects[o], FC_FILE))
- {
- FcChar8 *dir, *alias;
- FcConfig *config = FcConfigGetCurrent (); /* FIXME: this may need to be exported as API? */
-
- for (v = FcPatternEltValues (e); v->value.type != FcTypeString; v = FcValueListNext (v));
- if (!v)
- goto bail2;
- dir = FcStrDirname (FcValueString (&v->value));
- if (FcHashTableFind (config->alias_table, dir, (void **) &alias))
- {
- FcChar8 *base = FcStrBasename (FcValueString (&v->value));
- FcChar8 *s = FcStrBuildFilename (alias, base, NULL);
- FcValue vv;
-
- FcStrFree (alias);
- FcStrFree (base);
- vv.type = FcTypeString;
- vv.u.s = s;
- if (!FcPatternAdd (bucket->pattern,
- os->objects[o],
- FcValueCanonicalize (&vv),
- FcTrue))
- {
- FcStrFree (s);
- FcStrFree (dir);
- goto bail2;
- }
- FcStrFree (s);
- FcStrFree (dir);
- goto bail3;
- }
- else
- FcStrFree (dir);
- }
for (v = FcPatternEltValues(e), idx = 0; v;
v = FcValueListNext(v), ++idx)
{
@@ -491,7 +456,6 @@ FcListAppend (FcListHashTable *table,
FcValueCanonicalize(&v->value), defidx != idx))
goto bail2;
}
- bail3:;
}
}
*prev = bucket;
@@ -604,6 +568,9 @@ FcFontSetList (FcConfig *config,
free (bucket);
}
+ if (destroy_os)
+ FcObjectSetDestroy (os);
+
return ret;
bail2:
diff --git a/src/fcmatch.c b/src/fcmatch.c
index 62f8e582..c3d2b8ad 100644
--- a/src/fcmatch.c
+++ b/src/fcmatch.c
@@ -682,43 +682,9 @@ FcFontRenderPrepare (FcConfig *config,
}
else
{
- if (FcRefIsConst (&font->ref) && fe->object == FC_FILE_OBJECT)
- {
- FcValueListPtr l = FcPatternEltValues (fe);
- FcChar8 *dir, *alias;
-
- while (l->value.type != FcTypeString)
- l = FcValueListNext (l);
- if (!l)
- goto bail0;
- dir = FcStrDirname (FcValueString (&l->value));
- if (!config)
- config = FcConfigGetCurrent ();
- if (config && FcHashTableFind (config->alias_table, dir, (void **) &alias))
- {
- FcChar8 *base = FcStrBasename (FcValueString (&l->value));
- FcChar8 *s = FcStrBuildFilename (alias, base, NULL);
- FcValue v;
-
- FcStrFree (alias);
- FcStrFree (base);
- v.type = FcTypeString;
- v.u.s = s;
- FcPatternObjectAddWithBinding (new, fe->object,
- FcValueCanonicalize (&v),
- l->binding,
- FcTrue);
- FcStrFree (s);
- FcStrFree (dir);
- goto bail0;
- }
- else
- FcStrFree (dir);
- }
FcPatternObjectListAdd (new, fe->object,
FcValueListDuplicate (FcPatternEltValues (fe)),
FcTrue);
- bail0:;
}
}
for (i = 0; i < pat->num; i++)
@@ -841,19 +807,21 @@ FcFontSetMatchInternal (FcFontSet **sets,
if (!(p = strchr (s, ',')))
{
f = FcFalse;
- len = strlen (s) + 1;
+ len = strlen (s);
}
else
{
- len = (p - s) + 1;
+ len = (p - s);
+ }
+ x = malloc (sizeof (char) * (len + 1));
+ if (x)
+ {
+ strcpy (x, s);
+ if (FcObjectFromName (x) > 0)
+ FcObjectSetAdd (os, x);
+ s = p + 1;
+ free (x);
}
- x = malloc (sizeof (char) * len);
- strncpy (x, s, len - 1);
- x[len - 1] = 0;
- if (FcObjectFromName (x) > 0)
- FcObjectSetAdd (os, x);
- s = p + 1;
- free (x);
}
free (ss);
}
diff --git a/src/fcname.c b/src/fcname.c
index 79e413e1..711bb9b2 100644
--- a/src/fcname.c
+++ b/src/fcname.c
@@ -330,13 +330,37 @@ FcNameConvert (FcType type, FcChar8 *string)
case FcTypeRange:
if (sscanf ((char *) string, "[%lg %lg]", &b, &e) != 2)
{
- v.u.d = strtod ((char *) string, &p);
- if (p != NULL && p[0] != 0)
+ char *sc, *ec;
+ size_t len = strlen ((const char *) string);
+ int si, ei;
+
+ sc = malloc (len + 1);
+ ec = malloc (len + 1);
+ if (sc && ec && sscanf ((char *) string, "[%s %[^]]]", sc, ec) == 2)
{
- v.type = FcTypeVoid;
- break;
+ if (FcNameConstant ((const FcChar8 *) sc, &si) &&
+ FcNameConstant ((const FcChar8 *) ec, &ei))
+ v.u.r = FcRangeCreateDouble (si, ei);
+ else
+ goto bail1;
+ }
+ else
+ {
+ bail1:
+ v.type = FcTypeDouble;
+ if (FcNameConstant (string, &si))
+ {
+ v.u.d = (double) si;
+ } else {
+ v.u.d = strtod ((char *) string, &p);
+ if (p != NULL && p[0] != 0)
+ v.type = FcTypeVoid;
+ }
}
- v.type = FcTypeDouble;
+ if (sc)
+ free (sc);
+ if (ec)
+ free (ec);
}
else
v.u.r = FcRangeCreateDouble (b, e);
@@ -466,6 +490,10 @@ FcNameParse (const FcChar8 *name)
if (!FcPatternAddBool (pat, c->object, c->value))
goto bail2;
break;
+ case FcTypeRange:
+ if (!FcPatternAddInteger (pat, c->object, c->value))
+ goto bail2;
+ break;
default:
break;
}
diff --git a/src/fcobjshash.h b/src/fcobjshash.h
deleted file mode 100644
index 867a369a..00000000
--- a/src/fcobjshash.h
+++ /dev/null
@@ -1,332 +0,0 @@
-/* ANSI-C code produced by gperf version 3.1 */
-/* Command-line: gperf --pic -m 100 fcobjshash.gperf */
-/* Computed positions: -k'2-3' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gperf@gnu.org>."
-#endif
-
-#line 1 "fcobjshash.gperf"
-
-#line 13 "fcobjshash.gperf"
-struct FcObjectTypeInfo {
-int name;
-int id;
-};
-#include <string.h>
-/* maximum key range = 65, duplicates = 0 */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static unsigned int
-FcObjectTypeHash (register const char *str, register size_t len)
-{
- static const unsigned char asso_values[] =
- {
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 9, 21, 18,
- 33, 21, 69, 6, 36, 0, 69, 69, 0, 24,
- 9, 0, 21, 69, 33, 15, 18, 0, 69, 69,
- 0, 21, 6, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 69
- };
- return len + asso_values[(unsigned char)str[2]] + asso_values[(unsigned char)str[1]];
-}
-
-struct FcObjectTypeNamePool_t
- {
- char FcObjectTypeNamePool_str4[sizeof("file")];
- char FcObjectTypeNamePool_str5[sizeof("color")];
- char FcObjectTypeNamePool_str7[sizeof("foundry")];
- char FcObjectTypeNamePool_str8[sizeof("fullname")];
- char FcObjectTypeNamePool_str9[sizeof("pixelsize")];
- char FcObjectTypeNamePool_str10[sizeof("size")];
- char FcObjectTypeNamePool_str12[sizeof("fullnamelang")];
- char FcObjectTypeNamePool_str13[sizeof("globaladvance")];
- char FcObjectTypeNamePool_str14[sizeof("slant")];
- char FcObjectTypeNamePool_str16[sizeof("hinting")];
- char FcObjectTypeNamePool_str17[sizeof("minspace")];
- char FcObjectTypeNamePool_str18[sizeof("hintstyle")];
- char FcObjectTypeNamePool_str19[sizeof("fontformat")];
- char FcObjectTypeNamePool_str20[sizeof("fontversion")];
- char FcObjectTypeNamePool_str21[sizeof("fontfeatures")];
- char FcObjectTypeNamePool_str22[sizeof("lang")];
- char FcObjectTypeNamePool_str23[sizeof("fontvariations")];
- char FcObjectTypeNamePool_str24[sizeof("dpi")];
- char FcObjectTypeNamePool_str25[sizeof("outline")];
- char FcObjectTypeNamePool_str26[sizeof("autohint")];
- char FcObjectTypeNamePool_str27[sizeof("weight")];
- char FcObjectTypeNamePool_str28[sizeof("hash")];
- char FcObjectTypeNamePool_str29[sizeof("postscriptname")];
- char FcObjectTypeNamePool_str31[sizeof("rgba")];
- char FcObjectTypeNamePool_str32[sizeof("scale")];
- char FcObjectTypeNamePool_str33[sizeof("matrix")];
- char FcObjectTypeNamePool_str34[sizeof("rasterizer")];
- char FcObjectTypeNamePool_str35[sizeof("scalable")];
- char FcObjectTypeNamePool_str36[sizeof("antialias")];
- char FcObjectTypeNamePool_str37[sizeof("spacing")];
- char FcObjectTypeNamePool_str38[sizeof("width")];
- char FcObjectTypeNamePool_str39[sizeof("family")];
- char FcObjectTypeNamePool_str40[sizeof("capability")];
- char FcObjectTypeNamePool_str41[sizeof("namelang")];
- char FcObjectTypeNamePool_str42[sizeof("aspect")];
- char FcObjectTypeNamePool_str43[sizeof("familylang")];
- char FcObjectTypeNamePool_str44[sizeof("style")];
- char FcObjectTypeNamePool_str46[sizeof("prgname")];
- char FcObjectTypeNamePool_str47[sizeof("index")];
- char FcObjectTypeNamePool_str48[sizeof("stylelang")];
- char FcObjectTypeNamePool_str49[sizeof("decorative")];
- char FcObjectTypeNamePool_str50[sizeof("variable")];
- char FcObjectTypeNamePool_str51[sizeof("symbol")];
- char FcObjectTypeNamePool_str52[sizeof("charset")];
- char FcObjectTypeNamePool_str53[sizeof("embolden")];
- char FcObjectTypeNamePool_str54[sizeof("charwidth")];
- char FcObjectTypeNamePool_str55[sizeof("charheight")];
- char FcObjectTypeNamePool_str59[sizeof("embeddedbitmap")];
- char FcObjectTypeNamePool_str60[sizeof("lcdfilter")];
- char FcObjectTypeNamePool_str68[sizeof("verticallayout")];
- };
-static const struct FcObjectTypeNamePool_t FcObjectTypeNamePool_contents =
- {
- "file",
- "color",
- "foundry",
- "fullname",
- "pixelsize",
- "size",
- "fullnamelang",
- "globaladvance",
- "slant",
- "hinting",
- "minspace",
- "hintstyle",
- "fontformat",
- "fontversion",
- "fontfeatures",
- "lang",
- "fontvariations",
- "dpi",
- "outline",
- "autohint",
- "weight",
- "hash",
- "postscriptname",
- "rgba",
- "scale",
- "matrix",
- "rasterizer",
- "scalable",
- "antialias",
- "spacing",
- "width",
- "family",
- "capability",
- "namelang",
- "aspect",
- "familylang",
- "style",
- "prgname",
- "index",
- "stylelang",
- "decorative",
- "variable",
- "symbol",
- "charset",
- "embolden",
- "charwidth",
- "charheight",
- "embeddedbitmap",
- "lcdfilter",
- "verticallayout"
- };
-#define FcObjectTypeNamePool ((const char *) &FcObjectTypeNamePool_contents)
-const struct FcObjectTypeInfo *
-FcObjectTypeLookup (register const char *str, register size_t len)
-{
- enum
- {
- TOTAL_KEYWORDS = 50,
- MIN_WORD_LENGTH = 3,
- MAX_WORD_LENGTH = 14,
- MIN_HASH_VALUE = 4,
- MAX_HASH_VALUE = 68
- };
-
- static const struct FcObjectTypeInfo wordlist[] =
- {
- {-1}, {-1}, {-1}, {-1},
-#line 38 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str4,FC_FILE_OBJECT},
-#line 64 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str5,FC_COLOR_OBJECT},
- {-1},
-#line 31 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str7,FC_FOUNDRY_OBJECT},
-#line 22 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str8,FC_FULLNAME_OBJECT},
-#line 29 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str9,FC_PIXEL_SIZE_OBJECT},
-#line 27 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str10,FC_SIZE_OBJECT},
- {-1},
-#line 23 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str12,FC_FULLNAMELANG_OBJECT},
-#line 37 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str13,FC_GLOBAL_ADVANCE_OBJECT},
-#line 24 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str14,FC_SLANT_OBJECT},
- {-1},
-#line 34 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str16,FC_HINTING_OBJECT},
-#line 46 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str17,FC_MINSPACE_OBJECT},
-#line 33 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str18,FC_HINT_STYLE_OBJECT},
-#line 54 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str19,FC_FONTFORMAT_OBJECT},
-#line 52 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str20,FC_FONTVERSION_OBJECT},
-#line 60 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str21,FC_FONT_FEATURES_OBJECT},
-#line 51 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str22,FC_LANG_OBJECT},
-#line 66 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str23,FC_FONT_VARIATIONS_OBJECT},
-#line 43 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str24,FC_DPI_OBJECT},
-#line 41 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str25,FC_OUTLINE_OBJECT},
-#line 36 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str26,FC_AUTOHINT_OBJECT},
-#line 25 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str27,FC_WEIGHT_OBJECT},
-#line 62 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str28,FC_HASH_OBJECT},
-#line 63 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str29,FC_POSTSCRIPT_NAME_OBJECT},
- {-1},
-#line 44 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str31,FC_RGBA_OBJECT},
-#line 45 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str32,FC_SCALE_OBJECT},
-#line 49 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str33,FC_MATRIX_OBJECT},
-#line 40 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str34,FC_RASTERIZER_OBJECT},
-#line 42 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str35,FC_SCALABLE_OBJECT},
-#line 32 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str36,FC_ANTIALIAS_OBJECT},
-#line 30 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str37,FC_SPACING_OBJECT},
-#line 26 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str38,FC_WIDTH_OBJECT},
-#line 18 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str39,FC_FAMILY_OBJECT},
-#line 53 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str40,FC_CAPABILITY_OBJECT},
-#line 59 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str41,FC_NAMELANG_OBJECT},
-#line 28 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str42,FC_ASPECT_OBJECT},
-#line 19 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str43,FC_FAMILYLANG_OBJECT},
-#line 20 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str44,FC_STYLE_OBJECT},
- {-1},
-#line 61 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str46,FC_PRGNAME_OBJECT},
-#line 39 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str47,FC_INDEX_OBJECT},
-#line 21 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str48,FC_STYLELANG_OBJECT},
-#line 57 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str49,FC_DECORATIVE_OBJECT},
-#line 67 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str50,FC_VARIABLE_OBJECT},
-#line 65 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str51,FC_SYMBOL_OBJECT},
-#line 50 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str52,FC_CHARSET_OBJECT},
-#line 55 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str53,FC_EMBOLDEN_OBJECT},
-#line 47 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str54,FC_CHARWIDTH_OBJECT},
-#line 48 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str55,FC_CHAR_HEIGHT_OBJECT},
- {-1}, {-1}, {-1},
-#line 56 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str59,FC_EMBEDDED_BITMAP_OBJECT},
-#line 58 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str60,FC_LCD_FILTER_OBJECT},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 35 "fcobjshash.gperf"
- {(int)(size_t)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str68,FC_VERTICAL_LAYOUT_OBJECT}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register unsigned int key = FcObjectTypeHash (str, len);
-
- if (key <= MAX_HASH_VALUE)
- {
- register int o = wordlist[key].name;
- if (o >= 0)
- {
- register const char *s = o + FcObjectTypeNamePool;
-
- if (*str == *s && !strcmp (str + 1, s + 1))
- return &wordlist[key];
- }
- }
- }
- return 0;
-}
diff --git a/src/fcpat.c b/src/fcpat.c
index e624aeaa..0861b8f5 100644
--- a/src/fcpat.c
+++ b/src/fcpat.c
@@ -373,6 +373,71 @@ FcValueListHash (FcValueListPtr l)
return hash;
}
+static void *
+FcPatternGetCacheObject (FcPattern *p)
+{
+ /* We use a value to find the cache, instead of the FcPattern object
+ * because the pattern itself may be a cache allocation if we rewrote the path,
+ * so the p may not be in the cached region. */
+ return FcPatternEltValues(&FcPatternElts (p)[0]);
+}
+
+FcPattern *
+FcPatternCacheRewriteFile (const FcPattern *p,
+ FcCache *cache,
+ const FcChar8 *relocated_font_file)
+{
+ FcPatternElt *elts = FcPatternElts (p);
+ size_t i,j;
+ FcChar8 *data;
+ FcPattern *new_p;
+ FcPatternElt *new_elts;
+ FcValueList *new_value_list;
+ size_t new_path_len = strlen ((char *)relocated_font_file);
+ FcChar8 *new_path;
+
+ /* Allocate space for the patter, the PatternElt headers and
+ * the FC_FILE FcValueList and path that will be freed with the
+ * cache */
+ data = FcCacheAllocate (cache,
+ sizeof (FcPattern) +
+ p->num * sizeof (FcPatternElt) +
+ sizeof (FcValueList) +
+ new_path_len + 1);
+
+ new_p = (FcPattern *)data;
+ data += sizeof (FcPattern);
+ new_elts = (FcPatternElt *)(data);
+ data += p->num * sizeof (FcPatternElt);
+ new_value_list = (FcValueList *)data;
+ data += sizeof (FcValueList);
+ new_path = data;
+
+ *new_p = *p;
+ new_p->elts_offset = FcPtrToOffset (new_p, new_elts);
+
+ /* Copy all but the FILE values from the cache */
+ for (i = 0, j = 0; i < p->num; i++)
+ {
+ FcPatternElt *elt = &elts[i];
+ new_elts[j].object = elt->object;
+ if (elt->object != FC_FILE_OBJECT)
+ new_elts[j++].values = FcPatternEltValues(elt);
+ else
+ new_elts[j++].values = new_value_list;
+ }
+
+ new_value_list->next = NULL;
+ new_value_list->value.type = FcTypeString;
+ new_value_list->value.u.s = new_path;
+ new_value_list->binding = FcValueBindingWeak;
+
+ /* Add rewritten path at the end */
+ strcpy ((char *)new_path, (char *)relocated_font_file);
+
+ return new_p;
+}
+
void
FcPatternDestroy (FcPattern *p)
{
@@ -384,21 +449,31 @@ FcPatternDestroy (FcPattern *p)
if (FcRefIsConst (&p->ref))
{
- FcCacheObjectDereference (p);
+ FcCacheObjectDereference (FcPatternGetCacheObject(p));
return;
}
-
+
if (FcRefDec (&p->ref) != 1)
return;
elts = FcPatternElts (p);
- for (i = 0; i < p->num; i++)
+ for (i = 0; i < FcPatternObjectCount (p); i++)
FcValueListDestroy (FcPatternEltValues(&elts[i]));
free (elts);
free (p);
}
+int
+FcPatternObjectCount (const FcPattern *pat)
+{
+ if (pat)
+ return pat->num;
+
+ return 0;
+}
+
+
static int
FcPatternObjectPosition (const FcPattern *p, FcObject object)
{
@@ -406,7 +481,7 @@ FcPatternObjectPosition (const FcPattern *p, FcObject object)
FcPatternElt *elts = FcPatternElts(p);
low = 0;
- high = p->num - 1;
+ high = FcPatternObjectCount (p) - 1;
c = 1;
mid = 0;
while (low <= high)
@@ -452,7 +527,7 @@ FcPatternObjectInsertElt (FcPattern *p, FcObject object)
i = -i - 1;
/* reallocate array */
- if (p->num + 1 >= p->size)
+ if (FcPatternObjectCount (p) + 1 >= p->size)
{
int s = p->size + 16;
if (p->size)
@@ -463,7 +538,7 @@ FcPatternObjectInsertElt (FcPattern *p, FcObject object)
{
e = malloc(s * sizeof (FcPatternElt));
if (e)
- memcpy(e, e0, p->num * sizeof (FcPatternElt));
+ memcpy(e, e0, FcPatternObjectCount (p) * sizeof (FcPatternElt));
}
}
else
@@ -484,7 +559,7 @@ FcPatternObjectInsertElt (FcPattern *p, FcObject object)
memmove (e + i + 1,
e + i,
sizeof (FcPatternElt) *
- (p->num - i));
+ (FcPatternObjectCount (p) - i));
/* bump count */
p->num++;
@@ -499,24 +574,26 @@ FcPatternObjectInsertElt (FcPattern *p, FcObject object)
FcBool
FcPatternEqual (const FcPattern *pa, const FcPattern *pb)
{
- int i;
- FcPatternElt *pae, *pbe;
+ FcPatternIter ia, ib;
if (pa == pb)
return FcTrue;
- if (pa->num != pb->num)
+ if (FcPatternObjectCount (pa) != FcPatternObjectCount (pb))
return FcFalse;
- pae = FcPatternElts(pa);
- pbe = FcPatternElts(pb);
- for (i = 0; i < pa->num; i++)
- {
- if (pae[i].object != pbe[i].object)
- return FcFalse;
- if (!FcValueListEqual (FcPatternEltValues(&pae[i]),
- FcPatternEltValues(&pbe[i])))
+ FcPatternIterStart (pa, &ia);
+ FcPatternIterStart (pb, &ib);
+ do {
+ FcBool ra, rb;
+
+ if (!FcPatternIterEqual (pa, &ia, pb, &ib))
return FcFalse;
- }
+ ra = FcPatternIterNext (pa, &ia);
+ rb = FcPatternIterNext (pb, &ib);
+ if (!ra && !rb)
+ break;
+ } while (1);
+
return FcTrue;
}
@@ -527,7 +604,7 @@ FcPatternHash (const FcPattern *p)
FcChar32 h = 0;
FcPatternElt *pe = FcPatternElts(p);
- for (i = 0; i < p->num; i++)
+ for (i = 0; i < FcPatternObjectCount (p); i++)
{
h = (((h << 1) | (h >> 31)) ^
pe[i].object ^
@@ -713,10 +790,10 @@ FcPatternObjectDel (FcPattern *p, FcObject object)
/* shuffle existing ones down */
memmove (e, e+1,
- (FcPatternElts(p) + p->num - (e + 1)) *
+ (FcPatternElts(p) + FcPatternObjectCount (p) - (e + 1)) *
sizeof (FcPatternElt));
p->num--;
- e = FcPatternElts(p) + p->num;
+ e = FcPatternElts(p) + FcPatternObjectCount (p);
e->object = 0;
e->values = NULL;
return FcTrue;
@@ -1115,8 +1192,7 @@ FcPattern *
FcPatternDuplicate (const FcPattern *orig)
{
FcPattern *new;
- FcPatternElt *e;
- int i;
+ FcPatternIter iter;
FcValueListPtr l;
if (!orig)
@@ -1126,20 +1202,18 @@ FcPatternDuplicate (const FcPattern *orig)
if (!new)
goto bail0;
- e = FcPatternElts(orig);
-
- for (i = 0; i < orig->num; i++)
+ FcPatternIterStart (orig, &iter);
+ do
{
- for (l = FcPatternEltValues(e + i); l; l = FcValueListNext(l))
+ for (l = FcPatternIterGetValues (orig, &iter); l; l = FcValueListNext (l))
{
- if (!FcPatternObjectAddWithBinding (new, e[i].object,
+ if (!FcPatternObjectAddWithBinding (new, FcPatternIterGetObjectId (orig, &iter),
FcValueCanonicalize(&l->value),
l->binding,
FcTrue))
goto bail1;
-
}
- }
+ } while (FcPatternIterNext (orig, &iter));
return new;
@@ -1155,7 +1229,7 @@ FcPatternReference (FcPattern *p)
if (!FcRefIsConst (&p->ref))
FcRefInc (&p->ref);
else
- FcCacheObjectReference (p);
+ FcCacheObjectReference (FcPatternGetCacheObject(p));
}
FcPattern *
@@ -1184,21 +1258,21 @@ FcPatternBuild (FcPattern *p, ...)
FcBool
FcPatternAppend (FcPattern *p, FcPattern *s)
{
- int i;
- FcPatternElt *e;
- FcValueListPtr v;
+ FcPatternIter iter;
+ FcValueListPtr v;
- for (i = 0; i < s->num; i++)
+ FcPatternIterStart (s, &iter);
+ do
{
- e = FcPatternElts(s)+i;
- for (v = FcPatternEltValues(e); v; v = FcValueListNext(v))
+ for (v = FcPatternIterGetValues (s, &iter); v; v = FcValueListNext (v))
{
- if (!FcPatternObjectAddWithBinding (p, e->object,
+ if (!FcPatternObjectAddWithBinding (p, FcPatternIterGetObjectId (s, &iter),
FcValueCanonicalize(&v->value),
v->binding, FcTrue))
return FcFalse;
}
- }
+ } while (FcPatternIterNext (s, &iter));
+
return FcTrue;
}
@@ -1239,6 +1313,148 @@ bail0:
return NULL;
}
+typedef struct _FcPatternPrivateIter {
+ FcPatternElt *elt;
+ int pos;
+} FcPatternPrivateIter;
+
+static void
+FcPatternIterSet (const FcPattern *pat, FcPatternPrivateIter *iter)
+{
+ iter->elt = FcPatternObjectCount (pat) > 0 && iter->pos < FcPatternObjectCount (pat) ? &FcPatternElts (pat)[iter->pos] : NULL;
+}
+
+void
+FcPatternIterStart (const FcPattern *pat, FcPatternIter *iter)
+{
+ FcPatternPrivateIter *priv = (FcPatternPrivateIter *) iter;
+
+ priv->pos = 0;
+ FcPatternIterSet (pat, priv);
+}
+
+FcBool
+FcPatternIterNext (const FcPattern *pat, FcPatternIter *iter)
+{
+ FcPatternPrivateIter *priv = (FcPatternPrivateIter *) iter;
+
+ priv->pos++;
+ if (priv->pos >= FcPatternObjectCount (pat))
+ return FcFalse;
+ FcPatternIterSet (pat, priv);
+
+ return FcTrue;
+}
+
+FcBool
+FcPatternIterEqual (const FcPattern *p1, FcPatternIter *i1,
+ const FcPattern *p2, FcPatternIter *i2)
+{
+ FcBool b1 = FcPatternIterIsValid (p1, i1);
+ FcBool b2 = FcPatternIterIsValid (p2, i2);
+
+ if (!i1 && !i2)
+ return FcTrue;
+ if (!b1 || !b2)
+ return FcFalse;
+ if (FcPatternIterGetObjectId (p1, i1) != FcPatternIterGetObjectId (p2, i2))
+ return FcFalse;
+
+ return FcValueListEqual (FcPatternIterGetValues (p1, i1),
+ FcPatternIterGetValues (p2, i2));
+}
+
+FcBool
+FcPatternFindObjectIter (const FcPattern *pat, FcPatternIter *iter, FcObject object)
+{
+ FcPatternPrivateIter *priv = (FcPatternPrivateIter *) iter;
+ int i = FcPatternObjectPosition (pat, object);
+
+ priv->elt = NULL;
+ if (i < 0)
+ return FcFalse;
+
+ priv->pos = i;
+ FcPatternIterSet (pat, priv);
+
+ return FcTrue;
+}
+
+FcBool
+FcPatternFindIter (const FcPattern *pat, FcPatternIter *iter, const char *object)
+{
+ return FcPatternFindObjectIter (pat, iter, FcObjectFromName (object));
+}
+
+FcBool
+FcPatternIterIsValid (const FcPattern *pat, FcPatternIter *iter)
+{
+ FcPatternPrivateIter *priv = (FcPatternPrivateIter *)iter;
+
+ if (priv && priv->elt)
+ return FcTrue;
+
+ return FcFalse;
+}
+
+FcObject
+FcPatternIterGetObjectId (const FcPattern *pat, FcPatternIter *iter)
+{
+ FcPatternPrivateIter *priv = (FcPatternPrivateIter *) iter;
+
+ if (priv && priv->elt)
+ return priv->elt->object;
+
+ return 0;
+}
+
+const char *
+FcPatternIterGetObject (const FcPattern *pat, FcPatternIter *iter)
+{
+ return FcObjectName (FcPatternIterGetObjectId (pat, iter));
+}
+
+FcValueListPtr
+FcPatternIterGetValues (const FcPattern *pat, FcPatternIter *iter)
+{
+ FcPatternPrivateIter *priv = (FcPatternPrivateIter *) iter;
+
+ if (priv && priv->elt)
+ return FcPatternEltValues (priv->elt);
+
+ return NULL;
+}
+
+int
+FcPatternIterValueCount (const FcPattern *pat, FcPatternIter *iter)
+{
+ int count = 0;
+ FcValueListPtr l;
+
+ for (l = FcPatternIterGetValues (pat, iter); l; l = FcValueListNext (l))
+ count++;
+
+ return count;
+}
+
+FcResult
+FcPatternIterGetValue (const FcPattern *pat, FcPatternIter *iter, int id, FcValue *v, FcValueBinding *b)
+{
+ FcValueListPtr l;
+
+ for (l = FcPatternIterGetValues (pat, iter); l; l = FcValueListNext (l))
+ {
+ if (id == 0)
+ {
+ *v = FcValueCanonicalize (&l->value);
+ if (b)
+ *b = l->binding;
+ return FcResultMatch;
+ }
+ id--;
+ }
+ return FcResultNoId;
+}
FcBool
FcPatternSerializeAlloc (FcSerialize *serialize, const FcPattern *pat)
@@ -1248,9 +1464,9 @@ FcPatternSerializeAlloc (FcSerialize *serialize, const FcPattern *pat)
if (!FcSerializeAlloc (serialize, pat, sizeof (FcPattern)))
return FcFalse;
- if (!FcSerializeAlloc (serialize, elts, pat->num * sizeof (FcPatternElt)))
+ if (!FcSerializeAlloc (serialize, elts, FcPatternObjectCount (pat) * sizeof (FcPatternElt)))
return FcFalse;
- for (i = 0; i < pat->num; i++)
+ for (i = 0; i < FcPatternObjectCount (pat); i++)
if (!FcValueListSerializeAlloc (serialize, FcPatternEltValues(elts+i)))
return FcFalse;
return FcTrue;
@@ -1269,7 +1485,7 @@ FcPatternSerialize (FcSerialize *serialize, const FcPattern *pat)
if (!pat_serialized)
return NULL;
*pat_serialized = *pat;
- pat_serialized->size = pat->num;
+ pat_serialized->size = FcPatternObjectCount (pat);
FcRefSetConst (&pat_serialized->ref);
elts_serialized = FcSerializePtr (serialize, elts);
@@ -1279,7 +1495,7 @@ FcPatternSerialize (FcSerialize *serialize, const FcPattern *pat)
pat_serialized->elts_offset = FcPtrToOffset (pat_serialized,
elts_serialized);
- for (i = 0; i < pat->num; i++)
+ for (i = 0; i < FcPatternObjectCount (pat); i++)
{
values_serialized = FcValueListSerialize (serialize, FcPatternEltValues (elts+i));
if (!values_serialized)
diff --git a/src/fcptrlist.c b/src/fcptrlist.c
index a0688dda..bb888328 100644
--- a/src/fcptrlist.c
+++ b/src/fcptrlist.c
@@ -143,6 +143,8 @@ FcPtrListIterAdd (FcPtrList *list,
return FcFalse;
e = (FcPtrListEntry *) malloc (sizeof (FcPtrListEntry));
+ if (!e)
+ return FcFalse;
e->data = data;
if (priv->entry)
diff --git a/src/fcstat.c b/src/fcstat.c
index f6e1aaab..5aa16434 100644
--- a/src/fcstat.c
+++ b/src/fcstat.c
@@ -218,6 +218,14 @@ FcScandir (const char *dirp,
size_t dentlen = FcPtrToOffset (dent, dent->d_name) + strlen (dent->d_name) + 1;
dentlen = ((dentlen + ALIGNOF_VOID_P - 1) & ~(ALIGNOF_VOID_P - 1));
p = (struct dirent *) malloc (dentlen);
+ if (!p)
+ {
+ free_dirent (dlist);
+ closedir (d);
+ errno = ENOMEM;
+
+ return -1;
+ }
memcpy (p, dent, dentlen);
if ((n + 1) >= lsize)
{
@@ -225,6 +233,7 @@ FcScandir (const char *dirp,
dlp = (struct dirent **) realloc (dlist, sizeof (struct dirent *) * lsize);
if (!dlp)
{
+ free (p);
free_dirent (dlist);
closedir (d);
errno = ENOMEM;
diff --git a/src/fcstdint.h b/src/fcstdint.h
index 8fac49a9..72a0c797 100644
--- a/src/fcstdint.h
+++ b/src/fcstdint.h
@@ -1,8 +1,8 @@
#ifndef _FONTCONFIG_SRC_FCSTDINT_H
#define _FONTCONFIG_SRC_FCSTDINT_H 1
#ifndef _GENERATED_STDINT_H
-#define _GENERATED_STDINT_H "fontconfig 2.13.0"
-/* generated using gnu compiler gcc (GCC) 7.3.1 20180130 (Red Hat 7.3.1-2) */
+#define _GENERATED_STDINT_H "fontconfig 2.13.1"
+/* generated using gnu compiler gcc (GCC) 8.2.1 20180801 (Red Hat 8.2.1-2) */
#define _STDINT_HAVE_STDINT_H 1
#include <stdint.h>
#endif
diff --git a/src/fcstr.c b/src/fcstr.c
index b65492d8..4247c85f 100644
--- a/src/fcstr.c
+++ b/src/fcstr.c
@@ -867,6 +867,17 @@ FcStrUsesHome (const FcChar8 *s)
return *s == '~';
}
+FcBool
+FcStrIsAbsoluteFilename (const FcChar8 *s)
+{
+#ifdef _WIN32
+ if (*s == '\\' ||
+ (isalpha (*s) && s[1] == ':' && (s[2] == '/' || s[2] == '\\')))
+ return FcTrue;
+#endif
+ return *s == '/';
+}
+
FcChar8 *
FcStrBuildFilename (const FcChar8 *path,
...)
@@ -942,7 +953,7 @@ FcStrCopyFilename (const FcChar8 *s)
if (!home)
return NULL;
size = strlen ((char *) home) + strlen ((char *) s);
- full = (FcChar8 *) malloc (size);
+ full = (FcChar8 *) malloc (size + 1);
if (!full)
return NULL;
strcpy ((char *) full, (char *) home);
diff --git a/src/fcxml.c b/src/fcxml.c
index 7c8aaac4..77975028 100644
--- a/src/fcxml.c
+++ b/src/fcxml.c
@@ -22,6 +22,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#include <string.h>
#include "fcint.h"
#include <fcntl.h>
#include <stdarg.h>
@@ -645,7 +646,6 @@ FcTypecheckValue (FcConfigParse *parse, FcType value, FcType type)
{
if ((value == FcTypeLangSet && type == FcTypeString) ||
(value == FcTypeString && type == FcTypeLangSet) ||
- (value == FcTypeInteger && type == FcTypeRange) ||
(value == FcTypeDouble && type == FcTypeRange))
return;
if (type == FcTypeUnknown)
@@ -1834,6 +1834,8 @@ FcParseAlias (FcConfigParse *parse)
!def)
{
FcExprDestroy (family);
+ if (rule)
+ FcRuleDestroy (rule);
return;
}
else
@@ -2186,6 +2188,7 @@ FcParseCacheDir (FcConfigParse *parse)
if (!data)
{
FcConfigMessage (parse, FcSevereError, "out of memory");
+ data = prefix;
goto bail;
}
if (prefix)
@@ -2197,7 +2200,7 @@ FcParseCacheDir (FcConfigParse *parse)
if (!p)
{
FcConfigMessage (parse, FcSevereError, "out of memory");
- data = prefix;
+ FcStrFree (prefix);
goto bail;
}
prefix = p;
@@ -2229,6 +2232,7 @@ FcParseCacheDir (FcConfigParse *parse)
else if (strcmp ((const char *) data, "WINDOWSTEMPDIR_FONTCONFIG_CACHE") == 0)
{
int rc;
+
FcStrFree (data);
data = malloc (1000);
if (!data)
@@ -2773,6 +2777,14 @@ FcParseAcceptRejectFont (FcConfigParse *parse, FcElement element)
{
FcConfigMessage (parse, FcSevereError, "out of memory");
}
+ else
+ {
+ if (parse->scanOnly && vstack->u.string)
+ {
+ FcStrFree (vstack->u.string);
+ vstack->tag = FcVStackNone;
+ }
+ }
break;
case FcVStackPattern:
if (!parse->scanOnly && !FcConfigPatternsAdd (parse->config,
@@ -2782,7 +2794,11 @@ FcParseAcceptRejectFont (FcConfigParse *parse, FcElement element)
FcConfigMessage (parse, FcSevereError, "out of memory");
}
else
+ {
+ if (parse->scanOnly && vstack->u.pattern)
+ FcPatternDestroy (vstack->u.pattern);
vstack->tag = FcVStackNone;
+ }
break;
default:
FcConfigMessage (parse, FcSevereWarning, "bad font selector");
@@ -3443,7 +3459,7 @@ _FcConfigParse (FcConfig *config,
FcStrBufInit (&sbuf, NULL, 0);
- fd = FcOpen ((char *) filename, O_RDONLY);
+ fd = FcOpen ((char *) realfilename, O_RDONLY);
if (fd == -1)
goto bail1;
@@ -3451,7 +3467,20 @@ _FcConfigParse (FcConfig *config,
len = read (fd, buf, BUFSIZ);
if (len < 0)
{
- FcConfigMessage (0, FcSevereError, "failed reading config file");
+ int errno_ = errno;
+ char ebuf[BUFSIZ+1];
+
+#if HAVE_STRERROR_R
+ strerror_r (errno_, ebuf, BUFSIZ);
+#elif HAVE_STRERROR
+ char *tmp = strerror (errno_);
+ size_t len = strlen (tmp);
+ strncpy (ebuf, tmp, FC_MIN (BUFSIZ, len));
+ ebuf[FC_MIN (BUFSIZ, len)] = 0;
+#else
+ ebuf[0] = 0;
+#endif
+ FcConfigMessage (0, FcSevereError, "failed reading config file: %s: %s (errno %d)", realfilename, ebuf, errno_);
close (fd);
goto bail1;
}
diff --git a/test-driver b/test-driver
index 0218a01f..b8521a48 100755
--- a/test-driver
+++ b/test-driver
@@ -1,9 +1,9 @@
#! /bin/sh
# test-driver - basic testsuite driver script.
-scriptversion=2016-01-11.22; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 2011-2017 Free Software Foundation, Inc.
+# Copyright (C) 2011-2018 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@ scriptversion=2016-01-11.22; # UTC
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -140,7 +140,7 @@ echo ":copy-in-global-log: $gcopy" >> $trs_file
# Local Variables:
# mode: shell-script
# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC0"
diff --git a/test/Makefile.am b/test/Makefile.am
index 75e326cf..79bcedea 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -8,19 +8,24 @@ AM_TESTS_ENVIRONMENT= \
EXEEXT=${EXEEXT}; export EXEEXT; \
$(NULL)
-BUILT_SOURCES = out.expected
+BUILT_SOURCES = $(builddir)/out.expected
SH_LOG_COMPILER = sh
TESTS=run-test.sh
-TESTDATA=4x6.pcf 8x16.pcf out.expected fonts.conf.in
+TESTDATA = \
+ 4x6.pcf \
+ 8x16.pcf \
+ fonts.conf.in \
+ test-90-synthetic.json \
+ $(NULL)
if FREETYPE_PCF_LONG_FAMILY_NAMES
-$(srcdir)/out.expected: $(srcdir)/out.expected-long-family-names
- cp $(srcdir)/out.expected-long-family-names $(srcdir)/out.expected
+$(builddir)/out.expected: $(srcdir)/out.expected-long-family-names Makefile
+ cp $(srcdir)/out.expected-long-family-names $(builddir)/out.expected
else
-$(srcdir)/out.expected: $(srcdir)/out.expected-no-long-family-names
- cp $(srcdir)/out.expected-no-long-family-names $(srcdir)/out.expected
+$(builddir)/out.expected: $(srcdir)/out.expected-no-long-family-names Makefile
+ cp $(srcdir)/out.expected-no-long-family-names $(builddir)/out.expected
endif
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
@@ -55,10 +60,39 @@ check_PROGRAMS += test-bz96676
test_bz96676_LDADD = $(top_builddir)/src/libfontconfig.la
TESTS += test-bz96676
-EXTRA_DIST=run-test.sh $(TESTDATA) out.expected-long-family-names out.expected-no-long-family-names
+check_PROGRAMS += test-name-parse
+test_name_parse_LDADD = $(top_builddir)/src/libfontconfig.la
+TESTS += test-name-parse
+
+if ENABLE_JSONC
+check_PROGRAMS += test-conf
+test_conf_CFLAGS = $(JSONC_CFLAGS)
+test_conf_LDADD = $(top_builddir)/src/libfontconfig.la $(JSONC_LIBS)
+TESTS += run-test-conf.sh
+endif
+
+check_PROGRAMS += test-bz106618
+test_bz106618_LDADD = $(top_builddir)/src/libfontconfig.la
+
+check_PROGRAMS += test-hash
+test_hash_CFLAGS = -I$(top_builddir) -I$(top_builddir)/src $(UUID_CFLAGS)
+test_hash_LDADD = $(UUID_LIBS)
+TESTS += test-hash
+
+check_PROGRAMS += test-bz106632
+test_bz106632_CFLAGS = \
+ -I$(top_builddir) \
+ -I$(top_builddir)/src \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/src \
+ -DFONTFILE='"$(abs_top_srcdir)/test/4x6.pcf"' \
+ -DHAVE_CONFIG_H \
+ $(NULL)
+test_bz106632_LDADD = $(top_builddir)/src/libfontconfig.la
+TESTS += test-bz106632
-CLEANFILES=out fonts.conf
+EXTRA_DIST=run-test.sh run-test-conf.sh $(TESTDATA) out.expected-long-family-names out.expected-no-long-family-names
-MAINTAINERCLEANFILES=out.expected
+CLEANFILES=out out1 out2 fonts.conf out.expected
-include $(top_srcdir)/git.mk
diff --git a/test/Makefile.in b/test/Makefile.in
index 7ed1c780..013abb45 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -89,11 +89,17 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
TESTS = run-test.sh test-bz89617$(EXEEXT) test-bz131804$(EXEEXT) \
- test-bz96676$(EXEEXT)
+ test-bz96676$(EXEEXT) test-name-parse$(EXEEXT) $(am__append_4) \
+ test-hash$(EXEEXT) test-bz106632$(EXEEXT)
check_PROGRAMS = $(am__EXEEXT_1) test-bz89617$(EXEEXT) \
- test-bz131804$(EXEEXT) $(am__EXEEXT_2) test-bz96676$(EXEEXT)
+ test-bz131804$(EXEEXT) $(am__EXEEXT_2) test-bz96676$(EXEEXT) \
+ test-name-parse$(EXEEXT) $(am__EXEEXT_3) \
+ test-bz106618$(EXEEXT) test-hash$(EXEEXT) \
+ test-bz106632$(EXEEXT)
@HAVE_PTHREAD_TRUE@am__append_1 = test-pthread
@OS_WIN32_FALSE@am__append_2 = test-migration
+@ENABLE_JSONC_TRUE@am__append_3 = test-conf
+@ENABLE_JSONC_TRUE@am__append_4 = run-test-conf.sh
subdir = test
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_symbol.m4 \
@@ -117,14 +123,24 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@HAVE_PTHREAD_TRUE@am__EXEEXT_1 = test-pthread$(EXEEXT)
@OS_WIN32_FALSE@am__EXEEXT_2 = test-migration$(EXEEXT)
+@ENABLE_JSONC_TRUE@am__EXEEXT_3 = test-conf$(EXEEXT)
PROGRAMS = $(noinst_PROGRAMS)
-test_bz131804_SOURCES = test-bz131804.c
-test_bz131804_OBJECTS = test-bz131804.$(OBJEXT)
-test_bz131804_DEPENDENCIES = $(top_builddir)/src/libfontconfig.la
+test_bz106618_SOURCES = test-bz106618.c
+test_bz106618_OBJECTS = test-bz106618.$(OBJEXT)
+test_bz106618_DEPENDENCIES = $(top_builddir)/src/libfontconfig.la
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
+test_bz106632_SOURCES = test-bz106632.c
+test_bz106632_OBJECTS = test_bz106632-test-bz106632.$(OBJEXT)
+test_bz106632_DEPENDENCIES = $(top_builddir)/src/libfontconfig.la
+test_bz106632_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_bz106632_CFLAGS) \
+ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+test_bz131804_SOURCES = test-bz131804.c
+test_bz131804_OBJECTS = test-bz131804.$(OBJEXT)
+test_bz131804_DEPENDENCIES = $(top_builddir)/src/libfontconfig.la
test_bz89617_SOURCES = test-bz89617.c
test_bz89617_OBJECTS = test_bz89617-test-bz89617.$(OBJEXT)
test_bz89617_DEPENDENCIES = $(top_builddir)/src/libfontconfig.la
@@ -134,10 +150,28 @@ test_bz89617_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
test_bz96676_SOURCES = test-bz96676.c
test_bz96676_OBJECTS = test-bz96676.$(OBJEXT)
test_bz96676_DEPENDENCIES = $(top_builddir)/src/libfontconfig.la
+test_conf_SOURCES = test-conf.c
+test_conf_OBJECTS = test_conf-test-conf.$(OBJEXT)
+am__DEPENDENCIES_1 =
+@ENABLE_JSONC_TRUE@test_conf_DEPENDENCIES = \
+@ENABLE_JSONC_TRUE@ $(top_builddir)/src/libfontconfig.la \
+@ENABLE_JSONC_TRUE@ $(am__DEPENDENCIES_1)
+test_conf_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_conf_CFLAGS) \
+ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+test_hash_SOURCES = test-hash.c
+test_hash_OBJECTS = test_hash-test-hash.$(OBJEXT)
+test_hash_DEPENDENCIES = $(am__DEPENDENCIES_1)
+test_hash_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_hash_CFLAGS) \
+ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
test_migration_SOURCES = test-migration.c
test_migration_OBJECTS = test-migration.$(OBJEXT)
@OS_WIN32_FALSE@test_migration_DEPENDENCIES = \
@OS_WIN32_FALSE@ $(top_builddir)/src/libfontconfig.la
+test_name_parse_SOURCES = test-name-parse.c
+test_name_parse_OBJECTS = test-name-parse.$(OBJEXT)
+test_name_parse_DEPENDENCIES = $(top_builddir)/src/libfontconfig.la
test_pthread_SOURCES = test-pthread.c
test_pthread_OBJECTS = test-pthread.$(OBJEXT)
@HAVE_PTHREAD_TRUE@test_pthread_DEPENDENCIES = \
@@ -156,7 +190,15 @@ am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/test-bz106618.Po \
+ ./$(DEPDIR)/test-bz131804.Po ./$(DEPDIR)/test-bz96676.Po \
+ ./$(DEPDIR)/test-migration.Po ./$(DEPDIR)/test-name-parse.Po \
+ ./$(DEPDIR)/test-pthread.Po \
+ ./$(DEPDIR)/test_bz106632-test-bz106632.Po \
+ ./$(DEPDIR)/test_bz89617-test-bz89617.Po \
+ ./$(DEPDIR)/test_conf-test-conf.Po \
+ ./$(DEPDIR)/test_hash-test-hash.Po
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -176,10 +218,12 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
-SOURCES = test-bz131804.c test-bz89617.c test-bz96676.c \
- test-migration.c test-pthread.c
-DIST_SOURCES = test-bz131804.c test-bz89617.c test-bz96676.c \
- test-migration.c test-pthread.c
+SOURCES = test-bz106618.c test-bz106632.c test-bz131804.c \
+ test-bz89617.c test-bz96676.c test-conf.c test-hash.c \
+ test-migration.c test-name-parse.c test-pthread.c
+DIST_SOURCES = test-bz106618.c test-bz106632.c test-bz131804.c \
+ test-bz89617.c test-bz96676.c test-conf.c test-hash.c \
+ test-migration.c test-name-parse.c test-pthread.c
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -467,6 +511,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JSONC_CFLAGS = @JSONC_CFLAGS@
+JSONC_LIBS = @JSONC_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -600,9 +646,15 @@ AM_TESTS_ENVIRONMENT = \
EXEEXT=${EXEEXT}; export EXEEXT; \
$(NULL)
-BUILT_SOURCES = out.expected
+BUILT_SOURCES = $(builddir)/out.expected
SH_LOG_COMPILER = sh
-TESTDATA = 4x6.pcf 8x16.pcf out.expected fonts.conf.in
+TESTDATA = \
+ 4x6.pcf \
+ 8x16.pcf \
+ fonts.conf.in \
+ test-90-synthetic.json \
+ $(NULL)
+
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
@HAVE_PTHREAD_TRUE@test_pthread_LDADD = $(top_builddir)/src/libfontconfig.la
test_bz89617_CFLAGS = \
@@ -613,9 +665,24 @@ test_bz131804_LDADD = $(top_builddir)/src/libfontconfig.la
noinst_PROGRAMS = $(check_PROGRAMS)
@OS_WIN32_FALSE@test_migration_LDADD = $(top_builddir)/src/libfontconfig.la
test_bz96676_LDADD = $(top_builddir)/src/libfontconfig.la
-EXTRA_DIST = run-test.sh $(TESTDATA) out.expected-long-family-names out.expected-no-long-family-names
-CLEANFILES = out fonts.conf
-MAINTAINERCLEANFILES = out.expected
+test_name_parse_LDADD = $(top_builddir)/src/libfontconfig.la
+@ENABLE_JSONC_TRUE@test_conf_CFLAGS = $(JSONC_CFLAGS)
+@ENABLE_JSONC_TRUE@test_conf_LDADD = $(top_builddir)/src/libfontconfig.la $(JSONC_LIBS)
+test_bz106618_LDADD = $(top_builddir)/src/libfontconfig.la
+test_hash_CFLAGS = -I$(top_builddir) -I$(top_builddir)/src $(UUID_CFLAGS)
+test_hash_LDADD = $(UUID_LIBS)
+test_bz106632_CFLAGS = \
+ -I$(top_builddir) \
+ -I$(top_builddir)/src \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/src \
+ -DFONTFILE='"$(abs_top_srcdir)/test/4x6.pcf"' \
+ -DHAVE_CONFIG_H \
+ $(NULL)
+
+test_bz106632_LDADD = $(top_builddir)/src/libfontconfig.la
+EXTRA_DIST = run-test.sh run-test-conf.sh $(TESTDATA) out.expected-long-family-names out.expected-no-long-family-names
+CLEANFILES = out out1 out2 fonts.conf out.expected
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -638,8 +705,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -669,6 +736,14 @@ clean-noinstPROGRAMS:
echo " rm -f" $$list; \
rm -f $$list
+test-bz106618$(EXEEXT): $(test_bz106618_OBJECTS) $(test_bz106618_DEPENDENCIES) $(EXTRA_test_bz106618_DEPENDENCIES)
+ @rm -f test-bz106618$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(test_bz106618_OBJECTS) $(test_bz106618_LDADD) $(LIBS)
+
+test-bz106632$(EXEEXT): $(test_bz106632_OBJECTS) $(test_bz106632_DEPENDENCIES) $(EXTRA_test_bz106632_DEPENDENCIES)
+ @rm -f test-bz106632$(EXEEXT)
+ $(AM_V_CCLD)$(test_bz106632_LINK) $(test_bz106632_OBJECTS) $(test_bz106632_LDADD) $(LIBS)
+
test-bz131804$(EXEEXT): $(test_bz131804_OBJECTS) $(test_bz131804_DEPENDENCIES) $(EXTRA_test_bz131804_DEPENDENCIES)
@rm -f test-bz131804$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(test_bz131804_OBJECTS) $(test_bz131804_LDADD) $(LIBS)
@@ -681,10 +756,22 @@ test-bz96676$(EXEEXT): $(test_bz96676_OBJECTS) $(test_bz96676_DEPENDENCIES) $(EX
@rm -f test-bz96676$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(test_bz96676_OBJECTS) $(test_bz96676_LDADD) $(LIBS)
+test-conf$(EXEEXT): $(test_conf_OBJECTS) $(test_conf_DEPENDENCIES) $(EXTRA_test_conf_DEPENDENCIES)
+ @rm -f test-conf$(EXEEXT)
+ $(AM_V_CCLD)$(test_conf_LINK) $(test_conf_OBJECTS) $(test_conf_LDADD) $(LIBS)
+
+test-hash$(EXEEXT): $(test_hash_OBJECTS) $(test_hash_DEPENDENCIES) $(EXTRA_test_hash_DEPENDENCIES)
+ @rm -f test-hash$(EXEEXT)
+ $(AM_V_CCLD)$(test_hash_LINK) $(test_hash_OBJECTS) $(test_hash_LDADD) $(LIBS)
+
test-migration$(EXEEXT): $(test_migration_OBJECTS) $(test_migration_DEPENDENCIES) $(EXTRA_test_migration_DEPENDENCIES)
@rm -f test-migration$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(test_migration_OBJECTS) $(test_migration_LDADD) $(LIBS)
+test-name-parse$(EXEEXT): $(test_name_parse_OBJECTS) $(test_name_parse_DEPENDENCIES) $(EXTRA_test_name_parse_DEPENDENCIES)
+ @rm -f test-name-parse$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(test_name_parse_OBJECTS) $(test_name_parse_LDADD) $(LIBS)
+
test-pthread$(EXEEXT): $(test_pthread_OBJECTS) $(test_pthread_DEPENDENCIES) $(EXTRA_test_pthread_DEPENDENCIES)
@rm -f test-pthread$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(test_pthread_OBJECTS) $(test_pthread_LDADD) $(LIBS)
@@ -695,11 +782,22 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-bz131804.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-bz96676.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-migration.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-pthread.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_bz89617-test-bz89617.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-bz106618.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-bz131804.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-bz96676.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-migration.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-name-parse.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-pthread.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_bz106632-test-bz106632.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_bz89617-test-bz89617.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conf-test-conf.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_hash-test-hash.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -722,6 +820,20 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+test_bz106632-test-bz106632.o: test-bz106632.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_bz106632_CFLAGS) $(CFLAGS) -MT test_bz106632-test-bz106632.o -MD -MP -MF $(DEPDIR)/test_bz106632-test-bz106632.Tpo -c -o test_bz106632-test-bz106632.o `test -f 'test-bz106632.c' || echo '$(srcdir)/'`test-bz106632.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_bz106632-test-bz106632.Tpo $(DEPDIR)/test_bz106632-test-bz106632.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test-bz106632.c' object='test_bz106632-test-bz106632.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_bz106632_CFLAGS) $(CFLAGS) -c -o test_bz106632-test-bz106632.o `test -f 'test-bz106632.c' || echo '$(srcdir)/'`test-bz106632.c
+
+test_bz106632-test-bz106632.obj: test-bz106632.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_bz106632_CFLAGS) $(CFLAGS) -MT test_bz106632-test-bz106632.obj -MD -MP -MF $(DEPDIR)/test_bz106632-test-bz106632.Tpo -c -o test_bz106632-test-bz106632.obj `if test -f 'test-bz106632.c'; then $(CYGPATH_W) 'test-bz106632.c'; else $(CYGPATH_W) '$(srcdir)/test-bz106632.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_bz106632-test-bz106632.Tpo $(DEPDIR)/test_bz106632-test-bz106632.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test-bz106632.c' object='test_bz106632-test-bz106632.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_bz106632_CFLAGS) $(CFLAGS) -c -o test_bz106632-test-bz106632.obj `if test -f 'test-bz106632.c'; then $(CYGPATH_W) 'test-bz106632.c'; else $(CYGPATH_W) '$(srcdir)/test-bz106632.c'; fi`
+
test_bz89617-test-bz89617.o: test-bz89617.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_bz89617_CFLAGS) $(CFLAGS) -MT test_bz89617-test-bz89617.o -MD -MP -MF $(DEPDIR)/test_bz89617-test-bz89617.Tpo -c -o test_bz89617-test-bz89617.o `test -f 'test-bz89617.c' || echo '$(srcdir)/'`test-bz89617.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_bz89617-test-bz89617.Tpo $(DEPDIR)/test_bz89617-test-bz89617.Po
@@ -736,6 +848,34 @@ test_bz89617-test-bz89617.obj: test-bz89617.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_bz89617_CFLAGS) $(CFLAGS) -c -o test_bz89617-test-bz89617.obj `if test -f 'test-bz89617.c'; then $(CYGPATH_W) 'test-bz89617.c'; else $(CYGPATH_W) '$(srcdir)/test-bz89617.c'; fi`
+test_conf-test-conf.o: test-conf.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_conf_CFLAGS) $(CFLAGS) -MT test_conf-test-conf.o -MD -MP -MF $(DEPDIR)/test_conf-test-conf.Tpo -c -o test_conf-test-conf.o `test -f 'test-conf.c' || echo '$(srcdir)/'`test-conf.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_conf-test-conf.Tpo $(DEPDIR)/test_conf-test-conf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test-conf.c' object='test_conf-test-conf.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_conf_CFLAGS) $(CFLAGS) -c -o test_conf-test-conf.o `test -f 'test-conf.c' || echo '$(srcdir)/'`test-conf.c
+
+test_conf-test-conf.obj: test-conf.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_conf_CFLAGS) $(CFLAGS) -MT test_conf-test-conf.obj -MD -MP -MF $(DEPDIR)/test_conf-test-conf.Tpo -c -o test_conf-test-conf.obj `if test -f 'test-conf.c'; then $(CYGPATH_W) 'test-conf.c'; else $(CYGPATH_W) '$(srcdir)/test-conf.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_conf-test-conf.Tpo $(DEPDIR)/test_conf-test-conf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test-conf.c' object='test_conf-test-conf.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_conf_CFLAGS) $(CFLAGS) -c -o test_conf-test-conf.obj `if test -f 'test-conf.c'; then $(CYGPATH_W) 'test-conf.c'; else $(CYGPATH_W) '$(srcdir)/test-conf.c'; fi`
+
+test_hash-test-hash.o: test-hash.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_hash_CFLAGS) $(CFLAGS) -MT test_hash-test-hash.o -MD -MP -MF $(DEPDIR)/test_hash-test-hash.Tpo -c -o test_hash-test-hash.o `test -f 'test-hash.c' || echo '$(srcdir)/'`test-hash.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_hash-test-hash.Tpo $(DEPDIR)/test_hash-test-hash.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test-hash.c' object='test_hash-test-hash.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_hash_CFLAGS) $(CFLAGS) -c -o test_hash-test-hash.o `test -f 'test-hash.c' || echo '$(srcdir)/'`test-hash.c
+
+test_hash-test-hash.obj: test-hash.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_hash_CFLAGS) $(CFLAGS) -MT test_hash-test-hash.obj -MD -MP -MF $(DEPDIR)/test_hash-test-hash.Tpo -c -o test_hash-test-hash.obj `if test -f 'test-hash.c'; then $(CYGPATH_W) 'test-hash.c'; else $(CYGPATH_W) '$(srcdir)/test-hash.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_hash-test-hash.Tpo $(DEPDIR)/test_hash-test-hash.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test-hash.c' object='test_hash-test-hash.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_hash_CFLAGS) $(CFLAGS) -c -o test_hash-test-hash.obj `if test -f 'test-hash.c'; then $(CYGPATH_W) 'test-hash.c'; else $(CYGPATH_W) '$(srcdir)/test-hash.c'; fi`
+
mostlyclean-libtool:
-rm -f *.lo
@@ -914,7 +1054,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
fi; \
$$success || exit 1
-check-TESTS:
+check-TESTS: $(check_PROGRAMS) $(check_SCRIPTS)
@list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@@ -956,6 +1096,27 @@ test-bz96676.log: test-bz96676$(EXEEXT)
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-name-parse.log: test-name-parse$(EXEEXT)
+ @p='test-name-parse$(EXEEXT)'; \
+ b='test-name-parse'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+test-hash.log: test-hash$(EXEEXT)
+ @p='test-hash$(EXEEXT)'; \
+ b='test-hash'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+test-bz106632.log: test-bz106632$(EXEEXT)
+ @p='test-bz106632$(EXEEXT)'; \
+ b='test-bz106632'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
.sh.log:
@p='$<'; \
$(am__set_b); \
@@ -971,7 +1132,10 @@ test-bz96676.log: test-bz96676$(EXEEXT)
@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \
@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT)
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -1044,14 +1208,22 @@ maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-am
clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
clean-noinstPROGRAMS mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/test-bz106618.Po
+ -rm -f ./$(DEPDIR)/test-bz131804.Po
+ -rm -f ./$(DEPDIR)/test-bz96676.Po
+ -rm -f ./$(DEPDIR)/test-migration.Po
+ -rm -f ./$(DEPDIR)/test-name-parse.Po
+ -rm -f ./$(DEPDIR)/test-pthread.Po
+ -rm -f ./$(DEPDIR)/test_bz106632-test-bz106632.Po
+ -rm -f ./$(DEPDIR)/test_bz89617-test-bz89617.Po
+ -rm -f ./$(DEPDIR)/test_conf-test-conf.Po
+ -rm -f ./$(DEPDIR)/test_hash-test-hash.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -1097,7 +1269,16 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/test-bz106618.Po
+ -rm -f ./$(DEPDIR)/test-bz131804.Po
+ -rm -f ./$(DEPDIR)/test-bz96676.Po
+ -rm -f ./$(DEPDIR)/test-migration.Po
+ -rm -f ./$(DEPDIR)/test-name-parse.Po
+ -rm -f ./$(DEPDIR)/test-pthread.Po
+ -rm -f ./$(DEPDIR)/test_bz106632-test-bz106632.Po
+ -rm -f ./$(DEPDIR)/test_bz89617-test-bz89617.Po
+ -rm -f ./$(DEPDIR)/test_conf-test-conf.Po
+ -rm -f ./$(DEPDIR)/test_hash-test-hash.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -1118,8 +1299,8 @@ uninstall-am:
.MAKE: all check check-am install install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
- clean-checkPROGRAMS clean-generic clean-libtool \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-TESTS \
+ check-am clean clean-checkPROGRAMS clean-generic clean-libtool \
clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
@@ -1136,10 +1317,10 @@ uninstall-am:
.PRECIOUS: Makefile
-@FREETYPE_PCF_LONG_FAMILY_NAMES_TRUE@$(srcdir)/out.expected: $(srcdir)/out.expected-long-family-names
-@FREETYPE_PCF_LONG_FAMILY_NAMES_TRUE@ cp $(srcdir)/out.expected-long-family-names $(srcdir)/out.expected
-@FREETYPE_PCF_LONG_FAMILY_NAMES_FALSE@$(srcdir)/out.expected: $(srcdir)/out.expected-no-long-family-names
-@FREETYPE_PCF_LONG_FAMILY_NAMES_FALSE@ cp $(srcdir)/out.expected-no-long-family-names $(srcdir)/out.expected
+@FREETYPE_PCF_LONG_FAMILY_NAMES_TRUE@$(builddir)/out.expected: $(srcdir)/out.expected-long-family-names Makefile
+@FREETYPE_PCF_LONG_FAMILY_NAMES_TRUE@ cp $(srcdir)/out.expected-long-family-names $(builddir)/out.expected
+@FREETYPE_PCF_LONG_FAMILY_NAMES_FALSE@$(builddir)/out.expected: $(srcdir)/out.expected-no-long-family-names Makefile
+@FREETYPE_PCF_LONG_FAMILY_NAMES_FALSE@ cp $(srcdir)/out.expected-no-long-family-names $(builddir)/out.expected
-include $(top_srcdir)/git.mk
diff --git a/test/out.expected b/test/out.expected
deleted file mode 100644
index 39634c50..00000000
--- a/test/out.expected
+++ /dev/null
@@ -1,8 +0,0 @@
-Fixed:pixelsize=16
-Fixed:pixelsize=6
-=
-Fixed:pixelsize=16
-Fixed:pixelsize=6
-=
-Fixed:pixelsize=16
-Fixed:pixelsize=6
diff --git a/test/run-test-conf.sh b/test/run-test-conf.sh
new file mode 100644
index 00000000..4bcc29cd
--- /dev/null
+++ b/test/run-test-conf.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+# test/run-test-conf.sh
+#
+# Copyright © 2000 Keith Packard
+# Copyright © 2018 Akira TAGOH
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of the author(s) not be used in
+# advertising or publicity pertaining to distribution of the software without
+# specific, written prior permission. The authors make no
+# representations about the suitability of this software for any purpose. It
+# is provided "as is" without express or implied warranty.
+#
+# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+set -eu
+
+case "$OSTYPE" in
+ msys ) MyPWD=`pwd -W` ;; # On Msys/MinGW, returns a MS Windows style path.
+ * ) MyPWD=`pwd` ;; # On any other platforms, returns a Unix style path.
+esac
+
+TESTDIR=${srcdir-"$MyPWD"}
+BUILDTESTDIR=${builddir-"$MyPWD"}
+
+RUNNER=../test/test-conf$EXEEXT
+
+$RUNNER $TESTDIR/../conf.d/90-synthetic.conf $TESTDIR/test-90-synthetic.json
diff --git a/test/run-test.sh b/test/run-test.sh
index 436dee17..e76e39bd 100644
--- a/test/run-test.sh
+++ b/test/run-test.sh
@@ -26,6 +26,7 @@ case "$OSTYPE" in
esac
TESTDIR=${srcdir-"$MyPWD"}
+BUILDTESTDIR=${builddir-"$MyPWD"}
FONTDIR="$MyPWD"/fonts
CACHEDIR="$MyPWD"/cache.dir
@@ -51,12 +52,12 @@ check () {
echo "=" >> out
$FCLIST - family pixelsize | sort >> out
tr -d '\015' <out >out.tmp; mv out.tmp out
- if cmp out $TESTDIR/$EXPECTED > /dev/null ; then : ; else
+ if cmp out $BUILDTESTDIR/$EXPECTED > /dev/null ; then : ; else
echo "*** Test failed: $TEST"
echo "*** output is in 'out', expected output in '$EXPECTED'"
exit 1
fi
- rm out
+ rm -f out
}
prep() {
@@ -140,7 +141,7 @@ if cmp out1 out2 > /dev/null ; then
echo "*** .uuid wasn't modified"
exit 1
fi
-rm out1 out2
+rm -f out1 out2
dotest "Consistency between .uuid and cache name"
prep
@@ -188,6 +189,8 @@ TESTTMPDIR=`mktemp -d /tmp/fontconfig.XXXXXXXX`
sed "s!@FONTDIR@!$TESTTMPDIR/fonts!
s!@CACHEDIR@!$TESTTMPDIR/cache.dir!" < $TESTDIR/fonts.conf.in > bind-fonts.conf
$BWRAP --bind / / --bind $CACHEDIR $TESTTMPDIR/cache.dir --bind $FONTDIR $TESTTMPDIR/fonts --bind .. $TESTTMPDIR/build --dev-bind /dev /dev --setenv FONTCONFIG_FILE $TESTTMPDIR/build/test/bind-fonts.conf $TESTTMPDIR/build/fc-match/fc-match$EXEEXT -f "%{file}\n" ":foundry=Misc" > xxx
+$BWRAP --bind / / --bind $CACHEDIR $TESTTMPDIR/cache.dir --bind $FONTDIR $TESTTMPDIR/fonts --bind .. $TESTTMPDIR/build --dev-bind /dev /dev --setenv FONTCONFIG_FILE $TESTTMPDIR/build/test/bind-fonts.conf $TESTTMPDIR/build/test/test-bz106618$EXEEXT | sort > flist1
+$BWRAP --bind / / --bind $CACHEDIR $TESTTMPDIR/cache.dir --bind $FONTDIR $TESTTMPDIR/fonts --bind .. $TESTTMPDIR/build --dev-bind /dev /dev find $TESTTMPDIR/fonts/ -type f -name '*.pcf' | sort > flist2
ls -l $CACHEDIR > out2
if cmp out1 out2 > /dev/null ; then : ; else
echo "*** Test failed: $TEST"
@@ -196,10 +199,59 @@ if cmp out1 out2 > /dev/null ; then : ; else
fi
if [ x`cat xxx` != "x$TESTTMPDIR/fonts/4x6.pcf" ]; then
echo "*** Test failed: $TEST"
- echo "file property doesn't points to the new place: $TESTTMPDIR/fonts/4x6.pcf"
+ echo "file property doesn't point to the new place: $TESTTMPDIR/fonts/4x6.pcf"
exit 1
fi
-rm -rf $TESTTMPDIR out1 out2 xxx bind-fonts.conf
+if cmp flist1 flist2 > /dev/null ; then : ; else
+ echo "*** Test failed: $TEST"
+ echo "file properties doesn't point to the new places"
+ echo "Expected result:"
+ cat flist2
+ echo "Actual result:"
+ cat flist1
+ exit 1
+fi
+rm -rf $TESTTMPDIR out1 out2 xxx flist1 flist2 bind-fonts.conf
+fi
+
+dotest "sysroot option"
+prep
+mkdir -p $MyPWD/sysroot/$FONTDIR
+mkdir -p $MyPWD/sysroot/$CACHEDIR
+cp $FONT1 $MyPWD/sysroot/$FONTDIR
+cp $MyPWD/fonts.conf $MyPWD/sysroot/$MyPWD/fonts.conf
+$FCCACHE -y $MyPWD/sysroot
+stat $MyPWD/sysroot/$FONTDIR/.uuid
+if test $? != 0; then
+ echo "*** Test failed: $TEST"
+ exit 1
+fi
+
+dotest "creating uuid-based cache file on sysroot"
+uuid=`cat $MyPWD/sysroot/$FONTDIR/.uuid`
+ls $MyPWD/sysroot/$CACHEDIR/$uuid*
+if [ $? != 0 ]; then
+ echo "*** Test failed: $TEST"
+ echo "No cache for $uuid"
+ ls $MyPWD/sysroot/$CACHEDIR
+ exit 1
+fi
+
+rm -rf $MyPWD/sysroot
+
+dotest "deleting .uuid file on empty dir"
+prep
+cp $FONT1 $FONT2 $FONTDIR
+$FCCACHE $FONTDIR
+sleep 1
+rm -f $FONTDIR/*pcf
+$FCCACHE $FONTDIR
+rmdir $FONTDIR > /dev/null 2>&1
+if [ $? != 0 ]; then
+ echo "*** Test failed: $TEST"
+ echo "$FONTDIR isn't empty"
+ ls -al $FONTDIR
+ exit 1
fi
rm -rf $FONTDIR $CACHEFILE $CACHEDIR $FONTCONFIG_FILE out
diff --git a/test/test-90-synthetic.json b/test/test-90-synthetic.json
new file mode 100644
index 00000000..42054024
--- /dev/null
+++ b/test/test-90-synthetic.json
@@ -0,0 +1,68 @@
+{
+ "fonts": [
+ {
+ "family": "Foo",
+ "style": "Medium",
+ "weight": 100
+ },
+ {
+ "family": "Bar",
+ "style": "Regular",
+ "weight": 80
+ },
+ {
+ "family": "Baz",
+ "style": "Bold",
+ "weight": 200
+ }
+ ],
+ "tests": [
+ {
+ "method": "match",
+ "query": {
+ "family": "Foo",
+ "weight": 200
+ },
+ "result": {
+ "family": "Foo",
+ "weight": 200,
+ "embolden": true
+ }
+ },
+ {
+ "method": "match",
+ "query": {
+ "family": "Bar",
+ "weight": 102
+ },
+ "result": {
+ "family": "Bar",
+ "weight": 80
+ }
+ },
+ {
+ "method": "match",
+ "query": {
+ "family": "Bar",
+ "weight": 200
+ },
+ "result": {
+ "family": "Bar",
+ "weight": 200,
+ "embolden": true
+ }
+ },
+ {
+ "method": "match",
+ "query": {
+ "family": "Baz",
+ "weight": 200
+ },
+ "result": {
+ "family": "Baz",
+ "weight": 200,
+ "embolden": null
+ }
+ }
+ ]
+}
diff --git a/test/test-bz106618.c b/test/test-bz106618.c
new file mode 100644
index 00000000..86f8eaef
--- /dev/null
+++ b/test/test-bz106618.c
@@ -0,0 +1,47 @@
+/*
+ * fontconfig/test/test-bz89617.c
+ *
+ * Copyright © 2000 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of the author(s) not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission. The authors make no
+ * representations about the suitability of this software for any purpose. It
+ * is provided "as is" without express or implied warranty.
+ *
+ * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+#include <stdio.h>
+#include <fontconfig/fontconfig.h>
+
+int
+main (int argc, char **argv)
+{
+ FcFontSet *fs = FcConfigGetFonts (NULL, FcSetSystem);
+ int i;
+
+ if (!fs)
+ return 1;
+ for (i = 0; i < fs->nfont; i++)
+ {
+ FcPattern *p = fs->fonts[i];
+ FcChar8 *file;
+
+ if (FcPatternGetString (p, FC_FILE, 0, &file) != FcResultMatch)
+ return 1;
+ printf ("%s\n", file);
+ }
+ FcFontSetDestroy (fs);
+
+ return 0;
+}
diff --git a/test/test-bz106632.c b/test/test-bz106632.c
new file mode 100644
index 00000000..daa0c1e8
--- /dev/null
+++ b/test/test-bz106632.c
@@ -0,0 +1,316 @@
+/*
+ * fontconfig/test/test-bz89617.c
+ *
+ * Copyright © 2000 Keith Packard
+ * Copyright © 2018 Akira TAGOH
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of the author(s) not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission. The authors make no
+ * representations about the suitability of this software for any purpose. It
+ * is provided "as is" without express or implied warranty.
+ *
+ * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include <stdlib.h>
+#include <dirent.h>
+#ifndef HAVE_STRUCT_DIRENT_D_TYPE
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#endif
+#include "fcstr.c"
+#undef FcConfigBuildFonts
+#undef FcConfigCreate
+#undef FcConfigGetCurrent
+#undef FcConfigParseAndLoadFromMemory
+#undef FcConfigUptoDate
+#undef FcFontList
+#undef FcInitReinitialize
+#undef FcPatternCreate
+#undef FcPatternDestroy
+#include <fontconfig/fontconfig.h>
+
+#ifdef HAVE_MKDTEMP
+#define fc_mkdtemp mkdtemp
+#else
+char *
+fc_mkdtemp (char *template)
+{
+ if (!mktemp (template) || mkdir (template, 0700))
+ return NULL;
+
+ return template;
+}
+#endif
+
+FcBool
+mkdir_p (const char *dir)
+{
+ char *parent;
+ FcBool ret;
+
+ if (strlen (dir) == 0)
+ return FcFalse;
+ parent = (char *) FcStrDirname ((const FcChar8 *) dir);
+ if (!parent)
+ return FcFalse;
+ if (access (parent, F_OK) == 0)
+ ret = mkdir (dir, 0755) == 0 && chmod (dir, 0755) == 0;
+ else if (access (parent, F_OK) == -1)
+ ret = mkdir_p (parent) && (mkdir (dir, 0755) == 0) && chmod (dir, 0755) == 0;
+ else
+ ret = FcFalse;
+ free (parent);
+
+ return ret;
+}
+
+FcBool
+unlink_dirs (const char *dir)
+{
+ DIR *d = opendir (dir);
+ struct dirent *e;
+ size_t len = strlen (dir);
+ char *n = NULL;
+ FcBool ret = FcTrue;
+#ifndef HAVE_STRUCT_DIRENT_D_TYPE
+ struct stat statb;
+#endif
+
+ if (!d)
+ return FcFalse;
+ while ((e = readdir (d)) != NULL)
+ {
+ size_t l;
+
+ if (strcmp (e->d_name, ".") == 0 ||
+ strcmp (e->d_name, "..") == 0)
+ continue;
+ l = strlen (e->d_name) + 1;
+ if (n)
+ free (n);
+ n = malloc (l + len + 1);
+ if (!n)
+ {
+ ret = FcFalse;
+ break;
+ }
+ strcpy (n, dir);
+ n[len] = FC_DIR_SEPARATOR;
+ strcpy (&n[len + 1], e->d_name);
+#ifdef HAVE_STRUCT_DIRENT_D_TYPE
+ if (e->d_type == DT_DIR)
+#else
+ if (stat (n, &statb) == -1)
+ {
+ fprintf (stderr, "E: %s\n", n);
+ ret = FcFalse;
+ break;
+ }
+ if (S_ISDIR (statb.st_mode))
+#endif
+ {
+ if (!unlink_dirs (n))
+ {
+ fprintf (stderr, "E: %s\n", n);
+ ret = FcFalse;
+ break;
+ }
+ }
+ else
+ {
+ if (unlink (n) == -1)
+ {
+ fprintf (stderr, "E: %s\n", n);
+ ret = FcFalse;
+ break;
+ }
+ }
+ }
+ if (n)
+ free (n);
+ closedir (d);
+
+ if (rmdir (dir) == -1)
+ {
+ fprintf (stderr, "E: %s\n", dir);
+ return FcFalse;
+ }
+
+ return ret;
+}
+
+FcChar8 *
+FcLangNormalize (const FcChar8 *lang)
+{
+ return NULL;
+}
+
+FcChar8 *
+FcConfigHome (void)
+{
+ return NULL;
+}
+
+int
+main (void)
+{
+ FcChar8 *fontdir = NULL, *cachedir = NULL, *fontname;
+ char *basedir, template[512] = "/tmp/bz106632-XXXXXX";
+ char cmd[512];
+ FcConfig *config;
+ const FcChar8 *tconf = "<fontconfig>\n"
+ " <dir>%s</dir>\n"
+ " <cachedir>%s</cachedir>\n"
+ "</fontconfig>\n";
+ char conf[1024];
+ int ret = 0;
+ FcFontSet *fs;
+ FcPattern *pat;
+
+ fprintf (stderr, "D: Creating tmp dir\n");
+ basedir = fc_mkdtemp (template);
+ if (!basedir)
+ {
+ fprintf (stderr, "%s: %s\n", template, strerror (errno));
+ goto bail;
+ }
+ fontdir = FcStrBuildFilename (basedir, "fonts", NULL);
+ cachedir = FcStrBuildFilename (basedir, "cache", NULL);
+ fprintf (stderr, "D: Creating %s\n", fontdir);
+ mkdir_p (fontdir);
+ fprintf (stderr, "D: Creating %s\n", cachedir);
+ mkdir_p (cachedir);
+
+ fprintf (stderr, "D: Copying %s to %s\n", FONTFILE, fontdir);
+ snprintf (cmd, 512, "cp -a %s %s", FONTFILE, fontdir);
+ system (cmd);
+
+ fprintf (stderr, "D: Loading a config\n");
+ snprintf (conf, 1024, tconf, fontdir, cachedir);
+ config = FcConfigCreate ();
+ if (!FcConfigParseAndLoadFromMemory (config, conf, FcTrue))
+ {
+ printf ("E: Unable to load config\n");
+ ret = 1;
+ goto bail;
+ }
+ if (!FcConfigBuildFonts (config))
+ {
+ printf ("E: unable to build fonts\n");
+ ret = 1;
+ goto bail;
+ }
+ fprintf (stderr, "D: Obtaining fonts information\n");
+ pat = FcPatternCreate ();
+ fs = FcFontList (config, pat, NULL);
+ FcPatternDestroy (pat);
+ if (!fs || fs->nfont != 1)
+ {
+ printf ("E: Unexpected the number of fonts: %d\n", !fs ? -1 : fs->nfont);
+ ret = 1;
+ goto bail;
+ }
+ fprintf (stderr, "D: Removing %s\n", fontdir);
+ snprintf (cmd, 512, "rm -f %s%s*", fontdir, FC_DIR_SEPARATOR_S);
+ system (cmd);
+ fprintf (stderr, "D: Reinitializing\n");
+ if (!FcConfigUptoDate (config) || !FcInitReinitialize ())
+ {
+ fprintf (stderr, "E: Unable to reinitialize\n");
+ ret = 2;
+ goto bail;
+ }
+ if (FcConfigGetCurrent () == config)
+ {
+ fprintf (stderr, "E: config wasn't reloaded\n");
+ ret = 3;
+ goto bail;
+ }
+ config = FcConfigCreate ();
+ if (!FcConfigParseAndLoadFromMemory (config, conf, FcTrue))
+ {
+ printf ("E: Unable to load config again\n");
+ ret = 4;
+ goto bail;
+ }
+ if (!FcConfigBuildFonts (config))
+ {
+ printf ("E: unable to build fonts again\n");
+ ret = 5;
+ goto bail;
+ }
+ fprintf (stderr, "D: Obtaining fonts information again\n");
+ pat = FcPatternCreate ();
+ fs = FcFontList (config, pat, NULL);
+ FcPatternDestroy (pat);
+ if (!fs || fs->nfont != 0)
+ {
+ printf ("E: Unexpected the number of fonts: %d\n", !fs ? -1 : fs->nfont);
+ ret = 1;
+ goto bail;
+ }
+ fprintf (stderr, "D: Copying %s to %s\n", FONTFILE, fontdir);
+ snprintf (cmd, 512, "cp -a %s %s", FONTFILE, fontdir);
+ system (cmd);
+ fprintf (stderr, "D: Reinitializing\n");
+ if (!FcConfigUptoDate (config) || !FcInitReinitialize ())
+ {
+ fprintf (stderr, "E: Unable to reinitialize\n");
+ ret = 2;
+ goto bail;
+ }
+ if (FcConfigGetCurrent () == config)
+ {
+ fprintf (stderr, "E: config wasn't reloaded\n");
+ ret = 3;
+ goto bail;
+ }
+ config = FcConfigCreate ();
+ if (!FcConfigParseAndLoadFromMemory (config, conf, FcTrue))
+ {
+ printf ("E: Unable to load config again\n");
+ ret = 4;
+ goto bail;
+ }
+ if (!FcConfigBuildFonts (config))
+ {
+ printf ("E: unable to build fonts again\n");
+ ret = 5;
+ goto bail;
+ }
+ fprintf (stderr, "D: Obtaining fonts information\n");
+ pat = FcPatternCreate ();
+ fs = FcFontList (config, pat, NULL);
+ FcPatternDestroy (pat);
+ if (!fs || fs->nfont != 1)
+ {
+ printf ("E: Unexpected the number of fonts: %d\n", !fs ? -1 : fs->nfont);
+ ret = 1;
+ goto bail;
+ }
+
+bail:
+ fprintf (stderr, "Cleaning up\n");
+ unlink_dirs (basedir);
+ if (fontdir)
+ FcStrFree (fontdir);
+ if (cachedir)
+ FcStrFree (cachedir);
+
+ return ret;
+}
diff --git a/test/test-conf.c b/test/test-conf.c
new file mode 100644
index 00000000..6619ea76
--- /dev/null
+++ b/test/test-conf.c
@@ -0,0 +1,328 @@
+/*
+ * fontconfig/test/test-conf.c
+ *
+ * Copyright © 2000 Keith Packard
+ * Copyright © 2018 Akira TAGOH
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of the author(s) not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission. The authors make no
+ * representations about the suitability of this software for any purpose. It
+ * is provided "as is" without express or implied warranty.
+ *
+ * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+#include <stdio.h>
+#include <string.h>
+#include <fontconfig/fontconfig.h>
+#include <json.h>
+
+struct _FcConfig {
+ FcStrSet *configDirs; /* directories to scan for fonts */
+ FcStrSet *fontDirs;
+ FcStrSet *cacheDirs;
+ FcStrSet *configFiles; /* config files loaded */
+ void *subst[FcMatchKindEnd];
+ int maxObjects; /* maximum number of tests in all substs */
+ FcStrSet *acceptGlobs;
+ FcStrSet *rejectGlobs;
+ FcFontSet *acceptPatterns;
+ FcFontSet *rejectPatterns;
+ FcFontSet *fonts[FcSetApplication + 1];
+};
+
+static FcPattern *
+build_pattern (json_object *obj)
+{
+ json_object_iter iter;
+ FcPattern *pat = FcPatternCreate ();
+
+ json_object_object_foreachC (obj, iter)
+ {
+ FcValue v;
+
+ if (json_object_get_type (iter.val) == json_type_boolean)
+ {
+ v.type = FcTypeBool;
+ v.u.b = json_object_get_boolean (iter.val);
+ }
+ else if (json_object_get_type (iter.val) == json_type_double)
+ {
+ v.type = FcTypeDouble;
+ v.u.d = json_object_get_double (iter.val);
+ }
+ else if (json_object_get_type (iter.val) == json_type_int)
+ {
+ v.type = FcTypeInteger;
+ v.u.i = json_object_get_int (iter.val);
+ }
+ else if (json_object_get_type (iter.val) == json_type_string)
+ {
+ v.type = FcTypeString;
+ v.u.s = json_object_get_string (iter.val);
+ }
+ else if (json_object_get_type (iter.val) == json_type_null)
+ {
+ v.type = FcTypeVoid;
+ }
+ else
+ {
+ fprintf (stderr, "W: unexpected object to build a pattern: (%s %s)", iter.key, json_type_to_name (json_object_get_type (iter.val)));
+ continue;
+ }
+ FcPatternAdd (pat, iter.key, v, FcTrue);
+ }
+ return pat;
+}
+
+static FcBool
+build_fonts (FcConfig *config, json_object *root)
+{
+ json_object *fonts;
+ FcFontSet *fs;
+ int i, n;
+
+ if (!json_object_object_get_ex (root, "fonts", &fonts) ||
+ json_object_get_type (fonts) != json_type_array)
+ {
+ fprintf (stderr, "W: No fonts defined\n");
+ return FcFalse;
+ }
+ fs = FcFontSetCreate ();
+ n = json_object_array_length (fonts);
+ for (i = 0; i < n; i++)
+ {
+ json_object *obj = json_object_array_get_idx (fonts, i);
+ FcPattern *pat;
+
+ if (json_object_get_type (obj) != json_type_object)
+ continue;
+ pat = build_pattern (obj);
+ FcFontSetAdd (fs, pat);
+ }
+ /* FcConfigSetFonts (config, fs, FcSetSystem); */
+ if (config->fonts[FcSetSystem])
+ FcFontSetDestroy (config->fonts[FcSetSystem]);
+ config->fonts[FcSetSystem] = fs;
+
+ return FcTrue;
+}
+
+static FcBool
+run_test (FcConfig *config, json_object *root)
+{
+ json_object *tests;
+ FcFontSet *fs;
+ int i, n, fail = 0;
+
+ if (!json_object_object_get_ex (root, "tests", &tests) ||
+ json_object_get_type (tests) != json_type_array)
+ {
+ fprintf (stderr, "W: No test cases defined\n");
+ return FcFalse;
+ }
+ fs = FcFontSetCreate ();
+ n = json_object_array_length (tests);
+ for (i = 0; i < n; i++)
+ {
+ json_object *obj = json_object_array_get_idx (tests, i);
+ json_object_iter iter;
+ FcPattern *query, *result;
+ const char *method;
+
+ if (json_object_get_type (obj) != json_type_object)
+ continue;
+ json_object_object_foreachC (obj, iter)
+ {
+ if (strcmp (iter.key, "method") == 0)
+ {
+ if (json_object_get_type (iter.val) != json_type_string)
+ {
+ fprintf (stderr, "W: invalid type of method: (%s)\n", json_type_to_name (json_object_get_type (iter.val)));
+ continue;
+ }
+ method = json_object_get_string (iter.val);
+ }
+ else if (strcmp (iter.key, "query") == 0)
+ {
+ if (json_object_get_type (iter.val) != json_type_object)
+ {
+ fprintf (stderr, "W: invalid type of query: (%s)\n", json_type_to_name (json_object_get_type (iter.val)));
+ continue;
+ }
+ query = build_pattern (iter.val);
+ }
+ else if (strcmp (iter.key, "result") == 0)
+ {
+ if (json_object_get_type (iter.val) != json_type_object)
+ {
+ fprintf (stderr, "W: invalid type of result: (%s)\n", json_type_to_name (json_object_get_type (iter.val)));
+ continue;
+ }
+ result = build_pattern (iter.val);
+ }
+ else
+ {
+ fprintf (stderr, "W: unknown object: %s\n", iter.key);
+ }
+ }
+ if (strcmp (method, "match") == 0)
+ {
+ FcPattern *match;
+ FcResult res;
+
+ FcConfigSubstitute (config, query, FcMatchPattern);
+ FcDefaultSubstitute (query);
+ match = FcFontMatch (config, query, &res);
+ if (match)
+ {
+ FcPatternIter iter;
+ int x, vc;
+
+ FcPatternIterStart (result, &iter);
+ do
+ {
+ vc = FcPatternIterValueCount (result, &iter);
+ for (x = 0; x < vc; x++)
+ {
+ FcValue vr, vm;
+
+ if (FcPatternIterGetValue (result, &iter, x, &vr, NULL) != FcResultMatch)
+ {
+ fprintf (stderr, "E: unable to obtain a value from the expected result\n");
+ fail++;
+ goto bail;
+ }
+ if (FcPatternGet (match, FcPatternIterGetObject (result, &iter), x, &vm) != FcResultMatch)
+ {
+ vm.type = FcTypeVoid;
+ }
+ if (!FcValueEqual (vm, vr))
+ {
+ printf ("E: failed to compare %s:\n", FcPatternIterGetObject (result, &iter));
+ printf (" actual result:");
+ FcValuePrint (vm);
+ printf ("\n expected result:");
+ FcValuePrint (vr);
+ printf ("\n");
+ fail++;
+ goto bail;
+ }
+ }
+ } while (FcPatternIterNext (result, &iter));
+ bail:;
+ }
+ else
+ {
+ fprintf (stderr, "E: no match\n");
+ fail++;
+ }
+ }
+ else
+ {
+ fprintf (stderr, "W: unknown testing method: %s\n", method);
+ }
+ }
+
+ return fail == 0;
+}
+
+static FcBool
+run_scenario (FcConfig *config, char *file)
+{
+ FcBool ret = FcTrue;
+ json_object *root, *scenario;
+
+ root = json_object_from_file (file);
+ if (!root)
+ {
+ fprintf (stderr, "E: Unable to read the file: %s\n", file);
+ return FcFalse;
+ }
+ if (!build_fonts (config, root))
+ {
+ ret = FcFalse;
+ goto bail1;
+ }
+ if (!run_test (config, root))
+ {
+ ret = FcFalse;
+ goto bail1;
+ }
+
+bail1:
+ json_object_put (root);
+
+ return ret;
+}
+
+static FcBool
+load_config (FcConfig *config, char *file)
+{
+ FILE *fp;
+ long len;
+ char *buf = NULL;
+ FcBool ret = FcTrue;
+
+ if ((fp = fopen(file, "rb")) == NULL)
+ return FcFalse;
+ fseek (fp, 0L, SEEK_END);
+ len = ftell (fp);
+ fseek (fp, 0L, SEEK_SET);
+ buf = malloc (sizeof (char) * (len + 1));
+ if (!buf)
+ {
+ ret = FcFalse;
+ goto bail1;
+ }
+ fread (buf, (size_t)len, sizeof (char), fp);
+ buf[len] = 0;
+
+ ret = FcConfigParseAndLoadFromMemory (config, buf, FcTrue);
+bail1:
+ fclose (fp);
+ if (buf)
+ free (buf);
+
+ return ret;
+}
+
+int
+main (int argc, char **argv)
+{
+ FcConfig *config;
+ int retval = 0;
+
+ if (argc < 3)
+ {
+ fprintf(stderr, "Usage: %s <conf file> <test scenario>\n", argv[0]);
+ return 1;
+ }
+
+ config = FcConfigCreate ();
+ if (!load_config (config, argv[1]))
+ {
+ fprintf(stderr, "E: Failed to load config\n");
+ retval = 1;
+ goto bail1;
+ }
+ if (!run_scenario (config, argv[2]))
+ {
+ retval = 1;
+ goto bail1;
+ }
+bail1:
+ FcConfigDestroy (config);
+
+ return retval;
+}
diff --git a/test/test-hash.c b/test/test-hash.c
new file mode 100644
index 00000000..7530e82a
--- /dev/null
+++ b/test/test-hash.c
@@ -0,0 +1,187 @@
+#include "../src/fchash.c"
+#include "../src/fcstr.c"
+
+FcChar8 *
+FcLangNormalize (const FcChar8 *lang)
+{
+ return NULL;
+}
+
+FcChar8 *
+FcConfigHome (void)
+{
+ return NULL;
+}
+
+typedef struct _Test
+{
+ FcHashTable *table;
+} Test;
+
+static Test *
+init (void)
+{
+ Test *ret;
+
+ ret = malloc (sizeof (Test));
+ if (ret)
+ {
+ ret->table = FcHashTableCreate ((FcHashFunc) FcStrHashIgnoreCase,
+ (FcCompareFunc) FcStrCmp,
+ FcHashStrCopy,
+ FcHashUuidCopy,
+ (FcDestroyFunc) FcStrFree,
+ FcHashUuidFree);
+ }
+
+ return ret;
+}
+
+static void
+fini (Test *test)
+{
+ FcHashTableDestroy (test->table);
+ free (test);
+}
+
+static FcBool
+test_add (Test *test, FcChar8 *key, FcBool replace)
+{
+ uuid_t uuid;
+ void *u;
+ FcBool (*hash_add) (FcHashTable *, void *, void *);
+ FcBool ret = FcFalse;
+
+ uuid_generate_random (uuid);
+ if (replace)
+ hash_add = FcHashTableReplace;
+ else
+ hash_add = FcHashTableAdd;
+ if (!hash_add (test->table, key, uuid))
+ return FcFalse;
+ if (!FcHashTableFind (test->table, key, &u))
+ return FcFalse;
+ ret = (uuid_compare (uuid, u) == 0);
+ FcHashUuidFree (u);
+
+ return ret;
+}
+
+static FcBool
+test_remove (Test *test, FcChar8 *key)
+{
+ void *u;
+
+ if (!FcHashTableFind (test->table, key, &u))
+ return FcFalse;
+ FcHashUuidFree (u);
+ if (!FcHashTableRemove (test->table, key))
+ return FcFalse;
+ if (FcHashTableFind (test->table, key, &u))
+ return FcFalse;
+
+ return FcTrue;
+}
+
+int
+main (void)
+{
+ Test *test;
+ uuid_t uuid;
+ int ret = 0;
+
+ test = init ();
+ /* first op to add */
+ if (!test_add (test, "foo", FcFalse))
+ {
+ ret = 1;
+ goto bail;
+ }
+ /* second op to add */
+ if (!test_add (test, "bar", FcFalse))
+ {
+ ret = 1;
+ goto bail;
+ }
+ /* dup not allowed */
+ if (test_add (test, "foo", FcFalse))
+ {
+ ret = 1;
+ goto bail;
+ }
+ /* replacement */
+ if (!test_add (test, "foo", FcTrue))
+ {
+ ret = 1;
+ goto bail;
+ }
+ /* removal */
+ if (!test_remove (test, "foo"))
+ {
+ ret = 1;
+ goto bail;
+ }
+ /* not found to remove */
+ if (test_remove (test, "foo"))
+ {
+ ret = 1;
+ goto bail;
+ }
+ /* complex op in pointer */
+ if (!test_add (test, "foo", FcFalse))
+ {
+ ret = 1;
+ goto bail;
+ }
+ if (test_add (test, "foo", FcFalse))
+ {
+ ret = 1;
+ goto bail;
+ }
+ if (!test_remove (test, "foo"))
+ {
+ ret = 1;
+ goto bail;
+ }
+ if (!test_add (test, "foo", FcFalse))
+ {
+ ret = 1;
+ goto bail;
+ }
+ if (!test_remove (test, "bar"))
+ {
+ ret = 1;
+ goto bail;
+ }
+ /* completely remove */
+ if (!test_remove (test, "foo"))
+ {
+ ret = 1;
+ goto bail;
+ }
+ /* completely remove from the last one */
+ if (!test_add (test, "foo", FcFalse))
+ {
+ ret = 1;
+ goto bail;
+ }
+ if (!test_add (test, "bar", FcFalse))
+ {
+ ret = 1;
+ goto bail;
+ }
+ if (!test_remove (test, "bar"))
+ {
+ ret = 1;
+ goto bail;
+ }
+ if (!test_remove (test, "foo"))
+ {
+ ret = 1;
+ goto bail;
+ }
+bail:
+ fini (test);
+
+ return ret;
+}
diff --git a/test/test-name-parse.c b/test/test-name-parse.c
new file mode 100644
index 00000000..7382360d
--- /dev/null
+++ b/test/test-name-parse.c
@@ -0,0 +1,90 @@
+#include <fontconfig/fontconfig.h>
+#include <stdio.h>
+
+static int
+test (const FcChar8 *query, const FcPattern *expect)
+{
+ FcPattern *pat;
+ int c = 0;
+
+ c++;
+ pat = FcNameParse (query);
+ if (!pat)
+ goto bail;
+ c++;
+ if (!FcPatternEqual (pat, expect))
+ goto bail;
+ c = 0;
+bail:
+ FcPatternDestroy (pat);
+
+ return c;
+}
+
+#define BEGIN(x) (x) = FcPatternCreate (); c++;
+#define END(x) FcPatternDestroy (x); (x) = NULL
+int
+main (void)
+{
+ FcPattern *expect;
+ int c = 0, ret;
+
+ BEGIN (expect) {
+ FcPatternAddString (expect, FC_FAMILY, (const FcChar8 *)"sans-serif");
+ if ((ret = test ((const FcChar8 *)"sans\\-serif", expect)) != 0)
+ goto bail;
+ } END (expect);
+ BEGIN (expect) {
+ FcPatternAddString (expect, FC_FAMILY, (const FcChar8 *)"Foo");
+ FcPatternAddInteger (expect, FC_SIZE, 10);
+ if ((ret = test ((const FcChar8 *)"Foo-10", expect)) != 0)
+ goto bail;
+ } END (expect);
+ BEGIN (expect) {
+ FcPatternAddString (expect, FC_FAMILY, (const FcChar8 *)"Foo");
+ FcPatternAddString (expect, FC_FAMILY, (const FcChar8 *)"Bar");
+ FcPatternAddInteger (expect, FC_SIZE, 10);
+ if ((ret = test ((const FcChar8 *)"Foo,Bar-10", expect)) != 0)
+ goto bail;
+ } END (expect);
+ BEGIN (expect) {
+ FcPatternAddString (expect, FC_FAMILY, (const FcChar8 *)"Foo");
+ FcPatternAddInteger (expect, FC_WEIGHT, FC_WEIGHT_MEDIUM);
+ if ((ret = test ((const FcChar8 *)"Foo:weight=medium", expect)) != 0)
+ goto bail;
+ } END (expect);
+ BEGIN (expect) {
+ FcPatternAddString (expect, FC_FAMILY, (const FcChar8 *)"Foo");
+ FcPatternAddInteger (expect, FC_WEIGHT, FC_WEIGHT_MEDIUM);
+ if ((ret = test ((const FcChar8 *)"Foo:weight_medium", expect)) != 0)
+ goto bail;
+ } END (expect);
+ BEGIN (expect) {
+ FcPatternAddInteger (expect, FC_WEIGHT, FC_WEIGHT_MEDIUM);
+ if ((ret = test ((const FcChar8 *)":medium", expect)) != 0)
+ goto bail;
+ } END (expect);
+ BEGIN (expect) {
+ FcPatternAddInteger (expect, FC_WIDTH, FC_WIDTH_NORMAL);
+ if ((ret = test ((const FcChar8 *)":normal", expect)) != 0)
+ goto bail;
+ } END (expect);
+ BEGIN (expect) {
+ FcPatternAddInteger (expect, FC_WIDTH, FC_WIDTH_NORMAL);
+ if ((ret = test ((const FcChar8 *)":normal", expect)) != 0)
+ goto bail;
+ } END (expect);
+ BEGIN (expect) {
+ FcRange *r = FcRangeCreateDouble (FC_WEIGHT_MEDIUM, FC_WEIGHT_BOLD);
+ FcPatternAddRange (expect, FC_WEIGHT, r);
+ FcRangeDestroy (r);
+ if ((ret = test ((const FcChar8 *)":weight=[medium bold]", expect)) != 0)
+ goto bail;
+ } END (expect);
+
+bail:
+ if (expect)
+ FcPatternDestroy (expect);
+
+ return ret == 0 ? 0 : (c - 1) * 2 + ret;
+}