Rework handling of context-specific options: drop get_render_key() and add

2005-07-19  Owen Taylor  <otaylor@redhat.com>

        * pango/pango-fcfontmap.[ch]: Rework handling of context-specific
        options: drop get_render_key() and add a opaque "context
        key" (get_context_key() and friends). Also add a function to get
        the resolution.

        * pango/pango-fcfontmap.c pango/pangofc-font.h:
         - Move the 'lang' into the fontset key lookup and get rid of the
           funky list-of-hash-tables
         - Make lookups of fontsets and fonts dependent on the context key
           for the context.
         - Simplify the pattern/fontset caching to have one finite-size
           cache rather than an infinite first-level and a finite-size
           second level.

        * pango/pangocairo.h pango/pangocairo-private.h
        pango/pangocairo-fontmap.c: Add
        pango_cairo_context_get/set_resolution(),
        pango_cairo_context_set/get_font_options to allow controlling the
        resolution and font rendering options for a specific PangoContext.

        * pango/pangocairo-fcfont.c pango/pangocairo-fcfontmap
        pango/pangocairo-win32font.c: Implement resolution and font
        options handling adapt to related Cairo changes.

        * docs/pango-sections.txt docs/Makefile.am pango/pangowin32.c:
        Doc updates and build fixes.

        * pango/pangofc-fontmap.c (pango_fc_make_pattern): Create
        patterns with FC_SIZE as well as FC_PIXEL_SIZE to work around
        a libgnomeprint bug. (#309477)

22 files changed, 145 insertions, 1 deletions

diff --git a/docs/tmpl/coverage-maps.sgml b/docs/tmpl/coverage-maps.sgml
index d673d65e..5dc89ff1 100644
--- a/docs/tmpl/coverage-maps.sgml
+++ b/docs/tmpl/coverage-maps.sgml
@@ -17,6 +17,9 @@ to represent that information.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### ENUM PangoCoverageLevel ##### -->
 <para>
 Used to indicate how well a font can represent a particular ISO 10646
diff --git a/docs/tmpl/engines.sgml b/docs/tmpl/engines.sgml
index fb7fdfd2..063c7454 100644
--- a/docs/tmpl/engines.sgml
+++ b/docs/tmpl/engines.sgml
@@ -28,6 +28,9 @@ function is used when building a catalog of all available modules.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT PangoEngineInfo ##### -->
 <para>
 The #PangoEngineInfo structure contains information about a particular
diff --git a/docs/tmpl/fonts.sgml b/docs/tmpl/fonts.sgml
index 18adc5cf..4e5caa62 100644
--- a/docs/tmpl/fonts.sgml
+++ b/docs/tmpl/fonts.sgml
@@ -19,6 +19,9 @@ to load a font of a given description.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT PangoFontDescription ##### -->
 <para>
 The #PangoFontDescription structure represents the description
@@ -610,6 +613,15 @@ Returns %TRUE if @object is a #PangoFont.
 @Returns: 
 
 
+<!-- ##### FUNCTION pango_font_get_font_map ##### -->
+<para>
+
+</para>
+
+@font: 
+@Returns: 
+
+
 <!-- ##### STRUCT PangoFontFamily ##### -->
 <para>
 The #PangoFontFamily structure is used to represent a family of related 
diff --git a/docs/tmpl/freetype-fonts.sgml b/docs/tmpl/freetype-fonts.sgml
index 9877c200..b554fe57 100644
--- a/docs/tmpl/freetype-fonts.sgml
+++ b/docs/tmpl/freetype-fonts.sgml
@@ -14,6 +14,9 @@ Functions for shape engines to manipulate FreeType fonts
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT PangoFT2FontMap ##### -->
 <para>
 The #PangoFT2FontMap is the #PangoFontMap implementation for FreeType fonts.
diff --git a/docs/tmpl/glyphs.sgml b/docs/tmpl/glyphs.sgml
index 35b4fbe8..0f9c1bfe 100644
--- a/docs/tmpl/glyphs.sgml
+++ b/docs/tmpl/glyphs.sgml
@@ -17,6 +17,9 @@ glyphs.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### MACRO PANGO_SCALE ##### -->
 <para>
 The PANGO_SCALE macro represents the scale between dimensions used
diff --git a/docs/tmpl/layout.sgml b/docs/tmpl/layout.sgml
index 8f0cb26c..43fdfa55 100644
--- a/docs/tmpl/layout.sgml
+++ b/docs/tmpl/layout.sgml
@@ -19,6 +19,9 @@ at once.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT PangoLayout ##### -->
 <para>
 The #PangoLayout structure represents and entire paragraph
diff --git a/docs/tmpl/main.sgml b/docs/tmpl/main.sgml
index a1b46787..cbb6b880 100644
--- a/docs/tmpl/main.sgml
+++ b/docs/tmpl/main.sgml
@@ -17,6 +17,9 @@ various steps of this process.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT PangoContext ##### -->
 <para>
 The #PangoContext structure stores global information
diff --git a/docs/tmpl/modules.sgml b/docs/tmpl/modules.sgml
index 2d74a8ad..a4dd32ac 100644
--- a/docs/tmpl/modules.sgml
+++ b/docs/tmpl/modules.sgml
@@ -14,6 +14,9 @@ Support for loadable modules
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT PangoIncludedModule ##### -->
 <para>
 The #PangoIncludedModule structure for a statically linked module 
diff --git a/docs/tmpl/opentype.sgml b/docs/tmpl/opentype.sgml
index c8487c13..fde93bee 100644
--- a/docs/tmpl/opentype.sgml
+++ b/docs/tmpl/opentype.sgml
@@ -14,6 +14,9 @@ Obtaining information from OpenType tables
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### TYPEDEF PangoOTTag ##### -->
 <para>
 The <type>PangoOTTag</type> typedef is used to represent TrueType and OpenType
diff --git a/docs/tmpl/pango-engine-lang.sgml b/docs/tmpl/pango-engine-lang.sgml
index 79b08f21..42ddfb07 100644
--- a/docs/tmpl/pango-engine-lang.sgml
+++ b/docs/tmpl/pango-engine-lang.sgml
@@ -14,6 +14,9 @@ Rendering-system independent script engines
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT PangoEngineLang ##### -->
 <para>
 </para>
diff --git a/docs/tmpl/pango-engine-shape.sgml b/docs/tmpl/pango-engine-shape.sgml
index d1aff7d0..8b6c8b98 100644
--- a/docs/tmpl/pango-engine-shape.sgml
+++ b/docs/tmpl/pango-engine-shape.sgml
@@ -14,6 +14,9 @@ Rendering-system dependent script engines
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT PangoEngineShape ##### -->
 <para>
 </para>
diff --git a/docs/tmpl/pango-renderer.sgml b/docs/tmpl/pango-renderer.sgml
index f88a679b..5ffd48bc 100644
--- a/docs/tmpl/pango-renderer.sgml
+++ b/docs/tmpl/pango-renderer.sgml
@@ -18,6 +18,9 @@ destinations can be created.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT PangoRenderer ##### -->
 <para>
 
diff --git a/docs/tmpl/pangocairo.sgml b/docs/tmpl/pangocairo.sgml
index 9223957a..da1d7e3f 100644
--- a/docs/tmpl/pangocairo.sgml
+++ b/docs/tmpl/pangocairo.sgml
@@ -139,6 +139,9 @@ int main (int argc, char **argv)
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT PangoCairoFontMap ##### -->
 <para>
 
@@ -191,6 +194,42 @@ int main (int argc, char **argv)
 @Returns: 
 
 
+<!-- ##### FUNCTION pango_cairo_context_set_resolution ##### -->
+<para>
+
+</para>
+
+@context: 
+@dpi: 
+
+
+<!-- ##### FUNCTION pango_cairo_context_get_resolution ##### -->
+<para>
+
+</para>
+
+@context: 
+@Returns: 
+
+
+<!-- ##### FUNCTION pango_cairo_context_set_font_options ##### -->
+<para>
+
+</para>
+
+@context: 
+@options: 
+
+
+<!-- ##### FUNCTION pango_cairo_context_get_font_options ##### -->
+<para>
+
+</para>
+
+@context: 
+@Returns: 
+
+
 <!-- ##### FUNCTION pango_cairo_update_context ##### -->
 <para>
 
diff --git a/docs/tmpl/pangofc-decoder.sgml b/docs/tmpl/pangofc-decoder.sgml
index ad033b6a..b8191c73 100644
--- a/docs/tmpl/pangofc-decoder.sgml
+++ b/docs/tmpl/pangofc-decoder.sgml
@@ -15,6 +15,9 @@ for handling a font that is encoded in a custom way.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT PangoFcDecoder ##### -->
 <para>
 
diff --git a/docs/tmpl/pangofc-font.sgml b/docs/tmpl/pangofc-font.sgml
index c87b2617..6bea63f4 100644
--- a/docs/tmpl/pangofc-font.sgml
+++ b/docs/tmpl/pangofc-font.sgml
@@ -31,6 +31,9 @@ Fontconfig-based backend involves deriving from both
 </variablelist>
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT PangoFcFont ##### -->
 <para>
 
diff --git a/docs/tmpl/pangofc-fontmap.sgml b/docs/tmpl/pangofc-fontmap.sgml
index 649f8787..e24dc050 100644
--- a/docs/tmpl/pangofc-fontmap.sgml
+++ b/docs/tmpl/pangofc-fontmap.sgml
@@ -31,6 +31,9 @@ Fontconfig-based backend involves deriving from both
 </variablelist>
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT PangoFcFontMap ##### -->
 <para>
 
@@ -44,7 +47,13 @@ Fontconfig-based backend involves deriving from both
 
 @default_substitute: 
 @new_font: 
-@get_render_key: 
+@get_resolution: 
+@context_key_get: 
+@context_key_copy: 
+@context_key_free: 
+@context_key_hash: 
+@context_key_equal: 
+@context_substitute: 
 @create_font: 
 
 <!-- ##### FUNCTION pango_fc_font_description_from_pattern ##### -->
diff --git a/docs/tmpl/scripts.sgml b/docs/tmpl/scripts.sgml
index 33e81760..562342fe 100644
--- a/docs/tmpl/scripts.sgml
+++ b/docs/tmpl/scripts.sgml
@@ -16,6 +16,9 @@ and of ranges within a larger text string.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT PangoScriptIter ##### -->
 <para>
 
diff --git a/docs/tmpl/tab-stops.sgml b/docs/tmpl/tab-stops.sgml
index 85672a5f..d131b162 100644
--- a/docs/tmpl/tab-stops.sgml
+++ b/docs/tmpl/tab-stops.sgml
@@ -14,6 +14,9 @@ Structures for storing Tab Stops
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT PangoTabArray ##### -->
 <para>
 A <structname>PangoTabArray</structname> struct contains an array
diff --git a/docs/tmpl/text-attributes.sgml b/docs/tmpl/text-attributes.sgml
index 7c5fa9da..70245462 100644
--- a/docs/tmpl/text-attributes.sgml
+++ b/docs/tmpl/text-attributes.sgml
@@ -18,6 +18,9 @@ of attributes applied to a portion of text.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### ENUM PangoAttrType ##### -->
 <para>
 distinguishes between different types of attributes. Along with the
diff --git a/docs/tmpl/win32-fonts.sgml b/docs/tmpl/win32-fonts.sgml
index 863b8500..50a9133f 100644
--- a/docs/tmpl/win32-fonts.sgml
+++ b/docs/tmpl/win32-fonts.sgml
@@ -14,6 +14,9 @@ Functions for shape engines to manipulate Win32 fonts
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### MACRO PANGO_RENDER_TYPE_WIN32 ##### -->
 <para>
 A string constant identifying the Win32 renderer. The associated quark (see
@@ -97,6 +100,33 @@ g_quark_from_string()) is used to identify the renderer in pango_find_map().
 @Returns: 
 
 
+<!-- ##### FUNCTION pango_win32_font_select_font ##### -->
+<para>
+
+</para>
+
+@font: 
+@hdc: 
+@Returns: 
+
+
+<!-- ##### FUNCTION pango_win32_font_done_font ##### -->
+<para>
+
+</para>
+
+@font: 
+
+
+<!-- ##### FUNCTION pango_win32_font_get_metrics_factor ##### -->
+<para>
+
+</para>
+
+@font: 
+@Returns: 
+
+
 <!-- ##### FUNCTION pango_win32_get_debug_flag ##### -->
 <para>
 
diff --git a/docs/tmpl/x-fonts.sgml b/docs/tmpl/x-fonts.sgml
index bd5a9a6d..ee19346b 100644
--- a/docs/tmpl/x-fonts.sgml
+++ b/docs/tmpl/x-fonts.sgml
@@ -17,6 +17,9 @@ unpredictable results. Use the <link linkend="pango-Xft-Fonts-and-Rendering">Xft
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### MACRO PANGO_RENDER_TYPE_X ##### -->
 <para>
 A string constant identifying the X renderer. The associated quark (see 
diff --git a/docs/tmpl/xft-fonts.sgml b/docs/tmpl/xft-fonts.sgml
index fc4d6cae..a572c94b 100644
--- a/docs/tmpl/xft-fonts.sgml
+++ b/docs/tmpl/xft-fonts.sgml
@@ -39,6 +39,9 @@ overring the #PangoXftRendererClass virtual functions
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT PangoXftFont ##### -->
 <para>