--- a/master/definitions.xml Thu Jun 05 17:24:57 2014 +0200
+++ b/master/definitions.xml Thu Jun 19 12:45:07 2014 +0200
@@ -1205,8 +1205,6 @@
<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"/>
--- a/master/interact.html Thu Jun 05 17:24:57 2014 +0200
+++ b/master/interact.html Thu Jun 19 12:45:07 2014 +0200
@@ -959,7 +959,7 @@
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>
@@ -979,11 +979,11 @@
<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>
--- a/master/linking.html Thu Jun 05 17:24:57 2014 +0200
+++ b/master/linking.html Thu Jun 19 12:45:07 2014 +0200
@@ -81,11 +81,13 @@
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><!--
--- a/master/painting.html Thu Jun 05 17:24:57 2014 +0200
+++ b/master/painting.html Thu Jun 19 12:45:07 2014 +0200
@@ -177,7 +177,7 @@
<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.
@@ -256,7 +256,7 @@
<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>
@@ -514,7 +514,7 @@
<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>
@@ -2627,7 +2627,7 @@
<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>
@@ -2636,9 +2636,9 @@
<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
@@ -2695,7 +2695,7 @@
</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>
@@ -2787,7 +2787,7 @@
</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>
@@ -2889,7 +2889,7 @@
</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>
--- a/master/propidx.html Thu Jun 05 17:24:57 2014 +0200
+++ b/master/propidx.html Thu Jun 19 12:45:07 2014 +0200
@@ -86,7 +86,7 @@
</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>
@@ -138,7 +138,7 @@
</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>
@@ -231,7 +231,7 @@
</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>
@@ -443,7 +443,7 @@
<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>
@@ -453,7 +453,7 @@
</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>
--- a/master/types.html Thu Jun 05 17:24:57 2014 +0200
+++ b/master/types.html Thu Jun 19 12:45:07 2014 +0200
@@ -332,9 +332,6 @@
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>