--- a/master/definitions-filters.xml Thu Mar 21 16:51:31 2013 +0100
+++ b/master/definitions-filters.xml Thu Mar 21 17:42:50 2013 +0100
@@ -22,36 +22,13 @@
name='feCustom'
href='#feCustomElement'
contentmodel='anyof'
- elements='animate, set, feCustomParam, feCustomSource'
+ elements='animate, set'
attributecategories='core, style, presentation, filter primitive'
interfaces='SVGFECustomElement'>
- <attribute name='geometry' href='#feCustomGeometryAttribute' animatable='yes'/>
- </element>
-
- <element
- name='feCustomParam'
- href='#feCustomParamElement'
- contentmodel='anyof'
- elements='animate, set'
- attributecategories='core'
- interfaces='SVGFECustomParamElement'>
- <attribute name='ident' href='#feCustomParamIdentAttribute' animatable='yes'/>
- <attribute name='type' href='#feCustomParamTypeAttribute' animatable='yes'/>
- <attribute name='values' href='#feCustomParamValuesAttribute' animatable='yes'/>
- <attribute name='color' href='#feCustomParamColorAttribute' animatable='yes'/>
- <attribute name='texture' href='#feCustomParamTextureAttribute' animatable='yes'/>
- <attribute name='transform' href='#feCustomParamTransformAttribute' animatable='yes'/>
- </element>
-
- <element
- name='feCustomSource'
- href='#feCustomSourceElement'
- contentmodel='anyof'
- elements='animate, set'
- attributecategories='core'
- interfaces='SVGFECustomSourceElement'>
- <attribute name='src' href='#feCustomSourceSrcAttribute' animatable='yes'/>
- <attribute name='format' href='#feCustomSourceFormatAttribute' animatable='yes'/>
+ <attribute name='vertexShader' href='#feCustomVertexShaderAttribute' animatable='yes'/>
+ <attribute name='fragmentShader' href='#feCustomFragmentShaderAttribute' animatable='yes'/>
+ <attribute name='vertexMesh' href='#feCustomVertexMeshAttribute' animatable='yes'/>
+ <attribute name='params' href='#feCustomParamsAttribute' animatable='yes'/>
</element>
<element
@@ -331,6 +308,18 @@
</element>
<element
+ name='feUnsharpMask'
+ href='#feUnsharpMaskElement'
+ contentmodel='anyof'
+ elements='animate, set'
+ attributecategories='core, style, presentation, filter primitive'
+ interfaces='SVGFETurbulenceElement'>
+ <attribute name='amount' href='#feUnsharpMaskAmountAttribute' animatable='yes'/>
+ <attribute name='threshold' href='#feUnsharpMaskThresholdAttribute' animatable='yes'/>
+ <attribute name='stdDeviation' href='#feUnsharpMaskStdDeviationAttribute' animatable='yes'/>
+ </element>
+
+ <element
name='filter'
href='#FilterElement'
contentmodel='anyof'
@@ -351,23 +340,18 @@
<!-- ... element categories ............................................ -->
- <elementcategory name='filter primitive' href='#TermFilterPrimitiveElement' elements='feBlend, feFlood, feColorMatrix, feComponentTransfer, feComposite, feConvolveMatrix, feCustom, feDiffuseLighting, feDisplacementMap, feDropShadow, feGaussianBlur, feImage, feMerge, feMorphology, feOffset, feSpecularLighting, feTile, feTurbulence'/>
+ <elementcategory name='filter primitive' href='#TermFilterPrimitiveElement' elements='feBlend, feFlood, feColorMatrix, feComponentTransfer, feComposite, feConvolveMatrix, feCustom, feDiffuseLighting, feDisplacementMap, feDropShadow, feGaussianBlur, feImage, feMerge, feMorphology, feOffset, feSpecularLighting, feTile, feTurbulence, feUnsharpMask'/>
<elementcategory name='light source' href='#TermLightSourceElement' elements='feDistantLight, fePointLight, feSpotLight'/>
<elementcategory name='transfer function' href='#TermTransferFunctionElement' elements='feFuncR, feFuncG, feFuncB, feFuncA'/>
<!-- ... attributes common to multiple elements ........................ -->
<!-- attribute common to most filter primitives (all except feFlood feImage feMerge feTurbulence) -->
- <attribute name='in' elements='feBlend, feColorMatrix, feComponentTransfer, feComposite, feConvolveMatrix, feCustom, feDropShadow, feDiffuseLighting, feDisplacementMap, feGaussianBlur, feMergeNode, feMorphology, feOffset, feSpecularLighting, feTile' href='#FilterPrimitiveInAttribute' animatable='yes'/>
+ <attribute name='in' elements='feBlend, feColorMatrix, feComponentTransfer, feComposite, feConvolveMatrix, feCustom, feDropShadow, feDiffuseLighting, feDisplacementMap, feGaussianBlur, feMorphology, feOffset, feSpecularLighting, feTile, feUnsharpMask' href='#FilterPrimitiveInAttribute' animatable='yes'/>
<!-- ... attribute categories .......................................... -->
<attributecategory
- name='presentation'
- href='http://www.w3.org/TR/2008/REC-SVGTiny12-20081222/intro.html#TermPresentationAttribute'
- presentationattributes='alignment-baseline, baseline-shift, clip, clip-path, clip-rule, color, color-interpolation, color-interpolation-filters, color-profile, color-rendering, cursor, direction, display, dominant-baseline, enable-background, fill, fill-opacity, fill-rule, filter, flood-color, flood-opacity, font-family, font-size, font-size-adjust, font-stretch, font-style, font-variant, font-weight, glyph-orientation-horizontal, glyph-orientation-vertical, image-rendering, kerning, letter-spacing, lighting-color, marker-end, marker-mid, marker-start, mask, mix, mix-composite, mix-blend-mode, opacity, overflow, pointer-events, shape-rendering, stop-color, stop-opacity, stroke, stroke-dasharray, stroke-dashoffset, stroke-linecap, stroke-linejoin, stroke-miterlimit, stroke-opacity, stroke-width, text-anchor, text-decoration, text-rendering, unicode-bidi, visibility, word-spacing, writing-mode'/>
-
- <attributecategory
name='filter primitive'
href='#TermFilterPrimitiveAttributes'>
<attribute name='x' href='#FilterPrimitiveXAttribute' animatable='yes'/>
@@ -397,10 +381,6 @@
<property name='flood-color' href='#FloodColorProperty'/>
<property name='flood-opacity' href='#FloodOpacityProperty'/>
<property name='lighting-color' href='#LightingColorProperty'/>
- <property name='mix' href='https://dvcs.w3.org/hg/FXTF/rawfile/default/compositing/index.html#mix-shorthand'/>
- <property name='mix-blend-mode' href='https://dvcs.w3.org/hg/FXTF/rawfile/default/compositing/index.html#mix-blend-mode'/>
- <property name='mix-composite' href='https://dvcs.w3.org/hg/FXTF/rawfile/default/compositing/index.html#mix-composite'/>
-
<!-- ... interfaces ..................................................... -->
@@ -408,8 +388,6 @@
<interface name='SVGFilterPrimitiveStandardAttributes' href='#InterfaceSVGFilterPrimitiveStandardAttributes'/>
<interface name='SVGFEBlendElement' href='#InterfaceSVGFEBlendElement'/>
<interface name='SVGFECustomElement' href='#InterfaceSVGFECustomElement'/>
- <interface name='SVGFECustomParamElement' href='#InterfaceSVGFECustomParamElement'/>
- <interface name='SVGFECustomSourceElement' href='#InterfaceSVGFECustomSourceElement'/>
<interface name='SVGFEColorMatrixElement' href='#InterfaceSVGFEColorMatrixElement'/>
<interface name='SVGFEComponentTransferElement' href='#InterfaceSVGFEComponentTransferElement'/>
<interface name='SVGComponentTransferFunctionElement' href='#InterfaceSVGComponentTransferFunctionElement'/>
@@ -435,8 +413,7 @@
<interface name='SVGFESpecularLightingElement' href='#InterfaceSVGFESpecularLightingElement'/>
<interface name='SVGFETileElement' href='#InterfaceSVGFETileElement'/>
<interface name='SVGFETurbulenceElement' href='#InterfaceSVGFETurbulenceElement'/>
- <interface name='SVGDefinitionElement' href='http://www.w3.org/TR/2012/WD-SVG2-20120828/types.html#InterfaceSVGDefinitionElement'/>
- <interface name='ImageData' href='http://www.w3.org/TR/2012/WD-2dcontext-20121025/#imagedata'/>
+ <interface name='SVGFEUnsharpMaskElement' href='#InterfaceSVGFEUnsharpMaskElement'/>
<!-- ... terms (these will be generated later) .......................... -->
<term name='filter primitive' href='#TermFilterPrimitiveElement'/>