You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by fe...@apache.org on 2008/02/14 23:43:33 UTC
svn commit: r627899 -
/forrest/branches/UpdateFOPto094/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl
Author: ferdinand
Date: Thu Feb 14 14:43:32 2008
New Revision: 627899
URL: http://svn.apache.org/viewvc?rev=627899&view=rev
Log:
Fixing fops problem with the darned ol/ols
Modified:
forrest/branches/UpdateFOPto094/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl
Modified: forrest/branches/UpdateFOPto094/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl?rev=627899&r1=627898&r2=627899&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl (original)
+++ forrest/branches/UpdateFOPto094/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl Thu Feb 14 14:43:32 2008
@@ -477,7 +477,8 @@
border-bottom="0.25pt solid"
padding-before="6pt"
padding-after="6pt">
- <xsl:copy-of select="@id"/>
+ <xsl:copy-of
+ select="@id" />
<xsl:call-template
name="insertPageBreaks" />
<!-- insert i18n stuff here --> NOTICE: <xsl:apply-templates />
@@ -486,7 +487,8 @@
<xsl:template
match="anchor">
<fo:block>
- <xsl:copy-of select="@id"/>
+ <xsl:copy-of
+ select="@id" />
</fo:block>
<xsl:apply-templates />
</xsl:template>
@@ -516,7 +518,7 @@
space-after="8pt"
margin="0">
<xsl:call-template
- name="insertPageBreaks" />
+ name="insertPageBreaks" />
<xsl:attribute
name="id">
<xsl:choose>
@@ -549,10 +551,12 @@
name="border-bottom-style">solid</xsl:attribute>
<xsl:attribute
name="border-bottom-width">
- <xsl:value-of select="2+(2-number($level))*2"/>pt</xsl:attribute>
+ <xsl:value-of
+ select="2+(2-number($level))*2" />pt</xsl:attribute>
<xsl:attribute
name="border-bottom-color">
- <xsl:value-of select="$heading-color"/>
+ <xsl:value-of
+ select="$heading-color" />
</xsl:attribute>
</xsl:if>
<xsl:if
@@ -629,7 +633,8 @@
<fo:block
space-after="4pt"
font-family="serif">
- <xsl:copy-of select="@id"/>
+ <xsl:copy-of
+ select="@id" />
<xsl:call-template
name="insertPageBreaks" />
<xsl:apply-templates />
@@ -640,7 +645,8 @@
space-before="4pt"
space-after="4pt"
font-family="serif">
- <xsl:copy-of select="@id"/>
+ <xsl:copy-of
+ select="@id" />
<xsl:call-template
name="insertPageBreaks" />
<xsl:apply-templates />
@@ -664,7 +670,8 @@
white-space-treatment="preserve"
wrap-option="wrap"
text-align="start">
- <xsl:copy-of select="@id"/>
+ <xsl:copy-of
+ select="@id" />
<xsl:call-template
name="insertPageBreaks" />
<xsl:apply-templates />
@@ -676,14 +683,16 @@
provisional-distance-between-starts="18pt"
provisional-label-separation="3pt"
text-align="start">
- <xsl:copy-of select="@id"/>
+ <xsl:copy-of
+ select="@id" />
<xsl:apply-templates />
</fo:list-block>
</xsl:template>
<xsl:template
match="ol/li">
<fo:list-item>
- <xsl:copy-of select="@id"/>
+ <xsl:copy-of
+ select="@id" />
<xsl:if
test="not(following-sibling::li[1])">
<xsl:attribute
@@ -711,24 +720,25 @@
<xsl:template
match="ul/ul | ul/ol | ol/ul | ol/ol">
<fo:list-item>
- <xsl:copy-of select="@id"/>
+ <xsl:copy-of
+ select="@id" />
<fo:list-item-label
end-indent="label-end()">
<fo:block />
</fo:list-item-label>
<fo:list-item-body
start-indent="body-start()">
- <fo:block
- font-family="serif">
+ <fo:list-block>
<xsl:apply-templates />
- </fo:block>
+ </fo:list-block>
</fo:list-item-body>
</fo:list-item>
</xsl:template>
<xsl:template
match="ul/li">
<fo:list-item>
- <xsl:copy-of select="@id"/>
+ <xsl:copy-of
+ select="@id" />
<xsl:if
test="not(following-sibling::li[1])">
<xsl:attribute
@@ -753,14 +763,16 @@
provisional-distance-between-starts="18pt"
provisional-label-separation="3pt"
text-align="start">
- <xsl:copy-of select="@id"/>
+ <xsl:copy-of
+ select="@id" />
<xsl:apply-templates />
</fo:list-block>
</xsl:template>
<xsl:template
match="dt">
<fo:list-item>
- <xsl:copy-of select="@id"/>
+ <xsl:copy-of
+ select="@id" />
<fo:list-item-label
end-indent="label-end()">
<fo:block />
@@ -777,7 +789,8 @@
<xsl:template
match="dd">
<fo:list-item>
- <xsl:copy-of select="@id"/>
+ <xsl:copy-of
+ select="@id" />
<fo:list-item-label
end-indent="label-end()">
<fo:block />
@@ -794,7 +807,8 @@
match="strong">
<fo:inline
font-weight="bold">
- <xsl:copy-of select="@id"/>
+ <xsl:copy-of
+ select="@id" />
<xsl:apply-templates />
</fo:inline>
</xsl:template>
@@ -802,7 +816,8 @@
match="em">
<fo:inline
font-style="italic">
- <xsl:copy-of select="@id"/>
+ <xsl:copy-of
+ select="@id" />
<xsl:apply-templates />
</fo:inline>
</xsl:template>
@@ -810,7 +825,8 @@
match="code">
<fo:inline
font-family="monospace">
- <xsl:copy-of select="@id"/>
+ <xsl:copy-of
+ select="@id" />
<xsl:apply-templates />
</fo:inline>
</xsl:template>
@@ -834,7 +850,8 @@
border-color="{$color}"
background-color="{$color}"
color="#ffffff">
- <xsl:copy-of select="@id"/>
+ <xsl:copy-of
+ select="@id" />
<xsl:call-template
name="insertPageBreaks" />
<xsl:choose>
@@ -886,7 +903,8 @@
border-end-style="solid"
border-color="{$color}"
background-color="{$color}">
- <xsl:copy-of select="@id"/>
+ <xsl:copy-of
+ select="@id" />
<xsl:call-template
name="insertPageBreaks" />
<xsl:choose>
@@ -939,7 +957,8 @@
border-end-style="solid"
border-color="{$color}"
background-color="{$color}">
- <xsl:copy-of select="@id"/>
+ <xsl:copy-of
+ select="@id" />
<xsl:call-template
name="insertPageBreaks" />
<!-- insert i18n stuff here --> FIXME (<xsl:value-of
@@ -976,7 +995,8 @@
color="{$color}"
text-decoration="underline"
internal-destination="{substring(@href,2)}">
- <xsl:copy-of select="@id"/>
+ <xsl:copy-of
+ select="@id" />
<xsl:apply-templates />
</fo:basic-link>
</xsl:when>
@@ -1008,7 +1028,8 @@
color="{$color}"
text-decoration="underline"
external-destination="{$href}">
- <xsl:copy-of select="@id"/>
+ <xsl:copy-of
+ select="@id" />
<xsl:apply-templates />
</fo:basic-link>
<xsl:if
@@ -1023,7 +1044,8 @@
text-align="center">
<xsl:call-template
name="insertPageBreaks" />
- <xsl:copy-of select="@id"/>
+ <xsl:copy-of
+ select="@id" />
<!-- Make relative paths absolute -->
<xsl:variable
name="imgpath">
@@ -1154,8 +1176,11 @@
name="column-width">
<xsl:value-of
select="6.25 div number($max-number-columns)" />in </xsl:variable>
- <fo:table table-layout="fixed" width="100%">
- <xsl:copy-of select="@id"/>
+ <fo:table
+ table-layout="fixed"
+ width="100%">
+ <xsl:copy-of
+ select="@id" />
<fo:table-column>
<xsl:attribute
name="column-width">
@@ -1199,7 +1224,8 @@
<xsl:template
match="tr">
<fo:table-row>
- <xsl:copy-of select="@id"/>
+ <xsl:copy-of
+ select="@id" />
<xsl:apply-templates />
</fo:table-row>
</xsl:template>
@@ -1219,7 +1245,8 @@
color="#FFFFFF"
background-color="{$background-color}"
border="1pt solid {$border-color}">
- <xsl:copy-of select="@id"/>
+ <xsl:copy-of
+ select="@id" />
<xsl:if
test="@colspan!=''">
<xsl:attribute
@@ -1257,7 +1284,8 @@
padding-end="4pt"
background-color="{$background-color}"
border="1pt solid {$border-color}">
- <xsl:copy-of select="@id"/>
+ <xsl:copy-of
+ select="@id" />
<xsl:if
test="@colspan!=''">
<xsl:attribute
@@ -1282,7 +1310,8 @@
<xsl:template
match="br">
<fo:block>
- <xsl:copy-of select="@id"/>
+ <xsl:copy-of
+ select="@id" />
</fo:block>
</xsl:template>
<xsl:template
@@ -1393,7 +1422,8 @@
<xsl:template
match="citation">
<fo:inline>
- <xsl:copy-of select="@id"/> [<xsl:value-of
+ <xsl:copy-of
+ select="@id" /> [<xsl:value-of
select="@def" />] </fo:inline>
</xsl:template>
<xsl:template
@@ -1406,7 +1436,8 @@
background-color="#f0f0f0"
font-family="serif"
font-style="italic">
- <xsl:copy-of select="@id"/>
+ <xsl:copy-of
+ select="@id" />
<xsl:call-template
name="insertPageBreaks" />
<xsl:apply-templates />