- From: SVG Working Group repository <cam+svgwgrepo@mcc.id.au>
- Date: Thu, 19 Jun 2014 03:47:52 -0700
- To: public-svg-wg@w3.org
details: https://svgwg.org/hg/svg2/rev/0e54656d371b
branches:
changeset: 683:0e54656d371b
user: Dirk Schulze <dschulze@adobe.com>
date: Thu Jun 19 12:45:07 2014 +0200
description:
Remove FuncIRI from spec and replace it with url
diffstat:
master/definitions.xml | 2 --
master/interact.html | 8 ++++----
master/linking.html | 4 +++-
master/painting.html | 18 +++++++++---------
master/propidx.html | 10 +++++-----
master/types.html | 3 ---
6 files changed, 21 insertions(+), 24 deletions(-)
diffs (359 lines):
diff --git a/master/definitions.xml b/master/definitions.xml
--- a/master/definitions.xml
+++ b/master/definitions.xml
@@ -1200,18 +1200,16 @@
<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='whitespace' href='types.html#DataTypeWhitespace'/>
<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'/>
<term name='container element' href='intro.html#TermContainerElement'/>
diff --git a/master/interact.html b/master/interact.html
--- a/master/interact.html
+++ b/master/interact.html
@@ -954,17 +954,17 @@ the <em>cursor</em>. Three types of curs
<li>Platform-specific custom cursors</li>
<li>Platform-independent custom cursors</li>
</ul>
<p>The <a>'cursor property'</a> property is used to
specify which cursor to use. The <a>'cursor property'</a> property can be used to
reference standard built-in cursors by specifying a keyword
such as <em>crosshair</em> or a custom cursor. Custom cursors
-are referenced via a <a><FuncIRI></a> and can point to either an
+are referenced via a <a><url></a> and can point to either an
external resource such as a platform-specific cursor file or to
a <a>'cursor element'</a> element, which can be
used to define a platform-independent cursor.</p>
<div class="ready-for-wider-review">
<h3 id="CursorProperty">The effect of the <span class="property">'cursor'</span> property</h3>
<p class="note">See the CSS Basic User Interface Module Level 3 specification
@@ -974,21 +974,21 @@ for the definition of <a>'cursor propert
be displayed for the pointing device when it is over a region of an
element that is sensitive to pointer events, according to the value of
the <a>'pointer-events'</a> property. SVG extends the definition of
<a>'cursor property'</a> from the CSS Basic User Interface Module Level 3
specification as follows:</p>
<ul>
<li>All <uri> values in the definition of the property are
- instead parsed as <a><funciri></a> values.</li>
+ instead parsed as <a><url></a> values.</li>
- <li>The SVG implementation must support an <a><funciri></a> value
+ <li>The SVG implementation must support an <a><url></a> value
being an IRI reference to an SVG <a>'cursor element'</a> element.
- If the <x> and <y> values are given for a <a><funciri></a>
+ If the <x> and <y> values are given for a <a><url></a>
that refers to a <a>'cursor element'</a>, they override its
<a>'cursor/x'</a> and <a>'cursor/y'</a> attributes.</li>
</ul>
</div>
<h3 id="CursorElement">The <span class="element-name">'cursor'</span> element</h3>
<edit:with element='cursor'>
diff --git a/master/linking.html b/master/linking.html
--- a/master/linking.html
+++ b/master/linking.html
@@ -76,21 +76,23 @@ because the <a>IRI</a> specification was
<p>In this specification, the correct term <a>IRI</a> is used for this "URI or sequence of characters
plus an algorithm" and the escaping method, which turns IRIs into URIs, is defined by reference to the
<a href="http://www.ietf.org/rfc/rfc3987.txt">IRI specification</a> [<a href="refs.html#ref-RFC3987">RFC3987</a>],
which has since become an IETF Proposed Standard. Other W3C specifications are
expected to be revised over time to remove these duplicate descriptions of the
escaping procedure and to refer to <a>IRI</a> directly.</p>
<h3 id="IRIforms">Syntactic forms: IRI and FuncIRI</h3>
+
+<p class="issue">FuncIRI has been removed. This section needs to be rewritten.</p>
<p>IRIs are used in the <a>'animate/xlink:href'</a> attribute. Some attributes
allow both IRIs and text strings as content. To disambiguate a text string from
a relative IRI, the functional notation
-<a href="types.html#DataTypeFuncIRI"><FuncIRI></a> is used. This is simply
+FuncIRI is used. This is simply
an IRI delimited with a functional notation. <strong>Note:</strong> For
historical reasons, the delimiters are "url(" and ")", for compatibility with
the CSS specifications. The FuncIRI form is used in <a href="styling.html#StylingUsingPresentationAttributes">presentation attributes</a><!--
not in 1.1
and <a href="interact.html#navigation">navigation attributes</a> -->.</p>
<p>SVG makes extensive use of <a>IRI</a> references, both absolute and relative,
to other objects. For example, to <a>fill</a> a rectangle with a linear
diff --git a/master/painting.html b/master/painting.html
--- a/master/painting.html
+++ b/master/painting.html
@@ -172,17 +172,17 @@ paint servers.</p>
For more on ICC-based colors, refer to <a
href="color.html#ColorProfileDescriptions">Color profile
descriptions</a>.</dd>
<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,
+ The <a><url></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
last child <a>paint server element</a> of the element where the paint value
is specified.
If the reference is not valid (e.g., it points to an element that
does not exist, no element was matched, or the element is not a valid paint
@@ -251,17 +251,17 @@ paint servers.</p>
</tr>
<tr>
<th>Media:</th>
<td>visual</td>
</tr>
<tr>
<th>Computed value:</th>
<td>as specified, but with <a><color></a> values computed and
- <a><funciri></a> values made absolute</td>
+ <a><url></a> values made absolute</td>
</tr>
<tr>
<th><a>Animatable</a>:</th>
<td>yes</td>
</tr>
</table>
<p>The <a>'fill'</a> property paints the interior of the given graphical
@@ -509,17 +509,17 @@ property</h3>
</tr>
<tr>
<th>Media:</th>
<td>visual</td>
</tr>
<tr>
<th>Computed value:</th>
<td>as specified, but with <a><color></a> values computed and
- <a><funciri></a> values made absolute</td>
+ <a><url></a> values made absolute</td>
</tr>
<tr>
<th><a>Animatable</a>:</th>
<td>yes</td>
</tr>
</table>
<p>The <a>'stroke'</a> property paints along the outline of the given
@@ -2622,28 +2622,28 @@ processed.</p>
<h3 id="MarkerReferences">Referencing <span class="element-name">'marker'</span> elements</h3>
<p>A number of marker properties allow specifying a <a>'marker element'</a> using a <a><marker-ref></a> value.</p>
<div class="definition">
<dfn id="DataTypeMarkerRef"><marker-ref></dfn> =<br/>
<div style="margin-left: 2em">
none |<br/>
- <a><funciri></a> |<br/>
+ <a><url></a> |<br/>
child |<br/>
<a><child-selector></a>
</div>
</div>
<p>Values have the following meaning</p>
<dl>
- <dt><span class='prop-value'><funciri></span></dt>
+ <dt><span class='prop-value'><url></span></dt>
<dd>Indicates that the <a>'marker element'</a> element referenced
- by the <a><funciri></a> value will be used.
+ by the <a><url></a> value will be used.
If the <a href="linking.html#IRIReference">IRI reference</a> is not valid
(e.g., it points to an object that is undefined or the object is not
a <a>'marker element'</a> element), then the marker reference is also not
valid.</dd>
<dt><span class='prop-value'>child</span></dt>
<dd>Indicates that the last child <a>'marker element'</a> element of the
element where the property is specified will be used.
@@ -2690,17 +2690,17 @@ properties</h3>
<td>N/A</td>
</tr>
<tr>
<th>Media:</th>
<td>visual</td>
</tr>
<tr>
<th>Computed value:</th>
- <td>as specified, but with <a><funciri></a> values (that are part of
+ <td>as specified, but with <a><url></a> values (that are part of
a <a><marker-ref></a>) made absolute</td>
</tr>
<tr>
<th><a>Animatable</a>:</th>
<td>yes</td>
</tr>
</table>
@@ -2782,17 +2782,17 @@ property</h3>
<td>N/A</td>
</tr>
<tr>
<th>Media:</th>
<td>visual</td>
</tr>
<tr>
<th>Computed value:</th>
- <td>as specified, but with <a><funciri></a> values (that are part of
+ <td>as specified, but with <a><url></a> values (that are part of
a <a><marker-ref></a>) made absolute</td>
</tr>
<tr>
<th><a>Animatable</a>:</th>
<td>yes</td>
</tr>
</table>
@@ -2884,17 +2884,17 @@ property</h3>
<td>refer to the length of the path</td>
</tr>
<tr>
<th>Media:</th>
<td>visual</td>
</tr>
<tr>
<th>Computed value:</th>
- <td>as specified, but with <a><funciri></a> values (that are part of
+ <td>as specified, but with <a><url></a> values (that are part of
a <a><marker-ref></a>) made absolute</td>
</tr>
<tr>
<th><a>Animatable</a>:</th>
<td>yes</td>
</tr>
</table>
diff --git a/master/propidx.html b/master/propidx.html
--- a/master/propidx.html
+++ b/master/propidx.html
@@ -81,17 +81,17 @@ other specifications.</p>
which establish a new viewport</a>, <a>'pattern'</a> elements and <a>'marker element'</a> elements</td>
<td>no</td>
<td>N/A</td>
<td><a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/media.html#visual-media-group">visual</a></td>
<td>yes</td>
</tr>
<tr>
<th><a>'clip-path'</a></th>
- <td><a href="types.html#DataTypeFuncIRI"><funciri></a> |
+ <td><basic-shape> | <a><url></a> |
none </td>
<td>none</td>
<td><a>container elements</a> and <a>graphics elements</a></td>
<td>no</td>
<td>N/A</td>
<td><a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/media.html#visual-media-group">visual</a></td>
<td>yes</td>
</tr>
@@ -133,17 +133,17 @@ other specifications.</p>
<td><a>container elements</a>, <a>graphics elements</a> and <a>'animate'</a></td>
<td>yes</td>
<td>N/A</td>
<td><a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/media.html#visual-media-group">visual</a></td>
<td>yes</td>
</tr>
<tr>
<th><a>'cursor property'</a></th>
- <td>[ [<a href="types.html#DataTypeFuncIRI"><funciri></a>
+ <td>[ [<a><url></a>
,]* [ auto | crosshair | default | pointer | move |
e-resize | ne-resize | nw-resize | n-resize | se-resize |
sw-resize | s-resize | w-resize| text | wait | help ] ]</td>
<td>auto</td>
<td><a>container elements</a> and <a>graphics elements</a></td>
<td>yes</td>
<td>N/A</td>
<td><a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/media.html#visual-media-group">visual</a>, <a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/media.html#interactive-media-group"> interactive</a></td>
@@ -226,17 +226,17 @@ other specifications.</p>
<td><a>shapes</a> and <a>text content elements</a></td>
<td>yes</td>
<td>N/A</td>
<td><a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/media.html#visual-media-group">visual</a></td>
<td>yes</td>
</tr>
<tr>
<th><a>'filter property'</a></th>
- <td><a href="types.html#DataTypeFuncIRI"><funciri></a> | none </td>
+ <td><filter-function-list> | none </td>
<td>none</td>
<td><a>container elements</a> and <a>graphics elements</a></td>
<td>no</td>
<td>N/A</td>
<td><a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/media.html#visual-media-group">visual</a></td>
<td>yes</td>
</tr>
<tr>
@@ -438,27 +438,27 @@ other specifications.</p>
<td>N/A</td>
<td><a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/media.html#visual-media-group">visual</a></td>
<td>yes</td>
</tr>
<tr>
<th><a>'marker-end'</a><br />
<a>'marker-mid'</a><br />
<a>'marker-start'</a></th>
- <td>none | <a href="types.html#DataTypeFuncIRI"><funciri></a></td>
+ <td>none | <a><url></a></td>
<td>none</td>
<td><a>'path'</a>, <a>'line'</a>, <a>'polyline'</a> and <a>'polygon'</a> elements</td>
<td>yes</td>
<td>N/A</td>
<td><a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/media.html#visual-media-group">visual</a></td>
<td>yes</td>
</tr>
<tr>
<th><a>'mask property'</a></th>
- <td><a href="types.html#DataTypeFuncIRI"><funciri></a> | none </td>
+ <td><a><url></a> | none </td>
<td>none</td>
<td><a>container elements</a> and <a>graphics elements</a></td>
<td>no</td>
<td>N/A</td>
<td><a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/media.html#visual-media-group">visual</a></td>
<td>yes</td>
</tr>
<tr>
diff --git a/master/types.html b/master/types.html
--- a/master/types.html
+++ b/master/types.html
@@ -327,19 +327,16 @@ attributes, including presentation attri
<p>Frequency values may not be negative.</p>
<p>In the SVG DOM, <frequency> values are represented
using the <a>CSSPrimitiveValue</a>
interface defined in <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113/css.html'>Document Object Model CSS</a>
([<a href='refs.html#ref-DOM2STYLE'>DOM2STYLE</a>], section 2.2).</p>
</dd>
-
- <dt id='DataTypeFuncIRI'><FuncIRI></dt>
- <dd>Functional notation for an <a>IRI</a>: "url(" <a href="#DataTypeIRI"><IRI></a> ")".</dd>
<dt id='DataTypeGradient'><gradient></dt>
<dd>
<p>
A gradient as defined by CSS Level 3 Image
Values [<a href='refs.html#ref-CSS3IMAGES'>CSS3IMAGES</a>] and can be used
as paint server for the properties <a>'fill'</a> and <a>'stroke'</a>. Percentage values get resolved
against the bounding box of the element to which the gradient is applied.
Received on Thursday, 19 June 2014 10:48:19 UTC