Added support for author/orgname in document metadata. Closes bug #3132862.

diff --git a/xsl/fo/axf.xsl b/xsl/fo/axf.xsl
index f74c52523b84fc593f7915587b9dd0e684807920..0dda873a4e59c7ce13b5e1acf53212f77687e69d 100644 (file)
--- 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 e3c6f3ed43d9cc6fd5e5b4a4779d45b3f24cd0ef..bb1ead6ed0b4232a94f3b4b0a406a7eb2bcf1d17 100644 (file)
--- 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 0910fb3759fd3ad9018cf4dfb69a7ddd75063f6a..fdcbd7478d620dc42315d61d5356f5e043be56e9 100644 (file)
--- 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>