Produce XML, not SGML.

	* docs/*: Produce XML, not SGML.

	* pango/fonts.c (pango_font_family_list_faces): Docs typo fix.

	* pango/pango-color.c (pango_color_parse): Fix markup to reduce
	spurious <link>s.

6 files changed, 50 insertions, 45 deletions

diff --git a/docs/Makefile.am b/docs/Makefile.am
index deccc950..d7400240 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -13,7 +13,7 @@ DOC_SOURCE_DIR=../pango
 SCAN_OPTIONS=
 
 # Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--sgml-mode
+MKDB_OPTIONS=--sgml-mode --output-format=xml
 
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS=
diff --git a/docs/pango-docs.sgml b/docs/pango-docs.sgml
index bf67d361..4e08ce45 100644
--- a/docs/pango-docs.sgml
+++ b/docs/pango-docs.sgml
@@ -1,21 +1,26 @@
-<!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-<!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 pango-Xft-Fonts-and-Rendering SYSTEM "sgml/xft-fonts.sgml">
-<!entity pango-OpenType-Font-Handling SYSTEM "sgml/opentype.sgml">
-<!entity markup-format SYSTEM "pango_markup.sgml">
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+<!ENTITY hash "#">
+<!ENTITY nbsp "&#x00a0;">
+<!ENTITY mdash "&#8212;">
+<!ENTITY pango-Text-Processing SYSTEM "xml/main.xml">
+<!ENTITY pango-Glyph-Storage SYSTEM "xml/glyphs.xml">
+<!ENTITY pango-Coverage-Maps SYSTEM "xml/coverage-maps.xml">
+<!ENTITY pango-Fonts SYSTEM "xml/fonts.xml">
+<!ENTITY pango-Text-Attributes SYSTEM "xml/text-attributes.xml">
+<!ENTITY pango-Tab-Stops SYSTEM "xml/tab-stops.xml">
+<!ENTITY pango-Layout-Objects SYSTEM "xml/layout.xml">
+<!ENTITY pango-Engines SYSTEM "xml/engines.xml">
+<!ENTITY pango-Indic-Engine-Support SYSTEM "xml/pango-indic.xml">
+<!ENTITY pango-Modules SYSTEM "xml/modules.xml">
+<!ENTITY pango-X-Rendering SYSTEM "xml/x-rendering.xml">
+<!ENTITY pango-X-Fonts SYSTEM "xml/x-fonts.xml">
+<!ENTITY pango-Win32-Fonts-and-Rendering SYSTEM "xml/win32-fonts.xml">
+<!ENTITY pango-FreeType-Fonts-and-Rendering SYSTEM "xml/freetype-fonts.xml">
+<!ENTITY pango-Xft-Fonts-and-Rendering SYSTEM "xml/xft-fonts.xml">
+<!ENTITY pango-OpenType-Font-Handling SYSTEM "xml/opentype.xml">
+<!ENTITY markup-format SYSTEM "pango_markup.sgml">
 ]>
 <book id="index">
   <bookinfo>
diff --git a/docs/tmpl/engines.sgml b/docs/tmpl/engines.sgml
index ffbdcd6e..ce7c6fb2 100644
--- a/docs/tmpl/engines.sgml
+++ b/docs/tmpl/engines.sgml
@@ -32,8 +32,8 @@ function is used when building a catalog of all available modules.
 The #PangoEngineInfo structure contains information about a particular
 engine. It contains the following fields:
 
-<informaltable pgwide=1 frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*">
+<informaltable pgwide="1" frame="none" role="struct">
+<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
 <tbody>
 
 <row>
@@ -78,8 +78,8 @@ The PangoEngineRange structure contains
 information about a range of Unicode code
 points. It contains the following fields:
 
-<informaltable pgwide=1 frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*">
+<informaltable pgwide="1" frame="none" role="struct">
+<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
 <tbody>
 
 <row>
@@ -118,8 +118,8 @@ The #PangoEngine structure contains basic
 information common to all script engines. It
 contains the following fields:
 
-<informaltable pgwide=1 frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*">
+<informaltable pgwide="1" frame="none" role="struct">
+<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
 <tbody>
 
 <row>
@@ -154,8 +154,8 @@ basic #PangoEngine structure to engines that
 deal with the rendering-system independent part
 of of the rendering pipeline. It contains the following fields:
 
-<informaltable pgwide=1 frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*">
+<informaltable pgwide="1" frame="none" role="struct">
+<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
 <tbody>
 
 <row>
@@ -182,8 +182,8 @@ basic #PangoEngine structure to engines that
 deal with the rendering-system dependent part
 of of the rendering pipeline. It contains the following fields:
 
-<informaltable pgwide=1 frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*">
+<informaltable pgwide="1" frame="none" role="struct">
+<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
 <tbody>
 
 <row>
diff --git a/docs/tmpl/glyphs.sgml b/docs/tmpl/glyphs.sgml
index 21c26481..3f48405d 100644
--- a/docs/tmpl/glyphs.sgml
+++ b/docs/tmpl/glyphs.sgml
@@ -103,8 +103,8 @@ horizontal origin.
 The #PangoGlyph structure represents a single glyph in the output
 form of a string. It contains the following fields.
 
-<informaltable pgwide=1 frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*">
+<informaltable pgwide="1" frame="none" role="struct">
+<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
 <tbody>
 
 <row>
@@ -139,8 +139,8 @@ The #PangoGlyphGeometry structure contains width and positioning
 information for a single glyph. Distances are in
 1/64ths of a point.
 
-<informaltable pgwide=1 frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*">
+<informaltable pgwide="1" frame="none" role="struct">
+<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
 <tbody>
 
 <row>
@@ -178,8 +178,8 @@ The PangoGlyphVisAttr is used to communicate information between
 the shaping phase and the rendering phase. It's contents
 are still evolving.
 
-<informaltable pgwide=1 frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*">
+<informaltable pgwide="1" frame="none" role="struct">
+<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
 <tbody>
 
 <row>
@@ -208,8 +208,8 @@ by the structure which simplifies memory management.
 #PangoGlyphString contains the following publically
 accessible fields
 
-<informaltable pgwide=1 frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*">
+<informaltable pgwide="1" frame="none" role="struct">
+<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
 <tbody>
 
 <row>
diff --git a/docs/tmpl/layout.sgml b/docs/tmpl/layout.sgml
index b1ff736c..44d5c7d3 100644
--- a/docs/tmpl/layout.sgml
+++ b/docs/tmpl/layout.sgml
@@ -32,14 +32,14 @@ position of the resulting glyphs can be made.
 
 <para>
 There are also a number of parameters to adjust the formatting
-of a #PangoLayout, which are illustrated in <xref linkend="parameters">.
+of a #PangoLayout, which are illustrated in <xref linkend="parameters"/>.
 It is possible, as well, to ignore the 2-D setup, and simply
 treat the results of a #PangoLayout as a list of lines.
 </para>
 
 <figure id="parameters">
 <title>Adjustable parameters for a PangoLayout</title>
-<graphic fileref="layout.gif" format="gif"></graphic>
+<graphic fileref="layout.gif" format="GIF"></graphic>
 </figure>
 
 <para>
diff --git a/docs/tmpl/main.sgml b/docs/tmpl/main.sgml
index 8aaf6590..b921e455 100644
--- a/docs/tmpl/main.sgml
+++ b/docs/tmpl/main.sgml
@@ -23,8 +23,8 @@ The #PangoContext structure stores global information
 used to control the itemization process. It contains
 the following fields:
 
-<informaltable pgwide=1 frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*">
+<informaltable pgwide="1" frame="none" role="struct">
+<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
 <tbody>
 
 <row>
@@ -49,8 +49,8 @@ the following fields:
 The #PangoItem structure stores information about
 a segment of text. It contains the following fields:
 
-<informaltable pgwide=1 frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*">
+<informaltable pgwide="1" frame="none" role="struct">
+<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
 <tbody>
 
 <row>
@@ -88,8 +88,8 @@ The #PangoAnalysis structure stores information about
 the properties of a segment of text. It has the following
 fields:
 
-<informaltable pgwide=1 frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*">
+<informaltable pgwide="1" frame="none" role="struct">
+<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
 <tbody>
 
 <row>