From 22dc6fc6dbae50d6ee2db17a88b5c6e4b3ac30be Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 3 Mar 2003 01:13:11 +0000 Subject: [PATCH] Sun Mar 2 14:16:17 2003 Owen Taylor fontconfig.spec.in: Improvements from Red Hat spec file. {fc-lang,fc-cache,fc-list}/Makefile.am: Add man pages. docs/*.sgml: SGML fixes. --- ChangeLog | 8 ++ doc/fontconfig-devel.sgml | 237 +++++++++++++++++++------------------- doc/fontconfig-user.sgml | 8 +- fc-cache/Makefile.am | 2 + fc-lang/Makefile.am | 2 + fc-list/Makefile.am | 2 + fontconfig.spec.in | 86 ++++++++------ 7 files changed, 191 insertions(+), 154 deletions(-) diff --git a/ChangeLog b/ChangeLog index bee66bf..525c3cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Sun Mar 2 14:16:17 2003 Owen Taylor + + + fontconfig.spec.in: Improvements from Red Hat spec file. + + + {fc-lang,fc-cache,fc-list}/Makefile.am: Add man pages. + + + docs/*.sgml: SGML fixes. + Sat Mar 1 17:28:53 PST 2003 keithp + Ok, so the ChangeLog is a bit out of date diff --git a/doc/fontconfig-devel.sgml b/doc/fontconfig-devel.sgml index f5d958f..66796cb 100644 --- a/doc/fontconfig-devel.sgml +++ b/doc/fontconfig-devel.sgml @@ -133,6 +133,7 @@ convenience for the applications rendering mechanism. + DATATYPES Fontconfig uses abstract datatypes to hide internal implementation details @@ -167,6 +168,7 @@ in a font. Operations to build and compare these sets are provided. FcType Tags the kind of data stored in an FcValue. + FcValue @@ -205,6 +207,8 @@ types. The 'type' tag indicates which member is valid. + + FcPattern @@ -213,6 +217,7 @@ 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 @@ -361,41 +366,41 @@ FcMatrix structures hold an affine transformation in matrix form. #define FcMatrixInit(m) ((m)->xx = (m)->yy = 1, (m)->xy = (m)->yx = 0) Initializes a matrix to the identify transformation. - + FcMatrixCopy FcMatrix *FcMatrixCopy (const FcMatrix *mat) Allocates a new FcMatrix and copies 'mat' into it. - + FcMatrixEqual FcBool FcMatrixEqual (const FcMatrix *mat1, const FcMatrix *mat2) Returns FcTrue if 'mat1' and 'mat2' are equal, else FcFalse. - + FcMatrixMultiply void FcMatrixMultiply (FcMatrix *result, const FcMatrix *a, const FcMatrix *b) Multiplies 'a' and 'b' together, placing the result in 'result'. 'result' may refer to the sam matrix as either 'a' or 'b'. - + FcMatrixRotate void FcMatrixRotate (FcMatrix *m, double c, double s) If 'c' is cos(angle) and 's' is sin(angle), FcMatrixRotate rotates the matrix by 'angle'. - + FcMatrixScale void FcMatrixScale (FcMatrix *m, double sx, double sy) Scales 'm' by 'sx' in the horizontal dimension and 'sy' in the vertical dimension. - + FcMatrixShear void FcMatrixShear (FcMatrix *m, double sh, double sv) Shears 'm' by 'sh' in the horizontal direction and 'sv' in the vertical direction. - + FcCharSet @@ -409,81 +414,81 @@ return it's argument, and that CharSet may remain unmodifiable. FcCharSet *FcCharSetCreate (void) Creates an empty FcCharSet object. - + FcCharSetDestroy void FcCharSetDestroy (FcCharSet *fcs) Frees an FcCharSet object. - + FcCharSetAddChar FcBool FcCharSetAddChar (FcCharSet *fcs, FcChar32 ucs4) 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. - + FcCharSetCopy FcCharSet *FcCharSetCopy (FcCharSet *src) Makes a copy of 'src'; note that this may not actually do anything more than increment the reference count on 'src'. - + FcCharSetEqual FcBool FcCharSetEqual (const FcCharSet *a, const FcCharSet *b) Returns whether 'a' and 'b' contain the same set of unicode chars. - + FcCharSetIntersect FcCharSet *FcCharSetIntersect (const FcCharSet *a, const FcCharSet *b) Returns a set including only those chars found in both 'a' and 'b'. - + FcCharSetUnion FcCharSet *FcCharSetUnion (const FcCharSet *a, const FcCharSet *b); Returns a set including only those chars found in either 'a' or 'b'. - + FcCharSetSubtract FcCharSet *FcCharSetSubtract (const FcCharSet *a, const FcCharSet *b) Returns a set including only those chars found in 'a' but not 'b'. - + FcCharSetHasChar FcBool FcCharSetHasChar (const FcCharSet *fcs, FcChar32 ucs4) Returns whether 'fcs' contains the char 'ucs4'. - + FcCharSetCount FcChar32 FcCharSetCount (const FcCharSet *a) Returns the total number of unicode chars in 'a'. - + FcCharSetIntersectCount FcChar32 FcCharSetIntersectCount (const FcCharSet *a, const FcCharSet *b) Returns the number of chars that are in both 'a' and 'b'. - + FcCharSetSubtractCount FcChar32 FcCharSetSubtractCount (const FcCharSet *a, const FcCharSet *b) Returns the number of chars that are in 'a' but not in 'b'. - + FcCharSetIsSubset FcBool FcCharSetIsSubset (const FcCharSet *a, const FcCharSet *b) Returns whether 'a' is a subset of 'b'. - + FcCharSetFirstPage FcChar32 FcCharSetFirstPage (const FcCharSet *a, FcChar32 [FC_CHARSET_MAP_SIZE], FcChar32 *next) Builds an array of bits marking the first page of Unicode coverage of 'a'. Returns the base of the array. 'next' contains the next page in the font. - + FcCharSetNextPage FcChar32 FcCharSetNextPage (const FcCharSet *a, FcChar32 [FC_CHARSET_MAP_SIZE], FcChar32 *next) Builds an array of bits marking the Unicode coverage of 'a' for page '*next'. Returns the base of the array. 'next' contains the next page in the font. - + FcValue @@ -498,13 +503,13 @@ void FcValueDestroy (FcValue v) Frees any memory referenced by `v'. Values of type FcTypeString, FcTypeMatrix and FcTypeCharSet reference memory, the other types do not. - + FcValueSave FcValue FcValueSave (FcValue v) Returns a copy of `v' duplicating any object referenced by it so that `v' may be safely destroyed without harming the new value. - + FcPattern @@ -515,29 +520,29 @@ available fonts, as well as the information about each font. FcPattern *FcPatternCreate (void) Creates a pattern with no properties; used to build patterns from scratch. - + FcPatternDestroy void FcPatternDestroy (FcPattern *p) Destroys a pattern, in the process destroying all related values. - + FcPatternEqual FcBool FcPatternEqual (const FcPattern *pa, const FcPattern *pb); Returns whether 'pa' and 'pb' are exactly alike. - + FcPatternEqualSubset FcBool FcPatternEqualSubset (const FcPattern *pa, const FcPattern *pb, const FcObjectSet *os) Returns whether 'pa' and 'pb' have exactly the same values for all of the objects in 'os'. - + FcPatternHash FcChar32 FcPatternHash (const FcPattern *p) Returns a 32-bit number which is the same for any two patterns which are exactly alike. - + FcPatternAdd FcBool FcPatternAdd (FcPattern *p, const char *object, FcValue value, FcBool append) @@ -546,13 +551,13 @@ Adds a single value to the list of values associated with the property named existing list, otherwise it is inserted at the begining. `value' is saved (with FcValueSave) when inserted into the pattern so that the library retains no reference to any application-supplied data structure. - + FcPatternAddWeak FcBool FcPatternAddWeak (FcPattern *p, const char *object, FcValue value, FcBool append) FcPatternAddWeak is essentially the same as FcPatternAdd except that any values added to the list have binding 'weak' instead of 'strong'. - + FcPatternAdd <emphasis>Type</emphasis> FcBool FcPatternAddInteger (FcPattern *p, const char *object, int i) FcBool FcPatternAddDouble (FcPattern *p, const char *object, double d) @@ -565,14 +570,14 @@ 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. - + FcPatternGet FcResult FcPatternGet (FcPattern *p, const char *object, int id, FcValue *v) 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 <emphasis>Type</emphasis> FcResult FcPatternGetInteger (FcPattern *p, const char *object, int n, int *i); FcResult FcPatternGetDouble (FcPattern *p, const char *object, int n, double *d); @@ -586,7 +591,7 @@ 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. - + FcPatternBuild, FcPatternVaBuild FcPattern *FcPatternBuild (FcPattern *orig, ...); FcPattern *FcPatternVaBuild (FcPattern *orig, va_list va) @@ -603,6 +608,7 @@ Object type, one of the FcType enumerated values 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 @@ -616,20 +622,20 @@ pattern = FcPatternBuild (0, FC_FAMILY, FtTypeString, "Times", (char *) 0); FcPatternVaBuild is used when the arguments are already in the form of a varargs value. - + FcPatternDel FcBool FcPatternDel (FcPattern *p, const char *object) Deletes all values associated with the property `object', returning whether the property existed or not. - + FcPatternPrint void FcPatternPrint (const FcPattern *p) 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 void FcDefaultSubstitute (FcPattern *pattern) @@ -646,19 +652,19 @@ 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 FcPattern *FcNameParse (const char *name) Converts 'name' from the standard text format described above into a pattern. - + FcNameUnparse FcChar8 *FcNameUnparse (FcPattern *pat) 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. - + FcFontSet @@ -669,19 +675,19 @@ results of listing available fonts. FcFontSet *FcFontSetCreate (void) Creates an empty font set. - + FcFontSetDestroy void FcFontSetDestroy (FcFontSet *s); Destroys a font set. Note that this destroys any referenced patterns as well. - + FcFontSetAdd FcBool FcFontSetAdd (FcFontSet *s, FcPattern *font) Adds a pattern to a font set. Note that the pattern is not copied before being inserted into the set. - + FcObjectSet @@ -693,23 +699,23 @@ FcFontList. FcObjectSet *FcObjectSetCreate (void) Creates an empty set. - + FcObjectSetAdd FcBool FcObjectSetAdd (FcObjectSet *os, const char *object) Adds a proprety name to the set. - + FcObjectSetDestroy void FcObjectSetDestroy (FcObjectSet *os) Destroys an object set. - + FcObjectSetBuild, FcObjectSetVaBuild FcObjectSet *FcObjectSetBuild (const char *first, ...) FcObjectSet *FcObjectSetVaBuild (const char *first, va_list va) These build an object set from a null-terminated list of property names. - + FcObjectType @@ -720,17 +726,17 @@ pattern elements can be generated from font names. FcBool FcNameRegisterObjectTypes (const FcObjectType *types, int ntype) Register 'ntype' new object types. - + FcNameUnregisterObjectTypes FcBool FcNameUnregisterObjectTypes (const FcObjectType *types, int ntype) Unregister 'ntype' object types. - + FcNameGetObjectType const FcObjectType *FcNameGetObjectType (const char *object) Return the object type for the pattern element named 'object'. - + FcConstant @@ -740,23 +746,23 @@ Provides for application-specified symbolic constants for font names. FcBool FcNameRegisterConstants (const FcConstant *consts, int nconsts) Register 'nconsts' new symbolic constants. - + FcNameUnregisterConstants FcBool FcNameUnregisterConstants (const FcConstant *consts, int nconsts) Unregister 'nconsts' symbolic constants. - + FcNameGetConstant const FcConstant *FcNameGetConstant (FcChar8 *string) Return the FcConstant structure related to symbolic constant 'string'. - + FcNameConstant FcBool FcNameConstant (FcChar8 *string, int *result); Returns whether a symbolic constant with name 'string' is registered, placing the value of the constant in 'result' if present. - + FcBlanks @@ -770,24 +776,24 @@ accurate CharSet for applications. FcBlanks *FcBlanksCreate (void) Creates an empty FcBlanks object. - + FcBlanksDestroy void FcBlanksDestroy (FcBlanks *b) Destroys an FcBlanks object, freeing any associated memory. - + FcBlanksAdd FcBool FcBlanksAdd (FcBlanks *b, FcChar32 ucs4) Adds a single character to an FcBlanks object, returning FcFalse if this process ran out of memory. - + FcBlanksIsMember FcBool FcBlanksIsMember (FcBlanks *b, FcChar32 ucs4) Returns whether the specified FcBlanks object contains the indicated Unicode value. - + FcConfig @@ -799,102 +805,102 @@ any function using the data within an FcConfig. FcConfig *FcConfigCreate (void) Creates an empty configuration. - + FcConfigDestroy void FcConfigDestroy (FcConfig *config) Destroys a configuration and any data associated with it. Note that calling this function with the return from FcConfigGetCurrent will place the library in an indeterminate state. - + FcConfigSetCurrent FcBool FcConfigSetCurrent (FcConfig *config) Sets the current default configuration to 'config'. Implicitly calls FcConfigBuildFonts if necessary, returning FcFalse if that call fails. - + FcConfigGetCurrent FcConfig *FcConfigGetCurrent (void) Returns the current default configuration. - + FcConfigUptoDate FcBool FcConfigUptoDate (FcConfig *config) Checks all of the files related to 'config' and returns whether the in-memory version is in sync with the disk version. - + FcConfigBuildFonts FcBool FcConfigBuildFonts (FcConfig *config) 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. - + FcConfigGetConfigDirs FcStrList *FcConfigGetConfigDirs (FcConfig *config) Returns the list of font directories specified in the configuration files for 'config'. Does not include any subdirectories. - + FcConfigGetFontDirs FcStrList *FcConfigGetFontDirs (FcConfig *config) Returns the list of font directories in 'config'. This includes the configured font directories along with any directories below those in the filesystem. - + FcConfigGetConfigFiles FcStrList *FcConfigGetConfigFiles (FcConfig *config) Returns the list of known configuration files used to generate 'config'. Note that this will not include any configuration done with FcConfigParse. - + FcConfigGetCache char *FcConfigGetCache (FcConfig *config) Returns the name of the file used to store per-user font information. - + FcConfigGetFonts FcFontSet *FcConfigGetFonts (FcConfig *config, FcSetName set) Returns one of the two sets of fonts from the configuration as specified by 'set'. - + FcConfigGetBlanks FcBlanks *FcConfigGetBlanks (FcConfig *config) Returns the FcBlanks object associated with the given configuration, if no blanks were present in the configuration, this function will return 0. - + FcConfigGetRescanInverval int FcConfigGetRescanInverval (FcConfig *config) 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. - + FcConfigSetRescanInverval FcBool FcConfigSetRescanInverval (FcConfig *config, int rescanInterval) Sets the rescan interval; returns FcFalse if an error occurred. - + FcConfigAppFontAddFile FcBool FcConfigAppFontAddFile (FcConfig *config, const char *file) Adds an application-specific font to the configuration. - + FcConfigAppFontAddDir FcBool FcConfigAppFontAddDir (FcConfig *config, const char *dir) Scans the specified directory for fonts, adding each one found to the application-specific set of fonts. - + FcConfigAppFontClear void FcConfigAppFontClear (FcConfig *config) Clears the set of application-specific fonts. - + FcConfigSubstituteWithPat FcBool FcConfigSubstituteWithPat (FcConfig *config, FcPattern *p, FcPattern *p_pat FcMatchKind kind) @@ -902,19 +908,19 @@ 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. - + FcConfigSubstitute FcBool FcConfigSubstitute (FcConfig *config, FcPattern *p, FcMatchKind kind) Calls FcConfigSubstituteWithPat setting p_pat to NULL. - + FcFontMatch FcPattern *FcFontMatch (FcConfig *config, FcPattern *p, FcResult *result) Returns the font in 'config' most close matching 'p'. This function should be called only after FcConfigSubstitute and FcDefaultSubstitute have been called for 'p'; otherwise the results will not be correct. - + FcFontSort FcFontSet *FcFontSort (FcConfig *config, FcPattern *p, FcBool trim, FcCharSet **csp, FcResult *result) @@ -931,7 +937,7 @@ 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 caling FcFontSetDestroy. - + FcFontRenderPrepare FcPattern *FcFontRenderPrepare (FcConfig *config, FcPattern *pat, FcPattern *font) @@ -939,13 +945,13 @@ 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 FcConfigSubstitute with 'kind' FcMatchFont and then returned. - + FcFontList FcFontSet *FcFontList (FcConfig *config, FcPattern *p, FcObjectSet *os) Selects fonts matching 'p', creates patterns from those fonts containing only the objects in 'os' and returns the set of unique such patterns. - + FcConfigFilename char *FcConfigFilename (const char *name) @@ -960,7 +966,7 @@ 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 FC_CONFIG_DIR environment variable. - + Initialization @@ -971,13 +977,13 @@ FcConfig *FcInitLoadConfig (void) Loads the default configuration file and returns the resulting configuration. Does not load any font information. - + FcInitLoadConfigAndFonts FcConfig *FcInitLoadConfigAndFonts (void) Loads the default configuration file and builds information about the available fonts. Returns the resulting configuration. - + FcInit FcBool FcInit (void) @@ -985,25 +991,25 @@ 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. - + FcGetVersion int FcGetVersion (void) Returns the version number of the library. - + FcInitReinitialize FcBool FcInitReinitialize (void) Forces the default configuration file to be reloaded and resets the default configuration. - + FcInitBringUptoDate FcBool FcInitBringUptoDate (void) 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. - + FcAtomic @@ -1018,45 +1024,45 @@ 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 FcBool FcAtomicLock (FcAtomic *atomic) Attempts to lock the file referenced by 'atomic'. Returns FcFalse if the file is locked by another process, else returns FcTrue and leaves the file locked. - + FcAtomicNewFile FcChar8 *FcAtomicNewFile (FcAtomic *atomic) Returns the filename for writing a new version of the file referenced by 'atomic'. - + FcAtomicOrigFile FcChar8 *FcAtomicOrigFile (FcAtomic *atomic) Returns the file refernced by 'atomic'. - + FcAtomicReplaceOrig FcBool FcAtomicReplaceOrig (FcAtomic *atomic) Replaces the original file referenced by 'atomic' with the new file. - + FcAtomicDeleteNew void FcAtomicDeleteNew (FcAtomic *atomic) Deletes the new file. - + FcAtomicUnlock void FcAtomicUnlock (FcAtomic *atomic) Unlocks the file. - + FcAtomicDestroy void FcAtomicDestroy (FcAtomic *atomic) Destroys 'atomic'. - + FreeType specific functions @@ -1075,7 +1081,7 @@ 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 FcCharSet *FcFreeTypeCharSet (FT_Face face, FcBlanks *blanks) Scans a @@ -1083,13 +1089,13 @@ FreeType face and returns the set of encoded Unicode chars. This scans several encoding tables to build as complete a list as possible. If 'blanks' is not 0, the glyphs in the font are examined and any blank glyphs not in 'blanks' are not placed in the returned FcCharSet. - + FcFreeTypeQuery FcPattern *FcFreeTypeQuery (const char *file, int id, FcBlanks *blanks, int *count) Constructs a pattern representing the 'id'th font in 'file'. The number of fonts in 'file' is returned in 'count'. - + XML specific functions FcConfigParseAndLoad @@ -1099,7 +1105,7 @@ Walks the configuration in 'file' and constructs the internal representation in 'config'. Any include files referenced from within 'file' will be loaded with FcConfigLoad and also parsed. If 'complain' is FcFalse, no warning will be displayed if 'file' does not exist. - + File and Directory routines FcFileScan @@ -1108,7 +1114,7 @@ FcBool FcFileScan (FcFontSet *set, FcStrSet *dirs, FcFileCache *cache, FcBlanks 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'. - + FcDirScan FcBool FcDirScan (FcFontSet *set, FcStrSet *dirs, FcFileCache *cache, FcBlanks *blanks, const char *dir, FcBool force) @@ -1116,19 +1122,19 @@ Scans an entire directory and adds all fonts found to 'set'. If 'force' is FcTrue, then the directory and all files within it are scanned even if information is present in the per-directory cache file or 'cache'. Any subdirectories found are added to 'dirs'. - + FcDirSave FcBool FcDirSave (FcFontSet *set, FcStrSet *dirs, const char *dir) Creates the per-directory cache file for 'dir' and populates it with the fonts in 'set' and subdirectories in 'dirs'. - + FcDirCacheValid FcBool FcDirCacheValid (const FcChar8 *cache_file) Returns FcTrue if 'cache_file' is no older than the directory containing it, else FcFalse. - + FcStrSet and FcStrList @@ -1139,49 +1145,49 @@ scanning the configuration as directories are added while scanning. FcStrSet *FcStrSetCreate (void) Create an empty set. - + FcStrSetMember FcBool FcStrSetMember (FcStrSet *set, const FcChar8 *s) Returns whether 's' is a member of 'set'. - + FcStrSetAdd FcBool FcStrSetAdd (FcStrSet *set, const FcChar8 *s) Adds a copy of 's' to 'set'. - + FcStrSetAddFilename FcBool FcStrSetAddFilename (FcStrSet *set, const FcChar8 *s) 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 FcBool FcStrSetDel (FcStrSet *set, const FcChar8 *s) Removes 's' from 'set', returning FcTrue if 's' was a member else FcFalse. - + FcStrSetDestroy void FcStrSetDestroy (FcStrSet *set) Destroys 'set'. - + FcStrListCreate FcStrList *FcStrListCreate (FcStrSet *set) Creates an enumerator to list the strings in 'set'. - + FcStrListNext FcChar8 *FcStrListNext (FcStrList *list) Returns the next string in 'set'. - + FcStrListDone void FcStrListDone (FcStrList *list) Destroys the enumerator 'list'. - + String utilities FcUtf8ToUcs4 @@ -1191,8 +1197,7 @@ int FcUtf8ToUcs4 (FcChar8 *src, FcChar32 *dst, int len) Converts the next Unicode char from 'src' into 'dst' and returns the number of bytes containing the char. 'src' nust be at least 'len' bytes long. - - + FcUcs4ToUtf8 int FcUcs4ToUtf8 (FcChar32 src, FcChar8 dst[FC_UTF8_MAX_LEN]) @@ -1234,7 +1239,7 @@ FcChar8 *FcStrCopyFilename (const FcChar8 *s) Just like FcStrCopy except that it converts any leading '~' characters in 's' to the value of the HOME environment variable. - + FcStrCmpIgnoreCase int FcStrCmpIgnoreCase (const char *s1, const char *s2) diff --git a/doc/fontconfig-user.sgml b/doc/fontconfig-user.sgml index f243f6d..49c6065 100644 --- a/doc/fontconfig-user.sgml +++ b/doc/fontconfig-user.sgml @@ -252,7 +252,7 @@ following structure: ... </fontconfig> - + <fontconfig> This is the top level element for a font configuration and can contain <dir>, <cache>, <include>, <match> and <alias> elements in any order. @@ -385,6 +385,8 @@ symbolic names for common font values: + + <or>, <and>, <plus>, @@ -393,6 +395,8 @@ symbolic names for common font values: <divide> These elements perform the specified operation on a list of expression elements. <or> and <and> are boolean, not bitwise. + + <eq>, <not_eq>, <less>, @@ -506,6 +510,7 @@ This is an example of a system-wide configuration file </alias> </fontconfig> </programlisting> + </sect2> <sect2><title>User configuration file This is an example of a per-user configuration file that lives in @@ -533,6 +538,7 @@ This is an example of a per-user configuration file that lives in </fontconfig> + FILES fonts.conf diff --git a/fc-cache/Makefile.am b/fc-cache/Makefile.am index bb2201d..ce51890 100644 --- a/fc-cache/Makefile.am +++ b/fc-cache/Makefile.am @@ -23,6 +23,8 @@ INCLUDES=$(FREETYPE_CFLAGS) +man1_MANS=fc-cache.man + bin_PROGRAMS=fc-cache fc_cache_LDADD = ../src/libfontconfig.la diff --git a/fc-lang/Makefile.am b/fc-lang/Makefile.am index 342dea6..fd4ba0e 100644 --- a/fc-lang/Makefile.am +++ b/fc-lang/Makefile.am @@ -31,6 +31,8 @@ noinst_PROGRAMS=fc-lang noinst_HEADERS=$(TARG) +noinst_MANS=fc-lang.man + ORTH=@ORTH_FILES@ EXTRA_DIST=$(TMPL) $(ORTH) diff --git a/fc-list/Makefile.am b/fc-list/Makefile.am index f9390d0..51c2803 100644 --- a/fc-list/Makefile.am +++ b/fc-list/Makefile.am @@ -23,6 +23,8 @@ bin_PROGRAMS=fc-list +man1_MANS=fc-list.man + INCLUDES=$(FREETYPE_CFLAGS) fc_list_LDADD = ../src/libfontconfig.la diff --git a/fontconfig.spec.in b/fontconfig.spec.in index 718198f..f725484 100644 --- a/fontconfig.spec.in +++ b/fontconfig.spec.in @@ -1,74 +1,86 @@ -Summary: System for configuring and customizing font access +# Different systems call the freetype2 RPM different things +%define freetype2 freetype +# %define freetype2 freetype2 + +Summary: Font configuration and customization library Name: fontconfig Version: @VERSION@ Release: 1 License: MIT Group: System Environment/Libraries -Source: http://fontconfig.org/fontconfig.tar.gz -BuildRoot: /var/tmp/%{name}-%{version}-root -Requires: freetype2 -BuildRequires: freetype2-devel +Source: http://fontconfig.org/release/fontconfig-%{vesion}.tar.gz +URL: http://fontconfig.org +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +BuildRequires: /usr/bin/docbook2html +BuildRequires: /usr/bin/docbook2txt +BuildRequires: %{freetype2}-devel +BuildRequires: expat-devel +BuildRequires: perl + +PreReq: %{freetype2} %description -System for layout and rendering of internationalized text. +Fontconfig is designed to locate fonts within the +system and select them according to requirements specified by +applications. %package devel -Summary: System for layout and rendering of internationalized text +Summary: Font configuration and customization library Group: Development/Libraries Requires: %{name} = %{version} -Requires: freetype2-devel +Requires: %{freetype2}-devel %description devel -The fontconfig-devel package includes the static libraries and header files -for the fontconfig package. +The fontconfig-devel package includes the static libraries, +header files, and developer docs for the fontconfig package. -Install fontconfig-devel if you want to develop programs which will use -fontconfig. +Install fontconfig-devel if you want to develop programs which +will use fontconfig. %prep -%setup +%setup -q %build -CFLAGS="$RPM_OPT_FLAGS" -./configure --prefix=%{_prefix} \ - --bindir=%{_bindir} --mandir=%{_mandir} \ - --localstatedir=%{_localstatedir} --libdir=%{_libdir} \ - --datadir=%{_datadir} --includedir=%{_includedir} \ - --sysconfdir=%{_sysconfdir} --disable-gtk-doc -make +%configure --with-x-fonts=/usr/X11R6/lib/X11/fonts +make -j %{_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT - -make prefix=$RPM_BUILD_ROOT%{_prefix} bindir=$RPM_BUILD_ROOT%{_bindir} \ - mandir=$RPM_BUILD_ROOT%{_mandir} libdir=$RPM_BUILD_ROOT%{_libdir} \ - localstatedir=$RPM_BUILD_ROOT%{_localstatedir} \ - datadir=$RPM_BUILD_ROOT%{_datadir} \ - includedir=$RPM_BUILD_ROOT%{_includedir} \ - sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir} install +[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +%makeinstall %clean -rm -rf $RPM_BUILD_ROOT +[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig +# Force regeneration of all fontconfig cache files. +fc-cache -f --system-only + %postun -p /sbin/ldconfig %files -%doc README AUTHORS COPYING ChangeLog TODO -%{_libdir}/libfontconfig*.so +%doc README AUTHORS COPYING ChangeLog doc/fontconfig-*.{html,txt} +%{_libdir}/libfontconfig*.so.* %{_bindir}/fc-* -%{_libdir}/pango -%config %{_sysconfdir}/fonts/fonts.conf -%config %{_sysconfdir}/fonts/fonts.dtd +%dir %{_sysconfdir}/fonts +%{_sysconfdir}/fonts/fonts.conf +%{_sysconfdir}/fonts/fonts.dtd %config %{_sysconfdir}/fonts/local.conf +%{_mandir}/man1/* %files devel %defattr(-, root, root) -%{_libdir}/libfontconfig*.so -%{_libdir}/*a -%{_libdir}/pkgconfig/*.pc +%{_libdir}/libfontconfig.so +%{_libdir}/*.a +%{_libdir}/*.la +%{_libdir}/pkgconfig %{_includedir}/fontconfig %changelog +* Sun Mar 2 2003 Owen Taylor +- Various improvements from Red Hat spec file + +* Sun Mar 2 2003 Mike A. Harris 2.1.90-0.1 +- Initial changelog entry -- 2.39.2