Adding contrast control to Emboss, Color emboss and Dark emboss

diff --git a/share/filters/filters.svg b/share/filters/filters.svg
index e0bba416b18bc5f07aed0f5e48a1a76f972b2312..b5077e76b67adee545ee6b7464e15d74b4d567b4 100644 (file)
--- a/share/filters/filters.svg
+++ b/share/filters/filters.svg
@@ -1021,13 +1021,13 @@
 </filter>
 <filter id="f096" inkscape:label="Color emboss" x="0" y="0" width="1" height="1" inkscape:menu="Bumps" inkscape:menu-tooltip="Classic or colorized emboss effect: grayscale, color and 3D relief">
 <feColorMatrix type="luminanceToAlpha" result="result2" />
-<feDiffuseLighting surfaceScale="10" result="result1" diffuseConstant="1" lighting-color="rgb(255,255,255)">
-<feDistantLight azimuth="225" elevation="25" />
+<feDiffuseLighting surfaceScale="-10" result="result1" diffuseConstant="1" lighting-color="rgb(255,255,255)">
+<feDistantLight azimuth="225" elevation="35" />
 </feDiffuseLighting>
 <feFlood flood-opacity="0.5" result="result3" flood-color="rgb(86,172,140)" in="SourceGraphic" />
 <feComposite result="result4" in2="result3" operator="arithmetic" in="result1" k1="0.5" k2="0.5" k3="1" />
-<feBlend mode="lighten" in2="SourceGraphic" blend="normal" in="result4" id="feBlend3077" />
-<feComposite in2="SourceGraphic" operator="in" />
+<feBlend mode="normal" in2="SourceGraphic" blend="normal" in="result4" />
+<feComposite operator="arithmetic" k2="1" />
 <feComposite in2="SourceGraphic" operator="in" />
 </filter>
 <filter id="f097" inkscape:label="Solarize" inkscape:menu="Color" inkscape:menu-tooltip="Classical photographic solarization effect" y="0" x="0" height="1" width="1">
@@ -1225,15 +1225,15 @@
 <feComposite operator="in" result="result2" in="result6" in2="SourceGraphic" />
 <feComposite in2="SourceGraphic" operator="arithmetic" k2="0.8" k3="0.8" />
 </filter>
-<filter id="f120" inkscape:menu-tooltip="Emboss effect : 3D relief where white is replaced by black" inkscape:menu="Bumps" height="1" width="1" y="0" x="0" inkscape:label="Dark Emboss">
+<filter id="f120" inkscape:label="Dark Emboss" inkscape:menu-tooltip="Emboss effect : 3D relief where white is replaced by black" inkscape:menu="Bumps" height="1" width="1" y="0" x="0">
 <feColorMatrix result="result2" type="luminanceToAlpha" />
-<feDiffuseLighting diffuseConstant="0.5" result="result1" surfaceScale="10">
-<feDistantLight elevation="25" azimuth="225" />
+<feDiffuseLighting diffuseConstant="0.5" result="result1" surfaceScale="-10">
+<feDistantLight elevation="20" azimuth="225" />
 </feDiffuseLighting>
 <feComposite result="result3" k3="1" k2="1" k1="1" in="result1" operator="arithmetic" in2="SourceGraphic" />
 <feBlend result="result4" mode="multiply" in="result2" blend="normal" />
-<feComposite operator="in" in="result4" in2="SourceGraphic" />
-<feComposite in2="SourceGraphic" operator="in" />
+<feComposite result="result5" operator="arithmetic" k2="1.2" />
+<feComposite operator="in" in="result5" in2="SourceGraphic" />
 </filter>
 <filter id="f121" inkscape:label="Simple blur" inkscape:menu="ABCs" inkscape:menu-tooltip="Simple Gaussian blur, same as the blur slider in Fill and Stroke dialog">
 <feGaussianBlur stdDeviation="3" />
@@ -1254,16 +1254,16 @@
 <feComposite in2="fbSourceGraphicAlpha" in="result5" result="result2" operator="in" />
 <feComposite in="fbSourceGraphic" result="result4" operator="arithmetic" k2="1" k3="0.7" />
 </filter>
-<filter id="f123" inkscape:menu-tooltip="Emboss effect : Colors of the original images are preserved or modified by Blend" inkscape:menu="Bumps" height="1" width="1" y="0" x="0" inkscape:label="Emboss">
+<filter id="f123" inkscape:label="Emboss" inkscape:menu-tooltip="Emboss effect : Colors of the original images are preserved or modified by Blend" inkscape:menu="Bumps" height="1" width="1" y="0" x="0">
 <feColorMatrix result="result2" type="luminanceToAlpha" />
-<feDiffuseLighting diffuseConstant="0.5" result="result1" surfaceScale="10">
-<fePointLight z="20000" y="-10000" x="-5000" />
+<feDiffuseLighting diffuseConstant="0.6" result="result1" surfaceScale="-10">
+<feDistantLight azimuth="225" elevation="35" />
 </feDiffuseLighting>
 <feComposite result="result3" k3="0.5" k1="1.5" in="result1" operator="arithmetic" in2="SourceGraphic" />
 <feComposite result="result5" operator="in" in="result3" />
-<feBlend result="result6" in2="result1" mode="lighten" in="result5" blend="normal" />
-<feComposite in2="SourceGraphic" in="result6" operator="in" />
-<feComposite in2="SourceGraphic" />
+<feBlend result="result6" in2="result1" mode="normal" in="result5" blend="normal" />
+<feComposite result="result7" operator="arithmetic" k2="1" in2="result6" />
+<feComposite in2="SourceGraphic" in="result7" operator="in" />
 </filter>
 <filter id="f124" inkscape:label="Blotting paper" inkscape:menu="Textures" inkscape:menu-tooltip="Inkblot on blotting paper" height="1.3" y="-0.15" width="1.3" x="-0.15">
 <feGaussianBlur stdDeviation="3" in="SourceGraphic" result="result1" />