--- a/trig/index.html Mon Sep 02 13:51:19 2013 +0100
+++ b/trig/index.html Mon Sep 02 14:37:24 2013 +0100
@@ -716,19 +716,20 @@
</section>
<section id="sec-parsing-triples">
- <h3>RDF Triples Constructors</h3>
- <p><small>@@ formatting of references to grammar rules</small></p>
- <p><small>@@ first draft wording - needs refining</small></p>
- <p>
- A TriG document defines an <a href="http://www.w3.org/TR/rdf11-concepts/#section-dataset"
- >RDF Dataset</a> composed of one default graph and zero or
- more named graphs. Each graph is composed of a set of
- <a href="http://www.w3.org/TR/rdf11-concepts/#dfn-rdf-triple">RDF triple</a>s.
- </p>
-
- <h4 id="output-graph"
+ <h3>RDF Triples Constructors</h3>
+ <p><small>@@ formatting of references to grammar rules</small></p>
+ <p><small>@@ first draft wording - needs refining</small></p>
+ <p>
+ A TriG document defines an <a href="http://www.w3.org/TR/rdf11-concepts/#section-dataset"
+ >RDF Dataset</a> composed of one default graph and zero or
+ more named graphs. Each graph is composed of a set of
+ <a href="http://www.w3.org/TR/rdf11-concepts/#dfn-rdf-triple">RDF triple</a>s.
+ </p>
+
+ <section id="output-graph">
+ <h4
style="padding-bottom:0; margin-bottom:0;"
- >Output Graph:</h4>
+ >Output Graph</h4>
<p style="padding-top:0; margin-top:0;">The state <code class="curGraph">curGraph</code> is
initially unset.</p>
<p>
@@ -740,61 +741,64 @@
set <code class="curGraph">curGraph</code> to the IRI or
blank node just matched.
</p>
-
+
<p>
The grammar production <tt>wrappedGraph</tt> in rule <tt><a href="#grammar-production-block">block</a></tt>
sets <code class="curGraph">curGraph</code> to be
undefined.
</p>
-
+
<p>
The grammar production
<tt>(iri | BlankNode) predicateObjectList '.'</tt>
in rule <tt><a href="#grammar-production-triplesOrGraph">triplesOrGraph</a></tt>
sets <code class="curGraph">curGraph</code> to be
- undefined.
+ undefined.
</p>
-
+
<p>
The grammar production in rule
<tt><a href="#grammar-production-triples2">triples2</a></tt>
sets <code class="curGraph">curGraph</code> to be
undefined.
</p>
-
+
<p>
- Each RDF triple produced is added to
- <code class="curGraph">curGraph</code>,
- or the default graph if
- <code class="curGraph">curGraph</code> is not set at that
- point in the parsing process.
+ Each RDF triple produced is added to
+ <code class="curGraph">curGraph</code>,
+ or the default graph if
+ <code class="curGraph">curGraph</code> is not set at that
+ point in the parsing process.
</p>
- <p>
- The <code><a href="#grammar-production-subject">subject</a></code> production sets the <code class="curSubject">curSubject</code>.
- The <code><a href="#grammar-production-verb">verb</a></code> production sets the <code class="curPredicate">curPredicate</code>.
- Each <a tabindex="30" class="grammarRef" href="#grammar-production-object">object</a> <code>N</code> in the document produces an RDF triple: <span class="ntriple"><code class="curSubject">curSubject</code> <code class="curPredicate">curPredicate</code> <code>N</code> .</span> Each RDF triple produced is added to <code class="curGraph">curGraph</code>.
- </p>
-
- <h4 id="propertyList" style="padding-bottom:0; margin-bottom:0;"><span>Property Lists:</span></h4>
- <p style="padding-top:0; margin-top:0;">
- Beginning the <code><a href="#grammar-production-blankNodePropertyList">blankNodePropertyList</a></code> production records the <code class="curSubject">curSubject</code> and <code class="curPredicate">curPredicate</code>, and sets <code class="curSubject">curSubject</code> to a novel <code>blank node</code> <code>B</code>.
- Finishing the <code><a href="#grammar-production-blankNodePropertyList">blankNodePropertyList</a></code> production restores <code class="curSubject">curSubject</code> and <code class="curPredicate">curPredicate</code>.
- The node produced by matching <code><a href="#grammar-production-blankNodePropertyList">blankNodePropertyList</a></code> is the blank node <code>B</code>.
+ <p>
+ The <code><a href="#grammar-production-subject">subject</a></code> production sets the <code class="curSubject">curSubject</code>.
+ The <code><a href="#grammar-production-verb">verb</a></code> production sets the <code class="curPredicate">curPredicate</code>.
+ Each <a tabindex="30" class="grammarRef" href="#grammar-production-object">object</a> <code>N</code> in the document produces an RDF triple: <span class="ntriple"><code class="curSubject">curSubject</code> <code class="curPredicate">curPredicate</code> <code>N</code> .</span> Each RDF triple produced is added to <code class="curGraph">curGraph</code>.
+ </p>
+ </section>
- </p>
-
- <h4 id="collection" style="padding-bottom:0; margin-bottom:0;"><span>Collections:</span></h4>
- <p style="padding-top:0; margin-top:0;">
- Beginning the <code><a href="#grammar-production-collection">collection</a></code> production records the <code class="curSubject">curSubject</code> and <code class="curPredicate">curPredicate</code>.
- Each <code>object</code> in the <code><a href="#grammar-production-collection">collection</a></code> production has a <code class="curSubject">curSubject</code> set to a novel <code>blank node</code> <code>B</code> and a <code class="curPredicate">curPredicate</code> set to <code>rdf:first</code>.
- For each object <code>object<sub>n</sub></code> after the first produces a triple:<span class="ntriple"><code>object<sub>n-1</sub></code> <code>rdf:rest</code> <code>object<sub>n</sub></code> .</span>
- Finishing the <code><a href="#grammar-production-collection">collection</a></code> production creates an additional triple <span class="ntriple"><code>curSubject rdf:rest rdf:nil</code> .</span> and restores <code class="curSubject">curSubject</code> and <code class="curPredicate">curPredicate</code>
- The node produced by matching <code><a href="#grammar-production-collection">collection</a></code> is the first blank node <code>B</code> for non-empty lists and <code>rdf:nil</code> for empty lists.
- </p>
+ <section id="propertyList">
+ <h4 style="padding-bottom:0; margin-bottom:0;">Property Lists</h4>
+ <p style="padding-top:0; margin-top:0;">
+ Beginning the <code><a href="#grammar-production-blankNodePropertyList">blankNodePropertyList</a></code> production records the <code class="curSubject">curSubject</code> and <code class="curPredicate">curPredicate</code>, and sets <code class="curSubject">curSubject</code> to a novel <code>blank node</code> <code>B</code>.
+ Finishing the <code><a href="#grammar-production-blankNodePropertyList">blankNodePropertyList</a></code> production restores <code class="curSubject">curSubject</code> and <code class="curPredicate">curPredicate</code>.
+ The node produced by matching <code><a href="#grammar-production-blankNodePropertyList">blankNodePropertyList</a></code> is the blank node <code>B</code>.
+ </p>
+ </section>
+ <section id="collection">
+ <h4 style="padding-bottom:0; margin-bottom:0;"><span>Collections</span></h4>
+ <p style="padding-top:0; margin-top:0;">
+ Beginning the <code><a href="#grammar-production-collection">collection</a></code> production records the <code class="curSubject">curSubject</code> and <code class="curPredicate">curPredicate</code>.
+ Each <code>object</code> in the <code><a href="#grammar-production-collection">collection</a></code> production has a <code class="curSubject">curSubject</code> set to a novel <code>blank node</code> <code>B</code> and a <code class="curPredicate">curPredicate</code> set to <code>rdf:first</code>.
+ For each object <code>object<sub>n</sub></code> after the first produces a triple:<span class="ntriple"><code>object<sub>n-1</sub></code> <code>rdf:rest</code> <code>object<sub>n</sub></code> .</span>
+ Finishing the <code><a href="#grammar-production-collection">collection</a></code> production creates an additional triple <span class="ntriple"><code>curSubject rdf:rest rdf:nil</code> .</span> and restores <code class="curSubject">curSubject</code> and <code class="curPredicate">curPredicate</code>
+ The node produced by matching <code><a href="#grammar-production-collection">collection</a></code> is the first blank node <code>B</code> for non-empty lists and <code>rdf:nil</code> for empty lists.
+ </p>
+ </section>
</section>
- </section>
- <section id="sec-differences" class="appendix informative">
+ </section>
+ <section id="sec-differences" class="appendix informative">
<h2>Differences from Previous TriG</h2>
<p>This section describes the main differences between TriG, as
defined in this ddcument, and the