updates.

Wed Feb  9 14:04:35 2000  Owen Taylor  <otaylor@redhat.com>

	* TODO: updates.

	* docs/*: Added some docs on font handling, both general
	and for X.

16 files changed, 287 insertions, 191 deletions

diff --git a/ChangeLog b/ChangeLog
index 3a9c14e8..6dc6b5c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Feb  9 14:04:35 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* TODO: updates.
+
+	* docs/*: Added some docs on font handling, both general
+	and for X.
+
 Tue Feb  8 15:05:17 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* libpango/pangox.c: Moved the primary size and charset matching
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 3a9c14e8..6dc6b5c1 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,10 @@
+Wed Feb  9 14:04:35 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* TODO: updates.
+
+	* docs/*: Added some docs on font handling, both general
+	and for X.
+
 Tue Feb  8 15:05:17 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* libpango/pangox.c: Moved the primary size and charset matching
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 3a9c14e8..6dc6b5c1 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,10 @@
+Wed Feb  9 14:04:35 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* TODO: updates.
+
+	* docs/*: Added some docs on font handling, both general
+	and for X.
+
 Tue Feb  8 15:05:17 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* libpango/pangox.c: Moved the primary size and charset matching
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 3a9c14e8..6dc6b5c1 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,10 @@
+Wed Feb  9 14:04:35 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* TODO: updates.
+
+	* docs/*: Added some docs on font handling, both general
+	and for X.
+
 Tue Feb  8 15:05:17 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* libpango/pangox.c: Moved the primary size and charset matching
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 3a9c14e8..6dc6b5c1 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,10 @@
+Wed Feb  9 14:04:35 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* TODO: updates.
+
+	* docs/*: Added some docs on font handling, both general
+	and for X.
+
 Tue Feb  8 15:05:17 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* libpango/pangox.c: Moved the primary size and charset matching
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 3a9c14e8..6dc6b5c1 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,10 @@
+Wed Feb  9 14:04:35 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* TODO: updates.
+
+	* docs/*: Added some docs on font handling, both general
+	and for X.
+
 Tue Feb  8 15:05:17 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* libpango/pangox.c: Moved the primary size and charset matching
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 3a9c14e8..6dc6b5c1 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,10 @@
+Wed Feb  9 14:04:35 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* TODO: updates.
+
+	* docs/*: Added some docs on font handling, both general
+	and for X.
+
 Tue Feb  8 15:05:17 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* libpango/pangox.c: Moved the primary size and charset matching
diff --git a/TODO b/TODO
index 9398f277..0bf999ab 100644
--- a/TODO
+++ b/TODO
@@ -1,88 +1,81 @@
-General
+Shaping
 =======
 
-* Switch engines to be indentified by properties, instead
-  of hardcoded role/language. (?)
+* Use the new PangoCoverage stuff for looking up fonts,
+  and implement pango_font_get_shaper().
+
+Layout Driver
+=============
 
-* Add a PangoLayout highlevel driver
+The PangoLayout object is a highlevel driver that takes an attributed
+string and produces lines of glyphs. As well as just implementing
+this, there are various improvements that need to be made to 
+
+* Figure out better ways of doing line breaks. (This may involve
+  implementing the TeX/Raph x0-x1 stuff for line breaks.)
 
 * Add attributes data structures, feed attributed strings
   into pango_itemize() (? is this necessary)
 
-* Return error codes from all functions. Possible errors include
- - Invalid string
- - Font does not match 
-
-  I think a good general way of doing this is to always
-  have an error object as a parameter to each function, but
-  allow that error object to be NULL, in which case a
-  global error object is used.
-
-  So, either
-
-    
-    err = PANGO_ERROR_INIT;
-    pango_shape (..., &err);
-    if (PANGO_ERROR_CODE (&err) != NO_ERROR) 
-      {
-        g_print ("An error %s occurred\n", PANGO_ERROR_STRING (&err));
-        pango_error_free (&err);
-      }
-
-  or:
-
-    pango_shape (..., NULL);
-    if (PANGO_ERROR_CODE (NULL) != NO_ERROR) 
-      g_print ("An error %s occurred\n", PANGO_ERROR_STRING (NULL));
-
-  Also, whenever possible, the return value of each Pango function
-  will be a gboolean success code (and also, a pango function that
-  returns a pointer that cannot otherwise be NULL, will return NULL),
-  so we can write instead of the last one:
-    
-    if (!pango_shape (..., NULL))
-      g_print ("An error %s occurred\n", PANGO_ERROR_STRING (NULL));
-
-  This always people who write non-threaded code to write conveniently,
-  while those who write threaded code can avoid pollution of return
-  values.
-  
+X rendering
+===========
 
-* Allow UTF8 strings with embedded NULLs.
+* The point-size/pixel size handling is not done right. Right
+  now we are just assuming pixel == point, because trying to
+  use the point-size fields of the X fonts didn't work on
+  systems with both 100 and 75 dpi fonts installed.
 
-* Write a small default shaping engine that only
-  draws a placeholder character ... and does that in
-  a way that always works.
+  We should query the X server for its actual reported value
+  and use that to translate point size to pixel size.
 
-* Convert over from utils.c to Tom Tromey's libunicode.
+  (This doesn't really handle the case of optically scaled
+   bitmaps properly, but I think that is an ignorable problem.)
 
-X fonts
+Other rendering engines
+======================
+
+Somebody should start working on a libart font-system / renderer
+soon, to make sure that the interfaces are suitable.
+
+Engines
 =======
 
-* Currently, for X, a language module must use a fixed priority
-  for the various encodings it can use; it can't distinguish:
+* Switch engines to be indentified by properties, instead
+  of hardcoded role/language. (?)
+
+Language Modules
+================
+
+ * It would be nice to have X based renderers for a few more scripts;
+   Arabic in particular is one such script.
+
+ * Once we have a libart renderer, porting Raph's devanagari shaper
+   to Pango and C (from Perl) would be a cool demo and test case.
+  
+ * The clusters set by the current modules need to be set.
+
+Documentation
+=============
 
-   good-unicode-subset-font
-   good-ksc-font
-   bad-unicode-full-fallback
+* Much or all of the X Fonts document from pango.org needs to be moved
+  into the API reference.
 
-  from:
+General
+=======
 
-   good-unicode-subset-font
-   bad-unicode-full-fallback
-   good-ksc-font
+* Report errors from functions, these errors include such things.
 
-  In either case if queried if a particular Unicode code-point, exists
-  in the font, it will return YES, and the bad-unicode-full-fallback
-  will be used.
+  - Invalid string
+  - Font does not match 
 
-  void pango_x_list_subfonts (font, charsets, n_charsets, &subfonts_xlfds,
-                              &subfont_charsets, &subfont_ids, &n_subfonts);
+ Probably the right thing to do here is to use something very close
+ to the GConf API ... see Havoc's GException proposal.
 
-  Note that this call adds the queried subfonts to an internal list for
-  the font. Subfonts once queried take up a small amount of memory
-  (enough for the name), subfonts, once accessed, will retain the full
-  amount of memory for the X font until the entire font is freed.
+* Allow UTF8 strings with embedded NULLs.
 
-  Then for each mask, we assemble a list of subfont-ids ordered.
+* Write a small default shaping engine that only
+  draws a placeholder character ... and does that in
+  a way that always works.
 
+* Finish coverting over from utils.c to Tom Tromey's libunicode.
+  Add the remaining useful functions from utils.c into libunicode.
diff --git a/docs/pango-docs.sgml b/docs/pango-docs.sgml
index 26019c4d..9e0d724d 100644
--- a/docs/pango-docs.sgml
+++ b/docs/pango-docs.sgml
@@ -4,7 +4,8 @@
 <!entity pango-fonts SYSTEM "sgml/fonts.sgml">
 <!entity pango-coverage-maps SYSTEM "sgml/coverage-maps.sgml">
 <!entity pango-engines SYSTEM "sgml/engines.sgml">
-<!entity pango-x SYSTEM "sgml/pango-x.sgml">
+<!entity x-fonts SYSTEM "sgml/x-fonts.sgml">
+<!entity x-rendering SYSTEM "sgml/x-rendering.sgml">
 ]>
 <book>
   <bookinfo>
@@ -22,6 +23,7 @@
 
   <chapter id="pango-x">
     <title>Rendering under X with Pango</title>
-    &pango-x;
+    &x-fonts;
+    &x-rendering;
     </chapter>
 </book>
\ No newline at end of file
diff --git a/docs/pango-sections.txt b/docs/pango-sections.txt
index a40bf383..f68e34a5 100644
--- a/docs/pango-sections.txt
+++ b/docs/pango-sections.txt
@@ -48,8 +48,9 @@ pango_glyph_string_free
 <SECTION>
 <TITLE>Coverage Maps</TITLE>
 <FILE>coverage-maps</FILE>
-PangoCoverage
 PangoCoverageLevel
+PangoCoverage
+<SUBSECTION>
 pango_coverage_new
 pango_coverage_copy
 pango_coverage_destroy
@@ -66,13 +67,12 @@ PangoStyle
 PangoWeight
 PangoVariant
 PangoStretch
-PangoFont
-PangoFontClass
-PangoFontMap
-PangoFontMapClass
 pango_font_description_copy
 pango_font_descriptions_free
 pango_font_description_free
+<SUBSECTION>
+PangoFont
+PangoFontClass
 pango_font_init
 pango_font_ref
 pango_font_unref
@@ -81,6 +81,9 @@ pango_font_describe
 pango_font_get_coverage
 pango_font_get_data
 pango_font_set_data
+<SUBSECTION>
+PangoFontMap
+PangoFontMapClass
 pango_font_map_init
 pango_font_map_ref
 pango_font_map_unref
@@ -105,19 +108,24 @@ script_engine_unload
 </SECTION>
 
 <SECTION>
-<FILE>pango-x</FILE>
 <TITLE>X Rendering</TITLE>
-PangoXSubfont
+<FILE>x-rendering</FILE>
 PANGO_RENDER_TYPE_X
-PANGO_X_MAKE_GLYPH
-PANGO_X_GLYPH_SUBFONT
-PANGO_X_GLYPH_INDEX
 pango_x_get_context
-pango_x_load_font
 pango_x_render
 pango_x_extents
 pango_x_glyph_extents
+</SECTION>
+
+<SECTION>
+<TITLE>X Fonts</TITLE>
+<FILE>x-fonts</FILE>
+PangoXSubfont
+PANGO_X_MAKE_GLYPH
+PANGO_X_GLYPH_SUBFONT
+PANGO_X_GLYPH_INDEX
+pango_x_load_font
+pango_x_get_unknown_glyph
 pango_x_has_glyph
 pango_x_list_subfonts
 </SECTION>
-
diff --git a/docs/tmpl/coverage-maps.sgml b/docs/tmpl/coverage-maps.sgml
index eef7b24d..2347100a 100644
--- a/docs/tmpl/coverage-maps.sgml
+++ b/docs/tmpl/coverage-maps.sgml
@@ -2,11 +2,14 @@
 Coverage Maps
 
 <!-- ##### SECTION Short_Description ##### -->
-
+Unicode character range coverage storage.
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-
+It is often necessary in Pango to determine if a paticular font can
+represent a particular character, and also how well it can represent
+that character. The #PangoCoverage is a data structure that is used
+to represent that information.
 </para>
 
 <!-- ##### SECTION See_Also ##### -->
@@ -14,21 +17,29 @@ Coverage Maps
 
 </para>
 
-<!-- ##### STRUCT PangoCoverage ##### -->
+<!-- ##### ENUM PangoCoverageLevel ##### -->
 <para>
-
+Used to indicate how well a font can represent a particular ISO 10646
+character point.
 </para>
 
+@PANGO_COVERAGE_NONE: The character is not representable with the font.
+@PANGO_COVERAGE_FALLBACK: The character is represented in a way that may be
+                          comprehensible but is not the correct graphical form.
+                          For instance, a Hangul character represented as a
+                          a sequence of Jamos, or a Latin transliteration of
+                          a Cyrillic word.
+@PANGO_COVERAGE_APPROXIMATE: The character is represented as the correct graphical
+                             form but not in the ideal fashion.
+@PANGO_COVERAGE_EXACT: The character is represented as the correct graphical form,
+                       in an attractive manner.
 
-<!-- ##### ENUM PangoCoverageLevel ##### -->
+<!-- ##### STRUCT PangoCoverage ##### -->
 <para>
-
+The #PangoCoverage structure represents a map from ISO-10646 character
+point to #PangoCoverageLevel. It is an opaque structure with no public fields.
 </para>
 
-@PANGO_COVERAGE_NONE: 
-@PANGO_COVERAGE_FALLBACK: 
-@PANGO_COVERAGE_APPROXIMATE: 
-@PANGO_COVERAGE_EXACT: 
 
 <!-- ##### FUNCTION pango_coverage_new ##### -->
 <para>
diff --git a/docs/tmpl/fonts.sgml b/docs/tmpl/fonts.sgml
index c4180422..3c18a7da 100644
--- a/docs/tmpl/fonts.sgml
+++ b/docs/tmpl/fonts.sgml
@@ -8,11 +8,10 @@ Structures representing abstract fonts.
 <para>
 Pango supports a flexible architecture where a
 particular rendering architecture can supply an
-implementation of fonts. The #PangoFont and
-#PangoCFont structures represent an abstract
-rendering-system-indepent font, and a
-<firstterm>component</firstterm> of such a font,
-respectively.
+implementation of fonts. The #PangoFont structure
+representn an abstract rendering-system-indepent font.
+Pango provides routines to list available fonts, and
+to load a font of a given description.
 </para>
 
 <!-- ##### SECTION See_Also ##### -->
@@ -22,55 +21,87 @@ respectively.
 
 <!-- ##### STRUCT PangoFontDescription ##### -->
 <para>
-
+The #PangoFontDescription structure represents the description
+of an ideal font. These structures are used both to list
+what fonts are available on the system and also for specifying
+the characteristics of a font to load.
 </para>
 
-@family_name: 
-@style: 
-@variant: 
-@weight: 
-@stretch: 
+@family_name: the name of the font family.
+@style: the style (slant) of the font.
+@variant: the variant (normal or small caps) of the font.
+@weight: the weight (boldness) of the font.
+@stretch: the relative width of the font.
 
 <!-- ##### ENUM PangoStyle ##### -->
 <para>
-
+An enumeration specifying the various slant styles possible for a font.
 </para>
 
-@PANGO_STYLE_NORMAL: 
-@PANGO_STYLE_OBLIQUE: 
-@PANGO_STYLE_ITALIC: 
+@PANGO_STYLE_NORMAL: the font is upright.
+@PANGO_STYLE_OBLIQUE: the font is slanted, but in a roman style.
+@PANGO_STYLE_ITALIC: the font is slanted in an italic style.
 
 <!-- ##### ENUM PangoWeight ##### -->
 <para>
-
+An enumeration specifying the weight (boldness) of a font. This is a numerical
+value ranging from 100 to 900, but there are two predefined values:
 </para>
 
-@PANGO_WEIGHT_NORMAL: 
-@PANGO_WEIGHT_BOLD: 
+@PANGO_WEIGHT_NORMAL: the default weight (= 400)
+@PANGO_WEIGHT_BOLD: the bold weight (= 700)
 
 <!-- ##### ENUM PangoVariant ##### -->
 <para>
-
+An enumeration specifying capitalization variant of the font.
 </para>
 
-@PANGO_VARIANT_NORMAL: 
-@PANGO_VARIANT_SMALL_CAPS: 
+@PANGO_VARIANT_NORMAL: A normal font.
+@PANGO_VARIANT_SMALL_CAPS: A font with the lower case characters
+  replaced by smaller variants of the capital characters.
 
 <!-- ##### ENUM PangoStretch ##### -->
 <para>
-
+An enumeration specifying the width of the font relative to other designs
+within a family.
 </para>
 
 @PANGO_STRETCH_ULTRA_CONDENSED: 
 @PANGO_STRETCH_EXTRA_CONDENSED: 
 @PANGO_STRETCH_CONDENSED: 
 @PANGO_STRETCH_SEMI_CONDENSED: 
-@PANGO_STRETCH_NORMAL: 
+@PANGO_STRETCH_NORMAL: the normal width
 @PANGO_STRETCH_SEMI_EXPANDED: 
 @PANGO_STRETCH_EXPANDED: 
 @PANGO_STRETCH_EXTRA_EXPANDED: 
 @PANGO_STRETCH_ULTRA_EXPANDED: 
 
+<!-- ##### FUNCTION pango_font_description_copy ##### -->
+<para>
+
+</para>
+
+@desc: 
+@Returns: 
+
+
+<!-- ##### FUNCTION pango_font_descriptions_free ##### -->
+<para>
+
+</para>
+
+@descs: 
+@n_descs: 
+
+
+<!-- ##### FUNCTION pango_font_description_free ##### -->
+<para>
+
+</para>
+
+@desc: 
+
+
 <!-- ##### STRUCT PangoFont ##### -->
 <para>
 The #PangoFont structure is used to represent
@@ -85,21 +116,13 @@ pango_font_init() on the structure.
 </para>
 <para>
 The #PangoFont structure contains one member
-that may be accessed by derived classes:
-
-<informaltable pgwide=1 frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*">
-<tbody>
-
-<row>
-<entry>#PangoFontClass *klass;</entry>
-<entry>a pointer to the <firstterm>class structure</firstterm>
-       for this font.</entry>
-</row>
-</tbody></tgroup></informaltable>
+which the implementation fills in:
 </para>
 
-@klass: 
+@klass: a pointer to the <firstterm>class structure</firstterm>
+        for this font. People using a #PangoFont should
+        not directly access this member; they should use the
+        appropriate wrapper functions.
 
 <!-- ##### STRUCT PangoFontClass ##### -->
 <para>
@@ -119,45 +142,13 @@ It contains the following member:
 </tbody></tgroup></informaltable>
 </para>
 
-
-<!-- ##### STRUCT PangoFontMap ##### -->
-<para>
-
-</para>
-
-@klass: 
-
-<!-- ##### STRUCT PangoFontMapClass ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION pango_font_description_copy ##### -->
-<para>
-
-</para>
-
-@desc: 
-@Returns: 
-
-
-<!-- ##### FUNCTION pango_font_descriptions_free ##### -->
-<para>
-
-</para>
-
-@descs: 
-@n_descs: 
-
-
-<!-- ##### FUNCTION pango_font_description_free ##### -->
-<para>
-
-</para>
-
-@desc: 
-
+@destroy: a function to free the font structure and associated resources.
+@describe: a function to describe the characteristics of a font. See
+           pango_font_describe().
+@get_coverage: A function to get a coverage map for the font.
+               See pango_font_get_coverage().
+@find_shaper: A function to find the shaper for a particular character 
+              point. See pango_font_find_shaper.
 
 <!-- ##### FUNCTION pango_font_init ##### -->
 <para>
@@ -211,6 +202,7 @@ It contains the following member:
 </para>
 
 @font: 
+@lang: 
 @Returns: 
 
 
@@ -235,6 +227,37 @@ It contains the following member:
 @destroy_func: 
 
 
+<!-- ##### STRUCT PangoFontMap ##### -->
+<para>
+The #PangoFontMap represents the set of fonts available for a
+particular rendering system. This is a virtual object with
+implementations being specific to particular rendering systems.  To
+create an implementation of a #PangoFontMap, the rendering-system
+specific code should malloc a larger structure that contains a nested
+#PangoFontMap, fill in the klass member of the nested #PangoFontMap with a
+pointer to a appropriate #PangoFontMapClass, then call
+pango_font_map_init() on the structure.
+</para>
+<para>
+The #PangoFont structure contains one member which the implementation fills in:
+</para>
+
+@klass: a pointer to the <firstterm>class structure</firstterm>
+        for this font map. People using a #PangoFontMap should
+        not directly access this member; they should use the
+        appropriate wrapper functions.
+
+<!-- ##### STRUCT PangoFontMapClass ##### -->
+<para>
+The #PangoFontMapClass structure holds the virtual functions for
+a particular #PangoFontMap implementation.
+</para>
+
+@destroy: a function to free the font map structure and associated resources.
+@load_font: a function to load a font with a given description. See
+            pango_font_map_load_font()
+@list_fonts: A function to list available fonts. See pango_font_map_list_fonts()
+
 <!-- ##### FUNCTION pango_font_map_init ##### -->
 <para>
 
diff --git a/docs/tmpl/pango-unused.sgml b/docs/tmpl/pango-unused.sgml
index b17053da..24361688 100644
--- a/docs/tmpl/pango-unused.sgml
+++ b/docs/tmpl/pango-unused.sgml
@@ -54,6 +54,30 @@ indices.
 
 @string: 
 
+<!-- ##### FUNCTION pango_x_load_xlfd ##### -->
+<para>
+
+</para>
+
+@font: 
+@xlfd: 
+@Returns: 
+
+<!-- ##### SECTION ./tmpl/pango-x.sgml:Title ##### -->
+X Rendering
+
+
+<!-- ##### SECTION ./tmpl/pango-x.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/pango-x.sgml:Short_Description ##### -->
+Functions for rendering and measuring glyphs on
+the X Window system.
+
+
 <!-- ##### FUNCTION g_glyph_string_new ##### -->
 <para>
 
@@ -61,25 +85,22 @@ indices.
 
 @Returns: 
 
-<!-- ##### FUNCTION pango_x_list_cfonts ##### -->
+<!-- ##### SECTION ./tmpl/pango-x.sgml:Long_Description ##### -->
 <para>
 
 </para>
 
-@font: 
-@charsets: 
-@n_charsets: 
-@xlfds: 
-@n_xlfds: 
 
-<!-- ##### FUNCTION pango_x_load_xlfd ##### -->
+<!-- ##### FUNCTION pango_x_list_cfonts ##### -->
 <para>
 
 </para>
 
 @font: 
-@xlfd: 
-@Returns: 
+@charsets: 
+@n_charsets: 
+@xlfds: 
+@n_xlfds: 
 
 <!-- ##### STRUCT PangoCFontClass ##### -->
 <para>
diff --git a/examples/pangox_aliases b/examples/pangox_aliases
index 7285f512..069a17f0 100644
--- a/examples/pangox_aliases
+++ b/examples/pangox_aliases
@@ -2,7 +2,7 @@
 #
 # family style variant weight stretch   XLFD
   
-sans normal normal normal normal "-urw-helvetica-medium-r-normal--*-*-*-*-*-*-*-*,-*-fixed-medium-r-normal--16-*-*-*-*-*-*-*,-kaist-iyagi-bold-r-normal--16-*-*-*-*-*-johab-1,-*-fixed-medium-r-normal--12-*-*-*-*-*-*-*,-isas-song ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0,-tamil-tscakaram-medium-r-normal--*-120-*-*-*-*-tscii-0"
-
-serif normal normal normal normal      "-adobe-times-medium-r-normal--*-*-*-*-*-*-*-*"
+sans normal normal normal normal "-*-helvetica-medium-r-normal--*-*-*-*-*-*-*-*,-*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,-kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,-*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,-tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0"
+serif normal normal normal normal "-*-times-medium-r-normal--*-*-*-*-*-*-*-*,-*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,-kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,-*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,-tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0"
+monospace normal normal normal normal "-*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,-kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,-*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,-tamil-tscakaram-medium-r-normal--*-*-*-*-*-*-tscii-0"
 
diff --git a/examples/viewer.c b/examples/viewer.c
index de707e3e..22d483ce 100644
--- a/examples/viewer.c
+++ b/examples/viewer.c
@@ -850,7 +850,7 @@ make_families_menu ()
 	}
     }
 
-  families = g_list_reverse (families);
+  families = g_list_sort (families, (GCompareFunc)strcmp);
   
   combo = gtk_combo_new ();
   gtk_combo_set_popdown_strings (GTK_COMBO (combo), families);
@@ -953,17 +953,6 @@ main (int argc, char **argv)
 
   font = pango_context_load_font (context, &font_description, font_size);
   
-#if 0
-  /* We hard code a font globally for now
-   */
-  font = pango_x_load_font (GDK_DISPLAY(),
-    /*			    "-misc-fixed-medium-r-semicondensed--13-*-*-*-c-*-iso10646-1," */
-			    "-tamil-tscakaram-medium-r-normal--*-120-*-*-*-*-tscii-0,"
-			    "-gnu-unifont-medium-r-normal--*-160-*-*-c-*-iso10646-1,"
-			    "-*-*-medium-r-normal--*-160-*-*-*-*-*-*");
-#endif  
-
-
   /* Create the user interface
    */
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
diff --git a/pango/pangox.c b/pango/pangox.c
index 2e836127..c0347080 100644
--- a/pango/pangox.c
+++ b/pango/pangox.c
@@ -1136,7 +1136,7 @@ pango_x_load_font (Display *display,
 }
  
 /**
- * pango_x_load_font:
+ * pango_x_load_font_with_size:
  * @display: the X display
  * @spec:    a comma-separated list of XLFD's, unsized
  * @size:    the size at which to load the font