Added support to FO stylesheets for handling instances of Org

where it occurs outside of *info content. In HTML stylesheets,
moved handling of Org out of info.xsl and into inline.xsl. In both
FO and HTML stylesheets, added support for correctly processing
Affiliation and Jobtitle.

diff --git a/xsl/fo/inline.xsl b/xsl/fo/inline.xsl
index 4812904181cc024c8e028e12f7adcdca5c0c54be..e761080ba25424b22e0bd10538ff77ca19d1c006 100644 (file)
--- a/xsl/fo/inline.xsl
+++ b/xsl/fo/inline.xsl
@@ -1076,10 +1076,31 @@
 <!-- ==================================================================== -->
 
 <xsl:template match="personname">
-  <xsl:call-template name="anchor"/>
   <xsl:call-template name="person.name"/>
 </xsl:template>
 
+<xsl:template match="jobtitle">
+  <xsl:apply-templates/>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<xsl:template match="org">
+  <xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template match="orgname">
+  <xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template match="orgdiv">
+  <xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template match="affiliation">
+  <xsl:apply-templates/>
+</xsl:template>
+
 <!-- ==================================================================== -->
 
 <xsl:template match="beginpage">

diff --git a/xsl/html/info.xsl b/xsl/html/info.xsl
index ecc90f3304f0add2523bc843bac0a6282cdd308d..3ab1daacebc1358b6b4857735b6fc91f45f8fd06 100644 (file)
--- a/xsl/html/info.xsl
+++ b/xsl/html/info.xsl
@@ -36,25 +36,6 @@
   </span>
 </xsl:template>
 
-<xsl:template match="org">
-  <span class="{name(.)}">
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates select="orgname"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="orgname">
-  <span class="{name(.)}">
-    <xsl:apply-templates/>
-  </span>
-</xsl:template>
-
-<xsl:template match="orgdiv">
-  <span class="{name(.)}">
-    <xsl:apply-templates/>
-  </span>
-</xsl:template>
-
 <!-- ==================================================================== -->
 
 </xsl:stylesheet>

diff --git a/xsl/html/inline.xsl b/xsl/html/inline.xsl
index 1396dc42bcee09928e036ef88137cfac7516871e..5b56ee260e159cbc71ff428e5968e1de1394f97d 100644 (file)
--- a/xsl/html/inline.xsl
+++ b/xsl/html/inline.xsl
@@ -1201,6 +1201,33 @@
 
 <!-- ==================================================================== -->
 
+<xsl:template match="org">
+  <span class="{name(.)}">
+    <xsl:call-template name="anchor"/>
+    <xsl:apply-templates/>
+  </span>
+</xsl:template>
+
+<xsl:template match="orgname">
+  <span class="{name(.)}">
+    <xsl:apply-templates/>
+  </span>
+</xsl:template>
+
+<xsl:template match="orgdiv">
+  <span class="{name(.)}">
+    <xsl:apply-templates/>
+  </span>
+</xsl:template>
+
+<xsl:template match="affiliation">
+  <span class="{name(.)}">
+    <xsl:apply-templates/>
+  </span>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
 <xsl:template match="beginpage">
   <!-- does nothing; this *is not* markup to force a page break. -->
 </xsl:template>