- Transpose Titlepage and Contents.

* src/yelp-db-pager.c:
- Transpose Titlepage and Contents.

* src/yelp-main.c:
- Handle startup notification.

* stylesheets/db2html-header.xsl
- Implement @label attribute.

* stylesheets/db2html-html.xsl:
* stylesheets/db2html-navbar.xsl:
- Fixes for prev/next links.

* stylesheets/db2html-toc.xsl:
- Deboldify section titles.

* test/testdoc1/testdoc1.xml:
- Change to 4.1.2.  I need to fix this fiasco.  ~sigh~

10 files changed, 87 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index a5a13067..7f89c985 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2003-12-29  Shaun McCance  <shaunm@gnome.org>
 
+	* src/yelp-db-pager.c:
+	- Transpose Titlepage and Contents.
+
+	* src/yelp-main.c:
+	- Handle startup notification.
+
+	* test/testdoc1/testdoc1.xml:
+	- Change to 4.1.2.  I need to fix this fiasco.  ~sigh~
+
+2003-12-29  Shaun McCance  <shaunm@gnome.org>
+
 	* test/testdoc1/testdoc1.xml:
 	- Put in a test for classsynopsis.
 
diff --git a/src/yelp-db-pager.c b/src/yelp-db-pager.c
index 1319799f..53def37f 100644
--- a/src/yelp-db-pager.c
+++ b/src/yelp-db-pager.c
@@ -533,8 +533,12 @@ walker_walk_xml (DBWalker *walker)
 	title = xml_get_title (walker->cur);
 
 	if (id) {
-	    gtk_tree_store_append (GTK_TREE_STORE (priv->sects),
-				   &iter, walker->iter);
+	    if (xml_is_info (walker->cur))
+		gtk_tree_store_prepend (GTK_TREE_STORE (priv->sects),
+					&iter, walker->iter);
+	    else
+		gtk_tree_store_append (GTK_TREE_STORE (priv->sects),
+				       &iter, walker->iter);
 
 	    gtk_tree_store_set (GTK_TREE_STORE (priv->sects),
 				&iter,
diff --git a/src/yelp-main.c b/src/yelp-main.c
index 3ff225f1..c8b037a6 100644
--- a/src/yelp-main.c
+++ b/src/yelp-main.c
@@ -162,6 +162,7 @@ main_start (gchar *url)
 	}
 	
 	main_open_new_window (yelp_base, url);
+	gdk_notify_startup_complete ();
 	
 	bonobo_object_release_unref (yelp_base, NULL);
 
diff --git a/stylesheets/ChangeLog b/stylesheets/ChangeLog
index 2c211f7f..a5547731 100644
--- a/stylesheets/ChangeLog
+++ b/stylesheets/ChangeLog
@@ -1,5 +1,17 @@
 2003-12-29  Shaun McCance  <shaunm@gnome.org>
 
+	* db2html-header.xsl
+	- Implement @label attribute.
+
+	* db2html-html.xsl:
+	* db2html-navbar.xsl:
+	- Fixes for prev/next links.
+
+	* db2html-toc.xsl:
+	- Deboldify section titles.
+
+2003-12-29  Shaun McCance  <shaunm@gnome.org>
+
 	* db2html-html.xsl:
 	- Put classsynopsis in a gray box.
 	- Monospace tt, since gtkhtml2 doesn't.
diff --git a/stylesheets/db2html-header.xsl b/stylesheets/db2html-header.xsl
index 6a92d889..598a6ce6 100644
--- a/stylesheets/db2html-header.xsl
+++ b/stylesheets/db2html-header.xsl
@@ -8,7 +8,14 @@
 <!-- header.prefix -->
 <xsl:template name="header.prefix">
 	<xsl:param name="node" select="."/>
-	<xsl:apply-templates mode="header.prefix.mode" select="$node"/>
+	<xsl:choose>
+		<xsl:when test="$node/@label">
+			<xsl:value-of select="$node/@label"/>
+		</xsl:when>
+		<xsl:otherwise>
+			<xsl:apply-templates mode="header.prefix.mode" select="$node"/>
+		</xsl:otherwise>
+	</xsl:choose>
 </xsl:template>
 
 <!-- header.prefix.named -->
@@ -365,7 +372,7 @@
 	</xsl:call-template>
 </xsl:template>
 
-<!-- == header.number.mode ================================================= -->
+<!-- == header.number ====================================================== -->
 
 <xsl:template name="header.number">
 	<xsl:param name="node" select="."/>
diff --git a/stylesheets/db2html-html.xsl b/stylesheets/db2html-html.xsl
index 69e5abe3..396e5521 100644
--- a/stylesheets/db2html-html.xsl
+++ b/stylesheets/db2html-html.xsl
@@ -1,4 +1,19 @@
 <?xml version='1.0'?><!-- -*- Mode: fundamental; tab-width: 3 -*- -->
+<!DOCTYPE xsl:stylesheet [
+<!ENTITY is-info "(
+	(name(.) = 'appendixinfo')			or (name(.) = 'articleinfo')    or
+	(name(.) = 'bibliographyinfo')	or (name(.) = 'bookinfo')       or
+	(name(.) = 'chapterinfo')			or (name(.) = 'glossaryinfo')   or
+	(name(.) = 'indexinfo')				or (name(.) = 'partinfo')       or
+	(name(.) = 'prefaceinfo')			or (name(.) = 'refentryinfo')   or
+	(name(.) = 'referenceinfo')		or (name(.) = 'refsect1info')   or
+	(name(.) = 'refsect2info')			or (name(.) = 'refsect3info')   or
+	(name(.) = 'refsectioninfo')		or (name(.) = 'sect1info')      or
+	(name(.) = 'sect2info')				or (name(.) = 'sect3info')      or
+	(name(.) = 'sect4info')				or (name(.) = 'sect5info')      or
+	(name(.) = 'sectioninfo')			or (name(.) = 'setinfo')        or
+	(name(.) = 'setindexinfo'))">
+]>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version="1.0">
@@ -238,9 +253,19 @@ div[class="attribution"] {
 	<table width="100%" cellpadding="0" cellspacing="0">
 		<tr width="100%">
 			<td width="50%" style="text-align: left;">
-				<xsl:call-template name="xref">
-					<xsl:with-param name="linkend" select="$prev"/>
-				</xsl:call-template>
+				<xsl:choose>
+					<xsl:when test="$prev = 'titlepage'">
+						<xsl:call-template name="xref">
+							<xsl:with-param name="linkend" select="$prev"/>
+							<xsl:with-param name="target" select="/*/*[&is-info;]"/>
+						</xsl:call-template>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:call-template name="xref">
+							<xsl:with-param name="linkend" select="$prev"/>
+						</xsl:call-template>
+					</xsl:otherwise>
+				</xsl:choose>
 			</td>
 			<td width="50%" style="text-align: right;">
 				<xsl:call-template name="xref">
@@ -273,9 +298,19 @@ div[class="attribution"] {
 	<table width="100%" cellpadding="0" cellspacing="0">
 		<tr width="100%">
 			<td width="40%" style="text-align: left;">
-				<xsl:call-template name="xref">
-					<xsl:with-param name="linkend" select="$prev"/>
-				</xsl:call-template>
+				<xsl:choose>
+					<xsl:when test="$prev = 'titlepage'">
+						<xsl:call-template name="xref">
+							<xsl:with-param name="linkend" select="$prev"/>
+							<xsl:with-param name="target" select="/*/*[&is-info;]"/>
+						</xsl:call-template>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:call-template name="xref">
+							<xsl:with-param name="linkend" select="$prev"/>
+						</xsl:call-template>
+					</xsl:otherwise>
+				</xsl:choose>
 			</td>
 			<td width="20%" style="text-align: center;">
 				<xsl:if test="$top != ''">
diff --git a/stylesheets/db2html-navbar.xsl b/stylesheets/db2html-navbar.xsl
index 7f3b38ea..e195e2e2 100644
--- a/stylesheets/db2html-navbar.xsl
+++ b/stylesheets/db2html-navbar.xsl
@@ -89,6 +89,7 @@
 		</xsl:call-template>
 	</xsl:param>
 	<xsl:choose>
+		<xsl:when test="$node/self::*[&is-info;]"/>
 		<xsl:when test="($node = /*)">
 			<xsl:if test="$generate_titlepage and $node/*[&is-info;]">
 				<xsl:value-of select="'titlepage'"/>
diff --git a/stylesheets/db2html-toc.xsl b/stylesheets/db2html-toc.xsl
index 5bdd2040..8ca90c3e 100644
--- a/stylesheets/db2html-toc.xsl
+++ b/stylesheets/db2html-toc.xsl
@@ -96,12 +96,12 @@
 		</a>
 		<xsl:choose>
 			<xsl:when test="title">
-				<xsl:text>&#160;</xsl:text>
-				<b><xsl:apply-templates select="title/node()"/></b>
+				<xsl:text>&#160;&#160;</xsl:text>
+				<xsl:apply-templates select="title/node()"/>
 			</xsl:when>
 			<xsl:when test="*[&is-info;]/title">
-				<xsl:text>&#160;</xsl:text>
-				<b><xsl:apply-templates select="*[&is-info;]/title/node()"/></b>
+				<xsl:text>&#160;&#160;</xsl:text>
+				<xsl:apply-templates select="*[&is-info;]/title/node()"/>
 			</xsl:when>
 		</xsl:choose>
 	</li>
diff --git a/stylesheets/db2html-xref.xsl b/stylesheets/db2html-xref.xsl
index 0ceca599..a848a79c 100644
--- a/stylesheets/db2html-xref.xsl
+++ b/stylesheets/db2html-xref.xsl
@@ -152,8 +152,6 @@
 	<xsl:call-template name="header"/>
 </xsl:template>
 
-
 <!-- ======================================================================= -->
 
-
 </xsl:stylesheet>
diff --git a/test/testdoc1/testdoc1.xml b/test/testdoc1/testdoc1.xml
index 8d469556..83cbe11b 100644
--- a/test/testdoc1/testdoc1.xml
+++ b/test/testdoc1/testdoc1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2.0//EN" 
-"http://www.oasis-open.org/docbook/xml/4.2.0/docbookx.dtd" [
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
+"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
 	<!ENTITY legal SYSTEM "legal.xml">
   <!ENTITY yelp "<application>Yelp</application>">
 ]>