Merge branch 'master' into remove-solidcolour

master/changes.html

@@ -666,11 +666,11 @@ <h3 id="pservers">Paint Servers chapter (owner: BogdanBrinza)</h3>
   <li>Added an <a>'radialGradient/fr'</a> attribute to the <a>'radialGradient'</a> element,
   which allows specifying the radius of the focal circle.</li>
 
-  <li>Added a section for mesh gradients, defining the <a>'mesh'</a>, <a>'meshrow'</a>
-    and <a>'meshpatch'</a> elements. (Renamed 'meshGradient' to 'mesh', 'meshRow' to 'meshrow',
+  <li>Added a section for mesh gradients, defining the mesh, meshrow
+    and meshpatch elements. (Renamed 'meshGradient' to 'mesh', 'meshRow' to 'meshrow',
     and 'meshPatch' to 'meshpatch'.)</li>
 
-  <li>Added a section for hatches, defining the <a>'hatch'</a> and <a>'hatchpath'</a> elements.
+  <li>Added a section for hatches, defining the hatch and hatchpath elements.
   (Renamed 'hatchPath' to 'hatchpath'.)</li>
 
   <li>Renamed <span class="attr-name">'gradientTransform'</span> on the <a>'mesh'</a> element
@@ -690,6 +690,8 @@ <h3 id="pservers">Paint Servers chapter (owner: BogdanBrinza)</h3>
 <div class='changed-since-cr1'>
 <ul>
   <li><a>SVGGradientElement</a> and <a>SVGPatternElement</a> no longer implement <a>SVGUnitTypes</a>. <a href="https://github.com/w3c/svgwg/issues/291">Github #291</a>.</li>
+  <li>Deferred hatch and hatchpath elements to a future version of SVG.</li>
+  <li>Deferred mesh gradients, including mesh, meshrow, and meshpath elements to a future version of SVG.</li>
   <li>Removed the solidcolor element and the solid-color and solid-opacity properties.</li>
 </ul>
 </div>
@@ -731,13 +733,19 @@ <h3 id="interact">Interactivity chapter (owner: BogdanBrinza)</h3>
   <li>Removed SVGZoomEvent.</li>
   <li>Clarify that shadow DOM content is focusable and interactive.</li>
   <li>Change display behavior of script elements to be defined using user agent styles.</li>
-  <li>Mark <a>'cursor element'</a> element as deprecated, update description of <a>'cursor property'</a>.</li>
+  <li>Mark cursor element as deprecated, update description of <a>'cursor property'</a>.</li>
 </ul>
 
+<div class='changed-since-cr1'>
+  <ul>
+    <li>Removed the cursor element and the SVG specific definition of the <a>'cursor property'</a></li>
+  </ul>
+</div>
+
 <h3 id="linking">Linking chapter (owner: BogdanBrinza)</h3>
 
 <ul>
-  <li><a id="linking-tests" href="https://github.com/w3c/web-platform-tests/tree/master/svg/linking/reftests">Tests</a></li>
+  <li><a id="linking-tests-all" href="https://github.com/w3c/web-platform-tests/tree/master/svg/linking/reftests">Tests</a></li>
   <li><a id="linking-test-results" href="https://wpt.fyi/svg/linking/reftests/">Test results</a></li>
 </ul>
 

master/coords.html

@@ -21,16 +21,16 @@ <h2 id="Introduction">Introduction</h2>
 <div class="ready-for-wider-review">
 
 <p>All SVG content is drawn inside
-<dfn id="TermSVGViewport" data-dfn-type="dfn" data-dfn-export="">SVG viewports</dfn>.
+<dfn id="TermSVGViewport" data-dfn-type="dfn" data-export="">SVG viewports</dfn>.
 Every SVG viewport defines a drawing region characterized by a size 
 (width, height), and an origin, measured in abstract 
-<dfn id="TermUserUnits" data-dfn-type="dfn" data-dfn-export="">user units</dfn>.</p>
+<dfn id="TermUserUnits" data-dfn-type="dfn" data-export="">user units</dfn>.</p>
 
 <p class="note">Note that the term SVG viewport is distinct from the 
 <a href="https://www.w3.org/TR/2011/REC-CSS2-20110607/visuren.html#viewport">"viewport"</a>
 term used in CSS.</p> 
 
-<p>The <dfn id="TermInitialViewport" data-dfn-type="dfn" data-dfn-export="">initial viewport</dfn> is a top-level
+<p>The <dfn id="TermInitialViewport" data-dfn-type="dfn" data-export="">initial viewport</dfn> is a top-level
 SVG viewport that establishes a mapping between the coordinate system used
 by the containing environment (for example, CSS pixels in web browsers)
 and <a>user units</a>. Establishing an initial viewport is described in more
@@ -41,8 +41,8 @@ <h2 id="Introduction">Introduction</h2>
 on which elements generate viewports.</p>
 
 <p>Each SVG viewport generates a 
-<dfn id="TermViewportCoordinateSystem" data-dfn-type="dfn" data-dfn-export="">viewport coordinate system</dfn>
-and a <dfn id="TermLocalCoordinateSystem" data-dfn-type="dfn" data-dfn-export="">local coordinate system</dfn>, initially identical.
+<dfn id="TermViewportCoordinateSystem" data-dfn-type="dfn" data-export="">viewport coordinate system</dfn>
+and a <dfn id="TermLocalCoordinateSystem" data-dfn-type="dfn" data-export="">local coordinate system</dfn>, initially identical.
 Providing a <a>'viewBox'</a> on a viewport's element transforms the local coordinate system 
 relative to the viewport coordinate system as described in
 The <a>'viewBox'</a> attribute. Child elements of a viewport can
@@ -67,7 +67,7 @@ <h2 id="Introduction">Introduction</h2>
 the <a>viewport coordinate system</a> relative to the parent element's local coordinate system.</p>
 
 <p>Abstractly, all SVG viewports are embedded in the
-<dfn id="TermCanvas" data-dfn-type="dfn" data-dfn-export="">canvas</dfn>,
+<dfn id="TermCanvas" data-dfn-type="dfn" data-export="">canvas</dfn>,
 a drawing region that is infinitely large in all relevant dimensions.</p>
 
 <h2 id="ComputingAViewportsTransform">Computing the equivalent transform of an SVG viewport</h2>
@@ -243,7 +243,7 @@ <h2 id="ViewBoxAttribute">The <span class="attr-name">'viewBox'</span> attribute
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="TermViewBox" data-dfn-type="element-attr" data-dfn-for="svg" data-dfn-export="">viewBox</dfn></td>
+        <td><dfn id="TermViewBox" data-dfn-type="element-attr" data-dfn-for="svg" data-export="">viewBox</dfn></td>
         <td>[<span class="attr-value">&lt;min-x&gt;</span>,?
             <span class="attr-value">&lt;min-y&gt;</span>,?
             <span class="attr-value">&lt;width&gt;</span>,?
@@ -440,7 +440,7 @@ <h2 id="PreserveAspectRatioAttribute">The <span class="attr-name">'preserveAspec
         <th>Animatable</th>
       </tr>
       <tr>
-        <td><dfn id="TermPreserveAspectRatio" data-dfn-type="element-attr" data-dfn-for="svg" data-dfn-export="">preserveAspectRatio</dfn></td>
+        <td><dfn id="TermPreserveAspectRatio" data-dfn-type="element-attr" data-dfn-for="svg" data-export="">preserveAspectRatio</dfn></td>
         <td><span class="attr-value">&lt;align&gt;</span> <span class="attr-value">&lt;meetOrSlice&gt;</span>?</td>
         <td>xMidYMid meet</td>
         <td>yes</td>
@@ -821,9 +821,9 @@ <h2 id="Units">Units</h2>
 
 <h2 id="BoundingBoxes">Bounding boxes</h2>
 
-<dl class='definitions' data-dfn-type="dfn" data-dfn-export="">
+<dl class='definitions' data-dfn-type="dfn" data-export="">
 
-  <dt id="TermBoundingBox"><dfn id="bounding-box" data-dfn-type="dfn" data-dfn-export="">bounding box</dfn></dt>
+  <dt id="TermBoundingBox"><dfn id="bounding-box" data-dfn-type="dfn" data-export="">bounding box</dfn></dt>
   <dd>
       <p>The bounding box (or "bbox") of an element is the tightest fitting rectangle
       aligned with the axes of that element's user coordinate system that entirely
@@ -834,15 +834,15 @@ <h2 id="BoundingBoxes">Bounding boxes</h2>
 <p>Three kinds of bounding boxes can be computed for an element:</p>
 
 <ol>
-  <li>The <dfn id="TermObjectBoundingBox" data-dfn-type="dfn" data-dfn-export="">object bounding box</dfn> is the bounding box that contains only
+  <li>The <dfn id="TermObjectBoundingBox" data-dfn-type="dfn" data-export="">object bounding box</dfn> is the bounding box that contains only
   an element's geometric shape.  For <a>basic shapes</a>, this is the area
   that is filled.  Unless otherwise specified, this is what is meant by the
   unqualified term "bounding box".</li>
 
-  <li>The <dfn id="TermStrokeBoundingBox" data-dfn-type="dfn" data-dfn-export="">stroke bounding box</dfn> is the bounding box that contains
+  <li>The <dfn id="TermStrokeBoundingBox" data-dfn-type="dfn" data-export="">stroke bounding box</dfn> is the bounding box that contains
   an element's geometric shape and its <a>stroke shape</a>.</li>
 
-  <li>The <dfn id="TermDecoratedBoundingBox" data-dfn-type="dfn" data-dfn-export="">decorated bounding box</dfn> is the bounding box that contains
+  <li>The <dfn id="TermDecoratedBoundingBox" data-dfn-type="dfn" data-export="">decorated bounding box</dfn> is the bounding box that contains
   an element's geometric shape, its <a>stroke shape</a> and its <a>markers</a>.</li>
 </ol>
 
@@ -926,7 +926,7 @@ <h2 id="BoundingBoxes">Bounding boxes</h2>
 calculation, each glyph must be treated as a separate graphics element.
 The calculations must assume that all glyphs occupy the <a>full glyph cell</a>.
 <span class='ready-for-wider-review'>
-The <dfn id="TermFullGlyphCell" data-dfn-type="dfn" data-dfn-export="">full glyph cell</dfn> must have width
+The <dfn id="TermFullGlyphCell" data-dfn-type="dfn" data-export="">full glyph cell</dfn> must have width
 equal to the horizontal advance and height equal to the EM box for horizontal
 text. For vertical text that is typeset sideways, the <a>full glyph cell</a> must 
 have width equal to the EM box and height equal to the horizontal advance.
@@ -1138,18 +1138,6 @@ <h2 id="ObjectBoundingBoxUnits">Object bounding box units</h2>
       gradient is applied.</td>
     </edit:with>
   </tr>
-  <tr>
-    <edit:with element='meshgradient'>
-      <td><a>'meshgradient'</a></td>
-      <td><a>'gradientUnits'</a></td>
-      <td>Indicates that the attributes which specify the paint server
-	mesh starting point (<a>'x'</a>, <a>'y'</a>) represent
-	fractions or percentages and that mesh path data represents
-	fractions of the bounding box of the element to which the mesh
-	is applied. If the mesh is rendered inside a <a>'mesh'</a> element
-	the current SVG viewport is used in place of a bounding box.</td>
-    </edit:with>
-  </tr>
   <edit:with element='pattern'>
     <tr>
       <td><a>'pattern'</a></td>
@@ -1452,7 +1440,7 @@ <h2 id="VectorEffects">Vector effects</h2>
 <table class="propdef def">
   <tr>
     <th>Name:</th>
-    <td><dfn id="VectorEffectProperty" data-dfn-type="property" data-dfn-export="">vector-effect</dfn></td>
+    <td><dfn id="VectorEffectProperty" data-dfn-type="property" data-export="">vector-effect</dfn></td>
   </tr>
   <tr>
     <th>Value:</th>
@@ -3218,7 +3206,7 @@ <h3 id="InterfaceSVGTransform">Interface SVGTransform</h3>
 <a href='https://drafts.csswg.org/css-transforms-1/#typedef-transform-function'>&lt;transform-function&gt;</a>
 value, which is called its <dfn id="TransformValue" data-dfn-type="dfn">value</dfn>.
 It also maintains a <a>DOMMatrix</a> object,
-which is called its <dfn id="TransformMatrixObject" data-dfn-type="dfn" data-dfn-export="">matrix object</dfn>,
+which is called its <dfn id="TransformMatrixObject" data-dfn-type="dfn" data-export="">matrix object</dfn>,
 which is the object returned from the <a href="#__svg__SVGTransform__matrix">matrix</a>
 IDL attribute.  An <a>SVGTransform</a> object's
 <a href="#TransformMatrixObject">matrix object</a>

master/definitions-masking.xml

@@ -11,7 +11,7 @@
       href='#MaskElement'
       contentmodel='anyof'
       elementcategories='animation, descriptive, shape, structural, gradient'
-      elements='a, clipPath, color-profile, cursor, filter, font, font-face, foreignObject, image, marker, mask, pattern, script, style, switch, view, text, altGlyphDef'
+      elements='a, clipPath, color-profile, filter, font, font-face, foreignObject, image, marker, mask, pattern, script, style, switch, view, text, altGlyphDef'
       attributecategories='conditional processing, core, presentation, style'
       interfaces='SVGMaskElement'>
     <attribute name='x' elements='mask' href='#element-attrdef-mask-x' animatable='yes'/>