Code

Filters. New custom predefined filters (all ABCs, Neon draw, Color shilf, Silhouette...
[inkscape.git] / src / extension / internal / filter / experimental.h
index acd258805a381183bacf1e5869c43420714a7145..0375f008d0a1a013bf6e40383b55c356ac41f277 100755 (executable)
@@ -9,7 +9,9 @@
  *
  * Experimental filters (no assigned menu)
  *   Chromolitho
+ *   Cross engraving
  *   Drawing
+ *   Neon draw
  *   Posterize
  *   Posterize basic
  *
@@ -55,70 +57,70 @@ namespace Filter {
 */
 class Chromolitho : public Inkscape::Extension::Internal::Filter::Filter {
 protected:
-       virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+    virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
 
 public:
-       Chromolitho ( ) : Filter() { };
-       virtual ~Chromolitho ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
-
-       static void init (void) {
-               Inkscape::Extension::build_from_mem(
-                       "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
-                               "<name>" N_("Chromolitho, custom") "</name>\n"
-                               "<id>org.inkscape.effect.filter.Chromolitho</id>\n"
-                   "<param name=\"tab\" type=\"notebook\">\n"
-                    "<page name=\"optionstab\" _gui-text=\"Options\">\n"
-                        "<param name=\"drawing\" gui-text=\"" N_("Drawing mode") "\" type=\"boolean\" >true</param>\n"
-                        "<param name=\"dblend\" gui-text=\"" N_("Drawing blend:") "\" type=\"enum\">\n"
-                            "<_item value=\"darken\">Darken</_item>\n"
-                            "<_item value=\"normal\">Normal</_item>\n"
-                            "<_item value=\"multiply\">Multiply</_item>\n"
-                            "<_item value=\"screen\">Screen</_item>\n"
-                            "<_item value=\"lighten\">Lighten</_item>\n"
-                        "</param>\n"
-                        "<param name=\"transparent\" gui-text=\"" N_("Transparent") "\" type=\"boolean\" >false</param>\n"
-                        "<param name=\"dented\" gui-text=\"" N_("Dented") "\" type=\"boolean\" >false</param>\n"
-                        "<param name=\"inverted\" gui-text=\"" N_("Inverted") "\" type=\"boolean\" >false</param>\n"
-                        "<param name=\"light\" gui-text=\"" N_("Lightness:") "\" type=\"float\" min=\"0\" max=\"10\">0</param>\n"
-                        "<param name=\"saturation\" gui-text=\"" N_("Saturation:") "\" type=\"float\" min=\"0\" max=\"1\">1</param>\n"
-                        "<param name=\"noise\" gui-text=\"" N_("Noise reduction:") "\" type=\"int\" min=\"1\" max=\"1000\">10</param>\n"
-                        "<param name=\"smooth\" gui-text=\"" N_("Smoothness:") "\" type=\"float\" min=\"0.01\" max=\"10\">1</param>\n"
-                    "</page>\n"
-                    "<page name=\"graintab\" _gui-text=\"Grain\">\n"
-                        "<param name=\"grain\" gui-text=\"" N_("Grain mode") "\" type=\"boolean\" >true</param>\n"
-                        "<param name=\"grainxf\" gui-text=\"" N_("X frequency:") "\" type=\"float\" min=\"0\" max=\"100\">100</param>\n"
-                        "<param name=\"grainyf\" gui-text=\"" N_("Y frequency:") "\" type=\"float\" min=\"0\" max=\"100\">100</param>\n"
-                        "<param name=\"grainc\" gui-text=\"" N_("Complexity:") "\" type=\"int\" min=\"1\" max=\"5\">1</param>\n"
-                        "<param name=\"grainv\" gui-text=\"" N_("Variation:") "\" type=\"int\" min=\"0\" max=\"1000\">0</param>\n"
-                        "<param name=\"grainexp\" gui-text=\"" N_("Expansion:") "\" type=\"float\" min=\"1\" max=\"50\">1</param>\n"
-                        "<param name=\"grainero\" gui-text=\"" N_("Erosion:") "\" type=\"float\" min=\"0\" max=\"40\">0</param>\n"
-                        "<param name=\"graincol\" gui-text=\"" N_("Color") "\" type=\"boolean\" >true</param>\n"
-                        "<param name=\"gblend\" gui-text=\"" N_("Grain blend:") "\" type=\"enum\">\n"
-                            "<_item value=\"normal\">Normal</_item>\n"
-                            "<_item value=\"multiply\">Multiply</_item>\n"
-                            "<_item value=\"screen\">Screen</_item>\n"
-                            "<_item value=\"lighten\">Lighten</_item>\n"
-                            "<_item value=\"darken\">Darken</_item>\n"
-                        "</param>\n"
-                    "</page>\n"
-                "</param>\n"
-                               "<effect>\n"
-                                       "<object-type>all</object-type>\n"
-                                       "<effects-menu>\n"
-                                               "<submenu name=\"" N_("Filters") "\">\n"
-                                               "<submenu name=\"" N_("Experimental") "\"/>\n"
-                             "</submenu>\n"
-                                       "</effects-menu>\n"
-                                       "<menu-tip>" N_("Chromo effect with customizable edge drawing and graininess") "</menu-tip>\n"
-                               "</effect>\n"
-                       "</inkscape-extension>\n", new Chromolitho());
-       };
+    Chromolitho ( ) : Filter() { };
+    virtual ~Chromolitho ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+
+    static void init (void) {
+        Inkscape::Extension::build_from_mem(
+            "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
+              "<name>" N_("Chromolitho, custom") "</name>\n"
+              "<id>org.inkscape.effect.filter.Chromolitho</id>\n"
+              "<param name=\"tab\" type=\"notebook\">\n"
+                "<page name=\"optionstab\" _gui-text=\"Options\">\n"
+                  "<param name=\"drawing\" gui-text=\"" N_("Drawing mode") "\" type=\"boolean\" >true</param>\n"
+                  "<param name=\"dblend\" gui-text=\"" N_("Drawing blend:") "\" type=\"enum\">\n"
+                    "<_item value=\"darken\">Darken</_item>\n"
+                    "<_item value=\"normal\">Normal</_item>\n"
+                    "<_item value=\"multiply\">Multiply</_item>\n"
+                    "<_item value=\"screen\">Screen</_item>\n"
+                    "<_item value=\"lighten\">Lighten</_item>\n"
+                  "</param>\n"
+                  "<param name=\"transparent\" gui-text=\"" N_("Transparent") "\" type=\"boolean\" >false</param>\n"
+                  "<param name=\"dented\" gui-text=\"" N_("Dented") "\" type=\"boolean\" >false</param>\n"
+                  "<param name=\"inverted\" gui-text=\"" N_("Inverted") "\" type=\"boolean\" >false</param>\n"
+                  "<param name=\"light\" gui-text=\"" N_("Lightness:") "\" type=\"float\" min=\"0\" max=\"10\">0</param>\n"
+                  "<param name=\"saturation\" gui-text=\"" N_("Saturation:") "\" type=\"float\" min=\"0\" max=\"1\">1</param>\n"
+                  "<param name=\"noise\" gui-text=\"" N_("Noise reduction:") "\" type=\"int\" min=\"1\" max=\"1000\">10</param>\n"
+                  "<param name=\"smooth\" gui-text=\"" N_("Smoothness:") "\" type=\"float\" min=\"0.01\" max=\"10\">1</param>\n"
+                "</page>\n"
+                "<page name=\"graintab\" _gui-text=\"Grain\">\n"
+                  "<param name=\"grain\" gui-text=\"" N_("Grain mode") "\" type=\"boolean\" >true</param>\n"
+                  "<param name=\"grainxf\" gui-text=\"" N_("X frequency:") "\" type=\"float\" min=\"0\" max=\"100\">100</param>\n"
+                  "<param name=\"grainyf\" gui-text=\"" N_("Y frequency:") "\" type=\"float\" min=\"0\" max=\"100\">100</param>\n"
+                  "<param name=\"grainc\" gui-text=\"" N_("Complexity:") "\" type=\"int\" min=\"1\" max=\"5\">1</param>\n"
+                  "<param name=\"grainv\" gui-text=\"" N_("Variation:") "\" type=\"int\" min=\"0\" max=\"1000\">0</param>\n"
+                  "<param name=\"grainexp\" gui-text=\"" N_("Expansion:") "\" type=\"float\" min=\"1\" max=\"50\">1</param>\n"
+                  "<param name=\"grainero\" gui-text=\"" N_("Erosion:") "\" type=\"float\" min=\"0\" max=\"40\">0</param>\n"
+                  "<param name=\"graincol\" gui-text=\"" N_("Color") "\" type=\"boolean\" >true</param>\n"
+                  "<param name=\"gblend\" gui-text=\"" N_("Grain blend:") "\" type=\"enum\">\n"
+                    "<_item value=\"normal\">Normal</_item>\n"
+                    "<_item value=\"multiply\">Multiply</_item>\n"
+                    "<_item value=\"screen\">Screen</_item>\n"
+                    "<_item value=\"lighten\">Lighten</_item>\n"
+                    "<_item value=\"darken\">Darken</_item>\n"
+                  "</param>\n"
+                "</page>\n"
+              "</param>\n"
+              "<effect>\n"
+                "<object-type>all</object-type>\n"
+                "<effects-menu>\n"
+                  "<submenu name=\"" N_("Filters") "\">\n"
+                    "<submenu name=\"" N_("Experimental") "\"/>\n"
+                  "</submenu>\n"
+                "</effects-menu>\n"
+                "<menu-tip>" N_("Chromo effect with customizable edge drawing and graininess") "</menu-tip>\n"
+              "</effect>\n"
+            "</inkscape-extension>\n", new Chromolitho());
+    };
 };
 
 gchar const *
 Chromolitho::get_filter_text (Inkscape::Extension::Extension * ext)
 {
-       if (_filter != NULL) g_free((void *)_filter);
+    if (_filter != NULL) g_free((void *)_filter);
     
     std::ostringstream b1in;
     std::ostringstream b2in;
@@ -178,51 +180,137 @@ Chromolitho::get_filter_text (Inkscape::Extension::Extension * ext)
     else
         graincol << "0";
 
-       _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=\"Chromolitho, custom\">\n"
-        "<feComposite stdDeviation=\"1\" 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\" stdDeviation=\"1\" result=\"convolve1\" />\n"
-        "<feBlend in=\"%s\" in2=\"composite1\" mode=\"%s\" blend=\"normal\" stdDeviation=\"1\" 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\" stdDeviation=\"3\" values=\"%s\" result=\"colormatrix2\" />\n"
-        "<feBlend in=\"%s\" in2=\"blur1\" stdDeviation=\"1\" blend=\"normal\" mode=\"%s\" result=\"blend2\" />\n"
-        "<feColorMatrix in=\"blend2\" type=\"saturate\" values=\"%s\" result=\"colormatrix3\" />\n"
-        "<feComponentTransfer in=\"colormatrix3\" stdDeviation=\"2\" result=\"component1\">\n"
+    _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=\"Chromolitho, custom\">\n"
+          "<feComposite stdDeviation=\"1\" 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\" stdDeviation=\"1\" result=\"convolve1\" />\n"
+          "<feBlend in=\"%s\" in2=\"composite1\" mode=\"%s\" blend=\"normal\" stdDeviation=\"1\" 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\" stdDeviation=\"3\" values=\"%s\" result=\"colormatrix2\" />\n"
+          "<feBlend in=\"%s\" in2=\"blur1\" stdDeviation=\"1\" blend=\"normal\" mode=\"%s\" result=\"blend2\" />\n"
+          "<feColorMatrix in=\"blend2\" type=\"saturate\" values=\"%s\" result=\"colormatrix3\" />\n"
+          "<feComponentTransfer in=\"colormatrix3\" stdDeviation=\"2\" result=\"component1\">\n"
             "<feFuncR type=\"discrete\" tableValues=\"%s\" />\n"
             "<feFuncG type=\"discrete\" tableValues=\"%s\" />\n"
             "<feFuncB type=\"discrete\" tableValues=\"%s\" />\n"
-        "</feComponentTransfer>\n"
-        "<feColorMatrix 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=\"colormatrix4\" />\n"
-        "<feColorMatrix in=\"%s\" values=\"1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 15 0 \" result=\"colormatrix5\" />\n"
-        "<feComposite in2=\"SourceGraphic\" operator=\"in\" result=\"composite2\" />\n"
+          "</feComponentTransfer>\n"
+          "<feColorMatrix 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=\"colormatrix4\" />\n"
+          "<feColorMatrix in=\"%s\" values=\"1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 15 0 \" result=\"colormatrix5\" />\n"
+          "<feComposite in2=\"SourceGraphic\" operator=\"in\" result=\"composite2\" />\n"
         "</filter>\n", light.str().c_str(), noise.str().c_str(), b1in.str().c_str(), dblend.str().c_str(), smooth.str().c_str(), grainxf.str().c_str(), grainyf.str().c_str(), grainc.str().c_str(), grainv.str().c_str(), grainexp.str().c_str(), grainero.str().c_str(), graincol.str().c_str(), b2in.str().c_str(), gblend.str().c_str(), saturation.str().c_str(), transf.str().c_str(), transf.str().c_str(), transf.str().c_str(), col3in.str().c_str());
 
-       return _filter;
+    return _filter;
 }; /* Chromolitho filter */
 
+/**
+    \brief    Custom predefined Cross engraving filter.
+    
+    Convert image to an engraving made of vertical and horizontal lines
+
+    Filter's parameters:
+    * Clean-up (1->500, default 30) -> convolve1 (kernelMatrix, central value -1001->-1500, default -1030)
+    * Dilatation (1.->50., default 1) -> color2 (n-1th value)
+    * Erosion (0.->50., default 0) -> color2 (nth value 0->-50)
+    * Strength (0.->10., default 0.5) -> composite2 (k2)
+    * Length (0.5->20, default 4) -> blur1 (stdDeviation x), blur2 (stdDeviation y)
+    * Transparent (boolean, default false) -> composite 4 (in, true->composite3, false->blend)
+*/
+class CrossEngraving : public Inkscape::Extension::Internal::Filter::Filter {
+protected:
+    virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+
+public:
+    CrossEngraving ( ) : Filter() { };
+    virtual ~CrossEngraving ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+
+    static void init (void) {
+        Inkscape::Extension::build_from_mem(
+            "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
+              "<name>" N_("Cross engraving, custom") "</name>\n"
+              "<id>org.inkscape.effect.filter.CrossEngraving</id>\n"
+              "<param name=\"clean\" gui-text=\"" N_("Clean-up:") "\" type=\"int\" min=\"1\" max=\"500\">30</param>\n"
+              "<param name=\"dilat\" gui-text=\"" N_("Dilatation:") "\" type=\"float\" min=\"1\" max=\"50\">1</param>\n"
+              "<param name=\"erosion\" gui-text=\"" N_("Erosion:") "\" type=\"float\" min=\"0\" max=\"50\">0</param>\n"
+              "<param name=\"strength\" gui-text=\"" N_("Strength:") "\" type=\"float\" min=\"0.1\" max=\"10\">0.5</param>\n"
+              "<param name=\"length\" gui-text=\"" N_("Length:") "\" type=\"float\" min=\"0.5\" max=\"20\">4</param>\n"
+              "<param name=\"trans\" gui-text=\"" N_("Transparent") "\" type=\"boolean\" >false</param>\n"
+              "<effect>\n"
+                "<object-type>all</object-type>\n"
+                "<effects-menu>\n"
+                  "<submenu name=\"" N_("Filters") "\">\n"
+                    "<submenu name=\"" N_("Experimental") "\"/>\n"
+                  "</submenu>\n"
+                "</effects-menu>\n"
+                "<menu-tip>" N_("Convert image to an engraving made of vertical and horizontal lines") "</menu-tip>\n"
+              "</effect>\n"
+            "</inkscape-extension>\n", new CrossEngraving());
+    };
+};
+
+gchar const *
+CrossEngraving::get_filter_text (Inkscape::Extension::Extension * ext)
+{
+    if (_filter != NULL) g_free((void *)_filter);
+
+    std::ostringstream clean;
+    std::ostringstream dilat;
+    std::ostringstream erosion;
+    std::ostringstream strength;
+    std::ostringstream length;
+    std::ostringstream trans;
+
+    clean << (-1000 - ext->get_param_int("clean"));
+    dilat << ext->get_param_float("dilat");
+    erosion << (- ext->get_param_float("erosion"));
+    strength << ext->get_param_float("strength");
+    length << ext->get_param_float("length");
+    if (ext->get_param_bool("trans"))
+        trans << "composite3";
+    else
+        trans << "blend";
+
+    _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=\"Cross engraving, custom\">\n"
+          "<feConvolveMatrix in=\"SourceGraphic\" targetY=\"1\" targetX=\"1\" kernelMatrix=\"0 250 0 250 %s 250 0 250 0 \" order=\"3 3\" result=\"convolve\" />\n"
+          "<feComposite in=\"convolve\" in2=\"convolve\" k1=\"1\" k2=\"1\" operator=\"arithmetic\" result=\"composite1\" />\n"
+          "<feColorMatrix in=\"composite1\" values=\"0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0.2125 -0.7154 -0.0721 1 0 \" result=\"color1\" />\n"
+          "<feColorMatrix in=\"color1\" values=\"1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 %s %s \" result=\"color2\" />\n"
+          "<feComposite in=\"color2\" in2=\"color2\" operator=\"arithmetic\" k2=\"%s\" result=\"composite2\" />\n"
+          "<feGaussianBlur in=\"composite2\" stdDeviation=\"%s 0.01\" result=\"blur1\" />\n"
+          "<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"
+          "<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());
+
+    return _filter;
+}; /* CrossEngraving filter */
+
 /**
     \brief    Custom predefined Drawing filter.
     
     Convert images to duochrome drawings.
 
     Filter's parameters:
-    * Simplification (0.01->20, default 0.6) -> blur1 (stdDeviation)
-    * Lightness (1->500, default 10) -> convolve1 (kernelMatrix, central value -1001->-1500, default -1010)
-    * Fading (0.->6., default 0) -> composite1 (k4)
-    * Smoothness (0.01->20, default 0.6) -> blur2 (stdDeviation)
-    * Dilatation (1->50, default 6) -> color2 (n-1th value)
-    * Erosion (0->50, default 3) -> color2 (nth value 0->-50)
+    * Simplification strength (0.01->20, default 0.6) -> blur1 (stdDeviation)
+    * Clean-up (1->500, default 10) -> convolve1 (kernelMatrix, central value -1001->-1500, default -1010)
+    * Erase (0.->6., default 0) -> composite1 (k4)
+    * Smoothness strength (0.01->20, default 0.6) -> blur2 (stdDeviation)
+    * Dilatation (1.->50., default 6) -> color2 (n-1th value)
+    * Erosion (0.->50., default 3) -> color2 (nth value 0->-50)
     * Transluscent (boolean, default false) -> composite 8 (in, true->merge1, false->composite7)
-    * Offset (-100->100, default 0) -> offset (val)
 
-    * Blur (0.01->20., default 1.) -> blur3 (stdDeviation)
-    * Blur spread (1->50, default 6) -> color4 (n-1th value)
-    * Blur erosion (0->50, default 3) -> color4 (nth value 0->-50)
+    * Blur strength (0.01->20., default 1.) -> blur3 (stdDeviation)
+    * Blur dilatation (1.->50., default 6) -> color4 (n-1th value)
+    * Blur erosion (0.->50., default 3) -> color4 (nth value 0->-50)
 
     * Stroke color (guint, default 64,64,64,255) -> flood2 (flood-color), composite3 (k2)
     * Image on stroke (boolean, default false) -> composite2 (in="flood2" true-> in="SourceGraphic")
+    * Offset (-100->100, default 0) -> offset (val)
+
     * Fill color (guint, default 200,200,200,255) -> flood3 (flood-opacity), composite5 (k2)
     * Image on fill (boolean, default false) -> composite4 (in="flood3" true-> in="SourceGraphic")
 
@@ -230,62 +318,64 @@ Chromolitho::get_filter_text (Inkscape::Extension::Extension * ext)
 
 class Drawing : public Inkscape::Extension::Internal::Filter::Filter {
 protected:
-       virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+    virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
 
 public:
-       Drawing ( ) : Filter() { };
-       virtual ~Drawing ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
-
-       static void init (void) {
-               Inkscape::Extension::build_from_mem(
-                       "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
-                               "<name>" N_("Drawing, custom") "</name>\n"
-                               "<id>org.inkscape.effect.filter.Drawing</id>\n"
-                   "<param name=\"tab\" type=\"notebook\">\n"
-                    "<page name=\"optionstab\" _gui-text=\"Options\">\n"
-                        "<param name=\"simply\" gui-text=\"" N_("Simplification:") "\" type=\"float\" min=\"0.01\" max=\"20\">0.6</param>\n"
-                        "<param name=\"light\" gui-text=\"" N_("Lightness:") "\" type=\"int\" min=\"0\" max=\"500\">10</param>\n"
-                        "<param name=\"fade\" gui-text=\"" N_("Fading:") "\" type=\"float\" min=\"0\" max=\"60\">0</param>\n"
-                        "<param name=\"smooth\" gui-text=\"" N_("Smoothness:") "\" type=\"float\" min=\"0.01\" max=\"20\">0.6</param>\n"
-                        "<param name=\"dilat\" gui-text=\"" N_("Dilatation:") "\" type=\"float\" min=\"1\" max=\"50\">6</param>\n"
-                        "<param name=\"erosion\" gui-text=\"" N_("Erosion:") "\" type=\"float\" min=\"0\" max=\"50\">3</param>\n"
-                        "<param name=\"transluscent\" gui-text=\"" N_("Transluscent") "\" type=\"boolean\" >false</param>\n"
-                        "<_param name=\"blurheader\" type=\"groupheader\">Blur</_param>\n"
-                            "<param name=\"blur\" gui-text=\"" N_("Level:") "\" type=\"float\" min=\"0.01\" max=\"20\">1</param>\n"
-                            "<param name=\"bdilat\" gui-text=\"" N_("Dilatation:") "\" type=\"float\" min=\"1\" max=\"50\">6</param>\n"
-                            "<param name=\"berosion\" gui-text=\"" N_("Erosion:") "\" type=\"float\" min=\"0\" max=\"50\">3</param>\n"
-                    "</page>\n"
-                    "<page name=\"co11tab\" _gui-text=\"Fill color\">\n"
-                        "<param name=\"fcolor\" gui-text=\"" N_("Fill color") "\" type=\"color\">-1515870721</param>\n"
-                        "<param name=\"iof\" gui-text=\"" N_("Image on fill") "\" type=\"boolean\" >false</param>\n"
-                    "</page>\n"
-                    "<page name=\"co12tab\" _gui-text=\"Stroke color\">\n"
-                        "<param name=\"scolor\" gui-text=\"" N_("Stroke color") "\" type=\"color\">589505535</param>\n"
-                        "<param name=\"ios\" gui-text=\"" N_("Image on stroke") "\" type=\"boolean\" >false</param>\n"
-                        "<param name=\"offset\" gui-text=\"" N_("Offset:") "\" type=\"int\" min=\"-100\" max=\"100\">0</param>\n"
-                    "</page>\n"
-                "</param>\n"
-                               "<effect>\n"
-                                       "<object-type>all</object-type>\n"
-                                       "<effects-menu>\n"
-                                               "<submenu name=\"" N_("Filters") "\">\n"
-                                               "<submenu name=\"" N_("Experimental") "\"/>\n"
-                             "</submenu>\n"
-                                       "</effects-menu>\n"
-                                       "<menu-tip>" N_("Convert images to duochrome drawings") "</menu-tip>\n"
-                               "</effect>\n"
-                       "</inkscape-extension>\n", new Drawing());
-       };
+    Drawing ( ) : Filter() { };
+    virtual ~Drawing ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+
+    static void init (void) {
+        Inkscape::Extension::build_from_mem(
+            "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
+              "<name>" N_("Drawing, custom") "</name>\n"
+              "<id>org.inkscape.effect.filter.Drawing</id>\n"
+              "<param name=\"tab\" type=\"notebook\">\n"
+                "<page name=\"optionstab\" _gui-text=\"Options\">\n"
+                  "<_param name=\"simplifyheader\" type=\"groupheader\">Simplify</_param>\n"
+                  "<param name=\"simply\" gui-text=\"" N_("Strength:") "\" type=\"float\" min=\"0.01\" max=\"20\">0.6</param>\n"
+                  "<param name=\"clean\" gui-text=\"" N_("Clean-up:") "\" type=\"int\" min=\"1\" max=\"500\">10</param>\n"
+                  "<param name=\"erase\" gui-text=\"" N_("Erase:") "\" type=\"float\" min=\"0\" max=\"60\">0</param>\n"
+                  "<param name=\"transluscent\" gui-text=\"" N_("Transluscent") "\" type=\"boolean\" >false</param>\n"
+                  "<_param name=\"smoothheader\" type=\"groupheader\">Smoothness</_param>\n"
+                    "<param name=\"smooth\" gui-text=\"" N_("Strength:") "\" type=\"float\" min=\"0.01\" max=\"20\">0.6</param>\n"
+                    "<param name=\"dilat\" gui-text=\"" N_("Dilatation:") "\" type=\"float\" min=\"1\" max=\"50\">6</param>\n"
+                    "<param name=\"erosion\" gui-text=\"" N_("Erosion:") "\" type=\"float\" min=\"0\" max=\"50\">3</param>\n"
+                  "<_param name=\"meltheader\" type=\"groupheader\">Melt</_param>\n"
+                    "<param name=\"blur\" gui-text=\"" N_("Level:") "\" type=\"float\" min=\"0.01\" max=\"20\">1</param>\n"
+                    "<param name=\"bdilat\" gui-text=\"" N_("Dilatation:") "\" type=\"float\" min=\"1\" max=\"50\">6</param>\n"
+                    "<param name=\"berosion\" gui-text=\"" N_("Erosion:") "\" type=\"float\" min=\"0\" max=\"50\">3</param>\n"
+                "</page>\n"
+                "<page name=\"co11tab\" _gui-text=\"Fill color\">\n"
+                  "<param name=\"fcolor\" gui-text=\"" N_("Fill color") "\" type=\"color\">-1515870721</param>\n"
+                  "<param name=\"iof\" gui-text=\"" N_("Image on fill") "\" type=\"boolean\" >false</param>\n"
+                "</page>\n"
+                "<page name=\"co12tab\" _gui-text=\"Stroke color\">\n"
+                  "<param name=\"scolor\" gui-text=\"" N_("Stroke color") "\" type=\"color\">589505535</param>\n"
+                  "<param name=\"ios\" gui-text=\"" N_("Image on stroke") "\" type=\"boolean\" >false</param>\n"
+                  "<param name=\"offset\" gui-text=\"" N_("Offset:") "\" type=\"int\" min=\"-100\" max=\"100\">0</param>\n"
+                "</page>\n"
+              "</param>\n"
+              "<effect>\n"
+                "<object-type>all</object-type>\n"
+                "<effects-menu>\n"
+                  "<submenu name=\"" N_("Filters") "\">\n"
+                    "<submenu name=\"" N_("Experimental") "\"/>\n"
+                  "</submenu>\n"
+                "</effects-menu>\n"
+                "<menu-tip>" N_("Convert images to duochrome drawings") "</menu-tip>\n"
+              "</effect>\n"
+            "</inkscape-extension>\n", new Drawing());
+    };
 };
 
 gchar const *
 Drawing::get_filter_text (Inkscape::Extension::Extension * ext)
 {
-       if (_filter != NULL) g_free((void *)_filter);
+    if (_filter != NULL) g_free((void *)_filter);
 
     std::ostringstream simply;
-    std::ostringstream light;
-    std::ostringstream fade;
+    std::ostringstream clean;
+    std::ostringstream erase;
     std::ostringstream smooth;
     std::ostringstream dilat;
     std::ostringstream erosion;
@@ -306,8 +396,8 @@ Drawing::get_filter_text (Inkscape::Extension::Extension * ext)
     std::ostringstream iof;
 
     simply << ext->get_param_float("simply");
-    light << (-1000 - ext->get_param_int("light"));
-    fade << (ext->get_param_float("fade") / 10);
+    clean << (-1000 - ext->get_param_int("clean"));
+    erase << (ext->get_param_float("erase") / 10);
     smooth << ext->get_param_float("smooth");
     dilat << ext->get_param_float("dilat");
     erosion << (- ext->get_param_float("erosion"));
@@ -341,8 +431,8 @@ Drawing::get_filter_text (Inkscape::Extension::Extension * ext)
     else
         ios << "flood2";
     
-       _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=\"Drawing, custom\">\n"
+    _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=\"Drawing, custom\">\n"
         "<feGaussianBlur in=\"SourceGraphic\" stdDeviation=\"%s\" result=\"blur1\" />\n"
         "<feConvolveMatrix in=\"blur1\" targetX=\"1\" targetY=\"1\" order=\"3 3\" kernelMatrix=\"0 250 0 250 %s 250 0 250 0 \" result=\"convolve1\" />\n"
         "<feComposite in=\"convolve1\" in2=\"convolve1\" k1=\"1\" k2=\"1\" k4=\"%s\" operator=\"arithmetic\" stdDeviation=\"1\" result=\"composite1\" />\n"
@@ -373,72 +463,189 @@ Drawing::get_filter_text (Inkscape::Extension::Extension * ext)
         "<feComposite in=\"merge1\" in2=\"merge1\" operator=\"over\" result=\"composite6\" />\n"
         "<feComposite in=\"composite6\" in2=\"composite6\" operator=\"over\" result=\"composite7\" />\n"
         "<feComposite in=\"%s\" in2=\"SourceGraphic\" operator=\"in\" result=\"composite8\" />\n"
-        "</filter>\n", simply.str().c_str(), light.str().c_str(), fade.str().c_str(), smooth.str().c_str(), dilat.str().c_str(), erosion.str().c_str(),  blur.str().c_str(), bdilat.str().c_str(), berosion.str().c_str(), stroker.str().c_str(), strokeg.str().c_str(), strokeb.str().c_str(), ios.str().c_str(), strokea.str().c_str(), offset.str().c_str(), offset.str().c_str(), fillr.str().c_str(), fillg.str().c_str(), fillb.str().c_str(), iof.str().c_str(), filla.str().c_str(), transluscent.str().c_str());
+        "</filter>\n", simply.str().c_str(), clean.str().c_str(), erase.str().c_str(), smooth.str().c_str(), dilat.str().c_str(), erosion.str().c_str(),  blur.str().c_str(), bdilat.str().c_str(), berosion.str().c_str(), stroker.str().c_str(), strokeg.str().c_str(), strokeb.str().c_str(), ios.str().c_str(), strokea.str().c_str(), offset.str().c_str(), offset.str().c_str(), fillr.str().c_str(), fillg.str().c_str(), fillb.str().c_str(), iof.str().c_str(), filla.str().c_str(), transluscent.str().c_str());
 
-       return _filter;
+    return _filter;
 }; /* Drawing filter */
 
+
 /**
-    \brief    Custom predefined Posterize filter.
+    \brief    Custom predefined Neon draw filter.
+    
+    Posterize and draw smooth lines around color shapes
+
+    Filter's parameters:
+    * Lines type (enum, default smooth) ->
+        smooth = component1 (type="table"), component2 (type="table"), composite1 (in2="blur2")
+        hard = component1 (type="discrete"), component2 (type="discrete"), composite1 (in2="component1")
+    * Simplify (0.01->20., default 1.5) -> blur1 (stdDeviation)
+    * Line width (0.01->20., default 1.5) -> blur2 (stdDeviation)
+    * Lightness (0.->10., default 5) -> composite1 (k3)
+    * Blend (enum [normal, multiply, screen], default normal) -> blend (mode)
+    * Dark mode (boolean, default false) -> composite1 (true: in2="component2")
+*/
+class NeonDraw : public Inkscape::Extension::Internal::Filter::Filter {
+protected:
+    virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+
+public:
+    NeonDraw ( ) : Filter() { };
+    virtual ~NeonDraw ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+
+    static void init (void) {
+        Inkscape::Extension::build_from_mem(
+            "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
+              "<name>" N_("Neon draw, custom") "</name>\n"
+              "<id>org.inkscape.effect.filter.NeonDraw</id>\n"
+              "<param name=\"type\" gui-text=\"" N_("Line type:") "\" type=\"enum\">\n"
+                "<_item value=\"smooth\">Smoothed</_item>\n"
+                "<_item value=\"hard\">Contrasted</_item>\n"
+              "</param>\n"
+              "<param name=\"simply\" gui-text=\"" N_("Simplify:") "\" type=\"float\" min=\"0.01\" max=\"20.0\">1.5</param>\n"
+              "<param name=\"width\" gui-text=\"" N_("Line width:") "\" type=\"float\" min=\"0.01\" max=\"20.0\">1.5</param>\n"
+              "<param name=\"lightness\" gui-text=\"" N_("Lightness:") "\" type=\"float\" min=\"0.\" max=\"10.0\">5</param>\n"
+              "<param name=\"blend\" gui-text=\"" N_("Blend mode:") "\" type=\"enum\">\n"
+                "<_item value=\"normal\">Normal</_item>\n"
+                "<_item value=\"multiply\">Multiply</_item>\n"
+                "<_item value=\"screen\">Screen</_item>\n"
+              "</param>\n"
+              "<param name=\"dark\" gui-text=\"" N_("Dark mode") "\" type=\"boolean\" >false</param>\n"
+              "<effect>\n"
+                "<object-type>all</object-type>\n"
+                "<effects-menu>\n"
+                  "<submenu name=\"" N_("Filters") "\">\n"
+                    "<submenu name=\"" N_("Experimental") "\"/>\n"
+                  "</submenu>\n"
+                "</effects-menu>\n"
+                "<menu-tip>" N_("Posterize and draw smooth lines around color shapes") "</menu-tip>\n"
+              "</effect>\n"
+            "</inkscape-extension>\n", new NeonDraw());
+    };
+};
+
+gchar const *
+NeonDraw::get_filter_text (Inkscape::Extension::Extension * ext)
+{
+    if (_filter != NULL) g_free((void *)_filter);
+
+    std::ostringstream blend;
+    std::ostringstream simply;
+    std::ostringstream width;
+    std::ostringstream lightness;
+    std::ostringstream type1;
+    std::ostringstream type2;
+    std::ostringstream dark;
+
+    const gchar *type = ext->get_param_enum("type");
+    if ((g_ascii_strcasecmp("smooth", type) == 0)) {
+        type1 << "table";
+        type2 << "table";
+    } else {
+        type1 << "discrete";
+        type2 << "discrete"; 
+    }
+
+    blend << ext->get_param_enum("blend");
+    simply << ext->get_param_float("simply");
+    width << ext->get_param_float("width");
+    lightness << ext->get_param_float("lightness");
+
+    if (ext->get_param_bool("dark"))
+        dark << "component2";
+    else if ((g_ascii_strcasecmp("smooth", type) == 0))
+        dark << "blur2";
+    else
+        dark << "component1";
+
+    _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, custom\">\n"
+          "<feBlend blend=\"normal\" mode=\"%s\" result=\"blend\" />\n"
+          "<feGaussianBlur in=\"blend\" stdDeviation=\"%s\" result=\"blur1\" />\n"
+          "<feComponentTransfer result=\"component1\">\n"
+            "<feFuncR type=\"%s\" tableValues=\"0 0.3 0.6 1 1\" />\n"
+            "<feFuncG type=\"%s\" tableValues=\"0 0.3 0.6 1 1\" />\n"
+            "<feFuncB type=\"%s\" tableValues=\"0 0.3 0.6 1 1\" />\n"
+          "</feComponentTransfer>\n"
+          "<feGaussianBlur in=\"component1\" stdDeviation=\"%s\" result=\"blur2\" />\n"
+          "<feComponentTransfer in=\"blur2\" result=\"component2\">\n"
+            "<feFuncR type=\"%s\" tableValues=\"0 1 0 1 0 1 0 1\" />\n"
+            "<feFuncG type=\"%s\" tableValues=\"0 1 0 1 0 1 0 1\" />\n"
+            "<feFuncB type=\"%s\" tableValues=\"0 1 0 1 0 1 0 1\" />\n"
+          "</feComponentTransfer>\n"
+          "<feComposite in=\"component2\" in2=\"%s\" k3=\"%s\" operator=\"arithmetic\" k2=\"1\" result=\"composite1\" />\n"
+          "<feComposite in=\"composite1\" in2=\"SourceGraphic\" operator=\"in\" result=\"composite2\" />\n"
+        "</filter>\n", blend.str().c_str(), simply.str().c_str(), type1.str().c_str(), type1.str().c_str(), type1.str().c_str(), width.str().c_str(), type2.str().c_str(), type2.str().c_str(), type2.str().c_str(), dark.str().c_str(), lightness.str().c_str());
+
+    return _filter;
+}; /* NeonDraw filter */
+
+/**
+    \brief    Custom predefined Poster paint filter.
     
     Poster and painting effects.
 
-    Filter's parameters (not finished yet):
+    Filter's parameters:
     * Effect type (enum, default "Normal") ->
         Normal = feComponentTransfer
         Dented = Normal + intermediate values
-    * Blur (0.01->10., default 5.) -> blur3 (stdDeviation)
-
+    * Transfer type (enum, default "descrete") -> component (type)
+    * Levels (1->15, default 5) -> component (tableValues)
+    * Blend mode (enum, default "Lighten") -> blend (mode)
+    * Primary blur (0.01->100., default 4.) -> blur1 (stdDeviation)
+    * Secondary blur (0.01->100., default 0.5) -> blur2 (stdDeviation)
+    * Pre-saturation (0.->1., default 1.) -> color1 (values)
+    * Post-saturation (0.->1., default 1.) -> color2 (values)
+    * Simulate antialiasing (boolean, default false) -> blur3 (true->stdDeviation=0.5, false->stdDeviation=0.01)
 */
 class Posterize : public Inkscape::Extension::Internal::Filter::Filter {
 protected:
-       virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+    virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
 
 public:
-       Posterize ( ) : Filter() { };
-       virtual ~Posterize ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
-
-       static void init (void) {
-               Inkscape::Extension::build_from_mem(
-                       "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
-                               "<name>" N_("Poster and painting, custom") "</name>\n"
-                               "<id>org.inkscape.effect.filter.Posterize</id>\n"
-                "<param name=\"type\" gui-text=\"" N_("Effect type:") "\" type=\"enum\">\n"
-                    "<_item value=\"normal\">Normal</_item>\n"
-                    "<_item value=\"dented\">Dented</_item>\n"
-                "</param>\n"
-                "<param name=\"table\" gui-text=\"" N_("Transfer type:") "\" type=\"enum\">\n"
-                    "<_item value=\"discrete\">Poster</_item>\n"
-                    "<_item value=\"table\">Painting</_item>\n"
-                "</param>\n"
-                "<param name=\"levels\" gui-text=\"" N_("Levels:") "\" type=\"int\" min=\"1\" max=\"15\">5</param>\n"
-                "<param name=\"blend\" gui-text=\"" N_("Blend mode:") "\" type=\"enum\">\n"
-                    "<_item value=\"lighten\">Lighten</_item>\n"
-                    "<_item value=\"normal\">Normal</_item>\n"
-                    "<_item value=\"darken\">Darken</_item>\n"
-                "</param>\n"
-                "<param name=\"blur1\" gui-text=\"" N_("Primary blur:") "\" type=\"float\" min=\"0.01\" max=\"100.0\">4.0</param>\n"
-                "<param name=\"blur2\" gui-text=\"" N_("Secondary blur:") "\" type=\"float\" min=\"0.01\" max=\"100.0\">0.5</param>\n"
-                "<param name=\"presaturation\" gui-text=\"" N_("Pre-saturation:") "\" type=\"float\" min=\"0.00\" max=\"1.00\">1.00</param>\n"
-                "<param name=\"postsaturation\" gui-text=\"" N_("Post-saturation:") "\" type=\"float\" min=\"0.00\" max=\"1.00\">1.00</param>\n"
-                "<param name=\"antialiasing\" gui-text=\"" N_("Simulate antialiasing") "\" type=\"boolean\">false</param>\n"
-                               "<effect>\n"
-                                       "<object-type>all</object-type>\n"
-                                       "<effects-menu>\n"
-                                               "<submenu name=\"" N_("Filters") "\">\n"
-                                               "<submenu name=\"" N_("Experimental") "\"/>\n"
-                             "</submenu>\n"
-                                       "</effects-menu>\n"
-                                       "<menu-tip>" N_("Poster and painting effects") "</menu-tip>\n"
-                               "</effect>\n"
-                       "</inkscape-extension>\n", new Posterize());
-       };
+    Posterize ( ) : Filter() { };
+    virtual ~Posterize ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+
+    static void init (void) {
+        Inkscape::Extension::build_from_mem(
+            "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
+              "<name>" N_("Poster paint, custom") "</name>\n"
+              "<id>org.inkscape.effect.filter.Posterize</id>\n"
+              "<param name=\"type\" gui-text=\"" N_("Effect type:") "\" type=\"enum\">\n"
+                "<_item value=\"normal\">Normal</_item>\n"
+                "<_item value=\"dented\">Dented</_item>\n"
+              "</param>\n"
+              "<param name=\"table\" gui-text=\"" N_("Transfer type:") "\" type=\"enum\">\n"
+                "<_item value=\"discrete\">Poster</_item>\n"
+                "<_item value=\"table\">Painting</_item>\n"
+              "</param>\n"
+              "<param name=\"levels\" gui-text=\"" N_("Levels:") "\" type=\"int\" min=\"1\" max=\"15\">5</param>\n"
+              "<param name=\"blend\" gui-text=\"" N_("Blend mode:") "\" type=\"enum\">\n"
+                "<_item value=\"lighten\">Lighten</_item>\n"
+                "<_item value=\"normal\">Normal</_item>\n"
+                "<_item value=\"darken\">Darken</_item>\n"
+              "</param>\n"
+              "<param name=\"blur1\" gui-text=\"" N_("Primary blur:") "\" type=\"float\" min=\"0.01\" max=\"100.0\">4.0</param>\n"
+              "<param name=\"blur2\" gui-text=\"" N_("Secondary blur:") "\" type=\"float\" min=\"0.01\" max=\"100.0\">0.5</param>\n"
+              "<param name=\"presaturation\" gui-text=\"" N_("Pre-saturation:") "\" type=\"float\" min=\"0.00\" max=\"1.00\">1.00</param>\n"
+              "<param name=\"postsaturation\" gui-text=\"" N_("Post-saturation:") "\" type=\"float\" min=\"0.00\" max=\"1.00\">1.00</param>\n"
+              "<param name=\"antialiasing\" gui-text=\"" N_("Simulate antialiasing") "\" type=\"boolean\">false</param>\n"
+              "<effect>\n"
+                "<object-type>all</object-type>\n"
+                "<effects-menu>\n"
+                  "<submenu name=\"" N_("Filters") "\">\n"
+                    "<submenu name=\"" N_("Experimental") "\"/>\n"
+                  "</submenu>\n"
+                "</effects-menu>\n"
+                "<menu-tip>" N_("Poster and painting effects") "</menu-tip>\n"
+              "</effect>\n"
+            "</inkscape-extension>\n", new Posterize());
+    };
 };
 
 gchar const *
 Posterize::get_filter_text (Inkscape::Extension::Extension * ext)
 {
-       if (_filter != NULL) g_free((void *)_filter);
+    if (_filter != NULL) g_free((void *)_filter);
 
     std::ostringstream table;
     std::ostringstream blendmode;
@@ -475,28 +682,28 @@ Posterize::get_filter_text (Inkscape::Extension::Extension * ext)
     else
         antialias << "0.01";
     
-       _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=\"Poster and painting, custom\">\n"
-            "<feComposite result=\"Composite1\" operator=\"arithmetic\" k2=\"1\" />\n"
-            "<feGaussianBlur stdDeviation=\"%s\" result=\"Gaussian1\" />\n"
-            "<feGaussianBlur stdDeviation=\"%s\" in=\"Composite1\" />\n"
-            "<feBlend in2=\"Gaussian1\" mode=\"%s\" />\n"
-            "<feColorMatrix type=\"saturate\" values=\"%s\" />\n"
-            "<feComponentTransfer>\n"
-                "<feFuncR type=\"%s\" tableValues=\"%s\" />\n"
-                "<feFuncG type=\"%s\" tableValues=\"%s\" />\n"
-                "<feFuncB type=\"%s\" tableValues=\"%s\" />\n"
-            "</feComponentTransfer>\n"
-            "<feColorMatrix type=\"saturate\" values=\"%s\" />\n"
-            "<feGaussianBlur stdDeviation=\"%s\" />\n"
-            "<feComposite in2=\"SourceGraphic\" operator=\"in\" />\n"
+    _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=\"Poster paint, custom\">\n"
+          "<feComposite operator=\"arithmetic\" k2=\"1\" result=\"composite1\" />\n"
+          "<feGaussianBlur stdDeviation=\"%s\" result=\"blur1\" />\n"
+          "<feGaussianBlur in=\"composite1\" stdDeviation=\"%s\" result=\"blur2\" />\n"
+          "<feBlend in2=\"blur1\" mode=\"%s\" result=\"blend\"/>\n"
+          "<feColorMatrix type=\"saturate\" values=\"%s\" result=\"color1\" />\n"
+          "<feComponentTransfer result=\"component\">\n"
+            "<feFuncR type=\"%s\" tableValues=\"%s\" />\n"
+            "<feFuncG type=\"%s\" tableValues=\"%s\" />\n"
+            "<feFuncB type=\"%s\" tableValues=\"%s\" />\n"
+          "</feComponentTransfer>\n"
+          "<feColorMatrix type=\"saturate\" values=\"%s\" result=\"color2\" />\n"
+          "<feGaussianBlur stdDeviation=\"%s\" result=\"blur3\" />\n"
+          "<feComposite in2=\"SourceGraphic\" operator=\"in\" result=\"composite3\" />\n"
         "</filter>\n", blur1.str().c_str(), blur2.str().c_str(), blendmode.str().c_str(), presat.str().c_str(), table.str().c_str(), transf.str().c_str(), table.str().c_str(), transf.str().c_str(), table.str().c_str(), transf.str().c_str(), postsat.str().c_str(), antialias.str().c_str());
 
-       return _filter;
+    return _filter;
 }; /* Posterize filter */
 
 /**
-    \brief    Custom predefined PosterizeBasic filter.
+    \brief    Custom predefined Posterize basic filter.
     
     Simple posterizing effect
 
@@ -506,36 +713,36 @@ Posterize::get_filter_text (Inkscape::Extension::Extension * ext)
 */
 class PosterizeBasic : public Inkscape::Extension::Internal::Filter::Filter {
 protected:
-       virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+    virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
 
 public:
-       PosterizeBasic ( ) : Filter() { };
-       virtual ~PosterizeBasic ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
-
-       static void init (void) {
-               Inkscape::Extension::build_from_mem(
-                       "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
-                               "<name>" N_("Posterize basic, custom") "</name>\n"
-                               "<id>org.inkscape.effect.filter.PosterizeBasic</id>\n"
-                "<param name=\"levels\" gui-text=\"" N_("Levels:") "\" type=\"int\" min=\"1\" max=\"20\">5</param>\n"
-                "<param name=\"blur\" gui-text=\"" N_("Blur:") "\" type=\"float\" min=\"0.01\" max=\"20.0\">4.0</param>\n"
-                               "<effect>\n"
-                                       "<object-type>all</object-type>\n"
-                                       "<effects-menu>\n"
-                                               "<submenu name=\"" N_("Filters") "\">\n"
-                                               "<submenu name=\"" N_("Experimental") "\"/>\n"
-                             "</submenu>\n"
-                                       "</effects-menu>\n"
-                                       "<menu-tip>" N_("Simple posterizing effect") "</menu-tip>\n"
-                               "</effect>\n"
-                       "</inkscape-extension>\n", new PosterizeBasic());
-       };
+    PosterizeBasic ( ) : Filter() { };
+    virtual ~PosterizeBasic ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+
+    static void init (void) {
+        Inkscape::Extension::build_from_mem(
+            "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
+              "<name>" N_("Posterize basic, custom") "</name>\n"
+              "<id>org.inkscape.effect.filter.PosterizeBasic</id>\n"
+              "<param name=\"levels\" gui-text=\"" N_("Levels:") "\" type=\"int\" min=\"1\" max=\"20\">5</param>\n"
+              "<param name=\"blur\" gui-text=\"" N_("Blur:") "\" type=\"float\" min=\"0.01\" max=\"20.0\">4.0</param>\n"
+              "<effect>\n"
+                "<object-type>all</object-type>\n"
+                "<effects-menu>\n"
+                  "<submenu name=\"" N_("Filters") "\">\n"
+                    "<submenu name=\"" N_("Experimental") "\"/>\n"
+                  "</submenu>\n"
+                "</effects-menu>\n"
+                "<menu-tip>" N_("Simple posterizing effect") "</menu-tip>\n"
+              "</effect>\n"
+            "</inkscape-extension>\n", new PosterizeBasic());
+    };
 };
 
 gchar const *
 PosterizeBasic::get_filter_text (Inkscape::Extension::Extension * ext)
 {
-       if (_filter != NULL) g_free((void *)_filter);
+    if (_filter != NULL) g_free((void *)_filter);
 
     std::ostringstream blur;
     std::ostringstream transf;
@@ -551,18 +758,18 @@ PosterizeBasic::get_filter_text (Inkscape::Extension::Extension * ext)
     }
     transf << " 1";
 
-       _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=\"Posterize basic, custom\">\n"
-            "<feGaussianBlur stdDeviation=\"%s\" result=\"blur1\" />\n"
-            "<feComponentTransfer stdDeviation=\"2\" in=\"blur1\" result=\"component1\">\n"
-                "<feFuncR type=\"discrete\" tableValues=\"%s\" />\n"
-                "<feFuncG type=\"discrete\" tableValues=\"%s\" />\n"
-                "<feFuncB type=\"discrete\" tableValues=\"%s\" />\n"
-            "</feComponentTransfer>\n"
-            "<feComposite in=\"component1\" in2=\"SourceGraphic\" operator=\"in\" />\n"
+    _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=\"Posterize basic, custom\">\n"
+          "<feGaussianBlur stdDeviation=\"%s\" result=\"blur1\" />\n"
+          "<feComponentTransfer stdDeviation=\"2\" in=\"blur1\" result=\"component1\">\n"
+            "<feFuncR type=\"discrete\" tableValues=\"%s\" />\n"
+            "<feFuncG type=\"discrete\" tableValues=\"%s\" />\n"
+            "<feFuncB type=\"discrete\" tableValues=\"%s\" />\n"
+          "</feComponentTransfer>\n"
+          "<feComposite in=\"component1\" in2=\"SourceGraphic\" operator=\"in\" />\n"
         "</filter>\n", blur.str().c_str(), transf.str().c_str(), transf.str().c_str(), transf.str().c_str());
 
-       return _filter;
+    return _filter;
 }; /* PosterizeBasic filter */
 
 }; /* namespace Filter */
@@ -570,5 +777,5 @@ PosterizeBasic::get_filter_text (Inkscape::Extension::Extension * ext)
 }; /* namespace Extension */
 }; /* namespace Inkscape */
 
-/* Change the 'COLOR' below to be your file name */
+/* Change the 'EXPERIMENTAL' below to be your file name */
 #endif /* __INKSCAPE_EXTENSION_INTERNAL_FILTER_EXPERIMENTAL_H__ */