Commit f2772d6b authored by Keith Packard's avatar Keith Packard
Browse files

Replace incorrect documentation uses of 'char' with 'FcChar8' (bug 13002).

parent b4a3e834
...@@ -123,7 +123,7 @@ filesystem. ...@@ -123,7 +123,7 @@ filesystem.
Returns the list of known configuration files used to generate <parameter>config</parameter>. Returns the list of known configuration files used to generate <parameter>config</parameter>.
@@ @@
@RET@ char * @RET@ FcChar8 *
@FUNC@ FcConfigGetCache @FUNC@ FcConfigGetCache
@TYPE1@ FcConfig * @ARG1@ config @TYPE1@ FcConfig * @ARG1@ config
@PURPOSE@ DEPRECATED used to return per-user cache filename @PURPOSE@ DEPRECATED used to return per-user cache filename
...@@ -183,7 +183,7 @@ Sets the rescan interval; returns FcFalse if an error occurred. ...@@ -183,7 +183,7 @@ Sets the rescan interval; returns FcFalse if an error occurred.
@RET@ FcBool @RET@ FcBool
@FUNC@ FcConfigAppFontAddFile @FUNC@ FcConfigAppFontAddFile
@TYPE1@ FcConfig * @ARG1@ config @TYPE1@ FcConfig * @ARG1@ config
@TYPE2@ const char * @ARG2@ file @TYPE2@ const FcChar8 * @ARG2@ file
@PURPOSE@ Add font file to font database @PURPOSE@ Add font file to font database
@DESC@ @DESC@
Adds an application-specific font to the configuration. Adds an application-specific font to the configuration.
...@@ -192,7 +192,7 @@ Adds an application-specific font to the configuration. ...@@ -192,7 +192,7 @@ Adds an application-specific font to the configuration.
@RET@ FcBool @RET@ FcBool
@FUNC@ FcConfigAppFontAddDir @FUNC@ FcConfigAppFontAddDir
@TYPE1@ FcConfig * @ARG1@ config @TYPE1@ FcConfig * @ARG1@ config
@TYPE2@ const char * @ARG1@ dir @TYPE2@ const FcChar8 * @ARG2@ dir
@PURPOSE@ Add fonts from directory to font database @PURPOSE@ Add fonts from directory to font database
@DESC@ @DESC@
Scans the specified directory for fonts, adding each one found to the Scans the specified directory for fonts, adding each one found to the
...@@ -291,9 +291,9 @@ Selects fonts matching <parameter>p</parameter>, creates patterns from those fon ...@@ -291,9 +291,9 @@ Selects fonts matching <parameter>p</parameter>, creates patterns from those fon
only the objects in <parameter>os</parameter> and returns the set of unique such patterns. only the objects in <parameter>os</parameter> and returns the set of unique such patterns.
@@ @@
@RET@ char * @RET@ FcChar8 *
@FUNC@ FcConfigFilename @FUNC@ FcConfigFilename
@TYPE1@ const char * @ARG1@ name @TYPE1@ const FcChar8 * @ARG1@ name
@PURPOSE@ Find a config file @PURPOSE@ Find a config file
@DESC@ @DESC@
Given the specified external entity name, return the associated filename. Given the specified external entity name, return the associated filename.
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
@TYPE2@ FcStrSet * @ARG2@ dirs @TYPE2@ FcStrSet * @ARG2@ dirs
@TYPE3@ FcFileCache * @ARG3@ cache @TYPE3@ FcFileCache * @ARG3@ cache
@TYPE4@ FcBlanks * @ARG4@ blanks @TYPE4@ FcBlanks * @ARG4@ blanks
@TYPE5@ const char * @ARG5@ file @TYPE5@ const FcChar8 * @ARG5@ file
@TYPE6@ FcBool% @ARG6@ force @TYPE6@ FcBool% @ARG6@ force
@PURPOSE@ scan a font file @PURPOSE@ scan a font file
@DESC@ @DESC@
...@@ -59,7 +59,7 @@ returns FcFalse. ...@@ -59,7 +59,7 @@ returns FcFalse.
@TYPE2@ FcStrSet * @ARG2@ dirs @TYPE2@ FcStrSet * @ARG2@ dirs
@TYPE3@ FcFileCache * @ARG3@ cache @TYPE3@ FcFileCache * @ARG3@ cache
@TYPE4@ FcBlanks * @ARG4@ blanks @TYPE4@ FcBlanks * @ARG4@ blanks
@TYPE5@ const char * @ARG5@ dir @TYPE5@ const FcChar8 * @ARG5@ dir
@TYPE6@ FcBool% @ARG6@ force @TYPE6@ FcBool% @ARG6@ force
@PURPOSE@ scan a font directory @PURPOSE@ scan a font directory
@DESC@ @DESC@
...@@ -76,7 +76,7 @@ fontconfig selects which fonts to include. ...@@ -76,7 +76,7 @@ fontconfig selects which fonts to include.
@FUNC@ FcDirSave @FUNC@ FcDirSave
@TYPE1@ FcFontSet * @ARG1@ set @TYPE1@ FcFontSet * @ARG1@ set
@TYPE2@ FcStrSet * @ARG2@ dirs @TYPE2@ FcStrSet * @ARG2@ dirs
@TYPE3@ const char * @ARG3@ dir @TYPE3@ const FcChar8 * @ARG3@ dir
@PURPOSE@ save a directory cache @PURPOSE@ save a directory cache
@DESC@ @DESC@
Creates the per-directory cache file for <parameter>dir</parameter> and Creates the per-directory cache file for <parameter>dir</parameter> and
......
...@@ -80,7 +80,7 @@ widths. ...@@ -80,7 +80,7 @@ widths.
#include &lt;fcfreetype.h&gt; #include &lt;fcfreetype.h&gt;
@RET@ FcPattern * @RET@ FcPattern *
@FUNC@ FcFreeTypeQuery @FUNC@ FcFreeTypeQuery
@TYPE1@ const char * @ARG1@ file @TYPE1@ const FcChar8 * @ARG1@ file
@TYPE2@ int% @ARG2@ id @TYPE2@ int% @ARG2@ id
@TYPE3@ FcBlanks * @ARG3@ blanks @TYPE3@ FcBlanks * @ARG3@ blanks
@TYPE4@ int * @ARG4@ count @TYPE4@ int * @ARG4@ count
...@@ -96,7 +96,7 @@ of fonts in 'file' is returned in 'count'. ...@@ -96,7 +96,7 @@ of fonts in 'file' is returned in 'count'.
@RET@ FcPattern * @RET@ FcPattern *
@FUNC@ FcFreeTypeQueryFace @FUNC@ FcFreeTypeQueryFace
@TYPE1@ const FT_Face% @ARG1@ face @TYPE1@ const FT_Face% @ARG1@ face
@TYPE2@ const char * @ARG2@ file @TYPE2@ const FcChar8 * @ARG2@ file
@TYPE3@ int% @ARG3@ id @TYPE3@ int% @ARG3@ id
@TYPE4@ FcBlanks * @ARG4@ blanks @TYPE4@ FcBlanks * @ARG4@ blanks
@PURPOSE@ compute pattern from FT_Face @PURPOSE@ compute pattern from FT_Face
......
...@@ -132,7 +132,7 @@ values added to the list have binding <parameter>weak</parameter> instead of <pa ...@@ -132,7 +132,7 @@ values added to the list have binding <parameter>weak</parameter> instead of <pa
@FUNC++@ FcPatternAddString @FUNC++@ FcPatternAddString
@TYPE1++@ FcPattern * @ARG1++@ p @TYPE1++@ FcPattern * @ARG1++@ p
@TYPE2++@ const char * @ARG2++@ object @TYPE2++@ const char * @ARG2++@ object
@TYPE3++@ const char * @ARG3++@ s @TYPE3++@ const FcChar8 * @ARG3++@ s
@PROTOTYPE+++@ @PROTOTYPE+++@
@RET+++@ FcBool @RET+++@ FcBool
...@@ -214,7 +214,7 @@ within the pattern directly. Applications must not free this value. ...@@ -214,7 +214,7 @@ within the pattern directly. Applications must not free this value.
@TYPE1++@ FcPattern * @ARG1++@ p @TYPE1++@ FcPattern * @ARG1++@ p
@TYPE2++@ const char * @ARG2++@ object @TYPE2++@ const char * @ARG2++@ object
@TYPE3++@ int% @ARG3++@ n @TYPE3++@ int% @ARG3++@ n
@TYPE4++@ char **const @ARG4++@ s @TYPE4++@ FcChar8 ** @ARG4++@ s
@PROTOTYPE+++@ @PROTOTYPE+++@
@RET+++@ FcResult @RET+++@ FcResult
...@@ -356,7 +356,7 @@ specified point size (default 12), dpi (default 75) and scale (default 1). ...@@ -356,7 +356,7 @@ specified point size (default 12), dpi (default 75) and scale (default 1).
@RET@ FcPattern * @RET@ FcPattern *
@FUNC@ FcNameParse @FUNC@ FcNameParse
@TYPE1@ const char * @ARG1@ name @TYPE1@ const FcChar8 * @ARG1@ name
@PURPOSE@ Parse a pattern string @PURPOSE@ Parse a pattern string
@DESC@ @DESC@
Converts <parameter>name</parameter> from the standard text format described above into a pattern. Converts <parameter>name</parameter> from the standard text format described above into a pattern.
......
...@@ -269,7 +269,7 @@ types. The 'type' tag indicates which member is valid. ...@@ -269,7 +269,7 @@ types. The 'type' tag indicates which member is valid.
FcTypeVoid (none) (none) FcTypeVoid (none) (none)
FcTypeInteger i int FcTypeInteger i int
FcTypeDouble d double FcTypeDouble d double
FcTypeString s char * FcTypeString s FcChar8 *
FcTypeBool b b FcTypeBool b b
FcTypeMatrix m FcMatrix * FcTypeMatrix m FcMatrix *
FcTypeCharSet c FcCharSet * FcTypeCharSet c FcCharSet *
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment