- Do XInclude when timing

* test/timing/timeall:
- Do XInclude when timing

* xslt/docbook/common/db-label.xsl:
* xslt/docbook/common/db-title.xsl:
* xslt/docbook/common/db-xref.xsl:-
* xslt/docbook/html/db2html-css.xsl:
* xslt/docbook/html/db2html-bibliography.xsl:
* xslt/docbook/html/db2html-division.xsl:
* xslt/docbook/html/db2html.xsl:
* xslt/gettext/l10n.xml.in:
- Added support for "cooked" bibliographies

* xslt/docbook/html/db2html-block.xsl:
* xslt/docbook/html/db2html-inline.xsl:
* xslt/docbook/html/db2html-suppressed.xsl:
- Added artpagenums, edition, isbn, pubdate, publishername

* xslt/gettext/l10n.xml.in:
- Added the 'Translator(s)' string

13 files changed, 539 insertions, 29 deletions

diff --git a/ChangeLog b/ChangeLog
index c276eba7..7aa3f554 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2005-11-25  Shaun McCance  <shaunm@gnome.org>
+
+	* test/timing/timeall:
+	- Do XInclude when timing
+
+	* xslt/docbook/common/db-label.xsl:
+	* xslt/docbook/common/db-title.xsl:
+	* xslt/docbook/common/db-xref.xsl:-
+	* xslt/docbook/html/db2html-css.xsl:
+	* xslt/docbook/html/db2html-bibliography.xsl:
+	* xslt/docbook/html/db2html-division.xsl:
+	* xslt/docbook/html/db2html.xsl:
+	* xslt/gettext/l10n.xml.in:
+	- Added support for "cooked" bibliographies
+
+	* xslt/docbook/html/db2html-block.xsl:
+	* xslt/docbook/html/db2html-inline.xsl:
+	* xslt/docbook/html/db2html-suppressed.xsl:
+	- Added artpagenums, edition, isbn, pubdate, publishername
+
+	* xslt/gettext/l10n.xml.in:
+	- Added the 'Translator(s)' string
+
 2005-10-17  Runa Bhattacharjee  <runa@bengalinux.org>
 	* configure.in: Added Bengali (bn) to ALL_LINGUAS
 
diff --git a/test/timing/timeall b/test/timing/timeall
index 1bfc354c..cb739a7d 100755
--- a/test/timing/timeall
+++ b/test/timing/timeall
@@ -25,7 +25,7 @@ for doc in `ls $helpdir`; do
 		mkdir -p "$outdir";
 		rm -f "$logfile" && touch "$logfile";
 		for i in 1 2 3 4 5; do
-		    xsltproc --timing \
+		    xsltproc --xinclude --timing \
 			--stringparam "db.chunk.basename" "$doc" \
 			-o "$outfile" \
 			../../xslt/docbook/html/db2html.xsl \
diff --git a/xslt/docbook/common/db-label.xsl b/xslt/docbook/common/db-label.xsl
index bec333fc..3b48bad5 100644
--- a/xslt/docbook/common/db-label.xsl
+++ b/xslt/docbook/common/db-label.xsl
@@ -107,6 +107,29 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
   </xsl:call-template>
 </xsl:template>
 
+<!-- = bibliography = -->
+<xsl:template mode="db.label.mode" match="bibliography"/>
+
+<!-- = biblioentry | bibliomixed = -->
+<xsl:template mode="db.label.mode" match="biblioentry | bibliomixed">
+  <xsl:if test="*[1]/self::abbrev | @xreflabel | @id">
+    <!-- FIXME: I18N -->
+    <xsl:text>[</xsl:text>
+    <xsl:choose>
+      <xsl:when test="*[1]/self::abbrev">
+        <xsl:apply-templates select="abbrev[1]"/>
+      </xsl:when>
+      <xsl:when test="@xreflabel">
+        <xsl:value-of select="@xreflabel"/>
+      </xsl:when>
+      <xsl:when test="@id">
+        <xsl:value-of select="@id"/>
+      </xsl:when>
+    </xsl:choose>
+    <xsl:text>]</xsl:text>
+  </xsl:if>
+</xsl:template>
+
 <!-- = book = -->
 <xsl:template mode="db.label.mode" match="book">
   <xsl:param name="role"/>
@@ -231,7 +254,7 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 <!-- FIXME -->
 
 <xsl:template mode="db.label.mode" match="
-              article  |  bibliography |
+              article  |
               colophon |    index     |
               qandadiv | qandaset |  reference |
               set      | setindex ">
@@ -279,13 +302,6 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 <!-- == db.number ========================================================== -->
 
-<xsl:template mode="l10n.format.mode" match="msg:number">
-  <xsl:param name="node"/>
-  <xsl:call-template name="db.number">
-    <xsl:with-param name="node" select="$node"/>
-  </xsl:call-template>
-</xsl:template>
-
 <template xmlns="http://www.gnome.org/~shaunm/xsldoc">
   <name>db.number</name>
   <purpose>
@@ -505,13 +521,6 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 <!-- == db.digit =========================================================== -->
 
-<xsl:template mode="l10n.format.mode" match="msg:digit">
-  <xsl:param name="node"/>
-  <xsl:call-template name="db.digit">
-    <xsl:with-param name="node" select="$node"/>
-  </xsl:call-template>
-</xsl:template>
-
 <xsl:template name="db.digit">
   <xsl:param name="node" select="."/>
   <xsl:apply-templates mode="db.digit.mode" select="$node"/>
@@ -698,12 +707,7 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 </xsl:template>
 
 
-<!-- == <msg:parent/> ====================================================== -->
-
-<xsl:template mode="l10n.format.mode" match="msg:parent">
-  <xsl:param name="node"/>
-  <xsl:apply-templates mode="db.number.parent.mode" select="$node"/>
-</xsl:template>
+<!-- == db.number.parent.mode ============================================== -->
 
 <xsl:template mode="db.number.parent.mode" match="*">
   <xsl:call-template name="db.number">
@@ -735,4 +739,38 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
   </xsl:call-template>
 </xsl:template>
 
+
+<!-- == msg:* ============================================================== -->
+
+<xsl:template mode="l10n.format.mode" match="msg:digit">
+  <xsl:param name="node"/>
+  <xsl:call-template name="db.digit">
+    <xsl:with-param name="node" select="$node"/>
+  </xsl:call-template>
+</xsl:template>
+
+<xsl:template mode="l10n.format.mode" match="msg:glossterm">
+  <xsl:param name="node"/>
+  <xsl:apply-templates select="$node/glossterm"/>
+</xsl:template>
+
+<xsl:template mode="l10n.format.mode" match="msg:label">
+  <xsl:param name="node"/>
+  <xsl:call-template name="db.label">
+    <xsl:with-param name="node" select="$node"/>
+  </xsl:call-template>
+</xsl:template>
+
+<xsl:template mode="l10n.format.mode" match="msg:number">
+  <xsl:param name="node"/>
+  <xsl:call-template name="db.number">
+    <xsl:with-param name="node" select="$node"/>
+  </xsl:call-template>
+</xsl:template>
+
+<xsl:template mode="l10n.format.mode" match="msg:parent">
+  <xsl:param name="node"/>
+  <xsl:apply-templates mode="db.number.parent.mode" select="$node"/>
+</xsl:template>
+
 </xsl:stylesheet>
diff --git a/xslt/docbook/common/db-title.xsl b/xslt/docbook/common/db-title.xsl
index 9dd3c294..cbb17ac3 100644
--- a/xslt/docbook/common/db-title.xsl
+++ b/xslt/docbook/common/db-title.xsl
@@ -156,6 +156,11 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
     <xsl:when test="bibliographyinfo/title">
       <xsl:apply-templates select="bibliographyinfo/title/node()"/>
     </xsl:when>
+    <xsl:otherwise>
+      <xsl:call-template name="l10n.gettext">
+        <xsl:with-param name="msgid" select="'Bibliography'"/>
+      </xsl:call-template>
+    </xsl:otherwise>
   </xsl:choose>
 </xsl:template>
 
@@ -484,6 +489,11 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
     <xsl:when test="bibliographyinfo/title">
       <xsl:apply-templates select="bibliographyinfo/title/node()"/>
     </xsl:when>
+    <xsl:otherwise>
+      <xsl:call-template name="l10n.gettext">
+        <xsl:with-param name="msgid" select="'Bibliography'"/>
+      </xsl:call-template>
+    </xsl:otherwise>
   </xsl:choose>
 </xsl:template>
 
diff --git a/xslt/docbook/common/db-xref.xsl b/xslt/docbook/common/db-xref.xsl
index fec0bd67..69440928 100644
--- a/xslt/docbook/common/db-xref.xsl
+++ b/xslt/docbook/common/db-xref.xsl
@@ -129,6 +129,32 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
   </xsl:call-template>
 </xsl:template>
 
+<!-- = biblioentry = -->
+<xsl:template mode="db.xref.content.mode" match="biblioentry">
+  <xsl:call-template name="db.label">
+    <xsl:with-param name="node" select="."/>
+  </xsl:call-template>
+</xsl:template>
+
+<!-- = bibliography = -->
+<xsl:template mode="db.xref.content.mode" match="bibliography">
+  <xsl:param name="xrefstyle"/>
+  <xsl:param name="role" select="substring-after($xrefstyle, 'role:')"/>
+  <xsl:call-template name="l10n.gettext">
+    <xsl:with-param name="msgid" select="'bibliography.xref'"/>
+    <xsl:with-param name="role" select="$role"/>
+    <xsl:with-param name="node" select="."/>
+    <xsl:with-param name="format" select="true()"/>
+  </xsl:call-template>
+</xsl:template>
+
+<!-- = bibliomixed = -->
+<xsl:template mode="db.xref.content.mode" match="bibliomixed">
+  <xsl:call-template name="db.label">
+    <xsl:with-param name="node" select="."/>
+  </xsl:call-template>
+</xsl:template>
+
 <!-- = book = -->
 <xsl:template mode="db.xref.content.mode" match="book">
   <xsl:param name="xrefstyle"/>
@@ -395,6 +421,14 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
   </xsl:call-template>
 </xsl:template>
 
+<xsl:template mode="db.xref.tooltip.mode" match="biblioentry | bibliomixed">
+  <xsl:call-template name="l10n.gettext">
+    <xsl:with-param name="msgid" select="'biblioentry.tooltip'"/>
+    <xsl:with-param name="node" select="."/>
+    <xsl:with-param name="format" select="true()"/>
+  </xsl:call-template>
+</xsl:template>
+
 <xsl:template mode="db.xref.tooltip.mode" match="glossentry">
   <xsl:call-template name="l10n.gettext">
     <xsl:with-param name="msgid" select="'glossentry.tooltip'"/>
diff --git a/xslt/docbook/html/db2html-bibliography.xsl b/xslt/docbook/html/db2html-bibliography.xsl
new file mode 100644
index 00000000..16ba6ad3
--- /dev/null
+++ b/xslt/docbook/html/db2html-bibliography.xsl
@@ -0,0 +1,283 @@
+<?xml version='1.0' encoding='UTF-8'?><!-- -*- indent-tabs-mode: nil -*- -->
+<!--
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU Lesser General Public License as published by the Free
+Software Foundation; either version 2 of the License, or (at your option) any
+later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this program; see the file COPYING.LGPL.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:doc="http://www.gnome.org/~shaunm/xsldoc"
+                xmlns="http://www.w3.org/1999/xhtml"
+                exclude-result-prefixes="doc"
+                version="1.0">
+
+<doc:title>Bibliographies</doc:title>
+
+
+<!-- == db2html.bibliography.css =============================================== -->
+
+<template xmlns="http://www.gnome.org/~shaunm/xsldoc">
+  <name>db2html.bibliography.css</name>
+  <purpose>
+    Create CSS for the bibliography elements
+  </purpose>
+</template>
+
+<xsl:template name="db2html.bibliography.css">
+  <xsl:text>
+    * + div[class~="biblioentry"] { margin-top: 1.2em; }
+    * + div[class~="bibliomixed"] { margin-top: 1.2em; }
+  </xsl:text>
+</xsl:template>
+
+
+<!-- = bibliography = -->
+<xsl:template match="bibliography">
+  <xsl:param name="depth_in_chunk">
+    <xsl:call-template name="db.chunk.depth-in-chunk"/>
+  </xsl:param>
+  <xsl:param name="depth_of_chunk">
+    <xsl:call-template name="db.chunk.depth-of-chunk"/>
+  </xsl:param>
+
+  <xsl:call-template name="db2html.division.div">
+    <xsl:with-param name="divisions" select="bibliodiv"/>
+    <xsl:with-param name="title_content">
+      <xsl:if test="not(title) and not(bibliographyinfo/title)">
+        <xsl:call-template name="l10n.gettext">
+          <xsl:with-param name="msgid" select="'Bibliography'"/>
+        </xsl:call-template>
+      </xsl:if>
+    </xsl:with-param>
+    <xsl:with-param name="info" select="glossaryinfo"/>
+    <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk"/>
+    <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
+    <xsl:with-param name="chunk_divisions" select="false()"/>
+  </xsl:call-template>
+</xsl:template>
+
+<!-- = bibliodiv = -->
+<xsl:template match="bibliodiv">
+  <xsl:param name="depth_in_chunk">
+    <xsl:call-template name="db.chunk.depth-in-chunk"/>
+  </xsl:param>
+  <xsl:param name="depth_of_chunk">
+    <xsl:call-template name="db.chunk.depth-of-chunk"/>
+  </xsl:param>
+  <xsl:call-template name="db2html.division.div">
+    <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk"/>
+    <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
+  </xsl:call-template>
+</xsl:template>
+
+<!-- = bibliomixed = -->
+<xsl:template match="bibliomixed">
+  <div class="bibliomixed block-indent">
+    <xsl:call-template name="db2html.anchor"/>
+    <xsl:choose>
+      <xsl:when test="*[1]/self::abbrev">
+        <xsl:call-template name="db.label">
+          <xsl:with-param name="node" select="."/>
+        </xsl:call-template>
+        <xsl:text> </xsl:text>
+        <xsl:apply-templates select="abbrev[1]/following-sibling::*"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:if test="@xreflabel | @id">
+          <xsl:call-template name="db.label">
+            <xsl:with-param name="node" select="."/>
+          </xsl:call-template>
+          <xsl:text> </xsl:text>
+        </xsl:if>
+        <xsl:apply-templates/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </div>
+</xsl:template>
+
+<!-- = bibliomset = -->
+<xsl:template match="bibliomset">
+  <xsl:call-template name="db2html.block"/>
+</xsl:template>
+
+<!-- = bibliomisc = -->
+<xsl:template match="bibliomisc">
+  <xsl:call-template name="db2html.inline"/>
+</xsl:template>
+
+
+<!--
+Cooked bibliography entries allow certain otherwise block-level
+elemets to be inline elements, so we special-case them here.
+-->
+
+<!-- = biblio*/abstract = -->
+<xsl:template match="bibliomixed/abstract | bibliomset/abstract">
+  <xsl:call-template name="db2html.inline"/>
+</xsl:template>
+
+<!-- = biblio*/address = -->
+<xsl:template match="bibliomixed/address | bibliomset/address">
+  <xsl:call-template name="db2html.inline"/>
+</xsl:template>
+
+<!-- = biblio*/affiliation = -->
+<xsl:template match="bibliomixed/affiliation | bibliomset/affiliation">
+  <xsl:call-template name="db2html.inline"/>
+</xsl:template>
+
+<!-- = biblio*/author = -->
+<xsl:template match="bibliomixed/author | bibliomset/author">
+  <xsl:call-template name="db2html.inline"/>
+</xsl:template>
+
+<!-- = biblio*/authorblurb = -->
+<xsl:template match="bibliomixed/authorblurb | bibliomset/authorblurb">
+  <xsl:call-template name="db2html.inline"/>
+</xsl:template>
+
+<!-- = biblio*/authorgroup = -->
+<xsl:template match="bibliomixed/authorgroup | bibliomset/authorgroup">
+  <xsl:call-template name="db2html.inline"/>
+</xsl:template>
+
+<!-- = biblio*/personblurb = -->
+<xsl:template match="bibliomixed/personblurb | bibliomset/personblurb">
+  <xsl:call-template name="db2html.inline"/>
+</xsl:template>
+
+<!-- = biblio*/shortaffil = -->
+<xsl:template match="bibliomixed/shortaffil | bibliomset/shortaffil">
+  <xsl:call-template name="db2html.inline"/>
+</xsl:template>
+
+<!-- = biblio*/title = -->
+<xsl:template match="bibliomixed/title | bibliomset/title">
+  <xsl:call-template name="db2html.inline">
+    <xsl:with-param name="italic" select="true()"/>
+  </xsl:call-template>
+</xsl:template>
+
+<!-- = refname = -->
+<!--
+<xsl:template match="refname">
+  <xsl:call-template name="db2html.inline"/>
+</xsl:template>
+-->
+
+<!-- = refnamediv = -->
+<!--
+<xsl:template match="refnamediv">
+  <div class="refnamediv">
+    <xsl:call-template name="db2html.anchor"/>
+    <xsl:for-each select="refname">
+      <xsl:if test="position() != 1">
+        <xsl:text>, </xsl:text>
+      </xsl:if>
+      <xsl:apply-templates select="."/>
+    </xsl:for-each>
+    <xsl:text> — </xsl:text>
+    <xsl:apply-templates select="refpurpose"/>
+  </div>
+</xsl:template>
+-->
+
+<!-- = refsection = -->
+<!--
+<xsl:template match="refsection">
+  <xsl:param name="depth_in_chunk">
+    <xsl:call-template name="db.chunk.depth-in-chunk"/>
+  </xsl:param>
+  <xsl:param name="depth_of_chunk">
+    <xsl:call-template name="db.chunk.depth-of-chunk"/>
+  </xsl:param>
+  <xsl:call-template name="db2html.division.div">
+    <xsl:with-param name="divisions" select="refsection"/>
+    <xsl:with-param name="info" select="refsectioninfo"/>
+    <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk"/>
+    <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
+    <xsl:with-param name="chunk_divisions" select="false()"/>
+  </xsl:call-template>
+</xsl:template>
+-->
+
+<!-- = refsynopsisdiv = -->
+<!--
+<xsl:template match="refsynopsisdiv">
+  <xsl:param name="depth_in_chunk">
+    <xsl:call-template name="db.chunk.depth-in-chunk"/>
+  </xsl:param>
+  <xsl:param name="depth_of_chunk">
+    <xsl:call-template name="db.chunk.depth-of-chunk"/>
+  </xsl:param>
+  <div class="refsynopsisdiv">
+    <xsl:call-template name="db2html.anchor"/>
+    <xsl:if test="not(title)">
+      <xsl:call-template name="db2html.title.header">
+        <xsl:with-param name="node" select="."/>
+        <xsl:with-param name="referent" select="."/>
+        <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk + 1"/>
+        <xsl:with-param name="referent_depth_in_chunk" select="$depth_in_chunk"/>
+        <xsl:with-param name="generate_label" select="false()"/>
+        <xsl:with-param name="title_content">
+          <xsl:call-template name="l10n.gettext">
+            <xsl:with-param name="msgid" select="'Synopsis'"/>
+          </xsl:call-template>
+        </xsl:with-param>
+      </xsl:call-template>
+    </xsl:if>
+    <xsl:apply-templates>
+      <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk + 1"/>
+    </xsl:apply-templates>
+  </div>
+</xsl:template>
+-->
+
+<!-- = title = -->
+<!--
+<xsl:template match="refsect1/title | refsect2/title   |
+                     refsect3/title | refsection/title ">
+  <xsl:param name="referent" select=".."/>
+  <xsl:param name="depth_in_chunk">
+    <xsl:call-template name="db.chunk.depth-in-chunk"/>
+  </xsl:param>
+  <xsl:param name="referent_depth_in_chunk">
+    <xsl:choose>
+      <xsl:when test="$referent = .">
+        <xsl:value-of select="$depth_in_chunk"/>
+      </xsl:when>
+      <xsl:when test="ancestor::* = $referent">
+        <xsl:value-of select="$depth_in_chunk -
+                      (count(ancestor::*) - count($referent/ancestor::*)) "/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="db.chunk.depth-in-chunk">
+          <xsl:with-param name="node" select="$referent"/>
+        </xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:param>
+  <xsl:param name="depth_of_chunk">
+    <xsl:call-template name="db.chunk.depth-of-chunk"/>
+  </xsl:param>
+  <xsl:call-template name="db2html.title.header">
+    <xsl:with-param name="referent" select="$referent"/>
+    <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk"/>
+    <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
+    <xsl:with-param name="generate_label" select="false()"/>
+  </xsl:call-template>
+</xsl:template>
+-->
+
+</xsl:stylesheet>
diff --git a/xslt/docbook/html/db2html-block.xsl b/xslt/docbook/html/db2html-block.xsl
index 1f44bdb4..0a2d44d8 100644
--- a/xslt/docbook/html/db2html-block.xsl
+++ b/xslt/docbook/html/db2html-block.xsl
@@ -434,11 +434,6 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
   </xsl:for-each>
 </xsl:template>
 
-<xsl:template mode="l10n.format.mode" match="msg:glosssterm">
-  <xsl:param name="node"/>
-  <xsl:apply-templates select="$node/glossterm"/>
-</xsl:template>
-
 <!-- = highlights = -->
 <xsl:template match="highlights">
   <xsl:call-template name="db2html.block"/>
diff --git a/xslt/docbook/html/db2html-css.xsl b/xslt/docbook/html/db2html-css.xsl
index eb7da725..6938acb0 100644
--- a/xslt/docbook/html/db2html-css.xsl
+++ b/xslt/docbook/html/db2html-css.xsl
@@ -35,6 +35,7 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
   <style>
     <xsl:call-template name="db2html.admon.css"/>
     <xsl:call-template name="db2html.autotoc.css"/>
+    <xsl:call-template name="db2html.bibliography.css"/>
     <xsl:call-template name="db2html.block.css"/>
     <xsl:call-template name="db2html.callout.css"/>
     <xsl:call-template name="db2html.cmdsynopsis.css"/>
diff --git a/xslt/docbook/html/db2html-division.xsl b/xslt/docbook/html/db2html-division.xsl
index 7216e804..5b0a9275 100644
--- a/xslt/docbook/html/db2html-division.xsl
+++ b/xslt/docbook/html/db2html-division.xsl
@@ -570,6 +570,17 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
   </xsl:call-template>
 </xsl:template>
 
+<!-- = bibliography = -->
+<xsl:template mode="db.chunk.content.mode" match="bibliography">
+  <xsl:param name="depth_of_chunk">
+    <xsl:call-template name="db.chunk.depth-of-chunk"/>
+  </xsl:param>
+  <xsl:call-template name="db2html.division.html">
+    <xsl:with-param name="info" select="bibliographyinfo"/>
+    <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
+  </xsl:call-template>
+</xsl:template>
+
 <!-- = book = -->
 <xsl:template mode="db.chunk.content.mode" match="book">
   <xsl:param name="depth_of_chunk">
@@ -802,7 +813,7 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
     <xsl:with-param name="entries" select="glossentry"/>
     <xsl:with-param name="divisions" select="glossdiv | bibliography"/>
     <xsl:with-param name="title_content">
-      <xsl:if test="not(title)">
+      <xsl:if test="not(title) and not(glossaryinfo/title)">
         <xsl:call-template name="l10n.gettext">
           <xsl:with-param name="msgid" select="'Glossary'"/>
         </xsl:call-template>
@@ -811,6 +822,7 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
     <xsl:with-param name="info" select="glossaryinfo"/>
     <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk"/>
     <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
+    <xsl:with-param name="chunk_divisions" select="false()"/>
   </xsl:call-template>
 </xsl:template>
 
diff --git a/xslt/docbook/html/db2html-inline.xsl b/xslt/docbook/html/db2html-inline.xsl
index 983d7035..84813286 100644
--- a/xslt/docbook/html/db2html-inline.xsl
+++ b/xslt/docbook/html/db2html-inline.xsl
@@ -133,6 +133,11 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
   <xsl:call-template name="db2html.inline"/>
 </xsl:template>
 
+<!-- = artpagenums = -->
+<xsl:template match="artpagenums">
+  <xsl:call-template name="db2html.inline"/>
+</xsl:template>
+
 <!-- = application = -->
 <xsl:template match="application">
   <xsl:call-template name="db2html.inline">
@@ -229,6 +234,11 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
   <xsl:call-template name="db2html.inline"/>
 </xsl:template>
 
+<!-- = edition = -->
+<xsl:template match="edition">
+  <xsl:call-template name="db2html.inline"/>
+</xsl:template>
+
 <!-- = email = -->
 <xsl:template match="email">
   <span class="email-punc">
@@ -408,6 +418,11 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
   </xsl:call-template>
 </xsl:template>
 
+<!-- = isbn = -->
+<xsl:template match="isbn">
+  <xsl:call-template name="db2html.inline"/>
+</xsl:template>
+
 <!-- = jobtitle = -->
 <xsl:template match="jobtitle">
   <xsl:call-template name="db2html.inline"/>
@@ -611,6 +626,16 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
   <xsl:call-template name="db2html.inline"/>
 </xsl:template>
 
+<!-- = pubdate = -->
+<xsl:template match="pubdate">
+  <xsl:call-template name="db2html.inline"/>
+</xsl:template>
+
+<!-- = publishername = -->
+<xsl:template match="publishername">
+  <xsl:call-template name="db2html.inline"/>
+</xsl:template>
+
 <!-- = quote = -->
 <xsl:template match="quote">
   <span class="quote">
diff --git a/xslt/docbook/html/db2html-suppressed.xsl b/xslt/docbook/html/db2html-suppressed.xsl
index ac73ce0f..0aaf4549 100644
--- a/xslt/docbook/html/db2html-suppressed.xsl
+++ b/xslt/docbook/html/db2html-suppressed.xsl
@@ -96,7 +96,6 @@ modes because of the DocBook content model.
 <xsl:template match="othercredit"/>
 <xsl:template match="personblurb"/>
 <xsl:template match="publisher"/>
-<xsl:template match="publishername"/>
 <xsl:template match="revdescription"/>
 <xsl:template match="revhistory"/>
 <xsl:template match="revision"/>
diff --git a/xslt/docbook/html/db2html.xsl b/xslt/docbook/html/db2html.xsl
index f4bf1917..4f62c357 100644
--- a/xslt/docbook/html/db2html.xsl
+++ b/xslt/docbook/html/db2html.xsl
@@ -40,6 +40,9 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 <xsl:include href="db2html-autotoc.xsl"
              doc:summary="true"
              doc:include="true"/>
+<xsl:include href="db2html-bibliography.xsl"
+             doc:summary="true"
+             doc:include="true"/>
 <xsl:include href="db2html-block.xsl"
              doc:summary="true"
              doc:include="true"/>
diff --git a/xslt/gettext/l10n.xml.in b/xslt/gettext/l10n.xml.in
index dd22236b..d968ec50 100644
--- a/xslt/gettext/l10n.xml.in
+++ b/xslt/gettext/l10n.xml.in
@@ -55,6 +55,11 @@
   </_msg>
 </msgset>
 <msgset>
+  <msgid>Bibliography</msgid>
+  <!-- Used as a title for a bibliography. -->
+  <_msg>Bibliography</_msg>
+</msgset>
+<msgset>
   <msgid>Caution</msgid>
   <!--
   http://www.docbook.org/tdg/en/html/caution.html
@@ -241,6 +246,14 @@
   <_msg>Tip</_msg>
 </msgset>
 <msgset>
+  <msgid>Translator</msgid>
+  <!-- Used as a header before a list of translators. -->
+  <_msg>
+    <msgstr form='0'>Translator</msgstr>
+    <msgstr form='1'>Translators</msgstr>
+  </_msg>
+</msgset>
+<msgset>
   <msgid>Warning</msgid>
   <!--
   http://www.docbook.org/tdg/en/html/warning.html
@@ -395,6 +408,80 @@
   </_msg>
 </msgset>
 
+<!-- == biblioentry == -->
+<msgset>
+  <msgid>biblioentry.tooltip</msgid>
+  <!--
+  This is a special format message.  Please read the full translator
+  documentation before translating this message.  The documentation
+  is maintained as part of the stylesheet documentation in DocBook.
+  For your convenience, it has also been converted to an HTML file
+  named STYLESHEETS.xml in the i18n directory.
+
+  This is a format message used to format tooltips on cross references
+  to bibliography entries.
+
+  Special elements in the message will be replaced with the
+  appropriate content, as follows:
+
+  label - The term being defined by the glossary entry
+
+  These should be written as empty XML elements.  Due to limitations
+  in intltool, I can't write XML content in translator comments.  To
+  insert the label, simply write left angle bracket, label,  slash,
+  right angle bracket.
+
+  Additionally, format messages can use the i, b, and tt markup tags
+  to mark text as italic, bold, and monospace.
+  -->  
+  <_msg>
+    <msgid>biblioentry.tooltip</msgid>
+    <msgstr>View the biblioraphy entry <label/>.</msgstr>
+  </_msg>
+</msgset>
+
+<!-- == bibliography == -->
+<msgset>
+  <msgid>bibliography.xref</msgid>
+  <!--
+  This is a special format message.  Please read the full translator
+  documentation before translating this message.  The documentation
+  is maintained as part of the stylesheet documentation in DocBook.
+  For your convenience, it has also been converted to an HTML file
+  named STYLESHEETS.xml in the i18n directory.
+
+  This is a format message used to format cross references to bibliographies.
+  Multiple roles can be provided to allow document translators to select
+  how to format each cross reference using the xrefstyle attribute.  If
+  your language needs to provide different cross reference formattings
+  for different parts of speech, you should provide multiple roles for
+  cross reference formatters.
+
+  Special elements in the message will be replaced with the
+  appropriate content, as follows:
+
+  title       - The title of the figure
+  titleabbrev - The titleabbrev of the figure, or just the title
+                if no titleabbrev exists
+
+  These should be written as empty XML elements.  Due to limitations
+  in intltool, I can't write XML content in translator comments.  To
+  insert the title, simply write left angle bracket, title, slash,
+  right angle bracket.
+
+  Note that authors are not required to provide explicit titles for
+  bibliographies.  If the author does not provide a title, the
+  translatable string 'Bibliography' is used as a default.
+
+  Additionally, format messages can use the i, b, and tt markup tags
+  to mark text as italic, bold, and monospace.
+  -->  
+  <_msg>
+    <msgid>bibliography.xref</msgid>
+    <msgstr><title/></msgstr>
+  </_msg>
+</msgset>
+
 <!-- == book == -->
 <msgset>
   <msgid>book.digit</msgid>