diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2013-12-05 19:27:44 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2013-12-05 19:27:44 +0000 |
| commit | 74bdba2b41e6609f3cee0e5eac4f766307577968 (patch) | |
| tree | 16fff098e56126eddfe1abdd4f0f7cb490bcb7ba /src/filter-enums.cpp | |
| parent | ImageMagick exception handling improvements (see Bug #1252719). (diff) | |
| download | inkscape-74bdba2b41e6609f3cee0e5eac4f766307577968.tar.gz inkscape-74bdba2b41e6609f3cee0e5eac4f766307577968.zip | |
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)
Diffstat (limited to 'src/filter-enums.cpp')
| -rw-r--r-- | src/filter-enums.cpp | 49 |
1 files changed, 37 insertions, 12 deletions
diff --git a/src/filter-enums.cpp b/src/filter-enums.cpp index 315b242bf..7ee57f7fa 100644 --- a/src/filter-enums.cpp +++ b/src/filter-enums.cpp @@ -48,11 +48,25 @@ const EnumDataConverter<FilterPrimitiveInput> FPInputConverter(FPInputData, FPIN // feBlend const EnumData<Inkscape::Filters::FilterBlendMode> BlendModeData[Inkscape::Filters::BLEND_ENDMODE] = { - {Inkscape::Filters::BLEND_NORMAL, _("Normal"), "normal"}, - {Inkscape::Filters::BLEND_MULTIPLY, _("Multiply"), "multiply"}, - {Inkscape::Filters::BLEND_SCREEN, _("Screen"), "screen"}, - {Inkscape::Filters::BLEND_DARKEN, _("Darken"), "darken"}, - {Inkscape::Filters::BLEND_LIGHTEN, _("Lighten"), "lighten"} + {Inkscape::Filters::BLEND_NORMAL, _("Normal"), "normal"}, + {Inkscape::Filters::BLEND_MULTIPLY, _("Multiply"), "multiply"}, + {Inkscape::Filters::BLEND_SCREEN, _("Screen"), "screen"}, + {Inkscape::Filters::BLEND_DARKEN, _("Darken"), "darken"}, + {Inkscape::Filters::BLEND_LIGHTEN, _("Lighten"), "lighten"}, +#ifdef WITH_CSSBLEND +// New in Compositing and Blending Level 1 + {Inkscape::Filters::BLEND_OVERLAY, _("Overlay"), "overlay"}, + {Inkscape::Filters::BLEND_COLORDODGE, _("Color Dodge"), "color-dodge"}, + {Inkscape::Filters::BLEND_COLORBURN, _("Color Burn"), "color-burn"}, + {Inkscape::Filters::BLEND_HARDLIGHT, _("Hard Light"), "hard-light"}, + {Inkscape::Filters::BLEND_SOFTLIGHT, _("Soft Light"), "soft-light"}, + {Inkscape::Filters::BLEND_DIFFERENCE, _("Difference"), "difference"}, + {Inkscape::Filters::BLEND_EXCLUSION, _("Exclusion"), "exclusion"}, + {Inkscape::Filters::BLEND_HUE, _("Hue"), "hue"}, + {Inkscape::Filters::BLEND_SATURATION, _("Saturation"), "saturation"}, + {Inkscape::Filters::BLEND_COLOR, _("Color"), "color"}, + {Inkscape::Filters::BLEND_LUMINOSITY, _("Luminosity"), "luminosity"} +#endif }; const EnumDataConverter<Inkscape::Filters::FilterBlendMode> BlendModeConverter(BlendModeData, Inkscape::Filters::BLEND_ENDMODE); @@ -67,13 +81,24 @@ const EnumDataConverter<Inkscape::Filters::FilterColorMatrixType> ColorMatrixTyp // feComposite const EnumData<FeCompositeOperator> CompositeOperatorData[COMPOSITE_ENDOPERATOR] = { - {COMPOSITE_DEFAULT, _("Default"), ""}, - {COMPOSITE_OVER, _("Over"), "over"}, - {COMPOSITE_IN, _("In"), "in"}, - {COMPOSITE_OUT, _("Out"), "out"}, - {COMPOSITE_ATOP, _("Atop"), "atop"}, - {COMPOSITE_XOR, _("XOR"), "xor"}, - {COMPOSITE_ARITHMETIC, _("Arithmetic"), "arithmetic"} + {COMPOSITE_DEFAULT, _("Default"), "" }, + {COMPOSITE_OVER, _("Over"), "over" }, + {COMPOSITE_IN, _("In"), "in" }, + {COMPOSITE_OUT, _("Out"), "out" }, + {COMPOSITE_ATOP, _("Atop"), "atop" }, + {COMPOSITE_XOR, _("XOR"), "xor" }, +#ifdef WITH_CSSCOMPOSITE +// New CSS + {COMPOSITE_CLEAR, _("Clear"), "clear" }, + {COMPOSITE_COPY, _("Copy"), "copy" }, + {COMPOSITE_DESTINATION, _("Destination"), "destination" }, + {COMPOSITE_DESTINATION_OVER, _("Destination Over"),"destination-over" }, + {COMPOSITE_DESTINATION_IN, _("Destination In"), "destination-in" }, + {COMPOSITE_DESTINATION_OUT, _("Destination Out"), "destination-out" }, + {COMPOSITE_DESTINATION_ATOP, _("Destination Atop"),"destination-atop" }, + {COMPOSITE_LIGHTER, _("Lighter"), "lighter" }, +#endif + {COMPOSITE_ARITHMETIC, _("Arithmetic"), "arithmetic" } }; const EnumDataConverter<FeCompositeOperator> CompositeOperatorConverter(CompositeOperatorData, COMPOSITE_ENDOPERATOR); |