- From: SVG Working Group repository <cam+svgwgrepo@mcc.id.au>
- Date: Wed, 12 Feb 2014 07:18:25 -0800
- To: public-svg-wg@w3.org
details: https://svgwg.org/hg/svg2/rev/1b5e73dde6a1
branches:
changeset: 638:1b5e73dde6a1
user: Dirk Schulze <dschulze@adobe.com>
date: Wed Feb 12 16:15:24 2014 +0100
description:
Initial patch to add background syntax to fill and stroke.
diffstat:
master/definitions.xml | 8 ++++++++
master/painting.html | 29 ++++++++++++-----------------
2 files changed, 20 insertions(+), 17 deletions(-)
diffs (131 lines):
diff --git a/master/definitions.xml b/master/definitions.xml
--- a/master/definitions.xml
+++ b/master/definitions.xml
@@ -1341,36 +1341,44 @@
<interface name='SVGMediaElement' href='embedded.html#InterfaceSVGMediaElement'/>
<!-- ... grammar symbols ................................................ -->
<symbol name='align' href='coords.html#DataTypeAlign'/>
<symbol name='anything' href='types.html#DataTypeAnything'/>
<symbol name='color' href='types.html#DataTypeColor'/>
<symbol name='child-selector' href='types.html#DataTypeChildSelector'/>
<symbol name='dasharray' href='painting.html#DataTypeDasharray'/>
+ <symbol name='final-paint-layer' href='types.html#typedef-final-paint-layer'/>
<symbol name='frequency' href='types.html#DataTypeFrequency'/>
<symbol name='gradient' href='types.html#DataTypeGradient'/>
<symbol name='icccolor' href='types.html#DataTypeICCColor'/>
<symbol name='image' href='types.html#DataTypeImage'/>
<symbol name='integer' href='types.html#DataTypeInteger'/>
<symbol name='knockout-offset' href="painting.html#DataTypeKnockoutOffset"/>
<symbol name='knockout-shape' href="painting.html#DataTypeKnockoutShape"/>
<symbol name='length' href='types.html#DataTypeLength'/>
<symbol name='list' href='types.html#DataTypeList'/>
<symbol name='list-of-family-names' href='types.html#DataTypeListOfFamilyNames'/>
<symbol name='list-of-strings' href='types.html#DataTypeListOfStrings'/>
<symbol name='marker-ref' href='painting.html#DataTypeMarkerRef'/>
<symbol name="name" href="types.html#DataTypeName"></symbol>
<symbol name='number' href='types.html#DataTypeNumber'/>
<symbol name='number-optional-number' href='types.html#DataTypeNumberOptionalNumber'/>
<symbol name='paint' href='types.html#DataTypePaint'/>
+ <symbol name='paint-layer' href='types.html#typedef-paint-layer'/>
+ <symbol name='paint-source' href='types.html#typedef-paint-source'/>
+ <symbol name='paint-size' href='http://www.w3.org/TR/css3-background/#ltbg-sizegt'/>
<symbol name='percentage' href='types.html#DataTypePercentage'/>
+ <symbol name='position' href='http://www.w3.org/TR/css3-background/#ltpositiongt'/>
+ <symbol name='repeat-style' href='http://www.w3.org/TR/css3-background/#ltrepeat-stylegt'/>
+ <symbol name='shape-box' href='http://www.w3.org/TR/2014/WD-css-shapes-1-20140211/#typedef-shape-box'/>
<symbol name='time' href='types.html#DataTypeTime'/>
<symbol name='transform-list' href='types.html#DataTypeTransformList'/>
<symbol name='iri' href='types.html#DataTypeIRI'/>
+ <symbol name='url' href='types.html#DataTypeIRI'/>
<symbol name='FuncIRI' href='types.html#DataTypeFuncIRI'/>
<symbol name='funciri' href='types.html#DataTypeFuncIRI'/>
<symbol name='XML-Name' href="types.html#DataTypeXML-Name"/>
<!-- ... terms (these will be generated later) .......................... -->
<!-- ... elements, in alphabetic order ... -->
<term name='animation element' href='intro.html#TermAnimationElement'/>
<term name='animation elements' href='intro.html#TermAnimationElement'/>
diff --git a/master/painting.html b/master/painting.html
--- a/master/painting.html
+++ b/master/painting.html
@@ -121,26 +121,26 @@ paint servers.</p>
<p class="caption">The rightmost rectangle is filled by stacking the paints shown in the other rectangles.</p>
</div>
</div>
<p>The type <a><paint></a> is defined as:</p>
<div class="definition">
- <dfn id="DataTypePaint"><paint></dfn> =<br/>
- <div style="margin-left: 2em">
- none |<br/>
- <a><color></a> |<br/>
- [ <a><color></a>? <a><icccolor></a> ] |<br/>
- <a><gradient></a> |<br/>
- [ [ <a><funciri></a> | child | <a><child-selector></a> ] [ none | <a><color></a> | [ <a><color></a>? <a><icccolor></a> ] ]? ] |<br/>
- context-fill |<br/>
- context-stroke
- </div>
+<pre class="prod"><dfn class="css-code" data-dfn-type="type" data-export="" id="typedef-paint"><paint></dfn> = [ <a><paint-layer></a> , ]* <a><final-paint-layer></a></pre>
+
+<pre class="prod"><dfn class="css-code" data-dfn-type="type" data-export="" id="typedef-paint-layer"><paint-layer></dfn> = <a><paint-source></a>|| <a><position></a> [ / <a><paint-size></a> ]? || <a><repeat-style></a> ||
+[ <a><shape-box></a> | fill | stroke | view-box ] || [ <a><shape-box></a> | fill | stroke | view-box ]</pre>
+
+<pre class="prod"><dfn class="css-code" data-dfn-type="type" data-export="" id="typedef-final-paint-layer"><final-paint-layer></dfn> = <a><paint-source></a> || <a><position></a> [ / <a><paint-size></a> ]? || <a><repeat-style></a> ||
+[ <a><shape-box></a> | fill | stroke | view-box ] ||
+[ <a><shape-box></a> | fill | stroke | view-box ] || <a><color></a></pre>
+
+<pre class="prod"><dfn class="css-code" data-dfn-type="type" data-export="" id="typedef-paint-source"><paint-source></dfn> = none | <a><image></a> | <a><url></a> | <a><icccolor></a> | context-fill | context-stroke</pre>
</div>
<p>Values have the following meaning:</p>
<dl>
<dt>none</dt>
<dd>Indicates that no paint is applied.</dd>
@@ -150,22 +150,17 @@ paint servers.</p>
defined by that specification are valid for use as a <a><paint></a>
value. This includes the basic color keywords,
RGB & RGBA color values, the <span class="prop-value">transparent</span>
value, HSL & HSLA color values, the extended color keywords,
the <span class="prop-value">currentColor</span> value,
and the CSS2 UI colors. Note that when <span class='prop-value'>currentColor</span>
is used, it refers to the current animated value of the <a>'color'</a> property.</dd>
- <dt><a href="types.html#DataTypeGradient"><gradient></a></dt>
- <dd>A CSS gradient value as <a href="http://www.w3.org/TR/css3-images/#gradients">defined in
- <cite>CSS Image Values and Replaced Content Module Level 3</cite></a>. Percentage values
- are resolved against the bounding box of the element to which the gradient is applied.</dd>
-
- <dt><color>? <icccolor></dt>
+ <dt><icccolor></dt>
<dd>An ICC color [<a href='refs.html#ref-ICC42'>ICC42</a>] with an optional sRGB fallback color if the ICC color cannot
be used. The user agent searches the color profile description
database for a <a href="color.html#ColorProfileDescriptions">color profile description</a>
entry whose name descriptor matches the <author-ident> part of the
<a><icccolor></a> and uses the last matching entry that is found.
If no match is found, then the sRGB fallback color is used instead,
if provided; otherwise the document is in error
(see <a href="implnote.html#ErrorProcessing">Error processing</a>).
@@ -173,17 +168,17 @@ paint servers.</p>
within the <a><icccolor></a> is a set of ICC-profile-specific color values.
(In most cases, the <a><number></a>s will be in the range 0 to 1.)
Note that color interpolation occurs in an RGB color space even if an
ICC-based color specification is provided (see <a>'color-interpolation'</a>).
For more on ICC-based colors, refer to <a
href="color.html#ColorProfileDescriptions">Color profile
descriptions</a>.</dd>
- <dt>[ <a><funciri></a> | child | <a><child-selector></a> ] [ none | <a><color></a> | [ <a><color></a>? <a><icccolor></a> ] ]?</dt>
+ <dt><a><url></a> <!--| child | <a><child-selector></a>--></dt>
<dd>A reference to a <a href="pservers.html">paint server</a> element with, if
the paint server is the last paint specified, an
optional fallback color or <span class="prop-value">none</span>.
The <a><funciri></a>, <span class="prop-value">child</span> keyword,
or <a><child-selector></a> is used to identify a <a>'solidColor'</a>
element, <a>gradient element</a>, <a>'pattern'</a> element, or <a>'hatch'</a> element,
which defines the paint to use.
The <span class="prop-value">child</span> keyword in this instance matches the
Received on Wednesday, 12 February 2014 15:18:49 UTC