--- a/model/prov-n.html Tue Oct 16 12:38:19 2012 +0100
+++ b/model/prov-n.html Tue Oct 16 12:59:35 2012 +0100
@@ -606,7 +606,7 @@
</li>
</ul>
-</div>
+
<p>Where suitable, the PROV-N grammar reuses production and terminal names of the SPARQL grammar [[!RDF-SPARQL-QUERY]].</p>
@@ -678,7 +678,7 @@
activity(a1, -, -)
</pre>
</div>
-</li>
+
</section>
@@ -686,7 +686,7 @@
<h3>Identifiers and attributes</h3>
<p>Almost all expressions defined in the grammar include an identifier (see <a href="#expression-identifier">Section 3.7.1</a> for the full syntax of identifiers). Most expressions
-can aslo include a set of attribute-value pairs, delimited by square brackets. Identifiers are optional except for Entities, Activites, and Agents. Identifiers are always the first term in any expression. </em>Optional</em> identifiers MUST be separated using a semi-colon ';', but where the identifiers are required, a regular comma ',' MUST be used. This makes it possible to completely omit an optional identifier with no ambiguity arising. Also, if the set of attribute-value pairs is present, it is always the last term in any expression.</p>
+can aslo include a set of attribute-value pairs, delimited by square brackets. Identifiers are optional except for Entities, Activites, and Agents. Identifiers are always the first term in any expression. <em>Optional</em> identifiers MUST be separated using a semi-colon ';', but where the identifiers are required, a regular comma ',' MUST be used. This makes it possible to completely omit an optional identifier with no ambiguity arising. Also, if the set of attribute-value pairs is present, it is always the last term in any expression.</p>
<div class="anexample">
<p>Derivation has an optional identifier. In the first expression, the identifier is not available, while it is explicit in the second. The third example shows that one can optionally indicate the missing identifier using the <span class="name">-</span> marker. This is equivalent to the first expression. </p>
@@ -741,7 +741,7 @@
<section id="expression-Entity">
<h4>Entity</h4>
-<div class="withPn">
+
<p>
<table class="grammar">
@@ -831,7 +831,7 @@
<h4>Generation</h4>
-<div class="withPn">
+
@@ -1093,7 +1093,7 @@
<h4>Invalidation</h4>
-<div class="withPn">
+
<table class="grammar">
@@ -1276,7 +1276,7 @@
[ prov:type='prov:PrimarySource' ])
</pre>
<p>Here, the derivation is provided with a <span class="name">prov:type</span> attribute and value <span class="name">prov:PrimarySource</span>.
- </pre>
+ </p>
</div>
@@ -2254,7 +2254,7 @@
<section id="semantic-rules-summary">
<h3>Summary of additional semantic rules</h3>
-Some of the grammar productions allow for expressions that are syntactically correct, and yet according to [[PROV-DM]] they are not acceptable, because additional semantic rules are defined for those expressions.
+<p>Some of the grammar productions allow for expressions that are syntactically correct, and yet according to [[PROV-DM]] they are not acceptable, because additional semantic rules are defined for those expressions.
The following table provides a summary of such expressions along with examples of syntactically correct but unacceptable forms, and the additional semantic rules.</p>
<div style="text-align: left;">
@@ -2269,9 +2269,10 @@
<td><span class="name">wasGeneratedBy(e2, -, -)</span><br/><span class="name">wasGeneratedBy(-; e2, -, -)</span></td>
<td>At least one of <a href="http://www.w3.org/TR/prov-dm/#generation.id"><span class='attribute'>id</span></a>, <a href="http://www.w3.org/TR/prov-dm/#generation.activity"><span class='attribute'>activity</span></a>, <a href="http://www.w3.org/TR/prov-dm/#generation.time"><span class='attribute'>time</span></a>, and <a href="http://www.w3.org/TR/prov-dm/#generation.attributes"><span class='attribute'>attributes</span></a> MUST be present.</td>
</tr>
-<td><a class="grammarRef" href="#prod-usageExpression">Usage expression</a></td>
+<tr><td><a class="grammarRef" href="#prod-usageExpression">Usage expression</a></td>
<td><span class="name">used(a2, -, -)</span><br/><span class="name">used(-; a2, -, -)</span></td>
<td>At least one of <a href="http://www.w3.org/TR/prov-dm/#usage.id"><span class='attribute'>id</span></a>, <a href="http://www.w3.org/TR/prov-dm/#usage.entity"><span class='attribute'>entity</span></a>, <a href="http://www.w3.org/TR/prov-dm/#usage.time"><span class='attribute'>time</span></a>, and <a href="http://www.w3.org/TR/prov-dm/#usage.attributes"><span class='attribute'>attributes</span></a> MUST be present</td>
+</tr>
<tr>
<td><a class="grammarRef" href="#prod-startExpression">Start expression</a></td>
<td> <span class="name">wasStartedBy(e2, -, -, -)</span><br/><span class="name">wasStartedBy(-; e2, -, -, -)</span></td>
@@ -2374,7 +2375,7 @@
<section id="extensibility">
<h4>Extensibility</h4>
-<p>The PROV data model is extensible by means of attributes <span class="name">prov:type</span> and <span class="name">prov:role</span> allowing subtyping of expressions. For some applications, novel syntax may also be convenient. Hence, the normative requirements are as follow.
+<p>The PROV data model is extensible by means of attributes <span class="name">prov:type</span> and <span class="name">prov:role</span> allowing subtyping of expressions. For some applications, novel syntax may also be convenient. Hence, the normative requirements are as follow.</p>
<ul>
<li> PROV-N compliant parsers MUST be able to parse expressions matching the <code class="content"><a class="grammarRef"
href="#prod-extensibilityExpression">extensibilityExpression</a></code> production defined below.
@@ -2382,7 +2383,7 @@
MAY ignore these expressions.</li>
<li> Extensions to PROV and PROV-N MAY specify more specific productions and interpretations for these expressions, which applications MAY adopt to follow. </li>
</ul>
-</p>
+
<table class="grammar">
@@ -2402,7 +2403,7 @@
<div class="anexample">
<p>
-<a href="#component6">Collections</a> are sets of entities, whose membership can be expressed using the <span class="name">hadMember</span> relation. The following example shows how one can express membership for <em>dictionaries</em>, an illustrative extension of Collections consisting of sets of key-entity pairs, where a key is a <a class="grammarRef" href="#prod-literal">literal</a></code>. The notation is a variation of that used for Collections membership, allowing multiple member elements to be declared, and in which the elements are pairs. The name of the relation is qualified with the extension-specific namespace <span class="name">http://example.org/dictionaries</span>.
+<a href="#component6">Collections</a> are sets of entities, whose membership can be expressed using the <span class="name">hadMember</span> relation. The following example shows how one can express membership for <em>dictionaries</em>, an illustrative extension of Collections consisting of sets of key-entity pairs, where a key is a <code><a class="grammarRef" href="#prod-literal">literal</a></code>. The notation is a variation of that used for Collections membership, allowing multiple member elements to be declared, and in which the elements are pairs. The name of the relation is qualified with the extension-specific namespace <span class="name">http://example.org/dictionaries</span>.
</p>
<pre class="codeexample">
prefix dictExt <http://example.org/dictionaries>
@@ -2528,10 +2529,10 @@
<h2>Changes since last version</h2>
<p>
<ul>
-<p> <a href="http://www.w3.org/2011/prov/track/issues/543">ISSUE-543</a>: uses key-entity pair terminology for example 43.
-<p> <a href="http://www.w3.org/2011/prov/track/issues/538">ISSUE-538</a>: rephrasing of text in example 10.
-<p> <a href="http://www.w3.org/2011/prov/track/issues/547">ISSUE-547</a>: aligned terminology and productions with prov-constraints document, renaming 'toplevel bundle' to 'document', and renaming 'named bundle' to 'bundle'.
-<p> <a href="http://www.w3.org/2011/prov/track/issues/496">ISSUE-496</a>: For each prov-n term, added a cross-reference to corresponding prov-dm term (see table following each production). Rephrased text related to scope of a namespace declaration. Added an informative file with all productions.
+<li> <a href="http://www.w3.org/2011/prov/track/issues/543">ISSUE-543</a>: uses key-entity pair terminology for example 43.
+<li> <a href="http://www.w3.org/2011/prov/track/issues/538">ISSUE-538</a>: rephrasing of text in example 10.
+<li> <a href="http://www.w3.org/2011/prov/track/issues/547">ISSUE-547</a>: aligned terminology and productions with prov-constraints document, renaming 'toplevel bundle' to 'document', and renaming 'named bundle' to 'bundle'.
+<li> <a href="http://www.w3.org/2011/prov/track/issues/496">ISSUE-496</a>: For each prov-n term, added a cross-reference to corresponding prov-dm term (see table following each production). Rephrased text related to scope of a namespace declaration. Added an informative file with all productions.
</ul>
</section>