Fixed non-working inline.or.block template for indexterm wrappers.

Add fop1 to list of processors using inline.or.block.

diff --git a/xsl/fo/index.xsl b/xsl/fo/index.xsl
index d50184466263a5a9fb3f1f9faa78cb3c143ccaaa..151e8d603e601a48d16a515d4587ae1059106902 100644 (file)
--- a/xsl/fo/index.xsl
+++ b/xsl/fo/index.xsl
@@ -295,7 +295,7 @@
   <!-- Temporal workaround for bug in AXF -->
   <xsl:variable name="wrapper.name">
     <xsl:choose>
-      <xsl:when test="$axf.extensions != 0">
+      <xsl:when test="$axf.extensions != 0 or $fop1.extensions != 0">
         <xsl:call-template name="inline.or.block"/>
       </xsl:when>
       <xsl:otherwise>fo:wrapper</xsl:otherwise>
@@ -466,12 +466,12 @@
 <xsl:template name="inline.or.block">
   <xsl:param name="parentnode" select=".."/>
 
-  <xsl:variable name="parent" select="local-name($parentnode)"/>
+  <xsl:variable name="parent" select="concat('|', local-name($parentnode), '|')"/>
 
   <xsl:variable name="block.parents" select="'|answer|appendix|appendixinfo|article|articleinfo|bibliodiv|bibliography|bibliographyinfo|blockinfo|blockquote|bookinfo|callout|caution|chapter|chapterinfo|dedication|example|figure|formalpara|funcsynopsisinfo|glossary|glossaryinfo|glossdef|glossdiv|glossentry|highlights|important|index|indexinfo|info|informalexample|informalfigure|informaltable|itemizedlist|legalnotice|listitem|msgexplan|msgtext|note|objectinfo|orderedlist|partinfo|partintro|preface|prefaceinfo|procedure|qandadiv|qandaset|question|refentry|refentryinfo|referenceinfo|refmeta|refmiscinfo|refsect1|refsect1info|refsect2|refsect2info|refsect3|refsect3info|refsection|refsectioninfo|refsynopsisdiv|refsynopsisdivinfo|revdescription|screeninfo|sect1|sect1info|sect2|sect2info|sect3|sect3info|sect4|sect4info|sect5|sect5info|section|sectioninfo|setindex|setindexinfo|setinfo|sidebar|sidebarinfo|simplesect|step|table|task|taskprerequisites|taskrelated|tasksummary|tip|variablelist|warning|'"/>
 
   <xsl:choose>
-    <xsl:when test="contains($parent, $block.parents)">fo:block</xsl:when>
+    <xsl:when test="contains($block.parents, $parent)">fo:block</xsl:when>
     <xsl:otherwise>fo:inline</xsl:otherwise>
   </xsl:choose>
 </xsl:template>