Author: aheritier
Date: Sun Aug 14 16:28:32 2005
New Revision: 232669
URL: http://svn.apache.org/viewcvs?rev=232669&view=rev
Log:
MPPDF-42 : Error when logo locations are not set.
Modified:
maven/maven-1/plugins/trunk/pdf/src/plugin-resources/fo-cover.xslt
maven/maven-1/plugins/trunk/pdf/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/pdf/src/plugin-resources/fo-cover.xslt
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/pdf/src/plugin-resources/fo-cover.xslt?rev=232669&r1=232668&r2=232669&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/pdf/src/plugin-resources/fo-cover.xslt
(original)
+++ maven/maven-1/plugins/trunk/pdf/src/plugin-resources/fo-cover.xslt Sun Aug
14 16:28:32 2005
@@ -35,6 +35,7 @@
<fo:table-body>
<fo:table-row height="{$headerHeight}in">
<fo:table-cell>
+ <xsl:if
test="normalize-space($companyLogo) != ''">
<fo:block text-align="left"
vertical-align="top">
<xsl:variable name="source">
<xsl:choose>
@@ -51,15 +52,17 @@
</xsl:variable>
<fo:external-graphic src="{$source}"
height="{$headerHeight}in" width="auto" content-height="{$headerHeight}in"
content-width="auto"/>
</fo:block>
+ </xsl:if>
</fo:table-cell>
<fo:table-cell>
+ <xsl:if
test="normalize-space($projectLogo) != ''">
<fo:block text-align="right"
vertical-align="top">
<xsl:variable name="source">
<xsl:choose>
<xsl:when
test="substring(normalize-space($projectLogo),1,3) = '../'">
<xsl:value-of
select="translate(substring-after(normalize-space($projectLogo),'../'),'\','/')"/>
</xsl:when>
- <xsl:when
test="substring(normalize-space($companyLogo),1,3) = '..\'">
+ <xsl:when
test="substring(normalize-space($projectLogo),1,3) = '..\'">
<xsl:value-of
select="translate(substring-after(normalize-space($projectLogo),'..\'),'\','/')"/>
</xsl:when>
<xsl:otherwise>
@@ -69,6 +72,7 @@
</xsl:variable>
<fo:external-graphic src="{$source}"
height="{$headerHeight}in" width="auto" content-height="{$headerHeight}in"
content-width="auto"/>
</fo:block>
+ </xsl:if>
</fo:table-cell>
</fo:table-row>
<fo:table-row keep-with-previous="always"
height="{$lineHeight}in">
Modified: maven/maven-1/plugins/trunk/pdf/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/pdf/xdocs/changes.xml?rev=232669&r1=232668&r2=232669&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/pdf/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/pdf/xdocs/changes.xml Sun Aug 14 16:28:32 2005
@@ -24,6 +24,7 @@
</properties>
<body>
<release version="2.3.1-SNAPSHOT" date="In SVN">
+ <action dev="aheritier" type="fix" issue="MPPDF-42" due-to="Lukas
Theussl">Error when logo locations are not set.</action>
<action dev="aheritier" type="fix" issue="MPPDF-41" due-to="Lukas
Theussl">Suppress verbose output by default.</action>
<action dev="aheritier" type="fix" issue="MPPDF-39" due-to="Lukas
Theussl">Missing patch for MPPDF-24 ( it defines a missing attribute for
<code style="indent"> tags and cleans up some layout issues with
definition lists).</action>
<action dev="aheritier" type="fix" issue="MPPDF-35" due-to="Lukas
Theussl">Standardize copyright notices.</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
