Fix low underline code to deal with run_ink == NULL.

Tue Nov 14 11:10:24 2000  Owen Taylor  <otaylor@redhat.com>

	* pango/pango-layout.c (pango_layout_run_get_extents):
	Fix low underline code to deal with run_ink == NULL.

	* pango/pango-utils.c (pango_read_line): Return number
	of lines read to allow decent parse errors line numbers.

	* pango/pangox-fontmap.c (pango_x_font_map_read_alias_file):
	Fix line number count.

	* examples/pangox.aliases: Include extra international fonts
	for all styles, not just roman, reindent so it looks
	halfway legible.

20 files changed, 476 insertions, 96 deletions

diff --git a/ChangeLog b/ChangeLog
index 3dcbc145..df83aef2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+Tue Nov 14 11:10:24 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_run_get_extents): 
+	Fix low underline code to deal with run_ink == NULL.
+
+	* pango/pango-utils.c (pango_read_line): Return number
+	of lines read to allow decent parse errors line numbers.
+
+	* pango/pangox-fontmap.c (pango_x_font_map_read_alias_file):
+	Fix line number count.
+
+	* examples/pangox.aliases: Include extra international fonts
+	for all styles, not just roman, reindent so it looks 
+	halfway legible.
+
+Mon Nov 13 14:02:48 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangox.c pango/pango-indic.c: Some doc comment
+	fixes.
+
 2000-11-13  Havoc Pennington  <hp@redhat.com>
 
 	* pango/pango-layout.c (pango_layout_get_cursor_pos): Don't need
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 3dcbc145..df83aef2 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,23 @@
+Tue Nov 14 11:10:24 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_run_get_extents): 
+	Fix low underline code to deal with run_ink == NULL.
+
+	* pango/pango-utils.c (pango_read_line): Return number
+	of lines read to allow decent parse errors line numbers.
+
+	* pango/pangox-fontmap.c (pango_x_font_map_read_alias_file):
+	Fix line number count.
+
+	* examples/pangox.aliases: Include extra international fonts
+	for all styles, not just roman, reindent so it looks 
+	halfway legible.
+
+Mon Nov 13 14:02:48 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangox.c pango/pango-indic.c: Some doc comment
+	fixes.
+
 2000-11-13  Havoc Pennington  <hp@redhat.com>
 
 	* pango/pango-layout.c (pango_layout_get_cursor_pos): Don't need
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 3dcbc145..df83aef2 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,23 @@
+Tue Nov 14 11:10:24 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_run_get_extents): 
+	Fix low underline code to deal with run_ink == NULL.
+
+	* pango/pango-utils.c (pango_read_line): Return number
+	of lines read to allow decent parse errors line numbers.
+
+	* pango/pangox-fontmap.c (pango_x_font_map_read_alias_file):
+	Fix line number count.
+
+	* examples/pangox.aliases: Include extra international fonts
+	for all styles, not just roman, reindent so it looks 
+	halfway legible.
+
+Mon Nov 13 14:02:48 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangox.c pango/pango-indic.c: Some doc comment
+	fixes.
+
 2000-11-13  Havoc Pennington  <hp@redhat.com>
 
 	* pango/pango-layout.c (pango_layout_get_cursor_pos): Don't need
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 3dcbc145..df83aef2 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,23 @@
+Tue Nov 14 11:10:24 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_run_get_extents): 
+	Fix low underline code to deal with run_ink == NULL.
+
+	* pango/pango-utils.c (pango_read_line): Return number
+	of lines read to allow decent parse errors line numbers.
+
+	* pango/pangox-fontmap.c (pango_x_font_map_read_alias_file):
+	Fix line number count.
+
+	* examples/pangox.aliases: Include extra international fonts
+	for all styles, not just roman, reindent so it looks 
+	halfway legible.
+
+Mon Nov 13 14:02:48 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangox.c pango/pango-indic.c: Some doc comment
+	fixes.
+
 2000-11-13  Havoc Pennington  <hp@redhat.com>
 
 	* pango/pango-layout.c (pango_layout_get_cursor_pos): Don't need
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 3dcbc145..df83aef2 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,23 @@
+Tue Nov 14 11:10:24 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_run_get_extents): 
+	Fix low underline code to deal with run_ink == NULL.
+
+	* pango/pango-utils.c (pango_read_line): Return number
+	of lines read to allow decent parse errors line numbers.
+
+	* pango/pangox-fontmap.c (pango_x_font_map_read_alias_file):
+	Fix line number count.
+
+	* examples/pangox.aliases: Include extra international fonts
+	for all styles, not just roman, reindent so it looks 
+	halfway legible.
+
+Mon Nov 13 14:02:48 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangox.c pango/pango-indic.c: Some doc comment
+	fixes.
+
 2000-11-13  Havoc Pennington  <hp@redhat.com>
 
 	* pango/pango-layout.c (pango_layout_get_cursor_pos): Don't need
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 3dcbc145..df83aef2 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,23 @@
+Tue Nov 14 11:10:24 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_run_get_extents): 
+	Fix low underline code to deal with run_ink == NULL.
+
+	* pango/pango-utils.c (pango_read_line): Return number
+	of lines read to allow decent parse errors line numbers.
+
+	* pango/pangox-fontmap.c (pango_x_font_map_read_alias_file):
+	Fix line number count.
+
+	* examples/pangox.aliases: Include extra international fonts
+	for all styles, not just roman, reindent so it looks 
+	halfway legible.
+
+Mon Nov 13 14:02:48 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangox.c pango/pango-indic.c: Some doc comment
+	fixes.
+
 2000-11-13  Havoc Pennington  <hp@redhat.com>
 
 	* pango/pango-layout.c (pango_layout_get_cursor_pos): Don't need
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 3dcbc145..df83aef2 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,23 @@
+Tue Nov 14 11:10:24 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_run_get_extents): 
+	Fix low underline code to deal with run_ink == NULL.
+
+	* pango/pango-utils.c (pango_read_line): Return number
+	of lines read to allow decent parse errors line numbers.
+
+	* pango/pangox-fontmap.c (pango_x_font_map_read_alias_file):
+	Fix line number count.
+
+	* examples/pangox.aliases: Include extra international fonts
+	for all styles, not just roman, reindent so it looks 
+	halfway legible.
+
+Mon Nov 13 14:02:48 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangox.c pango/pango-indic.c: Some doc comment
+	fixes.
+
 2000-11-13  Havoc Pennington  <hp@redhat.com>
 
 	* pango/pango-layout.c (pango_layout_get_cursor_pos): Don't need
diff --git a/configure.in b/configure.in
index 18ced476..00c599e5 100644
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,7 @@ AC_SUBST(PANGO_MAJOR_VERSION)
 AC_SUBST(PANGO_MINOR_VERSION)
 
 AC_INIT(ChangeLog)
-AM_INIT_AUTOMAKE(pango, 0.12)
+AM_INIT_AUTOMAKE(pango, 0.13)
 
 AM_CONFIG_HEADER(config.h)
 
diff --git a/docs/tmpl/pango-indic.sgml b/docs/tmpl/pango-indic.sgml
new file mode 100644
index 00000000..24c5fae3
--- /dev/null
+++ b/docs/tmpl/pango-indic.sgml
@@ -0,0 +1,88 @@
+<!-- ##### SECTION Title ##### -->
+Indic Engine Support
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### MACRO ZERO_WIDTH_NON_JOINER ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO ZERO_WIDTH_JOINER ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### STRUCT PangoIndicScript ##### -->
+<para>
+
+</para>
+
+@name: 
+@is_prefixing_vowel: 
+@is_vowel_sign: 
+@vowel_sign_to_matra: 
+@is_vowel_half: 
+@vowel_split: 
+
+<!-- ##### FUNCTION pango_indic_shift_vowels ##### -->
+<para>
+
+</para>
+
+@script: 
+@chars: 
+@end: 
+
+
+<!-- ##### FUNCTION pango_indic_compact ##### -->
+<para>
+
+</para>
+
+@script: 
+@num: 
+@chars: 
+@cluster: 
+
+
+<!-- ##### FUNCTION pango_indic_convert_vowels ##### -->
+<para>
+
+</para>
+
+@script: 
+@in_middle: 
+@num: 
+@chars: 
+@has_standalone_vowels: 
+
+
+<!-- ##### FUNCTION pango_indic_split_out_characters ##### -->
+<para>
+
+</para>
+
+@script: 
+@text: 
+@n_chars: 
+@wc: 
+@n_glyph: 
+@glyphs: 
+
+
diff --git a/docs/tmpl/text-attributes.sgml b/docs/tmpl/text-attributes.sgml
index 9305a25a..bd0546f6 100644
--- a/docs/tmpl/text-attributes.sgml
+++ b/docs/tmpl/text-attributes.sgml
@@ -54,7 +54,7 @@ provided for #PangoAttribute.
 @type: the type ID for this attribute
 @copy: function to duplicate an attribute of this type (see pango_attribute_copy())
 @destroy: function to free an attribute of this type (see pango_attribute_destroy())
-@equal: function to compare two attributes of this type (see pango_attribute_equal())
+@equal: 
 
 <!-- ##### STRUCT PangoAttribute ##### -->
 <para>
diff --git a/docs/tmpl/x-fonts.sgml b/docs/tmpl/x-fonts.sgml
index ec1ca925..9fb002df 100644
--- a/docs/tmpl/x-fonts.sgml
+++ b/docs/tmpl/x-fonts.sgml
@@ -148,10 +148,12 @@ glyph index.
 
 @font: 
 @subfont: 
-@chars: 
+@glyphs: 
 @n_glyphs: 
 @clusters: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@chars: 
 
 
 <!-- ##### FUNCTION pango_x_fallback_shape ##### -->
diff --git a/docs/tmpl/x-rendering.sgml b/docs/tmpl/x-rendering.sgml
index 32a83c4d..8f3f44b8 100644
--- a/docs/tmpl/x-rendering.sgml
+++ b/docs/tmpl/x-rendering.sgml
@@ -2,12 +2,11 @@
 X Rendering
 
 <!-- ##### SECTION Short_Description ##### -->
-Functions for Rendering Pango objects on X displays.
+
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-The functions in this system are used to take the output
-of the shaping modules and render that on the screen.
+
 </para>
 
 <!-- ##### SECTION See_Also ##### -->
@@ -17,9 +16,7 @@ of the shaping modules and render that on the screen.
 
 <!-- ##### MACRO PANGO_RENDER_TYPE_X ##### -->
 <para>
-%PANGO_RENDER_TYPE_X is a string constant that
-is used to identify shaping modules for the
-X Window System.
+
 </para>
 
 
@@ -45,28 +42,22 @@ X Window System.
 
 <!-- ##### USER_FUNCTION PangoGetGCFunc ##### -->
 <para>
-Used to represent a function which is called when a new GC must be
-created to draw something other than the default color when rendering
-a layout. The function used here will typically retrieve information
-from the context with pango_context_get_data().
+
 </para>
 
-@context: the #PangoContext
-@color: color attribute representing the desired color
-@base_gc: default GC used for rendering. The function will typically
-          copy attributes such as clip region from the GC
-@Returns: the new GC
+@context: 
+@color: 
+@base_gc: 
+@Returns: 
 
 
 <!-- ##### USER_FUNCTION PangoFreeGCFunc ##### -->
 <para>
-Used to represent a function which is called to free a GC created with
-the corresponding PangoGetGCFunc. The function used here will
-typically retrieve information from the context with pango_context_set_data().
+
 </para>
 
-@context: the #PangoContext
-@gc: the GC to free
+@context: 
+@gc: 
 
 
 <!-- ##### FUNCTION pango_x_render ##### -->
diff --git a/examples/pangox.aliases b/examples/pangox.aliases
index 99f05d17..7785a491 100644
--- a/examples/pangox.aliases
+++ b/examples/pangox.aliases
@@ -2,61 +2,207 @@
 #
 # family style variant weight stretch   XLFD
 
-sans normal normal normal normal "-*-helvetica-medium-r-normal--*-*-*-*-*-*-*-*,\
-                                  -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-                                  -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-                                  -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-                                  -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-                                  -tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0,\
--*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
--*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
--*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
--*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
--*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
--*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
--*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
--*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
--daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
-
-sans italic normal normal normal "-*-helvetica-medium-o-normal--*-*-*-*-*-*-*-*"
-sans normal normal bold normal "-*-helvetica-bold-r-normal--*-*-*-*-*-*-*-*"
-sans italic normal bold normal "-*-helvetica-bold-o-normal--*-*-*-*-*-*-*-*"
-
-serif normal normal normal normal "-*-times-medium-r-normal--*-*-*-*-*-*-*-*,\
-				  -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-	                           -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-                                   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-                                   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-                                   -tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0,\
--*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
--*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
--*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
--*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
--*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
--*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
--*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
--*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
--daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
-
-serif italic normal normal normal "-*-times-medium-i-normal--*-*-*-*-*-*-*-*"
-serif normal normal bold normal "-*-times-bold-r-normal--*-*-*-*-*-*-*-*"
-serif italic normal bold normal "-*-times-bold-i-normal--*-*-*-*-*-*-*-*"
-
-monospace normal normal normal normal "-*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-				       -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-                                       -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-                                       -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-                                       -tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0,\
--*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
--*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
--*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
--*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
--*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
--*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
--*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
--*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
--daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
-
-monospace italic normal normal normal "-*-fixed-medium-i-normal--*-*-*-*-*-*-*-*"
-monospace normal normal bold normal "-*-fixed-bold-r-normal--*-*-*-*-*-*-*-*"
-monospace italic normal bold normal "-*-fixed-bold-i-normal--*-*-*-*-*-*-*-*"
+sans normal normal normal normal \
+  "-*-helvetica-medium-r-normal--*-*-*-*-*-*-*-*,\
+   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
+   -tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0,\
+   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
+   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
+   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
+   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
+   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
+   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
+   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
+   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
+   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
+
+sans italic normal normal normal \
+  "-*-helvetica-medium-o-normal--*-*-*-*-*-*-*-*,\
+   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
+   -tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0,\
+   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
+   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
+   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
+   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
+   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
+   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
+   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
+   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
+   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
+
+sans normal normal bold normal \
+  "-*-helvetica-bold-r-normal--*-*-*-*-*-*-*-*,\
+   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
+   -tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0,\
+   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
+   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
+   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
+   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
+   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
+   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
+   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
+   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
+   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
+
+sans italic normal bold normal \
+  "-*-helvetica-bold-o-normal--*-*-*-*-*-*-*-*,\
+   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
+   -tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0,\
+   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
+   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
+   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
+   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
+   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
+   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
+   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
+   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
+   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
+
+
+serif normal normal normal normal \
+  "-*-times-medium-r-normal--*-*-*-*-*-*-*-*,\
+   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
+   -tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0,\
+   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
+   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
+   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
+   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
+   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
+   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
+   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
+   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
+   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
+
+serif italic normal normal normal \
+  "-*-times-medium-i-normal--*-*-*-*-*-*-*-*,\
+   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
+   -tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0,\
+   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
+   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
+   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
+   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
+   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
+   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
+   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
+   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
+   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
+
+serif normal normal bold normal \
+  "-*-times-bold-r-normal--*-*-*-*-*-*-*-*,\
+   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
+   -tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0,\
+   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
+   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
+   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
+   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
+   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
+   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
+   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
+   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
+   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
+
+serif italic normal bold normal \
+  "-*-times-bold-i-normal--*-*-*-*-*-*-*-*,\
+   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
+   -tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0,\
+   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
+   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
+   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
+   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
+   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
+   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
+   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
+   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
+   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
+
+monospace normal normal normal normal \
+  "-*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
+   -tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0,\
+   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
+   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
+   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
+   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
+   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
+   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
+   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
+   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
+   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
+
+monospace italic normal normal normal \
+  "-*-fixed-medium-i-normal--*-*-*-*-*-*-*-*,\
+   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
+   -tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0,\
+   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
+   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
+   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
+   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
+   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
+   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
+   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
+   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
+   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
+
+monospace normal normal bold normal \
+  "-*-fixed-bold-r-normal--*-*-*-*-*-*-*-*,\
+   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
+   -tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0,\
+   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
+   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
+   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
+   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
+   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
+   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
+   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
+   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
+   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
+
+monospace italic normal bold normal \
+  "-*-fixed-bold-i-normal--*-*-*-*-*-*-*-*,\
+   -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+   -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+   -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+   -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
+   -tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0,\
+   -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
+   -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
+   -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
+   -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
+   -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
+   -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
+   -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
+   -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
+   -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
diff --git a/pango/pango-indic.c b/pango/pango-indic.c
index e20a4980..5845a035 100755
--- a/pango/pango-indic.c
+++ b/pango/pango-indic.c
@@ -64,7 +64,7 @@ pango_indic_shift_vowels (PangoIndicScript *script,
  * @script: A #PangoIndicScript
  * @num: The number of glyphs
  * @chars: An array of glyphs/characters
- * @clusters: The cluster array.
+ * @cluster: The cluster array.
  *
  * This eliminates any blank space in the @chars
  * array, updated @clusters and @num also. 
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index 46ae0231..7f767f83 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -2868,22 +2868,29 @@ pango_layout_run_get_extents (PangoLayoutRun *run,
 
   PangoRectangle shape_ink;
   PangoRectangle shape_logical;
+  PangoRectangle tmp_ink;
   gboolean shape_set;
+  gboolean need_ink;
 
   pango_layout_get_item_properties (run->item, &uline,
                                     &shape_ink, &shape_logical, &shape_set);
 
   if (shape_setp)
     *shape_setp = shape_set;
+
+  need_ink = run_ink || uline == PANGO_UNDERLINE_LOW;
   
   if (shape_set)
     imposed_extents (run->item->num_chars, &shape_ink, &shape_logical,
-                     (uline != PANGO_UNDERLINE_NONE) ? run_ink : NULL, run_logical);
+		     need_ink ? &tmp_ink : NULL, run_logical);
   else
     pango_glyph_string_extents (run->glyphs, run->item->analysis.font,
-                                (uline != PANGO_UNDERLINE_NONE) ? run_ink : NULL,
+                                need_ink ? &tmp_ink : NULL,
                                 run_logical);
 
+  if (run_ink)
+    *run_ink = tmp_ink;
+
   switch (uline)
     {
     case PANGO_UNDERLINE_NONE:
@@ -2899,12 +2906,12 @@ pango_layout_run_get_extents (PangoLayoutRun *run,
       run_logical->height = MAX (run_logical->height, 4 * PANGO_SCALE - run_logical->y);
       break;
     case PANGO_UNDERLINE_LOW:
-      if (run_ink)
-        run_ink->height += 2 * PANGO_SCALE;
-	  
       /* FIXME: Should this simply be run_logical->height += 2 * PANGO_SCALE instead?
        */
-      run_logical->height = MAX (run_logical->height, run_ink->y + run_ink->height - run_logical->y);
+      if (run_ink)
+	run_ink->height += 2 * PANGO_SCALE;
+      run_logical->height = MAX (run_logical->height,
+				 tmp_ink.y + tmp_ink.height + 2 * PANGO_SCALE - run_logical->y);
       break;
     }
 }
diff --git a/pango/pango-utils.c b/pango/pango-utils.c
index b8ce0d58..b243f7be 100644
--- a/pango/pango-utils.c
+++ b/pango/pango-utils.c
@@ -142,14 +142,17 @@ pango_split_file_list (const char *str)
  * any other character is ignored and written into the output buffer
  * unmodified.
  * 
- * Return value: %FALSE if the stream was already at an EOF character.
+ * Return value: 0 if the stream was already at an EOF character, otherwise
+ *               the number of lines read (this is useful for maintaining
+ *               a line number counter which doesn't combine lines with \) 
  **/
-gboolean
+gint
 pango_read_line (FILE *stream, GString *str)
 {
   gboolean quoted = FALSE;
   gboolean comment = FALSE;
   int n_read = 0;
+  int lines = 1;
   
   flockfile (stream);
 
@@ -189,6 +192,8 @@ pango_read_line (FILE *stream, GString *str)
 		      (c == '\r' && next_c == '\n') ||
 		      (c == '\n' && next_c == '\r')))
 		  ungetc (next_c, stream);
+
+		lines++;
 		
 		break;
 	      }
@@ -230,7 +235,7 @@ pango_read_line (FILE *stream, GString *str)
 
   funlockfile (stream);
 
-  return n_read > 0;
+  return (n_read > 0) ? lines : 0;
 }
 
 /**
diff --git a/pango/pango-utils.h b/pango/pango-utils.h
index 35ef8127..bac20699 100644
--- a/pango/pango-utils.h
+++ b/pango/pango-utils.h
@@ -26,7 +26,7 @@
 char    *pango_trim_string     (const char *str);
 char **  pango_split_file_list (const char *str);
 
-gboolean pango_read_line      (FILE        *stream,
+gint     pango_read_line      (FILE        *stream,
 			       GString     *str);
 
 gboolean pango_skip_space     (const char **pos);
diff --git a/pango/pangox-fontmap.c b/pango/pangox-fontmap.c
index 1ea89428..1d0b476c 100644
--- a/pango/pangox-fontmap.c
+++ b/pango/pangox-fontmap.c
@@ -852,14 +852,15 @@ pango_x_font_map_read_alias_file (PangoXFontMap *xfontmap,
     {
       GString *line_buf = g_string_new (NULL);
       GString *tmp_buf = g_string_new (NULL);
+      gint lines_read;
 
-      while (pango_read_line (infile, line_buf))
+      while ((lines_read = pango_read_line (infile, line_buf)))
 	{
 	  PangoXFamilyEntry *family_entry;
 
 	  const char *p = line_buf->str;
 	  
-	  lineno++;
+	  lineno += lines_read;
 
 	  if (!pango_skip_space (&p))
 	    continue;
diff --git a/pango/pangox.c b/pango/pangox.c
index 4bf7e7be..fe72da5e 100644
--- a/pango/pangox.c
+++ b/pango/pangox.c
@@ -1804,7 +1804,7 @@ pango_x_apply_ligatures (PangoFont     *font,
  * @font: A #PangoFont
  * @rfont: A pointer to a #PangoXSubfont
  * @charsets: An array of charsets.
- * @n_charset: The number of charsets in @charsets.
+ * @n_charsets: The number of charsets in @charsets.
  * 
  * Looks for subfonts with the @charset charset,
  * in @font, and puts the first one in *@rfont
diff --git a/pango/pangox.h b/pango/pangox.h
index 09171b7e..9a3172fc 100644
--- a/pango/pangox.h
+++ b/pango/pangox.h
@@ -116,7 +116,7 @@ void pango_x_fallback_shape (PangoFont        *font,
 
 gboolean pango_x_apply_ligatures (PangoFont     *font, 
                                   PangoXSubfont  subfont, 
-                                  gunichar     **chars, 
+                                  gunichar     **glyphs, 
                                   int           *n_glyphs,
                                   int          **clusters);