Bug 471601 – Pass pango version information to fontconfig

2007-10-24  Behdad Esfahbod  <behdad@gnome.org>

        Bug 471601 – Pass pango version information to fontconfig

        * pango/pangofc-fontmap.h:
        New public API:

                PANGO_FC_GRAVITY
                PANGO_FC_VERSION

        * pango/pangofc-fontmap.c (pango_fc_make_pattern):
        Set PANGO_FC_VERSION in pattern.

        * docs/pango-sections.txt:
        * docs/tmpl/pangofc-fontmap.sgml:
        Update.

svn path=/trunk/; revision=2461

diff --git a/ChangeLog b/ChangeLog
index 9773889..568001f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 2007-10-24  Behdad Esfahbod  <behdad@gnome.org>
 
+       Bug 471601 – Pass pango version information to fontconfig
+
+       * pango/pangofc-fontmap.h:
+       New public API:
+       
+               PANGO_FC_GRAVITY
+               PANGO_FC_VERSION
+
+       * pango/pangofc-fontmap.c (pango_fc_make_pattern):
+       Set PANGO_FC_VERSION in pattern.
+
+       * docs/pango-sections.txt:
+       * docs/tmpl/pangofc-fontmap.sgml:
+       Update.
+
+2007-10-24  Behdad Esfahbod  <behdad@gnome.org>
+
        Bug 472629 – Add pango_renderer_get_layout(_line)
 
        * pango/pango-renderer.h:

diff --git a/docs/pango-sections.txt b/docs/pango-sections.txt
index bdc0686..5d2da56 100644 (file)
--- a/docs/pango-sections.txt
+++ b/docs/pango-sections.txt
@@ -900,12 +900,14 @@ pango_cairo_atsui_font_get_type
 <TITLE>PangoFcFontMap</TITLE>
 PangoFcFontMap
 PangoFcFontMapClass
-pango_fc_font_description_from_pattern
-pango_fc_font_map_cache_clear
 pango_fc_font_map_create_context
-pango_fc_font_map_shutdown
-pango_fc_font_map_add_decoder_find_func
 PangoFcDecoderFindFunc
+pango_fc_font_map_add_decoder_find_func
+pango_fc_font_map_cache_clear
+pango_fc_font_map_shutdown
+pango_fc_font_description_from_pattern
+PANGO_FC_GRAVITY
+PANGO_FC_VERSION
 <SUBSECTION Standard>
 PANGO_FC_FONT_MAP
 PANGO_IS_FC_FONT_MAP

diff --git a/docs/tmpl/pangofc-fontmap.sgml b/docs/tmpl/pangofc-fontmap.sgml
index 340ad03..02891c7 100644 (file)
--- a/docs/tmpl/pangofc-fontmap.sgml
+++ b/docs/tmpl/pangofc-fontmap.sgml
@@ -56,34 +56,37 @@ Fontconfig-based backend involves deriving from both
 @context_substitute: 
 @create_font: 
 
-<!-- ##### FUNCTION pango_fc_font_description_from_pattern ##### -->
+<!-- ##### FUNCTION pango_fc_font_map_create_context ##### -->
 <para>
 
 </para>
 
-@pattern: 
-@include_size: 
+@fcfontmap: 
 @Returns: 
 
 
-<!-- ##### FUNCTION pango_fc_font_map_cache_clear ##### -->
+<!-- ##### USER_FUNCTION PangoFcDecoderFindFunc ##### -->
 <para>
 
 </para>
 
-@fcfontmap: 
+@pattern: 
+@user_data: 
+@Returns: 
 
 
-<!-- ##### FUNCTION pango_fc_font_map_create_context ##### -->
+<!-- ##### FUNCTION pango_fc_font_map_add_decoder_find_func ##### -->
 <para>
 
 </para>
 
 @fcfontmap: 
-@Returns: 
+@findfunc: 
+@user_data: 
+@dnotify: 
 
 
-<!-- ##### FUNCTION pango_fc_font_map_shutdown ##### -->
+<!-- ##### FUNCTION pango_fc_font_map_cache_clear ##### -->
 <para>
 
 </para>
@@ -91,24 +94,35 @@ Fontconfig-based backend involves deriving from both
 @fcfontmap: 
 
 
-<!-- ##### FUNCTION pango_fc_font_map_add_decoder_find_func ##### -->
+<!-- ##### FUNCTION pango_fc_font_map_shutdown ##### -->
 <para>
 
 </para>
 
 @fcfontmap: 
-@findfunc: 
-@user_data: 
-@dnotify: 
 
 
-<!-- ##### USER_FUNCTION PangoFcDecoderFindFunc ##### -->
+<!-- ##### FUNCTION pango_fc_font_description_from_pattern ##### -->
 <para>
 
 </para>
 
 @pattern: 
-@user_data: 
+@include_size: 
 @Returns: 
 
 
+<!-- ##### MACRO PANGO_FC_GRAVITY ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PANGO_FC_VERSION ##### -->
+<para>
+
+</para>
+
+
+

diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c
index e45bf9d..067d05f 100644 (file)
--- a/pango/pangofc-fontmap.c
+++ b/pango/pangofc-fontmap.c
@@ -834,6 +834,7 @@ pango_fc_make_pattern (const  PangoFontDescription *description,
    * dpi values.
    */
   pattern = FcPatternBuild (NULL,
+                           PANGO_FC_VERSION, FcTypeInteger, pango_version(),
                            FC_WEIGHT, FcTypeInteger, weight,
                            FC_SLANT,  FcTypeInteger, slant,
 #ifdef FC_WIDTH

diff --git a/pango/pangofc-fontmap.h b/pango/pangofc-fontmap.h
index 5eaf9cc..87c1c74 100644 (file)
--- a/pango/pangofc-fontmap.h
+++ b/pango/pangofc-fontmap.h
@@ -172,6 +172,32 @@ void pango_fc_font_map_add_decoder_find_func (PangoFcFontMap        *fcfontmap,
 PangoFontDescription *pango_fc_font_description_from_pattern (FcPattern *pattern,
                                                              gboolean   include_size);
 
+/**
+ * PANGO_FC_GRAVITY:
+ *
+ * String representing a fontconfig property name that Pango sets on any
+ * fontconfig pattern it passes to fontconfig if a #PangoGravity other
+ * than %PangoGravitySouth is desired.
+ *
+ * The property will have a PangoGravity value as a string, like "east".
+ *
+ * Since: 1.20
+ */
+#define PANGO_FC_GRAVITY "pangogravity"
+
+/**
+ * PANGO_FC_VERSION:
+ *
+ * String representing a fontconfig property name that Pango sets on any
+ * fontconfig pattern it passes to fontconfig.
+ *
+ * The property will have an integer value equal to what pango_version()
+ * returns.
+ *
+ * Since: 1.20
+ */
+#define PANGO_FC_VERSION "pangoversion"
+
 G_END_DECLS
 
 #endif /* __PANGO_FC_FONT_MAP_H__ */

diff --git a/pango/pangofc-private.h b/pango/pangofc-private.h
index 27ad576..a8f3c23 100644 (file)
--- a/pango/pangofc-private.h
+++ b/pango/pangofc-private.h
@@ -42,8 +42,6 @@ struct _PangoFcMetricsInfo
    ((d) - PANGO_SCALE_26_6 / 2) / PANGO_SCALE_26_6)
 #define PANGO_UNITS_26_6(d) (PANGO_SCALE_26_6 * (d))
 
-#define PANGO_FC_GRAVITY "pangogravity"
-
 void _pango_fc_font_shutdown (PangoFcFont *fcfont);
 
 void           _pango_fc_font_map_remove          (PangoFcFontMap *fcfontmap,