From 0fd654fc729dc4328fc804db076d4c9f3ddb8714 Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Mon, 10 Oct 2011 19:41:51 +0000
Subject: [PATCH] Support author/orgname in bibliography, fixing bug 3293062.

---
 xsl/fo/biblio.xsl   | 20 +++++++++++++++++---
 xsl/html/biblio.xsl | 20 +++++++++++++++++---
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/xsl/fo/biblio.xsl b/xsl/fo/biblio.xsl
index 04a8310e7..e7025c0b4 100644
--- a/xsl/fo/biblio.xsl
+++ b/xsl/fo/biblio.xsl
@@ -344,8 +344,15 @@
 
 <xsl:template match="author" mode="bibliography.mode">
   <fo:inline>
-    <xsl:call-template name="person.name"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
+    <xsl:choose>
+      <xsl:when test="orgname">
+        <xsl:apply-templates select="orgname" mode="bibliography.mode"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="person.name"/>
+        <xsl:value-of select="$biblioentry.item.separator"/>
+      </xsl:otherwise>
+    </xsl:choose>
   </fo:inline>
 </xsl:template>
 
@@ -849,7 +856,14 @@
 
 <xsl:template match="author" mode="bibliomixed.mode">
   <fo:inline>
-    <xsl:call-template name="person.name"/>
+    <xsl:choose>
+      <xsl:when test="orgname">
+        <xsl:apply-templates select="orgname" mode="bibliomixed.mode"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="person.name"/>
+      </xsl:otherwise>
+    </xsl:choose>
   </fo:inline>
 </xsl:template>
 
diff --git a/xsl/html/biblio.xsl b/xsl/html/biblio.xsl
index 44a1a2f31..9e0ca5874 100644
--- a/xsl/html/biblio.xsl
+++ b/xsl/html/biblio.xsl
@@ -325,8 +325,15 @@
 <xsl:template match="author" mode="bibliography.mode">
   <span>
     <xsl:call-template name="common.html.attributes"/>
-    <xsl:call-template name="person.name"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
+    <xsl:choose>
+      <xsl:when test="orgname">
+        <xsl:apply-templates select="orgname" mode="bibliography.mode"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="person.name"/>
+        <xsl:copy-of select="$biblioentry.item.separator"/>
+      </xsl:otherwise>
+    </xsl:choose>
   </span>
 </xsl:template>
 
@@ -879,7 +886,14 @@
 <xsl:template match="author" mode="bibliomixed.mode">
   <span>
     <xsl:call-template name="common.html.attributes"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
+    <xsl:choose>
+      <xsl:when test="orgname">
+        <xsl:apply-templates select="orgname" mode="bibliomixed.mode"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="person.name"/>
+      </xsl:otherwise>
+    </xsl:choose>
   </span>
 </xsl:template>
 
-- 
2.40.0