- Add yelp-theme to test_pager_SOURCES

* src/Makefile.am:
- Add yelp-theme to test_pager_SOURCES

* src/yelp-db-pager.c:
* src/yelp-theme.c:
* src/yelp-theme.h:
- Theme the gray color of screen, programlisting, etc.

* src/yelp-window.c:
- Change keybindings up, for fun.

* stylesheets/Makefile.am:
* stylesheets/db2html-formal.xsl:
* stylesheets/db2html-lists.xsl:
- Removing db2html-formal and db2html-lists

* stylesheets/db2html-block.xsl:
- Better implementation of msg stuff.

* stylesheets/db2html-html.xsl:
* stylesheets/db2html-param.xsl:
- Theme the gray color of screen, programlisting, etc.
- Various stylistic improvements in the CSS.

* stylesheets/db2html-inline.xsl:
* stylesheets/db2html-titlepage.xsl:
* stylesheets/gettext.xsl:
- Get rid of em-dashes.  ~sigh~

* stylesheets/db2html-title.xsl:
- Implemented some more titles and subtitles.

* stylesheets/db2html-titlepage.xsl:
- Deboldify Affiliation.  The pages are too bold.

17 files changed, 227 insertions, 248 deletions

diff --git a/ChangeLog b/ChangeLog
index 21813874..20ccdd30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2003-12-24  Shaun McCance  <shaunm@gnome.org>
+
+	* src/Makefile.am:
+	- Add yelp-theme to test_pager_SOURCES
+
+	* src/yelp-db-pager.c:
+	* src/yelp-theme.c:
+	* src/yelp-theme.h:
+	- Theme the gray color of screen, programlisting, etc.
+
+	* src/yelp-window.c:
+	- Change keybindings up, for fun.
+
+	* stylesheets/Makefile.am:
+	* stylesheets/db2html-formal.xsl:
+	* stylesheets/db2html-lists.xsl:
+	- Removing db2html-formal and db2html-lists
+
 2003-12-22  Shaun McCance  <shaunm@gnome.org>
 
 	* src/yelp-toc-pager.c:
diff --git a/src/Makefile.am b/src/Makefile.am
index 6fae2351..914113bd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,6 +31,7 @@ test_pager_SOURCES =							\
 	yelp-pager.c		yelp-pager.h				\
 	yelp-db-pager.c		yelp-db-pager.h				\
 	yelp-toc-pager.c	yelp-toc-pager.h			\
+	yelp-theme.c		yelp-theme.h				\
 	yelp-uri.c		yelp-uri.h				\
 	yelp-marshal-main.c	test-pager.c
 
diff --git a/src/yelp-db-pager.c b/src/yelp-db-pager.c
index b07eb76f..ab7b6c3e 100644
--- a/src/yelp-db-pager.c
+++ b/src/yelp-db-pager.c
@@ -38,6 +38,7 @@
 #include "yelp-error.h"
 #include "yelp-db-pager.h"
 #include "yelp-toc-pager.h"
+#include "yelp-theme.h"
 
 #define YELP_NAMESPACE "http://www.gnome.org/yelp/ns"
 
@@ -211,7 +212,7 @@ db_pager_process (YelpPager *pager)
     gchar        *uri_slash;
     gchar        *doc_name;
     gchar        *doc_path;
-    const gchar  *params[15];
+    const gchar  *params[19];
 
     g_return_val_if_fail (pager != NULL, FALSE);
     g_return_val_if_fail (YELP_IS_DB_PAGER (pager), FALSE);
@@ -282,7 +283,11 @@ db_pager_process (YelpPager *pager)
     params[11] = "0";
     params[12] = "mediaobject_path";
     params[13] = doc_path;
-    params[14] = NULL;
+    params[14] = "color_gray_background";
+    params[15] = yelp_theme_get_gray_background ();
+    params[16] = "color_gray_border";
+    params[17] = yelp_theme_get_gray_border ();
+    params[18] = NULL;
 
     stylesheet = xsltParseStylesheetFile (DB_STYLESHEET);
     tctxt      = xsltNewTransformContext (stylesheet,
diff --git a/src/yelp-theme.c b/src/yelp-theme.c
index 8567617c..748a7ede 100644
--- a/src/yelp-theme.c
+++ b/src/yelp-theme.c
@@ -25,14 +25,74 @@
 #endif
 
 #include <string.h>
+#include <gtk/gtk.h>
+#include <libgnome/gnome-i18n.h>
 #include "yelp-theme.h"
 
 GtkIconTheme *icon_theme;
 
+gchar gray_background[10];
+gchar gray_border[10];
+
 void
 yelp_theme_init (void)
 {
+    GtkStyle *style;
+
     icon_theme = gtk_icon_theme_get_default ();
+
+    style = gtk_rc_get_style_by_paths (gtk_settings_get_default (),
+				       "GtkWidget", "GtkWidget",
+				       GTK_TYPE_WIDGET);
+    if (!style) {
+	g_warning (_("Could not obtain a GtkStyle."));
+    } else {
+	int state = GTK_STATE_NORMAL;
+	gushort rgb[3];
+	int i;
+
+	rgb[0] = style->bg[state].red >> 8;
+	rgb[1] = style->bg[state].green >> 8;
+	rgb[2] = style->bg[state].blue >> 8;
+
+	gray_background[0] = '"';
+	gray_background[1] = '#';
+	for (i = 0; i < 3; i++) {
+	    int j = rgb[i] / 16;
+	    if (j < 10)
+		gray_background[2*i+2] = '0' + j;
+	    else
+		gray_background[2*i+2] = 'A' + (j - 10);
+	    j = rgb[i] % 16;
+	    if (j < 10)
+		gray_background[2*i+3] = '0' + j;
+	    else
+		gray_background[2*i+3] = 'A' + (j - 10);
+	}
+	gray_background[8] = '"';
+	gray_background[9] = '\0';
+
+	rgb[0] = style->dark[state].red >> 8;
+	rgb[1] = style->dark[state].green >> 8;
+	rgb[2] = style->dark[state].blue >> 8;
+
+	gray_border[0] = '"';
+	gray_border[1] = '#';
+	for (i = 0; i < 3; i++) {
+	    int j = rgb[i] / 16;
+	    if (j < 10)
+		gray_border[2*i+2] = '0' + j;
+	    else
+		gray_border[2*i+2] = 'A' + (j - 10);
+	    j = rgb[i] % 16;
+	    if (j < 10)
+		gray_border[2*i+3] = '0' + j;
+	    else
+		gray_border[2*i+3] = 'A' + (j - 10);
+	}
+	gray_border[8] = '"';
+	gray_border[9] = '\0';
+    }
 }
 
 const GtkIconTheme*
@@ -40,3 +100,15 @@ yelp_theme_get_icon_theme (void)
 {
     return (const GtkIconTheme *) icon_theme;
 }
+
+const gchar*
+yelp_theme_get_gray_background (void)
+{
+    return gray_background;
+}
+
+const gchar*
+yelp_theme_get_gray_border (void)
+{
+    return gray_border;
+}
diff --git a/src/yelp-theme.h b/src/yelp-theme.h
index 62e92574..5145dd69 100644
--- a/src/yelp-theme.h
+++ b/src/yelp-theme.h
@@ -26,7 +26,9 @@
 #include <glib.h>
 #include <gtk/gtkicontheme.h>
 
-void                 yelp_theme_init              (void);
-const GtkIconTheme * yelp_theme_get_icon_theme    (void);
+void                 yelp_theme_init                 (void);
+const GtkIconTheme * yelp_theme_get_icon_theme       (void);
+const gchar*         yelp_theme_get_gray_background  (void);
+const gchar*         yelp_theme_get_gray_border      (void);
 
 #endif /* __YELP_THEME_H__ */
diff --git a/src/yelp-window.c b/src/yelp-window.c
index b39921ac..204f92f4 100644
--- a/src/yelp-window.c
+++ b/src/yelp-window.c
@@ -237,23 +237,23 @@ static GtkItemFactoryEntry menu_items[] = {
      "<Item>",                       NULL                       },
 
     {N_("/_Go"),                     NULL, 0, 0, "<Branch>"     },
-    {N_("/Go/_Back"),                NULL,
+    {N_("/Go/_Back"),                "<Alt>Left",
      window_go_cb,                   YELP_WINDOW_GO_BACK,
      "<StockItem>",                  GTK_STOCK_GO_BACK          },
-    {N_("/Go/_Forward"),             NULL,
+    {N_("/Go/_Forward"),             "<Alt>Right",
      window_go_cb,                   YELP_WINDOW_GO_FORWARD,
      "<StockItem>",                  GTK_STOCK_GO_FORWARD       },
     {N_("/Go/_Home"),                NULL,
      window_go_cb,                   YELP_WINDOW_GO_HOME,
      "<StockItem>",                  GTK_STOCK_HOME             },
     {N_("/Go/"),                     NULL, 0, 0, "<Separator>"  },
-    {N_("/Go/_Previous"),            "<Alt>Left",
+    {N_("/Go/_Previous"),            "<Alt>Up",
      window_go_cb,                   YELP_WINDOW_GO_PREVIOUS,
      0,                              NULL                       },
-    {N_("/Go/_Next"),                "<Alt>Right",
+    {N_("/Go/_Next"),                "<Alt>Down",
      window_go_cb,                   YELP_WINDOW_GO_NEXT,
      0,                              NULL                       },
-    {N_("/Go/_Contents"),            "<Alt>Up",
+    {N_("/Go/_Contents"),            NULL,
      window_go_cb,                   YELP_WINDOW_GO_TOC,
      0,                              NULL                       },
 
diff --git a/stylesheets/ChangeLog b/stylesheets/ChangeLog
index f6200e58..20819db8 100644
--- a/stylesheets/ChangeLog
+++ b/stylesheets/ChangeLog
@@ -1,3 +1,29 @@
+2003-12-24  Shaun McCance  <shaunm@gnome.org>
+
+	* Makefile.am:
+	* db2html-formal.xsl:
+	* db2html-lists.xsl:
+	- Removing db2html-formal and db2html-lists
+
+	* db2html-block.xsl:
+	- Better implementation of msg stuff.
+
+	* db2html-html.xsl:
+	* db2html-param.xsl:
+	- Theme the gray color of screen, programlisting, etc.
+	- Various stylistic improvements in the CSS.
+
+	* db2html-inline.xsl:
+	* db2html-titlepage.xsl:
+	* gettext.xsl:
+	- Get rid of em-dashes.  ~sigh~
+
+	* db2html-title.xsl:
+	- Implemented some more titles and subtitles.
+
+	* db2html-titlepage.xsl:
+	- Deboldify Affiliation.  The pages are too bold.
+
 2003-12-22  Shaun McCance  <shaunm@gnome.org>
 
 	* Makefile.am:
diff --git a/stylesheets/Makefile.am b/stylesheets/Makefile.am
index d646fbd6..49e523ee 100644
--- a/stylesheets/Makefile.am
+++ b/stylesheets/Makefile.am
@@ -10,14 +10,12 @@ yelpcustomization_DATA = 	\
 	db2html-division.xsl	\
 	db2html-ebnf.xsl	\
 	db2html-footnote.xsl	\
-	db2html-formal.xsl	\
 	db2html-glossary.xsl	\
 	db2html-header.xsl	\
 	db2html-html.xsl	\
 	db2html-index.xsl	\
 	db2html-inline.xsl	\
 	db2html-list.xsl	\
-	db2html-lists.xsl	\
 	db2html-math.xsl	\
 	db2html-media.xsl	\
 	db2html-navbar.xsl	\
diff --git a/stylesheets/db2html-block.xsl b/stylesheets/db2html-block.xsl
index 86f5d04b..a07f880f 100644
--- a/stylesheets/db2html-block.xsl
+++ b/stylesheets/db2html-block.xsl
@@ -30,16 +30,33 @@
 
 <xsl:template name="block.pre" match="
 		literallayout | programlisting | screen | synopsis">
-	<pre class="{name(.)}">
+	<div class="{name(.)}"><pre>
 		<xsl:call-template name="anchor"/>
 		<xsl:apply-templates/>
-	</pre>
+	</pre></div>
 </xsl:template>
 
-<xsl:template name="block.header" match="msgaud | msglevel | msgorig">
+<xsl:template name="block.msg" match="msgaud | msglevel | msgorig">
 	<div class="{name(.)}">
 		<xsl:call-template name="anchor"/>
-		<xsl:call-template name="node.heading"/>
+		<b>
+			<xsl:call-template name="gettext">
+				<xsl:with-param name="key">
+					<xsl:choose>
+						<xsl:when test="name(.) = 'msgaud'">
+							<xsl:value-of select="'Audience'"/>
+						</xsl:when>
+						<xsl:when test="name(.) = 'msglevel'">
+							<xsl:value-of select="'Level'"/>
+						</xsl:when>
+						<xsl:when test="name(.) = 'msgorig'">
+							<xsl:value-of select="'Origin'"/>
+						</xsl:when>
+					</xsl:choose>
+				</xsl:with-param>
+			</xsl:call-template>
+			<xsl:text>: </xsl:text>
+		</b>
 		<xsl:apply-templates/>
 	</div>
 </xsl:template>
diff --git a/stylesheets/db2html-formal.xsl b/stylesheets/db2html-formal.xsl
deleted file mode 100644
index 70749bbc..00000000
--- a/stylesheets/db2html-formal.xsl
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version='1.0'?><!-- -*- Mode: xml -*- -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-<xsl:template name="formal.object">
-	<div class="{name(.)}">
-		<xsl:call-template name="formal.object.heading"/>
-		<xsl:apply-templates mode="content.mode"/>
-	</div>
-</xsl:template>
-
-
-</xsl:stylesheet>
diff --git a/stylesheets/db2html-html.xsl b/stylesheets/db2html-html.xsl
index 0660ea59..e931ee54 100644
--- a/stylesheets/db2html-html.xsl
+++ b/stylesheets/db2html-html.xsl
@@ -88,9 +88,11 @@
 				<xsl:with-param name="next" select="$next"/>
 			</xsl:call-template>
 
-			<xsl:apply-templates select="$node">
-				<xsl:with-param name="depth_chunk" select="$depth_chunk"/>
-			</xsl:apply-templates>
+			<div class="body">
+				<xsl:apply-templates select="$node">
+					<xsl:with-param name="depth_chunk" select="$depth_chunk"/>
+				</xsl:apply-templates>
+			</div>
 
 			<xsl:call-template name="html.navbar.bottom">
 				<xsl:with-param name="node" select="$node"/>
@@ -106,109 +108,63 @@
 </xsl:template>
 
 <xsl:template name="html.css"><xsl:text>
-<!--
-body {
-	margin-right: 1em;
-}
+h1 { font-size: 1.6em; font-weight: bold; }
+h2 { font-size: 1.4em; font-weight: bold; }
+h3 { font-size: 1.2em; font-weight: bold; }
 
-h1 {
-	font-size: 1.6em;
-	font-weight: bold;
-	margin-bottom: 0em;
-	padding-bottom: 0em;
-}
-h1 + * {
-	margin-top: 0.2em;
-	padding-top: 0em;
-}
-h2 {
-	font-size: 1.4em;
-	font-weight: bold;
-	margin-top: 1.2em;
-	margin-bottom: 0em;
-	padding-bottom: 0em;
-}
-h2 + * {
-	margin-top: 0.2em;
-	padding-top: 0em;
-}
-h3 {
-	font-size: 1.2em;
-	font-weight: bold;
-	margin-bottom: 0em;
-	padding-bottom: 0em;
-}
-h3 + * {
-	margin-top: 0.2em;
-	padding-top: 0em;
-}
-h4 {
-	margin-bottom: 0em;
-	padding-bottom: 0em;
-}
-h4 + * {
-	margin-top: 0.2em;
-	padding-top: 0em;
-}
+div[class="title"] + * { margin-top: 0.8em; }
+div[class="body"] { margin-bottom: 1.6em; }
 
-div[class="heading"] {
-	margin-bottom: 0.5em;
-}
+p, div { margin: 0em; }
+p + p, p + div, div + p, div + div { margin-top: 0.8em; }
 
-div[class="admonition"] {
-	border-top: outset 1px;
-	border-bottom: outset 1px;
-	margin-left: 2em;
-	margin-right: 2em;
-	margin-bottom: 1em;
-}
+dl { margin: 0em; }
+ol { margin: 0em; }
+ul { margin: 0em; }
+ul li { padding-left: 0.4em; }
 
-div[class="informalexample"] {
-	margin-left: 2em;
-	margin-right: 1em;
-	margin-bottom: 1em;
-}
-div[class="informalfigure"] {
-	margin-left: 2em;
-	margin-right: 1em;
-	margin-bottom: 1em;
-}
-div[class="informaltable"] {
-	margin-left: 2em;
-	margin-right: 1em;
-	margin-bottom: 1em;
-}
-div[class="example"] {
-	margin-left: 2em;
-	margin-right: 1em;
-	margin-bottom: 1em;
-}
-div[class="figure"] {
-	margin-left: 2em;
-	margin-right: 1em;
-	margin-bottom: 1em;
-}
-div[class="table"] {
-	margin-left: 2em;
-	margin-right: 1em;
-	margin-bottom: 1em;
+dd + dt { margin-top: 0.8em; }
+
+div[class="example"],
+div[class="figure"],
+div[class="informalexample"],
+div[class="informalfigure"],
+div[class="informaltable"],
+div[class="msgset"],
+div[class="table"],
+div[class="variablelist"] {
+	margin-left: 1.6em;
+	margin-right: 1.6em;
+	margin-bottom: 0.8em;
 }
 
 div[class="sidebar"] {
 	border: outset 1px;
-	margin-left: 2em;
-	margin-right: 2em;
+	margin-left: 1.6em;
+	margin-right: 1.6em;
 }
 
-ul {
-	list-style-image: url("li.png")
+div[class="admonition"] {
+	margin: 1.6em;
+	padding: 1.6em;
+	background-color: #CCCCCC;
+	border: solid 2px #C0C0C0;
+}
+
+div[class="programlisting"],
+div[class="screen"] {
+	margin: 1.6em;
+	padding: 1.6em;
+	background-color: </xsl:text>
+<xsl:value-of select="$color_gray_background"/><xsl:text>;
+	border: solid 1px </xsl:text>
+<xsl:value-of select="$color_gray_border"/><xsl:text>;
 }
 
 <!--
 table {
 	border: outset 1px;
 }
--->
 thead th {
 	border-bottom: solid 1px;
 }
diff --git a/stylesheets/db2html-inline.xsl b/stylesheets/db2html-inline.xsl
index 7f4fd2cf..e568ccc3 100644
--- a/stylesheets/db2html-inline.xsl
+++ b/stylesheets/db2html-inline.xsl
@@ -347,7 +347,7 @@
 	<span class="{name(.)}">
 		<xsl:for-each select="*[name(.) != 'shortcut']">
 			<xsl:if test="position() &gt; 1">
-				<xsl:text>&#x2009;&#x2192;&#x2009;</xsl:text>
+				<xsl:text>&#160;&#x2192;&#160;</xsl:text>
 			</xsl:if>
 			<xsl:apply-templates select="."/>
 		</xsl:for-each>
diff --git a/stylesheets/db2html-lists.xsl b/stylesheets/db2html-lists.xsl
deleted file mode 100644
index 2c13e8d3..00000000
--- a/stylesheets/db2html-lists.xsl
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version='1.0'?><!-- -*- Mode: fundamental; tab-width: 3 -*- -->
-<!DOCTYPE xsl:stylesheet [
-<!ENTITY listcomponent "
-	abstract         | address          | anchor              | authorblurb        |
-	beginpage        | blockquote       | bridgehead          | caution            |
-	classsynopsis    | cmdsynopsis      | constructorsynopsis | destructorsynopsis |
-	epigraph         | fieldsynopsis    | formalpara          | funcsynopsis       |
-	graphic          | graphicco        | highlights          | important          |
-	indexterm        | informalequation | informalexample     | informalfigure     |
-	informaltable    | literallayout    | mediaobject         | mediaobjectco      |
-	methodsynopsis   | note             | para                | programlisting     |
-	programlistingco | remark           | screen              | screenco           |
-	screenshot       | simpara          | synopsis            | tip                |
-	warning          ">
-]>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-<!-- == itemizedlist ======================================================= -->
-
-<xsl:template match="itemizedlist">
-	<div class="{name(.)}">
-		<xsl:call-template name="anchor"/>
-		<xsl:if test="title">
-			<xsl:call-template name="node.heading"/>
-		</xsl:if>
-		<xsl:apply-templates select="&listcomponent;"/>
-		<ul>
-			<xsl:if test="@spacing='compact'">
-				<xsl:attribute name="compact">
-					<xsl:value-of select="@spacing"/>
-				</xsl:attribute>
-			</xsl:if>
-			<xsl:if test="@mark">
-				<xsl:attribute name="style">
-					<xsl:text>list-style-type: </xsl:text>
-					<xsl:choose>
-						<xsl:when test="@mark = 'opencircle'">
-							<xsl:text>circle</xsl:text>
-						</xsl:when>
-						<xsl:when test="@mark = 'bullet'">
-							<xsl:text>disc</xsl:text>
-						</xsl:when>
-						<xsl:when test="@mark = 'box'">
-							<xsl:text>square</xsl:text>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:value-of select="@mark"/>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:attribute>
-			</xsl:if>
-			<xsl:apply-templates select="listitem"/>
-		</ul>
-	</div>
-</xsl:template>
-
-<xsl:template match="itemizedlist/listitem">
-	<li>
-		<xsl:if test="@override">
-			<xsl:attribute name="style">
-				<xsl:text>list-style-type: </xsl:text>
-				<xsl:choose>
-					<xsl:when test="@override = 'opencircle'">
-						<xsl:text>circle</xsl:text>
-					</xsl:when>
-					<xsl:when test="@override = 'bullet'">
-						<xsl:text>disc</xsl:text>
-					</xsl:when>
-					<xsl:when test="@override = 'box'">
-						<xsl:text>square</xsl:text>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="@override"/>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:attribute>
-		</xsl:if>
-		<xsl:call-template name="anchor"/>
-		<xsl:apply-templates/>
-	</li>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/stylesheets/db2html-param.xsl b/stylesheets/db2html-param.xsl
index 196db798..15c467a7 100644
--- a/stylesheets/db2html-param.xsl
+++ b/stylesheets/db2html-param.xsl
@@ -21,6 +21,9 @@
 
 <xsl:param name="classsynopsis_default_langauge" select="'idl'"/>
 
+<xsl:param name="color_gray_background" select="'#E6E6E6'"/>
+<xsl:param name="color_gray_border" select="'#A1A1A1'"/>
+
 <xsl:param name="doc_name" select="''"/>
 <xsl:param name="doc_path" select="''"/>
 
diff --git a/stylesheets/db2html-title.xsl b/stylesheets/db2html-title.xsl
index 5ffaaf44..2c86fda7 100644
--- a/stylesheets/db2html-title.xsl
+++ b/stylesheets/db2html-title.xsl
@@ -20,30 +20,12 @@
 <xsl:template match="constraintdef/title">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
-<xsl:template match="glossdiv/title">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-<xsl:template match="indexdiv/title">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-<xsl:template match="msg/title">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
 <xsl:template match="msgexplan/title">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 <xsl:template match="msgmain/title">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
-<xsl:template match="msgrel/title">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-<xsl:template match="msgset/title">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-<xsl:template match="msgsub/title">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
 <xsl:template match="productionset/title">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
@@ -66,12 +48,6 @@
 <xsl:template match="biblioset/subtitle">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
-<xsl:template match="glossidv/subtitle">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-<xsl:template match="indexdiv/subtitle">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
 <xsl:template match="refsynopsisdiv/subtitle">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
@@ -96,7 +72,8 @@
 <!-- == title.header ======================================================= -->
 
 <xsl:template name="title.header" match="
-		equation/title | example/title | figure/title | table/title ">
+		equation/title | example/title | figure/title | msg/title   |
+		msgrel/title   | msgset/title  | msgsub/title | table/title ">
 	<div class="{name(.)}">
 		<i>
 			<xsl:call-template name="header.prefix"/>
@@ -110,13 +87,14 @@
 <xsl:template name="title.h" match="
 		appendix/title			| article/title		| bibliodiv/title		|
 		bibliography/title	| book/title			| chapter/title		|
-		colophon/title			| glossary/title		| index/title			|
-		part/title				| partintro/title		| preface/title		|
-		reference/title		| refsect1/title		| refsect2/title		|
-		refsect3/title			| refsection/title	| sect1/title			|
-		sect2/title				| sect3/title			| sect4/title			|
-		sect5/title				| section/title		| set/title				|
-		setindex/title			| simplesect/title	">
+		colophon/title			| glossary/title		| glossdiv/title		|
+		index/title				| indexdiv/title		| part/title			|
+		partintro/title		| preface/title		| reference/title		|
+		refsect1/title			| refsect2/title		| refsect3/title		|
+		refsection/title		| sect1/title			| sect2/title			|
+		sect3/title				| sect4/title			| sect5/title			|
+		section/title			| set/title				| setindex/title		|
+		simplesect/title		">
 	<xsl:param name="depth_in_chunk">
 		<xsl:call-template name="depth.in.chunk"/>
 	</xsl:param>
@@ -145,13 +123,14 @@
 <xsl:template name="subtitle.h" match="
 		appendix/subtitle			| article/subtitle		| bibliodiv/subtitle		|
 		bibliography/subtitle	| book/subtitle			| chapter/subtitle		|
-		colophon/subtitle			| glossary/subtitle		| index/subtitle			|
-		part/subtitle				| partintro/subtitle		| preface/subtitle		|
-		reference/subtitle		| refsect1/subtitle		| refsect2/subtitle		|
-		refsect3/subtitle			| refsection/subtitle	| sect1/subtitle			|
-		sect2/subtitle				| sect3/subtitle			| sect4/subtitle			|
-		sect5/subtitle				| section/subtitle		| set/subtitle				|
-		setindex/subtitle			| simplesect/subtitle	">
+		colophon/subtitle			| glossary/subtitle		| glossdiv/subtitle		|
+		index/subtitle				| indexdiv/subtitle		| part/subtitle			|
+		partintro/subtitle		| preface/subtitle		| reference/subtitle		|
+		refsect1/subtitle			| refsect2/subtitle		| refsect3/subtitle		|
+		refsection/subtitle		| sect1/subtitle			| sect2/subtitle			|
+		sect3/subtitle				| sect4/subtitle			| sect5/subtitle			|
+		section/subtitle			| set/subtitle				| setindex/subtitle		|
+		simplesect/subtitle		">
 	<xsl:param name="depth_in_chunk">
 		<xsl:call-template name="depth.in.chunk"/>
 	</xsl:param>
diff --git a/stylesheets/db2html-titlepage.xsl b/stylesheets/db2html-titlepage.xsl
index 97e7bd30..47ff75ee 100644
--- a/stylesheets/db2html-titlepage.xsl
+++ b/stylesheets/db2html-titlepage.xsl
@@ -146,12 +146,12 @@
 	<dt><xsl:call-template name="person.name"/></dt>
 	<xsl:for-each select="affiliation/orgname">
 		<dd>
-			<strong>
+			<i>
 				<xsl:call-template name="gettext">
 					<xsl:with-param name="key" select="'Affiliation'"/>
 				</xsl:call-template>
 				<xsl:text>: </xsl:text>
-			</strong>
+			</i>
 			<xsl:apply-templates select="." mode="titlepage.mode"/>
 		</dd>
 	</xsl:for-each>
@@ -212,7 +212,7 @@
 			</xsl:if>
 			<xsl:apply-templates select="." mode="titlepage.mode"/>
 		</xsl:for-each>
-		<xsl:text>&#x2003;</xsl:text>
+		<xsl:text>&#160;&#160;</xsl:text>
 		<xsl:for-each select="holder">
 			<xsl:if test="position() &gt; 1">
 				<xsl:text>, </xsl:text>
diff --git a/stylesheets/gettext.xsl b/stylesheets/gettext.xsl
index 70184dca..a020ac64 100644
--- a/stylesheets/gettext.xsl
+++ b/stylesheets/gettext.xsl
@@ -44,12 +44,12 @@
 
 <xsl:template name="format.header.prefix.named">
 	<xsl:param name="header"/>
-	<xsl:value-of select="concat($header, '&#x2003;')"/>
+	<xsl:value-of select="concat($header, '&#160;&#160;')"/>
 </xsl:template>
 
 <xsl:template name="format.header.prefix.unnamed">
 	<xsl:param name="header"/>
-	<xsl:value-of select="concat($header, '&#x2003;')"/>
+	<xsl:value-of select="concat($header, '&#160;&#160;')"/>
 </xsl:template>
 
 <xsl:template name="format.header">