Small bug fixes for gnome-doc-utils

[Peter Williams <peter newton cx>]

Hi,

Attached are patches that fix two small bugs in the db2html stylesheets
in gnome-doc-utils. One fixes the generation of copyright info in the
title page. It's pretty straightforward and the output looks good to me.

The second fixes an error that I ran into -- there's a place in the
stylesheets that still references the old 'format.foo' templates. I've
replaced it with what I *think* is correct, but I haven't been able to
check the output. The ChangeLog for this one is in a separate patch that
I'll send soon.

Peter

-- 
Peter Williams / peter newton cx

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-doc-utils/ChangeLog,v
retrieving revision 1.298
diff -u -r1.298 ChangeLog
--- ChangeLog	18 Dec 2005 20:39:56 -0000	1.298
+++ ChangeLog	20 Dec 2005 21:58:15 -0000
@@ -33,6 +42,11 @@
 
 	* xslt/gettext/l10n-numbers.xsl:
 	- Japanese ideographic numbers
+
+2005-12-03  Peter Williams  <peter newton cx>
+
+	* xslt/docbook/html/db2html-info.xsl: Fix generation of
+	copyright information.
 
 2005-11-28  Peter Williams  <peter newton cx>
 
Index: xslt/docbook/html/db2html-info.xsl
===================================================================
RCS file: /cvs/gnome/gnome-doc-utils/xslt/docbook/html/db2html-info.xsl,v
retrieving revision 1.19
diff -u -r1.19 db2html-info.xsl
--- xslt/docbook/html/db2html-info.xsl	11 Jul 2005 00:39:08 -0000	1.19
+++ xslt/docbook/html/db2html-info.xsl	20 Dec 2005 21:58:15 -0000
@@ -474,7 +474,7 @@
 <xsl:template name="db2html.info.copyrights">
   <xsl:param name="node" select="."/>
   <xsl:param name="info" select="'FIXME'"/>
-  <xsl:variable name="copyrights" select="$info/copyrights"/>
+  <xsl:variable name="copyrights" select="$info/copyright"/>
   <xsl:if test="$copyrights">
     <div>
       <h2 class="copyright">
@@ -484,7 +484,7 @@
         </xsl:call-template>
       </h2>
       <dl>
-        <xsl:apply-templates mode="db2html.info.mode" select="$copyrigths"/>
+        <xsl:apply-templates mode="db2html.info.mode" select="$copyrights"/>
       </dl>
     </div>
   </xsl:if>

Index: xslt/docbook/common/db-xref.xsl
===================================================================
RCS file: /cvs/gnome/gnome-doc-utils/xslt/docbook/common/db-xref.xsl,v
retrieving revision 1.20
diff -u -r1.20 db-xref.xsl
--- xslt/docbook/common/db-xref.xsl	18 Dec 2005 20:09:09 -0000	1.20
+++ xslt/docbook/common/db-xref.xsl	20 Dec 2005 21:58:15 -0000
@@ -39,18 +39,10 @@
   <xsl:choose>
     <xsl:when test="starts-with($url, 'mailto:')">
       <xsl:variable name="addy" select="substring-after($url, 'mailto:')"/>
-      <xsl:call-template name="format.tooltip.mailto">
+      <xsl:call-template name="l10n.gettext">
+        <xsl:with-param name="msgid" select="'email.tooltip'"/>
         <xsl:with-param name="node" select="$node"/>
-        <xsl:with-param name="address">
-          <xsl:choose>
-            <xsl:when test="contains($addy, '?')">
-              <xsl:value-of select="substring-before($addy, '?')"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="$addy"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:with-param>
+        <xsl:with-param name="format" select="true()"/>
       </xsl:call-template>
     </xsl:when>
     <xsl:otherwise>