--- a/rdf-xml/index.html Mon Dec 09 20:02:38 2013 +0100
+++ b/rdf-xml/index.html Mon Dec 09 20:32:12 2013 +0100
@@ -281,7 +281,7 @@
<a href="http://www.w3.org/TR/1999/REC-xml-names-19990114/#NT-LocalPart">local name</a>
part of the QName after the
<a href="http://www.w3.org/TR/1999/REC-xml-names-19990114/#dt-NSName">namespace
- name</a> (URI reference) part of the QName.
+ name</a> (IRI) part of the QName.
This is used to shorten the IRI
of all predicates and some nodes.
IRIs identifying
@@ -381,7 +381,7 @@
elements to give the result in <a href="#example2">Example 2</a>:</p>
<pre class="example" id="example2">
-<strong>Node Elements with RDF URI references added</strong>
+<strong>Node Elements with IRIs added</strong>
<rdf:Description rdf:about="http://www.w3.org/TR/rdf-syntax-grammar">
<ex:editor>
@@ -446,7 +446,7 @@
<p>Taking <a href="#example3">Example 3</a>, there are
two node elements that can take multiple property elements.
- The subject node with URI reference
+ The subject node with IRI
<code>http://www.w3.org/TR/rdf-syntax-grammar</code>
has property elements <code>ex:editor</code> and <code>ex:title</code>
@@ -763,9 +763,9 @@
<a href="http://www.w3.org/TR/xml-infoset/#infoitem.document">document information item</a>.
A <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-blank-node-id">blank node identifier</a> is used
on a node element to replace
- <code>rdf:about="</code><em>RDF URI reference</em><code>"</code>
+ <code>rdf:about="</code><em>IRI</em><code>"</code>
or on a property element to replace
- <code>rdf:resource="</code><em>RDF URI reference</em><code>"</code>
+ <code>rdf:resource="</code><em>IRI</em><code>"</code>
with <code>rdf:nodeID="</code><em><a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-blank-node-id">blank node identifier</a></em><code>"</code>
in both cases.</p>
@@ -1119,12 +1119,12 @@
full details).
The identifier for the triple should be constructed as a
IRI
- made from the relative URI reference
+ made from the relative IRI
<code>#</code> concatenated with the <code>rdf:ID</code> attribute
value, resolved against the in-scope base URI. So for example if
<code>rdf:ID="triple"</code>, that would be equivalent to the IRI
- formed from relative URI reference <code>#triple</code> against the base URI.
+ formed from relative IRI <code>#triple</code> against the base URI.
Each (<code>rdf:ID</code> attribute value, base URI)
pair has to be unique in an RDF/XML document,
see <a href="#constraint-id">constraint-id</a>.
@@ -1240,7 +1240,7 @@
<code>http://www.w3.org/1999/02/22-rdf-syntax-ns#</code>
and is typically used in XML with the prefix <code>rdf</code>
although other prefix strings may be used.
- The <span class="termdef"><a id="rdf-vocabulary">RDF Vocabulary</a></span>
+ The <dfn id="rdf-vocabulary">RDF Vocabulary</dfn>
is identified by this namespace name and consists of the following names only:</p>
<dl>
@@ -1281,14 +1281,14 @@
<p>Within RDF/XML documents it is not permitted to use XML namespaces
whose namespace name is the
- <a href="#rdf-ns-uri" class="termref"><span class="arrow">·</span>RDF namespace URI reference<span class="arrow">·</span></a>
+ <a href="#rdf-ns-uri" class="termref"><span class="arrow">·</span>RDF namespace IRI<span class="arrow">·</span></a>
concatenated with additional characters.</p>
<p>Throughout this document the terminology <code>rdf:</code><em>name</em>
will be used to indicate <em>name</em> is from the RDF vocabulary
and it has a IRI of the concatenation of the
- <a href="#rdf-ns-uri" class="termref"><span class="arrow">·</span>RDF namespace URI reference<span class="arrow">·</span></a> and <em>name</em>.
+ <a href="#rdf-ns-uri" class="termref"><span class="arrow">·</span>RDF namespace IRI<span class="arrow">·</span></a> and <em>name</em>.
For example, <code>rdf:type</code> has the IRI
<code>http://www.w3.org/1999/02/22-rdf-syntax-ns#type</code></p>
</section>
@@ -1309,7 +1309,7 @@
can be either:</p>
<ul>
<li>given as XML attribute values interpreted as relative
- URI references that are resolved against the in-scope base URI
+ IRIs that are resolved against the in-scope base URI
as described in <a href="#section-baseURIs">section 5.3</a>
to give absolute IRIs</li>
<li>transformed from XML namespace-qualified element and attribute names
@@ -1319,12 +1319,12 @@
<p>Within RDF/XML, XML QNames are transformed into
IRIs
- by appending the XML local name to the namespace name (URI reference).
+ by appending the XML local name to the namespace name (IRI).
For example, if the XML namespace prefix <code>foo</code> has
- namespace name (URI reference)
+ namespace name (IRI)
<code>http://example.org/somewhere/</code> then the QName
- <code>foo:bar</code> would correspond to the RDF URI reference
+ <code>foo:bar</code> would correspond to the IRI
<code>http://example.org/somewhere/bar</code>. Note that this
restricts which
IRIs can be made and the same URI can be given in multiple ways.</p>
@@ -1394,7 +1394,7 @@
<a href="#section-element-node"><span
class="arrow">·</span>element event<span
class="arrow">·</span></a>.
- Relative URI references are resolved into
+ Relative IRIs are resolved into
IRIs
according to the algorithm specified in [[XML Base]] (and RFC 2396).
These specifications do not specify an algorithm for resolving a
@@ -1458,8 +1458,7 @@
<h3>Constraints</h3>
<dl>
- <dt><strong><a id="constraint-id">constraint-id</a></strong><br /></dt>
-
+ <dt><<dfn id="constraint-id">constraint-id</dfn></dt>
<dd><p>Each application of production <a href="#idAttr">idAttr</a>
matches an attribute. The pair formed by the
<a href="#eventterm-attribute-string-value" class="termref"><span class="arrow">·</span>string-value<span class="arrow">·</span></a>
@@ -1489,18 +1488,18 @@
<dl>
<dt>Definition:<br /></dt>
- <dd>An <span class="termdef"><a id="dfn-rdf-document">RDF Document</a></span> is a serialization of an
+ <dd>An <dfn id="dfn-rdf-document">RDF Document</dfn> is a serialization of an
<a href="http://www.w3.org/TR/rdf-concepts/#dfn-rdf-graph">RDF Graph</a>
into a concrete syntax.</dd>
<dt>Definition:<br /></dt>
- <dd>An <span class="termdef"><a ">RDF/XML Document</a></span> is an
+ <dd>An <dfn ">RDF/XML Document</dfn> is an
<a href="#dfn-rdf-document" class="termref">RDF Document</a> written in the
recommended XML transfer syntax for RDF as defined in this document.</dd>
<dt>Conformance:<br /></dt>
<dd>An <a href="#dfn-rdf-xml-document" class="termref">RDF/XML Document</a> is a
- <span class="termdef"><a ">conforming RDF/XML document</a></span>
+ <dfn ">conforming RDF/XML document</dfn>
if it adheres to the specification defined in this document.</dd>
</dl>
@@ -1638,8 +1637,7 @@
<p>There are nine types of event defined in the following subsections.
Most events are constructed from an Infoset information item (except
- for <a href="#section-identifier-node">URI reference</a>,
-
+ for <a href="#section-identifier-node">IRI</a>,
<a href="#section-blank-nodeid-event">blank node</a>,
<a href="#section-literal-node">plain literal</a> and
<a href="#section-typed-literal-node">typed literal</a>). The effect
@@ -1657,14 +1655,14 @@
and takes the following accessors and values.</p>
<dl>
- <dt><span class="termdef"><a id="eventterm-root-document-element">document-element</a></span><br /></dt>
+ <dt><dfn id="eventterm-root-document-element">document-element</dfn><br /></dt>
<dd>Set to the value of document information item property [document-element].</dd>
- <dt><span class="termdef"><a id="eventterm-root-children">children</a></span><br /></dt>
+ <dt><dfn id="eventterm-root-children">children</dfn><br /></dt>
<dd>Set to the value of document information item property [children].</dd>
- <dt><span class="termdef"><a id="eventterm-root-base-uri">base-uri</a></span><br /></dt>
+ <dt><dfn id="eventterm-root-base-uri">base-uri</dfn><br /></dt>
<dd>Set to the value of document information item property [base URI].</dd>
- <dt><span class="termdef"><a id="eventterm-root-language">language</a></span><br /></dt>
+ <dt><dfn id="eventterm-root-language">language</dfn><br /></dt>
<dd>Set to the empty string.</dd>
</dl>
</section>
@@ -1681,22 +1679,22 @@
<dl>
- <dt><span class="termdef"><a id="eventterm-element-local-name">local-name</a></span><br /></dt>
+ <dt><dfn id="eventterm-element-local-name">local-name</dfn><br /></dt>
<dd>Set to the value of element information item property [local name].</dd>
- <dt><span class="termdef"><a id="eventterm-element-namespace-name">namespace-name</a></span><br /></dt>
+ <dt><dfn id="eventterm-element-namespace-name">namespace-name</dfn><br /></dt>
<dd>Set to the value of element information item property [namespace name].</dd>
- <dt><span class="termdef"><a id="eventterm-element-children">children</a></span><br /></dt>
+ <dt><dfn id="eventterm-element-children">children</dfn><br /></dt>
<dd>Set to the value of element information item property [children].</dd>
- <dt><span class="termdef"><a id="eventterm-element-parent">parent</a></span><br /></dt>
+ <dt><dfn id="eventterm-element-parent">parent</dfn><br /></dt>
<dd>Set to the value of element information item property [parent].</dd>
- <dt><span class="termdef"><a id="eventterm-element-base-uri">base-uri</a></span><br /></dt>
+ <dt><dfn id="eventterm-element-base-uri">base-uri</dfn><br /></dt>
<dd>Set to the value of element information item property [base URI].</dd>
- <dt><span class="termdef"><a id="eventterm-element-attributes">attributes</a></span><br /></dt>
+ <dt><dfn id="eventterm-element-attributes">attributes</dfn><br /></dt>
<dd><p>Made from the value of element information item property [attributes] which is a set of attribute information items.</p>
@@ -1728,13 +1726,13 @@
which is assigned as the value of this accessor.</p>
</dd>
- <dt><span class="termdef"><a id="eventterm-element-URI">URI</a></span><br /></dt>
+ <dt><dfn id="eventterm-element-URI">URI</dfn><br /></dt>
<dd>Set to the string value of the concatenation of the
value of the namespace-name accessor and the value of the
local-name accessor.
</dd>
- <dt><span class="termdef"><a id="eventterm-element-URI-string-value">URI-string-value</a></span><br /></dt>
+ <dt><dfn id="eventterm-element-URI-string-value">URI-string-value</dfn><br /></dt>
<dd>
<p>The value is the concatenation of the following in this order "<",
@@ -1745,15 +1743,15 @@
<p>The escaping of the
<a href="#eventterm-element-URI" class="termref"><span class="arrow">·</span>URI<span class="arrow">·</span></a>
accessor uses the N-Triples escapes for
- URI references as described in 3.3 URI References.
+ IRIs [[N_TRIPLES]].
</p>
</dd>
- <dt><span class="termdef"><a id="eventterm-element-liCounter">li-counter</a></span><br /></dt>
+ <dt><dfn id="eventterm-element-liCounter">li-counter</dfn><br /></dt>
<dd>Set to the integer value 1.</dd>
- <dt><span class="termdef"><a id="eventterm-element-language">language</a></span><br /></dt>
+ <dt><dfn id="eventterm-element-language">language</dfn><br /></dt>
<dd>Set from the
<a href="#eventterm-element-attributes" class="termref"><span class="arrow">·</span>attributes<span class="arrow">·</span></a>
as described above.
@@ -1763,7 +1761,7 @@
<a href="#section-element-node">Element Event</a>), which may be the empty string.
</dd>
- <dt><span class="termdef"><a id="eventterm-element-subject">subject</a></span><br /></dt>
+ <dt><dfn id="eventterm-element-subject">subject</dfn><br /></dt>
<dd>Has no initial value. Takes a value that is an
<a href="#section-identifier-node">Identifier</a> event.
This accessor is used on elements that deal with one node in the RDF graph,
@@ -1791,20 +1789,20 @@
and takes the following accessors and values:</p>
<dl>
- <dt><span class="termdef"><a id="eventterm-attribute-local-name">local-name</a></span><br /></dt>
+ <dt><dfn id="eventterm-attribute-local-name">local-name</dfn><br /></dt>
<dd>Set to the value of attribute information item property [local name].</dd>
- <dt><span class="termdef"><a id="eventterm-attribute-namespace-name">namespace-name</a></span><br /></dt>
+ <dt><dfn id="eventterm-attribute-namespace-name">namespace-name</dfn><br /></dt>
<dd>Set to the value of attribute information item property [namespace name].</dd>
- <dt><span class="termdef"><a id="eventterm-attribute-string-value">string-value</a></span><br /></dt>
+ <dt><dfn id="eventterm-attribute-string-value">string-value</dfn><br /></dt>
<dd>Set to the value of the attribute information item
property [normalized value] as specified by [[XML]] (if an attribute whose normalized
value is a zero-length string, then the string-value is also
a zero-length string).</dd>
- <dt><span class="termdef"><a id="eventterm-attribute-URI">URI</a></span><br /></dt>
+ <dt><dfn id="eventterm-attribute-URI">URI</dfn><br /></dt>
<dd><p>If <a href="#eventterm-attribute-namespace-name" class="termref"><span class="arrow">·</span>namespace-name<span class="arrow">·</span></a> is present,
set to a string value of the concatenation of the value of the
<a href="#eventterm-attribute-namespace-name" class="termref"><span class="arrow">·</span>namespace-name<span class="arrow">·</span></a> accessor
@@ -1813,7 +1811,7 @@
Otherwise if <a href="#eventterm-attribute-local-name" class="termref"><span class="arrow">·</span>local-name<span class="arrow">·</span></a> is
<code>ID</code>, <code>about</code>, <code>resource</code>, <code>parseType</code> or <code>type</code>, set to a string value of the
concatenation of the
- <a href="#rdf-ns-uri" class="termref"><span class="arrow">·</span>RDF namespace URI reference<span class="arrow">·</span></a>
+ <a href="#rdf-ns-uri" class="termref"><span class="arrow">·</span>RDF namespace IRI<span class="arrow">·</span></a>
and the value of the <a href="#eventterm-attribute-local-name" class="termref"><span class="arrow">·</span>local-name<span class="arrow">·</span></a> accessor. Other non-namespaced <a href="#eventterm-attribute-local-name" class="termref"><span class="arrow">·</span>local-name<span class="arrow">·</span></a> accessor values are forbidden.</p>
@@ -1835,7 +1833,7 @@
</dd>
- <dt><span class="termdef"><a id="eventterm-attribute-URI-string-value">URI-string-value</a></span><br /></dt>
+ <dt><dfn id="eventterm-attribute-URI-string-value">URI-string-value</dfn><br /></dt>
<dd>
<p>The value is the concatenation of the following in this order "<",
the escaped value of the
@@ -1845,7 +1843,7 @@
<p>The escaping of the
<a href="#eventterm-attribute-URI" class="termref"><span class="arrow">·</span>URI<span class="arrow">·</span></a>
accessor uses the N-Triples escapes for
- URI references as described in 3.3 URI References.
+ IRIs [[N-TRIPLES]].
</p>
</dd>
@@ -1862,7 +1860,7 @@
Has the single accessor:</p>
<dl>
- <dt><span class="termdef"><a id="eventterm-text-string-value">string-value</a></span><br /></dt>
+ <dt><dfn id="eventterm-text-string-value">string-value</dfn><br /></dt>
<dd>Set to the value of the string made from concatenating the
[<a href="http://www.w3.org/TR/xml-infoset/#infoitem.character">character code</a>] property of each of the character information items.
</dd>
@@ -1872,25 +1870,24 @@
<!-- uri reference event -->
<section id="section-identifier-node">
- <h3>URI Reference Event</h3>
-
- <p><a id="eventterm-identifier-identifier-type"></a>
+ <h3>IRI Event</h3>
+
+ <p><dfn id="eventterm-identifier-identifier-type"></dfn>
An event for a
IRIs
which has the following accessors:</p>
<dl>
- <dt><span class="termdef"><a id="eventterm-identifier-identifier">identifier</a></span><br /></dt>
+ <dt><dfn id="eventterm-identifier-identifier">identifier</dfn><br /></dt>
<dd>Takes a string value used as an
IRI.
</dd>
- <dt><span class="termdef"><a id="eventterm-identifier-string-value">string-value</a></span><br /></dt>
+ <dt><dfn id="eventterm-identifier-string-value">string-value</dfn><br /></dt>
<dd><p>The value is the concatenation of "<", the escaped value of the <a href="#eventterm-identifier-identifier" class="termref"><span class="arrow">·</span>identifier<span class="arrow">·</span></a> accessor and ">"</p>
<p>The escaping of the <a href="#eventterm-identifier-identifier" class="termref"><span class="arrow">·</span>identifier<span class="arrow">·</span></a> accessor value
- uses the <a href="http://www.w3.org/TR/2004/REC-rdf-testcases-20040210/#ntriples">N-Triples</a> escapes for URI references as described in
- <a href="http://www.w3.org/TR/2004/REC-rdf-testcases-20040210/#sec-uri-encoding">3.3 URI References</a>.</p>
+ uses the N-Triples escapes for IRIs [[N-TRIPLES]]. </p>
</dd>
@@ -1914,11 +1911,11 @@
which has the following accessors:</p>
<dl>
- <dt><span class="termdef"><a id="eventterm-blanknodeid-identifier">identifier</a></span><br /></dt>
+ <dt><dfn id="eventterm-blanknodeid-identifier">identifier</dfn><br /></dt>
<dd>Takes a string value.</dd>
- <dt><span class="termdef"><a id="eventterm-blanknodeid-string-value">string-value</a></span><br /></dt>
+ <dt><dfn id="eventterm-blanknodeid-string-value">string-value</dfn><br /></dt>
<dd>The value is a function of the value of the
<a href="#eventterm-blanknodeid-identifier" class="termref"><span class="arrow">·</span>identifier<span class="arrow">·</span></a> accessor.
The value begins with "_:" and the entire value MUST match the
@@ -1944,13 +1941,13 @@
<p>An event for a <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-plain-literal">plain literal</a> which can have the following accessors:</p>
<dl>
- <dt><span class="termdef"><a id="eventterm-literal-literal-value">literal-value</a></span><br /></dt>
+ <dt><dfn id="eventterm-literal-literal-value">literal-value</dfn><br /></dt>
<dd>Takes a string value.</dd>
- <dt><span class="termdef"><a id="eventterm-literal-literal-language">literal-language</a></span><br /></dt>
+ <dt><dfn id="eventterm-literal-literal-language">literal-language</dfn><br /></dt>
<dd>Takes a string value used as a <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-language-identifier">language tag</a> in an RDF plain literal.</dd>
- <dt><span class="termdef"><a id="eventterm-literal-string-value">string-value</a></span><br /></dt>
+ <dt><dfn id="eventterm-literal-string-value">string-value</dfn><br /></dt>
<dd><p>The value is calculated from the other accessors as follows.</p>
<p>If <a href="#eventterm-literal-literal-language" class="termref"><span class="arrow">·</span>literal-language<span class="arrow">·</span></a> is the empty string
@@ -1980,7 +1977,7 @@
<p class="note"><strong>Interoperability Note (Informative):</strong>
- <a id="literal-comb-char-note1"></a>
+ <dfn id="literal-comb-char-note1"></dfn>
Literals beginning with a Unicode combining character are
allowed however they may cause interoperability problems.
See [[CHARMOD]] for further information.
@@ -1991,18 +1988,20 @@
<!-- typed literal event -->
<section id="section-typed-literal-node">
<h3>Typed Literal Event</h3>
- <a id="section-xml-literal-node"></a> <!-- old ref -->
<p>An event for a <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#dfn-typed-literal">typed literal</a> which can have the following accessors:</p>
<dl>
- <dt><a id="eventterm-xmlliteral-literal-value"></a><span class="termdef"><a id="eventterm-typedliteral-literal-value">literal-value</a></span><br /></dt>
+ <dt><dfn id="eventterm-xmlliteral-literal-value"></dfn><dfn
+ id="eventterm-typedliteral-literal-value">literal-value</dfn></dt>
<dd>Takes a string value.</dd>
- <dt><a id="eventterm-literal-literal-datatype"></a><span class="termdef"><a id="eventterm-typedliteral-literal-datatype">literal-datatype</a></span><br /></dt>
+ <dt><dfn id="eventterm-literal-literal-datatype"></dfn><dfn
+ id="eventterm-typedliteral-literal-datatype">literal-datatype</dfn></dt>
<dd>Takes a string value used as an IRI.</dd>
- <dt><a id="eventterm-xmlliteral-string-value"></a><span class="termdef"><a id="eventterm-typedliteral-string-value">string-value</a></span><br /></dt>
+ <dt><dfn id="eventterm-xmlliteral-string-value"></dfn><dfn
+ id="eventterm-typedliteral-string-value">string-value</dfn></dt>
<dd><p>The value is the concatenation of the following in this order
""" (1 double quote),
the escaped value of the
@@ -2018,28 +2017,33 @@
escapes for strings as described in <a href="http://www.w3.org/TR/2004/REC-rdf-testcases-20040210/#ntrip_strings">3.2 Strings</a>
for escaping certain characters such as ".
The escaping of the <a href="#eventterm-typedliteral-literal-datatype" class="termref"><span class="arrow">·</span>literal-datatype<span class="arrow">·</span></a> accessor value
- must use the <a href="http://www.w3.org/TR/2004/REC-rdf-testcases-20040210/#ntriples">N-Triples</a> escapes for URI references as described in
- <a href="http://www.w3.org/TR/2004/REC-rdf-testcases-20040210/#sec-uri-encoding">3.3 URI References</a>.</p>
+ must use the N-Triples escapes for IRI [[N-TRIPLES]].</p>
</dd>
</dl>
<p>These events are constructed by giving values for the
- <a href="#eventterm-typedliteral-literal-value" class="termref"><span class="arrow">·</span>literal-value<span class="arrow">·</span></a>
- and
- <a href="#eventterm-typedliteral-literal-datatype" class="termref"><span class="arrow">·</span>literal-datatype<span class="arrow">·</span></a> accessors.</p>
-
- <p class="note"><strong>Interoperability Note (Informative):</strong>
- <a id="literal-comb-char-note2"></a>
+ <a href="#eventterm-typedliteral-literal-value"
+ class="termref"><span class="arrow">·</span>literal-value<span
+ class="arrow">·</span></a>
+ and <a href="#eventterm-typedliteral-literal-datatype"
+ class="termref"><span
+ class="arrow">·</span>literal-datatype<span
+ class="arrow">·</span></a> accessors.</p>
+
+ <p id="literal-comb-char-note2" class="note">
+ <strong>Interoperability Note (Informative):</strong>
Literals beginning with a Unicode combining character are
allowed however they may cause interoperability problems.
See [[CHARMOD]] for further information.
</p>
- <p class="note"><strong>Implementation Note (Informative):</strong>
- <a id="literal-white-space-normalization-note"></a>
+ <p class="note" id="literal-white-space-normalization-note">
+ <strong>Implementation Note (Informative): </strong>
In XML Schema (part 1) [[XML-SCHEMA1]],
- <a href="http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/#section-White-Space-Normalization-during-Validation">white space normalization</a>
+ <a
+ href="http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/#section-White-Space-Normalization-during-Validation">white
+ space normalization</a>
occurs during validation according to the value of the whiteSpace
facet. The syntax mapping used in this document occurs after this,
so the whiteSpace facet formally has no further effect.
@@ -2050,8 +2054,7 @@
<!-- infoset mapping -->
<section id="section-Infoset-Mapping">
- <h3>Information Set Mapping</h3>
- <a id="section-Infoset-Conformance"></a> <!-- old ref -->
+ <h3 id="section-Infoset-Conformance">Information Set Mapping</h3>
<p>To transform the Infoset into the sequence of events
in <em>document order</em>, each
@@ -2072,8 +2075,7 @@
<!-- grammar notation -->
<section id="section-Infoset-Grammar-Notation">
- <h3>Grammar Notation</h3>
- <a id="section-Notation-Forms"></a> <!-- old ref -->
+ <h3 id="section-Notation-Forms">Grammar Notation</h3>
<p>The following notation is used to describe matching the sequence
of data model events as given in <a href="#section-Data-Model">Section 6</a>
@@ -2170,11 +2172,11 @@
<td>The terms in A excluding all the terms in B.</td>
</tr>
<tr>
- <td><a id="anyURI">anyURI</a>.</td>
+ <td><dfn id="anyURI">anyURI</dfn>.</td>
<td>Any URI.</td>
</tr>
<tr>
- <td><a id="anyString">anyString</a>.</td>
+ <td><dfn id="anyString">anyString</dfn>.</td>
<td>Any string.</td>
</tr>
@@ -2254,7 +2256,7 @@
</tr>
<tr>
<td>resolve(<em>e</em>, <em>s</em>)</td>
- <td>A string created by interpreting string <em>s</em> as a relative URI reference to the
+ <td>A string created by interpreting string <em>s</em> as a relative IRI to the
<a href="#eventterm-element-base-uri" class="termref"><span class="arrow">·</span>base-uri<span class="arrow">·</span></a> accessor of <a href="#section-element-node"></a> <em>e</em>
as defined in <a href="#section-baseURIs">Section 5.3 Resolving URIs</a>.
@@ -2567,8 +2569,7 @@
<!-- old terms -->
<section id="oldTerms">
- <h4>Production oldTerms</h4>
- <a id="bagIdAttr"></a><a id="section-Bag-Expand"></a>
+ <h4 id="bagIdAttr" id="section-Bag-Expand" >Production oldTerms</h4>
<div class="productionOuter"><div class="productionInner"><p>
<code>rdf:aboutEach</code> | <code>rdf:aboutEachPrefix</code> | <code>rdf:bagID</code>
@@ -2662,8 +2663,7 @@
<!-- production node element -->
<section id="nodeElement">
- <h4>Production nodeElement</h4>
- <a id="description"></a><a id="typedNode"></a>
+ <h4 id="description" id="typedNode">Production nodeElement</h4>
<div class="productionOuter"><div class="productionInner"><p>
start-element(<a href="#eventterm-element-URI">URI</a> == <a href="#nodeElementURIs">nodeElementURIs</a><br />
@@ -2704,7 +2704,7 @@
<ul>
- <li><a id="nodeElementStatement1"></a> If <em>e</em>.<a href="#eventterm-element-URI">URI</a> != <code>rdf:Description</code>
+ <li><dfn id="nodeElementStatement1"></dfn> If <em>e</em>.<a href="#eventterm-element-URI">URI</a> != <code>rdf:Description</code>
then the following statement is added to the graph:
@@ -2713,7 +2713,7 @@
</p></div></div>
</li>
- <li><a id="nodeElementStatement2"></a> If there is an attribute <em>a</em>
+ <li><dfn id="nodeElementStatement2"></dfn> If there is an attribute <em>a</em>
in <a href="#propertyAttr">propertyAttr</a> with
<em>a</em>.<a href="#eventterm-attribute-URI">URI</a> == <code>rdf:type</code>
then
@@ -2726,7 +2726,7 @@
</p></div></div>
</li>
- <li><a id="nodeElementStatement3"></a> For each attribute <em>a</em> matching
+ <li><dfn id="nodeElementStatement3"></dfn> For each attribute <em>a</em> matching
<a href="#propertyAttr">propertyAttr</a> (and not <code>rdf:type</code>),
the Unicode string
<em>a</em>.<a href="#eventterm-attribute-string-value">string-value</a>
@@ -2742,7 +2742,7 @@
</p></div></div>
</li>
- <li><a id="nodeElementStatement4"></a> Handle the
+ <li><dfn id="nodeElementStatement4"></dfn> Handle the
<a href="#propertyEltList">propertyEltList</a> children events
in document order.</li>
@@ -3228,9 +3228,8 @@
<!-- id attribute -->
<section id="idAttr">
- <h4>Production idAttr</h4>
+ <h4 id="idAboutAttr">Production idAttr</h4>
<!-- idAboutAttr one has gone; id is closest thing replacing it -->
- <a id="idAboutAttr"></a>
<div class="productionOuter"><div class="productionInner"><p>
attribute(<a href="#eventterm-attribute-URI">URI</a> == <code>rdf:ID</code>,<br />
@@ -3266,8 +3265,7 @@
<!-- property attribute -->
<section id="propertyAttr">
- <h4>Production propertyAttr</h4>
- <a id="propAttr"></a><a id="typeAttr"></a>
+ <h4 id="propAttr" id="typeAttr">Production propertyAttr</h4>
<div class="productionOuter"><div class="productionInner"><p>
attribute(<a href="#eventterm-attribute-URI">URI</a> == <a href="#propertyAttributeURIs">propertyAttributeURIs</a>,<br />
@@ -3345,7 +3343,7 @@
<!-- URI reference -->
<section id="URI-reference">
- <h4>Production URI-reference</h4>
+ <h4>Production IRI</h4>
<div class="productionOuter"><div class="productionInner"><p>
An IRI.
@@ -3391,7 +3389,7 @@
<section id="section-Reification">
<h3>Reification Rules</h3>
- <p>For the given URI reference event <em>r</em> and
+ <p>For the given IRI event <em>r</em> and
the statement with terms <em>s</em>, <em>p</em> and <em>o</em>
corresponding to the N-Triples:</p>
@@ -3795,7 +3793,7 @@
</section>
<!-- THIRTEENTH PART : Changes -->
- <section id="changes" class="appendix informative">
+ <section id=section-changes" class="appendix informative">
<h2>Changes</h2>
<section id="changes-rdf11">
@@ -3817,7 +3815,6 @@
<section id="changes-2004">
<h2>Revisions since Draft 10 October 2003</h2>
- <a id="section-Changes"></a>
<p>Changes since <a href="http://www.w3.org/TR/2003/WD-rdf-syntax-grammar-20031010/">10 October 2003</a> second last call working draft</p>
@@ -3882,7 +3879,7 @@
<a href="#parseTypeCollectionPropertyElt">7.2.19</a> (<e.URI> twice)
<a href="#emptyPropertyElt">7.2.21</a> (<e.URI> twice, <a.URI> once)
changed from X.URI to X.URI-string-value (anywhere "<"..">" appeared
- in the grammar action without a hardcoded URI reference)<br />
+ in the grammar action without a hardcoded URI)<br />
<a href="#URI-reference">7.2.32</a>
Replace action wording with "An RDF URI reference"<br/>