From 9e9e142b4d8a7bcca5786e0f80c5b7944c6cb131 Mon Sep 17 00:00:00 2001
From: Mauritz Jeanson <mj@johanneberg.com>
Date: Sun, 27 Mar 2011 07:41:25 +0000
Subject: [PATCH] Added support for author/orgname in document metadata. Closes
 bug #3132862.

---
 xsl/fo/axf.xsl  |  3 +++
 xsl/fo/fop1.xsl |  3 +++
 xsl/fo/xep.xsl  | 16 ++++++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/xsl/fo/axf.xsl b/xsl/fo/axf.xsl
index f74c52523..0dda873a4 100644
--- a/xsl/fo/axf.xsl
+++ b/xsl/fo/axf.xsl
@@ -24,6 +24,9 @@
           </xsl:when>
           <xsl:when test="$authors[self::corpauthor]">
             <xsl:value-of select="$authors"/>
+          </xsl:when>
+           <xsl:when test="$authors[orgname]">
+            <xsl:value-of select="$authors/orgname"/>
           </xsl:when>
           <xsl:otherwise>
             <xsl:call-template name="person.name">
diff --git a/xsl/fo/fop1.xsl b/xsl/fo/fop1.xsl
index e3c6f3ed4..bb1ead6ed 100644
--- a/xsl/fo/fop1.xsl
+++ b/xsl/fo/fop1.xsl
@@ -168,6 +168,9 @@
                 <xsl:when test="$authors[self::corpauthor]">
                   <xsl:value-of select="$authors"/>
                 </xsl:when>
+                <xsl:when test="$authors[orgname]">
+                  <xsl:value-of select="$authors/orgname"/>
+                </xsl:when>
                 <xsl:otherwise>
                   <xsl:call-template name="person.name">
                     <xsl:with-param name="node" select="$authors"/>
diff --git a/xsl/fo/xep.xsl b/xsl/fo/xep.xsl
index 0910fb375..fdcbd7478 100644
--- a/xsl/fo/xep.xsl
+++ b/xsl/fo/xep.xsl
@@ -33,6 +33,9 @@
           <xsl:when test="$authors[self::corpauthor]">
             <xsl:value-of select="$authors"/>
           </xsl:when>
+          <xsl:when test="$authors[orgname]">
+            <xsl:value-of select="$authors/orgname"/>
+          </xsl:when>
           <xsl:otherwise>
             <xsl:call-template name="person.name">
               <xsl:with-param name="node" select="$authors"/>
@@ -104,6 +107,13 @@
      Pdf bookmarks
      ******************************************************************** -->
 
+<xsl:variable name="collapse.subtree">
+  <xsl:choose>
+    <xsl:when test="$bookmarks.collapse != 0">true</xsl:when>
+    <xsl:otherwise>false</xsl:otherwise>
+  </xsl:choose>
+</xsl:variable>
+
 <xsl:template match="*" mode="xep.outline">
   <xsl:apply-templates select="*" mode="xep.outline"/>
 </xsl:template>
@@ -127,6 +137,9 @@
     <xsl:when test="self::index and $generate.index = 0"/>	
     <xsl:when test="parent::*">
       <rx:bookmark internal-destination="{$id}">
+	<xsl:attribute name="collapse-subtree">
+	  <xsl:value-of select="$collapse.subtree"/>
+	</xsl:attribute>
         <rx:bookmark-label>
           <xsl:value-of select="normalize-space($bookmark-label)"/>
         </rx:bookmark-label>
@@ -136,6 +149,9 @@
     <xsl:otherwise>
       <xsl:if test="$bookmark-label != ''">
         <rx:bookmark internal-destination="{$id}">
+	  <xsl:attribute name="collapse-subtree">
+	    <xsl:value-of select="$collapse.subtree"/>
+	  </xsl:attribute>
           <rx:bookmark-label>
             <xsl:value-of select="normalize-space($bookmark-label)"/>
           </rx:bookmark-label>
-- 
2.40.0