Change PangoFc font loading API such that PangoContext is not passed down.

2009-01-09  Behdad Esfahbod  <behdad@gnome.org>

        * docs/pango-sections.txt:
        * docs/tmpl/pangofc-fontmap.sgml:
        * docs/tmpl/text-attributes.sgml:
        * pango/pangocairo-fc.h:
        * pango/pangocairo-fcfont.c (get_font_size), (get_gravity_class),
        (get_gravity), (_pango_cairo_fc_font_new):
        * pango/pangocairo-fcfontmap.c
        (pango_cairo_fc_font_map_font_key_substitute),
        (pango_cairo_fc_font_map_create_font),
        (pango_cairo_fc_font_map_class_init):
        * pango/pangofc-font.c (_pango_fc_font_get_font_key),
        (_pango_fc_font_set_font_key):
        * pango/pangofc-fontmap.c (pango_fc_font_key_equal),
        (pango_fc_font_key_hash), (pango_fc_font_key_free),
        (pango_fc_font_key_copy), (get_context_matrix),
        (pango_fc_font_key_init), (pango_fc_font_key_get_pattern),
        (pango_fc_font_key_get_matrix),
        (pango_fc_font_key_get_context_key), (pango_fc_font_map_init),
        (pango_fc_font_map_class_init), (pango_fc_font_map_add),
        (_pango_fc_font_map_remove), (pango_fc_make_pattern),
        (pango_fc_font_map_new_font), (pango_fc_default_substitute),
        (pango_fc_font_map_get_patterns), (pango_fc_font_map_load_fontset):
        * pango/pangofc-fontmap.h:
        * pango/pangofc-private.h:
        Change PangoFc font loading API such that PangoContext is not passed
        down.  We use a new opaque struct called PangoFcFontKey.  This struct
        is in fact our font hash key.  This avoids problems where previously
        we were using context members that were not necessarily considered
        by the pangofc layer when caching.
        This is in preparation for lazy loading of fonts in the pangofc fontmap.

svn path=/trunk/; revision=2804

3 files changed, 42 insertions, 1 deletions

diff --git a/docs/pango-sections.txt b/docs/pango-sections.txt
index b4809b50..9e42923e 100644
--- a/docs/pango-sections.txt
+++ b/docs/pango-sections.txt
@@ -933,11 +933,18 @@ PANGO_FC_FONT_MAP_CLASS
 PANGO_IS_FC_FONT_MAP_CLASS
 PANGO_FC_FONT_MAP_GET_CLASS
 
+<SUBSECTION>
+PangoFcFontKey
+pango_fc_font_key_get_context_key
+pango_fc_font_key_get_matrix
+pango_fc_font_key_get_pattern
+
 <SUBSECTION Private>
 PangoFcFontMapPrivate
 pango_fc_font_map_get_type
 </SECTION>
 
+
 <SECTION>
 <FILE>pangofc-font</FILE>
 <TITLE>PangoFcFont</TITLE>
diff --git a/docs/tmpl/pangofc-fontmap.sgml b/docs/tmpl/pangofc-fontmap.sgml
index 5d85676c..6800d30a 100644
--- a/docs/tmpl/pangofc-fontmap.sgml
+++ b/docs/tmpl/pangofc-fontmap.sgml
@@ -53,7 +53,7 @@ Fontconfig-based backend involves deriving from both
 @context_key_free: 
 @context_key_hash: 
 @context_key_equal: 
-@context_substitute: 
+@font_key_substitute:
 @create_font: 
 
 <!-- ##### FUNCTION pango_fc_font_map_create_context ##### -->
@@ -133,3 +133,36 @@ Fontconfig-based backend involves deriving from both
 
 
 
+<!-- ##### STRUCT PangoFcFontKey ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION pango_fc_font_key_get_context_key ##### -->
+<para>
+
+</para>
+
+@key:
+@Returns:
+
+
+<!-- ##### FUNCTION pango_fc_font_key_get_matrix ##### -->
+<para>
+
+</para>
+
+@key:
+@Returns:
+
+
+<!-- ##### FUNCTION pango_fc_font_key_get_pattern ##### -->
+<para>
+
+</para>
+
+@key:
+@Returns:
+
+
diff --git a/docs/tmpl/text-attributes.sgml b/docs/tmpl/text-attributes.sgml
index 050fe594..57469b8a 100644
--- a/docs/tmpl/text-attributes.sgml
+++ b/docs/tmpl/text-attributes.sgml
@@ -99,6 +99,7 @@ such that the attribute covers from the beginning of the text.
 Since: 1.24
 
 
+
 <!-- ##### MACRO PANGO_ATTR_INDEX_TO_TEXT_END ##### -->
 <para>
 This value can be used to set the end_index member of a #PangoAttribute