FOP-3091: Add transparency color support for PDF

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

7 files changed, 32 insertions, 13 deletions

diff --git a/fop-core/src/main/java/org/apache/fop/fo/expr/PropertyTokenizer.java b/fop-core/src/main/java/org/apache/fop/fo/expr/PropertyTokenizer.java
index f9b4cd87d..8e278156a 100644
--- a/fop-core/src/main/java/org/apache/fop/fo/expr/PropertyTokenizer.java
+++ b/fop-core/src/main/java/org/apache/fop/fo/expr/PropertyTokenizer.java
@@ -229,7 +229,7 @@ class PropertyTokenizer {
             ++exprIndex;
             scanHexDigits();
             int len = exprIndex - currentTokenStartIndex - 1;
-            if (len % 3 == 0) {
+            if (len % 3 == 0 || len == 8) {
                 currentToken = TOK_COLORSPEC;
             } else {
                 //Actually not a color at all, but an NCNAME starting with "#"
diff --git a/fop-core/src/main/java/org/apache/fop/pdf/PDFColorHandler.java b/fop-core/src/main/java/org/apache/fop/pdf/PDFColorHandler.java
index 027fedce9..193bd6dfd 100644
--- a/fop-core/src/main/java/org/apache/fop/pdf/PDFColorHandler.java
+++ b/fop-core/src/main/java/org/apache/fop/pdf/PDFColorHandler.java
@@ -23,6 +23,7 @@ import java.awt.Color;
 import java.awt.color.ColorSpace;
 import java.awt.color.ICC_ColorSpace;
 import java.awt.color.ICC_Profile;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.commons.logging.Log;
@@ -45,6 +46,7 @@ public class PDFColorHandler {
     private Log log = LogFactory.getLog(PDFColorHandler.class);
 
     private PDFResources resources;
+    private PDFResourceContext resourceContext;
 
     private Map<String, PDFCIELabColorSpace> cieLabColorSpaces;
 
@@ -52,8 +54,9 @@ public class PDFColorHandler {
      * Create a new instance for the given {@link PDFResources}
      * @param resources the PDF resources
      */
-    public PDFColorHandler(PDFResources resources) {
+    public PDFColorHandler(PDFResources resources, PDFResourceContext resourceContext) {
         this.resources = resources;
+        this.resourceContext = resourceContext;
     }
 
     private PDFDocument getDocument() {
@@ -67,7 +70,7 @@ public class PDFColorHandler {
      * @param color the color
      * @param fill true for fill color, false for stroke color
      */
-    public void establishColor(StringBuffer codeBuffer, Color color, boolean fill) {
+    public void establishColor(StringBuffer codeBuffer, Color color, boolean fill, boolean alpha) {
         if (color instanceof ColorWithAlternatives) {
             ColorWithAlternatives colExt = (ColorWithAlternatives)color;
             //Alternate colors have priority
@@ -87,7 +90,7 @@ public class PDFColorHandler {
         //Fallback
         boolean established = establishColorFromColor(codeBuffer, color, fill);
         if (!established) {
-            establishDeviceRGB(codeBuffer, color, fill);
+            establishDeviceRGB(codeBuffer, color, fill, alpha);
         }
     }
 
@@ -188,7 +191,7 @@ public class PDFColorHandler {
         }
     }
 
-    private void establishDeviceRGB(StringBuffer codeBuffer, Color color, boolean fill) {
+    private void establishDeviceRGB(StringBuffer codeBuffer, Color color, boolean fill, boolean alpha) {
         float[] comps;
         if (color.getColorSpace().isCS_sRGB()) {
             comps = color.getColorComponents(null);
@@ -199,6 +202,9 @@ public class PDFColorHandler {
             ColorSpace sRGB = ColorSpace.getInstance(ColorSpace.CS_sRGB);
             comps = color.getColorComponents(sRGB, null);
         }
+        if (alpha) {
+            writeAlpha(color, codeBuffer);
+        }
         if (ColorUtil.isGray(color)) {
             comps = new float[] {comps[0]}; //assuming that all components are the same
             writeColor(codeBuffer, comps, 1, (fill ? "g" : "G"));
@@ -207,7 +213,20 @@ public class PDFColorHandler {
         }
     }
 
+    private void writeAlpha(Color color, StringBuffer codeBuffer) {
+        int alpha = color.getAlpha();
+        if (alpha != 255 && alpha != 0 && resourceContext != null) {
+            Map<String, Float> vals = new HashMap<>();
+            vals.put(PDFGState.GSTATE_ALPHA_NONSTROKE, alpha / 255f);
+            vals.put(PDFGState.GSTATE_ALPHA_STROKE, 1.0f);
+            PDFGState gState = getDocument().getFactory().makeGState(vals, PDFGState.DEFAULT);
+            resourceContext.addGState(gState);
+            codeBuffer.append("/").append(gState.getName()).append(" gs\n");
+        }
+    }
+
     private void establishDeviceCMYK(StringBuffer codeBuffer, Color color, boolean fill) {
+        writeAlpha(color, codeBuffer);
         writeColor(codeBuffer, color, 4, (fill ? "k" : "K"));
     }
 
diff --git a/fop-core/src/main/java/org/apache/fop/pdf/PDFDocument.java b/fop-core/src/main/java/org/apache/fop/pdf/PDFDocument.java
index 220875349..2e13e7015 100644
--- a/fop-core/src/main/java/org/apache/fop/pdf/PDFDocument.java
+++ b/fop-core/src/main/java/org/apache/fop/pdf/PDFDocument.java
@@ -751,7 +751,7 @@ public class PDFDocument {
             poss = new PDFGState();
             poss.addValues(current);
             poss.addValues(avail);
-            if (poss.equals(wanted)) {
+            if (poss.contentEquals(wanted)) {
                 return avail;
             }
         }
diff --git a/fop-core/src/main/java/org/apache/fop/render/pdf/PDFContentGenerator.java b/fop-core/src/main/java/org/apache/fop/render/pdf/PDFContentGenerator.java
index c11df3c94..668734bde 100644
--- a/fop-core/src/main/java/org/apache/fop/render/pdf/PDFContentGenerator.java
+++ b/fop-core/src/main/java/org/apache/fop/render/pdf/PDFContentGenerator.java
@@ -96,7 +96,7 @@ public class PDFContentGenerator {
         };
 
         this.currentState = new PDFPaintingState();
-        this.colorHandler = new PDFColorHandler(document.getResources());
+        this.colorHandler = new PDFColorHandler(document.getResources(), resourceContext);
         this.context = context;
     }
 
@@ -455,7 +455,7 @@ public class PDFContentGenerator {
      */
     protected void setColor(Color col, boolean fill, StringBuffer pdf) {
         if (pdf != null) {
-            colorHandler.establishColor(pdf, col, fill);
+            colorHandler.establishColor(pdf, col, fill, true);
         } else {
             setColor(col, fill, getStream());
         }
diff --git a/fop-core/src/main/java/org/apache/fop/render/ps/PSImageHandlerRenderedImage.java b/fop-core/src/main/java/org/apache/fop/render/ps/PSImageHandlerRenderedImage.java
index 6b5745e86..eec267c3a 100644
--- a/fop-core/src/main/java/org/apache/fop/render/ps/PSImageHandlerRenderedImage.java
+++ b/fop-core/src/main/java/org/apache/fop/render/ps/PSImageHandlerRenderedImage.java
@@ -83,7 +83,7 @@ public class PSImageHandlerRenderedImage implements PSImageHandler {
         ImageEncodingHelper helper = new ImageEncodingHelper(ri);
         ColorModel cm = helper.getEncodedColorModel();
 
-        PSImageUtils.writeImage(encoder, imgDim, imgDescription, targetRect, cm, gen, ri);
+        PSImageUtils.writeImage(encoder, imgDim, imgDescription, targetRect, cm, gen, ri, null);
     }
 
     /** {@inheritDoc} */
diff --git a/fop-core/src/main/java/org/apache/fop/svg/PDFDocumentGraphics2D.java b/fop-core/src/main/java/org/apache/fop/svg/PDFDocumentGraphics2D.java
index 0e49cc40c..ab03355b7 100644
--- a/fop-core/src/main/java/org/apache/fop/svg/PDFDocumentGraphics2D.java
+++ b/fop-core/src/main/java/org/apache/fop/svg/PDFDocumentGraphics2D.java
@@ -102,7 +102,7 @@ public class PDFDocumentGraphics2D extends PDFGraphics2D {
         this.pdfDoc = new PDFDocument("Apache FOP Version " + Version.getVersion()
                 + ": PDFDocumentGraphics2D");
         this.pdfContext = new PDFContext();
-        this.colorHandler = new PDFColorHandler(this.pdfDoc.getResources());
+        this.colorHandler = new PDFColorHandler(this.pdfDoc.getResources(), resourceContext);
     }
 
     /**
@@ -237,7 +237,7 @@ public class PDFDocumentGraphics2D extends PDFGraphics2D {
     public void setBackgroundColor(Color col) {
         StringBuffer sb = new StringBuffer();
         sb.append("q\n");
-        this.colorHandler.establishColor(sb, col, true);
+        this.colorHandler.establishColor(sb, col, true, true);
 
         sb.append("0 0 ").append(width).append(" ").append(height).append(" re\n");
 
diff --git a/fop-core/src/main/java/org/apache/fop/svg/PDFGraphics2D.java b/fop-core/src/main/java/org/apache/fop/svg/PDFGraphics2D.java
index dbb0a2e65..cf8701522 100644
--- a/fop-core/src/main/java/org/apache/fop/svg/PDFGraphics2D.java
+++ b/fop-core/src/main/java/org/apache/fop/svg/PDFGraphics2D.java
@@ -217,7 +217,7 @@ public class PDFGraphics2D extends AbstractGraphics2D implements NativeImageHand
                          TransparencyIgnoredEventListener listener) {
         this(textAsShapes);
         pdfDoc = doc;
-        this.colorHandler = new PDFColorHandler(doc.getResources());
+        this.colorHandler = new PDFColorHandler(doc.getResources(), page);
         resourceContext = page;
         currentFontName = font;
         currentFontSize = size;
@@ -790,7 +790,7 @@ public class PDFGraphics2D extends AbstractGraphics2D implements NativeImageHand
         }
         if (doWrite) {
             StringBuffer sb = new StringBuffer();
-            colorHandler.establishColor(sb, col, fill);
+            colorHandler.establishColor(sb, col, fill, false);
             currentStream.write(sb.toString());
         }
     }