You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by th...@apache.org on 2008/02/18 16:33:09 UTC
svn commit: r628783 - in
/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo:
content-main-outline.ft content-toc.ft
Author: thorsten
Date: Mon Feb 18 07:32:58 2008
New Revision: 628783
URL: http://svn.apache.org/viewvc?rev=628783&view=rev
Log:
Fixing fo toc generation
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main-outline.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.ft
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main-outline.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main-outline.ft?rev=628783&r1=628782&r2=628783&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main-outline.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main-outline.ft Mon Feb 18 07:32:58 2008
@@ -42,19 +42,11 @@
<xsl:template match="tocitem">
<fo:bookmark>
<xsl:attribute name="internal-destination">
- <xsl:choose>
- <xsl:when test="normalize-space(@id)!=''">
- <xsl:value-of select="@id"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="generate-id()"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:value-of select="substring(@href,2)"/>
</xsl:attribute>
<fo:bookmark-title>
<xsl:number format="1.1.1.1.1.1.1" count="tocitem" level="multiple"/>
- <xsl:text>
- </xsl:text>
+ <xsl:text> </xsl:text>
<xsl:value-of select="normalize-space(@title)"/>
</fo:bookmark-title>
<xsl:apply-templates select="tocitem"/>
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.ft?rev=628783&r1=628782&r2=628783&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.ft Mon Feb 18 07:32:58 2008
@@ -71,16 +71,7 @@
<fo:block space-before="5pt" text-align-last="justify" start-indent=".5em"
text-indent=".5em">
<fo:inline>
- <xsl:variable name="id">
- <xsl:choose>
- <xsl:when test="normalize-space(@id)!=''">
- <xsl:value-of select="@id"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="generate-id()"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
+ <xsl:variable name="id" select="substring(@href,2)"/>
<fo:basic-link internal-destination="{$id}">
<xsl:value-of
select="substring('          ', 0, 2 * $depth - 1)"/>