Version 0.22. Updated Update. Don't look like a doc comment.

Wed Nov 21 12:54:39 2001  Owen Taylor  <otaylor@redhat.com>
	* configure.in (PANGO_MINOR_VERSION): Version 0.22.
        * NEWS: Updated
	* docs/pango-sections.txt Makefile.am: Update.
	* pango/pango-layout.c (process_item): Don't look
	like a doc comment.

16 files changed, 295 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index b94064d8..6cf324ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Wed Nov 21 12:54:39 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in (PANGO_MINOR_VERSION): Version 0.22.
+
+	* NEWS: Updated
+
+	* docs/pango-sections.txt Makefile.am: Update.
+
+	* pango/pango-layout.c (process_item): Don't look
+	like a doc comment.
+
 2001-11-22  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32-fontcache.c (pango_win32_font_cache_load):
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index b94064d8..6cf324ef 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,14 @@
+Wed Nov 21 12:54:39 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in (PANGO_MINOR_VERSION): Version 0.22.
+
+	* NEWS: Updated
+
+	* docs/pango-sections.txt Makefile.am: Update.
+
+	* pango/pango-layout.c (process_item): Don't look
+	like a doc comment.
+
 2001-11-22  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32-fontcache.c (pango_win32_font_cache_load):
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index b94064d8..6cf324ef 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,14 @@
+Wed Nov 21 12:54:39 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in (PANGO_MINOR_VERSION): Version 0.22.
+
+	* NEWS: Updated
+
+	* docs/pango-sections.txt Makefile.am: Update.
+
+	* pango/pango-layout.c (process_item): Don't look
+	like a doc comment.
+
 2001-11-22  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32-fontcache.c (pango_win32_font_cache_load):
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index b94064d8..6cf324ef 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,14 @@
+Wed Nov 21 12:54:39 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in (PANGO_MINOR_VERSION): Version 0.22.
+
+	* NEWS: Updated
+
+	* docs/pango-sections.txt Makefile.am: Update.
+
+	* pango/pango-layout.c (process_item): Don't look
+	like a doc comment.
+
 2001-11-22  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32-fontcache.c (pango_win32_font_cache_load):
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index b94064d8..6cf324ef 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,14 @@
+Wed Nov 21 12:54:39 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in (PANGO_MINOR_VERSION): Version 0.22.
+
+	* NEWS: Updated
+
+	* docs/pango-sections.txt Makefile.am: Update.
+
+	* pango/pango-layout.c (process_item): Don't look
+	like a doc comment.
+
 2001-11-22  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32-fontcache.c (pango_win32_font_cache_load):
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index b94064d8..6cf324ef 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,14 @@
+Wed Nov 21 12:54:39 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in (PANGO_MINOR_VERSION): Version 0.22.
+
+	* NEWS: Updated
+
+	* docs/pango-sections.txt Makefile.am: Update.
+
+	* pango/pango-layout.c (process_item): Don't look
+	like a doc comment.
+
 2001-11-22  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32-fontcache.c (pango_win32_font_cache_load):
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index b94064d8..6cf324ef 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,14 @@
+Wed Nov 21 12:54:39 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in (PANGO_MINOR_VERSION): Version 0.22.
+
+	* NEWS: Updated
+
+	* docs/pango-sections.txt Makefile.am: Update.
+
+	* pango/pango-layout.c (process_item): Don't look
+	like a doc comment.
+
 2001-11-22  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32-fontcache.c (pango_win32_font_cache_load):
diff --git a/NEWS b/NEWS
index f47349ed..cabb51d3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+Changes between 0.21 and 0.22
+
+* Documentation improvements [Matthias Clasen]
+* Win32 fixes [Tor Lillqvist, Hans Breuer]
+* Improve line-breaking algorithm to not be O(n^2) [Alex Larsson]
+* API addition to render to Xrender drawable
+* Restructure so that "font sets" are handled by the core 
+  for all backends [Alex]
+* Use the Xft font configuration scheme for the FT2 backend as well [Alex]
+
+Other Contributors: Darin Alder, Sven Neumann, Raymond Wan
+
 Changes between 0.20 and 0.21
 
 * Documentation improvements. [Matthias Clasen, Sven Neumann]
diff --git a/configure.in b/configure.in
index 7b0036f2..ddb28ad4 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to create configure.
 AC_INIT(ChangeLog)
 
 PANGO_MAJOR_VERSION=0
-PANGO_MINOR_VERSION=21
+PANGO_MINOR_VERSION=22
 
 AC_SUBST(PANGO_MAJOR_VERSION)
 AC_SUBST(PANGO_MINOR_VERSION)
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 34194a38..30ad6302 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -25,6 +25,7 @@ CFILE_GLOB=$(top_srcdir)/pango/*.c
 # Headers to ignore
 IGNORE_HFILES=			\
 	mini-fribidi		\
+	mini-xft		\
 	opentype		\
 	modules.h		\
 	pango-intset.h		\
diff --git a/docs/pango-sections.txt b/docs/pango-sections.txt
index ddc21db7..6e9ee549 100644
--- a/docs/pango-sections.txt
+++ b/docs/pango-sections.txt
@@ -16,7 +16,7 @@ pango_item_split
 pango_reorder_items
 <SUBSECTION>
 pango_context_new
-pango_context_add_font_map
+pango_context_set_font_map
 pango_context_get_font_description
 pango_context_set_font_description
 pango_context_get_language
@@ -24,6 +24,7 @@ pango_context_set_language
 pango_context_get_base_dir
 pango_context_set_base_dir
 pango_context_load_font
+pango_context_load_fontset
 pango_context_get_metrics
 pango_context_list_families
 <SUBSECTION Standard>
@@ -186,7 +187,22 @@ PANGO_FONT_MAP_CLASS
 PANGO_IS_FONT_MAP_CLASS
 PANGO_FONT_MAP_GET_CLASS
 pango_font_map_load_font
+pango_font_map_load_fontset
 pango_font_map_list_families
+<SUBSECTION>
+PangoFontset
+pango_fontset_get_font
+pango_fontset_get_metrics
+PangoFontsetClass
+PANGO_TYPE_FONTSET_SIMPLE
+PANGO_FONTSET_SIMPLE
+PANGO_IS_FONTSET_SIMPLE
+PangoFontsetSimple
+PangoFontsetSimpleClass
+pango_fontset_simple_get_type
+pango_fontset_simple_new
+pango_fontset_simple_append
+pango_fontset_simple_size
 
 <SUBSECTION Standard>
 PANGO_FONT_FACE_CLASS
@@ -201,6 +217,15 @@ PangoFontClass
 PANGO_FONT_FAMILY_GET_CLASS
 PANGO_FONT_FAMILY_CLASS
 PANGO_IS_FONT_FACE_CLASS
+PANGO_FONTSET
+PANGO_IS_FONTSET
+PANGO_TYPE_FONTSET
+PANGO_FONTSET_CLASS
+PANGO_IS_FONTSET_CLASS
+PANGO_FONTSET_GET_CLASS
+PANGO_TYPE_FONTSET_SIMPLE
+PANGO_FONTSET_SIMPLE
+PANGO_IS_FONTSET_SIMPLE
 
 <SUBSECTION Private>
 pango_font_metrics_new
@@ -215,6 +240,8 @@ pango_font_map_get_type
 pango_font_face_get_type
 pango_font_family_get_type
 pango_font_metrics_get_type
+pango_fontset_get_type
+pango_fontset_simple_get_type
 </SECTION>
 
 <SECTION>
@@ -528,29 +555,15 @@ STRICT
 <FILE>freetype-fonts</FILE>
 PANGO_RENDER_TYPE_FT2
 pango_ft2_get_context
-pango_ft2_load_font
 pango_ft2_render
 pango_ft2_render_layout_line
 pango_ft2_render_layout
-PangoFT2Subfont
-PANGO_FT2_MAKE_GLYPH
-PANGO_FT2_GLYPH_SUBFONT
-PANGO_FT2_GLYPH_INDEX
-pango_ft2_n_subfonts
 pango_ft2_get_unknown_glyph
 pango_ft2_font_get_kerning
-pango_ft2_get_coverage
-pango_ft2_get_face
-PangoFT2FontCache
-pango_ft2_font_cache_new
-pango_ft2_font_cache_free
-pango_ft2_font_cache_load
-pango_ft2_font_cache_unload
+pango_ft2_font_get_face
+pango_ft2_font_get_coverage
 pango_ft2_font_map_for_display
 pango_ft2_shutdown_display
-pango_ft2_font_map_get_font_cache
-pango_ft2_font_subfont_open_args
-pango_ft2_fontmap_dump
 <SUBSECTION Private>
 STRICT
 </SECTION>
@@ -559,9 +572,9 @@ STRICT
 <TITLE>Xft Fonts and Rendering</TITLE>
 <FILE>xft-fonts</FILE>
 PANGO_RENDER_TYPE_XFT
-PangoXftFont
 pango_xft_get_context
 pango_xft_render
+pango_xft_picture_render
 pango_xft_font_get_font
 pango_xft_font_get_face
 pango_xft_font_get_ot_info
diff --git a/docs/tmpl/fonts.sgml b/docs/tmpl/fonts.sgml
index b5f84da5..daabba27 100644
--- a/docs/tmpl/fonts.sgml
+++ b/docs/tmpl/fonts.sgml
@@ -733,6 +733,18 @@ Returns the type of a #PangoFontMap.
 @Returns: 
 
 
+<!-- ##### FUNCTION pango_font_map_load_fontset ##### -->
+<para>
+
+</para>
+
+@fontmap: 
+@context: 
+@desc: 
+@language: 
+@Returns: 
+
+
 <!-- ##### FUNCTION pango_font_map_list_families ##### -->
 <para>
 
@@ -743,3 +755,109 @@ Returns the type of a #PangoFontMap.
 @n_families: 
 
 
+<!-- ##### STRUCT PangoFontset ##### -->
+<para>
+
+</para>
+
+@parent_instance: 
+
+<!-- ##### FUNCTION pango_fontset_get_font ##### -->
+<para>
+
+</para>
+
+@fontset: 
+@wc: 
+@Returns: 
+
+
+<!-- ##### FUNCTION pango_fontset_get_metrics ##### -->
+<para>
+
+</para>
+
+@fontset: 
+@Returns: 
+
+
+<!-- ##### STRUCT PangoFontsetClass ##### -->
+<para>
+
+</para>
+
+@parent_class: 
+@get_font: 
+@get_metrics: 
+@get_language: 
+
+<!-- ##### MACRO PANGO_TYPE_FONTSET_SIMPLE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PANGO_FONTSET_SIMPLE ##### -->
+<para>
+
+</para>
+
+@object: 
+
+
+<!-- ##### MACRO PANGO_IS_FONTSET_SIMPLE ##### -->
+<para>
+
+</para>
+
+@object: 
+
+
+<!-- ##### STRUCT PangoFontsetSimple ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### STRUCT PangoFontsetSimpleClass ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION pango_fontset_simple_get_type ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
+
+<!-- ##### FUNCTION pango_fontset_simple_new ##### -->
+<para>
+
+</para>
+
+@language: 
+@Returns: 
+
+
+<!-- ##### FUNCTION pango_fontset_simple_append ##### -->
+<para>
+
+</para>
+
+@fontset: 
+@font: 
+
+
+<!-- ##### FUNCTION pango_fontset_simple_size ##### -->
+<para>
+
+</para>
+
+@fontset: 
+@Returns: 
+
+
diff --git a/docs/tmpl/freetype-fonts.sgml b/docs/tmpl/freetype-fonts.sgml
index 6fdd5da6..335faca3 100644
--- a/docs/tmpl/freetype-fonts.sgml
+++ b/docs/tmpl/freetype-fonts.sgml
@@ -88,6 +88,25 @@ g_quark_from_string()) is used to identify the renderer in pango_find_map().
 @Returns: 
 
 
+<!-- ##### FUNCTION pango_ft2_font_get_face ##### -->
+<para>
+
+</para>
+
+@font: 
+@Returns: 
+
+
+<!-- ##### FUNCTION pango_ft2_font_get_coverage ##### -->
+<para>
+
+</para>
+
+@font: 
+@language: 
+@Returns: 
+
+
 <!-- ##### FUNCTION pango_ft2_font_map_for_display ##### -->
 <para>
 
diff --git a/docs/tmpl/main.sgml b/docs/tmpl/main.sgml
index f6d30ab6..8aaf6590 100644
--- a/docs/tmpl/main.sgml
+++ b/docs/tmpl/main.sgml
@@ -206,6 +206,15 @@ The GObject type for #PangoDirection.
 @Returns: 
 
 
+<!-- ##### FUNCTION pango_context_set_font_map ##### -->
+<para>
+
+</para>
+
+@context: 
+@font_map: 
+
+
 <!-- ##### FUNCTION pango_context_get_font_description ##### -->
 <para>
 
@@ -270,6 +279,17 @@ The GObject type for #PangoDirection.
 @Returns: 
 
 
+<!-- ##### FUNCTION pango_context_load_fontset ##### -->
+<para>
+
+</para>
+
+@context: 
+@desc: 
+@language: 
+@Returns: 
+
+
 <!-- ##### FUNCTION pango_context_get_metrics ##### -->
 <para>
 
diff --git a/docs/tmpl/xft-fonts.sgml b/docs/tmpl/xft-fonts.sgml
index 76f40355..cfd3877c 100644
--- a/docs/tmpl/xft-fonts.sgml
+++ b/docs/tmpl/xft-fonts.sgml
@@ -45,6 +45,20 @@ g_quark_from_string()) is used to identify the renderer in pango_find_map().
 @y: 
 
 
+<!-- ##### FUNCTION pango_xft_picture_render ##### -->
+<para>
+
+</para>
+
+@display: 
+@src_picture: 
+@dest_picture: 
+@font: 
+@glyphs: 
+@x: 
+@y: 
+
+
 <!-- ##### FUNCTION pango_xft_font_get_font ##### -->
 <para>
 
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index f1b9f9b9..1e75ea85 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -2509,8 +2509,7 @@ insert_run (PangoLayoutLine *line,
   line->length += run_item->length;
 }
 
-/**
- * Tries to insert as much as possible of the item at the head of
+/* Tries to insert as much as possible of the item at the head of
  * state->items onto @line. Three results are possible:
  *
  *  BREAK_NONE_FIT: Could
@@ -2527,7 +2526,7 @@ insert_run (PangoLayoutLine *line,
  * returned even everything fits; the run will be broken earlier,
  * or BREAK_NONE_FIT returned. This is used when the end of the
  * run is not a break position.
- **/
+ */
 static BreakResult
 process_item (PangoLayout     *layout,
 	      PangoLayoutLine *line,