Up version to 1.7.0.

Fri Sep 24 12:59:22 2004  Owen Taylor  <otaylor@redhat.com>

        * configure.in: Up version to 1.7.0.

        * pango/pango-renderer.[ch] pango/pango.h pango/Makefile.am:
        Add PangoRenderer, a base class that is subclassed to produce
        rendering drivers for different backends and purposes.

        * pango/pangoft2-private.h pango/pangoft2-render.c
        pango/pangoft2.c: Move rendering into pangoft2-render.c,
        use PangoRenderer.

        * pango/pangoft2-fontmap.c pango/pangoft2-private.h: Add
        _pango_ft2_font_map_get_renderer() to retrieve a singleton
        fontmap for the fontmap.

        * pango/pangoxft-render.[ch] pango/pangoxft.c pango/Makefile.am:
        Make Xft rendering use PangoRenderer, add publically
        visible, subclassable PangoXftRenderer.

        * pango/pangoxft-fontmap.c pango/pangoxft-private.h: Add
        _pango_xft_font_map_get_renderer() to retrieve a singleton
        fontmap for the fontmap.

        * examples/xftview.c examples/Makefile.am: Add a test program
        using the Xft backend.

        * docs/*: Update minimally for PangoRenderer.

2 files changed, 175 insertions, 27 deletions

diff --git a/docs/pango-sections.txt b/docs/pango-sections.txt
index cae925bd..d0e9c938 100644
--- a/docs/pango-sections.txt
+++ b/docs/pango-sections.txt
@@ -581,6 +581,40 @@ pango_module_register
 </SECTION>
 
 <SECTION>
+<FILE>pango-renderer</FILE>
+PangoRenderer
+PangoRenderPart
+PANGO_TYPE_RENDER_PART
+PangoRendererClass
+<TITLE>PangoRenderer</TITLE>
+pango_renderer_draw_layout
+pango_renderer_draw_layout_line
+pango_renderer_draw_glyphs
+pango_renderer_draw_rectangle
+pango_renderer_draw_error_underline
+pango_renderer_draw_trapezoid
+pango_renderer_draw_glyph
+pango_renderer_activate
+pango_renderer_deactivate
+pango_renderer_part_changed
+pango_renderer_set_color
+pango_renderer_get_color
+pango_renderer_set_matrix
+pango_renderer_get_matrix
+<SUBSECTION Standard>
+PANGO_RENDERER
+PANGO_IS_RENDERER
+PANGO_TYPE_RENDERER
+pango_renderer_get_type
+PANGO_RENDERER_CLASS
+PANGO_IS_RENDERER_CLASS
+PANGO_RENDERER_GET_CLASS
+<SUBSECTION Private>
+pango_render_part_get_type
+PangoRendererPrivate
+</SECTION>
+
+<SECTION>
 <TITLE>X Fonts and Rendering</TITLE>
 <FILE>x-fonts</FILE>
 PANGO_RENDER_TYPE_X
@@ -676,6 +710,8 @@ STRICT
 <SECTION>
 <TITLE>Xft Fonts and Rendering</TITLE>
 <FILE>xft-fonts</FILE>
+PangoXftFont
+PangoXftFontMap
 PANGO_RENDER_TYPE_XFT
 pango_xft_get_context
 pango_xft_get_font_map
@@ -683,8 +719,6 @@ pango_xft_set_default_substitute
 PangoXftSubstituteFunc
 pango_xft_substitute_changed
 pango_xft_shutdown_display
-pango_xft_render
-pango_xft_picture_render
 pango_xft_font_get_font
 pango_xft_font_get_display
 pango_xft_font_has_char
@@ -692,13 +726,35 @@ pango_xft_font_lock_face
 pango_xft_font_unlock_face
 pango_xft_font_get_glyph
 pango_xft_font_get_unknown_glyph
-
+PangoXftRenderer
+PangoXftRendererClass
+pango_xft_renderer_new
+pango_xft_renderer_set_draw
+pango_xft_renderer_set_default_color
+pango_xft_render
+pango_xft_picture_render
+pango_xft_render_transformed
+pango_xft_render_layout_line
+pango_xft_render_layout
 <SUBSECTION Standard>
 PANGO_TYPE_XFT_FONT
+PANGO_XFT_FONT
 PANGO_XFT_IS_FONT
+PANGO_TYPE_XFT_FONT_MAP
+PANGO_XFT_FONT_MAP
+PANGO_XFT_IS_FONT_MAP
+PANGO_XFT_RENDERER
+PANGO_IS_XFT_RENDERER
+PANGO_TYPE_XFT_RENDERER
+PANGO_XFT_RENDERER_CLASS
+PANGO_IS_XFT_RENDERER_CLASS
+PANGO_XFT_RENDERER_GET_CLASS
 
 <SUBSECTION Private>
+PangoXftRendererPrivate
 pango_xft_font_get_type
+pango_xft_font_map_get_type
+pango_xft_renderer_get_type
 </SECTION>
 
 <SECTION>
diff --git a/docs/tmpl/xft-fonts.sgml b/docs/tmpl/xft-fonts.sgml
index ef0b635b..00c7090c 100644
--- a/docs/tmpl/xft-fonts.sgml
+++ b/docs/tmpl/xft-fonts.sgml
@@ -14,6 +14,18 @@ Functions for shape engines to manipulate Xft fonts
 
 </para>
 
+<!-- ##### STRUCT PangoXftFont ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### STRUCT PangoXftFontMap ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### MACRO PANGO_RENDER_TYPE_XFT ##### -->
 <para>
 A string constant that was used to identify shape engines that work
@@ -81,43 +93,35 @@ Function type for doing final config tweaking on prepared FcPatterns.
 @screen: 
 
 
-<!-- ##### FUNCTION pango_xft_render ##### -->
+<!-- ##### FUNCTION pango_xft_font_get_font ##### -->
 <para>
 
 </para>
 
-@draw: 
-@color: 
 @font: 
-@glyphs: 
-@x: 
-@y: 
+@Returns: 
 
 
-<!-- ##### FUNCTION pango_xft_picture_render ##### -->
+<!-- ##### FUNCTION pango_xft_font_get_display ##### -->
 <para>
 
 </para>
 
-@display: 
-@src_picture: 
-@dest_picture: 
 @font: 
-@glyphs: 
-@x: 
-@y: 
+@Returns: 
 
 
-<!-- ##### FUNCTION pango_xft_font_get_font ##### -->
+<!-- ##### FUNCTION pango_xft_font_has_char ##### -->
 <para>
 
 </para>
 
 @font: 
+@wc: 
 @Returns: 
 
 
-<!-- ##### FUNCTION pango_xft_font_get_display ##### -->
+<!-- ##### FUNCTION pango_xft_font_lock_face ##### -->
 <para>
 
 </para>
@@ -126,7 +130,15 @@ Function type for doing final config tweaking on prepared FcPatterns.
 @Returns: 
 
 
-<!-- ##### FUNCTION pango_xft_font_has_char ##### -->
+<!-- ##### FUNCTION pango_xft_font_unlock_face ##### -->
+<para>
+
+</para>
+
+@font: 
+
+
+<!-- ##### FUNCTION pango_xft_font_get_glyph ##### -->
 <para>
 
 </para>
@@ -136,40 +148,120 @@ Function type for doing final config tweaking on prepared FcPatterns.
 @Returns: 
 
 
-<!-- ##### FUNCTION pango_xft_font_lock_face ##### -->
+<!-- ##### FUNCTION pango_xft_font_get_unknown_glyph ##### -->
 <para>
 
 </para>
 
 @font: 
+@wc: 
 @Returns: 
 
 
-<!-- ##### FUNCTION pango_xft_font_unlock_face ##### -->
+<!-- ##### STRUCT PangoXftRenderer ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### STRUCT PangoXftRendererClass ##### -->
+<para>
+
+</para>
+
+@composite_trapezoids: 
+@composite_glyphs: 
+
+<!-- ##### FUNCTION pango_xft_renderer_new ##### -->
+<para>
+
+</para>
+
+@display: 
+@screen: 
+@Returns: 
+
+
+<!-- ##### FUNCTION pango_xft_renderer_set_draw ##### -->
+<para>
+
+</para>
+
+@xftrenderer: 
+@draw: 
+
+
+<!-- ##### FUNCTION pango_xft_renderer_set_default_color ##### -->
 <para>
 
 </para>
 
+@xftrenderer: 
+@default_color: 
+
+
+<!-- ##### FUNCTION pango_xft_render ##### -->
+<para>
+
+</para>
+
+@draw: 
+@color: 
 @font: 
+@glyphs: 
+@x: 
+@y: 
 
 
-<!-- ##### FUNCTION pango_xft_font_get_glyph ##### -->
+<!-- ##### FUNCTION pango_xft_picture_render ##### -->
 <para>
 
 </para>
 
+@display: 
+@src_picture: 
+@dest_picture: 
 @font: 
-@wc: 
-@Returns: 
+@glyphs: 
+@x: 
+@y: 
 
 
-<!-- ##### FUNCTION pango_xft_font_get_unknown_glyph ##### -->
+<!-- ##### FUNCTION pango_xft_render_transformed ##### -->
 <para>
 
 </para>
 
+@draw: 
+@color: 
+@matrix: 
 @font: 
-@wc: 
-@Returns: 
+@glyphs: 
+@x: 
+@y: 
+
+
+<!-- ##### FUNCTION pango_xft_render_layout_line ##### -->
+<para>
+
+</para>
+
+@draw: 
+@color: 
+@line: 
+@x: 
+@y: 
+
+
+<!-- ##### FUNCTION pango_xft_render_layout ##### -->
+<para>
+
+</para>
+
+@draw: 
+@color: 
+@layout: 
+@x: 
+@y: