--- a/model/prov-n.html Tue May 15 10:08:12 2012 -0400
+++ b/model/prov-n.html Tue May 15 15:55:48 2012 +0100
@@ -568,7 +568,7 @@
<section id="prov-n-standard-terms">
<h3>Identifiers and attributes</h3>
-<p>Most expressions defined in the grammar include the use of two terms: an identifier for the predicate, and 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. By convention, </em>optional</em> identifiers are separated using a semi-colon ';'. This makes it possible to completely omit an optional identifier with no ambiguity arising. Also, the set of attribute-value pairs is always the last term in any expression. </p>
+<p>Most expressions defined in the grammar include the use of two terms: an identifier for the predicate, and 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. By convention, </em>optional</em> identifiers are separated using a semi-colon ';'. 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.</p>
@@ -579,7 +579,7 @@
</pre>
</div>
-Lack of attributes can be equivalently expressed by omitting the list, or by using an empty list
+Lack of attributes can be equivalently expressed by omitting the list, or by using an empty list.
<!-- Expressions with no attributes A distinction is made between expressions with no attributes, and expressions that include an empty list of attributes. -->
@@ -1570,8 +1570,10 @@
<section id="component5">
<h3>Component 5: Collections</h3>
+
In the productions in this section, nonterminals <span class="nonterminal">keyValuePairs</span> and <span class="nonterminal">keySet</span> are defined as follows.
+<!--
<div class="grammar">
<span class="nonterminal">keyValuePairs</span> ::=
<span class="name">(</span>
@@ -1597,11 +1599,12 @@
<span class="name">,</span>
<span class="nonterminal">keySet</span>
</div>
-
+-->
<section id="expression-collection-insertion">
<h3>Insertion</h3>
+<!--
<div class="grammar">
<span class="nonterminal">derivationByInsertionFromExpression</span> ::=
<span class="name">derivedByInsertionFrom</span>
@@ -1618,6 +1621,7 @@
<span class="nonterminal">optional-attribute-values</span>
<span class="name">)</span>
</div>
+-->
<table class="grammar">
<tbody class="grammar-ref" data-ref="prod-insertionExpression"></tbody>
@@ -1650,6 +1654,7 @@
<section id="expression-collection-removal">
<h3>Removal</h3>
+<!--
<div class="grammar">
<span class="nonterminal">derivationByRemovalFromExpression</span> ::=
<span class="name">derivedByRemovalFrom</span>
@@ -1667,6 +1672,7 @@
<span class="name">)</span>
<br>
</div>
+-->
<table class="grammar">
<tbody class="grammar-ref" data-ref="prod-removalExpression"></tbody>
@@ -1698,6 +1704,7 @@
<section id="expression-collection-membership">
<h3>Membership</h3>
+<!--
<div class="grammar">
<span class="nonterminal">membershipExpression</span> ::=
<span class="name">isMemberOf</span>
@@ -1713,6 +1720,7 @@
<span class="name">)</span>
<br>
</div>
+-->
<table class="grammar">
<tbody class="grammar-ref" data-ref="prod-membershipExpression"></tbody>
@@ -1754,6 +1762,17 @@
<tbody class="grammar-ref" data-ref="prod-namedBundle"></tbody>
</table>
+<div class="anexample">
+ <pre class="codeexample">
+bundle ex:author-view
+ agent(ex:Paolo, [ prov:type='prov:Person' ])
+ agent(ex:Simon, [ prov:type='prov:Person' ])
+ ...
+endBundle
+ </pre>
+<p> Here <span class="name">ex:author-view</span> is the name of the bundle.
+</div>
+
</section>
@@ -1767,6 +1786,25 @@
</table>
+<div class="anexample">
+ <pre class="codeexample">
+
+bundle bob:bundle4
+ entity(ex:report1, ...)
+endBundle
+
+bundle alice:bundle5
+ entity(ex:report1)
+ hasProvenanceIn(ex:report1, bob:bundle4, -, -, -)
+ entity(ex:report2, ...)
+ wasDerivedFrom(ex:report2, ex:report1)
+endBundle
+</pre>
+
+In bundle <span class="name">alice:bundle5</span>, there is a description for entity <span class="name">ex:report1</span>, and a provenance locator pointing to bundle <span class="name">bob:bundle4</span>.
+The locator indicates that some provenance description for <span class="name">ex:report1</span> can be found in bundle <span class="name">bob:bundle4</span>.
+</div>
+
</section>
</section>
@@ -2114,6 +2152,7 @@
<section id="expression-literal">
<h4>Literal</h4>
+<!--
<div class='grammar'>
<span class="nonterminal">Literal</span> ::= <span class="nonterminal">typedLiteral</span> | <span class="nonterminal">convenienceNotation</span> <br/>
<span class="nonterminal">typedLiteral</span> ::= <span class="nonterminal">quotedString</span> <span class="name">%%</span> <span class="nonterminal">datatype</span><br/>
@@ -2124,6 +2163,7 @@
#x5C), enclosed in a pair of " (#x22) characters</em><br/>
<span class="nonterminal">intLiteral</span> ::= <em>a finite-length non-empty sequence of decimal digits (#x30-#x39) with an optional leading negative sign (-)</em>
</div>
+-->
<table class="grammar">
<tbody class="grammar-ref" data-ref="prod-literal"></tbody>