New CSS blending and compositing modes.

Define WITH_CSSBLEND and/or WITH_CSSCOMPOSITE to try out.
Note: these new modes are not yet defined to apply to SVG filters in the
CSS Compositing and Blending Level 1 or in CSS Filters Level 1 specifications.
They are expected to be included in Level 2.

(bzr r12837)

3 files changed, 120 insertions, 11 deletions

diff --git a/src/filters/blend.cpp b/src/filters/blend.cpp
index 219a099d1..5c78f4f9f 100644
--- a/src/filters/blend.cpp
+++ b/src/filters/blend.cpp
@@ -96,16 +96,50 @@ static Inkscape::Filters::FilterBlendMode sp_feBlend_readmode(gchar const *value
         case 's':
             if (strncmp(value, "screen", 6) == 0)
                 return Inkscape::Filters::BLEND_SCREEN;
+#ifdef WITH_CSSBLEND
+            if (strncmp(value, "saturation", 6) == 0)
+                return Inkscape::Filters::BLEND_SATURATION;
+#endif
             break;
         case 'd':
             if (strncmp(value, "darken", 6) == 0)
                 return Inkscape::Filters::BLEND_DARKEN;
+#ifdef WITH_CSSBLEND
+            if (strncmp(value, "difference", 10) == 0)
+                return Inkscape::Filters::BLEND_DIFFERENCE;
+#endif
             break;
         case 'l':
             if (strncmp(value, "lighten", 7) == 0)
                 return Inkscape::Filters::BLEND_LIGHTEN;
+#ifdef WITH_CSSBLEND
+            if (strncmp(value, "luminosity", 10) == 0)
+                return Inkscape::Filters::BLEND_LUMINOSITY;
+            break;
+        case 'o':
+            if (strncmp(value, "overlay", 7) == 0)
+                return Inkscape::Filters::BLEND_OVERLAY;
+            break;
+        case 'c':
+            if (strncmp(value, "color-dodge", 11) == 0)
+                return Inkscape::Filters::BLEND_COLORDODGE;
+            if (strncmp(value, "color-burn", 10) == 0)
+                return Inkscape::Filters::BLEND_COLORBURN;
+            if (strncmp(value, "color", 5) == 0)
+                return Inkscape::Filters::BLEND_COLOR;
             break;
+        case 'h':
+            if (strncmp(value, "hard-light", 7) == 0)
+                return Inkscape::Filters::BLEND_HARDLIGHT;
+            if (strncmp(value, "hue", 3) == 0)
+                return Inkscape::Filters::BLEND_HUE;
+            break;
+        case 'e':
+            if (strncmp(value, "exclusion", 10) == 0)
+                return Inkscape::Filters::BLEND_EXCLUSION;
+#endif
         default:
+            std::cout << "Inkscape::Filters::FilterBlendMode: Unimplemented mode: " << value << std::endl;
             // do nothing by default
             break;
     }
@@ -201,15 +235,40 @@ Inkscape::XML::Node* SPFeBlend::write(Inkscape::XML::Document *doc, Inkscape::XM
     char const *mode;
     switch(this->blend_mode) {
         case Inkscape::Filters::BLEND_NORMAL:
-            mode = "normal"; break;
+            mode = "normal";      break;
         case Inkscape::Filters::BLEND_MULTIPLY:
-            mode = "multiply"; break;
+            mode = "multiply";    break;
         case Inkscape::Filters::BLEND_SCREEN:
-            mode = "screen"; break;
+            mode = "screen";      break;
         case Inkscape::Filters::BLEND_DARKEN:
-            mode = "darken"; break;
+            mode = "darken";      break;
         case Inkscape::Filters::BLEND_LIGHTEN:
-            mode = "lighten"; break;
+            mode = "lighten";     break;
+#ifdef WITH_CSSBLEND
+        // New
+        case Inkscape::Filters::BLEND_OVERLAY:
+            mode = "overlay";     break;
+        case Inkscape::Filters::BLEND_COLORDODGE:
+            mode = "color-dodge"; break;
+        case Inkscape::Filters::BLEND_COLORBURN:
+            mode = "color-burn";  break;
+        case Inkscape::Filters::BLEND_HARDLIGHT:
+            mode = "hard-light";  break;
+        case Inkscape::Filters::BLEND_SOFTLIGHT:
+            mode = "soft-light";  break;
+        case Inkscape::Filters::BLEND_DIFFERENCE:
+            mode = "difference";  break;
+        case Inkscape::Filters::BLEND_EXCLUSION:
+            mode = "exclusion";   break;
+        case Inkscape::Filters::BLEND_HUE:
+            mode = "hue";         break;
+        case Inkscape::Filters::BLEND_SATURATION:
+            mode = "saturation";  break;
+        case Inkscape::Filters::BLEND_COLOR:
+            mode = "color";       break;
+        case Inkscape::Filters::BLEND_LUMINOSITY:
+            mode = "luminosity";  break;
+#endif
         default:
             mode = 0;
     }
diff --git a/src/filters/composite.cpp b/src/filters/composite.cpp
index 3c214a7a1..257292f12 100644
--- a/src/filters/composite.cpp
+++ b/src/filters/composite.cpp
@@ -100,6 +100,26 @@ sp_feComposite_read_operator(gchar const *value) {
     } else if (strcmp(value, "arithmetic") == 0) {
     	return COMPOSITE_ARITHMETIC;
     }
+#ifdef WITH_CSSCOMPOSITE
+      else if (strcmp(value, "clear") == 0) {
+    	return COMPOSITE_CLEAR;
+    } else if (strcmp(value, "copy") == 0) {
+    	return COMPOSITE_COPY;
+    } else if (strcmp(value, "destination") == 0) {
+    	return COMPOSITE_DESTINATION;
+    } else if (strcmp(value, "destination-over") == 0) {
+    	return COMPOSITE_DESTINATION_OVER;
+    } else if (strcmp(value, "destination-in") == 0) {
+    	return COMPOSITE_DESTINATION_IN;
+    } else if (strcmp(value, "destination-out") == 0) {
+    	return COMPOSITE_DESTINATION_OUT;
+    } else if (strcmp(value, "destination-atop") == 0) {
+    	return COMPOSITE_DESTINATION_ATOP;
+    } else if (strcmp(value, "lighter") == 0) {
+    	return COMPOSITE_LIGHTER;
+    }
+#endif
+    std::cout << "Inkscape::Filters::FilterCompositeOperator: Unimplemented operator: " << value << std::endl;
 
     return COMPOSITE_DEFAULT;
 }
@@ -243,6 +263,25 @@ Inkscape::XML::Node* SPFeComposite::write(Inkscape::XML::Document *doc, Inkscape
             comp_op = "xor"; break;
         case COMPOSITE_ARITHMETIC:
             comp_op = "arithmetic"; break;
+#ifdef WITH_CSSCOMPOSITE
+        // New CSS operators
+        case COMPOSITE_CLEAR:
+            comp_op = "clear"; break;
+        case COMPOSITE_COPY:
+            comp_op = "copy"; break;
+        case COMPOSITE_DESTINATION:
+            comp_op = "destination"; break;
+        case COMPOSITE_DESTINATION_OVER:
+            comp_op = "destination-over"; break;
+        case COMPOSITE_DESTINATION_IN:
+            comp_op = "destination-in"; break;
+        case COMPOSITE_DESTINATION_OUT:
+            comp_op = "destination-out"; break;
+        case COMPOSITE_DESTINATION_ATOP:
+            comp_op = "destination-atop"; break;
+        case COMPOSITE_LIGHTER:
+            comp_op = "lighter"; break;
+#endif
         default:
             comp_op = 0;
     }
diff --git a/src/filters/composite.h b/src/filters/composite.h
index b8c0178d1..42ec9d6b7 100644
--- a/src/filters/composite.h
+++ b/src/filters/composite.h
@@ -20,13 +20,24 @@ enum FeCompositeOperator {
     // Default value is 'over', but let's distinquish specifying the
     // default and implicitely using the default
     COMPOSITE_DEFAULT,
-    COMPOSITE_OVER,
-    COMPOSITE_IN,
-    COMPOSITE_OUT,
-    COMPOSITE_ATOP,
+    COMPOSITE_OVER,              /* Source Over */
+    COMPOSITE_IN,                /* Source In   */
+    COMPOSITE_OUT,               /* Source Out  */
+    COMPOSITE_ATOP,              /* Source Atop */
     COMPOSITE_XOR,
-    COMPOSITE_ARITHMETIC,
-    COMPOSITE_ENDOPERATOR
+    COMPOSITE_ARITHMETIC,        /* Not a fundamental PorterDuff operator, nor Cairo */
+#ifdef WITH_CSSCOMPOSITE
+    // New in CSS
+    COMPOSITE_CLEAR,
+    COMPOSITE_COPY,              /* Source      */
+    COMPOSITE_DESTINATION,
+    COMPOSITE_DESTINATION_OVER,
+    COMPOSITE_DESTINATION_IN,
+    COMPOSITE_DESTINATION_OUT,
+    COMPOSITE_DESTINATION_ATOP,
+    COMPOSITE_LIGHTER,           /* Plus, Add (Not a fundamental PorterDuff operator  */
+#endif
+    COMPOSITE_ENDOPERATOR        /* Cairo Saturate is not included in CSS */
 };
 
 class SPFeComposite : public SPFilterPrimitive {