Released 1.1.1.PANGO_1_1_1

Tue Aug 20 17:31:39 2002  Owen Taylor  <otaylor@redhat.com>

        * Released 1.1.1.

        * configure.in: Update versions numbers.

        * NEWS: Updated.

        * docs/pango-sections.txt: Updated.

        * pango/pangoxft-font.c (pango_xft_font_[un]lock_face):
        Fix docs.

13 files changed, 272 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 70e096ab..e0efc4cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Tue Aug 20 17:31:39 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* Released 1.1.1.
+
+	* configure.in: Update versions numbers.
+
+	* NEWS: Updated.
+
+	* docs/pango-sections.txt: Updated.
+
+	* pango/pangoxft-font.c (pango_xft_font_[un]lock_face): 
+	Fix docs.
+
 Tue Aug 20 17:14:13 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangofc-fontmap.cI: conditionalize 
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 70e096ab..e0efc4cc 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,16 @@
+Tue Aug 20 17:31:39 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* Released 1.1.1.
+
+	* configure.in: Update versions numbers.
+
+	* NEWS: Updated.
+
+	* docs/pango-sections.txt: Updated.
+
+	* pango/pangoxft-font.c (pango_xft_font_[un]lock_face): 
+	Fix docs.
+
 Tue Aug 20 17:14:13 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangofc-fontmap.cI: conditionalize 
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 70e096ab..e0efc4cc 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,16 @@
+Tue Aug 20 17:31:39 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* Released 1.1.1.
+
+	* configure.in: Update versions numbers.
+
+	* NEWS: Updated.
+
+	* docs/pango-sections.txt: Updated.
+
+	* pango/pangoxft-font.c (pango_xft_font_[un]lock_face): 
+	Fix docs.
+
 Tue Aug 20 17:14:13 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangofc-fontmap.cI: conditionalize 
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 70e096ab..e0efc4cc 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,16 @@
+Tue Aug 20 17:31:39 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* Released 1.1.1.
+
+	* configure.in: Update versions numbers.
+
+	* NEWS: Updated.
+
+	* docs/pango-sections.txt: Updated.
+
+	* pango/pangoxft-font.c (pango_xft_font_[un]lock_face): 
+	Fix docs.
+
 Tue Aug 20 17:14:13 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangofc-fontmap.cI: conditionalize 
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 70e096ab..e0efc4cc 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,16 @@
+Tue Aug 20 17:31:39 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* Released 1.1.1.
+
+	* configure.in: Update versions numbers.
+
+	* NEWS: Updated.
+
+	* docs/pango-sections.txt: Updated.
+
+	* pango/pangoxft-font.c (pango_xft_font_[un]lock_face): 
+	Fix docs.
+
 Tue Aug 20 17:14:13 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangofc-fontmap.cI: conditionalize 
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 70e096ab..e0efc4cc 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,16 @@
+Tue Aug 20 17:31:39 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* Released 1.1.1.
+
+	* configure.in: Update versions numbers.
+
+	* NEWS: Updated.
+
+	* docs/pango-sections.txt: Updated.
+
+	* pango/pangoxft-font.c (pango_xft_font_[un]lock_face): 
+	Fix docs.
+
 Tue Aug 20 17:14:13 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangofc-fontmap.cI: conditionalize 
diff --git a/NEWS b/NEWS
index 0beb6669..474b7b9d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Changes between 1.1.0 and 1.1.1
+
+* Merge a lot of the code between the Xft and FT2 backend,
+  so that the FT2 backend gets the recent improvements to Xft.
+* Add proper language tag support to the Xft/FT2 backends.
+* Various effienciency fixes for the Xft/FT2 backends.
+
 Changes between 1.0.x and 1.1.0
 
 * Support for version 2 of the Xft library. [Keith Packard]
@@ -7,6 +14,7 @@ Changes between 1.0.x and 1.1.0
 * A new hangul-xft [Changwoo Ryu]
 * Bug-fixes to the OpenType handling code.
 * Various cleanups to the PangoXft and PangoFT2 public APIs.
+* Docs switched over to DocBook XML. [Matthias Clasen]
 
 ============================================================
 
diff --git a/configure.in b/configure.in
index 5b270d81..5f00fe42 100644
--- a/configure.in
+++ b/configure.in
@@ -17,14 +17,14 @@ dnl set PANGO_BINARY_AGE _and_ PANGO_INTERFACE_AGE to 0.
 dnl The triplet 
 PANGO_MAJOR_VERSION=1
 PANGO_MINOR_VERSION=1
-PANGO_MICRO_VERSION=0
+PANGO_MICRO_VERSION=1
 PANGO_VERSION=$PANGO_MAJOR_VERSION.$PANGO_MINOR_VERSION.$PANGO_MICRO_VERSION
 
 dnl The X.Y in -lpango-X.Y line. This is expected to stay 1.0 until Pango 2.
 PANGO_API_VERSION=1.0
 
 dnl Number of releases since we've added interfaces
-PANGO_INTERFACE_AGE=0
+PANGO_INTERFACE_AGE=1
 
 dnl Number of releases since we've broken binary compatibility.
 # PANGO_BINARY_AGE=0
diff --git a/docs/pango-sections.txt b/docs/pango-sections.txt
index 7c3c55aa..a33f3123 100644
--- a/docs/pango-sections.txt
+++ b/docs/pango-sections.txt
@@ -549,7 +549,14 @@ STRICT
 <SECTION>
 <TITLE>FreeType Fonts and Rendering</TITLE>
 <FILE>freetype-fonts</FILE>
+PangoFT2FontMap
 PANGO_RENDER_TYPE_FT2
+pango_ft2_font_map_new
+pango_ft2_font_map_set_resolution
+pango_ft2_font_map_create_context
+PangoFT2SubstituteFunc
+pango_ft2_font_map_set_default_substitute
+pango_ft2_font_map_substitute_changed
 pango_ft2_get_context
 pango_ft2_render
 pango_ft2_render_layout_line
@@ -560,7 +567,12 @@ pango_ft2_font_get_face
 pango_ft2_font_get_coverage
 pango_ft2_font_map_for_display
 pango_ft2_shutdown_display
+<SUBSECTION Standard>
+PANGO_TYPE_FT2_FONT_MAP
+PANGO_FT2_FONT_MAP
+PANGO_FT2_IS_FONT_MAP
 <SUBSECTION Private>
+pango_ft2_font_map_get_type
 STRICT
 </SECTION>
 
@@ -569,12 +581,19 @@ STRICT
 <FILE>xft-fonts</FILE>
 PANGO_RENDER_TYPE_XFT
 pango_xft_get_context
+pango_xft_get_font_map
+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_face
-pango_xft_font_get_ot_info
 pango_xft_font_get_display
+pango_xft_font_has_char
+pango_xft_font_lock_face
+pango_xft_font_unlock_face
+pango_xft_font_get_glyph
 pango_xft_font_get_unknown_glyph
 
 <SUBSECTION Standard>
@@ -592,7 +611,7 @@ PangoOTTag
 PangoOTInfo
 PangoOTRuleset
 PangoOTTableType
-pango_ot_info_new
+pango_ot_info_get
 pango_ot_info_find_script
 pango_ot_info_find_language
 pango_ot_info_find_feature
diff --git a/docs/tmpl/freetype-fonts.sgml b/docs/tmpl/freetype-fonts.sgml
index a3d86f0a..99190b22 100644
--- a/docs/tmpl/freetype-fonts.sgml
+++ b/docs/tmpl/freetype-fonts.sgml
@@ -14,6 +14,12 @@ FreeType Fonts and Rendering
 
 </para>
 
+<!-- ##### STRUCT PangoFT2FontMap ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### MACRO PANGO_RENDER_TYPE_FT2 ##### -->
 <para>
 A string constant identifying the FreeType renderer. The associated quark (see
@@ -22,6 +28,61 @@ g_quark_from_string()) is used to identify the renderer in pango_find_map().
 
 
 
+<!-- ##### FUNCTION pango_ft2_font_map_new ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
+
+<!-- ##### FUNCTION pango_ft2_font_map_set_resolution ##### -->
+<para>
+
+</para>
+
+@fontmap: 
+@dpi_x: 
+@dpi_y: 
+
+
+<!-- ##### FUNCTION pango_ft2_font_map_create_context ##### -->
+<para>
+
+</para>
+
+@fontmap: 
+@Returns: 
+
+
+<!-- ##### USER_FUNCTION PangoFT2SubstituteFunc ##### -->
+<para>
+
+</para>
+
+@pattern: 
+@data: 
+
+
+<!-- ##### FUNCTION pango_ft2_font_map_set_default_substitute ##### -->
+<para>
+
+</para>
+
+@fontmap: 
+@func: 
+@data: 
+@notify: 
+
+
+<!-- ##### FUNCTION pango_ft2_font_map_substitute_changed ##### -->
+<para>
+
+</para>
+
+@fontmap: 
+
+
 <!-- ##### FUNCTION pango_ft2_get_context ##### -->
 <para>
 
diff --git a/docs/tmpl/opentype.sgml b/docs/tmpl/opentype.sgml
index dc0b6368..f4c853b1 100644
--- a/docs/tmpl/opentype.sgml
+++ b/docs/tmpl/opentype.sgml
@@ -49,6 +49,15 @@ identify the various OpenType tables in the
 @PANGO_OT_TABLE_GSUB: The GSUB table.
 @PANGO_OT_TABLE_GPOS: The GPOS table.
 
+<!-- ##### FUNCTION pango_ot_info_get ##### -->
+<para>
+
+</para>
+
+@face: 
+@Returns: 
+
+
 <!-- ##### FUNCTION pango_ot_info_find_script ##### -->
 <para>
 
diff --git a/docs/tmpl/xft-fonts.sgml b/docs/tmpl/xft-fonts.sgml
index c5aedd65..a45debb4 100644
--- a/docs/tmpl/xft-fonts.sgml
+++ b/docs/tmpl/xft-fonts.sgml
@@ -32,6 +32,55 @@ g_quark_from_string()) is used to identify the renderer in pango_find_map().
 @Returns: 
 
 
+<!-- ##### FUNCTION pango_xft_get_font_map ##### -->
+<para>
+
+</para>
+
+@display: 
+@screen: 
+@Returns: 
+
+
+<!-- ##### FUNCTION pango_xft_set_default_substitute ##### -->
+<para>
+
+</para>
+
+@display: 
+@screen: 
+@func: 
+@data: 
+@notify: 
+
+
+<!-- ##### USER_FUNCTION PangoXftSubstituteFunc ##### -->
+<para>
+
+</para>
+
+@pattern: 
+@data: 
+
+
+<!-- ##### FUNCTION pango_xft_substitute_changed ##### -->
+<para>
+
+</para>
+
+@display: 
+@screen: 
+
+
+<!-- ##### FUNCTION pango_xft_shutdown_display ##### -->
+<para>
+
+</para>
+
+@display: 
+@screen: 
+
+
 <!-- ##### FUNCTION pango_xft_render ##### -->
 <para>
 
@@ -77,6 +126,43 @@ g_quark_from_string()) is used to identify the renderer in pango_find_map().
 @Returns: 
 
 
+<!-- ##### FUNCTION pango_xft_font_has_char ##### -->
+<para>
+
+</para>
+
+@font: 
+@wc: 
+@Returns: 
+
+
+<!-- ##### FUNCTION pango_xft_font_lock_face ##### -->
+<para>
+
+</para>
+
+@font: 
+@Returns: 
+
+
+<!-- ##### FUNCTION pango_xft_font_unlock_face ##### -->
+<para>
+
+</para>
+
+@font: 
+
+
+<!-- ##### FUNCTION pango_xft_font_get_glyph ##### -->
+<para>
+
+</para>
+
+@font: 
+@wc: 
+@Returns: 
+
+
 <!-- ##### FUNCTION pango_xft_font_get_unknown_glyph ##### -->
 <para>
 
diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c
index 2d072757..690469f2 100644
--- a/pango/pangoxft-font.c
+++ b/pango/pangoxft-font.c
@@ -786,10 +786,12 @@ pango_xft_font_get_unknown_glyph (PangoFont *font,
 }
 
 /**
- * pango_xft_font_get_face:
+ * pango_xft_font_lock_face:
  * @font: a #PangoFont.
  *
- * Gets the FreeType FT_Face associated with a font.
+ * Gets the FreeType FT_Face associated with a font,
+ * This face will be kept around until you call
+ * pango_xft_font_unlock_face().
  *
  * Returns: the FreeType FT_Face associated with @font.
  **/
@@ -809,9 +811,8 @@ pango_xft_font_lock_face (PangoFont *font)
  * pango_xft_font_unlock_face:
  * @font: a #PangoFont.
  *
- * Gets the FreeType FT_Face associated with a font.
- *
- * Returns: the FreeType FT_Face associated with @font.
+ * Releases a font previously obtained with
+ * pango_xft_font_lock_face().
  **/
 void
 pango_xft_font_unlock_face (PangoFont *font)