You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2008/03/04 18:35:58 UTC
svn commit: r633559 - in /xmlgraphics/fop/trunk/src/documentation/poster:
cfg/ svg/ xml/ xslt/
Author: jeremias
Date: Tue Mar 4 09:35:52 2008
New Revision: 633559
URL: http://svn.apache.org/viewvc?rev=633559&view=rev
Log:
Update FOP poster for OpenExpo 2008 in Bern.
This fixes various warnings, updates the history and simplifies configuration (if you're on Windows, it will work out of the box because all fonts are available).
Removed:
xmlgraphics/fop/trunk/src/documentation/poster/cfg/VERDANA.ttf.xml
xmlgraphics/fop/trunk/src/documentation/poster/cfg/VERDANAB.ttf.xml
xmlgraphics/fop/trunk/src/documentation/poster/cfg/lucon.ttf.xml
Modified:
xmlgraphics/fop/trunk/src/documentation/poster/cfg/fop.xconf
xmlgraphics/fop/trunk/src/documentation/poster/svg/pepe-business-card.svg
xmlgraphics/fop/trunk/src/documentation/poster/xml/business-card-demo.xml
xmlgraphics/fop/trunk/src/documentation/poster/xml/fop-history.xml
xmlgraphics/fop/trunk/src/documentation/poster/xml/fop-poster.xml
xmlgraphics/fop/trunk/src/documentation/poster/xml/fop-transformation-chain.xml
xmlgraphics/fop/trunk/src/documentation/poster/xml/fop-use-cases.xml
xmlgraphics/fop/trunk/src/documentation/poster/xslt/common.xsl
xmlgraphics/fop/trunk/src/documentation/poster/xslt/fop-poster.xsl
Modified: xmlgraphics/fop/trunk/src/documentation/poster/cfg/fop.xconf
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/poster/cfg/fop.xconf?rev=633559&r1=633558&r2=633559&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/poster/cfg/fop.xconf (original)
+++ xmlgraphics/fop/trunk/src/documentation/poster/cfg/fop.xconf Tue Mar 4 09:35:52 2008
@@ -17,23 +17,13 @@
-->
<!-- $Id$ -->
<fop>
- <base>.</base>
<source-resolution>72</source-resolution>
<target-resolution>300</target-resolution>
- <default-page-settings height="11in" width="8.26in"/>
<renderers>
<renderer mime="application/pdf">
<!--output-profile>cfg/ISOuncoated.icc</output-profile-->
<fonts>
- <font metrics-url="cfg\VERDANA.ttf.xml" kerning="yes" embed-url="cfg\VERDANA.ttf">
- <font-triplet name="Verdana" style="normal" weight="normal"/>
- </font>
- <font metrics-url="cfg\VERDANAB.ttf.xml" kerning="yes" embed-url="cfg\VERDANAB.ttf">
- <font-triplet name="Verdana" style="normal" weight="bold"/>
- </font>
- <font metrics-url="cfg\LUCON.ttf.xml" kerning="yes" embed-url="cfg\LUCON.ttf">
- <font-triplet name="Lucida Console" style="normal" weight="normal"/>
- </font>
+ <auto-detect/>
</fonts>
</renderer>
</renderers>
Modified: xmlgraphics/fop/trunk/src/documentation/poster/svg/pepe-business-card.svg
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/poster/svg/pepe-business-card.svg?rev=633559&r1=633558&r2=633559&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/poster/svg/pepe-business-card.svg (original)
+++ xmlgraphics/fop/trunk/src/documentation/poster/svg/pepe-business-card.svg Tue Mar 4 09:35:52 2008
@@ -16,7 +16,8 @@
limitations under the License.
-->
<!-- $Id$ -->
-<svg xml:space="preserve" x="-3.05102in" y="-2.2459in" width="3.31009in" height="2.08961in"
+<svg xmlns="http://www.w3.org/2000/svg"
+ xml:space="preserve" x="-3.05102in" y="-2.2459in" width="3.31009in" height="2.08961in"
style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality" viewBox="-30510 0 33101 20896">
<g>
<g>
Modified: xmlgraphics/fop/trunk/src/documentation/poster/xml/business-card-demo.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/poster/xml/business-card-demo.xml?rev=633559&r1=633558&r2=633559&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/poster/xml/business-card-demo.xml (original)
+++ xmlgraphics/fop/trunk/src/documentation/poster/xml/business-card-demo.xml Tue Mar 4 09:35:52 2008
@@ -37,13 +37,13 @@
<fo:instream-foreign-object xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<svg:svg width="150mm" height="70mm" viewBox="0 0 150 70">
<svg:g transform="rotate(-7)">
- <svg:image x="0" y="12" width="84" height="53" xlink:href="svg/pepe-business-card.svg"/>
+ <svg:image x="0" y="12" width="84" height="53" xlink:href="../svg/pepe-business-card.svg"/>
</svg:g>
</svg:svg>
</fo:instream-foreign-object>
</p>
- <fo:block-container absolute-position="absolute" left="80mm" top="20mm" width="2cm" height="10cm">
- <fo:block>
+ <fo:block-container absolute-position="absolute" left="80mm" top="20mm" width="3cm" height="10cm">
+ <fo:block font-size="0" line-height="0">
<fo:instream-foreign-object xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="1.8cm" height="10cm" viewBox="0 0 20 100">
<defs>
@@ -65,11 +65,11 @@
</fo:instream-foreign-object>
</fo:block>
</fo:block-container>
- <fo:block-container absolute-position="absolute" width="100%" height="100%">
- <fo:block start-indent="112mm">
- <p>The XSLT stylesheet which contains the rules to convert the business card XML to XSL-FO:</p>
- <fo:block text-align="start" font-family="'Lucida Console'" font-size="10pt" white-space="pre"
- ><![CDATA[<?xml version="1.0" encoding="utf-8"?>
+ <fo:block-container absolute-position="absolute" width="100%">
+ <fo:block start-indent="112mm">
+ <p>The XSLT stylesheet which contains the rules to convert the business card XML to XSL-FO:</p>
+ <fo:block text-align="start" font-family="'Lucida Console'" font-size="10pt" white-space="pre"
+ ><![CDATA[<?xml version="1.0" encoding="utf-8"?>
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:fo="http://www.w3.org/1999/XSL/Format">
@@ -77,7 +77,8 @@
<xsl:template match="/">
<fo:root font-family="Helvetica" font-size="10pt">
<fo:layout-master-set>
- <fo:simple-page-master master-name="bc" page-height="53mm" page-width="84mm" margin="3mm">
+ <fo:simple-page-master master-name="bc"
+ page-height="53mm" page-width="84mm" margin="3mm">
<fo:region-body/>
</fo:simple-page-master>
</fo:layout-master-set>
Modified: xmlgraphics/fop/trunk/src/documentation/poster/xml/fop-history.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/poster/xml/fop-history.xml?rev=633559&r1=633558&r2=633559&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/poster/xml/fop-history.xml (original)
+++ xmlgraphics/fop/trunk/src/documentation/poster/xml/fop-history.xml Tue Mar 4 09:35:52 2008
@@ -39,13 +39,12 @@
</p>
<p>
In 2005, the redesign finally took a leap forward, which resulted in the first release from
- the new codebase (FOP 0.90alpha). Shortly thereafter, FOP 0.91beta was released in December
- 2005 and FOP 0.92beta in April 2006. Although 0.92beta still carries the beta tag,
- it has many advantages over the old version 0.20.5.
+ the new codebase (FOP 0.90alpha). The project team has published a number of releases
+ since then. FOP made big steps forward.
</p>
<p>
- The next version, to be released shortly, will be 0.93. This version should be the last release
- before the long-awaited version 1.0, for which the team only has to implement a handful of
- additional features.
+ The next version, to be released in March 2008, will be 0.95. Although FOP still carries
+ pre 1.0 version numbers it is production-ready. Some features are still missing before
+ version 1.0 can be released.
</p>
</section>
Modified: xmlgraphics/fop/trunk/src/documentation/poster/xml/fop-poster.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/poster/xml/fop-poster.xml?rev=633559&r1=633558&r2=633559&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/poster/xml/fop-poster.xml (original)
+++ xmlgraphics/fop/trunk/src/documentation/poster/xml/fop-poster.xml Tue Mar 4 09:35:52 2008
@@ -21,11 +21,11 @@
<section href="fop-overview.xml" width="165" height="118"/>
<section href="fop-output-formats.xml" width="165" height="103"/>
<section href="fop-foreign-xml-support.xml" width="165" height="55"/>
- <section href="fop-image-support.xml" width="165" height="65"/>
- <section href="fop-use-cases.xml" width="165" height="96"/>
- <section href="fop-history.xml" width="165" height="181"/>
+ <section href="fop-image-support.xml" width="165" height="66"/>
+ <section href="fop-use-cases.xml" width="165" height="98"/>
+ <section href="fop-history.xml" width="165" height="180"/>
<section href="fop-getting-help.xml" width="165" height="67"/>
- <section href="fop-transformation-chain.xml" width="335" height="167"/>
+ <section href="fop-transformation-chain.xml" width="335" height="166"/>
<!-- section href="hello-world-in-fo.xml" width="165" height="115"/-->
- <section href="business-card-demo.xml" width="335" height="181"/>
+ <section href="business-card-demo.xml" width="335" height="185"/>
</poster>
Modified: xmlgraphics/fop/trunk/src/documentation/poster/xml/fop-transformation-chain.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/poster/xml/fop-transformation-chain.xml?rev=633559&r1=633558&r2=633559&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/poster/xml/fop-transformation-chain.xml (original)
+++ xmlgraphics/fop/trunk/src/documentation/poster/xml/fop-transformation-chain.xml Tue Mar 4 09:35:52 2008
@@ -19,7 +19,7 @@
<section xmlns:fo="http://www.w3.org/1999/XSL/Format">
<title tab-width="80">Transformation Chain</title>
<fo:block space-before="10pt" space-before.conditionality="retain" space-after="10pt" text-align="center">
- <fo:external-graphic src="svg/fop-transformation-chain.svg" width="70%" content-width="scale-to-fit"/>
+ <fo:external-graphic src="../svg/fop-transformation-chain.svg" width="70%" content-width="scale-to-fit"/>
</fo:block>
<p>
This diagram shows a complete transformation chain (exemplary). It begins with your data source,
Modified: xmlgraphics/fop/trunk/src/documentation/poster/xml/fop-use-cases.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/poster/xml/fop-use-cases.xml?rev=633559&r1=633558&r2=633559&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/poster/xml/fop-use-cases.xml (original)
+++ xmlgraphics/fop/trunk/src/documentation/poster/xml/fop-use-cases.xml Tue Mar 4 09:35:52 2008
@@ -19,8 +19,7 @@
<section xmlns:fo="http://www.w3.org/1999/XSL/Format">
<title tab-width="50">Use Cases</title>
<fo:table table-layout="fixed" width="100%" border-collapse="separate">
- <fo:table-column/>
- <fo:table-column/>
+ <fo:table-column column-width="proportional-column-width(1)" number-columns-repeated="2"/>
<fo:table-header>
<fo:table-row font-weight="bold">
<fo:table-cell border-bottom="solid 0.5mm black">
Modified: xmlgraphics/fop/trunk/src/documentation/poster/xslt/common.xsl
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/poster/xslt/common.xsl?rev=633559&r1=633558&r2=633559&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/poster/xslt/common.xsl (original)
+++ xmlgraphics/fop/trunk/src/documentation/poster/xslt/common.xsl Tue Mar 4 09:35:52 2008
@@ -37,14 +37,14 @@
<xsl:choose>
<xsl:when test="ancestor::li and not(preceding-sibling::*)">
<fo:block
- space-after="4pt">
+ space-after.optimum="0.3em" space-after.maximum="1em">
<xsl:apply-templates/>
</fo:block>
</xsl:when>
<xsl:otherwise>
<fo:block
- space-before="4pt"
- space-after="4pt">
+ space-before.optimum="0.3em" space-before.maximum="1em"
+ space-after.optimum="0.3em" space-after.maximum="1em">
<xsl:apply-templates/>
</fo:block>
</xsl:otherwise>
Modified: xmlgraphics/fop/trunk/src/documentation/poster/xslt/fop-poster.xsl
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/poster/xslt/fop-poster.xsl?rev=633559&r1=633558&r2=633559&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/poster/xslt/fop-poster.xsl (original)
+++ xmlgraphics/fop/trunk/src/documentation/poster/xslt/fop-poster.xsl Tue Mar 4 09:35:52 2008
@@ -60,9 +60,6 @@
</fo:static-content>
<fo:flow flow-name="xsl-region-body">
<xsl:apply-templates select="section"/>
- <fo:block-container width="1cm" height="5cm">
- <fo:block/>
- </fo:block-container>
</fo:flow>
</fo:page-sequence>
</fo:root>
@@ -84,14 +81,14 @@
<path
d="M 840,575 L 280,575 c -40,0 -60,-50 -100,-50 L 0,525"
style="fill:none; stroke:blue; stroke-width:5;" />
- <image x="680" y="7" width="140" height="60" xlink:href="svg/fop-logo-reconstructed.svg"/>
+ <image x="680" y="7" width="140" height="60" xlink:href="../svg/fop-logo-reconstructed.svg"/>
<text x="15" y="35" style="fill:black; font-weight:bold; font-size:17">
Apache FOP - The leading open source XSL-FO formatter
</text>
<text x="685" y="74" style="fill:black; font-size:5.5">
A product of the Apache XML Graphics Project
</text>
- <image x="15" y="530" width="160" height="60" xlink:href="svg/asf-logo.svg"/>
+ <image x="15" y="530" width="160" height="60" xlink:href="../svg/asf-logo.svg"/>
<text x="360" y="560" style="fill:blue; font-size:12">
For more details, please visit: <a xlink:href="http://xmlgraphics.apache.org/fop/">http://xmlgraphics.apache.org/fop/</a>
</text>
@@ -111,7 +108,7 @@
</xsl:template>
<xsl:template match="section">
- <xsl:variable name="section-content" select="exslt:node-set(document(@href))"/>
+ <xsl:variable name="section-content" select="exslt:node-set(document(@href, .))"/>
<fo:block
space-before.minimum="2mm" space-before.optimum="5mm" space-before.maximum="30mm"
space-before.conditionality="discard" space-after.conditionality="discard"
@@ -129,7 +126,9 @@
</fo:instream-foreign-object>
</fo:block>
</fo:block-container>
- <fo:block-container width="{@width}mm - 8mm" height="{@height}mm - 20mm" padding="4mm" padding-top="16mm" margin="0pt">
+ <fo:block-container width="{@width}mm - 8mm" height="{@height}mm - 24mm"
+ padding="4mm" padding-top="16mm" padding-bottom="8mm" margin="0pt"
+ display-align="distribute" id="section{position()}">
<fo:block>
<xsl:apply-templates select="$section-content/section/*[local-name() != 'title']"/>
</fo:block>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org