diff options
author | Glenn Adams <gadams@apache.org> | 2012-06-03 22:07:35 +0000 |
---|---|---|
committer | Glenn Adams <gadams@apache.org> | 2012-06-03 22:07:35 +0000 |
commit | d514bdd295a67ac2bf6636eaf775b0413560d10f (patch) | |
tree | c94be5808089eb553d4e79ab7cc5d6fad469664c | |
parent | 212be02c8e6ac76ba73988fb5121e412d70516e7 (diff) | |
download | xmlgraphics-fop-d514bdd295a67ac2bf6636eaf775b0413560d10f.tar.gz xmlgraphics-fop-d514bdd295a67ac2bf6636eaf775b0413560d10f.zip |
(1) update xmlgraphics commons jar;
(2) xdocs validity fixups;
(3) xdocs 1.1rc1 updates;
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-1_1rc1@1345792 13f79535-47bb-0310-9956-ffa450edef68
23 files changed, 111 insertions, 290 deletions
@@ -1438,14 +1438,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"/> diff --git a/checkstyle-5.1.xml b/checkstyle-5.1.xml deleted file mode 100644 index 8a393d452..000000000 --- a/checkstyle-5.1.xml +++ /dev/null @@ -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> diff --git a/lib/xmlgraphics-commons-1.5rc1.jar b/lib/xmlgraphics-commons-1.5rc1.jar Binary files differnew file mode 100644 index 000000000..a8733f14c --- /dev/null +++ b/lib/xmlgraphics-commons-1.5rc1.jar diff --git a/lib/xmlgraphics-commons-1.5svn.jar b/lib/xmlgraphics-commons-1.5svn.jar Binary files differdeleted file mode 100644 index d8c5e0989..000000000 --- a/lib/xmlgraphics-commons-1.5svn.jar +++ /dev/null diff --git a/src/documentation/content/doap.rdf b/src/documentation/content/doap.rdf index 8ccd82bf6..dfac6ff98 100644 --- a/src/documentation/content/doap.rdf +++ b/src/documentation/content/doap.rdf @@ -76,17 +76,24 @@ </asfext:implements> <release> <Version> - <name>Previous stable release</name> - <created>2008-08-05</created> - <revision>0.95</revision> + <name>Upcoming release (candidate)</name> + <created>2012-06-03</created> + <revision>1.1rc1</revision> </Version> - </release> + </release <release> <Version> - <name>Latest stable release</name> + <name>Current release (stable)</name> <created>2010-07-21</created> <revision>1.0</revision> </Version> + </release + <release> + <Version> + <name>Previous release (stable)</name> + <created>2008-08-05</created> + <revision>0.95</revision> + </Version> </release> <repository> <SVNRepository> diff --git a/src/documentation/content/xdocs/bugs.xml b/src/documentation/content/xdocs/bugs.xml index 77b6ce379..100789c54 100644 --- a/src/documentation/content/xdocs/bugs.xml +++ b/src/documentation/content/xdocs/bugs.xml @@ -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> diff --git a/src/documentation/content/xdocs/compliance.ihtml b/src/documentation/content/xdocs/compliance.ihtml index d64b5fd2b..11e3332b3 100644 --- a/src/documentation/content/xdocs/compliance.ihtml +++ b/src/documentation/content/xdocs/compliance.ihtml @@ -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> @@ -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> @@ -4644,9 +4644,8 @@ <tr> <th align="center">1.0 (stable)</th> <th align="center">1.1 (rc1)</th> - <th align="center">develop- ment</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> diff --git a/src/documentation/content/xdocs/download.xml b/src/documentation/content/xdocs/download.xml index 22208b42f..905e4a131 100644 --- a/src/documentation/content/xdocs/download.xml +++ b/src/documentation/content/xdocs/download.xml @@ -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> @@ -117,8 +117,8 @@ <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 href="http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-1_0/"> + <code>http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-1_0/</code> </link> </td> </tr> @@ -128,16 +128,16 @@ <tr> <td>Repository URL</td> <td> - <link href="http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-1_0/"> - <code>http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-1_0/</code> + <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-1_0/"> - <code>http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-1_0/</code> + <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> diff --git a/src/documentation/content/xdocs/faq.xml b/src/documentation/content/xdocs/faq.xml index e4ebd3e1a..d980edbb1 100644 --- a/src/documentation/content/xdocs/faq.xml +++ b/src/documentation/content/xdocs/faq.xml @@ -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,7 +146,7 @@ <p> When it's ready and the committers have enough time to go through the time-consuming process of creating a release. Version - 1.1rc1 was released on [TBD - ADD DAY MONTH] 2012. A subsequent final + 1.1rc1 was released on 3 June 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. diff --git a/src/documentation/content/xdocs/fo.xml b/src/documentation/content/xdocs/fo.xml index 8d4521e4d..f0781ec50 100644 --- a/src/documentation/content/xdocs/fo.xml +++ b/src/documentation/content/xdocs/fo.xml @@ -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> diff --git a/src/documentation/content/xdocs/gethelp.xml b/src/documentation/content/xdocs/gethelp.xml index 4369362be..f94bf0544 100644 --- a/src/documentation/content/xdocs/gethelp.xml +++ b/src/documentation/content/xdocs/gethelp.xml @@ -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> diff --git a/src/documentation/content/xdocs/index.xml b/src/documentation/content/xdocs/index.xml index 2ffd0aba0..8a95934e3 100644 --- a/src/documentation/content/xdocs/index.xml +++ b/src/documentation/content/xdocs/index.xml @@ -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.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 release candidate (rc1) of the latest version of FOP is available at <link href="1.1rc1/">FOP 1.1rc1</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. diff --git a/src/documentation/content/xdocs/knownissues.xml b/src/documentation/content/xdocs/knownissues.xml index 7c63fb69d..d916f0171 100644 --- a/src/documentation/content/xdocs/knownissues.xml +++ b/src/documentation/content/xdocs/knownissues.xml @@ -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> diff --git a/src/documentation/content/xdocs/license.xml b/src/documentation/content/xdocs/license.xml index c453598f4..95e8b455a 100644 --- a/src/documentation/content/xdocs/license.xml +++ b/src/documentation/content/xdocs/license.xml @@ -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> diff --git a/src/documentation/content/xdocs/maillist.xml b/src/documentation/content/xdocs/maillist.xml index 91b174332..b24166462 100644 --- a/src/documentation/content/xdocs/maillist.xml +++ b/src/documentation/content/xdocs/maillist.xml @@ -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> diff --git a/src/documentation/content/xdocs/news-data.xml b/src/documentation/content/xdocs/news-data.xml index 0d977634c..9495528e5 100644 --- a/src/documentation/content/xdocs/news-data.xml +++ b/src/documentation/content/xdocs/news-data.xml @@ -17,12 +17,12 @@ --> <!-- $Id$ --> <news> - <item date="2012-DD-MM" title="Apache™ FOP 1.1 Released"> + <item date="2012-06-03" 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.1rc1/releaseNotes_1.1rc1.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> diff --git a/src/documentation/content/xdocs/news.xml b/src/documentation/content/xdocs/news.xml index 978314977..688558226 100644 --- a/src/documentation/content/xdocs/news.xml +++ b/src/documentation/content/xdocs/news.xml @@ -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> diff --git a/src/documentation/content/xdocs/quickstartguide.xml b/src/documentation/content/xdocs/quickstartguide.xml index 1192bf1c3..3d369c08c 100644 --- a/src/documentation/content/xdocs/quickstartguide.xml +++ b/src/documentation/content/xdocs/quickstartguide.xml @@ -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> diff --git a/src/documentation/content/xdocs/resources.xml b/src/documentation/content/xdocs/resources.xml index 020936c96..d976f9859 100644 --- a/src/documentation/content/xdocs/resources.xml +++ b/src/documentation/content/xdocs/resources.xml @@ -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> diff --git a/src/documentation/content/xdocs/site.xml b/src/documentation/content/xdocs/site.xml index 65a51a57b..c750f9556 100644 --- a/src/documentation/content/xdocs/site.xml +++ b/src/documentation/content/xdocs/site.xml @@ -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"> @@ -104,12 +104,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"> @@ -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"> diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml index 8b1f16099..ccefe58eb 100644 --- a/src/documentation/content/xdocs/status.xml +++ b/src/documentation/content/xdocs/status.xml @@ -27,17 +27,17 @@ <body> <section> <title>Status</title> - <p>Last updated DD Month 2012.</p> + <p>Last updated 3 June 2012.</p> <p> - Apache™ FOP version 1.1 was released on DD Month 2012. + Apache™ FOP version 1.1rc1 (candidate) was released on 3 June 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 byond are expected. </p> <p> FOP releases prior to version 0.90 were based on a different diff --git a/src/documentation/content/xdocs/team.xml b/src/documentation/content/xdocs/team.xml index c5d83443c..4eb2da7b3 100644 --- a/src/documentation/content/xdocs/team.xml +++ b/src/documentation/content/xdocs/team.xml @@ -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 diff --git a/status.xml b/status.xml index a6a5eaf13..8cfed70eb 100644 --- a/status.xml +++ b/status.xml @@ -61,7 +61,7 @@ users, i.e. when the behaviour changes and could affect the layout of existing documents. Example: the fix of marks layering will be such a case when it's done. --> - <release version="1.1rc1" date="DD Month 2012"> + <release version="1.1rc1" date="3 June 2012"> <action context="Renderers" dev="GA" type="fix" fixes-bug="53304,53306"> Add version attribute to AT and IF intermediate formats. Also eliminate redundant use of reversed attribute in AT format. </action> |