[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 doc/fontconfig-devel.sgml |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit af5864419441e12f1951c7cfd0a742b6316934cc
Author: Nick Alcock <nick.alcock at oracle.com>
Date:   Sat Dec 13 18:21:16 2014 +0000

    Generate documentation for FcWeight* functions.
    
    The SGML for these functions exists, and they are named as manpages,
    but because they are not mentioned in fontconfig-devel.sgml, no
    documentation is ever generated, and installation under --enable-docs
    fails.
    
    (The documentation I have written in fontconfig-devel.sgml is boilerplate
    so I can get the manpages generated. It's probably wrong.)

diff --git a/doc/fontconfig-devel.sgml b/doc/fontconfig-devel.sgml
index 9f3613a..7410ef0 100644
--- a/doc/fontconfig-devel.sgml
+++ b/doc/fontconfig-devel.sgml
@@ -20,6 +20,7 @@
 <!ENTITY fcstring SYSTEM "fcstring.sgml">
 <!ENTITY fcstrset SYSTEM "fcstrset.sgml">
 <!ENTITY fcvalue SYSTEM "fcvalue.sgml">
+<!ENTITY fcweight SYSTEM "fcweight.sgml">
 <!ENTITY version SYSTEM "version.sgml">
 ]>
 <!--
@@ -537,6 +538,12 @@ Provides for application-specified symbolic constants for font names.
     </para>
     &fcconstant;
   </sect2>
+  <sect2><title>FcWeight</title>
+    <para>
+Maps weights to and from OpenType weights.
+    </para>
+  &fcweight;
+  </sect2>
   <sect2><title>FcBlanks</title>
     <para>
 An FcBlanks object holds a list of Unicode chars which are expected to