Support author/orgname in bibliography, fixing bug 3293062.

diff --git a/xsl/fo/biblio.xsl b/xsl/fo/biblio.xsl
index 04a8310e79d9879f18e4d8244a47a2bee3520c87..e7025c0b485219c67aeab92ecacc4d5777fa8464 100644 (file)
--- 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 44a1a2f31a7dacbad14b848e35c6d92c0d1e3a83..9e0ca5874eb9de57304c1f243e93c699cb4dfb80 100644 (file)
--- 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>