--- a/trig/index.html Mon Sep 02 14:37:24 2013 +0100
+++ b/trig/index.html Mon Sep 02 15:58:56 2013 +0100
@@ -677,8 +677,12 @@
<li id="curPredicate">RDF_Term <code class="dfn">curPredicate</code> — The <code class="curPredicate">curPredicate</code> is bound to the <code><a href="#grammar-production-verb">verb</a></code> production. If token matched was "<code>a</code>", <code class="curPredicate">curPredicate</code> is bound to the IRI <code>http://www.w3.org/1999/02/22-rdf-syntax-ns#type</code> <span class="testrefs">(test: <a href="tests/#type">type</a>)</span>.</li>
- <li id="curGraph">RDF_Term <code class="dfn">curGraph</code> — The <code class="curGraph">curGraph</code> is bound to the <code><a href="#grammar-production-graphName">graphName</a></code> production.</li>
-
+ <li id="curGraph">RDF_Term <code class="dfn">curGraph</code> —
+ The <code class="curGraph">curGraph</code> is bound to
+ the label of the graph that is the destination of triples
+ produced in parsing. When undefines, triples are detined
+ for the default graph.
+ </li>
</ul>
</section>
<section id="sec-parsing-terms">
@@ -716,7 +720,7 @@
</section>
<section id="sec-parsing-triples">
- <h3>RDF Triples Constructors</h3>
+ <h3>RDF Triples Construction</h3>
<p><small>@@ formatting of references to grammar rules</small></p>
<p><small>@@ first draft wording - needs refining</small></p>
<p>
@@ -727,67 +731,89 @@
</p>
<section id="output-graph">
- <h4
- style="padding-bottom:0; margin-bottom:0;"
- >Output Graph</h4>
- <p style="padding-top:0; margin-top:0;">The state <code class="curGraph">curGraph</code> is
- initially unset.</p>
- <p>
- The grammar production starting <tt>"GRAPH"</tt> in
- rule <tt><a href="#grammar-production-block">block</a></tt>
- or the production <tt>(iri | BlankNode) wrappedGraph</tt>
- in rule
- <tt><a href="#grammar-production-triplesOrGraph">triplesOrGraph</a></tt>
- 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.
+ <h4>Output Graph</h4>
+ <p>The state <code class="curGraph">curGraph</code> is
+ initially unset. It records the label of the graph for
+ triples produced during parsing. If undefined, the default
+ graph is used.</p>
+
+ <p>The following grammar production clauses set <code
+class="curGraph">curGraph</code>:</p>
+ <ul>
+ <li>
+ The grammar production clause starting <tt>"GRAPH"</tt> in
+ rule <tt><a href="#grammar-production-block">block</a></tt>.
+ <code class="curGraph">curGraph</code> is set to
+ the RDF term matched by <tt>(iri | BlankNode)</tt> in that
+ grammar clause.
+ </li>
+
+ <li>
+ The gramamr production clause <tt>(iri | BlankNode) wrappedGraph</tt>
+ in rule
+ <tt><a href="#grammar-production-triplesOrGraph">triplesOrGraph</a></tt>.
+ <code class="curGraph">curGraph</code> is set to
+ the RDF term matched by <tt>(iri | BlankNode)</tt> in that
+ grammar clause.
+ </li>
+ </ul>
+
+ <p>The following grammar production clauses set
+ <code class="curGraph">curGraph</code> to be undefined, indicating the default
+ graph:
</p>
+ <ul>
+ <li>
+ The grammar production clause <tt>wrappedGraph</tt> in rule <tt><a href="#grammar-production-block">block</a></tt>.
+ </li>
+ <li>
+ The grammar production
+ <tt>(iri | BlankNode) predicateObjectList '.'</tt>
+ in rule <tt><a href="#grammar-production-triplesOrGraph">triplesOrGraph</a></tt>.
+ </li>
- <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.
- </p>
-
+ <li>
+ The grammar production in rule
+ <tt><a href="#grammar-production-triples2">triples2</a></tt>.
+ </li>
+ </section>
+ <section>
+ <h4>Triple Output</h4>
<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
+ 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>.
+ 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>.
</p>
- </section>
-
- <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>Triples are produced at the following points in the
+ parsing process and each RDF triple produced is
+ added to the graph identified
+ by <code class="curGraph">curGraph</code>.
</p>
- </section>
- <section id="collection">
- <h4 style="padding-bottom:0; margin-bottom:0;"><span>Collections</span></h4>
+ <section>
+ <h5 style="padding-bottom:0; margin-bottom:0;">Triple Production</h5>
+ <p style="padding-top:0; margin-top:0;">
+ Each <a 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>
+ </p>
+ </section>
+ <section id="propertyList">
+ <h5 style="padding-bottom:0; margin-bottom:0;">Property Lists</h5>
+ <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">
+ <h5 style="padding-bottom:0; margin-bottom:0;"><span>Collections</span></h5>
<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>.