[Fontconfig] fontconfig: Branch 'master' - 2 commits

[Keith Packard]

 doc/Makefile.am  |    3 +++
 doc/fccache.fncs |    8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 9bfb41ffefe41c90c8b16e155e04e6c6a5a2c1fd
Author: Keith Packard <keithp at koto.keithp.com>
Date:   Sat Nov 3 23:23:55 2007 -0700

    Generate fccache.sgml, fcdircache.sgml and fclangset.sgml.
    
    Just adding the .fncs versions doesn't get these files generated.

diff --git a/doc/Makefile.am b/doc/Makefile.am
index e5c922b..7a9a7c2 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -63,13 +63,16 @@ DOC_FUNCS_FNCS=\
 DOC_FUNCS_SGML=\
 	fcatomic.sgml \
 	fcblanks.sgml \
+	fccache.sgml \
 	fccharset.sgml \
 	fcconfig.sgml \
 	fcconstant.sgml \
+	fcdircache.sgml \
 	fcfile.sgml \
 	fcfontset.sgml \
 	fcfreetype.sgml \
 	fcinit.sgml \
+	fclangset.sgml \
 	fcmatrix.sgml \
 	fcobjectset.sgml \
 	fcobjecttype.sgml \
commit bfdc0047c670b0ac38bf050bbb81e0ef7299aa1f
Author: Keith Packard <keithp at koto.keithp.com>
Date:   Sat Nov 3 23:23:09 2007 -0700

    Fix formatting syntax in doc/fccache.fncs

diff --git a/doc/fccache.fncs b/doc/fccache.fncs
index 0a08632..36db10c 100644
--- a/doc/fccache.fncs
+++ b/doc/fccache.fncs
@@ -32,7 +32,7 @@ This function returns the directory from which the cache was constructed.
 @FUNC@		FcCacheCopySet
 @TYPE1@		const FcCache *			@ARG1@		cache
 @PURPOSE@	Returns a copy of the fontset from <parameter>cache</parameter>
- at DESC
+ at DESC@
 The returned fontset contains each of the font patterns from
 <parameter>cache</parameter>. This fontset may be modified, but the patterns
 from the cache are read-only.
@@ -43,7 +43,7 @@ from the cache are read-only.
 @TYPE1@		const FcCache *			@ARG1@		cache
 @TYPE2@		int				@ARG2@		i
 @PURPOSE@	Return the <parameter>i</parameter>'th subdirectory.
- at DESC
+ at DESC@
 The set of subdirectories stored in a cache file are indexed by this
 function, <parameter>i</parameter> should range from 0 to
 <parameter>n</parameter>-1, where <parameter>n</parameter> is the return
@@ -54,7 +54,7 @@ value from FcCacheNumSubdir.
 @FUNC@		FcCacheNumSubdir
 @TYPE1@		const FcCache *			@ARG1@		cache
 @PURPOSE@	Return the number of subdirectories in <parameter>cache</parameter>.
- at DESC
+ at DESC@
 This returns the total number of subdirectories in the cache.
 @@
 
@@ -62,7 +62,7 @@ This returns the total number of subdirectories in the cache.
 @FUNC@		FcCacheNumFont
 @TYPE1@		const FcCache *			@ARG1@		cache
 @PURPOSE@	Returns the number of fonts in <parameter>cache</parameter>.
- at DESC
+ at DESC@
 This returns the number of fonts which would be included in the return from
 FcCacheCopySet.
 @@