[docbook-checkins] CVS: xsl/fo autotoc.xsl,1.3,1.4

[Norman W. <nw...@us...>]

Update of /cvsroot/docbook/xsl/fo
In directory usw-pr-cvs1:/tmp/cvs-serv1022

Modified Files:
	autotoc.xsl 
Log Message:
Use alternate TOC format for FOP

Index: autotoc.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/fo/autotoc.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** autotoc.xsl	7 Feb 2002 17:46:34 -0000	1.3
--- autotoc.xsl	1 Mar 2002 10:56:36 -0000	1.4
***************
*** 74,100 ****
    </xsl:variable>
  
!   <fo:block text-align-last="justify"
!             end-indent="{$toc.indent.width}pt"
!             last-line-end-indent="-{$toc.indent.width}pt">
!     <fo:inline keep-with-next.within-line="always">
!       <fo:basic-link internal-destination="{$id}">
!         <xsl:if test="$label != ''">
!           <xsl:copy-of select="$label"/>
!           <xsl:value-of select="$autotoc.label.separator"/>
!         </xsl:if>
!         <xsl:apply-templates select="." mode="title.markup"/>
!       </fo:basic-link>
!     </fo:inline>
!     <fo:inline keep-together.within-line="always">
!       <xsl:text> </xsl:text>
!       <fo:leader leader-pattern="dots"
!                  keep-with-next.within-line="always"/>
!       <xsl:text> </xsl:text>
!       <fo:basic-link internal-destination="{$id}">
! <!--                     xsl:use-attribute-sets="xref.properties">-->
!         <fo:page-number-citation ref-id="{$id}"/>
!       </fo:basic-link>
!     </fo:inline>
!   </fo:block>
  </xsl:template>
  
--- 74,117 ----
    </xsl:variable>
  
!   <xsl:choose>
!     <xsl:when test="$fop.extensions != 0">
!       <fo:block text-align="start">
!         <fo:basic-link internal-destination="{$id}">
!           <fo:inline keep-with-next.within-line="always">
!             <xsl:apply-templates select="." mode="object.title.markup"/>
!           </fo:inline>
!           <fo:inline keep-together.within-line="always" font-style="italic">
!             <xsl:text>&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;</xsl:text>
!             <fo:page-number-citation ref-id="{$id}"/>
!             <xsl:text></xsl:text>
!           </fo:inline>
!         </fo:basic-link>
!       </fo:block>
!     </xsl:when>
!     <xsl:otherwise>
!       <fo:block text-align-last="justify"
!                 end-indent="{$toc.indent.width}pt"
!                 last-line-end-indent="-{$toc.indent.width}pt">
!         <fo:inline keep-with-next.within-line="always">
!           <fo:basic-link internal-destination="{$id}">
!             <xsl:if test="$label != ''">
!               <xsl:copy-of select="$label"/>
!               <xsl:value-of select="$autotoc.label.separator"/>
!             </xsl:if>
!             <xsl:apply-templates select="." mode="title.markup"/>
!           </fo:basic-link>
!         </fo:inline>
!         <fo:inline keep-together.within-line="always">
!           <xsl:text> </xsl:text>
!           <fo:leader leader-pattern="dots"
!                      keep-with-next.within-line="always"/>
!           <xsl:text> </xsl:text>
!           <fo:basic-link internal-destination="{$id}">
!             <fo:page-number-citation ref-id="{$id}"/>
!           </fo:basic-link>
!         </fo:inline>
!       </fo:block>
!     </xsl:otherwise>
!   </xsl:choose>
  </xsl:template>