git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-1_1@1356214 13f79535-47bb-0310-9956-ffa450edef68tags/fop-1_1rc1old
@@ -93,12 +93,12 @@ http://xmlgraphics.apache.org/fop/stable/running.html | |||
RELEASE NOTES | |||
============================================================================== | |||
Version 1.1 | |||
=========== | |||
Version 1.1rc1 | |||
============== | |||
This is a minor (dot) release of Apache FOP, which primarily addresses | |||
bug fixes and also adds a number of new features. See below for | |||
details. | |||
This is a candidate release of the next, minor (dot) release of Apache FOP, | |||
which primarily addresses bug fixes and also adds a number of new features. | |||
See below for details. | |||
Compliance | |||
---------- | |||
@@ -113,14 +113,14 @@ Known issues | |||
A detailed list of known issues in this release is available at | |||
http://xmlgraphics.apache.org/fop/1.1/knownissues_overview.html. | |||
Major Changes in Version 1.1 | |||
---------------------------- | |||
Major Changes in Version 1.1rc1 | |||
------------------------------- | |||
* Adds support for complex scripts, in particular those that require | |||
either bidirectional processing or advanced typographic tables in | |||
fonts (e.g., the GSUB and GPOS tables of OpenType). | |||
* Adds support for fo:bidi-override and (relatively) full support | |||
for writing-mode='tb-rl' (or equivalent). | |||
for writing-mode='rl-tb' (or equivalent). | |||
* Adds support for Unicode BIDI Control characters: U+200E LEFT-TO-RIGHT | |||
MARK (LRM), U+200F RIGHT-TO-LEFT MARK (RLM), U+202A LEFT-TO-RIGHT EMBEDDING | |||
(LRE), U+202B RIGHT-TO-LEFT EMBEDDING (RLE), U+202D LEFT-TO-RIGHT OVERRIDE | |||
@@ -128,7 +128,7 @@ Major Changes in Version 1.1 | |||
FORMATTING (PDF). | |||
A more detailed list of changes in this release is available at | |||
http://xmlgraphics.apache.org/fop/1.1/changes_1.1.html. | |||
http://xmlgraphics.apache.org/fop/1.1rc1/changes_1.1rc1.html. | |||
A more detailed list of changes in this and earlier releases is available at | |||
http://xmlgraphics.apache.org/fop/changes.html. |
@@ -143,7 +143,7 @@ list of possible build targets. | |||
<property name="Name" value="Apache FOP"/> | |||
<property name="name" value="fop"/> | |||
<property name="NAME" value="FOP"/> | |||
<property name="version" value="1.1"/> | |||
<property name="version" value="1.1rc1"/> | |||
<property name="year" value="1999-2012"/> | |||
<property name="javac.debug" value="on"/> | |||
<property name="javac.optimize" value="off"/> | |||
@@ -864,16 +864,28 @@ list of possible build targets. | |||
<target name="junit-text-linebreak" depends="junit-compile" description="Runs FOP's JUnit unicode linebreak tests" if="junit.present"> | |||
<junit-run title="Unicode UAX#14 support" testsuite="org.apache.fop.text.linebreak.LineBreakStatusTestCase" outfile="TEST-linebreak"/> | |||
</target> | |||
<target name="junit-fonts" depends="junit-compile"> | |||
<echo message="Running tests for the fonts package"/> | |||
<junit-run title="fonts" testsuite="org.apache.fop.fonts.FOPFontsTestSuite" outfile="TEST-fonts"/> | |||
</target> | |||
<target name="junit-render-ps" depends="junit-compile"> | |||
<echo message="Running tests for the render ps package"/> | |||
<junit-run title="render-ps" testsuite="org.apache.fop.render.ps.RenderPSTestSuite" outfile="TEST-render-ps"/> | |||
</target> | |||
<target name="junit-render-pdf" depends="junit-compile"> | |||
<junit-run title="render-pdf" testsuite="org.apache.fop.render.pdf.RenderPDFTestSuite" outfile="TEST-render-pdf"/> | |||
</target> | |||
<target name="junit-complexscripts" depends="junit-compile"> | |||
<junit-run title="complexscripts" testsuite="org.apache.fop.complexscripts.ComplexScriptsTestSuite" outfile="TEST-complexscripts"/> | |||
</target> | |||
<target name="junit-reduced" depends="junit-userconfig, junit-basic, junit-transcoder, junit-text-linebreak, junit-fotree, junit-render-pdf, junit-complexscripts"/> | |||
<target name="junit-reduced" depends="junit-userconfig, junit-basic, junit-transcoder, | |||
junit-text-linebreak, junit-fotree, junit-fonts, junit-render-pdf, junit-render-ps, | |||
junit-complexscripts"/> | |||
<target name="junit" depends="junit-all" description="Runs all of FOP's JUnit tests" | |||
if="junit.present"> | |||
<fail><condition><or><isset property="fop.junit.error"/><isset property="fop.junit.failure"/><not><isset property="hyphenation.present"/></not></or></condition> | |||
<fail><condition><or><isset property="fop.junit.error"/><isset | |||
property="fop.junit.failure"/><not><isset | |||
property="hyphenation.present"/></not></or></condition> | |||
NOTE: | |||
************************************************************************** | |||
* One or more of the Junit tests had Failures or Errors or were skipped! * | |||
@@ -1438,14 +1450,20 @@ NOTE: | |||
</delete> | |||
</target> | |||
<target name="validate-xdocs" description="Validate the xdocs. Point schemas.dir to Forrest's 'schemas' directory."> | |||
<property name="schemas.dir" value="../xml-forrest/src/resources/schema"/> | |||
<property name="schemas.dir" value="../xml-forrest/main/webapp/resources/schema"/> | |||
<xmlvalidate failonerror="no"> | |||
<fileset dir="${xdocs.dir}" includes="**.xml"/> | |||
<fileset dir="${xdocs.dir}"> | |||
<include name="**.xml"/> | |||
<exclude name="**/site.xml"/> | |||
<exclude name="**/news-data.xml"/> | |||
</fileset> | |||
<xmlcatalog> | |||
<entity publicId="-//APACHE//DTD Compliance V1.0//EN" location="src/documentation/resources/schema/dtd/compliance-v10.dtd"/> | |||
<entity publicId="-//APACHE//DTD Documentation V1.1//EN" location="${schemas.dir}/dtd/document-v11.dtd"/> | |||
<entity publicId="-//APACHE//DTD Documentation V1.3//EN" location="${schemas.dir}/dtd/document-v13.dtd"/> | |||
<entity publicId="-//APACHE//DTD Specification V1.1//EN" location="${schemas.dir}/dtd/specification-v11.dtd"/> | |||
<entity publicId="-//APACHE//DTD FAQ V1.1//EN" location="${schemas.dir}/dtd/faq-v11.dtd"/> | |||
<entity publicId="-//APACHE//DTD FAQ V1.3//EN" location="${schemas.dir}/dtd/faq-v13.dtd"/> | |||
<entity publicId="-//APACHE//DTD Changes V1.1//EN" location="${schemas.dir}/dtd/changes-v11.dtd"/> | |||
<entity publicId="-//APACHE//DTD Todo V1.1//EN" location="${schemas.dir}/dtd/todo-v11.dtd"/> | |||
<entity publicId="-//APACHE//DTD Cocoon Documentation Book V1.0//EN" location="${schemas.dir}/dtd/book-cocoon-v10.dtd"/> |
@@ -1,204 +0,0 @@ | |||
<?xml version="1.0" encoding="UTF-8"?> | |||
<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.1//EN" "http://www.puppycrawl.com/dtds/configuration_1_1.dtd"> | |||
<module name="Checker"> | |||
<module name="TreeWalker"> | |||
<module name="ArrayTypeStyleCheck"> | |||
<property name="javaStyle" value="true"/> | |||
<property name="severity" value="warning"/> | |||
</module> | |||
<module name="ModifierOrderCheck"> | |||
<property name="severity" value="warning"/> | |||
</module> | |||
<module name="RedundantModifierCheck"> | |||
<property name="severity" value="warning"/> | |||
<property name="tokens" value="METHOD_DEF, VARIABLE_DEF"/> | |||
</module> | |||
<module name="UpperEllCheck"> | |||
<property name="severity" value="warning"/> | |||
</module> | |||
<module name="AvoidNestedBlocksCheck"> | |||
<property name="severity" value="warning"/> | |||
</module> | |||
<module name="EmptyBlockCheck"> | |||
<property name="option" value="text"/> | |||
<property name="severity" value="warning"/> | |||
<property name="tokens" value="LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_IF, LITERAL_FOR, LITERAL_TRY, LITERAL_WHILE, STATIC_INIT"/> | |||
</module> | |||
<module name="LeftCurlyCheck"> | |||
<property name="maxLineLength" value="100"/> | |||
<property name="option" value="eol"/> | |||
<property name="severity" value="warning"/> | |||
<property name="tokens" value="CLASS_DEF, CTOR_DEF, INTERFACE_DEF, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, METHOD_DEF"/> | |||
</module> | |||
<module name="NeedBracesCheck"> | |||
<property name="severity" value="warning"/> | |||
<property name="tokens" value="LITERAL_DO, LITERAL_ELSE, LITERAL_IF, LITERAL_FOR, LITERAL_WHILE"/> | |||
</module> | |||
<module name="RightCurlyCheck"> | |||
<property name="option" value="same"/> | |||
<property name="severity" value="warning"/> | |||
<property name="tokens" value="LITERAL_CATCH, LITERAL_ELSE, LITERAL_TRY"/> | |||
</module> | |||
<module name="DoubleCheckedLockingCheck"> | |||
<property name="severity" value="warning"/> | |||
</module> | |||
<module name="EmptyStatementCheck"> | |||
<property name="severity" value="warning"/> | |||
</module> | |||
<module name="EqualsHashCodeCheck"> | |||
<property name="severity" value="warning"/> | |||
</module> | |||
<module name="InnerAssignmentCheck"> | |||
<property name="severity" value="warning"/> | |||
<property name="tokens" value="ASSIGN, BAND_ASSIGN, BOR_ASSIGN, BSR_ASSIGN, BXOR_ASSIGN, DIV_ASSIGN, MINUS_ASSIGN, MOD_ASSIGN, PLUS_ASSIGN, SL_ASSIGN, SR_ASSIGN, STAR_ASSIGN"/> | |||
</module> | |||
<module name="MissingSwitchDefaultCheck"> | |||
<property name="severity" value="warning"/> | |||
</module> | |||
<module name="SimplifyBooleanExpressionCheck"> | |||
<property name="severity" value="warning"/> | |||
</module> | |||
<module name="SimplifyBooleanReturnCheck"> | |||
<property name="severity" value="warning"/> | |||
</module> | |||
<module name="FinalClassCheck"> | |||
<property name="severity" value="warning"/> | |||
</module> | |||
<module name="HideUtilityClassConstructorCheck"> | |||
<property name="severity" value="warning"/> | |||
</module> | |||
<module name="VisibilityModifierCheck"> | |||
<property name="packageAllowed" value="false"/> | |||
<property name="protectedAllowed" value="true"/> | |||
<property name="publicMemberPattern" value="^serialVersionUID"/> | |||
<property name="severity" value="warning"/> | |||
</module> | |||
<module name="AvoidStarImportCheck"> | |||
<property name="severity" value="error"/> | |||
</module> | |||
<module name="JavadocMethodCheck"> | |||
<property name="allowMissingParamTags" value="false"/> | |||
<property name="allowMissingReturnTag" value="false"/> | |||
<property name="allowMissingThrowsTags" value="false"/> | |||
<property name="allowThrowsTagsForSubclasses" value="false"/> | |||
<property name="allowUndeclaredRTE" value="false"/> | |||
<property name="scope" value="protected"/> | |||
<property name="severity" value="warning"/> | |||
<property name="tokens" value="METHOD_DEF, CTOR_DEF"/> | |||
</module> | |||
<module name="JavadocTypeCheck"> | |||
<property name="scope" value="protected"/> | |||
<property name="severity" value="warning"/> | |||
<property name="tokens" value="CLASS_DEF, INTERFACE_DEF"/> | |||
</module> | |||
<module name="JavadocVariableCheck"> | |||
<property name="scope" value="protected"/> | |||
<property name="severity" value="warning"/> | |||
</module> | |||
<module name="ConstantNameCheck"> | |||
<property name="format" value="^([A-Z](_?[A-Z0-9]+)*)|(log)$"/> | |||
<property name="severity" value="warning"/> | |||
</module> | |||
<module name="LocalFinalVariableNameCheck"> | |||
<property name="format" value="^[a-z][a-zA-Z0-9]*$"/> | |||
<property name="severity" value="warning"/> | |||
</module> | |||
<module name="LocalVariableNameCheck"> | |||
<property name="format" value="^[a-z][a-zA-Z0-9]*$"/> | |||
<property name="severity" value="warning"/> | |||
</module> | |||
<module name="MemberNameCheck"> | |||
<property name="format" value="^[a-z][a-zA-Z0-9]*$"/> | |||
<property name="severity" value="warning"/> | |||
</module> | |||
<module name="MethodNameCheck"> | |||
<property name="format" value="^[a-z][a-zA-Z0-9]*$"/> | |||
<property name="severity" value="warning"/> | |||
</module> | |||
<module name="PackageNameCheck"> | |||
<property name="format" value="^[a-z]+(\.[a-zA-Z_][a-zA-Z0-9_]*)*$"/> | |||
<property name="severity" value="warning"/> | |||
</module> | |||
<module name="ParameterNameCheck"> | |||
<property name="format" value="^[a-z][a-zA-Z0-9]*$"/> | |||
<property name="severity" value="warning"/> | |||
</module> | |||
<module name="StaticVariableNameCheck"> | |||
<property name="format" value="^[a-z][a-zA-Z0-9]*$"/> | |||
<property name="severity" value="warning"/> | |||
</module> | |||
<module name="TypeNameCheck"> | |||
<property name="format" value="^[A-Z][a-zA-Z0-9]*$"/> | |||
<property name="severity" value="warning"/> | |||
<property name="tokens" value="CLASS_DEF, INTERFACE_DEF"/> | |||
</module> | |||
<module name="LineLengthCheck"> | |||
<property name="ignorePattern" value="^$"/> | |||
<property name="max" value="100"/> | |||
<property name="severity" value="warning"/> | |||
<property name="tabWidth" value="4"/> | |||
</module> | |||
<module name="MethodLengthCheck"> | |||
<property name="max" value="150"/> | |||
<property name="severity" value="warning"/> | |||
<property name="tokens" value="METHOD_DEF, CTOR_DEF"/> | |||
</module> | |||
<module name="ParameterNumberCheck"> | |||
<property name="max" value="7"/> | |||
<property name="severity" value="warning"/> | |||
<property name="tokens" value="METHOD_DEF, CTOR_DEF"/> | |||
</module> | |||
<module name="EmptyForIteratorPadCheck"> | |||
<property name="option" value="nospace"/> | |||
<property name="severity" value="warning"/> | |||
</module> | |||
<module name="NoWhitespaceAfterCheck"> | |||
<property name="allowLineBreaks" value="true"/> | |||
<property name="severity" value="warning"/> | |||
<property name="tokens" value="ARRAY_INIT, BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS"/> | |||
</module> | |||
<module name="NoWhitespaceBeforeCheck"> | |||
<property name="allowLineBreaks" value="true"/> | |||
<property name="severity" value="warning"/> | |||
<property name="tokens" value="SEMI, POST_DEC, POST_INC"/> | |||
</module> | |||
<module name="OperatorWrapCheck"> | |||
<property name="option" value="nl"/> | |||
<property name="severity" value="warning"/> | |||
<property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, SL, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN"/> | |||
</module> | |||
<module name="WhitespaceAfterCheck"> | |||
<property name="severity" value="warning"/> | |||
<property name="tokens" value="COMMA, SEMI"/> | |||
</module> | |||
<module name="WhitespaceAroundCheck"> | |||
<property name="severity" value="warning"/> | |||
<property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN"/> | |||
</module> | |||
<module name="FileContentsHolder"/> | |||
</module> | |||
<module name="RegexpHeader"> | |||
<property name="headerFile" value="${samedir}/checkstyle.header"/> | |||
<property name="severity" value="warning"/> | |||
</module> | |||
<module name="FileLengthCheck"> | |||
<property name="max" value="2000"/> | |||
<property name="severity" value="warning"/> | |||
</module> | |||
<module name="FileTabCharacter"> | |||
<property name="severity" value="error"/> | |||
</module> | |||
<module name="SuppressionFilter"> | |||
<property name="file" value="${samedir}/checkstyle-suppressions.xml"/> | |||
</module> | |||
<module name="SuppressionCommentFilter"> | |||
<property name="offCommentFormat" value="CSOFF\: ([\w\|]+)"/> | |||
<property name="onCommentFormat" value="CSON\: ([\w\|]+)"/> | |||
<property name="checkFormat" value="$1"/> | |||
</module> | |||
<module name="SuppressWithNearbyCommentFilter"> | |||
<property name="commentFormat" value="CSOK\: ([\w\|]+)"/> | |||
<property name="checkFormat" value="$1"/> | |||
<property name="influenceFormat" value="0"/> | |||
</module> | |||
</module> |
@@ -369,7 +369,7 @@ This font contains no embedding license restrictions | |||
</fo:block> | |||
</fo:wrapper> | |||
<fo:table> | |||
<fo:table table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="50mm"/> | |||
<fo:table-column column-width="50mm"/> | |||
<fo:table-column column-width="50mm"/> |
@@ -32,7 +32,7 @@ | |||
<fo:block-container absolute-position="absolute" width="100%" height="100%" border-top-color="silver" border-top-style="dotted" border-top-width="0.13mm"> | |||
<fo:block/> | |||
</fo:block-container> | |||
<fo:table space-before.optimum="1in div 12" margin-left="2in div 12" margin-top="1in div 10" font-family="sans-serif" font-size="7pt" color="green"> | |||
<fo:table space-before.optimum="1in div 12" margin-left="2in div 12" margin-top="1in div 10" font-family="sans-serif" font-size="7pt" color="green" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="8in div 10 - 2in div 12"/> | |||
<fo:table-column border-right-style="solid" border-right-width="0.5mm" column-width="36in div 10"/> | |||
<fo:table-column column-width="5in div 10"/> | |||
@@ -107,7 +107,7 @@ | |||
<fo:block>Från konto nr</fo:block> | |||
</fo:table-cell> | |||
<fo:table-cell border-bottom-style="solid" border-bottom-width="0.13mm" padding-top="6mm" display-align="after"> | |||
<fo:table height="3mm"> | |||
<fo:table height="3mm" table-layout="fixed" width="100%"> | |||
<fo:table-column border-right-style="solid" border-right-width="0.13mm" column-width="0.2in"/> | |||
<fo:table-column border-right-style="solid" border-right-width="0.13mm" column-width="0.2in"/> | |||
<fo:table-column border-right-style="solid" border-right-width="0.13mm" column-width="0.2in"/> | |||
@@ -182,7 +182,7 @@ | |||
<fo:block color="black">16.6.2006</fo:block> | |||
</fo:table-cell> | |||
<fo:table-cell border-bottom-style="solid" border-bottom-width="0.5mm" padding-left="2mm" padding-top="4mm" font-size="10pt"> | |||
<fo:table> | |||
<fo:table table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="0.5cm"/> | |||
<fo:table-column column-width="2cm"/> | |||
<fo:table-body> | |||
@@ -201,7 +201,7 @@ | |||
<fo:table-row height="13in div 12 - 5mm"> | |||
<fo:table-cell number-columns-spanned="4" padding-left="40mm" display-align="after"> | |||
<fo:block> | |||
<fo:table height="5in div 12" margin-left="2.5mm" margin-right="2.5mm"><!--105--> | |||
<fo:table height="5in div 12" margin-left="2.5mm" margin-right="2.5mm" table-layout="fixed" width="100%"><!--105--> | |||
<fo:table-column column-width="0.5mm"/> | |||
<fo:table-column column-width="0.25mm"/> | |||
<fo:table-column column-width="0.25mm"/> | |||
@@ -950,7 +950,7 @@ | |||
</fo:page-sequence> | |||
<fo:page-sequence master-reference="A4"> | |||
<fo:static-content flow-name="xsl-region-after"> | |||
<fo:table space-before.optimum="1in div 12" margin-left="2in div 12" margin-top="1in div 10" font-family="sans-serif" font-size="7pt" color="green"> | |||
<fo:table space-before.optimum="1in div 12" margin-left="2in div 12" margin-top="1in div 10" font-family="sans-serif" font-size="7pt" color="green" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="8in div 10 - 2in div 12"/> | |||
<fo:table-column border-right-style="solid" border-right-width="0.5mm" column-width="36in div 10"/> | |||
<fo:table-column column-width="5in div 10"/> | |||
@@ -1025,7 +1025,7 @@ | |||
<fo:block>Från konto nr</fo:block> | |||
</fo:table-cell> | |||
<fo:table-cell border-bottom-style="solid" border-bottom-width="0.13mm" padding-top="6mm" display-align="after"> | |||
<fo:table height="3mm"> | |||
<fo:table height="3mm" table-layout="fixed" width="100%"> | |||
<fo:table-column border-right-style="solid" border-right-width="0.13mm" column-width="0.2in"/> | |||
<fo:table-column border-right-style="solid" border-right-width="0.13mm" column-width="0.2in"/> | |||
<fo:table-column border-right-style="solid" border-right-width="0.13mm" column-width="0.2in"/> | |||
@@ -1100,7 +1100,7 @@ | |||
<fo:block color="black">16.6.2006</fo:block> | |||
</fo:table-cell> | |||
<fo:table-cell border-bottom-style="solid" border-bottom-width="0.5mm" padding-left="2mm" padding-top="4mm" font-size="10pt"> | |||
<fo:table> | |||
<fo:table table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="0.5cm"/> | |||
<fo:table-column column-width="2cm"/> | |||
<fo:table-body> |
@@ -31,8 +31,6 @@ | |||
odd-or-even="even" /> | |||
<fo:conditional-page-master-reference master-reference="right" | |||
odd-or-even="odd" /> | |||
<!-- recommended fallback procedure --> | |||
<fo:conditional-page-master-reference master-reference="rest" /> | |||
</fo:repeatable-page-master-alternatives> | |||
</fo:page-sequence-master> | |||
</fo:layout-master-set> |
@@ -67,9 +67,9 @@ | |||
<fo:block space-before="12pt" space-after="6pt">The next table has width=100% on the table no column widths specified on the table-column element.</fo:block> | |||
<!-- table start --> | |||
<fo:table border-collapse="separate" table-layout="fixed" width="100%"> | |||
<fo:table-column background-color="yellow"/> | |||
<fo:table-column background-color="blue"/> | |||
<fo:table-column background-color="green"/> | |||
<fo:table-column column-width="proportional-column-width(1)" background-color="yellow"/> | |||
<fo:table-column column-width="proportional-column-width(1)" background-color="blue"/> | |||
<fo:table-column column-width="proportional-column-width(1)" background-color="green"/> | |||
<fo:table-body> | |||
<fo:table-row> | |||
<fo:table-cell display-align="before"><fo:block>Some text to make this cell | |||
@@ -83,7 +83,7 @@ | |||
<fo:block space-before="12pt" space-after="6pt">The next table has fixed column widths=13cm, ipd.optimum=12cm and ipd.max = 100%.</fo:block> | |||
<!-- table start --> | |||
<fo:table border-collapse="separate" | |||
table-layout="fixed" | |||
table-layout="fixed" width="100%" | |||
inline-progression-dimension="12cm" | |||
inline-progression-dimension.maximum="100%" | |||
> | |||
@@ -122,8 +122,8 @@ | |||
<!-- table start --> | |||
<fo:table border-collapse="separate" table-layout="fixed" width="70% + 1cm"> | |||
<fo:table-column column-width="from-parent('width') div 3" background-color="yellow"/> | |||
<fo:table-column background-color="blue"/> | |||
<fo:table-column background-color="green"/> | |||
<fo:table-column column-width="proportional-column-width(1)" background-color="blue"/> | |||
<fo:table-column column-width="proportional-column-width(1)" background-color="green"/> | |||
<fo:table-body> | |||
<fo:table-row> | |||
<fo:table-cell display-align="before"><fo:block>Some text to make this cell | |||
@@ -140,11 +140,11 @@ | |||
</fo:block> | |||
<!-- table start --> | |||
<fo:table border-collapse="separate" | |||
table-layout="fixed" | |||
table-layout="fixed" width="100%" | |||
inline-progression-dimension="15cm"> | |||
<fo:table-column background-color="yellow"/> | |||
<fo:table-column column-width="proportional-column-width(1)" background-color="yellow"/> | |||
<fo:table-column column-width="3cm" background-color="blue"/> | |||
<fo:table-column background-color="green"/> | |||
<fo:table-column column-width="proportional-column-width(1)" background-color="green"/> | |||
<fo:table-body> | |||
<fo:table-row> | |||
<fo:table-cell display-align="before"><fo:block>Some text to make this cell | |||
@@ -159,10 +159,10 @@ | |||
The next table specifies neither width nor inline-progression-dimension. | |||
</fo:block> | |||
<!-- table start --> | |||
<fo:table table-layout="fixed" border-collapse="separate"> | |||
<fo:table-column background-color="yellow"/> | |||
<fo:table table-layout="fixed" width="100%" border-collapse="separate"> | |||
<fo:table-column column-width="proportional-column-width(1)" background-color="yellow"/> | |||
<fo:table-column column-width="3cm" background-color="blue"/> | |||
<fo:table-column background-color="green"/> | |||
<fo:table-column column-width="proportional-column-width(1)" background-color="green"/> | |||
<fo:table-body> | |||
<fo:table-row> | |||
<fo:table-cell display-align="before"><fo:block>Some text to make this cell | |||
@@ -178,11 +178,11 @@ | |||
specifies a column width of 5cm on the middle column only. | |||
</fo:block> | |||
<!-- table start --> | |||
<fo:table table-layout="fixed" border-collapse="separate" | |||
<fo:table table-layout="fixed" width="100%" border-collapse="separate" | |||
inline-progression-dimension.minimum="10cm"> | |||
<fo:table-column background-color="yellow"/> | |||
<fo:table-column column-width="proportional-column-width(1)" background-color="yellow"/> | |||
<fo:table-column column-width="5cm" background-color="blue"/> | |||
<fo:table-column background-color="green"/> | |||
<fo:table-column column-width="proportional-column-width(1)" background-color="green"/> | |||
<fo:table-body> | |||
<fo:table-row> | |||
<fo:table-cell display-align="before"><fo:block>Some text to make this cell | |||
@@ -194,17 +194,17 @@ | |||
</fo:table> | |||
<fo:block space-before="12pt" space-after="6pt"> | |||
The next table specifies inline-progression-dimension.minimum="10cm", | |||
inline-progression-dimension.maximum="17cm and | |||
The next table specifies inline-progression-dimension.minimum="10cm", | |||
inline-progression-dimension.maximum="17cm and | |||
specifies a column width of 5cm on the middle column only. | |||
</fo:block> | |||
<!-- table start --> | |||
<fo:table table-layout="fixed" border-collapse="separate" | |||
<fo:table table-layout="fixed" width="100%" border-collapse="separate" | |||
inline-progression-dimension.minimum="10cm" | |||
inline-progression-dimension.maximum="17cm"> | |||
<fo:table-column background-color="yellow"/> | |||
<fo:table-column column-width="proportional-column-width(1)" background-color="yellow"/> | |||
<fo:table-column column-width="5cm" background-color="blue"/> | |||
<fo:table-column background-color="green"/> | |||
<fo:table-column column-width="proportional-column-width(1)" background-color="green"/> | |||
<fo:table-body> | |||
<fo:table-row> | |||
<fo:table-cell display-align="before"><fo:block>Some text to make this cell |
@@ -127,6 +127,7 @@ | |||
</target> | |||
<!-- =================================================================== --> | |||
<!-- Compares new test pdf files to reference pdf files --> | |||
<!-- N.B. All comparisons fail due to differences in /CreationDate --> | |||
<!-- =================================================================== --> | |||
<target name="comparePDF" depends="newPDF"> | |||
<compare referenceDirectory="${referenceDir}" testDirectory="${testDir}" filenames="normal.pdf,table.pdf,list.pdf,link.pdf,border.pdf,images.pdf,extensive.pdf,readme.pdf,fonts.pdf,bordershorthand.pdf,character.pdf,corresprop.pdf,hyphen.pdf,inhprop.pdf,instream.pdf,leader.pdf,newlinktest.pdf,normalex.pdf,pdfoutline.pdf,simple.pdf,textdeko.pdf,tableunits.pdf"/> | |||
@@ -144,6 +145,7 @@ | |||
<!-- =================================================================== --> | |||
<!-- Starts the test --> | |||
<!-- N.B. All tests fail due to differences in /CreationDate --> | |||
<!-- =================================================================== --> | |||
<target name="runtest" depends="comparePDF"> | |||
<echo message="Running Fop tests"/> | |||
@@ -154,6 +156,9 @@ | |||
<target name="clean" depends="init"> | |||
<delete dir="${testDir}"/> | |||
</target> | |||
<target name="cleantest" depends="init"> | |||
<delete dir="${referenceDir}"/> | |||
</target> | |||
</project> | |||
<!-- End of file --> |
@@ -794,7 +794,7 @@ XML Syntax | |||
<fo:block> | |||
Here we have some examples of how the XML can be specified in the fo document. | |||
<fo:block> | |||
<fo:table> | |||
<fo:table table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="350pt"/> | |||
<fo:table-column column-width="150pt"/> | |||
<fo:table-body> | |||
@@ -932,7 +932,7 @@ Sizing | |||
The size of the instream-foreign-object is obtained in a number of ways. | |||
<fo:block> | |||
<fo:table xmlns:svg="http://www.w3.org/2000/svg"> | |||
<fo:table xmlns:svg="http://www.w3.org/2000/svg" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="350pt"/> | |||
<fo:table-column column-width="150pt"/> | |||
<fo:table-body> |
@@ -30,7 +30,7 @@ | |||
Table 1: cell background | |||
</fo:block> | |||
<fo:table> | |||
<fo:table table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -72,7 +72,7 @@ | |||
Table 1: row background | |||
</fo:block> | |||
<fo:table> | |||
<fo:table table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -152,7 +152,7 @@ | |||
Table 1: column background | |||
</fo:block> | |||
<fo:table> | |||
<fo:table table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm" background-color="green"/> | |||
<fo:table-column column-width="3cm" background-color="red"/> | |||
<fo:table-column column-width="3cm" background-color="blue"/> | |||
@@ -219,7 +219,7 @@ | |||
Table 1: column backgrounds over page | |||
</fo:block> | |||
<fo:table> | |||
<fo:table table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm" background-color="green"/> | |||
<fo:table-column column-width="3cm" background-color="red"/> | |||
<fo:table-column column-width="3cm" background-color="blue"/> | |||
@@ -286,7 +286,7 @@ | |||
Table 1: body background | |||
</fo:block> | |||
<fo:table> | |||
<fo:table table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -323,7 +323,7 @@ | |||
</fo:table-body> | |||
</fo:table> | |||
<fo:table> | |||
<fo:table table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -360,7 +360,7 @@ | |||
</fo:table-body> | |||
</fo:table> | |||
<fo:table> | |||
<fo:table table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -397,7 +397,7 @@ | |||
</fo:table-body> | |||
</fo:table> | |||
<fo:table> | |||
<fo:table table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -438,7 +438,7 @@ | |||
Table 1: table background | |||
</fo:block> | |||
<fo:table background-color="green"> | |||
<fo:table background-color="green" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -475,7 +475,7 @@ | |||
</fo:table-body> | |||
</fo:table> | |||
<fo:table background-color="red"> | |||
<fo:table background-color="red" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -516,7 +516,7 @@ | |||
Table 1: combinations | |||
</fo:block> | |||
<fo:table background-color="green"> | |||
<fo:table background-color="green" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="2.5cm"/> | |||
<fo:table-column column-width="2.5cm" background-color="green"/> | |||
<fo:table-column column-width="2.5cm" background-color="red"/> |
@@ -30,7 +30,7 @@ | |||
Table 1: cell borders | |||
</fo:block> | |||
<fo:table border-collapse="separate"> | |||
<fo:table border-collapse="separate" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -186,7 +186,7 @@ | |||
Table 2: row borders | |||
</fo:block> | |||
<fo:table border-collapse="collapse"> | |||
<fo:table border-collapse="collapse" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -310,7 +310,7 @@ | |||
Table 3: column borders | |||
</fo:block> | |||
<fo:table border-collapse="collapse"> | |||
<fo:table border-collapse="collapse" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm" border-left-color="green" border-left-width="0.5pt" border-left-style="solid"/> | |||
<fo:table-column column-width="3cm" border-top-color="red" border-top-width="0.5pt" border-top-style="solid"/> | |||
<fo:table-column column-width="3cm" border-right-color="blue" border-right-width="0.5pt" border-right-style="solid"/> | |||
@@ -377,7 +377,7 @@ | |||
Table 4: column borders over page | |||
</fo:block> | |||
<fo:table border-collapse="collapse"> | |||
<fo:table border-collapse="collapse" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm" border-left-color="green" border-left-width="0.5pt" border-left-style="solid"/> | |||
<fo:table-column column-width="3cm" border-top-color="red" border-top-width="0.5pt" border-top-style="solid"/> | |||
<fo:table-column column-width="3cm" border-right-color="blue" border-right-width="0.5pt" border-right-style="solid"/> | |||
@@ -444,7 +444,7 @@ | |||
Table 5: body borders | |||
</fo:block> | |||
<fo:table border-collapse="separate"> | |||
<fo:table border-collapse="separate" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -480,7 +480,7 @@ | |||
</fo:table-body> | |||
</fo:table> | |||
<fo:table border-collapse="separate"> | |||
<fo:table border-collapse="separate" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -516,7 +516,7 @@ | |||
</fo:table-body> | |||
</fo:table> | |||
<fo:table border-collapse="separate"> | |||
<fo:table border-collapse="separate" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -552,7 +552,7 @@ | |||
</fo:table-body> | |||
</fo:table> | |||
<fo:table border-collapse="separate"> | |||
<fo:table border-collapse="separate" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -588,7 +588,7 @@ | |||
</fo:table-body> | |||
</fo:table> | |||
<fo:table border-collapse="separate"> | |||
<fo:table border-collapse="separate" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -628,8 +628,7 @@ | |||
Table 6: table borders | |||
</fo:block> | |||
<fo:table border-left-color="green" border-left-width="0.5pt" border-left-style="solid" | |||
border-collapse="separate"> | |||
<fo:table border-left-color="green" border-left-width="0.5pt" border-left-style="solid" border-collapse="separate" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -665,7 +664,7 @@ | |||
</fo:table-body> | |||
</fo:table> | |||
<fo:table border-top-color="red" border-top-width="0.5pt" border-top-style="solid" border-collapse="separate"> | |||
<fo:table border-top-color="red" border-top-width="0.5pt" border-top-style="solid" border-collapse="separate" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -701,7 +700,7 @@ | |||
</fo:table-body> | |||
</fo:table> | |||
<fo:table border-right-color="blue" border-right-width="0.5pt" border-right-style="solid" border-collapse="separate"> | |||
<fo:table border-right-color="blue" border-right-width="0.5pt" border-right-style="solid" border-collapse="separate" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -737,7 +736,7 @@ | |||
</fo:table-body> | |||
</fo:table> | |||
<fo:table border-bottom-color="yellow" border-bottom-width="0.5pt" border-bottom-style="solid" border-collapse="separate"> | |||
<fo:table border-bottom-color="yellow" border-bottom-width="0.5pt" border-bottom-style="solid" border-collapse="separate" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -773,7 +772,7 @@ | |||
</fo:table-body> | |||
</fo:table> | |||
<fo:table border-color="orange" border-width="0.5pt" border-style="solid" border-collapse="separate"> | |||
<fo:table border-color="orange" border-width="0.5pt" border-style="solid" border-collapse="separate" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -813,7 +812,7 @@ | |||
Table 7: combinations | |||
</fo:block> | |||
<fo:table border-left-color="green" border-left-width="0.5pt" border-left-style="solid" border-collapse="collapse"> | |||
<fo:table border-left-color="green" border-left-width="0.5pt" border-left-style="solid" border-collapse="collapse" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="2.5cm"/> | |||
<fo:table-column column-width="2.5cm" border-left-color="green" border-left-width="0.5pt" border-left-style="solid"/> | |||
<fo:table-column column-width="2.5cm" border-top-color="red" border-top-width="0.5pt" border-top-style="solid"/> | |||
@@ -1025,7 +1024,7 @@ | |||
implementation status. | |||
</fo:block> | |||
<fo:table border-collapse="collapse" table-layout="fixed"> | |||
<fo:table border-collapse="collapse" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm" border-color="blue" border-width="0.5pt" border-style="solid"/> | |||
<fo:table-column column-width="3cm" border-color="blue" border-width="0.5pt" border-style="solid"/> | |||
<fo:table-column column-width="3cm" border-color="blue" border-width="0.5pt" border-style="solid"/> | |||
@@ -1090,7 +1089,7 @@ | |||
fo:table-cell level. | |||
</fo:block> | |||
<fo:table border-collapse="collapse" table-layout="fixed"> | |||
<fo:table border-collapse="collapse" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -1159,7 +1158,7 @@ | |||
Check the FOP compliance page for current implementation status. | |||
</fo:block> | |||
<fo:table border-collapse="collapse" table-layout="fixed" | |||
<fo:table border-collapse="collapse" table-layout="fixed" width="100%" | |||
border-style="solid" border-width="5pt" border-color="yellow"> | |||
<fo:table-column column-width="3cm" | |||
border-style="solid" border-width="3pt" border-color="black"/> | |||
@@ -1264,7 +1263,7 @@ | |||
the border properties differ only on color. | |||
</fo:block> | |||
<fo:table border-collapse="collapse" table-layout="fixed"> | |||
<fo:table border-collapse="collapse" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm" | |||
border-style="solid" border-width="3pt" border-color="black"/> |
@@ -34,7 +34,7 @@ | |||
Table 1: basic break after with next | |||
</fo:block> | |||
<fo:table border-width="0.5pt" border-color="red"> | |||
<fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -81,7 +81,7 @@ | |||
Table 2: basic break before with next | |||
</fo:block> | |||
<fo:table border-width="0.5pt" border-color="red"> | |||
<fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -128,7 +128,7 @@ | |||
Table 3: basic break before a keep with next | |||
</fo:block> | |||
<fo:table border-width="0.5pt" border-color="red"> | |||
<fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -175,7 +175,7 @@ | |||
Table 4: basic break after a keep with previous | |||
</fo:block> | |||
<fo:table border-width="0.5pt" border-color="red"> | |||
<fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -222,7 +222,7 @@ | |||
Table 5: basic break after a keep with previous | |||
</fo:block> | |||
<fo:table border-width="0.5pt" border-color="red"> | |||
<fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> |
@@ -30,7 +30,7 @@ | |||
Table 1: with header | |||
</fo:block> | |||
<fo:table> | |||
<fo:table table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="2cm"/> | |||
<fo:table-column column-width="2cm"/> | |||
<fo:table-column column-width="2cm"/> | |||
@@ -311,7 +311,7 @@ | |||
Table 2: with footer | |||
</fo:block> | |||
<fo:table> | |||
<fo:table table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="2cm"/> | |||
<fo:table-column column-width="2cm"/> | |||
<fo:table-column column-width="2cm"/> | |||
@@ -592,7 +592,7 @@ | |||
Table 3: with header and footer and keeps | |||
</fo:block> | |||
<fo:table> | |||
<fo:table table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="2cm"/> | |||
<fo:table-column column-width="2cm"/> | |||
<fo:table-column column-width="2cm"/> | |||
@@ -888,7 +888,7 @@ | |||
Table 4: cells spanning columns | |||
</fo:block> | |||
<fo:table> | |||
<fo:table table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="2cm"/> | |||
<fo:table-column column-width="2cm"/> | |||
<fo:table-column column-width="2cm"/> | |||
@@ -940,7 +940,7 @@ | |||
Table 5: cells spanning rows | |||
</fo:block> | |||
<fo:table> | |||
<fo:table table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="48pt"/> | |||
<fo:table-column column-width="48pt"/> | |||
<fo:table-column column-width="48pt"/> | |||
@@ -1054,7 +1054,7 @@ | |||
Table 6: table with header and multiple body's | |||
</fo:block> | |||
<fo:table> | |||
<fo:table table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="2cm"/> | |||
<fo:table-column column-width="2cm"/> | |||
<fo:table-column column-width="2cm"/> | |||
@@ -1242,7 +1242,7 @@ | |||
Table 6: table with footer and multiple body's | |||
</fo:block> | |||
<fo:table> | |||
<fo:table table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="2cm"/> | |||
<fo:table-column column-width="2cm"/> | |||
<fo:table-column column-width="2cm"/> |
@@ -34,7 +34,7 @@ | |||
Table 1: basic keep with next | |||
</fo:block> | |||
<fo:table border-width="0.5pt" border-color="red"> | |||
<fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -81,7 +81,7 @@ | |||
Table 1: basic keep with previous | |||
</fo:block> | |||
<fo:table border-width="0.5pt" border-color="red"> | |||
<fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -128,7 +128,7 @@ | |||
Table 1: basic keep with next and keep with previous | |||
</fo:block> | |||
<fo:table border-width="0.5pt" border-color="red"> | |||
<fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -192,7 +192,7 @@ | |||
Table 1: basic multiple keep with next after normal row | |||
</fo:block> | |||
<fo:table border-width="0.5pt" border-color="red"> | |||
<fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -324,7 +324,7 @@ | |||
Table 1: basic multiple keep (next and previous) after normal row | |||
</fo:block> | |||
<fo:table border-width="0.5pt" border-color="red"> | |||
<fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="6cm"/> | |||
@@ -456,7 +456,7 @@ | |||
Table 1: basic multiple keep with next after normal row with normal row in middle | |||
</fo:block> | |||
<fo:table border-width="0.5pt" border-color="red"> | |||
<fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="6cm"/> |
@@ -30,7 +30,7 @@ | |||
Table 1: with header | |||
</fo:block> | |||
<fo:table table-omit-header-at-break="true"> | |||
<fo:table table-omit-header-at-break="true" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="2cm"/> | |||
<fo:table-column column-width="2cm"/> | |||
<fo:table-column column-width="2cm"/> | |||
@@ -311,7 +311,7 @@ | |||
Table 2: with footer | |||
</fo:block> | |||
<fo:table table-omit-footer-at-break="true"> | |||
<fo:table table-omit-footer-at-break="true" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="2cm"/> | |||
<fo:table-column column-width="2cm"/> | |||
<fo:table-column column-width="2cm"/> | |||
@@ -592,7 +592,7 @@ | |||
Table 3: with header and footer and keeps | |||
</fo:block> | |||
<fo:table table-omit-header-at-break="true" table-omit-footer-at-break="true"> | |||
<fo:table table-omit-header-at-break="true" table-omit-footer-at-break="true" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="2cm"/> | |||
<fo:table-column column-width="2cm"/> | |||
<fo:table-column column-width="2cm"/> | |||
@@ -888,7 +888,7 @@ | |||
Table 6: table with multiple body's | |||
</fo:block> | |||
<fo:table table-omit-header-at-break="true"> | |||
<fo:table table-omit-header-at-break="true" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="2cm"/> | |||
<fo:table-column column-width="2cm"/> | |||
<fo:table-column column-width="2cm"/> | |||
@@ -1076,7 +1076,7 @@ | |||
Table 6: table with multiple body's | |||
</fo:block> | |||
<fo:table table-omit-footer-at-break="true"> | |||
<fo:table table-omit-footer-at-break="true" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="2cm"/> | |||
<fo:table-column column-width="2cm"/> | |||
<fo:table-column column-width="2cm"/> |
@@ -30,7 +30,7 @@ | |||
Table 1: spaces around cells | |||
</fo:block> | |||
<fo:table border-style="solid" border-width="0.5pt" border-color="red"> | |||
<fo:table border-style="solid" border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -109,7 +109,7 @@ | |||
Table 2: spaces around rows | |||
</fo:block> | |||
<fo:table border-style="solid" border-width="0.5pt" border-color="red"> | |||
<fo:table border-style="solid" border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -190,7 +190,7 @@ | |||
Table 3: spaces around body | |||
</fo:block> | |||
<fo:table border-style="solid" border-width="0.5pt" border-color="red"> | |||
<fo:table border-style="solid" border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -281,7 +281,7 @@ | |||
</fo:block> | |||
<fo:block border-style="solid" border-width="0.5pt"> | |||
<fo:table space-before.optimum="5pt" border-style="solid" border-width="0.5pt" border-color="red"> | |||
<fo:table space-before.optimum="5pt" border-style="solid" border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -309,7 +309,7 @@ | |||
</fo:block> | |||
<fo:block border-style="solid" border-width="0.5pt"> | |||
<fo:table padding-left="5pt" border-style="solid" border-width="0.5pt" border-color="red"> | |||
<fo:table padding-left="5pt" border-style="solid" border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -337,7 +337,7 @@ | |||
</fo:block> | |||
<fo:block border-style="solid" border-width="0.5pt"> | |||
<fo:table padding-right="5pt" border-style="solid" border-width="0.5pt" border-color="red"> | |||
<fo:table padding-right="5pt" border-style="solid" border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -365,7 +365,7 @@ | |||
</fo:block> | |||
<fo:block border-style="solid" border-width="0.5pt"> | |||
<fo:table space-after.optimum="5pt" border-style="solid" border-width="0.5pt" border-color="red"> | |||
<fo:table space-after.optimum="5pt" border-style="solid" border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -397,7 +397,7 @@ | |||
</fo:block> | |||
<fo:block border-style="solid" border-width="0.5pt"> | |||
<fo:table space-after.optimum="20pt" border-style="solid" border-width="0.5pt" border-color="red"> | |||
<fo:table space-after.optimum="20pt" border-style="solid" border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
@@ -462,7 +462,7 @@ | |||
</fo:block> | |||
<fo:block border-style="solid" border-width="0.5pt"> | |||
<fo:table space-after.optimum="5pt" border-style="solid" border-width="0.5pt" border-color="red"> | |||
<fo:table space-after.optimum="5pt" border-style="solid" border-width="0.5pt" border-color="red" table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> | |||
<fo:table-column column-width="3cm"/> |
@@ -1,5 +1,14 @@ | |||
<?xml version="1.0" encoding="utf-8"?> | |||
<FindBugsFilter> | |||
<Match> | |||
<Class name="org.apache.fop.fonts.truetype.TTFFile$1"/> | |||
<Bug pattern="SIC_INNER_SHOULD_BE_STATIC_ANON"/> | |||
</Match> | |||
<Match> | |||
<Class name="org.apache.fop.fonts.truetype.FontFileReader"/> | |||
<Method name="getAllBytes"/> | |||
<Bug pattern="EI_EXPOSE_REP"/> | |||
</Match> | |||
<Match> | |||
<Class name="org.apache.fop.fo.properties.FontFamilyProperty"/> | |||
<Bug pattern="EQ_DOESNT_OVERRIDE_EQUALS"/> | |||
@@ -949,11 +958,6 @@ | |||
<Method name="getInputStreamOnFont"/> | |||
<Bug pattern="RV_EXCEPTION_NOT_THROWN"/> | |||
</Match> | |||
<Match> | |||
<Class name="org.apache.fop.hyphenation.HyphenationTreeCache"/> | |||
<Method name="constructUserKey"/> | |||
<Bug pattern="RV_RETURN_VALUE_IGNORED"/> | |||
</Match> | |||
<Match> | |||
<Class name="org.apache.fop.afp.AFPResourceLevel"/> | |||
<Method name="equals"/> | |||
@@ -5162,4 +5166,41 @@ | |||
<Method name="getNonEmptyLevels"/> | |||
<Bug pattern="PZLA_PREFER_ZERO_LENGTH_ARRAYS"/> | |||
</Match> | |||
<Match> | |||
<Class name="org.apache.fop.render.pdf.AbstractImageAdapter"/> | |||
<Method name="populateXObjectDictionaryForIndexColorModel"/> | |||
<Bug pattern="OS_OPEN_STREAM"/> | |||
</Match> | |||
<Match> | |||
<Class name="org.apache.fop.render.pdf.ImageRawPNGAdapter"/> | |||
<Or> | |||
<Method name="outputContents"/> | |||
<Method name="setup"/> | |||
</Or> | |||
<Or> | |||
<Bug pattern="OS_OPEN_STREAM"/> | |||
<Bug pattern="OS_OPEN_STREAM_EXCEPTION_PATH"/> | |||
</Or> | |||
</Match> | |||
<Match> | |||
<Class name="org.apache.fop.render.ps.ImageEncoderPNG"/> | |||
<Method name="writeTo"/> | |||
<Bug pattern="OS_OPEN_STREAM"/> | |||
</Match> | |||
<Match> | |||
<Or> | |||
<Class name="org.apache.fop.render.pdf.PDFImageHandlerRawPNG"/> | |||
<Class name="org.apache.fop.render.ps.PSImageHandlerRawPNG"/> | |||
</Or> | |||
<Method name="getSupportedImageFlavors"/> | |||
<Bug pattern="EI_EXPOSE_REP"/> | |||
</Match> | |||
<Match> | |||
<Class name="org.apache.fop.render.ps.PSImageHandlerRawPNG"/> | |||
<Or> | |||
<Method name="handleImage"/> | |||
<Method name="generateForm"/> | |||
</Or> | |||
<Bug pattern="BC_UNCONFIRMED_CAST"/> | |||
</Match> | |||
</FindBugsFilter> |
@@ -1,34 +1,34 @@ | |||
# redirect moved files | |||
RedirectMatch Permanent ^/fop/anttask(.*) http://xmlgraphics.apache.org/fop/1.1/anttask$1 | |||
RedirectMatch Permanent ^/fop/compiling(.*) http://xmlgraphics.apache.org/fop/1.1/compiling$1 | |||
RedirectMatch Permanent ^/fop/configuration(.*) http://xmlgraphics.apache.org/fop/1.1/configuration$1 | |||
RedirectMatch Permanent ^/fop/embedding(.*) http://xmlgraphics.apache.org/fop/1.1/embedding$1 | |||
RedirectMatch Permanent ^/fop/extensions(.*) http://xmlgraphics.apache.org/fop/1.1/extensions$1 | |||
RedirectMatch Permanent ^/fop/fonts(.*) http://xmlgraphics.apache.org/fop/1.1/fonts$1 | |||
RedirectMatch Permanent ^/fop/graphics(.*) http://xmlgraphics.apache.org/fop/1.1/graphics$1 | |||
RedirectMatch Permanent ^/fop/hyphenation(.*) http://xmlgraphics.apache.org/fop/1.1/hyphenation$1 | |||
RedirectMatch Permanent ^/fop/intermediate(.*) http://xmlgraphics.apache.org/fop/1.1/intermediate$1 | |||
RedirectMatch Permanent ^/fop/output(.*) http://xmlgraphics.apache.org/fop/1.1/output$1 | |||
RedirectMatch Permanent ^/fop/pdfa(.*) http://xmlgraphics.apache.org/fop/1.1/pdfa$1 | |||
RedirectMatch Permanent ^/fop/pdfencryption(.*) http://xmlgraphics.apache.org/fop/1.1/pdfencryption$1 | |||
RedirectMatch Permanent ^/fop/pdfx(.*) http://xmlgraphics.apache.org/fop/1.1/pdfx$1 | |||
RedirectMatch Permanent ^/fop/running(.*) http://xmlgraphics.apache.org/fop/1.1/running$1 | |||
RedirectMatch Permanent ^/fop/servlets(.*) http://xmlgraphics.apache.org/fop/1.1/servlets$1 | |||
RedirectMatch Permanent ^/fop/upgrading(.*) http://xmlgraphics.apache.org/fop/1.1/upgrading$1 | |||
RedirectMatch Permanent ^/fop/anttask(.*) http://xmlgraphics.apache.org/fop/1.1rc1/anttask$1 | |||
RedirectMatch Permanent ^/fop/compiling(.*) http://xmlgraphics.apache.org/fop/1.1rc1/compiling$1 | |||
RedirectMatch Permanent ^/fop/configuration(.*) http://xmlgraphics.apache.org/fop/1.1rc1/configuration$1 | |||
RedirectMatch Permanent ^/fop/embedding(.*) http://xmlgraphics.apache.org/fop/1.1rc1/embedding$1 | |||
RedirectMatch Permanent ^/fop/extensions(.*) http://xmlgraphics.apache.org/fop/1.1rc1/extensions$1 | |||
RedirectMatch Permanent ^/fop/fonts(.*) http://xmlgraphics.apache.org/fop/1.1rc1/fonts$1 | |||
RedirectMatch Permanent ^/fop/graphics(.*) http://xmlgraphics.apache.org/fop/1.1rc1/graphics$1 | |||
RedirectMatch Permanent ^/fop/hyphenation(.*) http://xmlgraphics.apache.org/fop/1.1rc1/hyphenation$1 | |||
RedirectMatch Permanent ^/fop/intermediate(.*) http://xmlgraphics.apache.org/fop/1.1rc1/intermediate$1 | |||
RedirectMatch Permanent ^/fop/output(.*) http://xmlgraphics.apache.org/fop/1.1rc1/output$1 | |||
RedirectMatch Permanent ^/fop/pdfa(.*) http://xmlgraphics.apache.org/fop/1.1rc1/pdfa$1 | |||
RedirectMatch Permanent ^/fop/pdfencryption(.*) http://xmlgraphics.apache.org/fop/1.1rc1/pdfencryption$1 | |||
RedirectMatch Permanent ^/fop/pdfx(.*) http://xmlgraphics.apache.org/fop/1.1rc1/pdfx$1 | |||
RedirectMatch Permanent ^/fop/running(.*) http://xmlgraphics.apache.org/fop/1.1rc1/running$1 | |||
RedirectMatch Permanent ^/fop/servlets(.*) http://xmlgraphics.apache.org/fop/1.1rc1/servlets$1 | |||
RedirectMatch Permanent ^/fop/upgrading(.*) http://xmlgraphics.apache.org/fop/1.1rc1/upgrading$1 | |||
# redirect to versioned documentation | |||
# Current stable release | |||
Redirect Temp /fop/stable http://xmlgraphics.apache.org/fop/1.1 | |||
Redirect Temp /fop/stable http://xmlgraphics.apache.org/fop/1.0 | |||
# Current unstable release (or trunk if no beta is the latest release) | |||
Redirect Temp /fop/unstable http://xmlgraphics.apache.org/fop/trunk | |||
Redirect Temp /fop/unstable http://xmlgraphics.apache.org/fop/1.1rc1 | |||
# Latest release | |||
Redirect Temp /fop/current http://xmlgraphics.apache.org/fop/1.1 | |||
Redirect Temp /fop/latest http://xmlgraphics.apache.org/fop/1.1 | |||
Redirect Temp /fop/current http://xmlgraphics.apache.org/fop/1.0 | |||
Redirect Temp /fop/latest http://xmlgraphics.apache.org/fop/1.0 | |||
# Previous stable release | |||
Redirect Temp /fop/previous http://xmlgraphics.apache.org/fop/1.0 | |||
Redirect Temp /fop/previous http://xmlgraphics.apache.org/fop/0.95 | |||
# Old releases | |||
Redirect Temp /fop/maintenance http://xmlgraphics.apache.org/fop/0.95 |
@@ -76,16 +76,23 @@ | |||
</asfext:implements> | |||
<release> | |||
<Version> | |||
<name>Previous stable release</name> | |||
<name>Upcoming release (candidate)</name> | |||
<created>2012-07-02</created> | |||
<revision>1.1rc1</revision> | |||
</Version> | |||
</release | |||
<release> | |||
<Version> | |||
<name>Current release (stable)</name> | |||
<created>2010-07-21</created> | |||
<revision>1.0</revision> | |||
</Version> | |||
</release> | |||
</release | |||
<release> | |||
<Version> | |||
<name>Latest stable release</name> | |||
<created>2012-MM-DD</created> | |||
<revision>1.1</revision> | |||
<name>Previous release (stable)</name> | |||
<created>2008-08-05</created> | |||
<revision>0.95</revision> | |||
</Version> | |||
</release> | |||
<repository> |
@@ -1,85 +0,0 @@ | |||
<?xml version="1.0" encoding="UTF-8" ?> | |||
<!-- | |||
Licensed to the Apache Software Foundation (ASF) under one or more | |||
contributor license agreements. See the NOTICE file distributed with | |||
this work for additional information regarding copyright ownership. | |||
The ASF licenses this file to You under the Apache License, Version 2.0 | |||
(the "License"); you may not use this file except in compliance with | |||
the License. You may obtain a copy of the License at | |||
http://www.apache.org/licenses/LICENSE-2.0 | |||
Unless required by applicable law or agreed to in writing, software | |||
distributed under the License is distributed on an "AS IS" BASIS, | |||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |||
See the License for the specific language governing permissions and | |||
limitations under the License. | |||
--> | |||
<!-- $Id$ --> | |||
<known-issues> | |||
<!-- NEED TO REVIEW ALL OF THE FOLLOWING | |||
<known-issue> | |||
MIF and SVG output support have not been restored, yet. | |||
</known-issue> | |||
<known-issue> | |||
RTF output is inferior to other output formats supported by FOP. | |||
For details, please see the "Output Targets" page of the release | |||
you're using. | |||
</known-issue> | |||
<known-issue> | |||
Auto table layout is not implemented, yet. | |||
</known-issue> | |||
<known-issue> | |||
Footnotes may overlap with text of the region-body in multi-column | |||
documents. | |||
</known-issue> | |||
<known-issue> | |||
Space resolution does not work between footnote regions. | |||
</known-issue> | |||
<known-issue> | |||
Block containers with no height currently don't create a fence for | |||
spaces as they should (they behave like a normal block). | |||
</known-issue> | |||
<known-issue> | |||
Preserved linefeeds in fo:character are not handled correctly. | |||
</known-issue> | |||
<known-issue> | |||
An empty block currently produces a fence for stacking constraints | |||
which it shouldn't. | |||
</known-issue> | |||
<known-issue> | |||
There are several small problems around white space handling. | |||
</known-issue> | |||
<known-issue> | |||
Images currently don't shrink so they fit on a page when they are | |||
too big and shrinking is allowed to happen. | |||
</known-issue> | |||
<known-issue> | |||
Inline container may not work as expected. | |||
</known-issue> | |||
<known-issue> | |||
The letter-spacing and word-spacing properties may not work as expected. | |||
</known-issue> | |||
<known-issue> | |||
Leaders with leader-pattern="use-content" may not work as expected. | |||
</known-issue> | |||
<known-issue> | |||
The keep-with-previous property doesn't work inside tables and lists, yet. | |||
</known-issue> | |||
<known-issue> | |||
If two consecutive pages don't have the same available width, the | |||
content currently isn't properly fit into the available space on | |||
the new page. | |||
</known-issue> | |||
<known-issue> | |||
Background images on page number citations are not placed correctly. | |||
</known-issue> | |||
<known-issue> | |||
Not all FO elements can be referenced by their "id", most notably: | |||
table-body, table-header, table-footer and table-row. | |||
</known-issue> | |||
<known-issue> | |||
Border and padding conditionality are not supported on table-cells, yet. | |||
</known-issue> | |||
--> | |||
</known-issues> |
@@ -26,7 +26,7 @@ | |||
<title>Overview</title> | |||
<p> | |||
This page describes the | |||
<a href="http://en.wikipedia.org/wiki/Complex_scripts">complex scripts</a> | |||
<link href="http://en.wikipedia.org/wiki/Complex_scripts">complex scripts</link> | |||
features of Apache™ FOP, which include: | |||
</p> | |||
<ul> | |||
@@ -80,16 +80,16 @@ | |||
sufficient. In these cases, an author may make use of the following XSL-FO constructs: | |||
</p> | |||
<ul> | |||
<li>The <a href="http://www.w3.org/TR/2006/REC-xsl11-20061205/#script"><code>script</code></a> property.</li> | |||
<li>The <a href="http://www.w3.org/TR/2006/REC-xsl11-20061205/#language"><code>language</code></a> property.</li> | |||
<li>The <a href="http://www.w3.org/TR/2006/REC-xsl11-20061205/#writing-mode"><code>writing-mode</code></a> property.</li> | |||
<li>The <link href="http://www.w3.org/TR/2006/REC-xsl11-20061205/#script"><code>script</code></link> property.</li> | |||
<li>The <link href="http://www.w3.org/TR/2006/REC-xsl11-20061205/#language"><code>language</code></link> property.</li> | |||
<li>The <link href="http://www.w3.org/TR/2006/REC-xsl11-20061205/#writing-mode"><code>writing-mode</code></link> property.</li> | |||
<li>The number to string conversion properties: | |||
<a href="http://www.w3.org/TR/2006/REC-xsl11-20061205/#format"><code>format</code></a>, | |||
<a href="http://www.w3.org/TR/2006/REC-xsl11-20061205/#grouping-separator"><code>grouping-separator</code></a>, | |||
<a href="http://www.w3.org/TR/2006/REC-xsl11-20061205/#grouping-size"><code>grouping-size</code></a>, | |||
<a href="http://www.w3.org/TR/2006/REC-xsl11-20061205/#letter-value"><code>letter-value</code></a>, | |||
<link href="http://www.w3.org/TR/2006/REC-xsl11-20061205/#format"><code>format</code></link>, | |||
<link href="http://www.w3.org/TR/2006/REC-xsl11-20061205/#grouping-separator"><code>grouping-separator</code></link>, | |||
<link href="http://www.w3.org/TR/2006/REC-xsl11-20061205/#grouping-size"><code>grouping-size</code></link>, | |||
<link href="http://www.w3.org/TR/2006/REC-xsl11-20061205/#letter-value"><code>letter-value</code></link>, | |||
and <code>fox:number-conversion-features</code>.</li> | |||
<li>The <a href="http://www.w3.org/TR/2006/REC-xsl11-20061205/#fo_bidi-override"><code>fo:bidi-override</code></a> element.</li> | |||
<li>The <link href="http://www.w3.org/TR/2006/REC-xsl11-20061205/#fo_bidi-override"><code>fo:bidi-override</code></link> element.</li> | |||
<li>Explicit bidirectional control characters: U+200E LRM, U+200F RLM, U+202A LRE, | |||
U+202B RLE, U+202C PDF, U+202D LRO, U+202E RLO.</li> | |||
<li>Explicit join control characters: U+200C ZWNJ and U+200D ZWJ.</li> | |||
@@ -107,7 +107,7 @@ | |||
</p> | |||
<ol> | |||
<li>If the FO element that governs the text specifies a | |||
<a href="http://www.w3.org/TR/2006/REC-xsl11-20061205/#script"><code>script</code></a> | |||
<link href="http://www.w3.org/TR/2006/REC-xsl11-20061205/#script"><code>script</code></link> | |||
property and its value is not the empty string or <code>"auto"</code>, then that script is used.</li> | |||
<li>Otherwise, the dominant script of the text is determined automatically by finding the | |||
script whose constituent characters appear most frequently in the text.</li> | |||
@@ -115,8 +115,8 @@ | |||
<p>In case the automatic algorithm does not produce the desired results, an author may | |||
explicitly specify a <code>script</code> property with the desired script. If specified, | |||
it must be one of the four-letter script code specified in | |||
<a href="http://unicode.org/iso15924/iso15924-codes.html">ISO 15924 Code List</a> or | |||
in the <a href="#extended_script_codes">Extended Script Codes</a> table. Comparison | |||
<link href="http://unicode.org/iso15924/iso15924-codes.html">ISO 15924 Code List</link> or | |||
in the <link href="#extended_script_codes">Extended Script Codes</link> table. Comparison | |||
of script codes is performed in a case-insensitive manner, so it does not matter what case | |||
is used when specifying these codes in an XSL-FO document.</p> | |||
<section id="standard_script_codes"> | |||
@@ -335,28 +335,94 @@ | |||
language specific processing rules to be applied. For example, a font designed for the Arabic script may support | |||
typographic variations according to whether the written language is Arabic, Farsi (Persian), Sindhi, Urdu, or | |||
another language written with the Arabic script. In order to apply these language specific features, the author | |||
may explicitly mark the text with a <a href="http://www.w3.org/TR/2006/REC-xsl11-20061205/#language"><code>language</code></a> | |||
may explicitly mark the text with a <link href="http://www.w3.org/TR/2006/REC-xsl11-20061205/#language"><code>language</code></link> | |||
property.</p> | |||
<p>When specifying the <code>language</code> property, the value of the property must be either an | |||
<a href="http://en.wikipedia.org/wiki/List_of_ISO_639-2_codes">ISO639-2 3-letter code</a> or an | |||
<a href="http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes">ISO639-1 2-letter code</a>. Comparison of language | |||
<link href="http://en.wikipedia.org/wiki/List_of_ISO_639-2_codes">ISO639-2 3-letter code</link> or an | |||
<link href="http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes">ISO639-1 2-letter code</link>. Comparison of language | |||
codes is performed in a case-insensitive manner, so it does not matter what case is used when specifying these | |||
codes in an XSL-FO document.</p> | |||
</section> | |||
<section id="writing_mode_property"> | |||
<title>Writing Mode Property</title> | |||
<p>The <code>writing-mode</code> property is used to determine the axes and direction of the inline | |||
progression direction, the block progression direction, the column progression direction (in tables | |||
and flows), the shift direction, region placement, the resolution of writing-mode relative property | |||
values (such as start, end, before, after), and the default block (paragraph) bidirectionality | |||
level. | |||
</p> | |||
<p>The <code>writing-mode</code> property is inherited, so it can appear on any XSL-FO element type; however, | |||
it applies (semantically) only to the following element types: | |||
</p> | |||
<ul> | |||
<li><code>fo:page-sequence</code></li> | |||
<li><code>fo:simple-page-master</code></li> | |||
<li><code>fo:region-*</code></li> | |||
<li><code>fo:block-container</code></li> | |||
<li><code>fo:inline-container</code></li> | |||
<li><code>fo:table</code></li> | |||
</ul> | |||
<p>If it is not specified on one of these element types, but is specified on an ancestor element, then the value specified on that | |||
ancestor element (the inherited value) is used; otherwise, the initial value <code>lr-tb</code> is used.</p> | |||
<p>At present, only the following values of the <code>writing-mode</code> property are supported:</p> | |||
<ul> | |||
<li><code>lr-tb</code></li> | |||
<li><code>rl-tb</code></li> | |||
<li><code>lr</code></li> | |||
<li><code>rl</code></li> | |||
</ul> | |||
<p>Writing modes that employ a vertical inline progression direction are not yet supported.</p> | |||
</section> | |||
<!-- [TBD] - NEED TO DOCUMENT | |||
<section id="number_conversion_properties"> | |||
<title>Number Conversion Properties</title> | |||
</section> | |||
--> | |||
<section id="bidi_override_element"> | |||
<title>Bidi Override Element</title> | |||
<p>The <link href="http://www.w3.org/TR/2006/REC-xsl11-20061205/#fo_bidi-override"><code>fo:bidi-override</code></link> | |||
element may be used to override default bidirectional processing behavior, | |||
including default embedding levels and default character directionality. In the absence of either this element | |||
or use of explicit <link href="#bidi_controls">Bidi Control Characters</link>, the default behavior prescribed | |||
by the <link href="http://www.w3.org/TR/2006/REC-xsl11-20061205/#fo_bidi-override">Unicode Bidirectional Algorithm</link> | |||
applies. | |||
</p> | |||
</section> | |||
<section id="bidi_controls"> | |||
<title>Bidi Control Characters</title> | |||
<p>In addition to the use of the <link href="#bidi_override_element">Bidi Override Element</link>, an author | |||
may make use of the following explicit Unicode Bidi Control Characters:</p> | |||
<ul> | |||
<li>U+200E - LEFT-TO-RIGHT MARK (LRM)</li> | |||
<li>U+200F - RIGHT-TO-LEFT MARK (RLM)</li> | |||
<li>U+202A - LEFT-TO-RIGHT EMBEDDING (LRE)</li> | |||
<li>U+202B - RIGHT-TO-LEFT EMBEDDING (RLE)</li> | |||
<li>U+202C - POP DIRECTIONAL FORMATTING (PDF)</li> | |||
<li>U+202D - LEFT-TO-RIGHT OVERRIDE (LRO)</li> | |||
<li>U+202E - RIGHT-TO-LEFT OVERRIDE (RLO)</li> | |||
</ul> | |||
<p>If an embedding or override is not terminated (using U+202C PDF) prior to the end of a | |||
<link href="http://www.w3.org/TR/2006/REC-xsl11-20061205/#d0e4879">delimited text range</link>, | |||
then it is automatically terminated by FOP. | |||
</p> | |||
</section> | |||
<section id="join_controls"> | |||
<title>Join Control Characters</title> | |||
<p>In order to prevent joining behavior in contexts where joining occurs by default, | |||
for example, between U+0628 ARABIC LETTER BEH and U+0646 ARABIC LETTER NOON, | |||
an author may used a U+200C ZERO WIDTH NON-JOINER (ZWNJ). | |||
</p> | |||
<p>Conversely, in order to force joining behavior in contexts where joining does not occur by default, | |||
for example, between U+0628 ARABIC LETTER BEH and U+0020 SPACE, an author may used a U+200D ZERO WIDTH JOINER (ZWJ). | |||
</p> | |||
<p>The behavior of ZWNJ and ZWJ is script specific. See | |||
<link href="http://www.unicode.org/versions/Unicode6.1.0/ch08.pdf">The Unicode Standard, Chapter 8, | |||
Middle Eastern Scripts</link> for information on the use of these control characters with the Arabic | |||
script. See | |||
<link href="http://www.unicode.org/versions/Unicode6.1.0/ch09.pdf">The Unicode Standard, Chapter 9, | |||
South Asian Scripts - I</link> for information on the use of these control characters with common | |||
Indic scripts. | |||
</p> | |||
</section> | |||
</section> | |||
<section id="supported_scripts"> | |||
@@ -377,103 +443,103 @@ | |||
<th style="text-align:left">Comments</th> | |||
</tr> | |||
<tr> | |||
<td><a href="http://en.wikipedia.org/wiki/Arabic_alphabet">Arabic</a></td> | |||
<td><link href="http://en.wikipedia.org/wiki/Arabic_alphabet">Arabic</link></td> | |||
<td class="yes">full</td> | |||
<td class="yes">full</td> | |||
<td></td> | |||
</tr> | |||
<tr> | |||
<td><a href="http://en.wikipedia.org/wiki/Bengali_alphabet">Bengali</a></td> | |||
<td><link href="http://en.wikipedia.org/wiki/Bengali_alphabet">Bengali</link></td> | |||
<td class="no">none</td> | |||
<td class="no">none</td> | |||
<td></td> | |||
</tr> | |||
<tr> | |||
<td><a href="http://en.wikipedia.org/wiki/Burmese_alphabet">Burmese</a></td> | |||
<td><link href="http://en.wikipedia.org/wiki/Burmese_alphabet">Burmese</link></td> | |||
<td class="no">none</td> | |||
<td class="no">none</td> | |||
<td></td> | |||
</tr> | |||
<tr> | |||
<td><a href="http://en.wikipedia.org/wiki/Devanagari_alphabet">Devanagari</a></td> | |||
<td><link href="http://en.wikipedia.org/wiki/Devanagari_alphabet">Devanagari</link></td> | |||
<td class="partial">partial</td> | |||
<td class="partial">partial</td> | |||
<td style="text-align:left">join controls (ZWJ, ZWNJ) not yet supported</td> | |||
</tr> | |||
<tr> | |||
<td><a href="http://en.wikipedia.org/wiki/Khmer_alphabet">Khmer</a></td> | |||
<td><link href="http://en.wikipedia.org/wiki/Khmer_alphabet">Khmer</link></td> | |||
<td class="no">none</td> | |||
<td class="no">none</td> | |||
<td></td> | |||
</tr> | |||
<tr> | |||
<td><a href="http://en.wikipedia.org/wiki/Gujarati_alphabet">Gujarati</a></td> | |||
<td><link href="http://en.wikipedia.org/wiki/Gujarati_alphabet">Gujarati</link></td> | |||
<td class="partial">partial</td> | |||
<td class="no">none</td> | |||
<td style="text-align:left">pre-alpha</td> | |||
</tr> | |||
<tr> | |||
<td><a href="http://en.wikipedia.org/wiki/Gurmukhī_alphabet">Gurmukhi</a></td> | |||
<td><link href="http://en.wikipedia.org/wiki/Gurmukhī_alphabet">Gurmukhi</link></td> | |||
<td class="partial">partial</td> | |||
<td class="no">none</td> | |||
<td style="text-align:left">pre-alpha</td> | |||
</tr> | |||
<tr> | |||
<td><a href="http://en.wikipedia.org/wiki/Hebrew_alphabet">Hebrew</a></td> | |||
<td><link href="http://en.wikipedia.org/wiki/Hebrew_alphabet">Hebrew</link></td> | |||
<td class="yes">full</td> | |||
<td class="partial">partial</td> | |||
<td></td> | |||
</tr> | |||
<tr> | |||
<td><a href="http://en.wikipedia.org/wiki/Kannada_alphabet">Kannada</a></td> | |||
<td><link href="http://en.wikipedia.org/wiki/Kannada_alphabet">Kannada</link></td> | |||
<td class="no">none</td> | |||
<td class="no">none</td> | |||
<td></td> | |||
</tr> | |||
<tr> | |||
<td><a href="http://en.wikipedia.org/wiki/Lao_alphabet">Lao</a></td> | |||
<td><link href="http://en.wikipedia.org/wiki/Lao_alphabet">Lao</link></td> | |||
<td class="no">none</td> | |||
<td class="no">none</td> | |||
<td></td> | |||
</tr> | |||
<tr> | |||
<td><a href="http://en.wikipedia.org/wiki/Malayalam_alphabet">Malayalam</a></td> | |||
<td><link href="http://en.wikipedia.org/wiki/Malayalam_alphabet">Malayalam</link></td> | |||
<td class="no">none</td> | |||
<td class="no">none</td> | |||
<td></td> | |||
</tr> | |||
<tr> | |||
<td><a href="http://en.wikipedia.org/wiki/Mongolian_script">Mongolian</a></td> | |||
<td><link href="http://en.wikipedia.org/wiki/Mongolian_script">Mongolian</link></td> | |||
<td class="no">none</td> | |||
<td class="no">none</td> | |||
<td></td> | |||
</tr> | |||
<tr> | |||
<td><a href="http://en.wikipedia.org/wiki/Oriya_script">Oriya</a></td> | |||
<td><link href="http://en.wikipedia.org/wiki/Oriya_script">Oriya</link></td> | |||
<td class="no">none</td> | |||
<td class="no">none</td> | |||
<td></td> | |||
</tr> | |||
<tr> | |||
<td><a href="http://en.wikipedia.org/wiki/Tamil_alphabet">Tamil</a></td> | |||
<td><link href="http://en.wikipedia.org/wiki/Tamil_alphabet">Tamil</link></td> | |||
<td class="no">none</td> | |||
<td class="no">none</td> | |||
<td></td> | |||
</tr> | |||
<tr> | |||
<td><a href="http://en.wikipedia.org/wiki/Telugu_alphabet">Telugu</a></td> | |||
<td><link href="http://en.wikipedia.org/wiki/Telugu_alphabet">Telugu</link></td> | |||
<td class="no">none</td> | |||
<td class="no">none</td> | |||
<td></td> | |||
</tr> | |||
<tr> | |||
<td><a href="http://en.wikipedia.org/wiki/Tibetan_alphabet">Tibetan</a></td> | |||
<td><link href="http://en.wikipedia.org/wiki/Tibetan_alphabet">Tibetan</link></td> | |||
<td class="no">none</td> | |||
<td class="no">none</td> | |||
<td></td> | |||
</tr> | |||
<tr> | |||
<td><a href="http://en.wikipedia.org/wiki/Thai_alphabet">Thai</a></td> | |||
<td><link href="http://en.wikipedia.org/wiki/Thai_alphabet">Thai</link></td> | |||
<td class="no">none</td> | |||
<td class="no">none</td> | |||
<td></td> | |||
@@ -500,55 +566,55 @@ | |||
<th style="text-align:left">Comments</th> | |||
</tr> | |||
<tr> | |||
<td><a href="http://www.microsoft.com/typography/fonts/family.aspx?FID=24">Arial Unicode MS</a></td> | |||
<td class="yes" style="text-align:left"><a href="http://www.microsoft.com/typography/fonts/font.aspx?FMID=1081">1.01</a></td> | |||
<td><link href="http://www.microsoft.com/typography/fonts/family.aspx?FID=24">Arial Unicode MS</link></td> | |||
<td class="yes" style="text-align:left"><link href="http://www.microsoft.com/typography/fonts/font.aspx?FMID=1081">1.01</link></td> | |||
<td style="text-align:center">50377</td> | |||
<td>limited GPOS support</td> | |||
</tr> | |||
<tr> | |||
<td><a href="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=ArabicFonts">Lateef</a></td> | |||
<td><link href="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=ArabicFonts">Lateef</link></td> | |||
<td class="yes" style="text-align:left">1.0</td> | |||
<td style="text-align:center">1147</td> | |||
<td>language features for Kurdish (KUR), Sindhi (SND), Urdu (URD)</td> | |||
</tr> | |||
<tr> | |||
<td><a href="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=ArabicFonts">Scheherazade</a></td> | |||
<td><link href="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=ArabicFonts">Scheherazade</link></td> | |||
<td class="yes" style="text-align:left">1.0</td> | |||
<td style="text-align:center">1197</td> | |||
<td>language features for Kurdish (KUR), Sindhi (SND), Urdu (URD)</td> | |||
</tr> | |||
<tr> | |||
<td><a href="http://www.microsoft.com/typography/fonts/family.aspx?FID=261">Simplified Arabic</a></td> | |||
<td class="no" style="text-align:left"><a href="http://www.microsoft.com/typography/fonts/font.aspx?FMID=867">1.01</a></td> | |||
<td><link href="http://www.microsoft.com/typography/fonts/family.aspx?FID=261">Simplified Arabic</link></td> | |||
<td class="no" style="text-align:left"><link href="http://www.microsoft.com/typography/fonts/font.aspx?FMID=867">1.01</link></td> | |||
<td/> | |||
<td>contains invalid, out of order coverage table entries</td> | |||
</tr> | |||
<tr> | |||
<td><a href="http://www.microsoft.com/typography/fonts/font.aspx?FID=261">Simplified Arabic</a></td> | |||
<td class="yes" style="text-align:left"><a href="http://www.microsoft.com/typography/fonts/font.aspx?FMID=1645">5.00</a></td> | |||
<td><link href="http://www.microsoft.com/typography/fonts/font.aspx?FID=261">Simplified Arabic</link></td> | |||
<td class="yes" style="text-align:left"><link href="http://www.microsoft.com/typography/fonts/font.aspx?FMID=1645">5.00</link></td> | |||
<td style="text-align:center">414</td> | |||
<td>lacks GPOS support</td> | |||
</tr> | |||
<tr> | |||
<td><a href="http://www.microsoft.com/typography/fonts/font.aspx?FID=261">Simplified Arabic</a></td> | |||
<td><link href="http://www.microsoft.com/typography/fonts/font.aspx?FID=261">Simplified Arabic</link></td> | |||
<td class="yes" style="text-align:left">5.92</td> | |||
<td style="text-align:center">473</td> | |||
<td>includes GPOS for advanced position adjustment</td> | |||
</tr> | |||
<tr> | |||
<td><a href="http://www.microsoft.com/typography/fonts/family.aspx?FID=264">Traditional Arabic</a></td> | |||
<td class="yes" style="text-align:left"><a href="http://www.microsoft.com/typography/fonts/family.aspx?FMID=877">1.01</a></td> | |||
<td><link href="http://www.microsoft.com/typography/fonts/family.aspx?FID=264">Traditional Arabic</link></td> | |||
<td class="yes" style="text-align:left"><link href="http://www.microsoft.com/typography/fonts/family.aspx?FMID=877">1.01</link></td> | |||
<td style="text-align:center">530</td> | |||
<td>lacks GPOS support</td> | |||
</tr> | |||
<tr> | |||
<td><a href="http://www.microsoft.com/typography/fonts/font.aspx?FID=264">Traditional Arabic</a></td> | |||
<td class="yes" style="text-align:left"><a href="http://www.microsoft.com/typography/fonts/font.aspx?FMID=1658">5.00</a></td> | |||
<td><link href="http://www.microsoft.com/typography/fonts/font.aspx?FID=264">Traditional Arabic</link></td> | |||
<td class="yes" style="text-align:left"><link href="http://www.microsoft.com/typography/fonts/font.aspx?FMID=1658">5.00</link></td> | |||
<td style="text-align:center">530</td> | |||
<td>lacks GPOS support</td> | |||
</tr> | |||
<tr> | |||
<td><a href="http://www.microsoft.com/typography/fonts/font.aspx?FID=264">Traditional Arabic</a></td> | |||
<td><link href="http://www.microsoft.com/typography/fonts/font.aspx?FID=264">Traditional Arabic</link></td> | |||
<td class="yes" style="text-align:left">5.92</td> | |||
<td style="text-align:center">589</td> | |||
<td>includes GPOS for advanced position adjustment</td> | |||
@@ -571,26 +637,26 @@ | |||
<th style="text-align:left">Comments</th> | |||
</tr> | |||
<tr> | |||
<td><a href="http://www.microsoft.com/typography/fonts/family.aspx?FID=370">Aparajita</a></td> | |||
<td class="yes" style="text-align:left"><a href="http://www.microsoft.com/typography/fonts/font.aspx?FMID=1700">1.00</a></td> | |||
<td><link href="http://www.microsoft.com/typography/fonts/family.aspx?FID=370">Aparajita</link></td> | |||
<td class="yes" style="text-align:left"><link href="http://www.microsoft.com/typography/fonts/font.aspx?FMID=1700">1.00</link></td> | |||
<td style="text-align:center">706</td> | |||
<td/> | |||
</tr> | |||
<tr> | |||
<td><a href="http://www.microsoft.com/typography/fonts/family.aspx?FID=374">Kokila</a></td> | |||
<td class="yes" style="text-align:left"><a href="http://www.microsoft.com/typography/fonts/font.aspx?FMID=1749">1.00</a></td> | |||
<td><link href="http://www.microsoft.com/typography/fonts/family.aspx?FID=374">Kokila</link></td> | |||
<td class="yes" style="text-align:left"><link href="http://www.microsoft.com/typography/fonts/font.aspx?FMID=1749">1.00</link></td> | |||
<td style="text-align:center">706</td> | |||
<td/> | |||
</tr> | |||
<tr> | |||
<td><a href="http://www.microsoft.com/typography/fonts/family.aspx?FID=243">Mangal</a></td> | |||
<td class="yes" style="text-align:left"><a href="http://www.microsoft.com/typography/fonts/font.aspx?FMID=1759">5.01</a></td> | |||
<td><link href="http://www.microsoft.com/typography/fonts/family.aspx?FID=243">Mangal</link></td> | |||
<td class="yes" style="text-align:left"><link href="http://www.microsoft.com/typography/fonts/font.aspx?FMID=1759">5.01</link></td> | |||
<td style="text-align:center">885</td> | |||
<td>designed for use in user interfaces</td> | |||
</tr> | |||
<tr> | |||
<td><a href="http://www.microsoft.com/typography/fonts/family.aspx?FID=384">Utsaah</a></td> | |||
<td class="yes" style="text-align:left"><a href="http://www.microsoft.com/typography/fonts/font.aspx?FMID=1811">1.00</a></td> | |||
<td><link href="http://www.microsoft.com/typography/fonts/family.aspx?FID=384">Utsaah</link></td> | |||
<td class="yes" style="text-align:left"><link href="http://www.microsoft.com/typography/fonts/font.aspx?FMID=1811">1.00</link></td> | |||
<td style="text-align:center">706</td> | |||
<td/> | |||
</tr> | |||
@@ -618,10 +684,10 @@ | |||
described above: | |||
</p> | |||
<ul> | |||
<li><a href="http://www.unicode.org/">The Unicode Standard</a></li> | |||
<li><a href="http://www.w3.org/TR/2006/REC-xsl11-20061205/#fo_bidi-override">Unicode Bidirectional Algorithm</a></li> | |||
<li><a href="http://www.microsoft.com/typography/otspec/ttochap1.htm">OpenType Advanced Typographic Extensions</a></li> | |||
<li><a href="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=CmplxRndExamples">Examples of Complex Rendering</a></li> | |||
<li><link href="http://www.unicode.org/">The Unicode Standard</link></li> | |||
<li><link href="http://www.w3.org/TR/2006/REC-xsl11-20061205/#fo_bidi-override">Unicode Bidirectional Algorithm</link></li> | |||
<li><link href="http://www.microsoft.com/typography/otspec/ttochap1.htm">OpenType Advanced Typographic Extensions</link></li> | |||
<li><link href="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=CmplxRndExamples">Examples of Complex Rendering</link></li> | |||
</ul> | |||
</section> | |||
</body> |
@@ -19,18 +19,18 @@ | |||
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd"> | |||
<document> | |||
<header> | |||
<title>Apache™ FOP Version 1.1</title> | |||
<title>Apache™ FOP Version 1.1rc1</title> | |||
<version>$Revision$</version> | |||
</header> | |||
<body> | |||
<section id="intro"> | |||
<title>Introduction</title> | |||
<p> | |||
The Apache™ FOP team is proud to present to you this production quality | |||
minor (dot) release of FOP. FOP 1.1 contains many bux fixes and a number of improvements, including | |||
This is Release Candidate 1 (rc1) of an upcoming minor (dot) release of FOP. FOP 1.1rc1 contains many bux | |||
fixes and a number of improvements, including | |||
important features such as support for <a href="complexscripts.html">Complex Scripts</a> | |||
(e.g., Arabic, Hebrew, Indic, and Southeast Asian scripts). To see what has changed since the last release, | |||
please visit <a href="releaseNotes_1.0.html">Release Notes</a>. | |||
please visit <a href="releaseNotes_1.1rc1.html">Release Notes</a>. | |||
</p> | |||
<p> | |||
This release implements a substantial subset of the W3C XSL-FO 1.1 |
@@ -0,0 +1,54 @@ | |||
<?xml version="1.0" encoding="UTF-8" ?> | |||
<!-- | |||
Licensed to the Apache Software Foundation (ASF) under one or more | |||
contributor license agreements. See the NOTICE file distributed with | |||
this work for additional information regarding copyright ownership. | |||
The ASF licenses this file to You under the Apache License, Version 2.0 | |||
(the "License"); you may not use this file except in compliance with | |||
the License. You may obtain a copy of the License at | |||
http://www.apache.org/licenses/LICENSE-2.0 | |||
Unless required by applicable law or agreed to in writing, software | |||
distributed under the License is distributed on an "AS IS" BASIS, | |||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |||
See the License for the specific language governing permissions and | |||
limitations under the License. | |||
--> | |||
<!-- $Id$ --> | |||
<known-issues> | |||
<known-issue> | |||
Support for Unicode characters outside of the Base Multilingual Plane (BMP), i.e., characters | |||
whose code points are greater than 65535, is not yet implemented. | |||
See <link href="http://issues.apache.org/bugzilla/show_bug.cgi?id=51843">bug 51843</link>. | |||
</known-issue> | |||
<known-issue> | |||
The writing-mode property does not produce the expected behavior when specified on | |||
<code>fo:simple-page-master</code> or <code>fo:region-*</code> elements. | |||
See <link href="http://issues.apache.org/bugzilla/show_bug.cgi?id=53276">bug 53276</link>. | |||
</known-issue> | |||
<known-issue> | |||
Support for Devanagari and other Indic scripts is not yet complete. | |||
</known-issue> | |||
<known-issue> | |||
Use of Unicode U+200C ZERO WIDTH NON-JOINER (ZWNJ) or U+200D ZERO WIDTH JOINER (ZWJ) | |||
does not prevent or force contextual substitution, respectively, when used with Arabic script. | |||
</known-issue> | |||
<known-issue> | |||
Use of Unicode U+200C ZERO WIDTH NON-JOINER (ZWNJ) or U+200D ZERO WIDTH JOINER (ZWJ) | |||
does not affect conjunct formation or other special behavior prescribed when used with Indic scripts. | |||
</known-issue> | |||
<known-issue> | |||
Support for automatic line breaking at orthographic syllable segment boundaries in Indic | |||
or Southeast Asian scripts is not yet available. In the mean time, use U+200B ZERO WIDTH SPACE (ZWSP). | |||
</known-issue> | |||
<known-issue> | |||
Complex script content is presently supported only with AT, IF, and PDF output formats. | |||
</known-issue> | |||
<known-issue> | |||
When complex script text encounters an <code>fo:inline</code> or <code>fo:character</code> boundary, | |||
contextual substitution and ligature formation will not occur across the boundary. This prevents, | |||
for example, applying a different color to an Arabic Letter within an Arabic word, unless that letter | |||
is a non-joining letter (on both sides). | |||
</known-issue> | |||
</known-issues> |
@@ -49,7 +49,7 @@ | |||
This section lists disabled test cases in the test suite for the FO tree tests, at the time | |||
of the release. | |||
</p> | |||
<xi:include href="cocoon://knownissues-raw-fotree_1.1.xml#xpointer(/document/body/*)"/> | |||
<xi:include href="cocoon://knownissues-raw-fotree_1.1rc1.xml#xpointer(/document/body/*)"/> | |||
</section> | |||
<section> | |||
<title>Layout Engine</title> | |||
@@ -57,12 +57,17 @@ | |||
This section lists disabled test cases in the test suite for the layout engine tests, at the | |||
time of the release. | |||
</p> | |||
<xi:include href="cocoon://knownissues-raw-layoutengine_1.1.xml#xpointer(/document/body/*)"/> | |||
<xi:include href="cocoon://knownissues-raw-layoutengine_1.1rc1.xml#xpointer(/document/body/*)"/> | |||
</section> | |||
<section> | |||
<title>Other known issues</title> | |||
<p>This section lists other known issues.</p> | |||
<xi:include href="cocoon://knownissues-raw-static_1.1.xml#xpointer(/document/body/*)"/> | |||
<p>This section lists some other issues that post-date the release of FOP 1.0. For known issues that pre-date FOP 1.0, see | |||
<link href="http://issues.apache.org/bugzilla/buglist.cgi?chfieldto=2010-07-20&chfield=%5BBug%20creation%5D&query_format=advanced&chfieldfrom=2001-01-01&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&product=Fop">older bugs that remain open</link>. | |||
For all open issues that post-date FOP 1.0, see | |||
<link href="http://issues.apache.org/bugzilla/buglist.cgi?chfieldto=Now&chfield=%5BBug%20creation%5D&query_format=advanced&chfieldfrom=2010-07-20&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&product=Fop">newer bugs that remain open</link>. | |||
</p> | |||
<!-- See <root>/known-issues.xml for the source document of this section! --> | |||
<xi:include href="cocoon://knownissues-raw-static_1.1rc1.xml#xpointer(/document/body/*)"/> | |||
</section> | |||
</section> | |||
</body> |
@@ -16,7 +16,7 @@ | |||
limitations under the License. | |||
--> | |||
<!-- $Id$ --> | |||
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd"> | |||
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN" "http://forrest.apache.org/dtd/document-v13.dtd"> | |||
<document> | |||
<header> | |||
<title>Apache™ FOP: Bugs and Other Trackable Issues</title> |
@@ -561,7 +561,7 @@ | |||
</tr> | |||
<tr> | |||
<th align="center">1.0 (stable)</th> | |||
<th align="center">1.1 (stable)</th> | |||
<th align="center">1.1 (rc1)</th> | |||
<th align="center">development</th> | |||
</tr> | |||
@@ -883,8 +883,8 @@ | |||
<td><a name="fo-object-bidi-override" id="fo-object-bidi-override">bidi-override</a></td> | |||
<td class="extended">Extended</td> | |||
<td class="no">no</td> | |||
<td class="no">no</td> | |||
<td class="no">no</td> | |||
<td class="yes">yes</td> | |||
<td class="yes">yes</td> | |||
<td> </td> | |||
</tr> | |||
<tr> | |||
@@ -1492,7 +1492,7 @@ | |||
</tr> | |||
<tr> | |||
<th align="center">1.0 (stable)</th> | |||
<th align="center">1.1 (stable)</th> | |||
<th align="center">1.1 (rc1)</th> | |||
<th align="center">develop- ment</th> | |||
</tr> | |||
@@ -2303,7 +2303,7 @@ | |||
<td class="yes">yes</td> | |||
<td class="yes">yes</td> | |||
<td>For PDF output: Only 2-letter codes from ISO 639 are supported properly to | |||
identify the natural language!</td> | |||
identify the natural language! Also used with complex scripts features.</td> | |||
</tr> | |||
<tr> | |||
<td align="center"><a href= | |||
@@ -2311,9 +2311,9 @@ | |||
<td><a name="fo-property-script" id="fo-property-script">script</a></td> | |||
<td class="extended">Extended</td> | |||
<td class="no">no</td> | |||
<td class="no">no</td> | |||
<td class="no">no</td> | |||
<td> </td> | |||
<td class="no">yes</td> | |||
<td class="no">yes</td> | |||
<td>Used with complex scripts features to override default script heuristics.</td> | |||
</tr> | |||
<tr> | |||
<td align="center"><a href= | |||
@@ -3647,9 +3647,9 @@ | |||
<td><a name="fo-property-format" id="fo-property-format">format</a></td> | |||
<td class="basic">Basic</td> | |||
<td class="partial">partial</td> | |||
<td class="partial">partial</td> | |||
<td class="partial">partial</td> | |||
<td>only values '0*1', 'a', 'A', 'i', 'I' supported</td> | |||
<td class="yes">yes</td> | |||
<td class="yes">yes</td> | |||
<td>[1.0 and earlier] only values '0*1', 'a', 'A', 'i', 'I' supported</td> | |||
</tr> | |||
<tr> | |||
<td align="center"><a href= | |||
@@ -3658,8 +3658,8 @@ | |||
"fo-property-grouping-separator">grouping-separator</a></td> | |||
<td class="extended">Extended</td> | |||
<td class="no">no</td> | |||
<td class="no">no</td> | |||
<td class="no">no</td> | |||
<td class="yes">yes</td> | |||
<td class="yes">yes</td> | |||
<td> </td> | |||
</tr> | |||
<tr> | |||
@@ -3668,8 +3668,8 @@ | |||
<td><a name="fo-property-grouping-size" id="fo-property-grouping-size">grouping-size</a></td> | |||
<td class="extended">Extended</td> | |||
<td class="no">no</td> | |||
<td class="no">no</td> | |||
<td class="no">no</td> | |||
<td class="yes">yes</td> | |||
<td class="yes">yes</td> | |||
<td> </td> | |||
</tr> | |||
<tr> | |||
@@ -3678,8 +3678,8 @@ | |||
<td><a name="fo-property-letter-value" id="fo-property-letter-value">letter-value</a></td> | |||
<td class="basic">Basic</td> | |||
<td class="no">no</td> | |||
<td class="no">no</td> | |||
<td class="no">no</td> | |||
<td class="yes">yes</td> | |||
<td class="yes">yes</td> | |||
<td> </td> | |||
</tr> | |||
@@ -4177,9 +4177,9 @@ | |||
<td><a name="fo-property-writing-mode" id="fo-property-writing-mode">writing-mode</a></td> | |||
<td class="basic">Basic</td> | |||
<td class="no">no</td> | |||
<td class="no">no</td> | |||
<td class="no">no</td> | |||
<td> </td> | |||
<td class="yes">yes</td> | |||
<td class="yes">yes</td> | |||
<td>[1.1 and later] only horizontal left-to-right and right-to-left modes</td> | |||
</tr> | |||
<tr> | |||
@@ -4643,10 +4643,9 @@ | |||
</tr> | |||
<tr> | |||
<th align="center">1.0 (stable)</th> | |||
<th align="center">1.1 (stable)</th> | |||
<th align="center">develop- ment</th> | |||
<th align="center">1.1 (rc1)</th> | |||
<th align="center">development</th> | |||
</tr> | |||
<tr> | |||
<td class="category" align="center"><a href= | |||
"http://www.w3.org/TR/xsl/#d0e5860">§5.10.1</a></td> |
@@ -16,7 +16,7 @@ | |||
limitations under the License. | |||
--> | |||
<!-- $Id$ --> | |||
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd"> | |||
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN" "http://forrest.apache.org/dtd/document-v13.dtd"> | |||
<document> | |||
<header> | |||
<title>Apache™ FOP: Downloading A Distribution</title> | |||
@@ -85,26 +85,26 @@ | |||
<p/> | |||
<table> | |||
<tr> | |||
<th colspan="2">Latest Stable Release</th> | |||
<th colspan="2">This Candidate Release</th> | |||
</tr> | |||
<tr> | |||
<td>Repository URL</td> | |||
<td> | |||
<link href="http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-1_1/"> | |||
<code>http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-1_1/</code> | |||
<link href="http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-1_1rc1/"> | |||
<code>http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-1_1rc1/</code> | |||
</link> | |||
</td> | |||
</tr> | |||
<tr> | |||
<td>Web view</td> | |||
<td> | |||
<link href="http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-1_1/"> | |||
<code>http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-1_1/</code> | |||
<link href="http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-1_1rc1/"> | |||
<code>http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-1_1rc1/</code> | |||
</link> | |||
</td> | |||
</tr> | |||
<tr> | |||
<th colspan="2">Previous Stable Release</th> | |||
<th colspan="2">Latest Stable Release</th> | |||
</tr> | |||
<tr> | |||
<td>Repository URL</td> | |||
@@ -122,6 +122,25 @@ | |||
</link> | |||
</td> | |||
</tr> | |||
<tr> | |||
<th colspan="2">Previous Stable Release</th> | |||
</tr> | |||
<tr> | |||
<td>Repository URL</td> | |||
<td> | |||
<link href="http://svn.apache.org/repos/asf/xmlgraphics/fop/tages/fop-0_95/"> | |||
<code>http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_95/</code> | |||
</link> | |||
</td> | |||
</tr> | |||
<tr> | |||
<td>Web view</td> | |||
<td> | |||
<link href="http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_95/"> | |||
<code>http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_95/</code> | |||
</link> | |||
</td> | |||
</tr> | |||
<tr> | |||
<th colspan="2">Trunk</th> | |||
</tr> |
@@ -39,7 +39,7 @@ | |||
<tr> | |||
<td>default font characters</td> | |||
<td><link href="fo/fonts.fo">fonts.fo</link></td> | |||
<td><link href="fo/fonts.fo.pdf">fonts.fo.pdf</link></td> | |||
<td><link href="fo/fonts.pdf">fonts.pdf</link></td> | |||
</tr> | |||
</table> | |||
<p>Other basic examples on the use of XSL-FO can be found in the FOP distribution in | |||
@@ -100,17 +100,17 @@ Embedding images in FO: | |||
<tr> | |||
<td>align in larger viewport</td> | |||
<td><link href="fo/align.fo">align.fo</link></td> | |||
<td><link href="fo/align.fo.pdf">align.fo.pdf</link></td> | |||
<td><link href="fo/align.pdf">align.pdf</link></td> | |||
</tr> | |||
<tr> | |||
<td>align in smaller viewport</td> | |||
<td><link href="fo/align2.fo">align2.fo</link></td> | |||
<td><link href="fo/align2.fo.pdf">align2.fo.pdf</link></td> | |||
<td><link href="fo/align2.pdf">align2.pdf</link></td> | |||
</tr> | |||
<tr> | |||
<td>scaling image</td> | |||
<td><link href="fo/size.fo">size.fo</link></td> | |||
<td><link href="fo/size.fo.pdf">size.fo.pdf</link></td> | |||
<td><link href="fo/size.pdf">size.pdf</link></td> | |||
</tr> | |||
</table> | |||
<p>Look also into the directory examples/fo/svg. There you find some very extensive SVG examples. | |||
@@ -132,7 +132,7 @@ Instream Foreign Object images in FO, there are more on the | |||
<tr> | |||
<td>embedding svg in viewport</td> | |||
<td><link href="fo/embed.fo">embed.fo</link></td> | |||
<td><link href="fo/embed.fo.pdf">embed.fo.pdf</link></td> | |||
<td><link href="fo/embed.pdf">embed.pdf</link></td> | |||
</tr> | |||
</table> | |||
</section> |
@@ -16,7 +16,7 @@ | |||
limitations under the License. | |||
--> | |||
<!-- $Id$ --> | |||
<!DOCTYPE faqs PUBLIC "-//APACHE//DTD FAQ V2.0//EN" "http://forrest.apache.org/dtd/faq-v20.dtd"> | |||
<!DOCTYPE faqs PUBLIC "-//APACHE//DTD FAQ V1.3//EN" "http://forrest.apache.org/dtd/faq-v12.dtd"> | |||
<faqs title="FOP FAQ"> | |||
<part id="part-general"> | |||
<title>Apache™ FOP: General questions</title> | |||
@@ -146,11 +146,11 @@ | |||
<p> | |||
When it's ready and the committers have enough time to go | |||
through the time-consuming process of creating a release. Version | |||
1.1 was released on [TBD - ADD DAY MONTH] 2012, and will release a | |||
subsequent version when we accumulate enough enhancements and bug fixes. If | |||
you want to speed up the process, consider <link | |||
href="dev/index.html#involved">contributing</link> to | |||
FOP.</p> | |||
1.1rc1 was released on 02 July 2012. A subsequent final | |||
Version 1.1 is expected to be released within 1 to 3 months following | |||
this release candidate. If you want to speed up the process, consider <link | |||
href="dev/index.html#involved">contributing</link> to FOP. | |||
</p> | |||
</answer> | |||
</faq> | |||
<faq id="redesign"> |
@@ -16,7 +16,7 @@ | |||
limitations under the License. | |||
--> | |||
<!-- $Id$ --> | |||
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd"> | |||
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN" "http://forrest.apache.org/dtd/document-v13.dtd"> | |||
<document> | |||
<header> | |||
<title>Apache™ FOP: XSL-FO Input</title> | |||
@@ -518,7 +518,7 @@ This applies similarly to the extent of the after region and the bottom margin o | |||
<section id="external-resources"> | |||
<title>External Resources</title> | |||
<p>Resources needed by an XSL-FO file that are external to it (graphics, for example), are defined in the XSL-FO standard as being of type "uri-specification". This is defined in the standard at <jump href="http://www.w3.org/TR/xsl11/#datatype">Section 5.11 Property Datatypes</jump>, which includes a link to the URI standard itself. Refer to the XSL-FO and URI standards themselves for more detailed instructions.</p> | |||
<p>URIs may be either absolute or relative to a base URI. (See <link href="1.1/configuration.html">FOP: Configuration</link> for information on setting the base URI for a FOP session). Here is an example referencing an external-graphic that is relative to the base URI:</p> | |||
<p>URIs may be either absolute or relative to a base URI. (See <link href="1.1rc1/configuration.html">FOP: Configuration</link> for information on setting the base URI for a FOP session). Here is an example referencing an external-graphic that is relative to the base URI:</p> | |||
<source><![CDATA[<fo:external-graphic src="url('images/logo.jpg')"/>]]></source> | |||
<p>Here is an example referencing an external-graphic that is an absolute URI on a local filesystem:</p> | |||
<source><![CDATA[fo:external-graphic src="url('file:///d:/images/logo.jpg')"/>]]></source> |
@@ -19,19 +19,18 @@ | |||
<fo:root font-family="Times Roman" font-size="12pt" text-align="center" xmlns:fo="http://www.w3.org/1999/XSL/Format"> | |||
<fo:layout-master-set> | |||
<fo:simple-page-master | |||
margin-right="1.5cm" | |||
margin-left="1.5cm" | |||
margin-bottom="2cm" | |||
margin-top="1cm" | |||
page-width="21cm" | |||
page-height="29.7cm" | |||
master-name="left"> | |||
<fo:region-before extent="1cm"/> | |||
<fo:region-body margin-top="1cm"/> | |||
<fo:region-after extent="1.5cm"/> | |||
</fo:simple-page-master> | |||
<fo:simple-page-master | |||
margin-right="1.5cm" | |||
margin-left="1.5cm" | |||
margin-bottom="2cm" | |||
margin-top="1cm" | |||
page-width="21cm" | |||
page-height="29.7cm" | |||
master-name="left"> | |||
<fo:region-body margin-top="1cm"/> | |||
<fo:region-before extent="1cm"/> | |||
<fo:region-after extent="1.5cm"/> | |||
</fo:simple-page-master> | |||
</fo:layout-master-set> | |||
<fo:page-sequence id="N2528" master-reference="left"> |
@@ -19,19 +19,18 @@ | |||
<fo:root font-family="Times Roman" font-size="12pt" text-align="center" xmlns:fo="http://www.w3.org/1999/XSL/Format"> | |||
<fo:layout-master-set> | |||
<fo:simple-page-master | |||
margin-right="1.5cm" | |||
margin-left="1.5cm" | |||
margin-bottom="2cm" | |||
margin-top="1cm" | |||
page-width="21cm" | |||
page-height="29.7cm" | |||
master-name="left"> | |||
<fo:region-before extent="1cm"/> | |||
<fo:region-body margin-top="1cm"/> | |||
<fo:region-after extent="1.5cm"/> | |||
</fo:simple-page-master> | |||
<fo:simple-page-master | |||
margin-right="1.5cm" | |||
margin-left="1.5cm" | |||
margin-bottom="2cm" | |||
margin-top="1cm" | |||
page-width="21cm" | |||
page-height="29.7cm" | |||
master-name="left"> | |||
<fo:region-body margin-top="1cm"/> | |||
<fo:region-before extent="1cm"/> | |||
<fo:region-after extent="1.5cm"/> | |||
</fo:simple-page-master> | |||
</fo:layout-master-set> | |||
<fo:page-sequence id="N2528" master-reference="left"> | |||
@@ -59,7 +58,7 @@ Default align: | |||
<fo:block> | |||
Default align: | |||
(<fo:external-graphic width="50pt" height="50pt" overflow="hidden" src="images/fop.jpg"/>), start-before | |||
(<fo:external-graphic width="50pt" height="50pt" overflow="hidden" text-align="start" display-align="start" src="images/fop.jpg"/>), start-center | |||
(<fo:external-graphic width="50pt" height="50pt" overflow="hidden" text-align="start" display-align="before" src="images/fop.jpg"/>), start-center | |||
(<fo:external-graphic width="50pt" height="50pt" overflow="hidden" text-align="start" display-align="center" src="images/fop.jpg"/>), start-after | |||
(<fo:external-graphic width="50pt" height="50pt" overflow="hidden" text-align="start" display-align="after" src="images/fop.jpg"/>), center-before | |||
(<fo:external-graphic width="50pt" height="50pt" overflow="hidden" text-align="center" display-align="before" src="images/fop.jpg"/>), center-after |
@@ -0,0 +1,70 @@ | |||
<?xml version="1.0"?> | |||
<!-- | |||
Licensed to the Apache Software Foundation (ASF) under one or more | |||
contributor license agreements. See the NOTICE file distributed with | |||
this work for additional information regarding copyright ownership. | |||
The ASF licenses this file to You under the Apache License, Version 2.0 | |||
(the "License"); you may not use this file except in compliance with | |||
the License. You may obtain a copy of the License at | |||
http://www.apache.org/licenses/LICENSE-2.0 | |||
Unless required by applicable law or agreed to in writing, software | |||
distributed under the License is distributed on an "AS IS" BASIS, | |||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |||
See the License for the specific language governing permissions and | |||
limitations under the License. | |||
--> | |||
<!-- =========================================================================== --> | |||
<project default="newPDF" basedir="."> | |||
<!-- =================================================================== --> | |||
<!-- Initialization target --> | |||
<!-- =================================================================== --> | |||
<target name="init"> | |||
<tstamp/> | |||
<mkdir dir="tests"/> | |||
<property name="testDir" value="tests"/> | |||
<property name="foDir" value="."/> | |||
<path id="run-classpath"> | |||
<fileset dir="../../../../../lib"> | |||
<include name="*.jar"/> | |||
</fileset> | |||
<pathelement location="../../../../../build/fop.jar"/> | |||
</path> | |||
<taskdef name="fop" classname="org.apache.fop.tools.anttasks.Fop" classpathref="run-classpath"/> | |||
</target> | |||
<!-- =================================================================== --> | |||
<!-- Help on usage --> | |||
<!-- =================================================================== --> | |||
<target name="usage"> | |||
<echo message="Use '-projecthelp' instead"/> | |||
</target> | |||
<!-- =================================================================== --> | |||
<!-- Produces new test files (function) --> | |||
<!-- =================================================================== --> | |||
<target name="newTestFiles"> | |||
<fop format="${mimetype}" outdir="${outDir}" messagelevel="${msglevel}" relativebase="true" throwexceptions="false"> | |||
<fileset dir="."> | |||
<include name="**/*.fo"/> | |||
</fileset> | |||
</fop> | |||
</target> | |||
<!-- =================================================================== --> | |||
<!-- Produces new test PDF files --> | |||
<!-- =================================================================== --> | |||
<target name="newPDF" depends="init" description="Creates a new set of PDF test files"> | |||
<antcall target="newTestFiles"> | |||
<param name="mimetype" value="application/pdf"/> | |||
<param name="msglevel" value="warn"/> | |||
<param name="outDir" value="${testDir}"/> | |||
</antcall> | |||
</target> | |||
<!-- =================================================================== --> | |||
<!-- Clean targets --> | |||
<!-- =================================================================== --> | |||
<target name="clean" depends="init"> | |||
<delete dir="${testDir}"/> | |||
</target> | |||
</project> | |||
<!-- End of file --> |
@@ -23,19 +23,18 @@ | |||
<fo:root font-family="Times Roman" font-size="12pt" xmlns:fo="http://www.w3.org/1999/XSL/Format"> | |||
<fo:layout-master-set> | |||
<fo:simple-page-master | |||
margin-right="1.5cm" | |||
margin-left="1.5cm" | |||
margin-bottom="2cm" | |||
margin-top="1cm" | |||
page-width="21cm" | |||
page-height="29.7cm" | |||
master-name="left"> | |||
<fo:region-before extent="1cm"/> | |||
<fo:region-body margin-top="1cm"/> | |||
<fo:region-after extent="1.5cm"/> | |||
</fo:simple-page-master> | |||
<fo:simple-page-master | |||
margin-right="1.5cm" | |||
margin-left="1.5cm" | |||
margin-bottom="2cm" | |||
margin-top="1cm" | |||
page-width="21cm" | |||
page-height="29.7cm" | |||
master-name="left"> | |||
<fo:region-body margin-top="1cm"/> | |||
<fo:region-before extent="1cm"/> | |||
<fo:region-after extent="1.5cm"/> | |||
</fo:simple-page-master> | |||
</fo:layout-master-set> | |||
<fo:page-sequence id="N2528" master-reference="left"> |
@@ -1,87 +0,0 @@ | |||
%PDF-1.3 | |||
%ª«¬ | |||
4 0 obj | |||
<< /Type /Info | |||
/Producer (FOP 0.20.5) >> | |||
endobj | |||
5 0 obj | |||
<< /Length 1556 /Filter [ /ASCII85Decode /FlateDecode ] | |||
>> | |||
stream | |||
Gb"0W9p=9h(^KQB5D>011Kd^2(:&!s-8.0G?92NC6am<+$Zp"a8L^3ZrE?Z%8B:u_OFn)DOGr-/INIQ=q\oZh2p:3YpSJW^j5k;[E4:*BGe#CoakN"mYH!sFZ8>$).@Y@g/-!,+\,3geIX]sgn&ks8h-P:I5CJ>(?M<peVjI(+?b[S@pZ8%/ns@)HU2Lio<0CtCPX[Q)8_(<FftM:sit[&L*Ob:OKat[.EkI%ON)unFn92KJrG.J!cH<PB*A9Y6q24X,`S^&S[!UEIh+u"#V93'eZc#bITL93O^P^p,I3BHrmbEFVPF$aP[Jemg]0^JG[GBF4ZUN[?=KSW(*k#W!J+1'Bh;+g]["$p!rMJIh;uH?[:#+dG<U]5@$Jf'eIGN8iGJ0k>3srEp%+j`GFC2lVAW?-k]'A%*A+X0,Y&n>gXrgJRd8etuLIh.uop[SIXoW1(Me8(mZ+eI84[tkfD8Y2>AOP5_.60qf-b].hK50R#%EJ8&ck"-ed6),XDAZ4I/+.NABKpXVTecSBnJhE/-BIl,-QFP0P>7hC<B]QN&C.,Y8Gd*8%[k^9Hi4&$B)L$>kMsi)STHZs%$'J5nT--!YC%F5o`L74Wr:Be]r#sCZ+lgS/E:AD3,3jV\ej=Ch)Mm&T3L9Qof&akqNaE.ePBeD$+%h=PJ*s!3>n&C]igN#KOB]'j8H"aks*5=iHX3ZW>2HPS[b]*`)73_Q%NVce\!_DKr]/-Y/42K3d4X3_6^:.XnTm.M/Ws*C)U,oQ,$R7M5;IQWWpQNXEeNq$<R<Z?j3W^FmcIHJnJLtn"7q,lIV18P-__e<Fgr_6rPiH7SM(LJ5hU;;F)d'"fZPjPmA)PrUM!Qp%*M$jflJgibHB!cmc"N9.VAd;)(V]?<k_^!EQuC=90p["fud#Pn6%clf97o>-MaM&m21cZ'7XGeK>`6"O7>T<ko&E!@qO]XE0/^&3L?dC3.eQYbEX_<h1cDLEnJS=-O,Fo?4qC$r@,-5S^4!<M2Bs<$Qsaan'ESI[F:IQD.j]$*GaN/1&\A3Cq0H&Y'R;YM^/.JlhFK?K]UL7.;t8P=rd#Au7HmY>plj8g:-IOGkatB8+,OGQk;/'tf.M\ap^O]Zf]N/IY_K;_Cf\L-lRiL(u"ei;CH2-j*X=.qf*gTG=iZSQ6qr)cg<j)q4H%YZ.\Z,10D%M5;J,.L4)Jb&CAe^;<tH$=DaBI%@mQK]&)u;bP"C=,]);Y<#<---<LF5r/0+2(Jf:i@B;0YOE:@cJ;PgE8YMeBD+'tMJH7H>BtH@(6&KA0C:ed<NAL]hd<_.;BdP%K4MpV]JSDt]5SSS_HjZ5GBXA0<7Li@R\gm\NFJc%&ogoS@O[.ub!@ekBUfe=Y.td^!a":e>j%+t+a=UNaVEi.YkDdNJud0091bqd)C/fC``XJC$=&-4E!<D[FmcaPJcf8u<fEkZ?OjPcl:rlH2j2]h[<`2[_>YWO/1#n25qkWC<X.PM>_ic-+YL^(]=:7:C?abAqh?bqD4b-,1\n_j+*T5NVnRDAT6?<U@WcP17PIi#^4hB/rspg7gYM~> | |||
endstream | |||
endobj | |||
6 0 obj | |||
<< /Type /Page | |||
/Parent 1 0 R | |||
/MediaBox [ 0 0 595 842 ] | |||
/Resources 3 0 R | |||
/Contents 5 0 R | |||
>> | |||
endobj | |||
7 0 obj | |||
<< /Length 1817 /Filter [ /ASCII85Decode /FlateDecode ] | |||
>> | |||
stream | |||
Gb"0W:N+uG(^BKA5)#"'Yd"$U8imem#OF-PR"6:/*k]utN6sEG3%4Xj7nFsp;3J?+4m;Cb/S%)3?CFKB?VSYnqb?ePK?>&Z1uIXURQk@7VtS,NabaJ,Y-fH"AbkJUs)n(bDSLTWQi$]3.r%#RgR?#YrF>m&j5#._.Gt&lrOg7dfGe=DCLO9.JlJ#\Nu:_+'9XObCm7%pIqEiC#]3r(6ZXV,rHP^:2:!="7[p5gQd%aYoh4"?CMW%pVqf;,\4sMKf<>Y[[oqT?]$9s%n,K_VArek#gUbF!FjDL<f/M_nI7j[N(Sm.]Wjj^^X.[)1g9opE<O[0BX3jCRC#>/(H\Zt^D8g"tMc@0c>I<YL)PBJq<Yb-Gl^BiRqaf,5=oU6pl&g!lMKY/W;-W=o:>%?@\t`PT_@NNSUM//U^7dnFB>]k,gsGT'8p>p-/_"t]4N`X)^SA/n>4O8[WK$DZi:"X[8@`0iGF;K/oBJDZ9tRQ^T20MuX/In(9BX/odV^W3rKV8qhu&C&.Ui@aH`nog^">K.8!\<CbO;jA8pD*MA_f>SZl<4uYB;@Nk0tuRbZQ^4Zl`RW%CQc6l9V>:g\X^LPnhTI(tXiC5P1&O>dih=]W7P0+tFD=.[%`'UfWeAOpP4=dVor(_H")Q=5iGu?005^2='PfY.j8J=(&-[];:<l9bJ,&#hDj."`%!AYQ@k@$<R<Z?sPjq69;_j@GTJ+k>`7n,`KdDas8\bkm\B&A4"hR1fT1/:_fus<N*KP<MaYXc)UX7DLX_9k$aN$,J&\><CpXd;FK$3aTS\ZBtt'X!@qO]XFPH\YU\Vu)St.eR@`EV"d+89V$UU:P#AMhgD3`r/kZfjOs20H@)CZo%(HJMi"k+">B%2tDAdYA`K1Sda):WQ;.YHi:?tGNSg5X.4ecbW9V!N#'S<B)'s>DR\-c<hmODkpY$"i\dtAg/Ar1e%#oi@`P/N$La-;XJaci0JKto3`"g?i!]RnbCo.$QBCOt*6.:L?"KM>*j=-Y$X,X&#FPY<*N9aZGQn-WL<.sM6$CZe\5cE7=W(ZpJ.6/"Y,KQRN)PJi,BKk(lkffCYd>!XZP"g+F4['#tNb0soB]CI].`JJ$#/^9_Q\FLn"+mCRiUL`Z"CJkGNJlhFK?GS.:>s#6[Hb1&@?()XK^4M2BZ*,oS9LsJ(`@./D2(]8Ei@B;0YOE:@Y2*0Q]NkoZ/kuj+,'5q+XHLMT,b>rMPKCr*@3P+I?GS.:"g?j,mCZ'Ym@*'X=+=PH)to%WGsV)l\>r8sj/sOC"]p_r\of,GA;.+H's^0W[EIir]<[S6Z`l&V$F><sVH>)o:D+>(*`=mgV@L0aKjZEIKrqQo[_gV'gWGqjlRK%F1W!Bq+pYQ6,V^J,-0:n4_Uc(NCk]!q't1t[fXc61"a>,!D']\<G9=2?le#JE2Yh5Y,q?c(\&BGM>B?a8_H-VhA(.Qi,aB[Mh<MIJrU<u4p8@NPg4a!]HUU%C"C_!=2A_5k-70un,]&]=]dZ\`!H,[^\,ePH#2F!L4!5Am3d=S.rtet1DeYBZ)9"mCOX)8!]qp+@9YE#Q$:.bW$=0>UFG6l5f<tDUW7J+S>o.&e<C*#%OfU<09Lr])D44.H_C$c8=Wo;+Krg@NZE@KaJDf0nF]6C[:nh/r=d&F?+,c5>K),#!I2T6r<l$7f"fl$RmAr(?41i![XCmel?e:;s#lD"fc\IkNRhp:0Qc#fjKD<PeD8,\(cFYa5L\!.0])1S''m`&lNLkFP?K+K&a,A18gZeADJ+r!>R/Z're+oUP&g(8R_^!@;&u7($?83Z%nS$eZO5XGIU386~> | |||
endstream | |||
endobj | |||
8 0 obj | |||
<< /Type /Page | |||
/Parent 1 0 R | |||
/MediaBox [ 0 0 595 842 ] | |||
/Resources 3 0 R | |||
/Contents 7 0 R | |||
>> | |||
endobj | |||
9 0 obj | |||
<< /Type /Font | |||
/Subtype /Type1 | |||
/Name /F5 | |||
/BaseFont /Times-Roman | |||
/Encoding /WinAnsiEncoding >> | |||
endobj | |||
10 0 obj | |||
<< /Type /Font | |||
/Subtype /Type1 | |||
/Name /F7 | |||
/BaseFont /Times-Bold | |||
/Encoding /WinAnsiEncoding >> | |||
endobj | |||
1 0 obj | |||
<< /Type /Pages | |||
/Count 2 | |||
/Kids [6 0 R 8 0 R ] >> | |||
endobj | |||
2 0 obj | |||
<< /Type /Catalog | |||
/Pages 1 0 R | |||
>> | |||
endobj | |||
3 0 obj | |||
<< | |||
/Font << /F5 9 0 R /F7 10 0 R >> | |||
/ProcSet [ /PDF /ImageC /Text ] >> | |||
endobj | |||
xref | |||
0 11 | |||
0000000000 65535 f | |||
0000004058 00000 n | |||
0000004122 00000 n | |||
0000004172 00000 n | |||
0000000015 00000 n | |||
0000000071 00000 n | |||
0000001719 00000 n | |||
0000001825 00000 n | |||
0000003734 00000 n | |||
0000003840 00000 n | |||
0000003949 00000 n | |||
trailer | |||
<< | |||
/Size 11 | |||
/Root 2 0 R | |||
/Info 4 0 R | |||
>> | |||
startxref | |||
4261 | |||
%%EOF |
@@ -18,32 +18,32 @@ | |||
<!-- $Id$ --> | |||
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> | |||
<!-- defines the layout master --> | |||
<fo:layout-master-set> | |||
<fo:simple-page-master master-name="first" | |||
page-height="29.7cm" | |||
page-width="21cm" | |||
margin-top="1cm" | |||
margin-bottom="2cm" | |||
margin-left="2.5cm" | |||
margin-right="2.5cm"> | |||
<fo:region-body margin-top="1cm"/> | |||
<fo:region-before extent="1cm"/> | |||
<fo:region-after extent="1.5cm"/> | |||
</fo:simple-page-master> | |||
</fo:layout-master-set> | |||
<!-- starts actual layout --> | |||
<fo:page-sequence master-reference="first"> | |||
<!-- defines the layout master --> | |||
<fo:layout-master-set> | |||
<fo:simple-page-master | |||
master-name="first" | |||
page-height="29.7cm" | |||
page-width="21cm" | |||
margin-top="1cm" | |||
margin-bottom="2cm" | |||
margin-left="2.5cm" | |||
margin-right="2.5cm"> | |||
<fo:region-body margin-top="1cm"/> | |||
<fo:region-before extent="1cm"/> | |||
<fo:region-after extent="1.5cm"/> | |||
</fo:simple-page-master> | |||
</fo:layout-master-set> | |||
<!-- starts actual layout --> | |||
<fo:page-sequence master-reference="first"> | |||
<fo:flow flow-name="xsl-region-body"> | |||
<fo:block font-family="Helvetica" font-size="14pt"> | |||
<fo:block font-family="Helvetica" font-size="14pt"> | |||
Helvetica | |||
</fo:block> | |||
<fo:block space-after.optimum="10pt" font-family="Helvetica" font-size="10pt"> | |||
<fo:table> | |||
<fo:block space-after.optimum="10pt" font-family="Helvetica" font-size="10pt"> | |||
<fo:table table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="65pt"/> | |||
<fo:table-column column-width="30pt"/> | |||
<fo:table-column column-width="65pt"/> | |||
@@ -303,7 +303,7 @@ Helvetica | |||
Times Roman | |||
</fo:block> | |||
<fo:block space-after.optimum="10pt" font-family="Times Roman" font-size="10pt"> | |||
<fo:table> | |||
<fo:table table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="65pt"/> | |||
<fo:table-column column-width="30pt"/> | |||
<fo:table-column column-width="65pt"/> | |||
@@ -563,7 +563,7 @@ Times Roman | |||
Courier | |||
</fo:block> | |||
<fo:block space-after.optimum="10pt" font-family="Courier" font-size="10pt"> | |||
<fo:table> | |||
<fo:table table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="65pt"/> | |||
<fo:table-column column-width="30pt"/> | |||
<fo:table-column column-width="65pt"/> | |||
@@ -823,7 +823,7 @@ Courier | |||
ZapfDingbats: | |||
</fo:block> | |||
<fo:block space-after.optimum="10pt" font-family="ZapfDingbats" font-size="10pt"> | |||
<fo:table> | |||
<fo:table table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="65pt"/> | |||
<fo:table-column column-width="30pt"/> | |||
<fo:table-column column-width="65pt"/> | |||
@@ -1071,7 +1071,7 @@ Courier | |||
Symbol: | |||
</fo:block> | |||
<fo:block space-after.optimum="10pt" font-family="Symbol" font-size="10pt"> | |||
<fo:table> | |||
<fo:table table-layout="fixed" width="100%"> | |||
<fo:table-column column-width="65pt"/> | |||
<fo:table-column column-width="30pt"/> | |||
<fo:table-column column-width="65pt"/> |
@@ -1,160 +0,0 @@ | |||
%PDF-1.4 | |||
%ª«¬ | |||
4 0 obj | |||
<< /Type /Info | |||
/Producer (FOP 0.20.5) >> | |||
endobj | |||
5 0 obj | |||
<< /Length 2756 /Filter [ /ASCII85Decode /FlateDecode ] | |||
>> | |||
stream | |||
Gas2O=aO+:'LgpN.p>dQQ0),tXf?8Xl8sh^A"4[?L]L?S.Yp(`G)J$07;CF[q0Xk,m[_:;p.hg?\%DUPMj%;2G1eG?n*DpXrcNRk=kqghM^JC4(9q#F6<M1iQEg+@rM.>kF&rk?5<4+=n+NmTMjoY'X2c"#Z%_Ip=kXFJF_B#_[H@&U`<@2^l+]E+l1pZ!Cop\)PH?hg\+B/,61.dsGk/JYH2/>>gUQl'^O&$qIgP0_PeXi&QbNt"`g=GeR$XG9Q\Vt!J+koUIg+m`>Q4&kH259:cpnuO)YE2Y+(Xr3H2XcdDe8Lq]_jXK4.1I\07P#'<[L&Tb:eD$aQ1Beq%DbJ9R`Fs?_!J[FZFa!bf^reYKF[C8A"tK/EcFDnJ:3"S@aEl4-6r5g`7ZS"h?/HmND$@jL1SjK>\"VRr[p,&g'EraP7s/X*K!&QFTB@f-"GBg`c-Q5TXJ(OS?p@pG-s6q\pYrAaYZS2aQkBmZ@1P5]10$OS?4MDT]N!OS<rahNW)"+n(nG\QbDAD^"QiaC@7)(@p=74Hso*+n#NSI6%$;nihZ</a(tWhC"DsEpbO?rEYLhR60L.$HS4N*V01Na;^O/jSeAVgob2UOSAK8*bFc$pCBM1AF>QR%mfVpmZ@1(5i0Z=+n$M*gm)sTOS;O9DTfS;aSVkX2s&gXjSdfFgoS]0HcZ(s+CCCTpQ5,tON2D0*qK<@aA)011uohL?]\T5a@"t%,e`]/LWFs6H3#3#RK&`J6:;k]J"?4`6lo6U"8'`(*b'V<5R'PD*eJm*oKktfP5c!UKo.u\s'*nZ('VeYGGH$-$5!2@U_b]lOT+]?04Yb>rjPHPBG;Th5Cd(n-pReQP$[&p5QTX`^!KW,!k:mL_4pu6n0@1ONrg$24jj]\"Xnnn82#W1TE'Ef]c^4'!k;$P@AEo!56AMb;Ln[0+MCTLJG_VW]jO`kr;T*0iM6bTs-<3X8eLXo)sN'@,38b9klm=rjSpt!Kp<kCs*)m!/4IY['@86]7EGKNU_d9nOT25S(LDu\s$'(.^_@slJ!"&n.74%6-G:O#K`(j;H=<ZVq>ZfR!_j9tru^KZRPp8B"5E*hD.fR'["/K0$b`fV$_aI-UbGs8SLn%O6#@a#a[0o_fg7*%"'J;5H>gtB6;ebYA$XIN>IG*3g-?jGL#1XkKb2dh:@6Wubr&]2<GgsRDE[B@P19c2R4N#)Pccp+c=B4fTnKhI=6S6$?J$t3QI?$nQ7R-Vfg7Z6"+OpHKaotE#\nMOQhDO.a?jR@_ls@dC:4]3l7hQjLRKfJ\N1.Gd%TkY'Y?C7H_@&^G]aksTOH.^_Hn7;4j[L`IWZM$5^T1-em[2Um=dl/LLH7N(Wp/,L-<sk.#N-ap5"&=1tH*f,OL0d=U0G<P6L?-10KB\&SWm4b<#!J8:.%@el,qOQN1P>E7Rrp\;']Dq5gL.E"22g,$Icji>UDXV6lij_DSh>!bsmkKkk?TPgt*F$eNa3.'E6m(TsIF:h&ai0:\`L:h]0o0@Hn"Z4Lp>W@sd8]hih:W@sd8]hj%@W@sd8]hj7FW@sdX]b#qaW@sd8]hj[RW@sd8]hjk2YV.QpKu2VqI:6hCPii8;$VPi?82jp`=P=.Z\cM]FdU"?S%G2J_p-RGM^qR%_(P6i5p4]?V:qRaO0-'A5in]-5iFjkYmfr+d7sgqS2dfuPg'bm3!W0a]?7=Y>fGBSA6Les/^2UFqMK]0rKql=X]Gn+/>1sA']+Oq73^.'^_7L<VU,kIt5Q;eYLj`,@+0pUYh2$JV*?VS@i8'3;;&paaL#CdCI8M",ZA%5mLj`,@+0pUYh2$JV*?TG?MK^<=7<O"!(4p`Tp-j+Oa;0AO,PFQKI)m(TG9cfMFaV7GJp/I5Kr;U\]Gn+/Wr#5n&A/se0<4n<[Lg*@YV3$R7CEc?S$4QGqo-iInSZ4XW9tJT6L\m0^8UH9fg>1G_S2u:(YM.EDSj,dmMFPCn8?+WW9tJT6L\m0^8UH9fg>1G_S2u:(YM.EDSj,dmMFPCn8?+WW9tH`$cT^aqkCZ/A.-5c$2^I.?XsP\]*\A/\mJtU_7L$NU:O]B$c0F]qkCZ/A.-5c`mBo4#I^A5Ca+Cr9^pb<]k#;5Jp<9KV]=,\K%hH1QV?oF>.oUFR4.3oYOU=J]l;.A!d_rkDd4#rAeRJDA:dmcl;_LU&_LmC)Fn&gG-Zt_?=WM*\ZH,`RgAN:`o*FfYa%ocq2u'@V(:?D-3AV;"@l]oF>a`t9."o3XZ1W>U>VA3n>KP3n$7eC?S]I^<&gID"TFPjDJTL;fgP<_RGc(c=28Y#lCM+ZK'J/Y9q:VXI>B>?d%2Wg-54TuF^`?<7e_R"'9mqY1/STV;<<,"NE$Zd-Fg>23A6jih%P+u5?.`Q"PFI+s'tZ2ioFb/G)!V!4POK$Y.#KpgV7rSpuo9+[>.8]*b5XST6W59[<2(ShO[$rp'3YX&jGo!9J#:K?4NTQ1JK:ZDI*gFH!C/Dh9N([,B'Wk<;UquIH&M:l7fE=&%pRn*TtuLH+3^sZV8W]GGf(pF_i,55<YL:F5&mJ>NtD*>T)>jdG.>hO64UG[SQ$do'7Ebd;9uLXlME+0!j:rQWqS4kAp0"8VX^&cbDBrp\]/_g\:X//F^Y+,M^#r5@]95q9'I6W/ag5ns;XcclT*uj'U*;K*"(#%KCI=*L+Xhqu+(VAY::H&:ETgJWBA$n<HcS3^TI0EoiL9NmK8R*;O-<,P9,m2nj=*,;dSX-baVo,F$B.$fAJ/pHP_$<5J~> | |||
endstream | |||
endobj | |||
6 0 obj | |||
<< /Type /Page | |||
/Parent 1 0 R | |||
/MediaBox [ 0 0 595 842 ] | |||
/Resources 3 0 R | |||
/Contents 5 0 R | |||
>> | |||
endobj | |||
7 0 obj | |||
<< /Length 2935 /Filter [ /ASCII85Decode /FlateDecode ] | |||
>> | |||
stream | |||
Gas2O=-jma'SPBB.u%SN_RLo"U`"2C^gpR<OtetcAE%Mt#"GslqY'^#I]5BohPsK0gZn=qd^@Wo9XjJ6B:iGoG+W(r].X%:]@cK]+m`ZsHPb]0m-EK^="`BQb8q_=\pMg#gP@?jrVt48.p$r`m*;b8p^g'q&b&j&msU$7gA(OFhY/=DCr>]H\8rsDC;V+n\@!W1DSmP!\1o:WBuBZFn%'.G[c,iln8L?&E7_MV*Pg^/KUXmT!'HLWF1)Oe!;E>VS86"__#%#PY&D4)J@e^%cF;aRi3lUU$Z1+g\1(G@@N-?hhNb*^i:oYYmZ440*#SY\n0k:=^HVkj+K>OY57DKaWWU"#!q9Mq#C_.:i(d5VIX_da<`B<QIiRCD<*^#`IfeP6WOa/K5.';IYuG!>INJT>-rnlOh^<r0;KY.tI0R27<S)l\(P)7Vl?_ss$?0(HXp;^+$#j+KXp;^+"`RD?Xp;^+%Id+l#CaGEL:a4Z%fH;7^^m/#nGBNlO.n])qf;c3U,qf@o)S5JFl<!1!:EJ0H1:]h!4Sfi4S\k$J=BGZ*rQ!m^q3Ke*rQ"0)fC_5l9+k?%,cn=FWUJ[Wk_?ubu3pp2t%;a9!no_]M!JueK0tH*oWqq#E[7.KU5j_5W^&!?@$_onU*lP.FnOLo+BrX=U1&7a+2cV*C)hJ#VY!p^k)"^iMBca3&*TC]X6u)8&f1pQ[0\1bkR^td]W`m)IF%^$?gquj%I6^_[^X%Hpr:ZfE(pM2;klP#OqaPKU7iB_#N:)?<VLTs*mO`WS%m]s#o>;B1MIk9u9QNNo9pZ#VSn6K)^<G]N"8(rr7iEd^:=ps(B,_foG"j?O/<%4+dKN&ROaG"TSKoGj3rpr;R_pV/Sros6kW-`Z;nqIh5p9G6IsG8U0LT&cDYFiMCW,i4j?fl[%\]TuD?Y$RQ3dd:<S5hZLAB;<XGq;b-p2^kdh6=#HC49)&Bm9GG(@aV7Xk#I%^4d$7>&O>9"M,85d6D)-eZnpr^,l#3;X;EiI5ep>i"'_;@,R4(TB>0[@lB;-MSBL*`UTSZ!X@7,D34eaQ\l69.t9cm4K6$8;=UoBERMkIZ&'N3LPe4!>BA.%Se,O-JQ/i&,[p(;EZ<>V&i>5O,eLoQA,+iSjt>t!+pG4uTS4&M(l[(_S4hhcr,TacI(#+$`/(L#fG-unFQ,@+uDTBI87*U,nkr']_(lUViGjsN2[>XuBP69ijXP2_HLUsi,((TnugBW[mT03h#Yct5L>?FZ#;U#g`t]PrUIU&BG7]PrUITbW'O]PrUITe1bg]PrUITgaI*]PrUITj</B]L[f2;+TN8-nh)6?"i8j-nh)6?"iJp0eY*B6@8`kH!s8\>5`*X$VS(Xp-3%n=OMm5!&Nbk-!f^C0OnEkdY3\^1ZjB[?-"9F@pW9cKh_\*k(P$ckThil?9$Ae:'*66Kd0me,VW_737<LU!]/tm,@0LY0OnEKdY1Et1ZjB9?0EOf@pV.EKhMOUk!`(Wcq.W]]VsuB9HfV8JpC5<WQqu^oa=Bm)JLs\9EGSoWu>\-KhMOU8uikE15/C'$VJUCZnd>/!XhWDX0aX99EGSobH&!*KhMOu8h6jI15/C'.nV=jZq_;r$*5PW5e><6@)\lhO=kVf=RddHU^N^r<]l8>;)_Fp,d?9*</nJW67.6uO.pC=bnMo>XEYFZUMcrj8RTN4W#Be7KhMOuk!_/mSg\[n=>;J/;)_Fp,d:`a<24?.O@`j!]Vn<U9HfV8MKr'Y\sYl3JJIdN)Kdii9ELcYf?NKe.e8uqAq<@%$d7gWcQk7TFGAYCVOn"A+nIrC_$+`,G"s;D&Tic9pkaYFXNgs*"P4gICm%A#.S(hp&?-"0-BYj31Iq?X=)3=[,*P<*Z,#%mb[qKU%;]ZR-WMhG,VgAc&mT9Tbrh32I#png='Q2>R7&BT7"X1.C?.F<k_tToE;s#,Gqt4M$&Je744WDX8RtRe,cK@1G0;-d.3oO*Cpbt>,VgmGs#<J6[I;3_1+aaaN.Pg)P=_i*etRAg@5O/b<NO/^GI7Ip,b6ENDB5W;+iW`rO@W3Qe`J6C*)s1b'/`2ZP!i0Ki<Pi"gM<kC-0+uG+oarT\p'C!_V"a8q5/([](u/]Ri-@mfD$)G:-[dJ5K3#^+a!Nmq!Xi!aT(6&:JkY`)n9b&mf[m`7IN-Rf7r/dnBUKNgq`eFr9cJu*;r'i%G\GOpAk,QIZ`AT(Y\B%!0;SYgci=%L>NC.1c:`hUH>jAo^.?(^#!Y!h%B/Gm=e,PlaICCB]J(+$^2&e^O:?:)\1b3R$:3Oqs^I@*59*?-L;8tLGu^$nEkqo_Z%&nG"Wbahd.;_hJAh>g.&uX(PfN0Rg8\+#1dJ_o&BAS@e8@pfUY4=LjQm^C_#6\05i.Q4?2I\_FrU-YfuEdQalSDR5YC)H/l^sDZX5Ia+J$],.o1]#Lg=[G_mCNXuS]o!XTkX^7i0<)EJpu6[)HdF?EZ\m\Xaa">CAB:"@l&?lutLWjreY5]eqbK."H[8U")ZGljM&F>['m-bt"!2cD#L!k9=*VO$0S_#/L32(s;&Hj7sS\ZN<(R6pIW!;RoJ>'t)gNM+(.>AY`DKr!'$,"r]XpspQ+6&1;K?AN81N?H2.5qbV_N^f+?U7`;H)Fu)Dnq)cZRRnaFnq)cZ)G;;Go7Dl[RS4sV3PL<EiA=H-j,5mc:EpiU(L4o+L`562]&4cmUsqr5']6fjTGldV]&4KeACZKE_7+C+\/I(PE&4JM[?/@4FU'[#87F/]0j!1^bS64B$X(\RG9A\q,h>9tF4D;P'87da65FXm*QUntM7&Ga>]g9,;b1@LA2.0AJ]ngk=:88j?PmNe/S$Sb@Ao$jON7-MTdJ>W-K>nsRTKs.N*dE:@P)+HIUT13[F12]0+9/3<]ZB=IA%q;8d@,d/sO:X0eE*:@@:4JAjnnDQa9>7"16kd=o~> | |||
endstream | |||
endobj | |||
8 0 obj | |||
<< /Type /Page | |||
/Parent 1 0 R | |||
/MediaBox [ 0 0 595 842 ] | |||
/Resources 3 0 R | |||
/Contents 7 0 R | |||
>> | |||
endobj | |||
9 0 obj | |||
<< /Length 3803 /Filter [ /ASCII85Decode /FlateDecode ] | |||
>> | |||
stream | |||
Gat=/BpTgY&cAe=0fD3@gQ_!gWbr-%H[Bq?nSK$`Y[E-$#ltYUY`6udmM]f;-7cEtQ,Vbc]Vh).W&c.ZU3c[qlIOe/ZuagNh:9DIG5(3dgY).YgLY0?P]f'"1YKFQHEqn\p30j>.YR\CFtY4iXLN]Ir1DrnmbQ^L)koHS`^WiIf?5Be+%G9[;Eh1K&"l%F-?rF[f#n^Tu<Piq`1%*JN^&j<gG]mKtEDD[b&h6^KPJT<i@OWN>k?@Hh+4AD$Eo]RpYbO:)SEAEOqh6LAd$7O5a$2!HTlfG=%nhcb*O7%&%r.gqmR*7gVm]^$s)CUZ1alMZ[>qc3i-kB8P2^rt:jYJA>InG_RqXsCe;!tH*jQIf7qZ=p`..QB^,1-3.Pa=Uoo]Uh^0A"C&adRc%*ROZaP`OC+H?;F@YClE+^Zj,H^&Jq6-Yk&TF?o:Z!TeqiNZK4fq\u1j3ofJP!PSLIPQthF4Z]81T7M%ObWq4!kl'\;gc:S^d/gr\!gHo%7XB/An%W*\O-;@53P#7TrE#Y>oZ!#g)h?dp%Ec"9SfHPdo_oe+T"GBjkQ[^S2aR8tbs7;,!.)B]jjBPcNt1CP/QV;fYj+srOPGViT%T;12"qj;1OkR<kWV?+bb-5S\rT]OF!q@9mLrRG/4ouTH\1ON7nGsj:Jj82.1%Ek;c(eG8d<`@%+R/'P(E?+MX$U*aZt6GUO$NO1/QjEW1H#7%-7./Wb5?Y"9&0-eMFCl_8?.4XDc?U"rm:YW1LPb%.sQ7Wb6K$"9&65eMFt'Jc>ZQlFC?F5l^jRous[OT`>%bH=g;8d/SSm4nC3Bkl6.2Ssbl^kjR4qLEMt(R=PJKKLZTt]Z`Wp"bOeM$Gd.p%"q_*Ggri,bf%^jMZn^Qh$UuWbREQ7+F)s16#\V9"%<t2*d]C?1Ggm!jg?0]JmbHf#.c>sW%YZcR=R1&"R6A4DJ#Qe!eL3")k7cOZp=,pn7hh*AcY!]3`pj$'nY,/"j&;tI[h.)3Lp>q/6I@k'nVjE"j&;tI[h.)q4.]2/6I.ebjm;UB#/MU<=%`5(*p4o\]cN+1Hl20=`G5XJpX*naXfF$(Yo!@87o]3^>KK75r&fXo`[9?$^+Y3W%YXk>*-s[6[ceQciR6VJO"Y"h9Z53@=^[l_%"cn$upiKIDJ%n*mP-(qh!Lq4e*<0p'#M,HT3Z@l3hKip2F>_e/-m^mGY_IW%YYLg;A3p;.":/["n7iUV>YUBb0B\7t&45dN6\lJGOj:V*1=b!VHUT8p`NN!pg;,PkK'&"P=O7..-!+#cKDd;;/p5&PuhRUU5gJ,+u[.7VNCr76l:;NRB,C(D6<D2bKEU?3hKW+dc-<K_%O_pb8dV"s'@7'7V2@Jf1Be<,1DgUd?c1FFZtXr/"AYAs<d%WL5u5$Gh\L!@ftu-W2+T;*$t=B)"c];*$t=B!0Vj_2QeC.Q):DSfkO?3^BNRe/-mg*M?:dl3hKo%T',Bo`[9HetL:DCG1'1"^tH2JAAZFL0k*mB$%W;VM5o$YC\I?<'Xjh(X(_FdMaIuclGp`JHs@L;ZT0Iie;NU+NuYW&C`"4bju1YCm/uTI)I3TSNs])Z6&Em06VaI@FiP)#Q$pAQ3tLQ;ZVFc,Jpri&8%OA#^jS-O&cg(TF(t;;\4trJhRR45iAbrLqsgZRA^/gT8kV6'nk8=!WkGa=PF2"N)Th/*@p]&"^tH3r5IVC&97IJ_Tc$\JYPI5iX3Qh;uqR(&RN/&0LJi*i$Fi%+K-F,;AH1jnVB5lS#QMk4&uLE$GpUZ!J)7Agi<Q)hMh)7*Br+jr9k]^c:.?kG=DG3?eO[h*1l3(rSY#;qo;JSIIQ1<0CI4k]36/NTp`2MgLm):o6Bm,E^GQ`_A1J:JRNpn_)V^`L5+0$F&Is8.QC'C;U\N'6T6C3GY,_S#&T_GcIgB50tsLB/7(9a##4ehcWLt!0tsdJ%,&/;r&n!Qhm:-qE;IBZ[c,HdS.t"q$;MD]QlF>US!.;dhc>hB2F+U>\k+?jopln_qVla_UKuq5HFp,lpn!)D?oPM>\aIa[0YXaK9\G)B&hSFT@%:^D5>Z<b/We^Y[.!.Q(b[C!A(_jh,jITuMI@3hA]rKB>W<6WSCTHS]*cgr4N:tG3SQ'M#/_oMm::T#M-TcZD(sb'3SfqEcqGY8]g3SGYM^B*1Gsg+F`5V2,:GNm1r2&>h&E`;L^MF:2B*I)h9aD<0a7eo8Q3'c6`tcg2Af$%)5\`!(XDFXg0eFpVp?\KF3&KBcj!uZE4XQS2&4F)"km?X$;MPbd*A>qGMY4p$7A(6k-h]pG->]hEW=":@nH.V&F*Sn']PAo1T&9iFp)rk:($OV#34qa#;RD*p"8l4D+$X8;aW#I;Gb]Q8kLh@1o)<>"ngfSU_Mi@%B7E>5s>#n.E2(aL6RIh*7UaeP#@7rBh1Zb$L6;G8L_[J25DEC"nhAcU_Mi")H)]]JpR9=Q_.neMXe-0<90jJSq!#i@_AHY'fd]Joa(2-I.$)F`q?`oPp`CJe75_g;N,fWU`q8lFbD`FDhISOL/_][T["*=dUsGL@f0(j.`,(_LPV.+)N=DJU`qBZFc*,n']Xb!<5bW3NY.P@@XOgl'mV6O0@U3d:C9u;Qt#eVD(tsj+Vfh_Ft_>Lj"D<K&Xd,&6>\CtC.Ld*MVSZJ_0Db!'qm("0@U3d6Og"c9sK&=2AhK4U`q_9mY0A&I&%o#\LD\Te-=rC%4Mf__pU:/8!>pP-ONb6S7;4RV%?E:PWUu9F2s/`I^TsMWIe#YVqA[T.E&,'Pc#THam>8A@j/@IQV6C@nsd9S5,G&]0pS)7OIt*Bo'uo`g9I-6@Z]L-Dt<H1Q'-I@<*kGJI`0"C.pb+[FW4CgMEu^e^WFZo<;[ZI'SCccYfY);<(q%j<d?,`iSD'cXLpYl`ME3AQ+)&/jG0iV_TL%X<W!arC>M,L6).d!X("u=[1dHtWsZ.eQNsSDYG2;sn7qSGZ;p7`)\#9qe`^)QX4TY/)iVY7dB?)C0r^^JjeWfJ=/0+7Z=6_$\&q>u$Elq612#_Jk=[N:Y=?8^C?>HX9/-dW7_^]qjmM<d?sNT1dB<s`\bl1\(kl%d?^\I1g7JUoF59VH$Elq613R6:7Ba?<U[W$j/!F%8?[Egfd*XR,(kl%d?Q$S`g8S.[MG\UUqN^k,X7*df3E(mRX3n,0?s2mMO1\!/hI%%(Q%$^<X0LDd2&PCYat6p3`5Z\A73Tb8QWpQN2:gDsXsaGK@WRH-`3HT%>#>RrOlmYKl)0:lO\P*I)=>T$/FmN'-EhZf25qs6Zo>Jc9d2ZKca:eEhJ#^L$!DPC7!AP8C6M`3esb)%o([:Oj.pE'g%igj9j[@%CJmsLb1e2IoB0/D]]/&(Un3\@S=;oir^L[e=1mFZe._DoH^p17,!1;,[E0q*ETo,qlJK'BAEU/42L38GY$!n3.rUWmcC^28n]DYRZ[,06GhYW0rpFTd=1mgeeRPoU2MitQNIL!DY$%;\.rUWm6Ib4#^@7TA$+07]M(D&SIcWYp=e/A=Dj/7/eEBuJp6sM<V=HO$/8X/S<aLp0Ap$G>]M0RXRl?"c=!Y)^A,kET2Miu$h@Q9'AKmU*p?uZmk(tX*h@N^oOiZ[FrHlH:,dOY"6WeV&,+C[fD`M1N'3Wu#+fr=#Oj+pDpP-.KA7>(aYk!Z>2L"NFRr`H[=kLA1XLoa>boQ\*>Y/I7o7jL?MF;X8]a*:[(,g*r.^)BR(YsGB9k7](VQTKI7!?tk#?`8*]W"!_MF;X8]a!4Z[WtYm@MOadU3d3TM/;dLmeg?H94Sjp/$M`YooAJ2lIPt9%SlFX~> | |||
endstream | |||
endobj | |||
10 0 obj | |||
<< /Type /Page | |||
/Parent 1 0 R | |||
/MediaBox [ 0 0 595 842 ] | |||
/Resources 3 0 R | |||
/Contents 9 0 R | |||
>> | |||
endobj | |||
11 0 obj | |||
<< /Length 3625 /Filter [ /ASCII85Decode /FlateDecode ] | |||
>> | |||
stream | |||
Gat=pl'!AO&]MNR?dW8Ah#PVEWCj1r\[H]o!-@0DJ8h!q!>kkWF(9:im::-ZV))$pbtDN\D8a(oQWhOZ:F5](rlJr"nIVTP*U\FKA3.Bt,T\</(CtWqCFP$BQ`t?"E<!c5mAHS'jeGf8m2O@]YGSnZh`Q>cg#8L>rL7GbR:UPuQr7%f``GA"MrkOnAsl"=ML"An:6X*#._o:eW*(n)KJR,*(SgLXJ2tX]-cM$^VUTi#0[gg"WgLoQPT!&B)/E>e`QW4se9D!JV\2m,bh:7*)E3^5b;P,e<QrG*<#W4GF%p(I'XP<;;WA6peeiF*bj&e4NNWH.AICrXTecGa<bd!a@*YRMl;63i9W@PVJ=0&tFWGerXg^p_9n8YoYj+8kF>Kc5[fC$a+mM,\!b]s=7\fKjJ2tTQkW3hGAkJ'O4O.3_/Sr!.\bi;Qpb'?-mA0'0]72;imfCX16;_kR]DJMSpccJuQ8#:!Phl::C&@s=c8fFsLU+OA.ZGM[R'A1_'=P]/Rprob1TBn7"PUAi"Wgs(8rZ%Yd)LelnF/24CA\s#=s(0m*RK-&\5M??#h0ctjTl[<'Xs0edJ,3n[8(O`!P=%"f9[4KC&AEk2HFX65YGn3rXM140=KZO*bBh!V=>'!g6f-VoffA'p]uF/DJXl0$:CZ0`sC2KZ+@_/AR@2bj.?UanRDsn;]$uAre3TV6aeu*l#e1ANIN2"`fVjW;dlWSp^[FC/D1)/'cp\\nQuFQGd?>s1.pSkjp5p1?WPsA7VNDm+l(),'fZRW=)&:*,M^;2'fZ^[=)&:j7_"FJ.r]B9Y1+T^JoD[$<npD>Bb7`^\<KKF<c*Q23QKcU[8WYdj36;uXf_(P1KS<&G;RUhD%,/+O#(jR#'$>VDYD@V\A'h$C(Riugh-S&Kj-Z\V8at)$/mdhBIhm"R4C.N40"LgD9U`A2u4MtqnH$]\>)*qF5+C8(%1`V=(r4i<%"*g=L])`pGlRS#c%ZEOnIJ?\/"H,b`s*b7FlBmjAreTo/KAPiZd]tol;Rq7rd[_pF)71EKTqKg:7ZQdec(')Q0*ep"MO=%JDg+Po@S0eo,?h2V@1H=)&9_>/-'#gL-Yk>ik9l6Ip)@lS`tee\3X`AGnF#0)EUkqmr;Zp"T8QpjYE0noZr9laQD,EHD!dmH^]k+l()hD=7D(I9k-nop_<)(>KMq)tR%`pRimS=pVV-F[u4PRB(aAKq>dDF[t)&0N\._3iZ9*D1(.Op)EV1L/Jst=%Dq@\W*dS_L@-Jg=OkP]jbm>lgSc,H+IkqC0t%4onp;>Y<0UMK=T^fePX$6\ZN%s_L>u:BB/=CW*V41pq"*1(@M'4DX6W:cp'><pq"*1`pp]GW7CaU1s@Dm285*B([f'9]ZSj&ToWcfnTFK:pq3@$T^H<;>oMikjr.Ss>Xs4>H"AjhMpt>alY)es?cV3.HsIZQ,N]nO8'gM"=4__oHsIZY1GIGU3oW3sd<1uPIbf[Y,O=ZO$g351odVlsFi3"Z>iY.+lf^j*EAm]:'@I\uY9U3Fs'E^um+4tQ]X#83\9L6LY$\MB2r$o4Y46YANaNs@Y9UA\2pB%\bqW0tYARe+c<R>7>kS'@qJZ)ZaCLFaFh.Fl>9A@amYC8G55;M:^RDVGAed'Bri!B`(-V]<@MD!0&8NT8/;TiD1*B2C<rc^':FLia-WUY3;W4q^ENV?#F>bfX7&9kpF4-r";aL^WWGm.j+NYj?l/t.YA:TmOVe6!MU<b6iI&B7nKHpY<'u'/s0s<G[C#V4NlX=7^7cB7*Z)3VYIIEQ8r\H$X!"bKsNI.Q455[j8aXFe+&Eab%W&hVE4oM@T'LlAP-`.fVW&hV%4ThEX)#9)\)!M]kWma&Z1E];D;5_)?doO@3W_R_=<i%M@'K_H:MmVWWdpNDKWA&@N40d-['LaC]CUm=[p%+`aS@=4Vd9Xq\_C0]r6jaBmW&_C%3sJ*P0ZnQ#0u^ARRZlR`6Rf):Ob1;(hq?gJPf!,R0lE-OOW\g@GJC:1"i+?]>/Db)Nk8LEKf9!@Thd(PNk8LEKeEJF\V)GJ:+)J@Lf33T!7BHbm-]p,!Ot6YL0SS#Ap8`($Gb2S89)(qRaX?_1jDKhnFkn\Q#`ED3PDabrNB'*]^n+d`_](>=kl@o"b&YnmADmZd$aG/Q^m[3%9eWm@s%:5TdK(:'WsL[o1s'X)P^g3$oN$[T^_S^W72ZTK4h,S49U@RcPa<+UG4e8cVP:$#R\m^L.[HQ8U,uYfL&KF!qGbPNLq=i'7:&mYF+qJXiY78cJS(eRsh13*;8XoP:DR>!ITWjpd7m1W\[Uh+K+18![9&ZSJ`n7hEmk^";)?VcO?'WpB]:0+G.H?R\<X>7gRU4+bIQXR\<VhFJEZ-g,)2ofLPC,V(oP*aA<P+#RXdML.[Gt,#FJ[VL3J=)5Zjr"DVBX6/d@;:oWt;!]A)UT^Hs&1u:Tm-6*WI]hXj4Y7RYS7g*t<;l0#"!,<_k6/Cj+Bcoq8D+Z"NH^uXGh]bl1PR-P\Vb.'%M.Eq*5oga5$C)OE6_GbY&_(5T=#+;Uj7`i/,US+(/Edfu2;Uir-8Z=ai<E@eT17iO!7^'V@QM`kj[#^GE]_<0-UKkqi5P=\M%9j4rJ4GEQ=u`G&pQSaeV'hjNqtQ`^+5qbl/kTt;]`XkB!-Pl'I-j(Qn(%MM]=TjhAaE>Vl6pfC/PacOe\2dgS9S>Z/Xr3)F$]apAIk,2ffk:hB:q=q$Q9<QUnB*??a2M)Q0qbPIYt('RT"cqcos`>i\"[o0TF'Nc`(%)T5(iF#L4e@dgttJ1EL5Mk&t;\Z1..Fhj7\`'kHFNE.LfQL2>0RqQr=D]7T'FHtjF@m47WL=/'CN6GoRY__V4cPNb4+>,FAD8md&@m481;M2L#I'tbf\;pB4j[p!A,2]Ru>/YR-k:9VK&/Ub\2Jf3H\a-'>pbW%0@>gfH@\knVWBagna]l]+(Fu?P)$"FC(.$as:hbG=h/)-rY.NL?NR9Bs1"8TDK#0O/Ti)!*Y$t<GESXqrBn4ftD"&W$SG&>NNe(WjO_j_8/tBWK2P`/nO$HG5+t+F'c4>9YT2llg>nn$fB]ZiXQ'=8iiD&6+DGI277T=SkOqOr.OSb`g-@o#!6^dQ<_!A$k/eKkj-EskoFcj3qJO,(HRfo%'Q_"FeS\TuH2484n=R'0U*cQ6'K+<l!#qYa%*tPmH"Q/uP/9>Y69>*u""0Mr=d.>s&7S_=T<?Z1+WI<qf+Y;U@5L,UWRWhq"6_H>gV&(cJ98BY_f_B%tF);!%]jIH!&$er<\KHg/8RNE#<m4g6^iD^f<Kk3RIO:>j.Y6^?07P\--Eu;&KtY<udKuutga7S(0-&cjNi,HV1NJ,A8RSC)kESeMPYVjn9jjgl9.'hE8mo$#&?\`8V>#lm"0P7(Bn=!*S%qYb(In[7WBjeQq_]P`Y4QUh4?TgQIH1"A9l&m[&4TpFI,;`Q)3%.(QLA(J_h\\)k+-:.f^OVSF%m.V>Ar>G6#$5uJXRQJ:rfBC6<+Lgco"Oe_hdXBpfFW@@0sNBBlb,2iV^`$S\p1HbJ[YL_hdV\6s$P@+>0sUC_S+s].'*q2LJT4F%m>nXCD]FYU55Nhl_fF7"o!8lml.0&9Vms\+`\t#E)-F\G~> | |||
endstream | |||
endobj | |||
12 0 obj | |||
<< /Type /Page | |||
/Parent 1 0 R | |||
/MediaBox [ 0 0 595 842 ] | |||
/Resources 3 0 R | |||
/Contents 11 0 R | |||
>> | |||
endobj | |||
13 0 obj | |||
<< /Length 1495 /Filter [ /ASCII85Decode /FlateDecode ] | |||
>> | |||
stream | |||
Gat%e6#YO:&4Z-f'`nFNG*'!T7j=r);VSgQ,.A\Q*a85ECc>(H)@>c+9oufu4l[f^3$X(O#[b5&oKA>r%%k$GqigJlY&i1HDZA_7G/'ZZcLR%^U,=BQ0#lc#0m<H[m[)C@*kVlMn'AR`I8#%-l/T,<f5CW\/q\2c*8m>CdA_d(b8%&cB&YK_)\unqBH]F-n,X[*I"tZ40:U!a-N"5_4l;qbM!_NP-N")[*LSW7`:J^<HBZ!6R#(+\Tj^W,lkel>D1.Wm@IaGM-GE8W5[?1Q9OOe$THT_f$L#hF/JG8fi]nh"$ZQhaQ]Obr@J0\cpa5q@h).I"$!&?G4sCNePDM^9Z>T:gf(85tPqi(u!*G^a/GbI)&RS*c[`g`23cc/62G#TlLFP&3!%)>K/""i1/2NjtbWmLC_8H^nAsO<=JCu:`HGL$7bVJ3kJ4Y-L:,)3qR@.X+Nr[WT1F0e1c-.s'=bZ+WE3CTj\qGFDGL7[6)6XXN1'NEL'q1h-`XMuLZG9;H6o23op^)L$?XP9eUD[6Ig`fRk$k2NmTk24_!32<8Tl=Y3Td&MK!`dCY:q/AnBUSAlJLY5=.,5as[*1KP:h:(EKptGaQ5T-'W3QV^Nm5p+iu\E(XarCTbs>l&7A)/DfJGMlOhn%qZd5&Op4c:_eVK/K&a2h,2U,5H1B'b9arJ(e%5T!Tk.osq&[&DEju*W+XR1Sp[jKmuWsljLC*.A^_(3YQ>\+MkD:ijFg*1d5CKu=r]2p7?Y8!3om^'T_N/%[<M$-2lEMtf[WJl[]m0t:]PtNeI4p\[YY$?Q+GsJl3-^_M_*cII_M[JGnU[[-XQC&bs4GN@5(W`#FV1Q8&Mb9R/&CoKTjsmQB0"fqNXuM@_6Ae=7"`rW32fm0$M/9:cB!/EIju1hR4I%#o4^TKPb_6Q:1KPPi&Cdeg@sCeR+m4+d-PI.[<Kb0tpb6XS)C"3k!3-LGF2bTu<Fl#X5a>b3[(1WR#&h)+E4'6G5FT,\1*Y."<g)DDm&ZVU,Qh2i/'7:SGo^\BJEC!-#&dkn>U:7F/e.QI<p\6MhKO<.RXS3R'+M?5Q+>$nQj`Ap]tN0M<h;%qelCi^cX?1DKhG!a"q@t_Q+>$nG%h35;/`6";0rKVd.:8/_-FL1108eA:m:R?X$)*GYcQ/UjV^G1X"mb%#'43UcWo]P6d8so=*Y!kiP(GbdPHWHB4S19%-GET,BK\o<58CQ>lF=cg;,FnRB&FPRV1_"b_?!QF+n7'oqaTgQ"_oghL@=_*+r+@$_NifAV7Ot^Wp)H_-Ed3C>WDOm&tK&PeKH6rASe_D_N"$f?=uD5ul7Q>icpKKh_-eIRMmKW-YD)\]QjugT^^,i<nJ8M"F:+)pE0QIm;2an-t8LI_EDVb;V3TfULC&c^-bDFa[MV\$(jJ5Hauhrc!+-F`V\MF1f&Smm`'YB4qe0^:eg">W\K/^]/I>/0EO>qa\iMQcF<n#B.pAVmFE4MRRYdDYGM#!>>4h*r~> | |||
endstream | |||
endobj | |||
14 0 obj | |||
<< /Type /Page | |||
/Parent 1 0 R | |||
/MediaBox [ 0 0 595 842 ] | |||
/Resources 3 0 R | |||
/Contents 13 0 R | |||
>> | |||
endobj | |||
15 0 obj | |||
<< /Type /Font | |||
/Subtype /Type1 | |||
/Name /F14 | |||
/BaseFont /ZapfDingbats >> | |||
endobj | |||
16 0 obj | |||
<< /Type /Font | |||
/Subtype /Type1 | |||
/Name /F5 | |||
/BaseFont /Times-Roman | |||
/Encoding /WinAnsiEncoding >> | |||
endobj | |||
17 0 obj | |||
<< /Type /Font | |||
/Subtype /Type1 | |||
/Name /F13 | |||
/BaseFont /Symbol >> | |||
endobj | |||
18 0 obj | |||
<< /Type /Font | |||
/Subtype /Type1 | |||
/Name /F1 | |||
/BaseFont /Helvetica | |||
/Encoding /WinAnsiEncoding >> | |||
endobj | |||
19 0 obj | |||
<< /Type /Font | |||
/Subtype /Type1 | |||
/Name /F9 | |||
/BaseFont /Courier | |||
/Encoding /WinAnsiEncoding >> | |||
endobj | |||
1 0 obj | |||
<< /Type /Pages | |||
/Count 5 | |||
/Kids [6 0 R 8 0 R 10 0 R 12 0 R 14 0 R ] >> | |||
endobj | |||
2 0 obj | |||
<< /Type /Catalog | |||
/Pages 1 0 R | |||
>> | |||
endobj | |||
3 0 obj | |||
<< | |||
/Font << /F5 16 0 R /F14 15 0 R /F13 17 0 R /F1 18 0 R /F9 19 0 R >> | |||
/ProcSet [ /PDF /ImageB /ImageC /Text ] >> | |||
endobj | |||
xref | |||
0 20 | |||
0000000000 65535 f | |||
0000016170 00000 n | |||
0000016255 00000 n | |||
0000016305 00000 n | |||
0000000015 00000 n | |||
0000000071 00000 n | |||
0000002919 00000 n | |||
0000003025 00000 n | |||
0000006052 00000 n | |||
0000006158 00000 n | |||
0000010053 00000 n | |||
0000010160 00000 n | |||
0000013878 00000 n | |||
0000013986 00000 n | |||
0000015574 00000 n | |||
0000015682 00000 n | |||
0000015767 00000 n | |||
0000015877 00000 n | |||
0000015956 00000 n | |||
0000016064 00000 n | |||
trailer | |||
<< | |||
/Size 20 | |||
/Root 2 0 R | |||
/Info 4 0 R | |||
>> | |||
startxref | |||
16438 | |||
%%EOF |
@@ -19,19 +19,18 @@ | |||
<fo:root font-family="Times Roman" font-size="12pt" xmlns:fo="http://www.w3.org/1999/XSL/Format"> | |||
<fo:layout-master-set> | |||
<fo:simple-page-master | |||
margin-right="1.5cm" | |||
margin-left="1.5cm" | |||
margin-bottom="2cm" | |||
margin-top="1cm" | |||
page-width="21cm" | |||
page-height="29.7cm" | |||
master-name="left"> | |||
<fo:region-before extent="0.5cm"/> | |||
<fo:region-body margin-top="0.5cm" margin-bottom="1.7cm"/> | |||
<fo:region-after extent="1.5cm"/> | |||
</fo:simple-page-master> | |||
<fo:simple-page-master | |||
margin-right="1.5cm" | |||
margin-left="1.5cm" | |||
margin-bottom="2cm" | |||
margin-top="1cm" | |||
page-width="21cm" | |||
page-height="29.7cm" | |||
master-name="left"> | |||
<fo:region-body margin-top="0.5cm" margin-bottom="1.7cm"/> | |||
<fo:region-before extent="0.5cm"/> | |||
<fo:region-after extent="1.5cm"/> | |||
</fo:simple-page-master> | |||
</fo:layout-master-set> | |||
<fo:page-sequence id="N2528" master-reference="left"> |
@@ -16,7 +16,7 @@ | |||
limitations under the License. | |||
--> | |||
<!-- $Id$ --> | |||
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd"> | |||
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN" "http://forrest.apache.org/dtd/document-v13.dtd"> | |||
<document> | |||
<header> | |||
<title>Apache™ FOP: Getting Help</title> |
@@ -16,7 +16,7 @@ | |||
limitations under the License. | |||
--> | |||
<!-- $Id$ --> | |||
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd"> | |||
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN" "http://forrest.apache.org/dtd/document-v13.dtd"> | |||
<document> | |||
<header> | |||
<title>Apache™ FOP</title> | |||
@@ -25,21 +25,22 @@ | |||
<body> | |||
<section id="intro"> | |||
<title>Introduction</title> | |||
<p>Apache™ FOP (Formatting Objects Processor) is a print formatter driven by XSL | |||
<p> | |||
Apache™ FOP (Formatting Objects Processor) is a print formatter driven by XSL | |||
formatting objects (XSL-FO) and an output independent formatter. It is a Java | |||
application that reads a formatting object (FO) tree and renders the resulting | |||
pages to a specified output. <link href="1.1/output.html">Output formats</link> | |||
pages to a specified output. <link href="1.1rc1/output.html">Output formats</link> | |||
currently supported include PDF, PS, PCL, AFP, XML (area tree representation), | |||
Print, AWT and PNG, and to a lesser extent, RTF and TXT. The primary output target is PDF. | |||
</p> | |||
<p>The Apache™ FOP project is part of the <a href="http://www.apache.org">Apache™</a> | |||
Software Foundation, which is a wider community of users and developers of open | |||
source projects. | |||
<p> | |||
The Apache™ FOP project is part of the <link href="http://www.apache.org">Apache™</link> | |||
Software Foundation, which is a wider community of users and developers of open source projects. | |||
</p> | |||
<figure width="480" height="260" src="images/document.jpg" alt="Render Diagram" /> | |||
<p> | |||
A release candidate (rc1) of the latest version of FOP is available at <link href="1.1rc1/">FOP 1.1rc1</link>. | |||
</p> | |||
<figure width="480" height="260" src="images/document.jpg" alt="Render Diagram" /> | |||
<p> | |||
A stable release of the latest version of FOP is available at <link href="1.1/">FOP 1.1</link>. | |||
</p> | |||
<p> | |||
Support for each of the standard's objects and properties is detailed in <link href="compliance.html">FOP Compliance</link>. | |||
<link href="download.html">Download</link> options include a precompiled version, source code, and many example files to get you started. <link href="resources.html">Resources</link> include links to XSL-FO introductions and many other useful references. A checklist for <link href="gethelp.html">Getting Help</link> will guide you toward maximizing the usefulness of FOP. |
@@ -16,7 +16,14 @@ | |||
limitations under the License. | |||
--> | |||
<!-- $Id$ --> | |||
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd"> | |||
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN" "http://forrest.apache.org/dtd/document-v13.dtd" [ | |||
<!ATTLIST document | |||
xmlns:xi CDATA #IMPLIED> | |||
<!ELEMENT xi:include EMPTY> | |||
<!ATTLIST xi:include | |||
href CDATA #IMPLIED> | |||
<!ENTITY % local.sections "|xi:include"> | |||
]> | |||
<document xmlns:xi="http://www.w3.org/2001/XInclude"> | |||
<header> | |||
<title>Apache™ FOP: Known Issues</title> | |||
@@ -30,27 +37,25 @@ | |||
from data in FOP's code repository (Trunk) and may not exactly represent the list of issues in | |||
the latest release. | |||
</p> | |||
<note> | |||
<p> | |||
For additional information on known issues in Apache FOP, please have a look at the following pages, too: | |||
</p> | |||
<ul> | |||
<li><a href="bugs.html">the bug list in Bugzilla</a></li> | |||
<li><a href="http://wiki.apache.org/xmlgraphics-fop/FOPProjectTasks">the task list in the Wiki</a></li> | |||
</ul> | |||
</note> | |||
<p> | |||
Apache™ FOP has an extensive automated testing infrastructure. Parts of this infrastructure are several | |||
sets of test cases. When a test case is listed in disabled-testcases.xml it is disabled in the JUnit | |||
tests during the normal build process. This indicates a problem in the current codebase. When a bug is | |||
fixed or a missing feature is added the entry for the relevant test case(s) are removed. | |||
</p> | |||
<p> | |||
For additional information on known issues in Apache FOP, please have a look at the following pages, too: | |||
</p> | |||
<ul> | |||
<li><link href="bugs.html">the bug list in Bugzilla</link></li> | |||
<li><link href="http://wiki.apache.org/xmlgraphics-fop/FOPProjectTasks">the task list in the Wiki</link></li> | |||
</ul> | |||
<section> | |||
<title>FO Tree</title> | |||
<p> | |||
This section lists currently disabled test cases in the test suite for the FO tree tests. | |||
The data for this section comes from | |||
<a href="http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/test/fotree/disabled-testcases.xml">test/fotree/disabled-testcases.xml</a>. | |||
<link href="http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/test/fotree/disabled-testcases.xml">test/fotree/disabled-testcases.xml</link>. | |||
</p> | |||
<xi:include href="cocoon://knownissues-raw-fotree.xml#xpointer(/document/body/*)"/> | |||
</section> | |||
@@ -59,7 +64,7 @@ | |||
<p> | |||
This section lists currently disabled test cases in the test suite for the layout engine tests. | |||
The data for this section comes from | |||
<a href="http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.xml">test/layoutengine/disabled-testcases.xml</a>. | |||
<link href="http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.xml">test/layoutengine/disabled-testcases.xml</link>. | |||
</p> | |||
<xi:include href="cocoon://knownissues-raw-layoutengine.xml#xpointer(/document/body/*)"/> | |||
</section> |
@@ -16,7 +16,7 @@ | |||
limitations under the License. | |||
--> | |||
<!-- $Id$ --> | |||
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd"> | |||
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN" "http://forrest.apache.org/dtd/document-v13.dtd"> | |||
<document> | |||
<header> | |||
<title>Apache™ FOP License</title> | |||
@@ -27,7 +27,7 @@ | |||
<title>License</title> | |||
<p> | |||
All new Apache™ FOP releases will be licensed under the <strong>Apache™ License, version 2.0</strong>. | |||
Releases until version 0.20.5 are released unter the Apache™ License, version 1.1. | |||
Releases up through version 0.20.5 were released under the Apache™ License, version 1.1. | |||
</p> | |||
<p> | |||
To inspect the license terms please consult the LICENSE and NOTICE files in the root |
@@ -16,7 +16,7 @@ | |||
limitations under the License. | |||
--> | |||
<!-- $Id$ --> | |||
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd"> | |||
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN" "http://forrest.apache.org/dtd/document-v13.dtd"> | |||
<document> | |||
<header> | |||
<title>Apache™ FOP: Mailing List Resources</title> | |||
@@ -83,7 +83,7 @@ If you are using Microsoft Outlook, this setting can be found at the "Mail Forma | |||
source, or other semantic XML? If so, the question is <em>almost certainly not | |||
appropriate to this list</em>. In general, the only input documents that are | |||
appropriate on this list are XSL-FO snippets. See <link | |||
href="1.1/running.html#check-input">Running Xalan</link> for instructions about capturing the XSL-FO document that is actually submitted to FOP. If you haven't examined the XSL-FO document yourself, then you are not yet prepared to formulate a FOP-specific question.</li> | |||
href="1.1rc1/running.html#check-input">Running Xalan</link> for instructions about capturing the XSL-FO document that is actually submitted to FOP. If you haven't examined the XSL-FO document yourself, then you are not yet prepared to formulate a FOP-specific question.</li> | |||
<li>If you are providing one or more XSL-FO snippets: | |||
<ul> | |||
<li>Have you reduced them to the shortest possible complete, <strong>self-contained</strong> document that demonstrates the problem? Please do so.</li> |
@@ -17,12 +17,12 @@ | |||
--> | |||
<!-- $Id$ --> | |||
<news> | |||
<item date="2012-DD-MM" title="Apache™ FOP 1.1 Released"> | |||
<item date="2012-07-02" title="Apache™ FOP 1.1rc1 Available"> | |||
<p> | |||
The Apache™ FOP team is delighted to present you a production grade | |||
This is a candidate release for an upcoming FOP Version 1.1 (stable) release. | |||
release of the new FOP codebase. This release | |||
contains bug fixes and new features. See the <a | |||
href="1.1/releaseNotes_1.1.html">Release Notes</a> for a list of | |||
contains bug fixes and new features. See | |||
<a href="1.1rc1/releaseNotes_1.1rc1.html">Release Notes</a> for a list of | |||
the most important changes. | |||
</p> | |||
</item> |
@@ -16,17 +16,24 @@ | |||
limitations under the License. | |||
--> | |||
<!-- $Id$ --> | |||
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd"> | |||
<document> | |||
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN" "http://forrest.apache.org/dtd/document-v13.dtd" [ | |||
<!ATTLIST document | |||
xmlns:xi CDATA #IMPLIED> | |||
<!ELEMENT xi:include EMPTY> | |||
<!ATTLIST xi:include | |||
href CDATA #IMPLIED> | |||
<!ENTITY % local.sections "|xi:include"> | |||
]> | |||
<document xmlns:xi="http://www.w3.org/2001/XInclude"> | |||
<header> | |||
<title>Apache™ FOP News</title> | |||
<version>$Revision$</version> | |||
</header> | |||
<body> | |||
<p> | |||
RSS Feed: <a href="subproject-news-feed.rss"><img src="feed-icon-14x14.png" alt="Subproject News Feed"/></a> | |||
RSS Feed: <link href="subproject-news-feed.rss"><img src="feed-icon-14x14.png" alt="Subproject News Feed"/></link> | |||
</p> | |||
<xi:include href="cocoon://subproject-news-document.xml#xpointer(/document/body/*)" xmlns:xi="http://www.w3.org/2001/XInclude"/> | |||
<xi:include href="cocoon://subproject-news-document.xml#xpointer(/document/body/*)"/> | |||
</body> | |||
</document> | |||
@@ -16,7 +16,7 @@ | |||
limitations under the License. | |||
--> | |||
<!-- $Id$ --> | |||
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd"> | |||
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN" "http://forrest.apache.org/dtd/document-v13.dtd"> | |||
<document> | |||
<header> | |||
<title>Apache™ FOP: Quick Start Guide</title> | |||
@@ -29,15 +29,15 @@ | |||
<p>The goal of this <strong>Quick Start Guide</strong> is to help novice users get Apache FOP up and running quickly. Typically, you'll need to:</p> | |||
<ol> | |||
<li><link href="download.html">Download FOP</link></li> | |||
<li><link href="1.1/compiling.html">Build FOP</link> (you can skip this step if you download the binary distribution!)</li> | |||
<li><link href="1.1/configuration.html">Configure FOP</link></li> | |||
<li><link href="1.1/running.html">Run FOP</link></li> | |||
<li><link href="1.1rc1/compiling.html">Build FOP</link> (you can skip this step if you download the binary distribution!)</li> | |||
<li><link href="1.1rc1/configuration.html">Configure FOP</link></li> | |||
<li><link href="1.1rc1/running.html">Run FOP</link></li> | |||
</ol> | |||
<p>Here are some links to help you find out what FOP can do, as well as how and where to get help:</p> | |||
<ul> | |||
<li><link href="1.1/embedding.html">Calling FOP from a Java Application</link></li> | |||
<li><link href="1.1/servlets.html">Using FOP in Servlets</link></li> | |||
<li><link href="1.1/anttask.html">Using FOP in an 'Ant' Build Script</link></li> | |||
<li><link href="1.1rc1/embedding.html">Calling FOP from a Java Application</link></li> | |||
<li><link href="1.1rc1/servlets.html">Using FOP in Servlets</link></li> | |||
<li><link href="1.1rc1/anttask.html">Using FOP in an 'Ant' Build Script</link></li> | |||
<li><link href="compliance.html" title="FOP Compliance">XSL-FO Compliance</link> (what FOP supports and what it doesn't)</li> | |||
<li><link href="faq.html">FAQs</link></li> | |||
<li><link href="gethelp.html">Getting Help</link></li> | |||
@@ -45,7 +45,7 @@ | |||
</ul> | |||
<p> | |||
Once you've familiarized yourself with the basics, you can get more detailed information, | |||
in the detailed FOP <link href="1.1/index.html">product documentation</link>. | |||
in the detailed FOP <link href="1.1rc1/index.html">product documentation</link>. | |||
</p> | |||
</section> | |||
@@ -16,7 +16,7 @@ | |||
limitations under the License. | |||
--> | |||
<!-- $Id$ --> | |||
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd"> | |||
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN" "http://forrest.apache.org/dtd/document-v13.dtd"> | |||
<!-- FOP Relevant Specifications and links --> | |||
<document> | |||
<header> |
@@ -65,12 +65,12 @@ | |||
<upgrading label="Upgrading" href="upgrading.html"/> | |||
<using label="Using Apache™ FOP"> | |||
<ant label="Ant Task" href="anttask.html"/> | |||
<build label="Build" href="compiling.html"/> | |||
<config label="Configure" href="configuration.html"/> | |||
<run label="Run" href="running.html"/> | |||
<embed label="Embed" href="embedding.html"/> | |||
<run label="Run" href="running.html"/> | |||
<servlet label="Servlets" href="servlets.html"/> | |||
<ant label="Ant Task" href="anttask.html"/> | |||
</using> | |||
<features label="Features"> | |||
@@ -94,22 +94,22 @@ | |||
--> | |||
<!-- | |||
BEGIN Version 1.1 documentation tab | |||
BEGIN Version 1.1rc1 documentation tab | |||
--> | |||
<trunk label="Apache™ FOP 1.1" href="1.1/" tab="stableversion"> | |||
<trunk label="Apache™ FOP 1.1rc1" href="1.1rc1/" tab="stableversion"> | |||
<about label="About" href="index.html"/> | |||
<release label="Release Notes" href="releaseNotes_1.1.html"/> | |||
<changes label="Changes (1.1)" href="changes_1.1.html"/> | |||
<release label="Release Notes" href="releaseNotes_1.1rc1.html"/> | |||
<changes label="Changes (1.1rc1)" href="changes_1.1rc1.html"/> | |||
<knownissues label="Known Issues" href="knownissues_overview.html"/> | |||
<upgrading label="Upgrading" href="upgrading.html"/> | |||
<using label="Using Apache™ FOP"> | |||
<ant label="Ant Task" href="anttask.html"/> | |||
<build label="Build" href="compiling.html"/> | |||
<config label="Configure" href="configuration.html"/> | |||
<run label="Run" href="running.html"/> | |||
<embed label="Embed" href="embedding.html"/> | |||
<run label="Run" href="running.html"/> | |||
<servlet label="Servlets" href="servlets.html"/> | |||
<ant label="Ant Task" href="anttask.html"/> | |||
</using> | |||
<features label="Features"> | |||
@@ -130,7 +130,7 @@ | |||
</trunk> | |||
<!-- | |||
END Version 1.1 documentation tab | |||
END Version 1.1rc1 documentation tab | |||
--> | |||
<!-- | |||
@@ -141,12 +141,12 @@ | |||
<upgrading label="Upgrading" href="upgrading.html"/> | |||
<using label="Using Apache™ FOP"> | |||
<ant label="Ant Task" href="anttask.html"/> | |||
<build label="Build" href="compiling.html"/> | |||
<config label="Configure" href="configuration.html"/> | |||
<run label="Run" href="running.html"/> | |||
<embed label="Embed" href="embedding.html"/> | |||
<run label="Run" href="running.html"/> | |||
<servlet label="Servlets" href="servlets.html"/> | |||
<ant label="Ant Task" href="anttask.html"/> | |||
</using> | |||
<features label="Features"> |
@@ -27,17 +27,17 @@ | |||
<body> | |||
<section> | |||
<title>Status</title> | |||
<p>Last updated DD Month 2012.</p> | |||
<p>Last updated 02 July 2012.</p> | |||
<p> | |||
Apache™ FOP version 1.1 was released on DD Month 2012. | |||
Apache™ FOP version 1.1rc1 (candidate) was released on 02 July 2012. | |||
</p> | |||
</section> | |||
<section> | |||
<title>Development Status</title> | |||
<p> | |||
The FOP code base is gradually evolving, from version 0.90 | |||
released on 22 November 2005, to version 1.1 released on DD Month 2012. | |||
Further releases in the 1.x series are expected. | |||
The FOP code base is gradually evolving, from Version 0.90, | |||
released on 22 November 2005, to Version 1.1, expected to be released during | |||
the Summer of 2012. Further releases in the 1.x series and beyond are expected. | |||
</p> | |||
<p> | |||
FOP releases prior to version 0.90 were based on a different |
@@ -22,7 +22,7 @@ | |||
<tabs software="FOP" title="FOP" copyright="@year@ The Apache Software Foundation" xmlns:xlink="http://www.w3.org/1999/xlink"> | |||
<tab label="Home" dir=""/> | |||
<tab label="Version 1.0" dir="1.0/"/> | |||
<tab label="Version 1.1" dir="1.1/"/> | |||
<tab label="Version 1.1rc1" dir="1.1rc1/"/> | |||
<tab label="FOP Trunk" dir="trunk/"/> | |||
<tab label="Development" dir="dev/"/> | |||
</tabs> |
@@ -16,7 +16,7 @@ | |||
limitations under the License. | |||
--> | |||
<!-- $Id$ --> | |||
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd"> | |||
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN" "http://forrest.apache.org/dtd/document-v13.dtd"> | |||
<document> | |||
<header> | |||
<title>Apache™ FOP: Development Team</title> | |||
@@ -44,7 +44,7 @@ | |||
is an XP/Agile practitioner with interests in open source content management and electronic | |||
document generation. He is a UK expat now residing in Singapore.</li> | |||
<li id="ad"><link href="mailto:adelmelle@apache.org">Andreas Delmelle</link> (AD)</li> | |||
<li id="pjfh"> <a href="mailto:phancock.at.apache.org">Peter Hancock</a> | |||
<li id="pjfh"> <link href="mailto:phancock.at.apache.org">Peter Hancock</link> | |||
(PH) is a Java developer from England.</li> | |||
<li id="vh"><link href="mailto:vhennebert@apache.org">Vincent Hennebert</link> | |||
(VH), a Java developer from France; with an interest in typography, and in using |
@@ -281,6 +281,24 @@ | |||
treated as zero penalty in most cases. For more details on the image loading framework, | |||
please consult the documentation there. | |||
</p> | |||
<p> | |||
The ImageLoaderPNG and ImageLoaderRawPNG have a hard-coded penalty of 1000 and as such the | |||
ImageLoaderImageIO image loader will be selected by default when loading PNGs unless | |||
the latter is disabled by awarding a INFINITE penalty to it, or one of the former two is | |||
promoted by awarding a strong negative penalty (say, -10000) to it. | |||
</p> | |||
<source><![CDATA[<fop version="1.0"> | |||
[..] | |||
<image-loading> | |||
<penalty value="-10000" | |||
class="org.apache.xmlgraphics.image.loader.impl.ImageLoaderRawPNG"/> | |||
<penalty value="INFINITE" | |||
class="org.apache.xmlgraphics.image.loader.impl.ImageLoaderPNG"/> | |||
<penalty value="INFINITE" | |||
class="org.apache.xmlgraphics.image.loader.impl.imageio.ImageLoaderImageIO"/> | |||
</image-loading> | |||
<renderers.... | |||
</fop>]]></source> | |||
</section> | |||
<section id="renderers"> | |||
<title>Renderer configuration</title> |
@@ -493,10 +493,10 @@ | |||
Various notes related to embedded fonts: | |||
</p> | |||
<ul> | |||
<li>The PostScript renderer does not yet support TrueType fonts, but can embed Type 1 fonts.</li> | |||
<li>The font is simply embedded into the PDF file, it is not converted.</li> | |||
<li>When FOP embeds a font, it adds a prefix to the fontname to ensure that the name will not match the fontname of an installed font. | |||
This is helpful with older versions of Acrobat Reader that preferred installed fonts over embedded fonts.</li> | |||
<li>The font is simply embedded into the output file, it is not converted.</li> | |||
<li>When FOP embeds a font in a PDF file, it adds a prefix to the fontname to ensure that | |||
the name will not match the fontname of an installed font. This is helpful with older | |||
versions of Acrobat Reader that preferred installed fonts over embedded fonts.</li> | |||
<li>When embedding PostScript fonts, the entire font is always embedded.</li> | |||
<li>When embedding TrueType fonts (ttf) or TrueType Collections (ttc), a subset of the | |||
original font, containing only the glyphs used, is embedded in the output document. | |||
@@ -576,4 +576,4 @@ | |||
</p> | |||
</section> | |||
</body> | |||
</document> | |||
</document> |
@@ -108,7 +108,7 @@ | |||
<tr> | |||
<td><a href="#png">PNG</a> (Portable Network Graphic)</td> | |||
<td>bitmap</td> | |||
<td/> | |||
<td>(X)</td> | |||
<td/> | |||
<td>X</td> | |||
</tr> | |||
@@ -217,8 +217,8 @@ | |||
</tr> | |||
<tr> | |||
<td><a href="#png">PNG</a> (Portable Network Graphic)</td> | |||
<td>X</td> | |||
<td>X</td> | |||
<td>X [2]</td> | |||
<td>X [2]</td> | |||
<td>X</td> | |||
<td>X</td> | |||
<td>X</td> | |||
@@ -383,8 +383,11 @@ | |||
<section id="png"> | |||
<title>PNG</title> | |||
<p> | |||
PNG images are supported through an Image&nbsp;I/O codec. Transparency is supported but | |||
not guaranteed to work with every output format. | |||
FOP native support of PNG only includes the variants with 8 bits per channel and without | |||
interlacing. Native support requires using the ImageLoaderRawPNG image loader. | |||
Support through a Image I/O codec can use either the internal XGC PNG codec or the JRE PNG | |||
codec. The associated image loaders are, respectively, ImageLoaderPNG and ImageLoaderImageIO. | |||
Transparency is supported but not guaranteed to work with every output format. | |||
</p> | |||
</section> | |||
<section id="svg"> |
@@ -46,4 +46,10 @@ | |||
</li> | |||
</xsl:template> | |||
<xsl:template match="@*|*|text()|processing-instruction()|comment()"> | |||
<xsl:copy> | |||
<xsl:apply-templates select="@*|*|text()|processing-instruction()|comment()"/> | |||
</xsl:copy> | |||
</xsl:template> | |||
</xsl:stylesheet> |
@@ -1,6 +1,7 @@ | |||
org.apache.fop.render.pdf.PDFImageHandlerGraphics2D | |||
org.apache.fop.render.pdf.PDFImageHandlerRenderedImage | |||
org.apache.fop.render.pdf.PDFImageHandlerRawJPEG | |||
org.apache.fop.render.pdf.PDFImageHandlerRawPNG | |||
org.apache.fop.render.pdf.PDFImageHandlerRawCCITTFax | |||
org.apache.fop.render.pdf.PDFImageHandlerSVG | |||
org.apache.fop.render.java2d.Java2DImageHandlerRenderedImage | |||
@@ -11,6 +12,7 @@ org.apache.fop.render.ps.PSImageHandlerRenderedImage | |||
org.apache.fop.render.ps.PSImageHandlerEPS | |||
org.apache.fop.render.ps.PSImageHandlerRawCCITTFax | |||
org.apache.fop.render.ps.PSImageHandlerRawJPEG | |||
org.apache.fop.render.ps.PSImageHandlerRawPNG | |||
org.apache.fop.render.ps.PSImageHandlerGraphics2D | |||
org.apache.fop.render.ps.PSImageHandlerSVG | |||
org.apache.fop.render.afp.AFPImageHandlerRenderedImage |
@@ -28,6 +28,12 @@ public final class Accessibility { | |||
/** Constant string for the rendering options key to enable accessibility features. */ | |||
public static final String ACCESSIBILITY = "accessibility"; | |||
/** | |||
* The value to be set on the 'role' property for the element and its descendants to | |||
* be considered as artifacts. | |||
*/ | |||
public static final String ROLE_ARTIFACT = "artifact"; | |||
private Accessibility() { } | |||
} |
@@ -23,6 +23,7 @@ import java.util.Stack; | |||
import org.xml.sax.SAXException; | |||
import org.apache.fop.accessibility.Accessibility; | |||
import org.apache.fop.accessibility.StructureTreeEventHandler; | |||
import org.apache.fop.fo.DelegatingFOEventHandler; | |||
import org.apache.fop.fo.FOEventHandler; | |||
@@ -57,6 +58,8 @@ import org.apache.fop.fo.pagination.Flow; | |||
import org.apache.fop.fo.pagination.PageSequence; | |||
import org.apache.fop.fo.pagination.Root; | |||
import org.apache.fop.fo.pagination.StaticContent; | |||
import org.apache.fop.fo.properties.CommonAccessibility; | |||
import org.apache.fop.fo.properties.CommonAccessibilityHolder; | |||
/** | |||
* Allows to create the structure tree of an FO document, by converting FO | |||
@@ -355,6 +358,7 @@ public class FO2StructureTreeConverter extends DelegatingFOEventHandler { | |||
@Override | |||
public void startStatic(StaticContent staticContent) { | |||
handleStartArtifact(staticContent); | |||
converter.startStatic(staticContent); | |||
super.startStatic(staticContent); | |||
} | |||
@@ -362,6 +366,7 @@ public class FO2StructureTreeConverter extends DelegatingFOEventHandler { | |||
@Override | |||
public void endStatic(StaticContent statisContent) { | |||
converter.endStatic(statisContent); | |||
handleEndArtifact(statisContent); | |||
super.endStatic(statisContent); | |||
} | |||
@@ -454,6 +459,7 @@ public class FO2StructureTreeConverter extends DelegatingFOEventHandler { | |||
@Override | |||
public void startWrapper(Wrapper wrapper) { | |||
handleStartArtifact(wrapper); | |||
converter.startWrapper(wrapper); | |||
super.startWrapper(wrapper); | |||
} | |||
@@ -461,6 +467,7 @@ public class FO2StructureTreeConverter extends DelegatingFOEventHandler { | |||
@Override | |||
public void endWrapper(Wrapper wrapper) { | |||
converter.endWrapper(wrapper); | |||
handleEndArtifact(wrapper); | |||
super.endWrapper(wrapper); | |||
} | |||
@@ -488,4 +495,22 @@ public class FO2StructureTreeConverter extends DelegatingFOEventHandler { | |||
super.endExternalDocument(document); | |||
} | |||
private void handleStartArtifact(CommonAccessibilityHolder fobj) { | |||
if (isArtifact(fobj)) { | |||
converters.push(converter); | |||
converter = eventSwallower; | |||
} | |||
} | |||
private void handleEndArtifact(CommonAccessibilityHolder fobj) { | |||
if (isArtifact(fobj)) { | |||
converter = converters.pop(); | |||
} | |||
} | |||
private boolean isArtifact(CommonAccessibilityHolder fobj) { | |||
CommonAccessibility accessibility = fobj.getCommonAccessibility(); | |||
return Accessibility.ROLE_ARTIFACT.equalsIgnoreCase(accessibility.getRole()); | |||
} | |||
} |
@@ -67,7 +67,7 @@ import org.apache.fop.svg.NativeImageHandler; | |||
/** | |||
* This is a concrete implementation of {@link AbstractGraphics2D} (and | |||
* therefore of {@link Graphics2D}) which is able to generate GOCA byte | |||
* therefore of {@link java.awt.Graphics2D}) which is able to generate GOCA byte | |||
* codes. | |||
* | |||
* @see org.apache.xmlgraphics.java2d.AbstractGraphics2D | |||
@@ -165,7 +165,7 @@ public class AFPGraphics2D extends AbstractGraphics2D implements NativeImageHand | |||
} | |||
/** | |||
* Returns the AFP resource manager associated with this {@link Graphics2D} instance. | |||
* Returns the AFP resource manager associated with this {@link java.awt.Graphics2D} instance. | |||
* @return the resource manager | |||
*/ | |||
public AFPResourceManager getResourceManager() { |
@@ -119,7 +119,8 @@ public class ImageObject extends AbstractDataObject { | |||
* Sets the image IDE color model. | |||
* | |||
* @param colorModel the IDE color model. | |||
* @deprecated Use {@link IDEStructureParameter#setColorModel(byte)} instead. | |||
* @deprecated Use {@link org.apache.fop.afp.ioca.IDEStructureParameter#setColorModel(byte)} | |||
* instead. | |||
*/ | |||
public void setIDEColorModel(byte colorModel) { | |||
getImageSegment().setIDEColorModel(colorModel); | |||
@@ -128,7 +129,8 @@ public class ImageObject extends AbstractDataObject { | |||
/** | |||
* Set either additive or subtractive mode (used for ASFLAG). | |||
* @param subtractive true for subtractive mode, false for additive mode | |||
* @deprecated Use {@link IDEStructureParameter#setSubtractive(boolean)} instead. | |||
* @deprecated Use {@link org.apache.fop.afp.ioca.IDEStructureParameter#setSubtractive(boolean)} | |||
* instead. | |||
*/ | |||
public void setSubtractive(boolean subtractive) { | |||
getImageSegment().setSubtractive(subtractive); |
@@ -46,7 +46,7 @@ import org.apache.fop.afp.util.BinaryUtils; | |||
* which signal an alternate mode of processing for the content of the current | |||
* Presentation Text data. | |||
* <p> | |||
* The content for this object can be created using {@link PtocaBuilder}. | |||
* The content for this object can be created using {@link org.apache.fop.afp.ptoca.PtocaBuilder}. | |||
*/ | |||
public class PresentationTextData extends AbstractAFPObject implements PtocaConstants { | |||
@@ -44,7 +44,8 @@ public class DefaultFOPResourceAccessor extends SimpleResourceAccessor { | |||
* Constructor for resource to be accessed via the {@link FOUserAgent}. This contructor | |||
* can take two base URIs: the category base URI is the one to use when differentiating between | |||
* normal resources (ex. images) and font resources. So, if fonts need to be accessed, you can | |||
* set the {@link FontManager}'s base URI instead of the one on the {@link FopFactory}. | |||
* set the {@link org.apache.fop.fonts.FontManager}'s base URI instead of the one on the | |||
* {@link org.apache.fop.apps.FopFactory}. | |||
* @param userAgent the FO user agent | |||
* @param categoryBaseURI the category base URI (may be null) | |||
* @param baseURI the custom base URI to resolve relative URIs against (may be null) |
@@ -355,7 +355,7 @@ public class FOUserAgent { | |||
/** | |||
* Sets font base URL. | |||
* @param fontBaseUrl font base URL | |||
* @deprecated Use {@link FontManager#setFontBaseURL(String)} instead. | |||
* @deprecated Use {@link org.apache.fop.fonts.FontManager#setFontBaseURL(String)} instead. | |||
*/ | |||
public void setFontBaseURL(String fontBaseUrl) { | |||
try { | |||
@@ -500,7 +500,8 @@ public class FOUserAgent { | |||
/** | |||
* Returns the font base URL. | |||
* @return the font base URL | |||
* @deprecated Use {@link FontManager#getFontBaseURL()} instead. This method is not used by FOP. | |||
* @deprecated Use {@link org.apache.fop.fonts.FontManager#getFontBaseURL()} instead. | |||
* This method is not used by FOP. | |||
*/ | |||
public String getFontBaseURL() { | |||
String fontBase = getFactory().getFontManager().getFontBaseURL(); |
@@ -1783,9 +1783,9 @@ public class GlyphPositioningTable extends GlyphTable { | |||
* Find device adjustment. | |||
* @param fontSize the font size to search for | |||
* @return an adjustment if font size matches an entry | |||
* @asf.todo at present, assumes that 1 device unit equals one point | |||
*/ | |||
public int findAdjustment ( int fontSize ) { | |||
// [TODO] at present, assumes that 1 device unit equals one point | |||
int fs = fontSize / 1000; | |||
if ( fs < startSize ) { | |||
return 0; |
@@ -31,6 +31,7 @@ import org.apache.commons.logging.LogFactory; | |||
import org.apache.fop.fonts.truetype.FontFileReader; | |||
import org.apache.fop.fonts.truetype.TTFDirTabEntry; | |||
import org.apache.fop.fonts.truetype.TTFFile; | |||
import org.apache.fop.fonts.truetype.TTFTableName; | |||
// CSOFF: AvoidNestedBlocksCheck | |||
// CSOFF: NoWhitespaceAfterCheck | |||
@@ -126,7 +127,7 @@ public final class OTFAdvancedTypographicTableReader { | |||
return gpos; | |||
} | |||
private void readLangSysTable(String tableTag, long langSysTable, String langSysTag) throws IOException { | |||
private void readLangSysTable(TTFTableName tableTag, long langSysTable, String langSysTag) throws IOException { | |||
in.seekSet(langSysTable); | |||
if (log.isDebugEnabled()) { | |||
log.debug(tableTag + " lang sys table: " + langSysTag ); | |||
@@ -168,7 +169,7 @@ public final class OTFAdvancedTypographicTableReader { | |||
private static String defaultTag = "dflt"; | |||
private void readScriptTable(String tableTag, long scriptTable, String scriptTag) throws IOException { | |||
private void readScriptTable(TTFTableName tableTag, long scriptTable, String scriptTag) throws IOException { | |||
in.seekSet(scriptTable); | |||
if (log.isDebugEnabled()) { | |||
log.debug(tableTag + " script table: " + scriptTag ); | |||
@@ -221,7 +222,7 @@ public final class OTFAdvancedTypographicTableReader { | |||
seLanguages = null; | |||
} | |||
private void readScriptList(String tableTag, long scriptList) throws IOException { | |||
private void readScriptList(TTFTableName tableTag, long scriptList) throws IOException { | |||
in.seekSet(scriptList); | |||
// read script record count | |||
int ns = in.readTTFUShort(); | |||
@@ -250,7 +251,7 @@ public final class OTFAdvancedTypographicTableReader { | |||
} | |||
} | |||
private void readFeatureTable(String tableTag, long featureTable, String featureTag, int featureIndex) throws IOException { | |||
private void readFeatureTable(TTFTableName tableTag, long featureTable, String featureTag, int featureIndex) throws IOException { | |||
in.seekSet(featureTable); | |||
if (log.isDebugEnabled()) { | |||
log.debug(tableTag + " feature table: " + featureTag ); | |||
@@ -278,7 +279,7 @@ public final class OTFAdvancedTypographicTableReader { | |||
seFeatures.put ( "f" + featureIndex, new Object[] { featureTag, lul } ); | |||
} | |||
private void readFeatureList(String tableTag, long featureList) throws IOException { | |||
private void readFeatureList(TTFTableName tableTag, long featureList) throws IOException { | |||
in.seekSet(featureList); | |||
// read feature record count | |||
int nf = in.readTTFUShort(); | |||
@@ -3144,9 +3145,9 @@ public final class OTFAdvancedTypographicTableReader { | |||
resetATSubState(); | |||
} | |||
private void readLookupTable(String tableTag, int lookupSequence, long lookupTable) throws IOException { | |||
boolean isGSUB = tableTag.equals ( "GSUB" ); | |||
boolean isGPOS = tableTag.equals ( "GPOS" ); | |||
private void readLookupTable(TTFTableName tableTag, int lookupSequence, long lookupTable) throws IOException { | |||
boolean isGSUB = tableTag.equals ( TTFTableName.GSUB ); | |||
boolean isGPOS = tableTag.equals ( TTFTableName.GPOS ); | |||
in.seekSet(lookupTable); | |||
// read lookup type | |||
int lt = in.readTTFUShort(); | |||
@@ -3197,7 +3198,7 @@ public final class OTFAdvancedTypographicTableReader { | |||
} | |||
} | |||
private void readLookupList(String tableTag, long lookupList) throws IOException { | |||
private void readLookupList(TTFTableName tableTag, long lookupList) throws IOException { | |||
in.seekSet(lookupList); | |||
// read lookup record count | |||
int nl = in.readTTFUShort(); | |||
@@ -3232,7 +3233,7 @@ public final class OTFAdvancedTypographicTableReader { | |||
* @param lookupList offset to lookup list from beginning of font file | |||
* @throws IOException In case of a I/O problem | |||
*/ | |||
private void readCommonLayoutTables(String tableTag, long scriptList, long featureList, long lookupList) throws IOException { | |||
private void readCommonLayoutTables(TTFTableName tableTag, long scriptList, long featureList, long lookupList) throws IOException { | |||
if ( scriptList > 0 ) { | |||
readScriptList ( tableTag, scriptList ); | |||
} | |||
@@ -3244,7 +3245,7 @@ public final class OTFAdvancedTypographicTableReader { | |||
} | |||
} | |||
private void readGDEFClassDefTable(String tableTag, int lookupSequence, long subtableOffset) throws IOException { | |||
private void readGDEFClassDefTable(TTFTableName tableTag, int lookupSequence, long subtableOffset) throws IOException { | |||
initATSubState(); | |||
in.seekSet(subtableOffset); | |||
// subtable is a bare class definition table | |||
@@ -3256,7 +3257,7 @@ public final class OTFAdvancedTypographicTableReader { | |||
resetATSubState(); | |||
} | |||
private void readGDEFAttachmentTable(String tableTag, int lookupSequence, long subtableOffset) throws IOException { | |||
private void readGDEFAttachmentTable(TTFTableName tableTag, int lookupSequence, long subtableOffset) throws IOException { | |||
initATSubState(); | |||
in.seekSet(subtableOffset); | |||
// read coverage offset | |||
@@ -3274,7 +3275,7 @@ public final class OTFAdvancedTypographicTableReader { | |||
resetATSubState(); | |||
} | |||
private void readGDEFLigatureCaretTable(String tableTag, int lookupSequence, long subtableOffset) throws IOException { | |||
private void readGDEFLigatureCaretTable(TTFTableName tableTag, int lookupSequence, long subtableOffset) throws IOException { | |||
initATSubState(); | |||
in.seekSet(subtableOffset); | |||
// read coverage offset | |||
@@ -3304,7 +3305,7 @@ public final class OTFAdvancedTypographicTableReader { | |||
resetATSubState(); | |||
} | |||
private void readGDEFMarkAttachmentTable(String tableTag, int lookupSequence, long subtableOffset) throws IOException { | |||
private void readGDEFMarkAttachmentTable(TTFTableName tableTag, int lookupSequence, long subtableOffset) throws IOException { | |||
initATSubState(); | |||
in.seekSet(subtableOffset); | |||
// subtable is a bare class definition table | |||
@@ -3316,7 +3317,7 @@ public final class OTFAdvancedTypographicTableReader { | |||
resetATSubState(); | |||
} | |||
private void readGDEFMarkGlyphsTableFormat1(String tableTag, int lookupSequence, long subtableOffset, int subtableFormat) throws IOException { | |||
private void readGDEFMarkGlyphsTableFormat1(TTFTableName tableTag, int lookupSequence, long subtableOffset, int subtableFormat) throws IOException { | |||
initATSubState(); | |||
in.seekSet(subtableOffset); | |||
// skip over format (already known) | |||
@@ -3350,7 +3351,7 @@ public final class OTFAdvancedTypographicTableReader { | |||
resetATSubState(); | |||
} | |||
private void readGDEFMarkGlyphsTable(String tableTag, int lookupSequence, long subtableOffset) throws IOException { | |||
private void readGDEFMarkGlyphsTable(TTFTableName tableTag, int lookupSequence, long subtableOffset) throws IOException { | |||
in.seekSet(subtableOffset); | |||
// read mark set subtable format | |||
int sf = in.readTTFUShort(); | |||
@@ -3366,11 +3367,11 @@ public final class OTFAdvancedTypographicTableReader { | |||
* @throws IOException In case of a I/O problem | |||
*/ | |||
private void readGDEF() throws IOException { | |||
String tableTag = "GDEF"; | |||
TTFTableName tableTag = TTFTableName.GDEF; | |||
// Initialize temporary state | |||
initATState(); | |||
// Read glyph definition (GDEF) table | |||
TTFDirTabEntry dirTab = ttf.getDirectoryEntry ( tableTag ); | |||
TTFDirTabEntry dirTab = ttf.getDirectoryEntry( tableTag ); | |||
if ( gdef != null ) { | |||
if (log.isDebugEnabled()) { | |||
log.debug(tableTag + ": ignoring duplicate table"); | |||
@@ -3439,7 +3440,7 @@ public final class OTFAdvancedTypographicTableReader { | |||
* @throws IOException In case of a I/O problem | |||
*/ | |||
private void readGSUB() throws IOException { | |||
String tableTag = "GSUB"; | |||
TTFTableName tableTag = TTFTableName.GSUB; | |||
// Initialize temporary state | |||
initATState(); | |||
// Read glyph substitution (GSUB) table | |||
@@ -3476,7 +3477,7 @@ public final class OTFAdvancedTypographicTableReader { | |||
* @throws IOException In case of a I/O problem | |||
*/ | |||
private void readGPOS() throws IOException { | |||
String tableTag = "GPOS"; | |||
TTFTableName tableTag = TTFTableName.GPOS; | |||
// Initialize temporary state | |||
initATState(); | |||
// Read glyph positioning (GPOS) table |
@@ -360,7 +360,7 @@ public class IndicScriptProcessor extends DefaultScriptProcessor { | |||
} | |||
/** Abstract syllabizer. */ | |||
protected abstract static class Syllabizer { | |||
protected abstract static class Syllabizer implements Comparable { | |||
private String script; | |||
private String language; | |||
Syllabizer ( String script, String language ) { |
@@ -123,11 +123,17 @@ public abstract class FOEventHandler { | |||
public void endDocument() throws SAXException { | |||
} | |||
/** {@inheritDoc} */ | |||
/** | |||
* Called upon start of root element. | |||
* @param root element | |||
*/ | |||
public void startRoot(Root root) { | |||
} | |||
/** {@inheritDoc} */ | |||
/** | |||
* Called upon end of root element. | |||
* @param root element | |||
*/ | |||
public void endRoot(Root root) { | |||
} | |||
@@ -413,9 +419,9 @@ public abstract class FOEventHandler { | |||
/** | |||
* Process end of a Static. | |||
* @param statisContent StaticContent that is ending | |||
* @param staticContent StaticContent that is ending | |||
*/ | |||
public void endStatic(StaticContent statisContent) { | |||
public void endStatic(StaticContent staticContent) { | |||
} | |||
@@ -26,7 +26,10 @@ import org.apache.fop.fo.Constants; | |||
import org.apache.fop.fo.FONode; | |||
import org.apache.fop.fo.FOText; | |||
import org.apache.fop.fo.FObjMixed; | |||
import org.apache.fop.fo.PropertyList; | |||
import org.apache.fop.fo.ValidationException; | |||
import org.apache.fop.fo.properties.CommonAccessibility; | |||
import org.apache.fop.fo.properties.CommonAccessibilityHolder; | |||
/** | |||
* Class modelling the <a href=http://www.w3.org/TR/xsl/#fo_wrapper"> | |||
@@ -34,13 +37,13 @@ import org.apache.fop.fo.ValidationException; | |||
* The <code>fo:wrapper</code> object serves as a property holder for | |||
* its child node objects. | |||
*/ | |||
public class Wrapper extends FObjMixed { | |||
// The value of properties relevant for fo:wrapper. | |||
// End of property values | |||
public class Wrapper extends FObjMixed implements CommonAccessibilityHolder { | |||
// used for FO validation | |||
private boolean blockOrInlineItemFound = false; | |||
private CommonAccessibility commonAccessibility; | |||
/** | |||
* Create a Wrapper instance that is a child of the | |||
* given {@link FONode} | |||
@@ -51,6 +54,12 @@ public class Wrapper extends FObjMixed { | |||
super(parent); | |||
} | |||
@Override | |||
public void bind(PropertyList pList) throws FOPException { | |||
super.bind(pList); | |||
commonAccessibility = CommonAccessibility.getInstance(pList); | |||
} | |||
@Override | |||
protected void startOfNode() throws FOPException { | |||
super.startOfNode(); | |||
@@ -136,6 +145,10 @@ public class Wrapper extends FObjMixed { | |||
return FO_WRAPPER; | |||
} | |||
public CommonAccessibility getCommonAccessibility() { | |||
return commonAccessibility; | |||
} | |||
@Override | |||
public boolean isDelimitedTextRangeBoundary ( int boundary ) { | |||
return false; |