--- a/master/definitions-masking.xml Tue Mar 26 09:34:26 2013 -0700
+++ b/master/definitions-masking.xml Tue Mar 26 11:16:14 2013 -0700
@@ -38,7 +38,10 @@
<!-- ... properties ..................................................... -->
- <property name='mask' href='#MaskProperty'/>
+ <property name='mask' href='#mask-property'/>
+ <property name='clip' href='#clip-property'/>
+ <property name='clip-path' href='#the-clip-path'/>
+ <property name='clip-rule' href='#the-clip-rule'/>
<!-- ... interfaces ..................................................... -->
@@ -46,7 +49,6 @@
<interface name='SVGClipPathElement' href='#InterfaceSVGClipPathElement'/>
<!-- ... grammar symbols ................................................ -->
- <symbol name='mask-source' href='#DataTypeMaskSource'/>
<!-- ... terms (these will be generated later) .......................... -->
--- a/master/definitions.xml Tue Mar 26 09:34:26 2013 -0700
+++ b/master/definitions.xml Tue Mar 26 11:16:14 2013 -0700
@@ -115,17 +115,6 @@
</element>
<element
- name='clipPath'
- href='masking.html#ClipPathElement'
- contentmodel='anyof'
- elementcategories='descriptive, animation, shape, paint server'
- elements='text, use, clipPath, marker'
- attributecategories='core, presentation, style'
- interfaces='SVGClipPathElement'>
- <attribute name='clipPathUnits' elements='clipPath' href='masking.html#ClipPathElementClipPathUnitsAttribute' animatable='yes'/>
- </element>
-
- <element
name='color-profile'
href='color.html#ColorProfileElement'
contentmodel='anyof'
@@ -408,23 +397,6 @@
</element>
<element
- name='mask'
- href='masking.html#MaskElement'
- contentmodel='anyof'
- elementcategories='animation, descriptive, shape, structural, paint server'
- elements='a, clipPath, color-profile, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, view, text, altGlyphDef'
- attributecategories='core, presentation, style'
- interfaces='SVGMaskElement'>
- <attribute name='x' elements='mask' href='masking.html#MaskElementXAttribute' animatable='yes'/>
- <attribute name='y' elements='mask' href='masking.html#MaskElementYAttribute' animatable='yes'/>
- <attribute name='width' elements='mask' href='masking.html#MaskElementWidthAttribute' animatable='yes'/>
- <attribute name='height' elements='mask' href='masking.html#MaskElementHeightAttribute' animatable='yes'/>
- <attribute name='maskUnits' elements='mask' href='masking.html#MaskElementMaskUnitsAttribute' animatable='yes'/>
- <attribute name='maskContentUnits' elements='mask' href='masking.html#MaskElementMaskContentUnitsAttribute' animatable='yes'/>
- <attribute name='maskType' elements='mask' href='masking.html#MaskElementMaskTypeAttribute' animatable='yes'/>
- </element>
-
- <element
name='meshGradient'
href='pservers.html#MeshGradientElement'
contentmodel='anyof'
@@ -987,9 +959,6 @@
<property name='alignment-baseline' href='text.html#AlignmentBaselineProperty'/>
<property name='baseline-shift' href='text.html#BaselineShiftProperty'/>
<property name='buffered-rendering' href='painting.html#BufferedRenderingProperty'/>
- <property name='clip' href='masking.html#ClipProperty'/>
- <property name='clip-path' href='masking.html#ClipPathProperty'/>
- <property name='clip-rule' href='masking.html#ClipRuleProperty'/>
<property name='color' href='color.html#ColorProperty'/>
<property name='color-interpolation' href='painting.html#ColorInterpolationProperty'/>
<property name='color-rendering' href='painting.html#ColorRenderingProperty'/>
@@ -1019,7 +988,6 @@
<property name='marker-pattern' href='painting.html#MarkerPatternProperty'/>
<property name='marker-segment' href='painting.html#MarkerSegmentProperty'/>
<property name='marker-start' href='painting.html#MarkerStartProperty'/>
- <property name='mask' href='masking.html#MaskProperty'/>
<property name='overflow' href='masking.html#OverflowProperty'/>
<property name='paint-order' href='painting.html#PaintOrderProperty'/>
<property name='pointer-events' href='interact.html#PointerEventsProperty'/>
@@ -1090,8 +1058,6 @@
<interface name='SVGTransformList' href='coords.html#InterfaceSVGTransformList'/>
<interface name='SVGAnimatedTransformList' href='coords.html#InterfaceSVGAnimatedTransformList'/>
<interface name='SVGGradientElement' href='pservers.html#InterfaceSVGGradientElement'/>
- <interface name='SVGClipPathElement' href='masking.html#InterfaceSVGClipPathElement'/>
- <interface name='SVGMaskElement' href='masking.html#InterfaceSVGMaskElement'/>
<interface name='SVGAnimatedLengthList' href='types.html#InterfaceSVGAnimatedLengthList'/>
<interface name='SVGAnimatedAngle' href='types.html#InterfaceSVGAnimatedAngle'/>
<interface name='SVGAnimatedString' href='types.html#InterfaceSVGAnimatedString'/>
@@ -1212,7 +1178,6 @@
<symbol name='list-of-family-names' href='types.html#DataTypeListOfFamilyNames'/>
<symbol name='list-of-strings' href='types.html#DataTypeListOfStrings'/>
<symbol name='marker-ref' href='types.html#DataTypeMarkerRef'/>
- <symbol name='mask-source' href='masking.html#DataTypeMaskSource'/>
<symbol name="name" href="types.html#DataTypeName"></symbol>
<symbol name='number' href='types.html#DataTypeNumber'/>
<symbol name='number-optional-number' href='types.html#DataTypeNumberOptionalNumber'/>
--- a/master/publish.xml Tue Mar 26 09:34:26 2013 -0700
+++ b/master/publish.xml Tue Mar 26 11:16:14 2013 -0700
@@ -27,6 +27,7 @@
<definitions href='definitions.xml'/>
<definitions href='definitions-filters.xml' base='http://www.w3.org/TR/2012/WD-filter-effects-20121025/'/>
+ <definitions href='definitions-masking.xml' base='http://www.w3.org/TR/2012/WD-css-masking-20121115/'/>
<interfaces idl='../build/svg.idlx'/>