Changes for request #1243027, "Impove handling of AUTHOR section."

This adds support for Collab, Corpauthor, Corpcredt, Orgname,
Publishername, and Publisher. Also adds support for output of
Affiliation and its children, and support for using gentext
strings for auto-attributing roles (Author, Editor, Publisher,
Translator, etc.). Also did a lot of code cleanup and
modularization of all the AUTHOR handling code. And fixed a bug
that was causing Author info to not be picked up correctly for
metainfo comment we embed in man-page source.

diff --git a/xsl/manpages/info.xsl b/xsl/manpages/info.xsl
index 09403b47bedd63a43e8206a8e521d85fad0422d8..8fea71c189ede5e6c09f84ef4686009cef28453a 100644 (file)
--- a/xsl/manpages/info.xsl
+++ b/xsl/manpages/info.xsl
@@ -28,6 +28,10 @@
   
   <!-- * =============================================================== -->
 
+  <!-- * The author.names template and mode are used only for -->
+  <!-- * populating the Author field in the metadata "top comment" -->
+  <!-- * we embed at the beginning of each man page -->
+
   <xsl:template name="author.names">
     <xsl:param name="info"/>
     <xsl:param name="parentinfo"/>
@@ -46,11 +50,12 @@
                        |sect1info|sect2info|sect3info|sect4info|sect5info
                        |partinfo|prefaceinfo|appendixinfo|docinfo"
                 mode="author.names">
-    <xsl:for-each select="author">
+    <xsl:for-each select=".//author">
       <xsl:apply-templates select="." mode="author.names"/>
       <xsl:choose>
         <xsl:when test="position() = last()"/> <!-- do nothing -->
         <xsl:otherwise>
+          <!-- * separate multiple author names with a comma -->
           <xsl:text>, </xsl:text>
         </xsl:otherwise>
       </xsl:choose>
@@ -61,10 +66,16 @@
     <xsl:call-template name="person.name"/>
     <xsl:if test=".//email">
       <xsl:text> </xsl:text>
-      <xsl:apply-templates select=".//email"/>
+      <!-- * use only the first e-mail address for each author -->
+      <xsl:apply-templates select=".//email[1]"/>
     </xsl:if>
   </xsl:template>
 
+  <!-- * ============================================================== -->
+
+  <!-- * This is where we assemble the AUTHOR/AUTHORS section at the -->
+  <!-- * end of each man page. -->
+
   <xsl:template name="author.section">
     <xsl:param name="info"/>
     <xsl:param name="parentinfo"/>
@@ -79,7 +90,7 @@
   </xsl:template>
 
   <!-- * Match only the direct *info children of Refentry, along with -->
-  <!-- * any *info for the valid direct parents of Refentry -->
+  <!-- * any of the *info for the valid direct parents of Refentry. -->
   <xsl:template match="info|refentryinfo|referenceinfo
                        |articleinfo|chapterinfo|sectioninfo
                        |sect1info|sect2info|sect3info|sect4info|sect5info
@@ -94,48 +105,201 @@
       </xsl:with-param>
     </xsl:call-template>
     <xsl:text>"&#10;</xsl:text>
-
-    <xsl:for-each select=".//author|.//editor|.//othercredit">
+    <xsl:for-each select=".//author|.//editor|.//collab|.//corpauthor|
+                          .//corpcredit|.//othercredit|
+                          orgname|publishername|publisher">
       <xsl:apply-templates select="." mode="authorsect"/>
     </xsl:for-each>
-
   </xsl:template>
   
   <xsl:template match="author|editor|othercredit" mode="authorsect">
     <xsl:text>.PP&#10;</xsl:text>
-    <xsl:call-template name="person.name"/>
-    <xsl:if test=".//email">
-      <xsl:text> </xsl:text>
-      <xsl:apply-templates select=".//email" mode="authorsect"/>
-    </xsl:if>
+    <xsl:variable name="person-name">
+      <xsl:call-template name="person.name"/>
+    </xsl:variable>
+    <!-- * Display person name in bold -->
+    <xsl:apply-templates mode="bold" select="exsl:node-set($person-name)"/>
+    <!-- * Display e-mail address(es) on same line as name -->
+    <xsl:apply-templates select=".//email" mode="authorsect"/>
     <xsl:text>&#10;</xsl:text>
-    <xsl:if test="contrib|personblurb|authorblurb">
-      <xsl:apply-templates select="(contrib|personblurb|authorblurb)" mode="authorsect"/>
+    <!-- * Display affiliation(s) on separate lines -->
+    <xsl:apply-templates select="affiliation" mode="authorsect"/>
+    <!-- * Display direct-child addresses on separate lines -->
+    <xsl:apply-templates select="address" mode="authorsect"/>
+    <!-- * Call template for handling various attribution possibilities -->
+    <xsl:call-template name="attribution"/>
+  </xsl:template>
+
+  <xsl:template match="collab" mode="authorsect">
+    <xsl:text>.PP&#10;</xsl:text>
+    <xsl:apply-templates mode="bold" select="collabname"/>
+    <!-- * Display e-mail address(es) on same line as name -->
+    <xsl:apply-templates select=".//email" mode="authorsect"/>
+    <xsl:text>&#10;</xsl:text>
+    <!-- * Display affilition(s) on separate lines -->
+    <xsl:apply-templates select="affiliation" mode="authorsect"/>
+  </xsl:template>
+
+  <xsl:template match="corpauthor|orgname|publishername" mode="authorsect">
+    <xsl:text>.PP&#10;</xsl:text>
+    <xsl:apply-templates mode="bold" select="."/>
     <xsl:text>&#10;</xsl:text>
+    <xsl:if test="self::publishername">
+       <!--* Display localized "Publisher" gentext -->
+      <xsl:call-template name="publisher.attribution"/>
     </xsl:if>
   </xsl:template>
 
+  <xsl:template match="publisher" mode="authorsect">
+    <xsl:text>.PP&#10;</xsl:text>
+    <xsl:apply-templates mode="bold" select="publishername"/>
+    <!-- * Display e-mail address(es) on same line as name -->
+    <xsl:apply-templates select=".//email" mode="authorsect"/>
+    <!-- * Display addresses on separate lines -->
+    <xsl:apply-templates select="address" mode="authorsect"/>
+       <!--* Display localized "Publisher" literal -->
+    <xsl:call-template name="publisher.attribution"/>
+  </xsl:template>
+
+  <xsl:template name="publisher.attribution">
+    <xsl:text>&#10;.sp -1&#10;</xsl:text>
+    <xsl:text>.IP&#10;</xsl:text>
+    <xsl:call-template name="gentext">
+      <xsl:with-param name="key" select="'Publisher'"/>
+    </xsl:call-template>
+    <xsl:text>.&#10;</xsl:text>
+  </xsl:template>
+
   <xsl:template match="email" mode="authorsect">
+    <xsl:choose>
+      <xsl:when test="position() != 1"/> <!-- do nothing -->
+      <xsl:otherwise>
+        <!-- * this is 1st e-mail address, so put space before it -->
+        <xsl:text> </xsl:text>
+      </xsl:otherwise>
+    </xsl:choose>
     <xsl:text>&lt;</xsl:text>
     <xsl:apply-templates/>
     <xsl:text>&gt;</xsl:text>
+    <xsl:choose>
+      <xsl:when test="position() = last()"/> <!-- do nothing -->
+      <xsl:otherwise>
+        <!-- * separate multiple e-mail addresses with a comma -->
+        <xsl:text>, </xsl:text>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template match="affiliation" mode="authorsect">
+    <xsl:text>.br&#10;</xsl:text>
+    <xsl:for-each select="shortaffil|jobtitle|orgname|orgdiv|address">
+      <!-- * only display output of nodes other than Email element -->
+      <xsl:apply-templates select="node()[local-name() != 'email']"/>
+      <xsl:choose>
+        <xsl:when test="position() = last()"/> <!-- do nothing -->
+        <xsl:otherwise>
+          <!-- * only add comma if the node has a child node other than -->
+          <!-- * an Email element -->
+          <xsl:if test="child::node()[local-name() != 'email']">
+            <xsl:text>, </xsl:text>
+          </xsl:if>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:for-each>
+    <xsl:text>&#10;</xsl:text>
+    <xsl:choose>
+      <xsl:when test="position() = last()"/> <!-- do nothing -->
+      <xsl:otherwise>
+        <!-- * put a line break after every Affiliation instance except -->
+        <!-- * the last one in the set -->
+        <xsl:text>.br&#10;</xsl:text>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template match="address" mode="authorsect">
+    <xsl:text>&#10;</xsl:text>
+    <xsl:text>.br&#10;</xsl:text>
+    <!--*  Skip Email children of Address (rendered elsewhere) -->
+    <xsl:apply-templates select="node()[local-name() != 'email']"/>
+  </xsl:template>
+
+  <xsl:template name="attribution">
+  <!-- * Determine appropriate attribution a particular person's role. -->
+    <xsl:choose>
+      <!-- * if we have a *blurb or contrib, just use that -->
+      <xsl:when test="contrib|personblurb|authorblurb">
+        <xsl:apply-templates select="(contrib|personblurb|authorblurb)" mode="authorsect"/>
+        <xsl:text>&#10;</xsl:text>
+      </xsl:when>
+      <!-- * If we have no *blurb or contrib, but this is an Author or -->
+      <!-- * Editor, then render the corresponding localized gentext -->
+      <xsl:when test="self::author">
+        <xsl:text>&#10;.sp -1&#10;</xsl:text>
+        <xsl:text>.IP&#10;</xsl:text>
+        <xsl:call-template name="gentext">
+          <xsl:with-param name="key" select="'Author'"/>
+        </xsl:call-template>
+        <xsl:text>.&#10;</xsl:text>
+      </xsl:when>
+      <xsl:when test="self::editor">
+        <xsl:text>&#10;.sp -1&#10;</xsl:text>
+        <xsl:text>.IP&#10;</xsl:text>
+        <xsl:call-template name="gentext">
+          <xsl:with-param name="key" select="'Editor'"/>
+        </xsl:call-template>
+        <xsl:text>.&#10;</xsl:text>
+      </xsl:when>
+      <!-- * If we have no *blurb or contrib, but this is an Othercredit, -->
+      <!-- * check value of Class attribute and use corresponding gentext. -->
+      <xsl:when test="self::othercredit">
+        <xsl:choose>
+          <xsl:when test="@class and @class != 'other'">
+            <xsl:text>&#10;.sp -1&#10;</xsl:text>
+            <xsl:text>.IP&#10;</xsl:text>
+            <xsl:call-template name="gentext">
+              <xsl:with-param name="key" select="@class"/>
+            </xsl:call-template>
+            <xsl:text>.&#10;</xsl:text>
+          </xsl:when>
+          <xsl:otherwise>
+            <!-- * We have an Othercredit, but not usable value for the Class -->
+            <!-- * attribute, so nothing to show, do nothing -->
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:when>
+      <xsl:otherwise>
+        <!-- * We have no *blurb or contrib or anything else we can use to -->
+        <!-- * display appropriate attribution for this person, so do nothing -->
+      </xsl:otherwise>
+    </xsl:choose>
   </xsl:template>
 
   <xsl:template match="personblurb|authorblurb" mode="authorsect">
-      <xsl:text>&#10;.IP&#10;</xsl:text>
-      <xsl:for-each select="title">
-        <xsl:apply-templates/>
-        <xsl:text>.</xsl:text>
-        <xsl:if test="following-sibling::*[name() != '']">
-          <xsl:text> </xsl:text>
-        </xsl:if>
-      </xsl:for-each>
-      <xsl:for-each select="*[name() != 'title']">
-        <xsl:apply-templates/>
-      </xsl:for-each>
+    <xsl:text>&#10;.sp -1&#10;</xsl:text>
+    <xsl:text>.IP&#10;</xsl:text>
+     <!-- * yeah, it's possible for a *blurb to have a "title" -->
+    <xsl:apply-templates select="title"/>
+    <xsl:for-each select="*[name() != 'title']">
+      <xsl:apply-templates/>
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template match="personblurb/title|authorblurb/title">
+       <!-- * always render period after title -->
+    <xsl:apply-templates/>
+    <xsl:text>.</xsl:text>
+    <!-- * render space after Title+period if the title is followed -->
+    <!-- * by something element content -->
+    <xsl:if test="following-sibling::*[name() != '']">
+      <xsl:text> </xsl:text>
+    </xsl:if>
   </xsl:template>
 
   <xsl:template match="contrib" mode="authorsect">
+    <!-- * We treat Contrib the same as Personblurb/Authorblurb -->
+    <!-- * except that we don't need to check for a title. -->
+    <xsl:text>&#10;.sp -1&#10;</xsl:text>
     <xsl:text>&#10;.IP&#10;</xsl:text>
     <xsl:apply-templates/>
   </xsl:template>