Remove fribidi include.

Mon Nov 13 09:17:34 2000  Owen Taylor  <otaylor@redhat.com>

	* pango/pangox.c: Remove fribidi include.

	* pango.pc.in (Requires): Substitute fribidi reference only
        when necessary

	* Makefile.am (pkgconfigdir): pkgconfigdir is $(libdir)/pkgconfig

	* modules/indic/Makefile.am (EXTRA_DIST): Add pango-indic-script.h

        * fonts/Makefile.am (EXTRA_DIST): Remove devnag*

        * configure.in: Up version to 0.13

        * docs/pango-docs.sgml: Reorganize, add all new chapters.

	* docs/pango-sections.txt: Update

        * docs/Makefile.am (IGNORE_HFILES): add mini-fribidi
        pango-intset.h

20 files changed, 343 insertions, 43 deletions

diff --git a/ChangeLog b/ChangeLog
index ad4b077b..3bc0a031 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+Mon Nov 13 09:17:34 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangox.c: Remove fribidi include.
+
+	* pango.pc.in (Requires): Substitute fribidi reference only
+	when necessary
+
+	* Makefile.am (pkgconfigdir): pkgconfigdir is $(libdir)/pkgconfig
+
+	* modules/indic/Makefile.am (EXTRA_DIST): Add pango-indic-script.h
+
+	* fonts/Makefile.am (EXTRA_DIST): Remove devnag*
+
+        * configure.in: Up version to 0.13
+	
+	* docs/pango-docs.sgml: Reorganize, add all new chapters.
+
+	* docs/pango-sections.txt: Update
+
+	* docs/Makefile.am (IGNORE_HFILES): add mini-fribidi
+	pango-intset.h
+
 2000-11-13  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* pango/pango-attributes.c, pango/pango-attributes.h: Renamed
@@ -122,7 +144,8 @@ Sun Nov 12 16:07:06 2000  Owen Taylor  <otaylor@redhat.com>
 	
 Thu Nov  2 16:21:22 2000  Owen Taylor  <otaylor@redhat.com>
 
-	* New Arabic shaper from Karl Koehler.
+	* pango/modules/arabic: new version of Arabic shaper from Karl
+  	  Koehler.
 
 2000-11-01  Havoc Pennington  <hp@redhat.com>
 
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index ad4b077b..3bc0a031 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,25 @@
+Mon Nov 13 09:17:34 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangox.c: Remove fribidi include.
+
+	* pango.pc.in (Requires): Substitute fribidi reference only
+	when necessary
+
+	* Makefile.am (pkgconfigdir): pkgconfigdir is $(libdir)/pkgconfig
+
+	* modules/indic/Makefile.am (EXTRA_DIST): Add pango-indic-script.h
+
+	* fonts/Makefile.am (EXTRA_DIST): Remove devnag*
+
+        * configure.in: Up version to 0.13
+	
+	* docs/pango-docs.sgml: Reorganize, add all new chapters.
+
+	* docs/pango-sections.txt: Update
+
+	* docs/Makefile.am (IGNORE_HFILES): add mini-fribidi
+	pango-intset.h
+
 2000-11-13  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* pango/pango-attributes.c, pango/pango-attributes.h: Renamed
@@ -122,7 +144,8 @@ Sun Nov 12 16:07:06 2000  Owen Taylor  <otaylor@redhat.com>
 	
 Thu Nov  2 16:21:22 2000  Owen Taylor  <otaylor@redhat.com>
 
-	* New Arabic shaper from Karl Koehler.
+	* pango/modules/arabic: new version of Arabic shaper from Karl
+  	  Koehler.
 
 2000-11-01  Havoc Pennington  <hp@redhat.com>
 
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index ad4b077b..3bc0a031 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,25 @@
+Mon Nov 13 09:17:34 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangox.c: Remove fribidi include.
+
+	* pango.pc.in (Requires): Substitute fribidi reference only
+	when necessary
+
+	* Makefile.am (pkgconfigdir): pkgconfigdir is $(libdir)/pkgconfig
+
+	* modules/indic/Makefile.am (EXTRA_DIST): Add pango-indic-script.h
+
+	* fonts/Makefile.am (EXTRA_DIST): Remove devnag*
+
+        * configure.in: Up version to 0.13
+	
+	* docs/pango-docs.sgml: Reorganize, add all new chapters.
+
+	* docs/pango-sections.txt: Update
+
+	* docs/Makefile.am (IGNORE_HFILES): add mini-fribidi
+	pango-intset.h
+
 2000-11-13  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* pango/pango-attributes.c, pango/pango-attributes.h: Renamed
@@ -122,7 +144,8 @@ Sun Nov 12 16:07:06 2000  Owen Taylor  <otaylor@redhat.com>
 	
 Thu Nov  2 16:21:22 2000  Owen Taylor  <otaylor@redhat.com>
 
-	* New Arabic shaper from Karl Koehler.
+	* pango/modules/arabic: new version of Arabic shaper from Karl
+  	  Koehler.
 
 2000-11-01  Havoc Pennington  <hp@redhat.com>
 
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index ad4b077b..3bc0a031 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,25 @@
+Mon Nov 13 09:17:34 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangox.c: Remove fribidi include.
+
+	* pango.pc.in (Requires): Substitute fribidi reference only
+	when necessary
+
+	* Makefile.am (pkgconfigdir): pkgconfigdir is $(libdir)/pkgconfig
+
+	* modules/indic/Makefile.am (EXTRA_DIST): Add pango-indic-script.h
+
+	* fonts/Makefile.am (EXTRA_DIST): Remove devnag*
+
+        * configure.in: Up version to 0.13
+	
+	* docs/pango-docs.sgml: Reorganize, add all new chapters.
+
+	* docs/pango-sections.txt: Update
+
+	* docs/Makefile.am (IGNORE_HFILES): add mini-fribidi
+	pango-intset.h
+
 2000-11-13  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* pango/pango-attributes.c, pango/pango-attributes.h: Renamed
@@ -122,7 +144,8 @@ Sun Nov 12 16:07:06 2000  Owen Taylor  <otaylor@redhat.com>
 	
 Thu Nov  2 16:21:22 2000  Owen Taylor  <otaylor@redhat.com>
 
-	* New Arabic shaper from Karl Koehler.
+	* pango/modules/arabic: new version of Arabic shaper from Karl
+  	  Koehler.
 
 2000-11-01  Havoc Pennington  <hp@redhat.com>
 
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index ad4b077b..3bc0a031 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,25 @@
+Mon Nov 13 09:17:34 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangox.c: Remove fribidi include.
+
+	* pango.pc.in (Requires): Substitute fribidi reference only
+	when necessary
+
+	* Makefile.am (pkgconfigdir): pkgconfigdir is $(libdir)/pkgconfig
+
+	* modules/indic/Makefile.am (EXTRA_DIST): Add pango-indic-script.h
+
+	* fonts/Makefile.am (EXTRA_DIST): Remove devnag*
+
+        * configure.in: Up version to 0.13
+	
+	* docs/pango-docs.sgml: Reorganize, add all new chapters.
+
+	* docs/pango-sections.txt: Update
+
+	* docs/Makefile.am (IGNORE_HFILES): add mini-fribidi
+	pango-intset.h
+
 2000-11-13  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* pango/pango-attributes.c, pango/pango-attributes.h: Renamed
@@ -122,7 +144,8 @@ Sun Nov 12 16:07:06 2000  Owen Taylor  <otaylor@redhat.com>
 	
 Thu Nov  2 16:21:22 2000  Owen Taylor  <otaylor@redhat.com>
 
-	* New Arabic shaper from Karl Koehler.
+	* pango/modules/arabic: new version of Arabic shaper from Karl
+  	  Koehler.
 
 2000-11-01  Havoc Pennington  <hp@redhat.com>
 
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index ad4b077b..3bc0a031 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,25 @@
+Mon Nov 13 09:17:34 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangox.c: Remove fribidi include.
+
+	* pango.pc.in (Requires): Substitute fribidi reference only
+	when necessary
+
+	* Makefile.am (pkgconfigdir): pkgconfigdir is $(libdir)/pkgconfig
+
+	* modules/indic/Makefile.am (EXTRA_DIST): Add pango-indic-script.h
+
+	* fonts/Makefile.am (EXTRA_DIST): Remove devnag*
+
+        * configure.in: Up version to 0.13
+	
+	* docs/pango-docs.sgml: Reorganize, add all new chapters.
+
+	* docs/pango-sections.txt: Update
+
+	* docs/Makefile.am (IGNORE_HFILES): add mini-fribidi
+	pango-intset.h
+
 2000-11-13  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* pango/pango-attributes.c, pango/pango-attributes.h: Renamed
@@ -122,7 +144,8 @@ Sun Nov 12 16:07:06 2000  Owen Taylor  <otaylor@redhat.com>
 	
 Thu Nov  2 16:21:22 2000  Owen Taylor  <otaylor@redhat.com>
 
-	* New Arabic shaper from Karl Koehler.
+	* pango/modules/arabic: new version of Arabic shaper from Karl
+  	  Koehler.
 
 2000-11-01  Havoc Pennington  <hp@redhat.com>
 
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index ad4b077b..3bc0a031 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,25 @@
+Mon Nov 13 09:17:34 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangox.c: Remove fribidi include.
+
+	* pango.pc.in (Requires): Substitute fribidi reference only
+	when necessary
+
+	* Makefile.am (pkgconfigdir): pkgconfigdir is $(libdir)/pkgconfig
+
+	* modules/indic/Makefile.am (EXTRA_DIST): Add pango-indic-script.h
+
+	* fonts/Makefile.am (EXTRA_DIST): Remove devnag*
+
+        * configure.in: Up version to 0.13
+	
+	* docs/pango-docs.sgml: Reorganize, add all new chapters.
+
+	* docs/pango-sections.txt: Update
+
+	* docs/Makefile.am (IGNORE_HFILES): add mini-fribidi
+	pango-intset.h
+
 2000-11-13  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* pango/pango-attributes.c, pango/pango-attributes.h: Renamed
@@ -122,7 +144,8 @@ Sun Nov 12 16:07:06 2000  Owen Taylor  <otaylor@redhat.com>
 	
 Thu Nov  2 16:21:22 2000  Owen Taylor  <otaylor@redhat.com>
 
-	* New Arabic shaper from Karl Koehler.
+	* pango/modules/arabic: new version of Arabic shaper from Karl
+  	  Koehler.
 
 2000-11-01  Havoc Pennington  <hp@redhat.com>
 
diff --git a/Makefile.am b/Makefile.am
index c8677bba..84724247 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@ EXTRA_DIST = 		\
 	pango.pc.in	\
 	pangox.pc.in
 
-pkgconfigdir = $(libexecdir)/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = pango.pc pangox.pc
 
 dist-hook: pango.spec
diff --git a/configure.in b/configure.in
index 5a4a6640..18ced476 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to create configure.
 
 PANGO_MAJOR_VERSION=0
-PANGO_MINOR_VERSION=12
+PANGO_MINOR_VERSION=13
 
 AC_SUBST(PANGO_MAJOR_VERSION)
 AC_SUBST(PANGO_MINOR_VERSION)
@@ -51,6 +51,7 @@ AC_ARG_WITH(fribidi, [ --with-fribidi     Use external fribidi library ],,with_f
 
 FRIBIDI_LIBS=""
 FRIBIDI_CFLAGS=""
+FRIBIDI_PC=""
 have_fribidi=no
 
 if test "x$with_fribidi" = "xyes" ; then
@@ -67,6 +68,7 @@ if test "x$with_fribidi" = "xyes" ; then
    FRIBIDI_CFLAGS="`$FRIBIDI_CONFIG --cflags`"
    CFLAGS="$CFLAGS $FRIBIDI_CFLAGS"
    FRIBIDI_LIBS="`$FRIBIDI_CONFIG --libs`"
+   FRIBIDI_PC="fribidi,"	
 
    AC_CHECK_LIB(fribidi, fribidi_get_mirror_char, :,
 	        AC_MSG_ERROR([*** libfribidi not found.]), $FRIBIDI_LIBS)
@@ -77,6 +79,7 @@ fi
 
 AC_SUBST(FRIBIDI_LIBS)
 AC_SUBST(FRIBIDI_CFLAGS)
+AC_SUBST(FRIBIDI_PC)
 AM_CONDITIONAL(HAVE_FRIBIDI, test x$have_fribidi = xyes)
 
 #
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 9009a918..07af8d37 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -14,7 +14,9 @@ FIXXREF_OPTIONS=
 
 # Headers to ignore
 IGNORE_HFILES=			\
+	mini-fribidi		\
 	modules.h		\
+	pango-intset.h		\
 	pango-utils.h		\
 	pangoft2-private.h	\
 	pangowin32-private.h	\
diff --git a/docs/pango-docs.sgml b/docs/pango-docs.sgml
index 91d7c782..a51705c3 100644
--- a/docs/pango-docs.sgml
+++ b/docs/pango-docs.sgml
@@ -1,13 +1,18 @@
 <!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-<!entity pango-main SYSTEM "sgml/main.sgml">
-<!entity pango-glyphs SYSTEM "sgml/glyphs.sgml">
-<!entity pango-fonts SYSTEM "sgml/fonts.sgml">
-<!entity pango-text-attributes SYSTEM "sgml/text-attributes.sgml">
-<!entity pango-layout SYSTEM "sgml/layout.sgml">
-<!entity pango-coverage-maps SYSTEM "sgml/coverage-maps.sgml">
-<!entity pango-engines SYSTEM "sgml/engines.sgml">
-<!entity x-fonts SYSTEM "sgml/x-fonts.sgml">
-<!entity x-rendering SYSTEM "sgml/x-rendering.sgml">
+<!entity pango-Text-Processing SYSTEM "sgml/main.sgml">
+<!entity pango-Glyph-Storage SYSTEM "sgml/glyphs.sgml">
+<!entity pango-Coverage-Maps SYSTEM "sgml/coverage-maps.sgml">
+<!entity pango-Fonts SYSTEM "sgml/fonts.sgml">
+<!entity pango-Text-Attributes SYSTEM "sgml/text-attributes.sgml">
+<!entity pango-Tab-Stops SYSTEM "sgml/tab-stops.sgml">
+<!entity pango-Layout-Objects SYSTEM "sgml/layout.sgml">
+<!entity pango-Engines SYSTEM "sgml/engines.sgml">
+<!entity pango-Indic-Engine-Support SYSTEM "sgml/pango-indic.sgml">
+<!entity pango-Modules SYSTEM "sgml/modules.sgml">
+<!entity pango-X-Rendering SYSTEM "sgml/x-rendering.sgml">
+<!entity pango-X-Fonts SYSTEM "sgml/x-fonts.sgml">
+<!entity pango-Win32-Fonts-and-Rendering SYSTEM "sgml/win32-fonts.sgml">
+<!entity pango-FreeType-Fonts-and-Rendering SYSTEM "sgml/freetype-fonts.sgml">
 <!entity markup-format SYSTEM "pango_markup.sgml">
 ]>
 <book id="index">
@@ -17,19 +22,28 @@
 
   <chapter id="pango">
     <title>Basic Pango Interfaces</title>
-    &pango-main;
-    &pango-glyphs;
-    &pango-fonts;
-    &pango-text-attributes;
+    &pango-Text-Processing;
+    &pango-Glyph-Storage;
+    &pango-Fonts;
+    &pango-Text-Attributes;
+    &pango-Tab-Stops;
     &markup-format;
-    &pango-layout;
-    &pango-coverage-maps;
-    &pango-engines;
+    &pango-Layout-Objects;
   </chapter>
 
-  <chapter id="pango-x">
-    <title>Rendering under X with Pango</title>
-    &x-fonts;
-    &x-rendering;
+  <chapter id="rendering">
+    <title>Rendering with Pango</title>
+    &pango-X-Fonts;
+    &pango-X-Rendering;
+    &pango-Win32-Fonts-and-Rendering;
+    &pango-FreeType-Fonts-and-Rendering;
+    </chapter>
+
+  <chapter id="lowlevel">
+    <title>Low Level Functionality</title>
+    &pango-Coverage-Maps;
+    &pango-Engines;
+    &pango-Indic-Engine-Support;
+    &pango-Modules;
     </chapter>
 </book>
diff --git a/docs/pango-sections.txt b/docs/pango-sections.txt
index 35b91770..32e4c799 100644
--- a/docs/pango-sections.txt
+++ b/docs/pango-sections.txt
@@ -212,6 +212,7 @@ pango_layout_get_context
 pango_layout_context_changed
 
 pango_layout_set_text
+pango_layout_get_text
 pango_layout_set_markup
 pango_layout_set_markup_with_accel
 pango_layout_set_attributes
@@ -286,6 +287,18 @@ script_engine_unload
 </SECTION>
 
 <SECTION>
+<FILE>pango-indic</FILE>
+<TITLE>Indic Engine Support</TITLE>
+ZERO_WIDTH_NON_JOINER
+ZERO_WIDTH_JOINER
+PangoIndicScript
+pango_indic_shift_vowels
+pango_indic_compact
+pango_indic_convert_vowels
+pango_indic_split_out_characters
+</SECTION>
+
+<SECTION>
 <TITLE>Modules</TITLE>
 <FILE>modules</FILE>
 PangoMap
@@ -323,6 +336,9 @@ pango_x_font_map_for_display
 pango_x_shutdown_display
 pango_x_font_map_get_font_cache
 pango_x_font_subfont_xlfd
+pango_x_find_first_subfont
+pango_x_apply_ligatures
+pango_x_fallback_shape
 PangoXFontCache
 pango_x_font_cache_new
 pango_x_font_cache_free
diff --git a/docs/tmpl/layout.sgml b/docs/tmpl/layout.sgml
index 4cb4c9a9..f66b0a25 100644
--- a/docs/tmpl/layout.sgml
+++ b/docs/tmpl/layout.sgml
@@ -84,6 +84,37 @@ fields.
 @length: 
 
 
+<!-- ##### FUNCTION pango_layout_get_text ##### -->
+<para>
+
+</para>
+
+@layout: 
+@Returns: 
+
+
+<!-- ##### FUNCTION pango_layout_set_markup ##### -->
+<para>
+
+</para>
+
+@layout: 
+@markup: 
+@length: 
+
+
+<!-- ##### FUNCTION pango_layout_set_markup_with_accel ##### -->
+<para>
+
+</para>
+
+@layout: 
+@markup: 
+@length: 
+@accel_marker: 
+@accel_char: 
+
+
 <!-- ##### FUNCTION pango_layout_set_attributes ##### -->
 <para>
 
@@ -93,6 +124,15 @@ fields.
 @attrs: 
 
 
+<!-- ##### FUNCTION pango_layout_get_attributes ##### -->
+<para>
+
+</para>
+
+@layout: 
+@Returns: 
+
+
 <!-- ##### FUNCTION pango_layout_set_font_description ##### -->
 <para>
 
diff --git a/docs/tmpl/main.sgml b/docs/tmpl/main.sgml
index 7f97791e..7e5c4068 100644
--- a/docs/tmpl/main.sgml
+++ b/docs/tmpl/main.sgml
@@ -171,12 +171,12 @@ for text.
 
 @context: 
 @text: 
+@start_index: 
 @length: 
 @attrs: 
+@cached_iter: 
 @Returns: 
 <!-- # Unused Parameters # -->
-@start_index: 
-@cached_iter: 
 @lang_info: 
 @n_langs: 
 
diff --git a/docs/tmpl/text-attributes.sgml b/docs/tmpl/text-attributes.sgml
index 80a5bba1..9305a25a 100644
--- a/docs/tmpl/text-attributes.sgml
+++ b/docs/tmpl/text-attributes.sgml
@@ -41,6 +41,7 @@ attribute is listed in parentheses after the description.
 @PANGO_ATTR_STRIKETHROUGH: whether the text is struck-through (#PangoAttrInt)
 @PANGO_ATTR_RISE: baseline displacement (#PangoAttrInt)
 @PANGO_ATTR_SHAPE: 
+@PANGO_ATTR_SCALE: 
 
 <!-- ##### STRUCT PangoAttrClass ##### -->
 <para>
@@ -98,6 +99,14 @@ a integer or enumeration value.
 @attr: the common portion of the attribute
 @value: the value of the attribute
 
+<!-- ##### STRUCT PangoAttrFloat ##### -->
+<para>
+
+</para>
+
+@attr: 
+@value: 
+
 <!-- ##### STRUCT PangoAttrFontDesc ##### -->
 <para>
 The #PangoAttrFontDesc structure is used to store an attribute that
@@ -116,6 +125,21 @@ sets all aspects of the font description at once.
 @ink_rect: 
 @logical_rect: 
 
+<!-- ##### FUNCTION pango_parse_markup ##### -->
+<para>
+
+</para>
+
+@markup_text: 
+@length: 
+@accel_marker: 
+@attr_list: 
+@text: 
+@accel_char: 
+@error: 
+@Returns: 
+
+
 <!-- ##### FUNCTION pango_attr_type_register ##### -->
 <para>
 
@@ -274,6 +298,15 @@ sets all aspects of the font description at once.
 @Returns: 
 
 
+<!-- ##### FUNCTION pango_attr_scale_new ##### -->
+<para>
+
+</para>
+
+@scale_factor: 
+@Returns: 
+
+
 <!-- ##### ENUM PangoUnderline ##### -->
 <para>
 the #PangoUnderline enumeration is used to specify
diff --git a/docs/tmpl/x-fonts.sgml b/docs/tmpl/x-fonts.sgml
index ecbc147f..ec1ca925 100644
--- a/docs/tmpl/x-fonts.sgml
+++ b/docs/tmpl/x-fonts.sgml
@@ -129,6 +129,42 @@ glyph index.
 @Returns: 
 
 
+<!-- ##### FUNCTION pango_x_find_first_subfont ##### -->
+<para>
+
+</para>
+
+@font: 
+@charsets: 
+@n_charsets: 
+@rfont: 
+@Returns: 
+
+
+<!-- ##### FUNCTION pango_x_apply_ligatures ##### -->
+<para>
+
+</para>
+
+@font: 
+@subfont: 
+@chars: 
+@n_glyphs: 
+@clusters: 
+@Returns: 
+
+
+<!-- ##### FUNCTION pango_x_fallback_shape ##### -->
+<para>
+
+</para>
+
+@font: 
+@glyphs: 
+@text: 
+@n_chars: 
+
+
 <!-- ##### STRUCT PangoXFontCache ##### -->
 <para>
 
diff --git a/fonts/Makefile.am b/fonts/Makefile.am
index 85345dd9..f747c793 100644
--- a/fonts/Makefile.am
+++ b/fonts/Makefile.am
@@ -1,6 +1,4 @@
 ## Process this file with automake to create Makefile.in.
 
 EXTRA_DIST= 		\
-	tscakaram.pcf	\
-	devnag.README	\
-	devnag18.bdf
+	tscakaram.pcf
diff --git a/modules/indic/Makefile.am b/modules/indic/Makefile.am
index f593b566..18d27153 100644
--- a/modules/indic/Makefile.am
+++ b/modules/indic/Makefile.am
@@ -24,6 +24,10 @@ endif
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine)
 
+
+EXTRA_DIST = \
+	pango-indic-script.h
+
 pango_devanagari_la_LDFLAGS = -rpath $(libdir) -export-dynamic -avoid-version -module
 pango_devanagari_la_SOURCES = devanagari.c
 
@@ -42,18 +46,12 @@ pango_gurmukhi_la_SOURCES = gurmukhi.c
 libpango_gurmukhi_la_SOURCES = gurmukhi.c
 
 
-
-
 pango_bengali_la_LDFLAGS = -rpath $(libdir) -export-dynamic -avoid-version -module
 pango_bengali_la_SOURCES = bengali.c
 
 libpango_bengali_la_SOURCES = bengali.c
 
 
-
-
-
-
 pango_gujarati_la_LDFLAGS = -rpath $(libdir) -export-dynamic -avoid-version -module
 pango_gujarati_la_SOURCES = gujarati.c
 
diff --git a/pango.pc.in b/pango.pc.in
index a774a46e..ad077425 100644
--- a/pango.pc.in
+++ b/pango.pc.in
@@ -6,7 +6,7 @@ includedir=@includedir@
 Name: Pango
 Description: Internationalized text handling
 Version: @VERSION@
-Requires: fribidi,gobject-2.0,gmodule-2.0
+Requires: @FRIBIDI_PC@glib-2.0,gobject-2.0,gmodule-2.0
 Libs: -L${libdir} -lpango
 Cflags:
 
diff --git a/pango/pangox.c b/pango/pangox.c
index 5d9965a6..4bf7e7be 100644
--- a/pango/pangox.c
+++ b/pango/pangox.c
@@ -25,7 +25,6 @@
 #include <math.h>
 
 #include <X11/Xlib.h>
-#include <fribidi/fribidi.h>
 #include "pangox.h"
 #include "pango-utils.h"
 #include "pangox-private.h"
@@ -684,7 +683,7 @@ pango_x_font_get_metrics (PangoFont        *font,
 			  const gchar      *lang,
 			  PangoFontMetrics *metrics)
 {
-  PangoXMetricsInfo *info;
+  PangoXMetricsInfo *info = NULL; /* Quiet gcc */
   PangoXFont *xfont = (PangoXFont *)font;
   GSList *tmp_list;