From c8014bfb131ed4d694b33cdda2237a9573c5edbf Mon Sep 17 00:00:00 2001
From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Wed, 11 May 2005 08:30:41 +0000
Subject: [PATCH] Handle email in info section apprpropriately. Replace "Man
 page edited by Foo." with "Foo. (man page)"

---
 xsl/manpages/docbook.xsl | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/xsl/manpages/docbook.xsl b/xsl/manpages/docbook.xsl
index 50303b5b7..148c561ac 100644
--- a/xsl/manpages/docbook.xsl
+++ b/xsl/manpages/docbook.xsl
@@ -278,22 +278,27 @@
     <xsl:if test="position() > 1">
       <xsl:text>, </xsl:text>
     </xsl:if>
-    <xsl:variable name="author">
-      <xsl:apply-templates select="."/>
-    </xsl:variable>
-    <xsl:value-of select="normalize-space($author)"/>    
+    <xsl:apply-templates select="."/>
   </xsl:for-each>
-  <xsl:text>.&#10;</xsl:text>
+  <xsl:text>. &#10;</xsl:text>
   <xsl:if test=".//editor">
-    <xsl:text>.br&#10;Man page edited by </xsl:text>
+    <xsl:text>.br&#10;</xsl:text>
     <xsl:apply-templates select=".//editor"/>
-    <xsl:text>.&#10;</xsl:text>
+    <xsl:text>. (man page)&#10;</xsl:text>
   </xsl:if>
+  <xsl:for-each select="address">
+  <xsl:text>.br&#10;</xsl:text>
+    <xsl:apply-templates/>
+    <xsl:text>&#10;</xsl:text>
+  </xsl:for-each>
 </xsl:template>
 
 <xsl:template match="author|editor">
   <xsl:call-template name="person.name"/>
-  <xsl:apply-templates select="./affiliation/address/email" />
+  <xsl:if test=".//email">
+    <xsl:text> </xsl:text>
+    <xsl:apply-templates select=".//email"/>
+  </xsl:if>
 </xsl:template>
 
 <xsl:template match="copyright">
@@ -303,7 +308,7 @@
 </xsl:template>
 
 <xsl:template match="email">
-  <xsl:text> &lt;</xsl:text>
+  <xsl:text>&lt;</xsl:text>
   <xsl:apply-templates/>
   <xsl:text>&gt;</xsl:text>
 </xsl:template>
-- 
2.50.1