Filters. Removing unnecessary elements and attributes.

(bzr r10551)

7 files changed, 22 insertions, 23 deletions

diff --git a/share/filters/filters.svg b/share/filters/filters.svg
index 814b69cfe..2e875b664 100644
--- a/share/filters/filters.svg
+++ b/share/filters/filters.svg
@@ -26,7 +26,6 @@ sodipodi:docname="filters.svg">
 </metadata>
 <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" id="namedview1264" showgrid="false" inkscape:zoom="0.16" inkscape:cx="372.045" inkscape:cy="1050" inkscape:window-x="253" inkscape:window-y="520" inkscape:current-layer="svg2" />
 <defs id="defs4">
-<inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 1050 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="744.09 : 1050 : 1" inkscape:persp3d-origin="372.045 : 700 : 1" id="perspective1268" />
 <filter id="f001" inkscape:label="Smart Jelly" inkscape:menu="Bevels" inkscape:menu-tooltip="Same as Matte jelly but with more controls" height="1" width="1" y="0" x="0" color-interpolation-filters="sRGB">
 <feBlend in2="SourceGraphic" mode="normal" result="result3" />
 <feComposite result="result4" operator="arithmetic" k2="1" in2="result3" />
diff --git a/src/extension/internal/filter/blurs.h b/src/extension/internal/filter/blurs.h
index 1854572ff..39d40ee33 100644
--- a/src/extension/internal/filter/blurs.h
+++ b/src/extension/internal/filter/blurs.h
@@ -231,7 +231,7 @@ CrossBlur::get_filter_text (Inkscape::Extension::Extension * ext)
           "<feComposite in=\"SourceGraphic\" in2=\"colormatrix\" operator=\"arithmetic\" k2=\"1\" k3=\"%s\" k4=\"%s\" result=\"composite\" />\n"
           "<feGaussianBlur stdDeviation=\"%s 0.01\" result=\"blur1\" />\n"
           "<feGaussianBlur in=\"composite\" stdDeviation=\"0.01 %s\" result=\"blur2\" />\n"
-          "<feBlend in=\"blur2\" in2=\"blur1\" blend=\"normal\" mode=\"%s\" result=\"blend\" />\n"
+          "<feBlend in=\"blur2\" in2=\"blur1\" mode=\"%s\" result=\"blend\" />\n"
         "</filter>\n", bright.str().c_str(), fade.str().c_str(), hblur.str().c_str(), vblur.str().c_str(), blend.str().c_str());
 
     return _filter;
@@ -400,7 +400,7 @@ ImageBlur::get_filter_text (Inkscape::Extension::Extension * ext)
           "<feColorMatrix in=\"SourceGraphic\" values=\"1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 -0.2125 -0.7154 -0.0721 1 0 \" result=\"colormatrix1\" />\n"
           "<feGaussianBlur in=\"colormatrix1\" stdDeviation=\"%s %s\" result=\"blur\" />\n"
           "<feColorMatrix in=\"blur\" values=\"1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 %s %s \" result=\"colormatrix2\" />\n"
-          "<feBlend in=\"colormatrix2\" in2=\"%s\" blend=\"normal\" mode=\"%s\" result=\"blend\" />\n"
+          "<feBlend in=\"colormatrix2\" in2=\"%s\" mode=\"%s\" result=\"blend\" />\n"
           "<feComposite in=\"blend\" in2=\"blend\" operator=\"arithmetic\" k2=\"%s\" result=\"composite1\" />\n"
           "<feComposite in2=\"SourceGraphic\" operator=\"in\" />\n"
         "</filter>\n", a.str().c_str(), r.str().c_str(), g.str().c_str(), b.str().c_str(),
diff --git a/src/extension/internal/filter/bumps.h b/src/extension/internal/filter/bumps.h
index e9860f4a7..ef7f1dc8b 100644
--- a/src/extension/internal/filter/bumps.h
+++ b/src/extension/internal/filter/bumps.h
@@ -707,13 +707,13 @@ WaxBump::get_filter_text (Inkscape::Extension::Extension * ext)
           "<feSpecularLighting in=\"blur2\" lighting-color=\"rgb(%s,%s,%s)\" specularConstant=\"%s\" surfaceScale=\"%s\" specularExponent=\"%s\" result=\"specular\">\n"
             "<feDistantLight elevation=\"%s\" azimuth=\"%s\" />\n"
           "</feSpecularLighting>\n"
-          "<feBlend in=\"specular\" in2=\"blur2\" specularConstant=\"1\" mode=\"%s\" blend=\"normal\" result=\"blend1\" />\n"
+          "<feBlend in=\"specular\" in2=\"blur2\" specularConstant=\"1\" mode=\"%s\" result=\"blend1\" />\n"
           "<feComposite in=\"blend1\" in2=\"blur2\" k2=\"0\" operator=\"%s\" k1=\"0.5\" k3=\"0.5\" k4=\"0\" result=\"composite2\" />\n"
           "<feMerge result=\"merge\">\n"
             "<feMergeNode in=\"colormatrix1\" />\n"
             "<feMergeNode in=\"composite2\" />\n"
           "</feMerge>\n"
-          "<feBlend in2=\"composite2\" mode=\"%s\" blend=\"normal\" result=\"blend2\" />\n"
+          "<feBlend in2=\"composite2\" mode=\"%s\" result=\"blend2\" />\n"
           "<feComposite in=\"blend2\" in2=\"SourceGraphic\" operator=\"in\" result=\"composite3\" />\n"
         "</filter>\n", simplifyImage.str().c_str(), background.str().c_str(), bgopacity.str().c_str(),
                        red.str().c_str(), green.str().c_str(), blue.str().c_str(), crop.str().c_str(),
diff --git a/src/extension/internal/filter/color.h b/src/extension/internal/filter/color.h
index 9ba03a3d6..77fa06a25 100644
--- a/src/extension/internal/filter/color.h
+++ b/src/extension/internal/filter/color.h
@@ -597,7 +597,7 @@ Duochrome::get_filter_text (Inkscape::Extension::Extension * ext)
           "<feComposite in=\"composite2\" in2=\"composite1\" k2=\"1\"  k3=\"1\" operator=\"arithmetic\" result=\"composite3\" />\n"
           "<feColorMatrix in=\"composite3\" type=\"matrix\" values=\"2 -1 0 0 0 0 2 -1 0 0 -1 0 2 0 0 0 0 0 1 0 \" result=\"colormatrix2\" />\n"
           "<feComposite in=\"colormatrix2\" in2=\"composite3\" operator=\"arithmetic\" k2=\"%s\" result=\"composite4\" />\n"
-          "<feBlend in=\"composite4\" in2=\"composite3\" blend=\"normal\" mode=\"normal\" result=\"blend\" />\n"
+          "<feBlend in=\"composite4\" in2=\"composite3\" mode=\"normal\" result=\"blend\" />\n"
           "<feComposite in2=\"SourceGraphic\" operator=\"in\" />\n"
         "</filter>\n", a1.str().c_str(), r1.str().c_str(), g1.str().c_str(), b1.str().c_str(), swap1.str().c_str(),
                        a2.str().c_str(), r2.str().c_str(), g2.str().c_str(), b2.str().c_str(), swap2.str().c_str(),
@@ -702,7 +702,7 @@ ExtractChannel::get_filter_text (Inkscape::Extension::Extension * ext)
     _filter = g_strdup_printf(
         "<filter xmlns:inkscape=\"http://www.inkscape.org/namespaces/inkscape\" color-interpolation-filters=\"sRGB\" inkscape:label=\"Extract Channel\">\n"
           "<feColorMatrix in=\"SourceGraphic\" values=\"%s %s %s 0 \" result=\"colormatrix\" />\n"
-          "<feBlend in2=\"BackgroundImage\" blend=\"normal\" mode=\"%s\" result=\"blend\" />\n"
+          "<feBlend in2=\"BackgroundImage\" mode=\"%s\" result=\"blend\" />\n"
         "</filter>\n", colors.str().c_str(), alpha.str().c_str(), invert.str().c_str(), blend.str().c_str() );
 
     return _filter;
@@ -1129,13 +1129,13 @@ Nudge::get_filter_text (Inkscape::Extension::Extension * ext)
           "<feFlood flood-opacity=\"%s\" flood-color=\"rgb(%s,%s,%s)\" result=\"flood\" />\n"
           "<feColorMatrix in=\"SourceGraphic\" values=\"0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 \" result=\"colormatrix1\" />\n"
           "<feOffset dy=\"%s\" dx=\"%s\" result=\"offset1\" />\n"
-          "<feBlend in2=\"%s\" mode=\"%s\" blend=\"normal\" result=\"blend1\" />\n"
+          "<feBlend in2=\"%s\" mode=\"%s\" result=\"blend1\" />\n"
           "<feColorMatrix in=\"SourceGraphic\" values=\"0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0 \" result=\"colormatrix2\" />\n"
           "<feOffset dy=\"%s\" dx=\"%s\" result=\"offset2\" />\n"
-          "<feBlend in2=\"blend1\" mode=\"%s\" blend=\"normal\" result=\"blend2\" />\n"
+          "<feBlend in2=\"blend1\" mode=\"%s\" result=\"blend2\" />\n"
           "<feOffset dy=\"%s\" dx=\"%s\" result=\"offset3\" />\n"
           "<feColorMatrix in=\"SourceGraphic\" values=\"0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 0 0 \" result=\"colormatrix3\" />\n"
-          "<feBlend in2=\"offset3\" mode=\"%s\" blend=\"normal\" result=\"blend3\" />\n"
+          "<feBlend in2=\"offset3\" mode=\"%s\" result=\"blend3\" />\n"
           "<feComposite in2=\"SourceGraphic\" operator=\"%s\" />\n"
         "</filter>\n", a.str().c_str(), r.str().c_str(), g.str().c_str(), b.str().c_str(),
                        rx.str().c_str(), ry.str().c_str(), source.str().c_str(), blend.str().c_str(), 
@@ -1224,10 +1224,10 @@ Quadritone::get_filter_text (Inkscape::Extension::Extension * ext)
           "<feColorMatrix in=\"SourceGraphic\" type=\"hueRotate\" values=\"%s\" result=\"colormatrix1\" />\n"
           "<feColorMatrix type=\"matrix\" values=\"0.5 0 0.5 0 0 0 1 0 0 0 0.5 0 0.5 0 0 0 0 0 1 0 \" result=\"colormatrix2\" />\n"
           "<feColorMatrix type=\"hueRotate\" values=\"%s\" result=\"colormatrix3\" />\n"
-          "<feBlend in2=\"colormatrix3\" blend=\"normal\" mode=\"%s\" result=\"blend1\" />\n"
+          "<feBlend in2=\"colormatrix3\" mode=\"%s\" result=\"blend1\" />\n"
           "<feColorMatrix type=\"matrix\" values=\"2.5 -0.75 -0.75 0 0 -0.75 2.5 -0.75 0 0 -0.75 -0.75 2.5 0 0 0 0 0 1 0 \" result=\"colormatrix4\" />\n"
           "<feComposite in=\"colormatrix4\" in2=\"blend1\" operator=\"arithmetic\" k2=\"%s\" result=\"composite1\" />\n"
-          "<feBlend in2=\"blend1\" blend=\"normal\" mode=\"%s\" result=\"blend2\" />\n"
+          "<feBlend in2=\"blend1\" mode=\"%s\" result=\"blend2\" />\n"
         "</filter>\n", dist.str().c_str(), colors.str().c_str(), blend1.str().c_str(), sat.str().c_str(), blend2.str().c_str() );
 
     return _filter;
@@ -1352,7 +1352,7 @@ public:
                     "<_item value=\"normal\">" N_("Normal") "</_item>\n"
                     "<_item value=\"enhue\">" N_("Enhance hue") "</_item>\n"
                     "<_item value=\"phospho\">" N_("Phosphorescence") "</_item>\n"
-                    "<_item value=\"phosphoB\">" N_("Phosphorescence B") "</_item>\n"
+                    "<_item value=\"phosphoB\">" N_("Colored nights") "</_item>\n"
                     "<_item value=\"htb\">" N_("Hue to background") "</_item>\n"
                   "</param>\n"
                   "<param name=\"globalblend\" gui-text=\"" N_("Global blend:") "\" type=\"enum\">\n"
@@ -1472,7 +1472,7 @@ Tritone::get_filter_text (Inkscape::Extension::Extension * ext)
           "<feFlood flood-opacity=\"%s\" flood-color=\"rgb(%s,%s,%s)\" result=\"flood\" />\n"
           "<feComposite in=\"colormatrix5\" in2=\"%s\" operator=\"arithmetic\" k1=\"1\" result=\"composite1\" />\n"
           "<feGaussianBlur stdDeviation=\"%s\" result=\"blur\" />\n"
-          "<feBlend in2=\"%s\" blend=\"normal\" mode=\"%s\" result=\"blend6\" />\n"
+          "<feBlend in2=\"%s\" mode=\"%s\" result=\"blend6\" />\n"
           "<feComposite in=\"%s\" in2=\"%s\" operator=\"arithmetic\" k1=\"%s\" k2=\"1\" k3=\"%s\" k4=\"0\" result=\"composite2\" />\n"
           "<feComposite in2=\"SourceGraphic\" operator=\"in\" result=\"composite3\" />\n"
         "</filter>\n", dist.str().c_str(), globalblend.str().c_str(),
diff --git a/src/extension/internal/filter/morphology.h b/src/extension/internal/filter/morphology.h
index d893ae635..2f5c3ecc8 100644
--- a/src/extension/internal/filter/morphology.h
+++ b/src/extension/internal/filter/morphology.h
@@ -184,7 +184,7 @@ Outline::get_filter_text (Inkscape::Extension::Extension * ext)
           "<feColorMatrix values=\"1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 %s %s \" result=\"color2\" />\n"
           "<feFlood flood-opacity=\"%s\" flood-color=\"rgb(%s,%s,%s)\" result=\"flood\" />\n"
           "<feComposite in=\"flood\" in2=\"color2\" operator=\"in\" result=\"composite\" />\n"
-          "<feBlend in=\"SourceGraphic\" in2=\"composite\" mode=\"normal\" blend=\"normal\" />\n"
+          "<feBlend in=\"SourceGraphic\" in2=\"composite\" mode=\"normal\" />\n"
         "</filter>\n", width.str().c_str(), melt.str().c_str(), dilat.str().c_str(), erosion.str().c_str(), a.str().c_str(), r.str().c_str(), g.str().c_str(), b.str().c_str());
 
     return _filter;
diff --git a/src/extension/internal/filter/paint.h b/src/extension/internal/filter/paint.h
index b22eeb889..fec2f8356 100644
--- a/src/extension/internal/filter/paint.h
+++ b/src/extension/internal/filter/paint.h
@@ -186,12 +186,12 @@ Chromolitho::get_filter_text (Inkscape::Extension::Extension * ext)
         "<filter xmlns:inkscape=\"http://www.inkscape.org/namespaces/inkscape\" color-interpolation-filters=\"sRGB\" height=\"1\" width=\"1\" y=\"0\" x=\"0\" inkscape:label=\"Chromolitho\">\n"
           "<feComposite in=\"SourceGraphic\" in2=\"SourceGraphic\" operator=\"arithmetic\" k1=\"%s\" k2=\"1\" result=\"composite1\" />\n"
           "<feConvolveMatrix in=\"composite1\" kernelMatrix=\"0 250 0 250 %s 250 0 250 0 \" order=\"3 3\" result=\"convolve1\" />\n"
-          "<feBlend in=\"%s\" in2=\"composite1\" mode=\"%s\" blend=\"normal\" result=\"blend1\" />\n"
+          "<feBlend in=\"%s\" in2=\"composite1\" mode=\"%s\" result=\"blend1\" />\n"
           "<feGaussianBlur in=\"blend1\" stdDeviation=\"%s\" result=\"blur1\" />\n"
           "<feTurbulence baseFrequency=\"%s %s\" numOctaves=\"%s\" seed=\"%s\" type=\"fractalNoise\" result=\"turbulence1\" />\n"
           "<feColorMatrix values=\"1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 %s %s \" result=\"colormatrix1\" />\n"
           "<feColorMatrix type=\"saturate\" values=\"%s\" result=\"colormatrix2\" />\n"
-          "<feBlend in=\"%s\" in2=\"blur1\" blend=\"normal\" mode=\"%s\" result=\"blend2\" />\n"
+          "<feBlend in=\"%s\" in2=\"blur1\" mode=\"%s\" result=\"blend2\" />\n"
           "<feColorMatrix in=\"blend2\" type=\"saturate\" values=\"%s\" result=\"colormatrix3\" />\n"
           "<feComponentTransfer in=\"colormatrix3\" result=\"component1\">\n"
             "<feFuncR type=\"discrete\" tableValues=\"%s\" />\n"
@@ -284,7 +284,7 @@ CrossEngraving::get_filter_text (Inkscape::Extension::Extension * ext)
           "<feGaussianBlur in=\"composite2\" stdDeviation=\"0.01 %s\" result=\"blur2\" />\n"
           "<feComposite in=\"blur2\" in2=\"blur1\" k3=\"1\" k2=\"1\" operator=\"arithmetic\" result=\"composite3\" />\n"
           "<feFlood flood-color=\"rgb(255,255,255)\" flood-opacity=\"1\" result=\"flood\" />\n"
-          "<feBlend in=\"flood\" in2=\"composite3\" blend=\"normal\" mode=\"multiply\" result=\"blend\" />\n"
+          "<feBlend in=\"flood\" in2=\"composite3\" mode=\"multiply\" result=\"blend\" />\n"
           "<feComposite in=\"%s\" in2=\"SourceGraphic\" operator=\"in\" result=\"composite4\" />\n"
         "</filter>\n", clean.str().c_str(), dilat.str().c_str(), erosion.str().c_str(), strength.str().c_str(), length.str().c_str(), length.str().c_str(), trans.str().c_str());
 
@@ -442,7 +442,7 @@ Drawing::get_filter_text (Inkscape::Extension::Extension * ext)
         "<feGaussianBlur stdDeviation=\"%s\" result=\"blur2\" />\n"
         "<feColorMatrix values=\"1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 %s %s \" result=\"color2\" />\n"
         "<feFlood flood-color=\"rgb(255,255,255)\" result=\"flood1\" />\n"
-        "<feBlend in2=\"color2\" mode=\"multiply\" blend=\"normal\" result=\"blend1\" />\n"
+        "<feBlend in2=\"color2\" mode=\"multiply\" result=\"blend1\" />\n"
         "<feComponentTransfer in=\"blend1\" result=\"component1\">\n"
           "<feFuncR type=\"discrete\" tableValues=\"0 1 1 1\" />\n"
           "<feFuncG type=\"discrete\" tableValues=\"0 1 1 1\" />\n"
@@ -639,7 +639,7 @@ NeonDraw::get_filter_text (Inkscape::Extension::Extension * ext)
 
     _filter = g_strdup_printf(
         "<filter xmlns:inkscape=\"http://www.inkscape.org/namespaces/inkscape\" color-interpolation-filters=\"sRGB\" height=\"1\" width=\"1\" y=\"0\" x=\"0\" inkscape:label=\"Neon Draw\">\n"
-          "<feBlend blend=\"normal\" mode=\"%s\" result=\"blend\" />\n"
+          "<feBlend mode=\"%s\" result=\"blend\" />\n"
           "<feGaussianBlur in=\"blend\" stdDeviation=\"%s\" result=\"blur1\" />\n"
           "<feComponentTransfer result=\"component1\">\n"
             "<feFuncR type=\"discrete\" tableValues=\"0 0.3 0.6 1 1\" />\n"
@@ -806,7 +806,7 @@ PointEngraving::get_filter_text (Inkscape::Extension::Extension * ext)
     _filter = g_strdup_printf(
         "<filter xmlns:inkscape=\"http://www.inkscape.org/namespaces/inkscape\" inkscape:label=\"Point Engraving\" x=\"0\" y=\"0\" width=\"1\" height=\"1\" color-interpolation-filters=\"sRGB\">\n"
           "<feConvolveMatrix in=\"SourceGraphic\" kernelMatrix=\"0 250 0 250 %s 250 0 250 0\" order=\"3 3\" result=\"convolve\" />\n"
-          "<feBlend in=\"convolve\" in2=\"SourceGraphic\" mode=\"%s\" blend=\"normal\" result=\"blend\" />\n"
+          "<feBlend in=\"convolve\" in2=\"SourceGraphic\" mode=\"%s\" result=\"blend\" />\n"
           "<feTurbulence type=\"%s\" baseFrequency=\"%s %s\" numOctaves=\"%s\" seed=\"%s\" result=\"turbulence\" />\n"
           "<feColorMatrix in=\"blend\" type=\"luminanceToAlpha\" result=\"colormatrix1\" />\n"
           "<feComposite in=\"turbulence\" in2=\"colormatrix1\" k1=\"%s\" k2=\"%s\" k4=\"%s\" operator=\"arithmetic\" result=\"composite1\" />\n"
diff --git a/src/extension/internal/filter/transparency.h b/src/extension/internal/filter/transparency.h
index 696c65b48..989df0131 100644
--- a/src/extension/internal/filter/transparency.h
+++ b/src/extension/internal/filter/transparency.h
@@ -90,7 +90,7 @@ Blend::get_filter_text (Inkscape::Extension::Extension * ext)
 
     _filter = g_strdup_printf(
         "<filter xmlns:inkscape=\"http://www.inkscape.org/namespaces/inkscape\" color-interpolation-filters=\"sRGB\" inkscape:label=\"Blend\">\n"
-          "<feBlend blend=\"normal\" in2=\"%s\" mode=\"%s\" result=\"blend\" />\n"
+          "<feBlend in2=\"%s\" mode=\"%s\" result=\"blend\" />\n"
         "</filter>\n", source.str().c_str(), mode.str().c_str() );
 
     return _filter;
@@ -308,7 +308,7 @@ Opacity::get_filter_text (Inkscape::Extension::Extension * ext)
            << (-ext->get_param_float("erode"));
 
     _filter = g_strdup_printf(
-        "<filter xmlns:inkscape=\"http://www.inkscape.org/namespaces/inkscape\" inkscape:label=\"Opacity\" height=\"1\" width=\"1\" y=\"0\" x=\"0\" color-interpolation-filters=\"sRGB\" >\n"
+        "<filter xmlns:inkscape=\"http://www.inkscape.org/namespaces/inkscape\" inkscape:label=\"Opacity\" color-interpolation-filters=\"sRGB\" >\n"
           "<feColorMatrix values=\"1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 %s \" result=\"colormatrix\" />\n"
           "<feComposite in2=\"colormatrix\" operator=\"arithmetic\" k2=\"%s\" result=\"composite\" />\n"
         "</filter>\n", matrix.str().c_str(), opacity.str().c_str());