- Some fixes for HTML generation

* gnome-doc-utils.make:
- Some fixes for HTML generation

* xslt/docbook/common/db-xref.xsl:
* xslt/gettext/gettext.xsl:
* xslt/gettext/l10n.xml.in:
- Fixed the email tooltip formatter

* xslt/docbook/html/db2html-inline.xsl:
- Don't put content before attributes, dummy

6 files changed, 119 insertions, 106 deletions

diff --git a/ChangeLog b/ChangeLog
index 96aaa9a..521ec62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2006-04-15  Shaun McCance  <shaunm@gnome.org>
+
+	* gnome-doc-utils.make:
+	- Some fixes for HTML generation
+
+	* xslt/docbook/common/db-xref.xsl:
+	* xslt/gettext/gettext.xsl:
+	* xslt/gettext/l10n.xml.in:
+	- Fixed the email tooltip formatter
+
+	* xslt/docbook/html/db2html-inline.xsl:
+	- Don't put content before attributes, dummy
+
 2006-03-29  Rhys Jones <rhys@sucs.org>
 
 	* configure.in: Added Welsh (cy) to ALL_LINGUAS.
diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make
index cb03f18..cc26d75 100644
--- a/gnome-doc-utils.make
+++ b/gnome-doc-utils.make
@@ -225,57 +225,20 @@ _DOC_OMF_HTML = $(if $(_DOC_OMF_IN),						\
 
 $(_DOC_OMF_HTML) : $(_DOC_OMF_IN)
 $(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml
-	xsltproc -o $@ $(call db2omf_args,$@,$<,'html')
+	xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml')
 
 ## @ _DOC_OMF_ALL
 ## All OMF output files to be built
 # FIXME
 _DOC_OMF_ALL =									\
-	$(if $(findstring docbook,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_DB))		\
-	$(if $(findstring html,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_HTML))
+	$(if $(filter docbook,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_DB))		\
+	$(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_HTML))
 
 .PHONY: omf
 omf: $(_DOC_OMF_ALL)
 
 
 ################################################################################
-## @@ Rules for Desktop Entry Files
-
-## @ _DOC_DSK_IN
-## The desktop entry input file
-_DOC_DSK_IN = $(if $(DOC_MODULE),$(wildcard $(srcdir)/$(DOC_MODULE).desktop.in))
-
-## @ _DOC_DSK_DB
-## The desktop entry files for DocBook output
-_DOC_DSK_DB = $(if $(_DOC_DSK_IN),						\
-	$(foreach lc,C $(DOC_LINGUAS),$(DOC_MODULE).db.$(lc).desktop))
-
-# FIXME
-$(_DOC_DSK_DB) : $(_DOC_DSK_IN)
-$(_DOC_DSK_DB) : $(DOC_MODULE).db.%.desktop : %/$(DOC_MODULE).xml
-	cp $(_DOC_DSK_IN) $@
-
-## @ _DOC_DSK_HTML
-## The desktop entry files for HTML output
-_DOC_DSK_HTML = $(if $(_DOC_DSK_IN),						\
-	$(foreach lc,C $(DOC_LINGUAS),$(DOC_MODULE).html.$(lc).desktop))
-
-$(_DOC_DSK_HTML) : $(_DOC_DSK_IN)
-$(_DOC_DSK_HTML) : $(DOC_MODULE).html.%.desktop : %/$(DOC_MODULE).xml
-	cp $(_DOC_DSK_IN) $@
-
-## @ _DOC_DSK_ALL
-## All desktop entry output files to be built
-# FIXME
-_DOC_DSK_ALL =									\
-	$(if $(findstring docbook,$(_DOC_REAL_FORMATS)),$(_DOC_DSK_DB))		\
-	$(if $(findstring html,$(_DOC_REAL_FORMATS)),$(_DOC_DSK_HTML))
-
-.PHONY: dsk
-dsk: $(_DOC_DSK_ALL)
-
-
-################################################################################
 ## @@ Rules for .cvsignore Files
 
 ## @ _CVSIGNORE_TOP
@@ -373,9 +336,11 @@ _DOC_C_FIGURES = $(if $(DOC_FIGURES),					\
 ## @ _DOC_C_HTML
 ## All HTML documentation in the C locale
 # FIXME: probably have to shell escape to determine the file names
-_DOC_C_HTML = $(shell xsltproc --xinclude 				\
-	--stringparam db.chunk.basename "$(DOC_MODULE)"			\
-	$(_chunks) "C/$(DOC_MODULE).xml")
+_DOC_C_HTML = $(foreach f,						\
+	$(shell xsltproc --xinclude 					\
+	  --stringparam db.chunk.basename "$(DOC_MODULE)"		\
+	  $(_chunks) "C/$(DOC_MODULE).xml"),				\
+	C/$(f).xhtml)
 
 ###############################################################################
 ## @@ Other Locale Documentation
@@ -423,7 +388,7 @@ _DOC_LC_HTML =								\
 _DOC_LC_DOCS =								\
 	$(_DOC_LC_MODULES)	$(_DOC_LC_INCLUDES)			\
 	$(_RNGDOC_LC_DOCS)	$(_XSLDOC_LC_DOCS)			\
-	$(if $(findstring html,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML))
+	$(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML))
 
 ## @ _DOC_LC_FIGURES
 ## All figures and other external data in all other locales
@@ -492,13 +457,13 @@ $(_DOC_POT): $(_DOC_C_DOCS_NOENT)
 
 ## @ _DOC_HTML_ALL
 ## All HTML documentation, only if it's built
-_DOC_HTML_ALL = $(if $(findstring html,$(_DOC_REAL_FORMATS)), \
+_DOC_HTML_ALL = $(if $(filter html HTML,$(_DOC_REAL_FORMATS)), \
 	$(_DOC_C_HTML) $(_DOC_LC_HTML))
 
-_DOC_HTML_TOPS = $(foreach lc,C $(DOC_LINGUAS),$(lc)/$(DOC_MODULE).html)
+_DOC_HTML_TOPS = $(foreach lc,C $(DOC_LINGUAS),$(lc)/$(DOC_MODULE).xhtml)
 
 $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
-	xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".html" $(_db2html) $(patsubst %.html,%.xml,$@)
+	xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
 
 
 ################################################################################
diff --git a/xslt/docbook/common/db-xref.xsl b/xslt/docbook/common/db-xref.xsl
index 6471645..f7d7592 100644
--- a/xslt/docbook/common/db-xref.xsl
+++ b/xslt/docbook/common/db-xref.xsl
@@ -39,18 +39,10 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
   <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: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:call-template name="l10n.gettext">
+        <xsl:with-param name="msgid" select="'email.tooltip'"/>
+        <xsl:with-param name="string" select="$addy"/>
+        <xsl:with-param name="format" select="true()"/>
       </xsl:call-template>
     </xsl:when>
     <xsl:otherwise>
diff --git a/xslt/docbook/html/db2html-inline.xsl b/xslt/docbook/html/db2html-inline.xsl
index 8481328..162710d 100644
--- a/xslt/docbook/html/db2html-inline.xsl
+++ b/xslt/docbook/html/db2html-inline.xsl
@@ -72,37 +72,32 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
   <xsl:param name="sans" select="false()"/>
 
   <span class="{local-name(.)}">
+    <xsl:if test="$bold or $italic or $mono or $underline or $sans">
+      <xsl:variable name="style">
+        <xsl:if test="$bold">
+          <xsl:text>font-weight: bold; </xsl:text>
+        </xsl:if>
+        <xsl:if test="$italic">
+          <xsl:text>font-style: italic; </xsl:text>
+        </xsl:if>
+        <xsl:if test="$underline">
+          <xsl:text>text-decoration: underline; </xsl:text>
+        </xsl:if>
+        <xsl:choose>
+          <xsl:when test="$mono">
+            <xsl:text>font-family: monospace; </xsl:text>
+          </xsl:when>
+          <xsl:when test="$sans">
+            <xsl:text>font-family: sans-serif; </xsl:text>
+          </xsl:when>
+        </xsl:choose>
+      </xsl:variable>
+      <xsl:attribute name="style">
+        <xsl:value-of select="$style"/>
+      </xsl:attribute>
+    </xsl:if>
     <xsl:call-template name="db2html.anchor"/>
-    <xsl:choose>
-      <xsl:when test="$bold or $italic or $mono or $underline or $sans">
-        <xsl:variable name="style">
-          <xsl:if test="$bold">
-            <xsl:text>font-weight: bold; </xsl:text>
-          </xsl:if>
-          <xsl:if test="$italic">
-            <xsl:text>font-style: italic; </xsl:text>
-          </xsl:if>
-          <xsl:if test="$underline">
-            <xsl:text>text-decoration: underline; </xsl:text>
-          </xsl:if>
-          <xsl:choose>
-            <xsl:when test="$mono">
-              <xsl:text>font-family: monospace; </xsl:text>
-            </xsl:when>
-            <xsl:when test="$sans">
-              <xsl:text>font-family: sans-serif; </xsl:text>
-            </xsl:when>
-          </xsl:choose>
-        </xsl:variable>
-        <xsl:attribute name="style">
-          <xsl:value-of select="$style"/>
-        </xsl:attribute>
-        <xsl:apply-templates/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates/>
-      </xsl:otherwise>
-    </xsl:choose>
+    <xsl:apply-templates/>
   </span>
 </xsl:template>
 
diff --git a/xslt/gettext/gettext.xsl b/xslt/gettext/gettext.xsl
index c31f611..cc13199 100644
--- a/xslt/gettext/gettext.xsl
+++ b/xslt/gettext/gettext.xsl
@@ -231,8 +231,9 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
       <xsl:with-param name="lang_charset"  select="$lang_charset"/>
     </xsl:call-template>
   </xsl:param>
-  <xsl:param name="role"/>
   <xsl:param name="node" select="."/>
+  <xsl:param name="role"/>
+  <xsl:param name="string"/>
   <xsl:param name="format" select="false()"/>
 
   <xsl:for-each select="$l10n">
@@ -251,8 +252,9 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
                                                      '@', $lang_variant,
                                                      '.', $lang_charset))"/>
           <xsl:with-param name="form" select="$form"/>
-          <xsl:with-param name="role" select="$role"/>
           <xsl:with-param name="node" select="$node"/>
+          <xsl:with-param name="role" select="$role"/>
+          <xsl:with-param name="string" select="$string"/>
           <xsl:with-param name="format" select="$format"/>
         </xsl:call-template>
       </xsl:when>
@@ -268,8 +270,9 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
                                      $lang_language, '_', $lang_region,
                                                      '@', $lang_variant))"/>
           <xsl:with-param name="form" select="$form"/>
-          <xsl:with-param name="role" select="$role"/>
           <xsl:with-param name="node" select="$node"/>
+          <xsl:with-param name="role" select="$role"/>
+          <xsl:with-param name="string" select="$string"/>
           <xsl:with-param name="format" select="$format"/>
         </xsl:call-template>
       </xsl:when>
@@ -285,8 +288,9 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
                                      $lang_language, '@', $lang_variant,
                                                      '.', $lang_charset))"/>
           <xsl:with-param name="form" select="$form"/>
-          <xsl:with-param name="role" select="$role"/>
           <xsl:with-param name="node" select="$node"/>
+          <xsl:with-param name="role" select="$role"/>
+          <xsl:with-param name="string" select="$string"/>
           <xsl:with-param name="format" select="$format"/>
         </xsl:call-template>
       </xsl:when>
@@ -300,8 +304,9 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
            select="key('msg', concat($msgid, '__LC__',
                                      $lang_language, '@', $lang_variant))"/>
           <xsl:with-param name="form" select="$form"/>
-          <xsl:with-param name="role" select="$role"/>
           <xsl:with-param name="node" select="$node"/>
+          <xsl:with-param name="role" select="$role"/>
+          <xsl:with-param name="string" select="$string"/>
           <xsl:with-param name="format" select="$format"/>
         </xsl:call-template>
       </xsl:when>
@@ -317,8 +322,9 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
                                      $lang_language, '_', $lang_region,
                                                      '.', $lang_charset))"/>
           <xsl:with-param name="form" select="$form"/>
-          <xsl:with-param name="role" select="$role"/>
           <xsl:with-param name="node" select="$node"/>
+          <xsl:with-param name="role" select="$role"/>
+          <xsl:with-param name="string" select="$string"/>
           <xsl:with-param name="format" select="$format"/>
         </xsl:call-template>
       </xsl:when>
@@ -332,8 +338,9 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
            select="key('msg', concat($msgid, '__LC__',
                                      $lang_language, '_', $lang_region))"/>
           <xsl:with-param name="form" select="$form"/>
-          <xsl:with-param name="role" select="$role"/>
           <xsl:with-param name="node" select="$node"/>
+          <xsl:with-param name="role" select="$role"/>
+          <xsl:with-param name="string" select="$string"/>
           <xsl:with-param name="format" select="$format"/>
         </xsl:call-template>
       </xsl:when>
@@ -347,8 +354,9 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
            select="key('msg', concat($msgid, '__LC__',
                                      $lang_language, '.', $lang_charset))"/>
           <xsl:with-param name="form" select="$form"/>
-          <xsl:with-param name="role" select="$role"/>
           <xsl:with-param name="node" select="$node"/>
+          <xsl:with-param name="role" select="$role"/>
+          <xsl:with-param name="string" select="$string"/>
           <xsl:with-param name="format" select="$format"/>
         </xsl:call-template>
       </xsl:when>
@@ -359,8 +367,9 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
            name="msg"
            select="key('msg', concat($msgid, '__LC__', $lang_language))"/>
           <xsl:with-param name="form" select="$form"/>
-          <xsl:with-param name="role" select="$role"/>
           <xsl:with-param name="node" select="$node"/>
+          <xsl:with-param name="role" select="$role"/>
+          <xsl:with-param name="string" select="$string"/>
           <xsl:with-param name="format" select="$format"/>
         </xsl:call-template>
       </xsl:when>
@@ -370,8 +379,9 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
           <xsl:with-param
            name="msg" select="key('msg', concat($msgid, '__LC__C'))"/>
           <xsl:with-param name="form" select="$form"/>
-          <xsl:with-param name="role" select="$role"/>
           <xsl:with-param name="node" select="$node"/>
+          <xsl:with-param name="role" select="$role"/>
+          <xsl:with-param name="string" select="$string"/>
           <xsl:with-param name="format" select="$format"/>
         </xsl:call-template>
       </xsl:when>
@@ -381,8 +391,9 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
           <xsl:with-param
            name="msg" select="key('msg', concat($msgid, '__LC__'))"/>
           <xsl:with-param name="form" select="$form"/>
-          <xsl:with-param name="role" select="$role"/>
           <xsl:with-param name="node" select="$node"/>
+          <xsl:with-param name="role" select="$role"/>
+          <xsl:with-param name="string" select="$string"/>
           <xsl:with-param name="format" select="$format"/>
         </xsl:call-template>
       </xsl:when>
@@ -401,14 +412,17 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 <xsl:template name="l10n.gettext.msg" doc:private="true">
   <xsl:param name="msg"/>
   <xsl:param name="form"/>
-  <xsl:param name="role"/>
   <xsl:param name="node" select="."/>
+  <xsl:param name="role"/>
+  <xsl:param name="string"/>
   <xsl:param name="format" select="false()"/>
   <xsl:choose>
     <xsl:when test="not($msg/msg:msgstr)">
       <xsl:call-template name="l10n.gettext.msgstr">
         <xsl:with-param name="msgstr" select="$msg"/>
         <xsl:with-param name="node" select="$node"/>
+        <xsl:with-param name="role" select="$role"/>
+        <xsl:with-param name="string" select="$string"/>
         <xsl:with-param name="format" select="$format"/>
       </xsl:call-template>
     </xsl:when>
@@ -423,6 +437,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
                 <xsl:with-param name="msgstr"
                                 select="msgstr_form[@role = $role][1]"/>
                 <xsl:with-param name="node" select="$node"/>
+                <xsl:with-param name="role" select="$role"/>
+                <xsl:with-param name="string" select="$string"/>
                 <xsl:with-param name="format" select="$format"/>
               </xsl:call-template>
             </xsl:when>
@@ -431,6 +447,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
                 <xsl:with-param name="msgstr"
                                 select="msgstr_form[not(@role)][1]"/>
                 <xsl:with-param name="node" select="$node"/>
+                <xsl:with-param name="role" select="$role"/>
+                <xsl:with-param name="string" select="$string"/>
                 <xsl:with-param name="format" select="$format"/>
               </xsl:call-template>
             </xsl:when>
@@ -439,6 +457,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
                 <xsl:with-param name="msgstr"
                                 select="msgstr_form[1]"/>
                 <xsl:with-param name="node" select="$node"/>
+                <xsl:with-param name="role" select="$role"/>
+                <xsl:with-param name="string" select="$string"/>
                 <xsl:with-param name="format" select="$format"/>
               </xsl:call-template>
             </xsl:otherwise>
@@ -451,6 +471,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
                 <xsl:with-param name="msgstr"
                                 select="$msg/msg:msgstr[@role = $role][1]"/>
                 <xsl:with-param name="node" select="$node"/>
+                <xsl:with-param name="role" select="$role"/>
+                <xsl:with-param name="string" select="$string"/>
                 <xsl:with-param name="format" select="$format"/>
               </xsl:call-template>
             </xsl:when>
@@ -459,6 +481,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
                 <xsl:with-param name="msgstr"
                                 select="$msg/msg:msgstr[not(@role)][1]"/>
                 <xsl:with-param name="node" select="$node"/>
+                <xsl:with-param name="role" select="$role"/>
+                <xsl:with-param name="string" select="$string"/>
                 <xsl:with-param name="format" select="$format"/>
               </xsl:call-template>
             </xsl:when>
@@ -467,6 +491,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
                 <xsl:with-param name="msgstr"
                                 select="$msg/msg:msgstr[1]"/>
                 <xsl:with-param name="node" select="$node"/>
+                <xsl:with-param name="role" select="$role"/>
+                <xsl:with-param name="string" select="$string"/>
                 <xsl:with-param name="format" select="$format"/>
               </xsl:call-template>
             </xsl:otherwise>
@@ -481,6 +507,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
             <xsl:with-param name="msgstr"
                             select="$msg/msg:msgstr[@form = $form][1]"/>
             <xsl:with-param name="node" select="$node"/>
+            <xsl:with-param name="role" select="$role"/>
+            <xsl:with-param name="string" select="$string"/>
             <xsl:with-param name="format" select="$format"/>
           </xsl:call-template>
         </xsl:when>
@@ -489,6 +517,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
             <xsl:with-param name="msgstr"
                             select="$msg/msg:msgstr[not(@form)][1]"/>
             <xsl:with-param name="node" select="$node"/>
+            <xsl:with-param name="role" select="$role"/>
+            <xsl:with-param name="string" select="$string"/>
             <xsl:with-param name="format" select="$format"/>
           </xsl:call-template>
         </xsl:when>
@@ -496,6 +526,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
           <xsl:call-template name="l10n.gettext.msgstr">
             <xsl:with-param name="msgstr" select="$msg/msg:msgstr[1]"/>
             <xsl:with-param name="node" select="$node"/>
+            <xsl:with-param name="role" select="$role"/>
+            <xsl:with-param name="string" select="$string"/>
             <xsl:with-param name="format" select="$format"/>
           </xsl:call-template>
         </xsl:otherwise>
@@ -508,6 +540,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
             <xsl:with-param name="msgstr"
                             select="$msg/msg:msgstr[@role = $role][1]"/>
             <xsl:with-param name="node" select="$node"/>
+            <xsl:with-param name="role" select="$role"/>
+            <xsl:with-param name="string" select="$string"/>
             <xsl:with-param name="format" select="$format"/>
           </xsl:call-template>
         </xsl:when>
@@ -516,6 +550,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
             <xsl:with-param name="msgstr"
                             select="$msg/msg:msgstr[not(@role)][1]"/>
             <xsl:with-param name="node" select="$node"/>
+            <xsl:with-param name="role" select="$role"/>
+            <xsl:with-param name="string" select="$string"/>
             <xsl:with-param name="format" select="$format"/>
           </xsl:call-template>
         </xsl:when>
@@ -523,6 +559,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
           <xsl:call-template name="l10n.gettext.msgstr">
             <xsl:with-param name="msgstr" select="$msg/msg:msgstr[1]"/>
             <xsl:with-param name="node" select="$node"/>
+            <xsl:with-param name="role" select="$role"/>
+            <xsl:with-param name="string" select="$string"/>
             <xsl:with-param name="format" select="$format"/>
           </xsl:call-template>
         </xsl:otherwise>
@@ -532,6 +570,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
       <xsl:call-template name="l10n.gettext.msgstr">
         <xsl:with-param name="msgstr" select="$msg/msg:msgstr[1]"/>
         <xsl:with-param name="node" select="$node"/>
+        <xsl:with-param name="role" select="$role"/>
+        <xsl:with-param name="string" select="$string"/>
         <xsl:with-param name="format" select="$format"/>
       </xsl:call-template>
     </xsl:otherwise>
@@ -541,11 +581,15 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 <xsl:template name="l10n.gettext.msgstr" doc:private="true">
   <xsl:param name="msgstr"/>
   <xsl:param name="node" select="."/>
+  <xsl:param name="role"/>
+  <xsl:param name="string"/>
   <xsl:param name="format" select="false()"/>
   <xsl:choose>
     <xsl:when test="$format">
       <xsl:apply-templates mode="l10n.format.mode" select="$msgstr/node()">
         <xsl:with-param name="node" select="$node"/>
+        <xsl:with-param name="role" select="$role"/>
+        <xsl:with-param name="string" select="$string"/>
       </xsl:apply-templates>
     </xsl:when>
     <xsl:otherwise>
@@ -1003,4 +1047,9 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
   <xsl:apply-templates select="$node/node()"/>
 </xsl:template>
 
+<xsl:template mode="l10n.format.mode" match="msg:string">
+  <xsl:param name="string"/>
+  <xsl:value-of select="$string"/>
+</xsl:template>
+
 </xsl:stylesheet>
diff --git a/xslt/gettext/l10n.xml.in b/xslt/gettext/l10n.xml.in
index 771473b..d54eb4b 100644
--- a/xslt/gettext/l10n.xml.in
+++ b/xslt/gettext/l10n.xml.in
@@ -747,20 +747,19 @@
   Special elements in the message will be replaced with the
   appropriate content, as follows:
 
-  node - The contents of the email element, which should be the
-         linked-to email address
+  string - The linked-to email address
 
   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 node, simply write left angle bracket, node, slash,
-  right angle bracket.
+  insert the email address, simply write left angle bracket, string,
+  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>email.tooltip</msgid>
-    <msgstr>Send email to ‘<node/>’.</msgstr>
+    <msgstr>Send email to ‘<string/>’.</msgstr>
   </_msg>
 </msgset>