Present othercredit on titlepages

diff --git a/xsl/fo/titlepage.templates.xml b/xsl/fo/titlepage.templates.xml
index aac56ea2c0ddb137556c39117b6542858e266051..e1e390acb659d67f73e68a24acd82f3cf86b604a 100644 (file)
--- a/xsl/fo/titlepage.templates.xml
+++ b/xsl/fo/titlepage.templates.xml
@@ -36,6 +36,7 @@
     <corpauthor/>
     <authorgroup/>
     <author/>
+    <othercredit/>
     <releaseinfo/>
     <copyright/>
     <legalnotice/>
@@ -76,6 +77,7 @@
     <corpauthor/>
     <authorgroup/>
     <author/>
+    <othercredit/>
     <releaseinfo/>
     <copyright/>
     <legalnotice/>
@@ -133,6 +135,7 @@
       <corpauthor/>
       <authorgroup/>
       <author/>
+      <othercredit/>
       <pubdate fo:space-before="1em"/>
       <copyright/>
       <abstract/>
@@ -203,6 +206,7 @@
     <corpauthor/>
     <authorgroup/>
     <author/>
+    <othercredit/>
     <releaseinfo/>
     <copyright/>
     <legalnotice/>
@@ -243,6 +247,7 @@
     <corpauthor/>
     <authorgroup/>
     <author/>
+    <othercredit/>
     <releaseinfo/>
     <copyright/>
     <legalnotice/>
@@ -311,6 +316,7 @@
       <corpauthor/>
       <authorgroup/>
       <author/>
+      <othercredit/>
       <releaseinfo/>
       <copyright/>
       <legalnotice/>
@@ -354,6 +360,7 @@
       <corpauthor/>
       <authorgroup/>
       <author/>
+      <othercredit/>
       <releaseinfo/>
       <copyright/>
       <legalnotice/>
@@ -392,6 +399,7 @@
       <corpauthor/>
       <authorgroup/>
       <author/>
+      <othercredit/>
       <releaseinfo/>
       <copyright/>
       <legalnotice/>
@@ -426,6 +434,7 @@
     <corpauthor/>
     <authorgroup/>
     <author/>
+    <othercredit/>
     <releaseinfo/>
     <copyright/>
     <legalnotice/>
@@ -458,6 +467,7 @@
     <corpauthor/>
     <authorgroup/>
     <author/>
+    <othercredit/>
     <releaseinfo/>
     <copyright/>
     <legalnotice/>
@@ -490,6 +500,7 @@
     <corpauthor/>
     <authorgroup/>
     <author/>
+    <othercredit/>
     <releaseinfo/>
     <copyright/>
     <legalnotice/>
@@ -522,6 +533,7 @@
     <corpauthor/>
     <authorgroup/>
     <author/>
+    <othercredit/>
     <releaseinfo/>
     <copyright/>
     <legalnotice/>
@@ -554,6 +566,7 @@
     <corpauthor/>
     <authorgroup/>
     <author/>
+    <othercredit/>
     <releaseinfo/>
     <copyright/>
     <legalnotice/>
@@ -586,6 +599,7 @@
     <corpauthor/>
     <authorgroup/>
     <author/>
+    <othercredit/>
     <releaseinfo/>
     <copyright/>
     <legalnotice/>
@@ -618,6 +632,7 @@
     <corpauthor/>
     <authorgroup/>
     <author/>
+    <othercredit/>
     <releaseinfo/>
     <copyright/>
     <legalnotice/>

diff --git a/xsl/fo/titlepage.xsl b/xsl/fo/titlepage.xsl
index 17a955673ac1d9077860e3897423714ac1ae0592..162c47407eb98b2d6b2b74f0537a8eee2ca17026 100644 (file)
--- a/xsl/fo/titlepage.xsl
+++ b/xsl/fo/titlepage.xsl
@@ -377,8 +377,29 @@
 </xsl:template>
 
 <xsl:template match="othercredit" mode="titlepage.mode">
+  <xsl:variable name="contrib" select="string(contrib)"/>
+  <xsl:choose>
+    <xsl:when test="contrib">
+      <xsl:if test="not(preceding-sibling::othercredit[string(contrib)=$contrib])">
+        <fo:block>
+          <xsl:apply-templates mode="titlepage.mode" select="contrib"/>
+          <xsl:text>: </xsl:text>
+          <xsl:call-template name="person.name"/>
+          <xsl:apply-templates mode="titlepage.mode" select="affiliation"/>
+          <xsl:apply-templates select="following-sibling::othercredit[string(contrib)=$contrib]" mode="titlepage.othercredits"/>
+        </fo:block>
+      </xsl:if>
+    </xsl:when>
+    <xsl:otherwise>
+      <fo:block><xsl:call-template name="person.name"/></fo:block>
+      <xsl:apply-templates mode="titlepage.mode" select="./affiliation"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="titlepage.othercredits">
+  <xsl:text>, </xsl:text>
   <xsl:call-template name="person.name"/>
-  <xsl:apply-templates mode="titlepage.mode" select="affiliation"/>
 </xsl:template>
 
 <xsl:template match="othername" mode="titlepage.mode">