Merge from Trunk, revisions 965390 to 1060234.

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

diff --cc src/java/org/apache/fop/afp/modca/GraphicsObject.java
Simple merge

diff --cc src/java/org/apache/fop/apps/FopFactory.java
index 7e97442e68fd837c432031f53b791d0d10c3c22f,181bc85da56628e0b862ffe1b592d466692470db..a85b2d305089d6fd8820a615a56b3fa4190529b5
--- 1/src/java/org/apache/fop/apps/FopFactory.java
--- 2/src/java/org/apache/fop/apps/FopFactory.java
+++ b/src/java/org/apache/fop/apps/FopFactory.java
@@@ -40,7 -43,7 +43,8 @@@ import org.apache.commons.logging.LogFa
  
  import org.apache.xmlgraphics.image.loader.ImageContext;
  import org.apache.xmlgraphics.image.loader.ImageManager;
 +import org.apache.xmlgraphics.java2d.color.RenderingIntent;
+ import org.apache.xmlgraphics.util.UnitConv;
  
  import org.apache.fop.fo.ElementMapping;
  import org.apache.fop.fo.ElementMappingRegistry;

diff --cc src/java/org/apache/fop/fo/expr/PropertyTokenizer.java
index 7d846eefc22a51ce246e40b081949d504fa47cdb,3008dbebe521e2546d0b4fb626956141e63ce928..89a3877535c981c3377df1b6063a7575ff53602d
--- 1/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java
--- 2/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java
+++ b/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java
@@@ -80,9 -80,10 +80,9 @@@ class PropertyTokenizer 
      void next() throws PropertyException {
          currentTokenValue = null;
          currentTokenStartIndex = exprIndex;
 -        boolean currentMaybeOperator = recognizeOperator;
          boolean bSawDecimal;
          recognizeOperator = true;
-         for (;;) {
+         while ( true ) {
              if (exprIndex >= exprLength) {
                  currentToken = TOK_EOF;
                  return;

diff --cc src/java/org/apache/fop/fo/properties/ColorProperty.java
Simple merge

diff --cc src/java/org/apache/fop/pdf/PDFDocument.java
index 10834760eabad7cf0a11f1d7b17d6ac1391226de,a17c8c4df0a0922ac6f4b712113ee26ac03faf84..9268ae921b678ccfc02da1c5b1baa4d44888953c
--- 1/src/java/org/apache/fop/pdf/PDFDocument.java
--- 2/src/java/org/apache/fop/pdf/PDFDocument.java
+++ b/src/java/org/apache/fop/pdf/PDFDocument.java
@@@ -85,13 -85,13 +85,13 @@@ public class PDFDocument 
      private Log log = LogFactory.getLog("org.apache.fop.pdf");
  
      /** the current character position */
 -    private int position = 0;
 +    private long position = 0;
  
      /** character position of xref table */
 -    private int xref;
 +    private long xref;
  
      /** the character position of each object */
--    private List location = new ArrayList();
++    private List<Long> location = new ArrayList<Long>();
  
      /** List of objects to write in the trailer */
      private List trailerObjects = new ArrayList();
@@@ -747,6 -747,6 +747,7 @@@
       * @return the image or PDFXObject for the key if found
       * @deprecated Use getXObject instead (so forms are treated in the same way)
       */
++    @Deprecated
      public PDFImageXObject getImage(String key) {
          return (PDFImageXObject)this.xObjectsMap.get(key);
      }
@@@ -915,7 -915,7 +916,7 @@@
          while (this.location.size() <= objidx) {
              this.location.add(LOCATION_PLACEHOLDER);
          }
-         this.location.set(objidx, new Long(position));
 -        this.location.set(objidx, new Integer(position));
++        this.location.set(objidx, position);
      }
  
      /**

diff --cc src/java/org/apache/fop/pdf/PDFFactory.java
Simple merge

diff --cc src/java/org/apache/fop/pdf/PDFName.java
Simple merge

diff --cc src/java/org/apache/fop/pdf/PDFResources.java
Simple merge

diff --cc src/java/org/apache/fop/render/intermediate/IFSerializer.java
Simple merge

diff --cc src/java/org/apache/fop/render/intermediate/IFState.java
index e5b031dd362b42b98d81dce920faca10936944c5,c13382192ec80eff0eb924f733a134fa72ee64bf..4d8325d3efc6129a32dc098d8bda8b141e4b98b2
--- 1/src/java/org/apache/fop/render/intermediate/IFState.java
--- 2/src/java/org/apache/fop/render/intermediate/IFState.java
+++ b/src/java/org/apache/fop/render/intermediate/IFState.java
@@@ -21,9 -21,8 +21,10 @@@ package org.apache.fop.render.intermedi
  
  import java.awt.Color;
  
- public class IFState {
 +import org.apache.xmlgraphics.java2d.color.ColorUtil;
 +
+ /** a state class for intermediate format data */
+ public final class IFState {
  
      private IFState parent;
  

diff --cc src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java
Simple merge

diff --cc src/java/org/apache/fop/render/pdf/PDFContentGenerator.java
Simple merge

diff --cc src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java
Simple merge

diff --cc src/java/org/apache/fop/svg/PDFGraphics2D.java
Simple merge

diff --cc src/java/org/apache/fop/traits/BorderProps.java
Simple merge

diff --cc src/java/org/apache/fop/util/AbstractPaintingState.java
Simple merge

diff --cc src/java/org/apache/fop/util/ColorExt.java
Simple merge

diff --cc src/java/org/apache/fop/util/ColorUtil.java
index 5a53a816c912f5411681fb2b04458c7c51d2f852,674079369107a74681c6bd311fd81bdc635a77b9..3c456dbbc0defd1ee3ed912dd22023e4c4907271
--- 1/src/java/org/apache/fop/util/ColorUtil.java
--- 2/src/java/org/apache/fop/util/ColorUtil.java
+++ b/src/java/org/apache/fop/util/ColorUtil.java
@@@ -805,158 -521,158 +805,158 @@@ public final class ColorUtil 
      /**
       * Initializes the colorMap with some predefined values.
       */
-     private static void initializeColorMap() {
+     private static void initializeColorMap() {                  // CSOK: MethodLength
          colorMap = Collections.synchronizedMap(new java.util.HashMap<String, Color>());
  
 -        colorMap.put("aliceblue", new Color(240, 248, 255));
 -        colorMap.put("antiquewhite", new Color(250, 235, 215));
 -        colorMap.put("aqua", new Color(0, 255, 255));
 -        colorMap.put("aquamarine", new Color(127, 255, 212));
 -        colorMap.put("azure", new Color(240, 255, 255));
 -        colorMap.put("beige", new Color(245, 245, 220));
 -        colorMap.put("bisque", new Color(255, 228, 196));
 -        colorMap.put("black", new Color(0, 0, 0));
 -        colorMap.put("blanchedalmond", new Color(255, 235, 205));
 -        colorMap.put("blue", new Color(0, 0, 255));
 -        colorMap.put("blueviolet", new Color(138, 43, 226));
 -        colorMap.put("brown", new Color(165, 42, 42));
 -        colorMap.put("burlywood", new Color(222, 184, 135));
 -        colorMap.put("cadetblue", new Color(95, 158, 160));
 -        colorMap.put("chartreuse", new Color(127, 255, 0));
 -        colorMap.put("chocolate", new Color(210, 105, 30));
 -        colorMap.put("coral", new Color(255, 127, 80));
 -        colorMap.put("cornflowerblue", new Color(100, 149, 237));
 -        colorMap.put("cornsilk", new Color(255, 248, 220));
 -        colorMap.put("crimson", new Color(220, 20, 60));
 -        colorMap.put("cyan", new Color(0, 255, 255));
 -        colorMap.put("darkblue", new Color(0, 0, 139));
 -        colorMap.put("darkcyan", new Color(0, 139, 139));
 -        colorMap.put("darkgoldenrod", new Color(184, 134, 11));
 -        colorMap.put("darkgray", new Color(169, 169, 169));
 -        colorMap.put("darkgreen", new Color(0, 100, 0));
 -        colorMap.put("darkgrey", new Color(169, 169, 169));
 -        colorMap.put("darkkhaki", new Color(189, 183, 107));
 -        colorMap.put("darkmagenta", new Color(139, 0, 139));
 -        colorMap.put("darkolivegreen", new Color(85, 107, 47));
 -        colorMap.put("darkorange", new Color(255, 140, 0));
 -        colorMap.put("darkorchid", new Color(153, 50, 204));
 -        colorMap.put("darkred", new Color(139, 0, 0));
 -        colorMap.put("darksalmon", new Color(233, 150, 122));
 -        colorMap.put("darkseagreen", new Color(143, 188, 143));
 -        colorMap.put("darkslateblue", new Color(72, 61, 139));
 -        colorMap.put("darkslategray", new Color(47, 79, 79));
 -        colorMap.put("darkslategrey", new Color(47, 79, 79));
 -        colorMap.put("darkturquoise", new Color(0, 206, 209));
 -        colorMap.put("darkviolet", new Color(148, 0, 211));
 -        colorMap.put("deeppink", new Color(255, 20, 147));
 -        colorMap.put("deepskyblue", new Color(0, 191, 255));
 -        colorMap.put("dimgray", new Color(105, 105, 105));
 -        colorMap.put("dimgrey", new Color(105, 105, 105));
 -        colorMap.put("dodgerblue", new Color(30, 144, 255));
 -        colorMap.put("firebrick", new Color(178, 34, 34));
 -        colorMap.put("floralwhite", new Color(255, 250, 240));
 -        colorMap.put("forestgreen", new Color(34, 139, 34));
 -        colorMap.put("fuchsia", new Color(255, 0, 255));
 -        colorMap.put("gainsboro", new Color(220, 220, 220));
 -        colorMap.put("ghostwhite", new Color(248, 248, 255));
 -        colorMap.put("gold", new Color(255, 215, 0));
 -        colorMap.put("goldenrod", new Color(218, 165, 32));
 -        colorMap.put("gray", new Color(128, 128, 128));
 -        colorMap.put("green", new Color(0, 128, 0));
 -        colorMap.put("greenyellow", new Color(173, 255, 47));
 -        colorMap.put("grey", new Color(128, 128, 128));
 -        colorMap.put("honeydew", new Color(240, 255, 240));
 -        colorMap.put("hotpink", new Color(255, 105, 180));
 -        colorMap.put("indianred", new Color(205, 92, 92));
 -        colorMap.put("indigo", new Color(75, 0, 130));
 -        colorMap.put("ivory", new Color(255, 255, 240));
 -        colorMap.put("khaki", new Color(240, 230, 140));
 -        colorMap.put("lavender", new Color(230, 230, 250));
 -        colorMap.put("lavenderblush", new Color(255, 240, 245));
 -        colorMap.put("lawngreen", new Color(124, 252, 0));
 -        colorMap.put("lemonchiffon", new Color(255, 250, 205));
 -        colorMap.put("lightblue", new Color(173, 216, 230));
 -        colorMap.put("lightcoral", new Color(240, 128, 128));
 -        colorMap.put("lightcyan", new Color(224, 255, 255));
 -        colorMap.put("lightgoldenrodyellow", new Color(250, 250, 210));
 -        colorMap.put("lightgray", new Color(211, 211, 211));
 -        colorMap.put("lightgreen", new Color(144, 238, 144));
 -        colorMap.put("lightgrey", new Color(211, 211, 211));
 -        colorMap.put("lightpink", new Color(255, 182, 193));
 -        colorMap.put("lightsalmon", new Color(255, 160, 122));
 -        colorMap.put("lightseagreen", new Color(32, 178, 170));
 -        colorMap.put("lightskyblue", new Color(135, 206, 250));
 -        colorMap.put("lightslategray", new Color(119, 136, 153));
 -        colorMap.put("lightslategrey", new Color(119, 136, 153));
 -        colorMap.put("lightsteelblue", new Color(176, 196, 222));
 -        colorMap.put("lightyellow", new Color(255, 255, 224));
 -        colorMap.put("lime", new Color(0, 255, 0));
 -        colorMap.put("limegreen", new Color(50, 205, 50));
 -        colorMap.put("linen", new Color(250, 240, 230));
 -        colorMap.put("magenta", new Color(255, 0, 255));
 -        colorMap.put("maroon", new Color(128, 0, 0));
 -        colorMap.put("mediumaquamarine", new Color(102, 205, 170));
 -        colorMap.put("mediumblue", new Color(0, 0, 205));
 -        colorMap.put("mediumorchid", new Color(186, 85, 211));
 -        colorMap.put("mediumpurple", new Color(147, 112, 219));
 -        colorMap.put("mediumseagreen", new Color(60, 179, 113));
 -        colorMap.put("mediumslateblue", new Color(123, 104, 238));
 -        colorMap.put("mediumspringgreen", new Color(0, 250, 154));
 -        colorMap.put("mediumturquoise", new Color(72, 209, 204));
 -        colorMap.put("mediumvioletred", new Color(199, 21, 133));
 -        colorMap.put("midnightblue", new Color(25, 25, 112));
 -        colorMap.put("mintcream", new Color(245, 255, 250));
 -        colorMap.put("mistyrose", new Color(255, 228, 225));
 -        colorMap.put("moccasin", new Color(255, 228, 181));
 -        colorMap.put("navajowhite", new Color(255, 222, 173));
 -        colorMap.put("navy", new Color(0, 0, 128));
 -        colorMap.put("oldlace", new Color(253, 245, 230));
 -        colorMap.put("olive", new Color(128, 128, 0));
 -        colorMap.put("olivedrab", new Color(107, 142, 35));
 -        colorMap.put("orange", new Color(255, 165, 0));
 -        colorMap.put("orangered", new Color(255, 69, 0));
 -        colorMap.put("orchid", new Color(218, 112, 214));
 -        colorMap.put("palegoldenrod", new Color(238, 232, 170));
 -        colorMap.put("palegreen", new Color(152, 251, 152));
 -        colorMap.put("paleturquoise", new Color(175, 238, 238));
 -        colorMap.put("palevioletred", new Color(219, 112, 147));
 -        colorMap.put("papayawhip", new Color(255, 239, 213));
 -        colorMap.put("peachpuff", new Color(255, 218, 185));
 -        colorMap.put("peru", new Color(205, 133, 63));
 -        colorMap.put("pink", new Color(255, 192, 203));
 -        colorMap.put("plum ", new Color(221, 160, 221));
 -        colorMap.put("plum", new Color(221, 160, 221));
 -        colorMap.put("powderblue", new Color(176, 224, 230));
 -        colorMap.put("purple", new Color(128, 0, 128));
 -        colorMap.put("red", new Color(255, 0, 0));
 -        colorMap.put("rosybrown", new Color(188, 143, 143));
 -        colorMap.put("royalblue", new Color(65, 105, 225));
 -        colorMap.put("saddlebrown", new Color(139, 69, 19));
 -        colorMap.put("salmon", new Color(250, 128, 114));
 -        colorMap.put("sandybrown", new Color(244, 164, 96));
 -        colorMap.put("seagreen", new Color(46, 139, 87));
 -        colorMap.put("seashell", new Color(255, 245, 238));
 -        colorMap.put("sienna", new Color(160, 82, 45));
 -        colorMap.put("silver", new Color(192, 192, 192));
 -        colorMap.put("skyblue", new Color(135, 206, 235));
 -        colorMap.put("slateblue", new Color(106, 90, 205));
 -        colorMap.put("slategray", new Color(112, 128, 144));
 -        colorMap.put("slategrey", new Color(112, 128, 144));
 -        colorMap.put("snow", new Color(255, 250, 250));
 -        colorMap.put("springgreen", new Color(0, 255, 127));
 -        colorMap.put("steelblue", new Color(70, 130, 180));
 -        colorMap.put("tan", new Color(210, 180, 140));
 -        colorMap.put("teal", new Color(0, 128, 128));
 -        colorMap.put("thistle", new Color(216, 191, 216));
 -        colorMap.put("tomato", new Color(255, 99, 71));
 -        colorMap.put("turquoise", new Color(64, 224, 208));
 -        colorMap.put("violet", new Color(238, 130, 238));
 -        colorMap.put("wheat", new Color(245, 222, 179));
 -        colorMap.put("white", new Color(255, 255, 255));
 -        colorMap.put("whitesmoke", new Color(245, 245, 245));
 -        colorMap.put("yellow", new Color(255, 255, 0));
 -        colorMap.put("yellowgreen", new Color(154, 205, 50));
 -        colorMap.put("transparent", new Color(0, 0, 0, 0));
 +        colorMap.put("aliceblue", createColor(240, 248, 255));
 +        colorMap.put("antiquewhite", createColor(250, 235, 215));
 +        colorMap.put("aqua", createColor(0, 255, 255));
 +        colorMap.put("aquamarine", createColor(127, 255, 212));
 +        colorMap.put("azure", createColor(240, 255, 255));
 +        colorMap.put("beige", createColor(245, 245, 220));
 +        colorMap.put("bisque", createColor(255, 228, 196));
 +        colorMap.put("black", createColor(0, 0, 0));
 +        colorMap.put("blanchedalmond", createColor(255, 235, 205));
 +        colorMap.put("blue", createColor(0, 0, 255));
 +        colorMap.put("blueviolet", createColor(138, 43, 226));
 +        colorMap.put("brown", createColor(165, 42, 42));
 +        colorMap.put("burlywood", createColor(222, 184, 135));
 +        colorMap.put("cadetblue", createColor(95, 158, 160));
 +        colorMap.put("chartreuse", createColor(127, 255, 0));
 +        colorMap.put("chocolate", createColor(210, 105, 30));
 +        colorMap.put("coral", createColor(255, 127, 80));
 +        colorMap.put("cornflowerblue", createColor(100, 149, 237));
 +        colorMap.put("cornsilk", createColor(255, 248, 220));
 +        colorMap.put("crimson", createColor(220, 20, 60));
 +        colorMap.put("cyan", createColor(0, 255, 255));
 +        colorMap.put("darkblue", createColor(0, 0, 139));
 +        colorMap.put("darkcyan", createColor(0, 139, 139));
 +        colorMap.put("darkgoldenrod", createColor(184, 134, 11));
 +        colorMap.put("darkgray", createColor(169, 169, 169));
 +        colorMap.put("darkgreen", createColor(0, 100, 0));
 +        colorMap.put("darkgrey", createColor(169, 169, 169));
 +        colorMap.put("darkkhaki", createColor(189, 183, 107));
 +        colorMap.put("darkmagenta", createColor(139, 0, 139));
 +        colorMap.put("darkolivegreen", createColor(85, 107, 47));
 +        colorMap.put("darkorange", createColor(255, 140, 0));
 +        colorMap.put("darkorchid", createColor(153, 50, 204));
 +        colorMap.put("darkred", createColor(139, 0, 0));
 +        colorMap.put("darksalmon", createColor(233, 150, 122));
 +        colorMap.put("darkseagreen", createColor(143, 188, 143));
 +        colorMap.put("darkslateblue", createColor(72, 61, 139));
 +        colorMap.put("darkslategray", createColor(47, 79, 79));
 +        colorMap.put("darkslategrey", createColor(47, 79, 79));
 +        colorMap.put("darkturquoise", createColor(0, 206, 209));
 +        colorMap.put("darkviolet", createColor(148, 0, 211));
 +        colorMap.put("deeppink", createColor(255, 20, 147));
 +        colorMap.put("deepskyblue", createColor(0, 191, 255));
 +        colorMap.put("dimgray", createColor(105, 105, 105));
 +        colorMap.put("dimgrey", createColor(105, 105, 105));
 +        colorMap.put("dodgerblue", createColor(30, 144, 255));
 +        colorMap.put("firebrick", createColor(178, 34, 34));
 +        colorMap.put("floralwhite", createColor(255, 250, 240));
 +        colorMap.put("forestgreen", createColor(34, 139, 34));
 +        colorMap.put("fuchsia", createColor(255, 0, 255));
 +        colorMap.put("gainsboro", createColor(220, 220, 220));
 +        colorMap.put("ghostwhite", createColor(248, 248, 255));
 +        colorMap.put("gold", createColor(255, 215, 0));
 +        colorMap.put("goldenrod", createColor(218, 165, 32));
 +        colorMap.put("gray", createColor(128, 128, 128));
 +        colorMap.put("green", createColor(0, 128, 0));
 +        colorMap.put("greenyellow", createColor(173, 255, 47));
 +        colorMap.put("grey", createColor(128, 128, 128));
 +        colorMap.put("honeydew", createColor(240, 255, 240));
 +        colorMap.put("hotpink", createColor(255, 105, 180));
 +        colorMap.put("indianred", createColor(205, 92, 92));
 +        colorMap.put("indigo", createColor(75, 0, 130));
 +        colorMap.put("ivory", createColor(255, 255, 240));
 +        colorMap.put("khaki", createColor(240, 230, 140));
 +        colorMap.put("lavender", createColor(230, 230, 250));
 +        colorMap.put("lavenderblush", createColor(255, 240, 245));
 +        colorMap.put("lawngreen", createColor(124, 252, 0));
 +        colorMap.put("lemonchiffon", createColor(255, 250, 205));
 +        colorMap.put("lightblue", createColor(173, 216, 230));
 +        colorMap.put("lightcoral", createColor(240, 128, 128));
 +        colorMap.put("lightcyan", createColor(224, 255, 255));
 +        colorMap.put("lightgoldenrodyellow", createColor(250, 250, 210));
 +        colorMap.put("lightgray", createColor(211, 211, 211));
 +        colorMap.put("lightgreen", createColor(144, 238, 144));
 +        colorMap.put("lightgrey", createColor(211, 211, 211));
 +        colorMap.put("lightpink", createColor(255, 182, 193));
 +        colorMap.put("lightsalmon", createColor(255, 160, 122));
 +        colorMap.put("lightseagreen", createColor(32, 178, 170));
 +        colorMap.put("lightskyblue", createColor(135, 206, 250));
 +        colorMap.put("lightslategray", createColor(119, 136, 153));
 +        colorMap.put("lightslategrey", createColor(119, 136, 153));
 +        colorMap.put("lightsteelblue", createColor(176, 196, 222));
 +        colorMap.put("lightyellow", createColor(255, 255, 224));
 +        colorMap.put("lime", createColor(0, 255, 0));
 +        colorMap.put("limegreen", createColor(50, 205, 50));
 +        colorMap.put("linen", createColor(250, 240, 230));
 +        colorMap.put("magenta", createColor(255, 0, 255));
 +        colorMap.put("maroon", createColor(128, 0, 0));
 +        colorMap.put("mediumaquamarine", createColor(102, 205, 170));
 +        colorMap.put("mediumblue", createColor(0, 0, 205));
 +        colorMap.put("mediumorchid", createColor(186, 85, 211));
 +        colorMap.put("mediumpurple", createColor(147, 112, 219));
 +        colorMap.put("mediumseagreen", createColor(60, 179, 113));
 +        colorMap.put("mediumslateblue", createColor(123, 104, 238));
 +        colorMap.put("mediumspringgreen", createColor(0, 250, 154));
 +        colorMap.put("mediumturquoise", createColor(72, 209, 204));
 +        colorMap.put("mediumvioletred", createColor(199, 21, 133));
 +        colorMap.put("midnightblue", createColor(25, 25, 112));
 +        colorMap.put("mintcream", createColor(245, 255, 250));
 +        colorMap.put("mistyrose", createColor(255, 228, 225));
 +        colorMap.put("moccasin", createColor(255, 228, 181));
 +        colorMap.put("navajowhite", createColor(255, 222, 173));
 +        colorMap.put("navy", createColor(0, 0, 128));
 +        colorMap.put("oldlace", createColor(253, 245, 230));
 +        colorMap.put("olive", createColor(128, 128, 0));
 +        colorMap.put("olivedrab", createColor(107, 142, 35));
 +        colorMap.put("orange", createColor(255, 165, 0));
 +        colorMap.put("orangered", createColor(255, 69, 0));
 +        colorMap.put("orchid", createColor(218, 112, 214));
 +        colorMap.put("palegoldenrod", createColor(238, 232, 170));
 +        colorMap.put("palegreen", createColor(152, 251, 152));
 +        colorMap.put("paleturquoise", createColor(175, 238, 238));
 +        colorMap.put("palevioletred", createColor(219, 112, 147));
 +        colorMap.put("papayawhip", createColor(255, 239, 213));
 +        colorMap.put("peachpuff", createColor(255, 218, 185));
 +        colorMap.put("peru", createColor(205, 133, 63));
 +        colorMap.put("pink", createColor(255, 192, 203));
 +        colorMap.put("plum ", createColor(221, 160, 221));
 +        colorMap.put("plum", createColor(221, 160, 221));
 +        colorMap.put("powderblue", createColor(176, 224, 230));
 +        colorMap.put("purple", createColor(128, 0, 128));
 +        colorMap.put("red", createColor(255, 0, 0));
 +        colorMap.put("rosybrown", createColor(188, 143, 143));
 +        colorMap.put("royalblue", createColor(65, 105, 225));
 +        colorMap.put("saddlebrown", createColor(139, 69, 19));
 +        colorMap.put("salmon", createColor(250, 128, 114));
 +        colorMap.put("sandybrown", createColor(244, 164, 96));
 +        colorMap.put("seagreen", createColor(46, 139, 87));
 +        colorMap.put("seashell", createColor(255, 245, 238));
 +        colorMap.put("sienna", createColor(160, 82, 45));
 +        colorMap.put("silver", createColor(192, 192, 192));
 +        colorMap.put("skyblue", createColor(135, 206, 235));
 +        colorMap.put("slateblue", createColor(106, 90, 205));
 +        colorMap.put("slategray", createColor(112, 128, 144));
 +        colorMap.put("slategrey", createColor(112, 128, 144));
 +        colorMap.put("snow", createColor(255, 250, 250));
 +        colorMap.put("springgreen", createColor(0, 255, 127));
 +        colorMap.put("steelblue", createColor(70, 130, 180));
 +        colorMap.put("tan", createColor(210, 180, 140));
 +        colorMap.put("teal", createColor(0, 128, 128));
 +        colorMap.put("thistle", createColor(216, 191, 216));
 +        colorMap.put("tomato", createColor(255, 99, 71));
 +        colorMap.put("turquoise", createColor(64, 224, 208));
 +        colorMap.put("violet", createColor(238, 130, 238));
 +        colorMap.put("wheat", createColor(245, 222, 179));
 +        colorMap.put("white", createColor(255, 255, 255));
 +        colorMap.put("whitesmoke", createColor(245, 245, 245));
 +        colorMap.put("yellow", createColor(255, 255, 0));
 +        colorMap.put("yellowgreen", createColor(154, 205, 50));
 +        colorMap.put("transparent", new ColorWithAlternatives(0, 0, 0, 0, null));
      }
  
      /**

diff --cc status.xml
index 90b1a84ba9faccd38ca67d441e525f8fda9ee2a3,c80ba0668263bf5127d89dfc6820c68b534cf805..660dda79d28d37a2823251ba113a273505470650
--- 1/status.xml
--- 2/status.xml
+++ b/status.xml
@@@ -58,11 -59,57 +59,60 @@@
        documents. Example: the fix of marks layering will be such a case when it's done.
      -->
      <release version="FOP Trunk" date="TBD">
-       </release>
-     <release version="1.0" date="July 2010">
 +      <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="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.
+         </action>
+       <action context="Layout" dev="AD" type="fix" fixes-bug="49848">
+         Bugfix: correct behavior of keep-together.within-line in case there are nested inlines
+       </action>
+       <action context="Code" dev="AD" type="fix" fixes-bug="50471">
+         Bugfix: avoid ArrayIndexOutOfBoundsException for codepoints without a linebreak class
+       </action>
+       <action context="Layout" dev="AD" type="fix" fixes-bug="48380">
+         Bugfix: avoid ClassCastException when using fox:widow-content-limit
+       </action>
+       <action context="Layout" dev="VH" type="fix" fixes-bug="50089">
+         Bugfix: content after forced break in block-container is not rendered.
+       </action>
+       <action context="Layout" dev="JM" type="fix" fixes-bug="42034">
+         Fixed adjustment of inline parent area for justified text containing a forward page reference.
+       </action>
+       <action context="Layout" dev="AD" type="fix" fixes-bug="38264">
+         Fixed behavior when combining hyphenation with preserved linefeeds or whitespace.
+       </action>
+       <action context="Code" dev="VH" type="fix" fixes-bug="49695" due-to="Joshua Marquart">
+         Replaced magic numbers with constants from UnitConv and GraphicsConstants.
+       </action>
+       <action context="Renderers" dev="JM" type="add" fixes-bug="42600" due-to="Maximilian Aster">
+         Added some support for break-before/-after for RTF output.
+       </action>
+       <action context="Renderers" dev="JM" type="add" fixes-bug="49379" due-to="Peter Hancock">
+         Added ability to embed an external AFP page segment resource file (AFP output only).
+       </action>
+       <action context="Renderers" dev="JM" type="fix" fixes-bug="46360" due-to="Alexis Giotis">
+         Fixed a multi-threading issue when rendering SVG.
+       </action>
+       <action context="Layout" dev="JM" type="fix" fixes-bug="49885">
+         Fixed retrieval of available BPD for cases spanning columns and multiple pages with differing page masters.
+       </action>
+       <action context="Renderers" dev="VH" type="remove">
+         Removed old Renderer implementations for those output formats that have a version based on 
+         the new DocumentHandler architecture available (AFP, PCL, PDF, PS).
+       </action>
+       <action context="Fonts" dev="AC" type="fix">
+         Reinstated support for being able to specify a font cache filepath in the fop user configuration.
+       </action>
+       <action context="Fonts" dev="AC" type="add">
+         Added convenience support for the flushing of the Fop font cache file from the command line.
+       </action>
+       <action context="Renderers" dev="JM" type="add" fixes-bug="44460" due-to="Andrejus Chaliapinas">
+         Added support for PDF File Attachments (Embedded Files).
+       </action>
+     </release>
+     <release version="1.0" date="21 July 2010">
        <action context="Renderers" dev="JM" type="fix">
          AFP Output: Fixed positioning of Java2D-based images (when GOCA is enabled).
        </action>

diff --cc test/java/org/apache/fop/traits/BorderPropsTestCase.java
Simple merge