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

[Keith Packard]

 .gitignore                |    3 +++
 doc/fclangset.fncs        |    2 +-
 doc/fontconfig-devel.sgml |   31 +++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)

New commits:
commit 69d3eb9cb8e58ab771170f68868748204a4793ab
Author: Keith Packard <keithp at koto.keithp.com>
Date:   Sat Nov 3 23:43:48 2007 -0700

    Ignore new generated documentation

diff --git a/.gitignore b/.gitignore
index 66a71cf..c1bd6ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,12 +34,15 @@ doc/confdir.sgml
 doc/edit-sgml
 doc/fcatomic.sgml
 doc/fcblanks.sgml
+doc/fccache.sgml
 doc/fccharset.sgml
 doc/fcconfig.sgml
 doc/fcconstant.sgml
+doc/fcdircache.sgml
 doc/fcfile.sgml
 doc/fcfontset.sgml
 doc/fcfreetype.sgml
+doc/fclangset.sgml
 doc/fcinit.sgml
 doc/fcmatrix.sgml
 doc/fcobjectset.sgml
commit dc7b6f1d79b5508706be9242b79180727701e54f
Author: Keith Packard <keithp at koto.keithp.com>
Date:   Sat Nov 3 23:42:32 2007 -0700

    Link new function documentation into the fontconfig-devel.sgml

diff --git a/doc/fontconfig-devel.sgml b/doc/fontconfig-devel.sgml
index 3f91e64..8231b3f 100644
--- a/doc/fontconfig-devel.sgml
+++ b/doc/fontconfig-devel.sgml
@@ -1,13 +1,16 @@
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
 <!ENTITY fcatomic SYSTEM "fcatomic.sgml">
 <!ENTITY fcblanks SYSTEM "fcblanks.sgml">
+<!ENTITY fccache SYSTEM "fccache.sgml">
 <!ENTITY fccharset SYSTEM "fccharset.sgml">
 <!ENTITY fcconfig SYSTEM "fcconfig.sgml">
 <!ENTITY fcconstant SYSTEM "fcconstant.sgml">
+<!ENTITY fcdircache SYSTEM "fcdircache.sgml">
 <!ENTITY fcfile SYSTEM "fcfile.sgml">
 <!ENTITY fcfontset SYSTEM "fcfontset.sgml">
 <!ENTITY fcfreetype SYSTEM "fcfreetype.sgml">
 <!ENTITY fcinit SYSTEM "fcinit.sgml">
+<!ENTITY fclangset SYSTEM "fclangset.sgml">
 <!ENTITY fcmatrix SYSTEM "fcmatrix.sgml">
 <!ENTITY fcobjectset SYSTEM "fcobjectset.sgml">
 <!ENTITY fcobjecttype SYSTEM "fcobjecttype.sgml">
@@ -406,6 +409,15 @@ Used for locking access to config files.  Provides a safe way to update
 configuration files.
     </para>
   </sect2>
+  <sect2><title>FcCache</title>
+    <para>
+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.
+    </para>
+  </sect2>
 </sect1>
 <sect1><title>FUNCTIONS</title>
   <para>
@@ -468,6 +480,16 @@ return it's argument, and that CharSet may remain unmodifiable.
     </para>
     &fccharset;
   </sect2>
+  <sect2><title>FcLangSet</title>
+    <para>
+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.
+    </para>
+    &fclangset;
+  </sect2>
   <sect2><title>FcMatrix</title>
     <para>
 FcMatrix structures hold an affine transformation in matrix form.
@@ -519,6 +541,15 @@ These routines work with font files and directories, including font
 directory cache files.
     </para>
     &fcfile;
+    &fcdircache;
+  </sect2>
+  <sect2><title>FcCache routines</title>
+    <para>
+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.
+    </para>
+    &fccache;
   </sect2>
   <sect2><title>FcStrSet and FcStrList</title>
     <para>
commit dac27f2f1a766b042487827c726b3ccae147d282
Author: Keith Packard <keithp at koto.keithp.com>
Date:   Sat Nov 3 23:41:38 2007 -0700

    Formatting syntax mistake in doc/fclangset.fncs.
    
    <parameter>ls</function> needed to be <parameter>ls</parameter>.

diff --git a/doc/fclangset.fncs b/doc/fclangset.fncs
index eb4a937..8ae5f5c 100644
--- a/doc/fclangset.fncs
+++ b/doc/fclangset.fncs
@@ -103,7 +103,7 @@ the same language and territory combinations as <parameter>ls_b</parameter>.
 @DESC@
 This function returns a value which depends solely on the languages
 supported by <parameter>ls</parameter>. Any language which equals
-<parameter>ls</function> will have the same result from
+<parameter>ls</parameter> will have the same result from
 <function>FcLangSetHash</function>. However, two langsets with the same hash
 value may not be equal.
 @@