Merged changes from Trunk up to revision 829121

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_Accessibility@829138 13f79535-47bb-0310-9956-ffa450edef68

diff --cc build.xml
Simple merge

diff --cc src/java/org/apache/fop/cli/CommandLineOptions.java
Simple merge

diff --cc src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
Simple merge

diff --cc src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
Simple merge

diff --cc status.xml
index 326b75001d798d766f50c79f73740f3c20aa484e,31afd446b1d3cd9ccd41fec66fdbe3cefd24a309..25867534cfe2b8d31a06c72988d40e5538721e4c
--- 1/status.xml
--- 2/status.xml
+++ b/status.xml
@@@ -58,9 -58,18 +58,21 @@@
        documents. Example: the fix of marks layering will be such a case when it's done.
      -->
      <release version="FOP Trunk" date="TBD">
 +      <action context="Renderers" dev="JM" type="add" fixes-bug="46705" due-to="Jost Klopfstein">
 +        Added basic accessibility and Tagged PDF support. 
 +      </action>
+       <action context="Code" dev="JM" type="add">
+         Added support for encoding CMYK bitmap images (IOCA FS45) and TIFF images as embedded objects.
+       </action>
+       <action context="Code" dev="AC" type="add">
+         Added support for xmlfile and xsltfile parameters in FOP's Ant Task.
+       </action>
+       <action context="Renderers" dev="AC" type="fix" fixes-bug="47941">
+         BugFix: Maintain valid AFP by providing TLE truncation on Attribute Value Triplet values that are greater than 250 chars in length.
+       </action>
+       <action context="Fonts" dev="JM" type="fix" fixes-bug="47711" due-to="Nicolas Peninguy">
+         Fixed generation of CIDSet object in PDF output.
+       </action>
        <action context="Layout" dev="VH" type="fix">
          Fixed handling of percentage values for provisional-label-separation.
        </action>