Start some broken link fixing, and remove definitions that are now in the Filter Effects specification.
authorCameron McCormack <cam@mcc.id.au>
Sun, 19 Aug 2012 16:26:58 +1000
changeset 280 15a5a1ef3492
parent 279 86a89f124cb9
child 281 0aa6b2179663
Start some broken link fixing, and remove definitions that are now in the Filter Effects specification.
master/coords.html
master/definitions-filters.xml
master/definitions.xml
master/index.html
master/intro.html
master/publish.xml
--- a/master/coords.html	Sun Aug 19 11:48:44 2012 +1000
+++ b/master/coords.html	Sun Aug 19 16:26:58 2012 +1000
@@ -18,11 +18,11 @@
 
 <h2 id="Introduction">Introduction</h2>
 
-<p>For all media, the <a>SVG canvas</a>
+<p>For all media, the <dfn id="SVGCanvas">SVG canvas</dfn>
 describes "the space where the SVG content is rendered." The
 canvas is infinite for each dimension of the space, but
 rendering occurs relative to a finite rectangular region of the
-canvas. This finite rectangular region is called the <a>SVG viewport</a>.
+canvas. This finite rectangular region is called the <dfn>SVG viewport</dfn>.
 For <a href='http://www.w3.org/TR/2008/REC-CSS2-20080411/media.html#visual-media-group'>visual media</a>
 ([<a href='refs.html#ref-CSS2'>CSS2</a>], section 7.3.1)
 the SVG viewport is the viewing area where the user sees the SVG content.</p>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/master/definitions-filters.xml	Sun Aug 19 16:26:58 2012 +1000
@@ -0,0 +1,440 @@
+<!-- Definitions for Filter Effects 1.0. -->
+
+<definitions xmlns='http://mcc.id.au/ns/local' xmlns:x='http://mcc.id.au/ns/local'>
+
+  <!-- === defined in this specification ================================== -->
+
+  <!-- ... elements and element-specific attributes ....................... -->
+
+  <element
+      name='feBlend'
+      href='#feBlendElement'
+      contentmodel='anyof'
+      elements='animate, set'
+      attributecategories='core, style, presentation, filter primitive'
+      attributes='in'
+      interfaces='SVGFEBlendElement'>
+    <attribute name='in2' href='#feBlendIn2Attribute' animatable='yes'/>
+    <attribute name='mode' href='#feBlendModeAttribute' animatable='yes'/>
+  </element>
+
+  <element
+      name='feCustom'
+      href='#feCustomElement'
+      contentmodel='anyof'
+      elements='animate, set'
+      attributecategories='core, style, presentation, filter primitive'
+      interfaces='SVGFECustomElement'>
+    <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
+      name='feColorMatrix'
+      href='#feColorMatrixElement'
+      contentmodel='anyof'
+      elements='animate, set'
+      attributecategories='core, style, presentation, filter primitive'
+      attributes='in'
+      interfaces='SVGFEColorMatrixElement'>
+    <attribute name='type' href='#feColorMatrixTypeAttribute' animatable='yes'/>
+    <attribute name='values' href='#feColorMatrixValuesAttribute' animatable='yes'/>
+  </element>
+
+  <element
+    name='feComponentTransfer'
+    href='#feComponentTransferElement'
+    contentmodel='anyof'
+    elements='feFuncR, feFuncG, feFuncB, feFuncA'
+    attributecategories='core, style, presentation, filter primitive'
+    attributes='in'
+    interfaces='SVGFEComponentTransferElement'/>
+
+  <element
+      name='feComposite'
+      href='#feCompositeElement'
+      contentmodel='anyof'
+      elements='animate, set'
+      attributecategories='core, style, presentation, filter primitive'
+      attributes='in'
+      interfaces='SVGFECompositeElement'>
+    <attribute name='in2' href='#feCompositeIn2Attribute' animatable='yes'/>
+    <attribute name='operator' href='#feCompositeOperatorAttribute' animatable='yes'/>
+    <attribute name='k1' href='#feCompositeK1Attribute' animatable='yes'/>
+    <attribute name='k2' href='#feCompositeK2Attribute' animatable='yes'/>
+    <attribute name='k3' href='#feCompositeK3Attribute' animatable='yes'/>
+    <attribute name='k4' href='#feCompositeK4Attribute' animatable='yes'/>
+  </element>
+
+  <element
+      name='feConvolveMatrix'
+      href='#feConvolveMatrixElement'
+      contentmodel='anyof'
+      elements='animate, set'
+      attributecategories='core, style, presentation, filter primitive'
+      attributes='in'
+      interfaces='SVGFEConvolveMatrixElement'>
+    <attribute name='order' href='#feConvolveMatrixElementOrderAttribute' animatable='yes'/>
+    <attribute name='kernelMatrix' href='#feConvolveMatrixElementKernelMatrixAttribute' animatable='yes'/>
+    <attribute name='divisor' href='#feConvolveMatrixElementDivisorAttribute' animatable='yes'/>
+    <attribute name='bias' href='#feConvolveMatrixElementBiasAttribute' animatable='yes'/>
+    <attribute name='targetX' href='#feConvolveMatrixElementTargetXAttribute' animatable='yes'/>
+    <attribute name='targetY' href='#feConvolveMatrixElementTargetYAttribute' animatable='yes'/>
+    <attribute name='edgeMode' href='#feConvolveMatrixElementEdgeModeAttribute' animatable='yes'/>
+    <attribute name='kernelUnitLength' href='#feConvolveMatrixElementKernelUnitLengthAttribute' animatable='yes'/>
+    <attribute name='preserveAlpha' href='#feConvolveMatrixElementPreserveAlphaAttribute' animatable='yes'/>
+  </element>
+
+  <element
+      name='feDiffuseLighting'
+      href='#feDiffuseLightingElement'
+      attributecategories='core, style, presentation, filter primitive'
+      attributes='in'
+      interfaces='SVGFEDiffuseLightingElement'>
+    <x:contentmodel xmlns='http://www.w3.org/1999/xhtml'>Any number of <a>descriptive elements</a>
+    and exactly one <a>light source element</a>, in any order.</x:contentmodel>
+    <attribute name='surfaceScale' href='#feDiffuseLightingSurfaceScaleAttribute' animatable='yes'/>
+    <attribute name='diffuseConstant' href='#feDiffuseLightingDiffuseConstantAttribute' animatable='yes'/>
+    <attribute name='kernelUnitLength' href='#feDiffuseLightingKernelUnitLengthAttribute' animatable='yes'/>
+  </element>
+
+  <element
+      name='feDisplacementMap'
+      href='#feDisplacementMapElement'
+      contentmodel='anyof'
+      elements='animate, set'
+      attributecategories='core, style, presentation, filter primitive'
+      attributes='in'
+      interfaces='SVGFEDisplacementMapElement'>
+    <attribute name='in2' href='#feDisplacementMapIn2Attribute' animatable='yes'/>
+    <attribute name='scale' href='#feDisplacementMapScaleAttribute' animatable='yes'/>
+    <attribute name='xChannelSelector' href='#feDisplacementMapXChannelSelectorAttribute' animatable='yes'/>
+    <attribute name='yChannelSelector' href='#feDisplacementMapYChannelSelectorAttribute' animatable='yes'/>
+  </element>
+
+  <element
+      name='feDistantLight'
+      href='#feDistantLightElement'
+      contentmodel='anyof'
+      elements='animate, set'
+      attributecategories='core'
+      interfaces='SVGFEDistantLightElement'>
+    <attribute name='azimuth' href='#feDistantLightAzimuthAttribute' animatable='yes'/>
+    <attribute name='elevation' href='#feDistantLightElevationAttribute' animatable='yes'/>
+  </element>
+
+    <element
+      name='feDropShadow'
+      href='#feDropShadowElement'
+      contentmodel='anyof'
+      elements='animate, set'
+      attributecategories='core, style, presentation, filter primitive'
+      attributes='in'
+      interfaces='SVGFEDropShadowElement'>
+    <attribute name='stdDeviation' href='#feDropShadowStdDeviationAttribute' animatable='yes'/>
+    <attribute name='dx' href='#feDropShadowDxAttribute' animatable='yes'/>
+    <attribute name='dy' href='#feDropShadowDyAttribute' animatable='yes'/>
+  </element>
+
+  <element
+    name='feFlood'
+    href='#feFloodElement'
+    contentmodel='anyof'
+    elements='animate, set, animateColor'
+    attributecategories='core, style, presentation, filter primitive'
+    interfaces='SVGFEFloodElement'/>
+
+  <element
+    name='feFuncR'
+    href='#feFuncRElement'
+    contentmodel='anyof'
+    elements='animate, set'
+    attributecategories='core, transfer function element'
+    interfaces='SVGFEFuncRElement'/>
+
+  <element
+    name='feFuncG'
+    href='#feFuncGElement'
+    contentmodel='anyof'
+    elements='animate, set'
+    attributecategories='core, transfer function element'
+    interfaces='SVGFEFuncGElement'/>
+
+  <element
+    name='feFuncB'
+    href='#feFuncBElement'
+    contentmodel='anyof'
+    elements='animate, set'
+    attributecategories='core, transfer function element'
+    interfaces='SVGFEFuncBElement'/>
+
+  <element
+    name='feFuncA'
+    href='#feFuncAElement'
+    contentmodel='anyof'
+    elements='animate, set'
+    attributecategories='core, transfer function element'
+    interfaces='SVGFEFuncAElement'/>
+
+  <element
+      name='feGaussianBlur'
+      href='#feGaussianBlurElement'
+      contentmodel='anyof'
+      elements='animate, set'
+      attributecategories='core, style, presentation, filter primitive'
+      attributes='in'
+      interfaces='SVGFEGaussianBlurElement'>
+    <attribute name='stdDeviation' href='#feGaussianBlurStdDeviationAttribute' animatable='yes'/>
+  </element>
+
+  <element
+      name='feImage'
+      href='#feImageElement'
+      contentmodel='anyof'
+      elements='animate, set, animateTransform'
+      attributecategories='core, style, presentation, filter primitive, xlink'
+      attributes='externalResourcesRequired, preserveAspectRatio'
+      interfaces='SVGFEImageElement'>
+    <attribute name='xlink:href' href='#feImageElementHrefAttribute' animatable='yes'/>
+  </element>
+
+  <element
+    name='feMerge'
+    href='#feMergeElement'
+    contentmodel='anyof'
+    elements='feMergeNode'
+    attributecategories='core, style, presentation, filter primitive'
+    interfaces='SVGFEMergeElement'/>
+
+  <element
+      name='feMergeNode'
+      href='#feMergeNodeElement'
+      contentmodel='anyof'
+      elements='animate, set'
+      attributecategories='core'
+      attributes='in'
+      interfaces='SVGFEMergeNodeElement'/>
+
+  <element
+      name='feMorphology'
+      href='#feMorphologyElement'
+      contentmodel='anyof'
+      elements='animate, set'
+      attributecategories='core, style, presentation, filter primitive'
+      attributes='in'
+      interfaces='SVGFEMorphologyElement'>
+    <attribute name='operator' href='#feMorphologyOperatorAttribute' animatable='yes'/>
+    <attribute name='radius' href='#feMorphologyRadiusAttribute' animatable='yes'/>
+  </element>
+
+  <element
+      name='feOffset'
+      href='#feOffsetElement'
+      contentmodel='anyof'
+      elements='animate, set'
+      attributecategories='core, style, presentation, filter primitive'
+      attributes='in'
+      interfaces='SVGFEOffsetElement'>
+    <attribute name='dx' href='#feOffsetDxAttribute' animatable='yes'/>
+    <attribute name='dy' href='#feOffsetDyAttribute' animatable='yes'/>
+  </element>
+
+  <element
+      name='fePointLight'
+      href='#fePointLightElement'
+      contentmodel='anyof'
+      elements='animate, set'
+      attributecategories='core'
+      interfaces='SVGFEPointLightElement'>
+    <attribute name='x' href='#fePointLightXAttribute' animatable='yes'/>
+    <attribute name='y' href='#fePointLightYAttribute' animatable='yes'/>
+    <attribute name='z' href='#fePointLightZAttribute' animatable='yes'/>
+  </element>
+
+  <element
+      name='feSpecularLighting'
+      href='#feSpecularLightingElement'
+      attributecategories='core, style, presentation, filter primitive'
+      attributes='in'
+      interfaces='SVGFESpecularLightingElement'>
+    <x:contentmodel xmlns='http://www.w3.org/1999/xhtml'>Any number of <a>descriptive elements</a>
+    and exactly one <a>light source element</a>, in any order.</x:contentmodel>
+    <attribute name='surfaceScale' href='#feSpecularLightingSurfaceScaleAttribute' animatable='yes'/>
+    <attribute name='specularConstant' href='#feSpecularLightingSpecularConstantAttribute' animatable='yes'/>
+    <attribute name='specularExponent' href='#feSpecularLightingSpecularExponentAttribute' animatable='yes'/>
+    <attribute name='kernelUnitLength' href='#feSpecularLightingKernelUnitLengthAttribute' animatable='yes'/>
+  </element>
+
+  <element
+      name='feSpotLight'
+      href='#feSpotLightElement'
+      contentmodel='anyof'
+      elements='animate, set'
+      attributecategories='core'
+      interfaces='SVGFESpotLightElement'>
+    <attribute name='x' href='#feSpotLightXAttribute' animatable='yes'/>
+    <attribute name='y' href='#feSpotLightYAttribute' animatable='yes'/>
+    <attribute name='z' href='#feSpotLightZAttribute' animatable='yes'/>
+    <attribute name='pointsAtX' href='#feSpotLightPointsAtXAttribute' animatable='yes'/>
+    <attribute name='pointsAtY' href='#feSpotLightPointsAtYAttribute' animatable='yes'/>
+    <attribute name='pointsAtZ' href='#feSpotLightPointsAtZAttribute' animatable='yes'/>
+    <attribute name='specularExponent' href='#feSpotLightSpecularExponentAttribute' animatable='yes'/>
+    <attribute name='limitingConeAngle' href='#feSpotLightLimitingConeAngleAttribute' animatable='yes'/>
+  </element>
+
+  <element
+    name='feTile'
+    href='#feTileElement'
+    contentmodel='anyof'
+    elements='animate, set'
+    attributecategories='core, style, presentation, filter primitive'
+    attributes='in'
+    interfaces='SVGFETileElement'/>
+
+  <element
+      name='feTurbulence'
+      href='#feTurbulenceElement'
+      contentmodel='anyof'
+      elements='animate, set'
+      attributecategories='core, style, presentation, filter primitive'
+      interfaces='SVGFETurbulenceElement'>
+    <attribute name='baseFrequency' href='#feTurbulenceBaseFrequencyAttribute' animatable='yes'/>
+    <attribute name='numOctaves' href='#feTurbulenceNumOctavesAttribute' animatable='yes'/>
+    <attribute name='seed' href='#feTurbulenceSeedAttribute' animatable='yes'/>
+    <attribute name='stitchTiles' href='#feTurbulenceStitchTilesAttribute' animatable='yes'/>
+    <attribute name='type' href='#feTurbulenceTypeAttribute' animatable='yes'/>
+  </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'
+      elementcategories='descriptive, filter primitive'
+      elements='animate, set'
+      attributecategories='core, style, presentation, xlink'
+      attributes='externalResourcesRequired'
+      interfaces='SVGFilterElement'>
+    <attribute name='x' href='#FilterElementXAttribute' animatable='yes'/>
+    <attribute name='y' href='#FilterElementYAttribute' animatable='yes'/>
+    <attribute name='width' href='#FilterElementWidthAttribute' animatable='yes'/>
+    <attribute name='height' href='#FilterElementHeightAttribute' animatable='yes'/>
+    <attribute name='filterRes' href='#FilterElementFilterResAttribute' animatable='yes'/>
+    <attribute name='filterUnits' href='#FilterElementFilterUnitsAttribute' animatable='yes'/>
+    <attribute name='primitiveUnits' href='#FilterElementPrimitiveUnitsAttribute' animatable='yes'/>
+    <attribute name='xlink:href' href='#FilterElementHrefAttribute' animatable='yes'/>
+  </element>
+
+  <!-- ... 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, 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, feMorphology, feOffset, feSpecularLighting, feTile, feUnsharpMask' href='#FilterPrimitiveInAttribute' animatable='yes'/>
+
+  <!-- ... attribute categories .......................................... -->
+
+  <attributecategory
+      name='filter primitive'
+      href='#TermFilterPrimitiveAttributes'>
+    <attribute name='x' href='#FilterPrimitiveXAttribute' animatable='yes'/>
+    <attribute name='y' href='#FilterPrimitiveYAttribute' animatable='yes'/>
+    <attribute name='width' href='#FilterPrimitiveWidthAttribute' animatable='yes'/>
+    <attribute name='height' href='#FilterPrimitiveHeightAttribute' animatable='yes'/>
+    <attribute name='result' href='#FilterPrimitiveResultAttribute' animatable='yes'/>
+  </attributecategory>
+
+  <attributecategory
+      name='transfer function element'
+      href='#TransferFunctionElementAttributes'>
+    <attribute name='type' href='#feComponentTransferTypeAttribute' animatable='yes'/>
+    <attribute name='tableValues' href='#feComponentTransferTableValuesAttribute' animatable='yes'/>
+    <attribute name='slope' href='#feComponentTransferSlopeAttribute' animatable='yes'/>
+    <attribute name='intercept' href='#feComponentTransferInterceptAttribute' animatable='yes'/>
+    <attribute name='amplitude' href='#feComponentTransferAmplitudeAttribute' animatable='yes'/>
+    <attribute name='exponent' href='#feComponentTransferExponentAttribute' animatable='yes'/>
+    <attribute name='offset' href='#feComponentTransferOffsetAttribute' animatable='yes'/>
+  </attributecategory>
+
+  <!-- ... properties ..................................................... -->
+
+  <property name='color-interpolation-filters' href='#ColorInterpolationFiltersProperty'/>
+  <property name='enable-background' href='#EnableBackgroundProperty'/>
+  <property name='filter' href='#FilterProperty'/>
+  <property name='flood-color' href='#FloodColorProperty'/>
+  <property name='flood-opacity' href='#FloodOpacityProperty'/>
+  <property name='lighting-color' href='#LightingColorProperty'/>
+
+  <!-- ... interfaces ..................................................... -->
+
+  <interface name='SVGFilterElement' href='#InterfaceSVGFilterElement'/>
+  <interface name='SVGFilterPrimitiveStandardAttributes' href='#InterfaceSVGFilterPrimitiveStandardAttributes'/>
+  <interface name='SVGFEBlendElement' href='#InterfaceSVGFEBlendElement'/>
+  <interface name='SVGFECustomElement' href='#InterfaceSVGFECustomElement'/>
+  <interface name='SVGFEColorMatrixElement' href='#InterfaceSVGFEColorMatrixElement'/>
+  <interface name='SVGFEComponentTransferElement' href='#InterfaceSVGFEComponentTransferElement'/>
+  <interface name='SVGComponentTransferFunctionElement' href='#InterfaceSVGComponentTransferFunctionElement'/>
+  <interface name='SVGFEFuncRElement' href='#InterfaceSVGFEFuncRElement'/>
+  <interface name='SVGFEFuncGElement' href='#InterfaceSVGFEFuncGElement'/>
+  <interface name='SVGFEFuncBElement' href='#InterfaceSVGFEFuncBElement'/>
+  <interface name='SVGFEFuncAElement' href='#InterfaceSVGFEFuncAElement'/>
+  <interface name='SVGFECompositeElement' href='#InterfaceSVGFECompositeElement'/>
+  <interface name='SVGFEConvolveMatrixElement' href='#InterfaceSVGFEConvolveMatrixElement'/>
+  <interface name='SVGFEDiffuseLightingElement' href='#InterfaceSVGFEDiffuseLightingElement'/>
+  <interface name='SVGFEDistantLightElement' href='#InterfaceSVGFEDistantLightElement'/>
+  <interface name='SVGFEDropShadowElement' href='#InterfaceSVGFEDropShadowElement'/>
+  <interface name='SVGFEPointLightElement' href='#InterfaceSVGFEPointLightElement'/>
+  <interface name='SVGFESpotLightElement' href='#InterfaceSVGFESpotLightElement'/>
+  <interface name='SVGFEDisplacementMapElement' href='#InterfaceSVGFEDisplacementMapElement'/>
+  <interface name='SVGFEFloodElement' href='#InterfaceSVGFEFloodElement'/>
+  <interface name='SVGFEGaussianBlurElement' href='#InterfaceSVGFEGaussianBlurElement'/>
+  <interface name='SVGFEImageElement' href='#InterfaceSVGFEImageElement'/>
+  <interface name='SVGFEMergeElement' href='#InterfaceSVGFEMergeElement'/>
+  <interface name='SVGFEMergeNodeElement' href='#InterfaceSVGFEMergeNodeElement'/>
+  <interface name='SVGFEMorphologyElement' href='#InterfaceSVGFEMorphologyElement'/>
+  <interface name='SVGFEOffsetElement' href='#InterfaceSVGFEOffsetElement'/>
+  <interface name='SVGFESpecularLightingElement' href='#InterfaceSVGFESpecularLightingElement'/>
+  <interface name='SVGFETileElement' href='#InterfaceSVGFETileElement'/>
+  <interface name='SVGFETurbulenceElement' href='#InterfaceSVGFETurbulenceElement'/>
+  <interface name='SVGFEUnsharpMaskElement' href='#InterfaceSVGFEUnsharpMaskElement'/>
+
+  <!-- ... terms (these will be generated later) .......................... -->
+  <term name='filter primitive' href='#TermFilterPrimitiveElement'/>
+  <term name='filter primitives' href='#TermFilterPrimitiveElement'/>
+  <term name='filter primitive attribute' href='#TermFilterPrimitiveAttributes'/>
+  <term name='filter primitive attributes' href='#TermFilterPrimitiveAttributes'/>
+  <term name='filter region' href='#FilterEffectsRegion'/>
+  <term name='filter effects region' href='#FilterEffectsRegion'/>
+  <term name='filter primitive subregion' href='#FilterPrimitiveSubRegion'/>
+  <term name='user coordinate system' href='#TermUserCoordinateSystem'/>
+  <term name='SourceGraphic' href='#SourceGraphic'/>
+  <term name='SourceAlpha' href='#SourceAlpha'/>
+  <term name='BackgroundImage' href='#BackgroundImage'/>
+  <term name='BackgroundAlpha' href='#BackgroundAlpha'/>
+  <term name='FillPaint' href='#FillPaint'/>
+  <term name='StrokePaint' href='#StrokePaint'/>
+
+  <!-- === defined in other specifications ================================ -->
+
+  <term name='bounding box' href='http://www.w3.org/TR/2008/REC-SVGTiny12-20081222/intro.html#TermBoundingBox'/>
+  <term name='lacuna value' href='http://www.w3.org/TR/2008/REC-SVGTiny12-20081222/intro.html#TermLacunaValue'/>
+  <term name='unsupported' href='http://www.w3.org/TR/2008/REC-SVGTiny12-20081222/intro.html#TermUnsupportedValue'/>
+  <term name='unsupported value' href='http://www.w3.org/TR/2008/REC-SVGTiny12-20081222/intro.html#TermUnsupportedValue'/>
+</definitions>
--- a/master/definitions.xml	Sun Aug 19 11:48:44 2012 +1000
+++ b/master/definitions.xml	Sun Aug 19 16:26:58 2012 +1000
@@ -195,299 +195,6 @@
   </element>
 
   <element
-      name='feBlend'
-      href='filters.html#feBlendElement'
-      contentmodel='anyof'
-      elements='animate, set'
-      attributecategories='core, style, presentation, filter primitive'
-      attributes='in'
-      interfaces='SVGFEBlendElement'>
-    <attribute name='in2' href='filters.html#feBlendIn2Attribute' animatable='yes'/>
-    <attribute name='mode' href='filters.html#feBlendModeAttribute' animatable='yes'/>
-  </element>
-
-  <element
-      name='feColorMatrix'
-      href='filters.html#feColorMatrixElement'
-      contentmodel='anyof'
-      elements='animate, set'
-      attributecategories='core, style, presentation, filter primitive'
-      attributes='in'
-      interfaces='SVGFEColorMatrixElement'>
-    <attribute name='type' href='filters.html#feColorMatrixTypeAttribute' animatable='yes'/>
-    <attribute name='values' href='filters.html#feColorMatrixValuesAttribute' animatable='yes'/>
-  </element>
-
-  <element
-    name='feComponentTransfer'
-    href='filters.html#feComponentTransferElement'
-    contentmodel='anyof'
-    elements='feFuncR, feFuncG, feFuncB, feFuncA'
-    attributecategories='core, style, presentation, filter primitive'
-    attributes='in'
-    interfaces='SVGFEComponentTransferElement'/>
-
-  <element
-      name='feComposite'
-      href='filters.html#feCompositeElement'
-      contentmodel='anyof'
-      elements='animate, set'
-      attributecategories='core, style, presentation, filter primitive'
-      attributes='in'
-      interfaces='SVGFECompositeElement'>
-    <attribute name='in2' href='filters.html#feCompositeIn2Attribute' animatable='yes'/>
-    <attribute name='operator' href='filters.html#feCompositeOperatorAttribute' animatable='yes'/>
-    <attribute name='k1' href='filters.html#feCompositeK1Attribute' animatable='yes'/>
-    <attribute name='k2' href='filters.html#feCompositeK2Attribute' animatable='yes'/>
-    <attribute name='k3' href='filters.html#feCompositeK3Attribute' animatable='yes'/>
-    <attribute name='k4' href='filters.html#feCompositeK4Attribute' animatable='yes'/>
-  </element>
-
-  <element
-      name='feConvolveMatrix'
-      href='filters.html#feConvolveMatrixElement'
-      contentmodel='anyof'
-      elements='animate, set'
-      attributecategories='core, style, presentation, filter primitive'
-      attributes='in'
-      interfaces='SVGFEConvolveMatrixElement'>
-    <attribute name='order' href='filters.html#feConvolveMatrixElementOrderAttribute' animatable='yes'/>
-    <attribute name='kernelMatrix' href='filters.html#feConvolveMatrixElementKernelMatrixAttribute' animatable='yes'/>
-    <attribute name='divisor' href='filters.html#feConvolveMatrixElementDivisorAttribute' animatable='yes'/>
-    <attribute name='bias' href='filters.html#feConvolveMatrixElementBiasAttribute' animatable='yes'/>
-    <attribute name='targetX' href='filters.html#feConvolveMatrixElementTargetXAttribute' animatable='yes'/>
-    <attribute name='targetY' href='filters.html#feConvolveMatrixElementTargetYAttribute' animatable='yes'/>
-    <attribute name='edgeMode' href='filters.html#feConvolveMatrixElementEdgeModeAttribute' animatable='yes'/>
-    <attribute name='kernelUnitLength' href='filters.html#feConvolveMatrixElementKernelUnitLengthAttribute' animatable='yes'/>
-    <attribute name='preserveAlpha' href='filters.html#feConvolveMatrixElementPreserveAlphaAttribute' animatable='yes'/>
-  </element>
-
-  <element
-      name='feDiffuseLighting'
-      href='filters.html#feDiffuseLightingElement'
-      attributecategories='core, style, presentation, filter primitive'
-      attributes='in'
-      interfaces='SVGFEDiffuseLightingElement'>
-    <x:contentmodel xmlns='http://www.w3.org/1999/xhtml'>Any number of <a>descriptive elements</a>
-    and exactly one <a>light source element</a>, in any order.</x:contentmodel>
-    <attribute name='surfaceScale' href='filters.html#feDiffuseLightingSurfaceScaleAttribute' animatable='yes'/>
-    <attribute name='diffuseConstant' href='filters.html#feDiffuseLightingDiffuseConstantAttribute' animatable='yes'/>
-    <attribute name='kernelUnitLength' href='filters.html#feDiffuseLightingKernelUnitLengthAttribute' animatable='yes'/>
-  </element>
-
-  <element
-      name='feDisplacementMap'
-      href='filters.html#feDisplacementMapElement'
-      contentmodel='anyof'
-      elements='animate, set'
-      attributecategories='core, style, presentation, filter primitive'
-      attributes='in'
-      interfaces='SVGFEDisplacementMapElement'>
-    <attribute name='in2' href='filters.html#feDisplacementMapIn2Attribute' animatable='yes'/>
-    <attribute name='scale' href='filters.html#feDisplacementMapScaleAttribute' animatable='yes'/>
-    <attribute name='xChannelSelector' href='filters.html#feDisplacementMapXChannelSelectorAttribute' animatable='yes'/>
-    <attribute name='yChannelSelector' href='filters.html#feDisplacementMapYChannelSelectorAttribute' animatable='yes'/>
-  </element>
-
-  <element
-      name='feDistantLight'
-      href='filters.html#feDistantLightElement'
-      contentmodel='anyof'
-      elements='animate, set'
-      attributecategories='core'
-      interfaces='SVGFEDistantLightElement'>
-    <attribute name='azimuth' href='filters.html#feDistantLightAzimuthAttribute' animatable='yes'/>
-    <attribute name='elevation' href='filters.html#feDistantLightElevationAttribute' animatable='yes'/>
-  </element>
-
-  <element
-    name='feFlood'
-    href='filters.html#feFloodElement'
-    contentmodel='anyof'
-    elements='animate, set, animateColor'
-    attributecategories='core, style, presentation, filter primitive'
-    interfaces='SVGFEFloodElement'/>
-
-  <element
-    name='feFuncA'
-    href='filters.html#feFuncAElement'
-    contentmodel='anyof'
-    elements='animate, set'
-    attributecategories='core, transfer function element'
-    interfaces='SVGFEFuncAElement'/>
-
-  <element
-    name='feFuncB'
-    href='filters.html#feFuncBElement'
-    contentmodel='anyof'
-    elements='animate, set'
-    attributecategories='core, transfer function element'
-    interfaces='SVGFEFuncBElement'/>
-
-  <element
-    name='feFuncG'
-    href='filters.html#feFuncGElement'
-    contentmodel='anyof'
-    elements='animate, set'
-    attributecategories='core, transfer function element'
-    interfaces='SVGFEFuncGElement'/>
-
-  <element
-    name='feFuncR'
-    href='filters.html#feFuncRElement'
-    contentmodel='anyof'
-    elements='animate, set'
-    attributecategories='core, transfer function element'
-    interfaces='SVGFEFuncRElement'/>
-
-  <element
-      name='feGaussianBlur'
-      href='filters.html#feGaussianBlurElement'
-      contentmodel='anyof'
-      elements='animate, set'
-      attributecategories='core, style, presentation, filter primitive'
-      attributes='in'
-      interfaces='SVGFEGaussianBlurElement'>
-    <attribute name='stdDeviation' href='filters.html#feGaussianBlurStdDeviationAttribute' animatable='yes'/>
-  </element>
-
-  <element
-      name='feImage'
-      href='filters.html#feImageElement'
-      contentmodel='anyof'
-      elements='animate, set, animateTransform'
-      attributecategories='core, style, presentation, filter primitive, xlink'
-      attributes='preserveAspectRatio'
-      interfaces='SVGFEImageElement'>
-    <attribute name='xlink:href' href='filters.html#feImageElementHrefAttribute' animatable='yes'/>
-  </element>
-
-  <element
-    name='feMerge'
-    href='filters.html#feMergeElement'
-    contentmodel='anyof'
-    elements='feMergeNode'
-    attributecategories='core, style, presentation, filter primitive'
-    interfaces='SVGFEMergeElement'/>
-
-  <element
-      name='feMergeNode'
-      href='filters.html#feMergeNodeElement'
-      contentmodel='anyof'
-      elements='animate, set'
-      attributecategories='core'
-      attributes='in'
-      interfaces='SVGFEMergeNodeElement'/>
-
-  <element
-      name='feMorphology'
-      href='filters.html#feMorphologyElement'
-      contentmodel='anyof'
-      elements='animate, set'
-      attributecategories='core, style, presentation, filter primitive'
-      attributes='in'
-      interfaces='SVGFEMorphologyElement'>
-    <attribute name='operator' href='filters.html#feMorphologyOperatorAttribute' animatable='yes'/>
-    <attribute name='radius' href='filters.html#feMorphologyRadiusAttribute' animatable='yes'/>
-  </element>
-
-  <element
-      name='feOffset'
-      href='filters.html#feOffsetElement'
-      contentmodel='anyof'
-      elements='animate, set'
-      attributecategories='core, style, presentation, filter primitive'
-      attributes='in'
-      interfaces='SVGFEOffsetElement'>
-    <attribute name='dx' href='filters.html#feOffsetDxAttribute' animatable='yes'/>
-    <attribute name='dy' href='filters.html#feOffsetDyAttribute' animatable='yes'/>
-  </element>
-
-  <element
-      name='fePointLight'
-      href='filters.html#fePointLightElement'
-      contentmodel='anyof'
-      elements='animate, set'
-      attributecategories='core'
-      interfaces='SVGFEPointLightElement'>
-    <attribute name='x' href='filters.html#fePointLightXAttribute' animatable='yes'/>
-    <attribute name='y' href='filters.html#fePointLightYAttribute' animatable='yes'/>
-    <attribute name='z' href='filters.html#fePointLightZAttribute' animatable='yes'/>
-  </element>
-
-  <element
-      name='feSpecularLighting'
-      href='filters.html#feSpecularLightingElement'
-      attributecategories='core, style, presentation, filter primitive'
-      attributes='in'
-      interfaces='SVGFESpecularLightingElement'>
-    <x:contentmodel xmlns='http://www.w3.org/1999/xhtml'>Any number of <a>descriptive elements</a>
-    and exactly one <a>light source element</a>, in any order.</x:contentmodel>
-    <attribute name='surfaceScale' href='filters.html#feSpecularLightingSurfaceScaleAttribute' animatable='yes'/>
-    <attribute name='specularConstant' href='filters.html#feSpecularLightingSpecularConstantAttribute' animatable='yes'/>
-    <attribute name='specularExponent' href='filters.html#feSpecularLightingSpecularExponentAttribute' animatable='yes'/>
-    <attribute name='kernelUnitLength' href='filters.html#feSpecularLightingKernelUnitLengthAttribute' animatable='yes'/>
-  </element>
-
-  <element
-      name='feSpotLight'
-      href='filters.html#feSpotLightElement'
-      contentmodel='anyof'
-      elements='animate, set'
-      attributecategories='core'
-      interfaces='SVGFESpotLightElement'>
-    <attribute name='x' href='filters.html#feSpotLightXAttribute' animatable='yes'/>
-    <attribute name='y' href='filters.html#feSpotLightYAttribute' animatable='yes'/>
-    <attribute name='z' href='filters.html#feSpotLightZAttribute' animatable='yes'/>
-    <attribute name='pointsAtX' href='filters.html#feSpotLightPointsAtXAttribute' animatable='yes'/>
-    <attribute name='pointsAtY' href='filters.html#feSpotLightPointsAtYAttribute' animatable='yes'/>
-    <attribute name='pointsAtZ' href='filters.html#feSpotLightPointsAtZAttribute' animatable='yes'/>
-    <attribute name='specularExponent' href='filters.html#feSpotLightSpecularExponentAttribute' animatable='yes'/>
-    <attribute name='limitingConeAngle' href='filters.html#feSpotLightLimitingConeAngleAttribute' animatable='yes'/>
-  </element>
-
-  <element
-    name='feTile'
-    href='filters.html#feTileElement'
-    contentmodel='anyof'
-    elements='animate, set'
-    attributecategories='core, style, presentation, filter primitive'
-    attributes='in'
-    interfaces='SVGFETileElement'/>
-
-  <element
-      name='feTurbulence'
-      href='filters.html#feTurbulenceElement'
-      contentmodel='anyof'
-      elements='animate, set'
-      attributecategories='core, style, presentation, filter primitive'
-      interfaces='SVGFETurbulenceElement'>
-    <attribute name='baseFrequency' href='filters.html#feTurbulenceBaseFrequencyAttribute' animatable='yes'/>
-    <attribute name='numOctaves' href='filters.html#feTurbulenceNumOctavesAttribute' animatable='yes'/>
-    <attribute name='seed' href='filters.html#feTurbulenceSeedAttribute' animatable='yes'/>
-    <attribute name='stitchTiles' href='filters.html#feTurbulenceStitchTilesAttribute' animatable='yes'/>
-    <attribute name='type' href='filters.html#feTurbulenceTypeAttribute' animatable='yes'/>
-  </element>
-
-  <element
-      name='filter'
-      href='filters.html#FilterElement'
-      contentmodel='anyof'
-      elementcategories='descriptive, filter primitive'
-      elements='animate, set'
-      attributecategories='core, style, presentation, xlink'
-      interfaces='SVGFilterElement'>
-    <attribute name='x' href='filters.html#FilterElementXAttribute' animatable='yes'/>
-    <attribute name='y' href='filters.html#FilterElementYAttribute' animatable='yes'/>
-    <attribute name='width' href='filters.html#FilterElementWidthAttribute' animatable='yes'/>
-    <attribute name='height' href='filters.html#FilterElementHeightAttribute' animatable='yes'/>
-    <attribute name='filterRes' href='filters.html#FilterElementFilterResAttribute' animatable='yes'/>
-    <attribute name='filterUnits' href='filters.html#FilterElementFilterUnitsAttribute' animatable='yes'/>
-    <attribute name='primitiveUnits' href='filters.html#FilterElementPrimitiveUnitsAttribute' animatable='yes'/>
-    <attribute name='xlink:href' href='filters.html#FilterElementHrefAttribute' animatable='yes'/>
-  </element>
-
-  <element
       name='font'
       href='fonts.html#FontElement'
       contentmodel='anyof'
@@ -1061,7 +768,6 @@
   <elementcategory name='basic shape' href='intro.html#TermBasicShapeElement' elements='circle, ellipse, line, polygon, polyline, rect'/>
   <elementcategory name='container' href='intro.html#TermContainerElement' elements='svg, g, defs, symbol, mask, pattern, marker, a, switch, glyph, missing-glyph'/>
   <elementcategory name='descriptive' href='intro.html#TermDescriptiveElement' elements='desc, title, metadata'/>
-  <elementcategory name='filter primitive' href='intro.html#TermFilterPrimitiveElement' elements='feBlend, feFlood, feColorMatrix, feComponentTransfer, feComposite, feConvolveMatrix, feDiffuseLighting, feDisplacementMap, feGaussianBlur, feImage, feMerge, feMorphology, feOffset, feSpecularLighting, feTile, feTurbulence'/>
   <elementcategory name='gradient' href='intro.html#TermGradientElement' elements='linearGradient, radialGradient, meshGradient'/>
   <elementcategory name='graphics' href='intro.html#TermGraphicsElement' elements='path, text, rect, circle, ellipse, line, polyline, polygon, image, use'/>
   <elementcategory name='graphics referencing' href='intro.html#TermGraphicsReferencingElement' elements='use, image'/>
@@ -1087,9 +793,6 @@
   <attribute name='vert-origin-y' elements='glyph, missing-glyph' href='fonts.html#GlyphElementVertOriginYAttribute'/>
   <attribute name='vert-adv-y' elements='glyph, missing-glyph' href='fonts.html#GlyphElementVertAdvYAttribute'/>
 
-  <!-- attribute common to most filter primitives (all except feFlood feImage feMerge feTurbulence -->
-  <attribute name='in' elements='feBlend, feColorMatrix, feComponentTransfer, feComposite, feConvolveMatrix, feDiffuseLighting, feDisplacementMap, feGaussianBlur, feMergeNode, feMorphology, feOffset, feSpecularLighting, feTile' href='filters.html#FilterPrimitiveInAttribute' animatable='yes'/>
-
   <!-- attributes common to hkern and vkern -->
   <attribute name='u1' elements='hkern, vkern' href='fonts.html#HKernElementU1Attribute'/>
   <attribute name='g1' elements='hkern, vkern' href='fonts.html#HKernElementG1Attribute'/>
@@ -1197,16 +900,6 @@
   </attributecategory>
 
   <attributecategory
-      name='filter primitive'
-      href='intro.html#TermFilterPrimitiveAttributes'>
-    <attribute name='x' href='filters.html#FilterPrimitiveXAttribute' animatable='yes'/>
-    <attribute name='y' href='filters.html#FilterPrimitiveYAttribute' animatable='yes'/>
-    <attribute name='width' href='filters.html#FilterPrimitiveWidthAttribute' animatable='yes'/>
-    <attribute name='height' href='filters.html#FilterPrimitiveHeightAttribute' animatable='yes'/>
-    <attribute name='result' href='filters.html#FilterPrimitiveResultAttribute' animatable='yes'/>
-  </attributecategory>
-
-  <attributecategory
       name='animation attribute target'
       href='animate.html#TargetAttributes'>
     <attribute name='attributeType' href='animate.html#AttributeTypeAttribute'/>
@@ -1246,18 +939,6 @@
     <attribute name='accumulate' href='animate.html#AccumulateAttribute'/>
   </attributecategory>
 
-  <attributecategory
-      name='transfer function element'
-      href='filters.html#TransferFunctionElementAttributes'>
-    <attribute name='type' href='filters.html#feComponentTransferTypeAttribute' animatable='yes'/>
-    <attribute name='tableValues' href='filters.html#feComponentTransferTableValuesAttribute' animatable='yes'/>
-    <attribute name='slope' href='filters.html#feComponentTransferSlopeAttribute' animatable='yes'/>
-    <attribute name='intercept' href='filters.html#feComponentTransferInterceptAttribute' animatable='yes'/>
-    <attribute name='amplitude' href='filters.html#feComponentTransferAmplitudeAttribute' animatable='yes'/>
-    <attribute name='exponent' href='filters.html#feComponentTransferExponentAttribute' animatable='yes'/>
-    <attribute name='offset' href='filters.html#feComponentTransferOffsetAttribute' animatable='yes'/>
-  </attributecategory>
-
   <!-- ... properties ..................................................... -->
 
   <property name='alignment-baseline' href='text.html#AlignmentBaselineProperty'/>
@@ -1273,13 +954,9 @@
   <property name='cursor' href='interact.html#CursorProperty'/>
   <property name='direction' href='text.html#DirectionProperty'/>
   <property name='dominant-baseline' href='text.html#DominantBaselineProperty'/>
-  <property name='enable-background' href='filters.html#EnableBackgroundProperty'/>
   <property name='fill' href='painting.html#FillProperty'/>
   <property name='fill-opacity' href='painting.html#FillOpacityProperty'/>
   <property name='fill-rule' href='painting.html#FillRuleProperty'/>
-  <property name='filter' href='filters.html#FilterProperty'/>
-  <property name='flood-color' href='filters.html#FloodColorProperty'/>
-  <property name='flood-opacity' href='filters.html#FloodOpacityProperty'/>
   <property name='font' href='text.html#FontProperty'/>
   <property name='font-family' href='text.html#FontFamilyProperty'/>
   <property name='font-size' href='text.html#FontSizeProperty'/>
@@ -1292,7 +969,6 @@
   <property name='glyph-orientation-vertical' href='text.html#GlyphOrientationVerticalProperty'/>
   <property name='image-rendering' href='painting.html#ImageRenderingProperty'/>
   <property name='letter-spacing' href='text.html#LetterSpacingProperty'/>
-  <property name='lighting-color' href='filters.html#LightingColorProperty'/>
   <property name='marker' href='painting.html#MarkerProperty'/>
   <property name='marker-end' href='painting.html#MarkerEndProperty'/>
   <property name='marker-knockout-left' href='painting.html#MarkerKnockoutLeftProperty'/>
@@ -1470,33 +1146,6 @@
   <interface name='SVGFontFaceNameElement' href='fonts.html#InterfaceSVGFontFaceNameElement'/>
   <interface name='SVGMetadataElement' href='metadata.html#InterfaceSVGMetadataElement'/>
   <interface name='SVGForeignObjectElement' href='extend.html#InterfaceSVGForeignObjectElement'/>
-  <interface name='SVGFilterElement' href='filters.html#InterfaceSVGFilterElement'/>
-  <interface name='SVGFilterPrimitiveStandardAttributes' href='filters.html#InterfaceSVGFilterPrimitiveStandardAttributes'/>
-  <interface name='SVGFEBlendElement' href='filters.html#InterfaceSVGFEBlendElement'/>
-  <interface name='SVGFEColorMatrixElement' href='filters.html#InterfaceSVGFEColorMatrixElement'/>
-  <interface name='SVGFEComponentTransferElement' href='filters.html#InterfaceSVGFEComponentTransferElement'/>
-  <interface name='SVGComponentTransferFunctionElement' href='filters.html#InterfaceSVGComponentTransferFunctionElement'/>
-  <interface name='SVGFEFuncRElement' href='filters.html#InterfaceSVGFEFuncRElement'/>
-  <interface name='SVGFEFuncGElement' href='filters.html#InterfaceSVGFEFuncGElement'/>
-  <interface name='SVGFEFuncBElement' href='filters.html#InterfaceSVGFEFuncBElement'/>
-  <interface name='SVGFEFuncAElement' href='filters.html#InterfaceSVGFEFuncAElement'/>
-  <interface name='SVGFECompositeElement' href='filters.html#InterfaceSVGFECompositeElement'/>
-  <interface name='SVGFEConvolveMatrixElement' href='filters.html#InterfaceSVGFEConvolveMatrixElement'/>
-  <interface name='SVGFEDiffuseLightingElement' href='filters.html#InterfaceSVGFEDiffuseLightingElement'/>
-  <interface name='SVGFEDistantLightElement' href='filters.html#InterfaceSVGFEDistantLightElement'/>
-  <interface name='SVGFEPointLightElement' href='filters.html#InterfaceSVGFEPointLightElement'/>
-  <interface name='SVGFESpotLightElement' href='filters.html#InterfaceSVGFESpotLightElement'/>
-  <interface name='SVGFEDisplacementMapElement' href='filters.html#InterfaceSVGFEDisplacementMapElement'/>
-  <interface name='SVGFEFloodElement' href='filters.html#InterfaceSVGFEFloodElement'/>
-  <interface name='SVGFEGaussianBlurElement' href='filters.html#InterfaceSVGFEGaussianBlurElement'/>
-  <interface name='SVGFEImageElement' href='filters.html#InterfaceSVGFEImageElement'/>
-  <interface name='SVGFEMergeElement' href='filters.html#InterfaceSVGFEMergeElement'/>
-  <interface name='SVGFEMergeNodeElement' href='filters.html#InterfaceSVGFEMergeNodeElement'/>
-  <interface name='SVGFEMorphologyElement' href='filters.html#InterfaceSVGFEMorphologyElement'/>
-  <interface name='SVGFEOffsetElement' href='filters.html#InterfaceSVGFEOffsetElement'/>
-  <interface name='SVGFESpecularLightingElement' href='filters.html#InterfaceSVGFESpecularLightingElement'/>
-  <interface name='SVGFETileElement' href='filters.html#InterfaceSVGFETileElement'/>
-  <interface name='SVGFETurbulenceElement' href='filters.html#InterfaceSVGFETurbulenceElement'/>
   <interface name='SVGSolidColorElement' href='pservers.html#InterfaceSVGSolidColorElement'/>
 
   <!-- ... grammar symbols ................................................ -->
@@ -1541,10 +1190,6 @@
   <term name='basic shape' href='intro.html#TermBasicShapeElement'/>
   <term name='descriptive element' href='intro.html#TermDescriptiveElement'/>
   <term name='descriptive elements' href='intro.html#TermDescriptiveElement'/>
-  <term name='filter primitive' href='intro.html#TermFilterPrimitiveElement'/>
-  <term name='filter primitives' href='intro.html#TermFilterPrimitiveElement'/>
-  <term name='filter primitive element' href='intro.html#TermFilterPrimitiveElement'/>
-  <term name='filter primitive elements' href='intro.html#TermFilterPrimitiveElement'/>
   <term name='fill' href='intro.html#TermFill'/>
   <term name='filled' href='intro.html#TermFill'/>
   <term name='gradient element' href='intro.html#TermGradientElement'/>
@@ -1559,8 +1204,8 @@
   <term name='outermost svg elements' href='intro.html#TermOutermostSVGElement'/>
   <term name='rootmost SVG element' href='intro.html#TermRootmostSVGElement'/>
   <term name="rootmost 'svg' element" href='intro.html#TermRootmostSVGElement'>rootmost <span xmlns='http://www.w3.org/1999/xhtml' class="element-name">‘svg’</span> element</term>
-  <term name='shape' href='intro.html#TermShape'/>
-  <term name='shapes' href='intro.html#TermShape'/>
+  <term name='shape' href='intro.html#TermShapeElement'/>
+  <term name='shapes' href='intro.html#TermShapeElement'/>
   <term name='stroke' href='intro.html#TermStroke'/>
   <term name='stroked' href='intro.html#TermStroke'/>
   <term name='structural elements' href='intro.html#TermStructuralElement'/>
@@ -1587,8 +1232,6 @@
   <term name='event attributes' href='intro.html#TermEventAttribute'/>
   <term name='graphical event attribute' href='intro.html#TermGraphicalEventAttribute'/>
   <term name='graphical event attributes' href='intro.html#TermGraphicalEventAttribute'/>
-  <term name='filter primitive attribute' href='intro.html#TermFilterPrimitiveAttributes'/>
-  <term name='filter primitive attributes' href='intro.html#TermFilterPrimitiveAttributes'/>
   <term name='presentation attribute' href='intro.html#TermPresentationAttribute'/>
   <term name='presentation attributes' href='intro.html#TermPresentationAttribute'/>
   <term name='XLink attribute' href='intro.html#TermXLinkAttributes'/>
@@ -1637,7 +1280,7 @@
   <term name='transformation' href='intro.html#TermTransformation'/>
   <term name='transformations' href='intro.html#TermTransformation'/>
   <term name='transformation matrix' href='intro.html#TermTransformationMatrix'/>
-  <term name='transformation matrices' href='intro.html#TermTransformationMatrices'/>
+  <term name='transformation matrices' href='intro.html#TermTransformationMatrix'/>
   <term name='user agent' href='intro.html#TermUserAgent'/>
   <term name='user agents' href='intro.html#TermUserAgent'/>
   <term name='user coordinate system' href='intro.html#TermUserCoordinateSystem'/>
@@ -1651,8 +1294,6 @@
   <term name='cap shape' href='painting.html#TermCapShape'/>
   <term name='dash positions' href='painting.html#TermDashPositions'/>
   <term name='equivalent path' href='paths.html#TermEquivalentPath'/> 
-  <term name='filter region' href='filters.html#FilterEffectsRegion'/>
-  <term name='filter primitive subregion' href='filters.html#FilterPrimitiveSubRegion'/>
   <term name='initial coordinate system' href='coords.html#InitialCoordinateSystem'/>
   <term name='inherit' href='http://www.w3.org/TR/2008/REC-CSS2-20080411/cascade.html#value-def-inherit'/>
   <term name='object bounding box units' href='coords.html#ObjectBoundingBoxUnits'/>
@@ -1673,10 +1314,6 @@
   
   <!-- === defined in other specifications ================================ -->
 
-  <!-- ... properties ..................................................... -->
-
-  <property name='color-interpolation-filters' href='https://dvcs.w3.org/hg/FXTF/raw-file/tip/filters/index.html#ColorInterpolationFiltersProperty'/>
-
   <!-- ... interfaces ..................................................... -->
 
   <interface name='DocumentCSS' href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113/css.html#CSS-DocumentCSS'/>
@@ -1704,6 +1341,8 @@
   <!-- ... terms .......................................................... -->
   <term name='compound selector' href='http://dev.w3.org/csswg/selectors4/#compound'/>
   <term name='compound selectors' href='http://dev.w3.org/csswg/selectors4/#compound'/>
+  <term name='filter primitive element' href='https://dvcs.w3.org/hg/FXTF/raw-file/tip/filters/index.html#TermFilterPrimitiveElement'/>
+  <term name='filter primitive elements' href='https://dvcs.w3.org/hg/FXTF/raw-file/tip/filters/index.html#TermFilterPrimitiveElement'/>
   <term name='tree order' href='http://www.w3.org/TR/2012/WD-dom-20120405/#concept-tree-order'/>
 
 </definitions>
--- a/master/index.html	Sun Aug 19 11:48:44 2012 +1000
+++ b/master/index.html	Sun Aug 19 16:26:58 2012 +1000
@@ -134,6 +134,10 @@
 <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5 February 2004 W3C Patent Policy</a>. 
 W3C maintains a <a rel="disclosure" href="http://www.w3.org/2004/01/pp-impl/19480/status">public list of any patent disclosures</a> made in connection with the deliverables of the group; that page also includes instructions for disclosing a patent. An individual who has actual knowledge of a patent which the individual believes contains <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/#def-essential">Essential Claim(s)</a> must disclose the information in accordance with <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/#sec-Disclosure">section 6 of the W3C Patent Policy</a>.</p>
 
+<p>Publication as a Working Draft does not imply endorsement by the W3C Membership.
+This is a draft document and may be updated, replaced or obsoleted by other documents
+at any time. It is inappropriate to cite this document as other than work in progress.</p>
+
 <p>A list of current W3C Recommendations and other technical documents can be found at
 <a href="http://www.w3.org/TR/" class='url'>http://www.w3.org/TR/</a>. W3C publications
 may be updated, replaced, or obsoleted by other documents at any time.</p>
--- a/master/intro.html	Sun Aug 19 11:48:44 2012 +1000
+++ b/master/intro.html	Sun Aug 19 16:26:58 2012 +1000
@@ -124,8 +124,8 @@
   like <a>'xlink:role'</a> will be removed.</p></li>
 
   <li>SVG content can be styled by either CSS (see
-  <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/"><cite>Cascading Style Sheets (CSS) level 2</cite></a>
-  [<a href="refs.html#ref-CSS2">CSS2</a>]) or XSLT
+  <a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/"><cite>Cascading Style Sheets (CSS) Level 2 Revision 1</cite></a>
+  [<a href="refs.html#ref-CSS21">CSS21</a>]) or XSLT
   (see <a href="http://www.w3.org/TR/1999/REC-xslt-19991116"><cite>XSL Transformations (XSLT) Version 1.0</cite></a>
   [<a href="refs.html#ref-XSLT">XSLT</a>] and
   <a href="http://www.w3.org/TR/2007/REC-xslt20-20070123/"><cite>XSL Transformations (XSLT) Version 2.0</cite></a>
@@ -438,7 +438,7 @@
 
   <dt id="TermMarkableElement">markable element</dt>
   <dd>A markable element is one that can have <a href="painting.html#Markers">markers</a>
-  painted on it either through the use of the <a href="painting.html#MarkerProperties">marker properties</a>
+  painted on it either through the use of the <a href="painting.html#TermMarkerProperties">marker properties</a>
   or by having a <a>'marker element'</a> element as a child.
   The following elements are markable elements:
   <edit:elementcategory name='markable'/></dd>
@@ -499,7 +499,7 @@
   assigned to elements in the SVG language either by
   <a>presentation attributes</a>
   on elements in the SVG language or by using a styling language such as CSS
-  [<a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/">CSS2</a>]. See
+  [<a href="refs.html#ref-CSS21">CSS21</a>]. See
   <a href="styling.html">Styling</a>.</dd>
       
   <dt id="TermRootmostSVGElement">rootmost <span class="element-name">'svg'</span> element</dt>
--- a/master/publish.xml	Sun Aug 19 11:48:44 2012 +1000
+++ b/master/publish.xml	Sun Aug 19 16:26:58 2012 +1000
@@ -27,6 +27,8 @@
   </versions>
 
   <definitions href='definitions.xml'/>
+  <definitions href='definitions-filters.xml' base='https://dvcs.w3.org/hg/FXTF/raw-file/tip/filters/index.html'/>
+
   <interfaces idl='../build/svg.idlx'/>
 
   <toc href='toc.html'/>