Merge from Trunk, revisions 1060235 to 1069383.

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

diff --cc src/java/org/apache/fop/pdf/PDFResources.java
index 46462bbd74d340d696b211cbc3fae335af9cec01,99a42433ca6f851837d6e91c2ccf50b43cde6cb5..317f703e154f4227b4491d6589f2410354824f5d
--- 1/src/java/org/apache/fop/pdf/PDFResources.java
--- 2/src/java/org/apache/fop/pdf/PDFResources.java
+++ b/src/java/org/apache/fop/pdf/PDFResources.java
@@@ -32,10 -31,9 +33,9 @@@ import org.apache.fop.fonts.FontInfo
  import org.apache.fop.fonts.Typeface;
  import org.apache.fop.fonts.base14.Symbol;
  import org.apache.fop.fonts.base14.ZapfDingbats;
- import org.apache.fop.util.ColorProfileUtil;
  
  /**
 - * class representing a /Resources object.
 + * Class representing a /Resources object.
   *
   * /Resources object contain a list of references to the fonts for the
   * document

diff --cc src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java
index d3cc554c8e1c34069ad2da8b0c5ba48da616c153,9e20886e0966a87e6cab93d973617a90b4339ff5..d076e6ab939e9d171ebe4717723603f3412a95e3
--- 1/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java
--- 2/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java
+++ b/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java
@@@ -34,9 -35,7 +35,8 @@@ import org.apache.fop.pdf.PDFDocument
  import org.apache.fop.pdf.PDFICCBasedColorSpace;
  import org.apache.fop.pdf.PDFICCStream;
  import org.apache.fop.pdf.PDFImage;
 +import org.apache.fop.pdf.PDFName;
  import org.apache.fop.pdf.PDFReference;
- import org.apache.fop.util.ColorProfileUtil;
  
  /**
   * Abstract PDFImage implementation for the PDF renderer.

diff --cc src/java/org/apache/fop/util/ColorSpaceCache.java
index 64524500337b835c34a8c659290c625bf6058415,63d8746f7f33ba81c7e0699bc455efcd77ae8987..63db937a049602a7189bf3dee42a512db9459c78
--- 1/src/java/org/apache/fop/util/ColorSpaceCache.java
--- 2/src/java/org/apache/fop/util/ColorSpaceCache.java
+++ b/src/java/org/apache/fop/util/ColorSpaceCache.java
@@@ -30,10 -31,8 +30,11 @@@ import javax.xml.transform.stream.Strea
  
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
+ import org.apache.xmlgraphics.java2d.color.profile.ColorProfileUtil;
  
 +import org.apache.xmlgraphics.java2d.color.ICCColorSpaceWithIntent;
 +import org.apache.xmlgraphics.java2d.color.RenderingIntent;
 +
  /**
   * Map with cached ICC based ColorSpace objects.
   */

diff --cc status.xml
index 660dda79d28d37a2823251ba113a273505470650,2a7fe4f12afa412cebaefeff2e450ce9d081ce2c..7dfcddcbf3441490b1ea732b8d52cde8c56bbb35
--- 1/status.xml
--- 2/status.xml
+++ b/status.xml
@@@ -59,8 -59,31 +59,34 @@@
        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="49403" due-to="Patrick Jaromin">
 +        Initial work on spot colors (aka named colors) for PDF output.
++      </action>
+       <action context="Renderers" dev="JM" type="fix" fixes-bug="50705" due-to="Mehdi Houshmand">
+         Fix to preserve the order of AFP TLEs and NOPs as given in the XSL-FO document.
+       </action>
+       <action context="Fonts" dev="JM" type="add" fixes-bug="50699" due-to="Alexandros Papadakis">
+         Added support for lookup of alternative glyphs when additional single-byte encodings are
+         used, ex. replacing "Omegagreek" by "Omega" and vice versa.
+       </action>
+       <action context="Code" dev="AD" type="add" fixes-bug="48334">
+         Added support for resolution of relative URIs against a specified xml:base during
+         property refinement.
+       </action>
+       <action context="Renderers" dev="JM" type="add">
+         Allow afp:no-operation to also appear under fo:page-sequence and fo:declarations.
+       </action>
+       <action context="Code" dev="AD" type="fix" fixes-bug="50635" due-to="mkoegler.AT.auto.tuwien.ac.at">
+         Bugfix: fix issue in RenderPagesModel.checkPreparedPages() where the same page-sequence
+         is potentially started multiple times.
+       </action>
+       <action context="Code" dev="AD" type="fix" fixes-bug="50636" due-to="mkoegler.AT.auto.tuwien.ac.at">
+         Bugfix: fix performance issue when adding pages, if the total number of pages
+         is significantly large.
+       </action>
+       <action context="Code" dev="AD" type="fix" fixes-bug="50626" due-to="mkoegler.AT.auto.tuwien.ac.at">
+         Bugfix: fix performance issue when adding nodes, if the number of children
+         is significantly large.
        </action>
          <action context="Config" dev="SP" type="fix">
                Bugfix: relative URIs in the configuration file (base, font-base, hyphenation-base) are evaluated relative to the base URI of the configuration file.