[Fontconfig] fontconfig: Branch 'master'

[Behdad Esfahbod]

 doc/fontconfig-devel.sgml |    2 ++
 doc/fontconfig-user.sgml  |    1 +
 fontconfig/fontconfig.h   |    1 +
 src/fcobjs.h              |    1 +
 4 files changed, 5 insertions(+)

New commits:
commit 3f84695104b169fe25742ba3b91d04467f5debc4
Author: Akira TAGOH <akira at tagoh.org>
Date:   Tue Sep 4 12:39:48 2012 +0900

    Bug 50497 - RFE: Add OpenType feature tags support
    
    Add FC_FONT_FEATURES to store the feature tags to be enabled.

diff --git a/doc/fontconfig-devel.sgml b/doc/fontconfig-devel.sgml
index 79cceb1..b35ef9a 100644
--- a/doc/fontconfig-devel.sgml
+++ b/doc/fontconfig-devel.sgml
@@ -190,6 +190,8 @@ convenience for the application's rendering mechanism.
                                                   the font
     embolden       FC_EMBOLDEN            Bool    Rasterizer should
                                                   synthetically embolden the font
+    fontfeatures   FC_FONT_FEATURES       String  List of the feature tags in
+                                                  OpenType to be enabled
     namelang       FC_NAMELANG            String  Language name to be used for the
                                                   default value of familylang,
                                                   stylelang and fullnamelang
diff --git a/doc/fontconfig-user.sgml b/doc/fontconfig-user.sgml
index c842371..068b1fc 100644
--- a/doc/fontconfig-user.sgml
+++ b/doc/fontconfig-user.sgml
@@ -131,6 +131,7 @@ convenience for the applications' rendering mechanism.
   fontversion     Int     Version number of the font
   capability      String  List of layout capabilities in the font
   embolden        Bool    Rasterizer should synthetically embolden the font
+  fontfeatures    String  List of the feature tags in OpenType to be enabled
     </programlisting>
   </refsect2>
   <refsect2>
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 52e9438..3676fc1 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -112,6 +112,7 @@ typedef int		FcBool;
 #define FC_EMBEDDED_BITMAP  "embeddedbitmap"	/* Bool - true to enable embedded bitmaps */
 #define FC_DECORATIVE	    "decorative"	/* Bool - true if style is a decorative variant */
 #define FC_LCD_FILTER	    "lcdfilter"		/* Int */
+#define FC_FONT_FEATURES    "fontfeatures"	/* String */
 #define FC_NAMELANG	    "namelang"		/* String RFC 3866 langs */
 
 #define FC_CACHE_SUFFIX		    ".cache-" FC_CACHE_VERSION
diff --git a/src/fcobjs.h b/src/fcobjs.h
index 1e9067e..cbe0190 100644
--- a/src/fcobjs.h
+++ b/src/fcobjs.h
@@ -41,4 +41,5 @@ FC_OBJECT (EMBEDDED_BITMAP,	FcTypeBool)
 FC_OBJECT (DECORATIVE,		FcTypeBool)
 FC_OBJECT (LCD_FILTER,		FcTypeInteger)
 FC_OBJECT (NAMELANG,		FcTypeString)
+FC_OBJECT (FONT_FEATURES,	FcTypeString)
 /* ^-------------- Add new objects here. */