Merge pull request #450 from dstorey/remove-solidcolour

Remove solidcolour
w3c · May 18, 2018 · f05f02e · f05f02e
2 parents 3f5e08e + 5c98303
commit f05f02e
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 170 deletions.
diff --git a/master/changes.html b/master/changes.html
@@ -659,8 +659,8 @@ <h3 id="color">Color chapter (owner: Chris Lilley)</h3>
 <h3 id="pservers">Paint Servers chapter (owner: BogdanBrinza)</h3>
 
 <ul>
-  <li>Added the <a>'solidcolor'</a> element and its two properties <a>'solid-color'</a>
-    and <a>'solid-opacity'</a>, ported over from SVG Tiny 1.2. (Renamed 'solidColor' to
+  <li>Added the solidcolor element and its two properties solid-color
+    and solid-opacity, ported over from SVG Tiny 1.2. (Renamed 'solidColor' to
   'solidcolor'.)</li>
 
   <li>Added an <a>'radialGradient/fr'</a> attribute to the <a>'radialGradient'</a> element,
@@ -692,6 +692,7 @@ <h3 id="pservers">Paint Servers chapter (owner: BogdanBrinza)</h3>
   <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>
 

diff --git a/master/definitions.xml b/master/definitions.xml
@@ -291,16 +291,6 @@
     <attribute name='crossorigin' href='interact.html#ScriptElementCrossoriginAttribute' animatable='yes'/>
   </element>
 
-  <element
-      name='solidcolor'
-      href='pservers.html#SolidcolorElement'
-      contentmodel='anyof'
-      elementcategories='descriptive'
-      elements='animate, set, script, style'
-      attributecategories='core, global event, document element event, presentation, style'
-      interfaces='SVGSolidcolorElement'>
-  </element>
-
   <element
       name='stop'
       href='pservers.html#StopElement'
@@ -452,7 +442,7 @@
   <elementcategory name='gradient' href='pservers.html#TermGradientElement' elements='linearGradient, radialGradient'/>
   <elementcategory name='graphics' href='struct.html#TermGraphicsElement' elements='path, text, tspan, textPath, rect, circle, ellipse, line, polyline, polygon, image, foreignObject, iframe, video, audio, canvas'/>
   <elementcategory name='graphics referencing' href='struct.html#TermGraphicsReferencingElement' elements='use, image, mesh, iframe, video, audio'/>
-  <elementcategory name='paint server' href='painting.html#TermPaintServerElement' elements='solidcolor, linearGradient, radialGradient, pattern'/>
+  <elementcategory name='paint server' href='painting.html#TermPaintServerElement' elements='linearGradient, radialGradient, pattern'/>
   <elementcategory name='shape' href='shapes.html#TermShapeElement' elements='circle, ellipse, line, path, polygon, polyline, rect'/>
   <elementcategory name='structural' href='struct.html#TermStructuralElement' elements='defs, g, svg, symbol, use'/>
   <elementcategory name='structurally external' href='struct.html#TermStructurallyExternalElement' elements='script, image, use, iframe, video, audio, foreignObject'/>
@@ -567,7 +557,7 @@
   <attributecategory
     name='presentation'
     href='styling.html#TermPresentationAttribute'
-    presentationattributes='alignment-baseline, baseline-shift, clip, clip-path, clip-rule, color, color-interpolation, color-interpolation-filters, color-rendering, cursor, direction, display, dominant-baseline, 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, letter-spacing, lighting-color, marker-end, marker-mid, marker-start, mask, opacity, overflow, paint-order, pointer-events, shape-rendering, solid-color, solid-opacity, 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, transform, unicode-bidi, vector-effect, visibility, word-spacing, writing-mode'/>
+    presentationattributes='alignment-baseline, baseline-shift, clip, clip-path, clip-rule, color, color-interpolation, color-interpolation-filters, color-rendering, cursor, direction, display, dominant-baseline, 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, letter-spacing, lighting-color, marker-end, marker-mid, marker-start, mask, opacity, overflow, paint-order, 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, transform, unicode-bidi, vector-effect, visibility, word-spacing, writing-mode'/>
 
   <attributecategory
       name='document event'
@@ -703,8 +693,6 @@
   <property name='paint-order' href='painting.html#PaintOrderProperty'/>
   <property name='pointer-events' href='interact.html#PointerEventsProperty'/>
   <property name='shape-rendering' href='painting.html#ShapeRenderingProperty'/>
-  <property name='solid-color' href='pservers.html#SolidcolorProperty'/>
-  <property name='solid-opacity' href='pservers.html#SolidOpacityProperty'/>
   <property name='stop-color' href='pservers.html#StopColorProperty'/>
   <property name='stop-opacity' href='pservers.html#StopOpacityProperty'/>
   <property name='stroke' href='painting.html#StrokeProperty'/>
@@ -885,7 +873,6 @@
   <interface name='SVGScriptElement' href='interact.html#InterfaceSVGScriptElement'/>
   <interface name='SVGMetadataElement' href='struct.html#InterfaceSVGMetadataElement'/>
   <interface name='SVGForeignObjectElement' href='embedded.html#InterfaceSVGForeignObjectElement'/>
-  <interface name='SVGSolidcolorElement' href='pservers.html#InterfaceSVGSolidcolorElement'/>
   <interface name='SVGBoundingBoxOptions' href='types.html#SVGBoundingBoxOptions'/>
   <interface name='SVGNameList' href='types.html#ListInterfaces'/> <!-- not a real interface -->
   <interface name='HTMLHyperlinkElementUtils' href='https://html.spec.whatwg.org/multipage/links.html#htmlhyperlinkelementutils'/>

diff --git a/master/images/pservers/pservers_example.png b/master/images/pservers/pservers_example.png
diff --git a/master/images/pservers/pservers_example.svg b/master/images/pservers/pservers_example.svg
diff --git a/master/pservers.html b/master/pservers.html
@@ -36,7 +36,6 @@ <h2 id="Introduction">Introduction</h2>
 </p>
 
 <ul>
-  <li><a href="#Solidcolors">Solid colors</a>,</li>
   <li><a href="#Gradients">Gradients</a>,</li>
   <li><a href="#Patterns">Patterns</a>.</li>
 </ul>
@@ -64,10 +63,9 @@ <h2 id="Introduction">Introduction</h2>
 
 <div class="figure">
   <img
-     alt="Image of three types of paint servers."
-     src="images/pservers/pservers_example.png"/>
-  <p class="caption">Three types of paint servers. From left to right:
-    A solid color ("MyLightPurple").
+     alt="Image of two types of paint servers."
+     src="images/pservers/pservers_example.svg"/>
+  <p class="caption">Two types of paint servers. From left to right:
     A linear gradient.
     A pattern.
   </p>
@@ -208,124 +206,6 @@ <h3 id="PaintServerTemplates">Using paint servers as templates</h3>
   SVG 1.1 did not define how styles applied to inherited paint server content.
 </p>
 
-<h2 id="Solidcolors">Solid colors</h2>
-
-<p class="note">Solid Colors are new in SVG 2 (ported from SVG 1.2 Tiny).</p>
-
-<div class="annotation svg2-requirement">
-  <table>
-    <tr>
-      <th>SVG 2 Requirement:</th>
-      <td>Support named colors.</td>
-    </tr>
-    <tr>
-      <th>Resolution:</th>
-      <td><a href="http://www.w3.org/2012/01/26-svg-minutes.html">Will add <span class="element-name">'solidColor'</span> element to SVG 2.</a></td>
-    </tr>
-    <tr>
-      <th>Purpose:</th>
-      <td>To provide an easy mechanism for creating named colors and palettes. Also useful for animation.</td>
-    </tr>
-    <tr>
-      <th>Owner:</th>
-      <td>Tav (no action)</td>
-    </tr>
-  </table>
-</div>
-
-<p>The 'solidcolor' element is a paint server that provides a single
-color with opacity. It can be referenced any place a single color
-can be used. The 'solidcolor' element allows a palette to be defined
-and used consistently throughout a document. It is also useful as
-away of animating a palette colors.  (See CSS3 Color for a more general
-discussion of color [<a href="refs.html#ref-css3-color">css3-color</a>].)</p>
-
-<p class="note">
-  In SVG 1.1, <em>1-stop</em> gradients can be used to to produce a
-  palette.  This method for creating a palette fails, however, when a
-  palette color is to be used for a gradient stop, a flood-fill, etc.
-</p>
-
-<edit:with element='solidcolor'>
-
-<p id="SolidcolorElement">Solid colors are defined by a <a>'solidcolor'</a>
-element.</p>
-
-<edit:elementsummary name='solidcolor'/>
-
-<h3 id="SolidcolorProperties">Properties</h3>
-
-  <dl class="propdef-list-svg2">
-
-    <dt id="SolidcolorProperty"><span class="propdef-title property">'solid-color'</span></dt>
-    <dd>
-
-      <p>
-	The <a>'solid-color'</a> property specifies the color of
-	the <a>'solidcolor'</a>. The keyword
-	<span class="attr-value">currentColor</span> and ICC colors
-	can be specified in the same manner as within a
-	<a href="painting.html#SpecifyingPaint">&lt;paint&gt;</a>
-	specification for the <a>'fill'</a> and <a>'stroke'</a>
-	properties.
-      </p>
-
-      <dl class="propdef-svg2">
-	<dt>Value</dt>
-        <dd>
-	  currentColor |
-	  <a>&lt;color&gt;</a> <a>&lt;icccolor&gt;</a>
-	</dd>
-        <dt>Initial</dt>            <dd>black</dd>
-        <dt>Applies to</dt>         <dd><a>'solid-color'</a> elements</dd>
-        <dt>Inherited</dt>          <dd>no</dd>
-        <dt>Percentages</dt>        <dd>N/A</dd>
-        <dt>Media</dt>              <dd>visual</dd>
-        <dt><a>Animatable</a></dt>  <dd>yes</dd>
-      </dl>
-    </dd>
-
-    <dt id="SolidOpacityProperty"><span class="propdef-title property">'solid-opacity'</span></dt>
-    <dd>
-      <p>
-      The <a>'solid-opacity'</a> property defines the opacity of
-      the <a>'solidcolor'</a>.
-      The value of 'solid-opacity' is independent of the opacity used to
-      render the paint via <a>'fill'</a> or <a>'stroke'</a>.</p>
-
-      <dl class="propdef-svg2">
-        <dt>Value</dt>              <dd><a>&lt;alpha-value&gt;</a></dd>
-        <dt>Initial</dt>            <dd>1</dd>
-        <dt>Applies to</dt>         <dd><a>'solid-color'</a> elements</dd>
-        <dt>Inherited</dt>          <dd>no</dd>
-        <dt>Percentages</dt>        <dd>N/A</dd>
-        <dt>Media</dt>              <dd>visual</dd>
-        <dt><a>Animatable</a></dt>  <dd>yes</dd>
-      </dl>
-
-      <dl class="propdef-values">
-        <dt>&lt;number&gt;</dt>
-        <dd>
-          The opacity of the <a>'solid-color'</a>. Any values outside the
-          range 0.0 (fully transparent) to 1.0 (fully opaque) must be
-          clamped to this range. 
-        </dd>
-        <dt>&lt;percentage&gt;</dt>
-        <dd>
-          The opacity of the <a>'solid-color'</a> expressed as a percentage
-          of the range 0 to 1.
-        </dd>
-      </dl>
-    </dd>
-  </dl><!-- propdef-list -->
-
-
-<edit:example href='images/pservers/solidcolor.svg' name='solidcolor.svg'
-  description='fill objects using a solidcolor paint server'
-  image='yes' link='yes'/>
-
-</edit:with>
-
 <h2 id="Gradients">Gradients</h2>
 
 <p>Gradients consist of smooth color transitions between points on a
@@ -1758,21 +1638,6 @@ <h3 id="PatternNotes">Notes on patterns</h3>
 
 <h2 id="DOMInterfaces">DOM interfaces</h2>
 
-<div class='ready-for-wider-review'>
-<h3 id="InterfaceSVGSolidcolorElement">Interface SVGSolidcolorElement</h3>
-
-<edit:with element="solidcolor">
-
-<p>An <a>SVGSolidcolorElement</a> object represents an <a>'solidcolor'</a>
-element in the DOM.</p>
-
-<pre class="idl">[Exposed=Window]
-interface <b>SVGSolidcolorElement</b> : <a>SVGElement</a> {
-};</pre>
-
-</edit:with>
-
-
 <h3 id="InterfaceSVGGradientElement">Interface SVGGradientElement</h3>
 
 <p>The <a>SVGGradientElement</a> interface is used as a base interface

diff --git a/master/struct.html b/master/struct.html
@@ -2661,11 +2661,6 @@ <h3 id="implicit-aria-semantics">Implicit and Allowed ARIA Semantics</h3>
       <td>none</td>
       <td>no role may be applied</td>
     </tr>
-    <tr>
-      <td><a>'solidcolor'</a></td>
-      <td>none</td>
-      <td>no role may be applied</td>
-    </tr>
     <tr>
       <td><a>'stop'</a></td>
       <td>none</td>