--- a/model/diff-n.html Tue May 15 13:10:09 2012 +0100
+++ b/model/diff-n.html Tue May 15 13:12:19 2012 +0100
@@ -1004,7 +1004,7 @@
from its constraints, and the notation used to illustrate it. The
PROV-N release is synchronized with the release of the PROV-DM, PROV-O,
PROV-PRIMER, and PROV-CONSTRAINTS documents.
-</p><p>This document was published by the <a href="http://www.w3.org/2011/prov/">Provenance Working Group</a> as <span class="delete">a First Public Working</span><span class="insert">an Editor's</span> Draft.<span class="delete"> This document is intended to become a </span><span class="delete">W3C</span><span class="delete"> Recommendation.</span> If you wish to make comments regarding this document, please send them to <a href="mailto:public-prov-wg@w3.org">public-prov-wg@w3.org</a> (<a href="mailto:public-prov-wg-request@w3.org?subject=subscribe">subscribe</a>, <a href="http://lists.w3.org/Archives/Public/public-prov-wg/">archives</a>). All feedback is welcome.</p><p>Publication as <span class="delete">a Working</span><span class="insert">an Editor's</span> Draft does not imply endorsement by the <acronym title="World Wide Web Consortium">W3C</acronym> Membership. This is a draft document and may be updated, replaced or obsoleted by other documents at any time. It is inappropriate to cite this document as other than work in progress.</p><p>This document was produced by a group operating under the <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5 February 2004 <acronym title="World Wide Web Consortium">W3C</acronym> Patent Policy</a>. <acronym title="World Wide Web Consortium">W3C</acronym> maintains a <a href="http://www.w3.org/2004/01/pp-impl/46974/status" rel="disclosure">public list of any patent disclosures</a> made in connection with the deliverables of the group; that page also includes instructions for disclosing a patent. An individual who has actual knowledge of a patent which the individual believes contains <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/#def-essential">Essential Claim(s)</a> must disclose the information in accordance with <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/#sec-Disclosure">section 6 of the <acronym title="World Wide Web Consortium">W3C</acronym> Patent Policy</a>.</p></div><div id="toc" class="section"><h2 class="introductory">Table of Contents</h2><ul class="toc"><li class="tocline"><a href="#introduction" class="tocxref"><span class="secno">1. </span>Introduction</a><ul class="toc"><li class="tocline"><a href="#purpose" class="tocxref"><span class="secno">1.1 </span>Purpose of this Document and target audience</a></li><li class="tocline"><a href="#structure-of-this-document" class="tocxref"><span class="secno">1.2 </span>Structure of this Document</a></li><li class="tocline"><a href="#prov-dm-namespace" class="tocxref"><span class="secno">1.3 </span>Notational Conventions</a></li></ul></li><li class="tocline"><a href="#general-conventions" class="tocxref"><span class="secno">2. </span>General grammar considerations</a><ul class="toc"><li class="tocline"><a href="#functional-syntax" class="tocxref"><span class="secno">2.1 </span>Functional-style Syntax</a></li><li class="tocline"><a href="#grammar-notation" class="tocxref"><span class="secno">2.2 </span>EBNF Grammar</a></li><li class="tocline"><a href="#prov-n-optionals" class="tocxref"><span class="secno">2.3 </span>Optional terms in expressions</a></li><li class="tocline"><a href="#prov-n-standard-terms" class="tocxref"><span class="secno">2.4 </span>Identifiers and attributes</a></li></ul></li><li class="tocline"><a href="#prov-n-expressions" class="tocxref"><span class="secno">3. </span>PROV-N Productions per Component</a><ul class="toc"><li class="tocline"><a href="#component1" class="tocxref"><span class="secno">3.1 </span>Component 1: Entities and Activities</a><ul class="toc"><li class="tocline"><a href="#expression-Entity" class="tocxref"><span class="secno">3.1.1 </span>Entity</a></li><li class="tocline"><a href="#expression-Activity" class="tocxref"><span class="secno">3.1.2 </span>Activity</a></li><li class="tocline"><a href="#expression-Generation" class="tocxref"><span class="secno">3.1.3 </span>Generation</a></li><li class="tocline"><a href="#expression-Usage" class="tocxref"><span class="secno">3.1.4 </span>Usage</a></li><li class="tocline"><a href="#expression-Start" class="tocxref"><span class="secno">3.1.5 </span>Start</a></li><li class="tocline"><a href="#expression-End" class="tocxref"><span class="secno">3.1.6 </span>End</a></li><li class="tocline"><a href="#expression-Invalidation" class="tocxref"><span class="secno">3.1.7 </span>Invalidation</a></li><li class="tocline"><a href="#expression-wasInformedBy" class="tocxref"><span class="secno">3.1.8 </span>Communication</a></li><span class="delete">3.1.9 </span><span class="delete">Start by Activity</span></ul></li><li class="tocline"><a href="#component2" class="tocxref"><span class="secno">3.2 </span>Component 2: Agents and Responsibility</a><ul class="toc"><li class="tocline"><a href="#expression-Agent" class="tocxref"><span class="secno">3.2.1 </span>Agent</a></li><li class="tocline"><a href="#expression-attribution" class="tocxref"><span class="secno">3.2.2 </span>Attribution</a></li><li class="tocline"><a href="#expression-Association" class="tocxref"><span class="secno">3.2.3 </span>Association</a></li><li class="tocline"><a href="#expression-responsibility" class="tocxref"><span class="secno">3.2.4 </span>Responsibility</a></li></ul></li><li class="tocline"><a href="#component3" class="tocxref"><span class="secno">3.3 </span>Component 3: Derivations</a><ul class="toc"><li class="tocline"><a href="#Derivation-Relation" class="tocxref"><span class="secno">3.3.1 </span>Derivation</a></li><li class="tocline"><a href="#expression-Revision" class="tocxref"><span class="secno">3.3.2 </span>Revision</a></li><li class="tocline"><a href="#expression-quotation" class="tocxref"><span class="secno">3.3.3 </span>Quotation</a></li><li class="tocline"><a href="#expression-original-source" class="tocxref"><span class="secno">3.3.4 </span>Original Source</a></li><li class="tocline"><a href="#expression-trace" class="tocxref"><span class="secno">3.3.5 </span>Trace</a></li></ul></li><li class="tocline"><a href="#component4" class="tocxref"><span class="secno">3.4 </span>Component 4: Alternate Entities</a><ul class="toc"><li class="tocline"><a href="#expression-alternate" class="tocxref"><span class="secno">3.4.1 </span>Alternate</a></li><li class="tocline"><a href="#expression-specialization" class="tocxref"><span class="secno">3.4.2 </span>Specialization</a></li></ul></li><li class="tocline"><a href="#component5" class="tocxref"><span class="secno">3.5 </span>Component 5: Collections</a><ul class="toc"><li class="tocline"><a href="#expression-collection-insertion" class="tocxref"><span class="secno">3.5.1 </span>Insertion</a></li><li class="tocline"><a href="#expression-collection-removal" class="tocxref"><span class="secno">3.5.2 </span>Removal</a></li><li class="tocline"><a href="#expression-collection-membership" class="tocxref"><span class="secno">3.5.3 </span>Membership</a></li></ul></li><li class="tocline"><a href="#component6" class="tocxref"><span class="secno">3.6 </span>Component 6: <span class="insert">Bundles</span></a><ul class="toc"><li class="tocline"><a href="#expression-bundle-declaration" class="tocxref"><span class="secno"><span class="insert">3.6.1 </span></span><span class="insert">Bundle Declaration</span></a></li><li class="tocline"><a href="#expression-bundle-description" class="tocxref"><span class="secno"><span class="insert">3.6.2 </span></span><span class="insert">Bundle Description</span></a></li><li class="tocline"><a href="#expression-provenance-locator" class="tocxref"><span class="secno"><span class="insert">3.6.3 </span></span><span class="insert">Provenance Locator</span></a></li></ul></li><li class="tocline"><a href="#component6" class="tocxref"><span class="secno"><span class="insert">3.7 </span></span><span class="insert">Component 6: </span>Annotations<span class="insert"> (OBSOLETE, TO DISAPPEAR)</span></a><ul class="toc"><li class="tocline"><a href="#expression-note" class="tocxref"><span class="secno"><span class="delete">3.6.1</span><span class="insert">3.7.1</span> </span>Note</a></li><li class="tocline"><a href="#expression-annotation" class="tocxref"><span class="secno"><span class="delete">3.6.2</span><span class="insert">3.7.2</span> </span>Annotation</a></li></ul></li><li class="tocline"><a href="#subexpressions" class="tocxref"><span class="secno"><span class="delete">3.7</span><span class="insert">3.8</span> </span>Further Expressions</a><ul class="toc"><li class="tocline"><a href="#expression-NamespaceDeclaration" class="tocxref"><span class="secno"><span class="delete">3.7.1</span><span class="insert">3.8.1</span> </span>Namespace Declaration</a></li><li class="tocline"><a href="#expression-identifier" class="tocxref"><span class="secno"><span class="delete">3.7.2</span><span class="insert">3.8.2</span> </span>Identifier</a></li><li class="tocline"><a href="#expression-attribute" class="tocxref"><span class="secno"><span class="delete">3.7.3</span><span class="insert">3.8.3</span> </span>Attribute</a></li><li class="tocline"><a href="#expression-literal" class="tocxref"><span class="secno"><span class="delete">3.7.4</span><span class="insert">3.8.4</span> </span>Literal</a><ul class="toc"><li class="tocline"><a href="#expression-types" class="tocxref"><span class="secno"><span class="delete">3.7.4.1</span><span class="insert">3.8.4.1</span> </span>Reserved Type Values</a></li><li class="tocline"><a href="#expression-Time" class="tocxref"><span class="secno"><span class="delete">3.7.4.2</span><span class="insert">3.8.4.2</span> </span>Time Values</a></li></ul></li></ul></li></ul></li><li class="tocline"><a href="#ExpressionContainer" class="tocxref"><span class="secno">4. </span>Expression Container</a></li><li class="tocline"><a href="#account" class="tocxref"><span class="secno">5. </span>Account</a></li><li class="tocline"><a href="#media-type" class="tocxref"><span class="secno">6. </span>Media Type</a></li><li class="tocline"><a href="#acknowledgements" class="tocxref"><span class="secno">A. </span>Acknowledgements</a></li><li class="tocline"><a href="#references" class="tocxref"><span class="secno">B. </span>References</a><ul class="toc"><li class="tocline"><a href="#normative-references" class="tocxref"><span class="secno">B.1 </span>Normative references</a></li><li class="tocline"><a href="#informative-references" class="tocxref"><span class="secno">B.2 </span>Informative references</a></li></ul></li></ul></div>
+</p><p>This document was published by the <a href="http://www.w3.org/2011/prov/">Provenance Working Group</a> as <span class="delete">a First Public Working</span><span class="insert">an Editor's</span> Draft.<span class="delete"> This document is intended to become a </span><span class="delete">W3C</span><span class="delete"> Recommendation.</span> If you wish to make comments regarding this document, please send them to <a href="mailto:public-prov-wg@w3.org">public-prov-wg@w3.org</a> (<a href="mailto:public-prov-wg-request@w3.org?subject=subscribe">subscribe</a>, <a href="http://lists.w3.org/Archives/Public/public-prov-wg/">archives</a>). All feedback is welcome.</p><p>Publication as <span class="delete">a Working</span><span class="insert">an Editor's</span> Draft does not imply endorsement by the <acronym title="World Wide Web Consortium">W3C</acronym> Membership. This is a draft document and may be updated, replaced or obsoleted by other documents at any time. It is inappropriate to cite this document as other than work in progress.</p><p>This document was produced by a group operating under the <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5 February 2004 <acronym title="World Wide Web Consortium">W3C</acronym> Patent Policy</a>. <acronym title="World Wide Web Consortium">W3C</acronym> maintains a <a href="http://www.w3.org/2004/01/pp-impl/46974/status" rel="disclosure">public list of any patent disclosures</a> made in connection with the deliverables of the group; that page also includes instructions for disclosing a patent. An individual who has actual knowledge of a patent which the individual believes contains <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/#def-essential">Essential Claim(s)</a> must disclose the information in accordance with <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/#sec-Disclosure">section 6 of the <acronym title="World Wide Web Consortium">W3C</acronym> Patent Policy</a>.</p></div><div id="toc" class="section"><h2 class="introductory">Table of Contents</h2><ul class="toc"><li class="tocline"><a href="#introduction" class="tocxref"><span class="secno">1. </span>Introduction</a><ul class="toc"><li class="tocline"><a href="#purpose" class="tocxref"><span class="secno">1.1 </span>Purpose of this Document and target audience</a></li><li class="tocline"><a href="#structure-of-this-document" class="tocxref"><span class="secno">1.2 </span>Structure of this Document</a></li><li class="tocline"><a href="#prov-dm-namespace" class="tocxref"><span class="secno">1.3 </span>Notational Conventions</a></li></ul></li><li class="tocline"><a href="#general-conventions" class="tocxref"><span class="secno">2. </span>General grammar considerations</a><ul class="toc"><li class="tocline"><a href="#functional-syntax" class="tocxref"><span class="secno">2.1 </span>Functional-style Syntax</a></li><li class="tocline"><a href="#grammar-notation" class="tocxref"><span class="secno">2.2 </span>EBNF Grammar</a></li><li class="tocline"><a href="#prov-n-optionals" class="tocxref"><span class="secno">2.3 </span>Optional terms in expressions</a></li><li class="tocline"><a href="#prov-n-standard-terms" class="tocxref"><span class="secno">2.4 </span>Identifiers and attributes</a></li></ul></li><li class="tocline"><a href="#prov-n-expressions" class="tocxref"><span class="secno">3. </span>PROV-N Productions per Component</a><ul class="toc"><li class="tocline"><a href="#component1" class="tocxref"><span class="secno">3.1 </span>Component 1: Entities and Activities</a><ul class="toc"><li class="tocline"><a href="#expression-Entity" class="tocxref"><span class="secno">3.1.1 </span>Entity</a></li><li class="tocline"><a href="#expression-Activity" class="tocxref"><span class="secno">3.1.2 </span>Activity</a></li><li class="tocline"><a href="#expression-Generation" class="tocxref"><span class="secno">3.1.3 </span>Generation</a></li><li class="tocline"><a href="#expression-Usage" class="tocxref"><span class="secno">3.1.4 </span>Usage</a></li><li class="tocline"><a href="#expression-Start" class="tocxref"><span class="secno">3.1.5 </span>Start</a></li><li class="tocline"><a href="#expression-End" class="tocxref"><span class="secno">3.1.6 </span>End</a></li><li class="tocline"><a href="#expression-Invalidation" class="tocxref"><span class="secno">3.1.7 </span>Invalidation</a></li><li class="tocline"><a href="#expression-wasInformedBy" class="tocxref"><span class="secno">3.1.8 </span>Communication</a></li><span class="delete">3.1.9 </span><span class="delete">Start by Activity</span></ul></li><li class="tocline"><a href="#component2" class="tocxref"><span class="secno">3.2 </span>Component 2: Agents and Responsibility</a><ul class="toc"><li class="tocline"><a href="#expression-Agent" class="tocxref"><span class="secno">3.2.1 </span>Agent</a></li><li class="tocline"><a href="#expression-attribution" class="tocxref"><span class="secno">3.2.2 </span>Attribution</a></li><li class="tocline"><a href="#expression-Association" class="tocxref"><span class="secno">3.2.3 </span>Association</a></li><li class="tocline"><a href="#expression-responsibility" class="tocxref"><span class="secno">3.2.4 </span>Responsibility</a></li></ul></li><li class="tocline"><a href="#component3" class="tocxref"><span class="secno">3.3 </span>Component 3: Derivations</a><ul class="toc"><li class="tocline"><a href="#Derivation-Relation" class="tocxref"><span class="secno">3.3.1 </span>Derivation</a></li><li class="tocline"><a href="#expression-Revision" class="tocxref"><span class="secno">3.3.2 </span>Revision</a></li><li class="tocline"><a href="#expression-quotation" class="tocxref"><span class="secno">3.3.3 </span>Quotation</a></li><li class="tocline"><a href="#expression-original-source" class="tocxref"><span class="secno">3.3.4 </span>Original Source</a></li><li class="tocline"><a href="#expression-trace" class="tocxref"><span class="secno">3.3.5 </span>Trace</a></li></ul></li><li class="tocline"><a href="#component4" class="tocxref"><span class="secno">3.4 </span>Component 4: Alternate Entities</a><ul class="toc"><li class="tocline"><a href="#expression-alternate" class="tocxref"><span class="secno">3.4.1 </span>Alternate</a></li><li class="tocline"><a href="#expression-specialization" class="tocxref"><span class="secno">3.4.2 </span>Specialization</a></li></ul></li><li class="tocline"><a href="#component5" class="tocxref"><span class="secno">3.5 </span>Component 5: Collections</a><ul class="toc"><li class="tocline"><a href="#expression-collection-insertion" class="tocxref"><span class="secno">3.5.1 </span>Insertion</a></li><li class="tocline"><a href="#expression-collection-removal" class="tocxref"><span class="secno">3.5.2 </span>Removal</a></li><li class="tocline"><a href="#expression-collection-membership" class="tocxref"><span class="secno">3.5.3 </span>Membership</a></li></ul></li><li class="tocline"><a href="#component6" class="tocxref"><span class="secno">3.6 </span>Component 6: <span class="insert">Bundles</span></a><ul class="toc"><li class="tocline"><a href="#expression-bundle-declaration" class="tocxref"><span class="secno"><span class="insert">3.6.1 </span></span><span class="insert">Bundle Declaration</span></a></li><li class="tocline"><a href="#expression-provenance-locator" class="tocxref"><span class="secno"><span class="insert">3.6.2 </span></span><span class="insert">Provenance Locator</span></a></li></ul></li><li class="tocline"><a href="#component6" class="tocxref"><span class="secno"><span class="insert">3.7 </span></span><span class="insert">Component 6: </span>Annotations<span class="insert"> (OBSOLETE, TO DISAPPEAR)</span></a><ul class="toc"><li class="tocline"><a href="#expression-note" class="tocxref"><span class="secno"><span class="delete">3.6.1</span><span class="insert">3.7.1</span> </span>Note</a></li><li class="tocline"><a href="#expression-annotation" class="tocxref"><span class="secno"><span class="delete">3.6.2</span><span class="insert">3.7.2</span> </span>Annotation</a></li></ul></li><li class="tocline"><a href="#subexpressions" class="tocxref"><span class="secno"><span class="delete">3.7</span><span class="insert">3.8</span> </span>Further Expressions</a><ul class="toc"><li class="tocline"><a href="#expression-NamespaceDeclaration" class="tocxref"><span class="secno"><span class="delete">3.7.1</span><span class="insert">3.8.1</span> </span>Namespace Declaration</a></li><li class="tocline"><a href="#expression-identifier" class="tocxref"><span class="secno"><span class="delete">3.7.2</span><span class="insert">3.8.2</span> </span>Identifier</a></li><li class="tocline"><a href="#expression-attribute" class="tocxref"><span class="secno"><span class="delete">3.7.3</span><span class="insert">3.8.3</span> </span>Attribute</a></li><li class="tocline"><a href="#expression-literal" class="tocxref"><span class="secno"><span class="delete">3.7.4</span><span class="insert">3.8.4</span> </span>Literal</a><ul class="toc"><li class="tocline"><a href="#expression-types" class="tocxref"><span class="secno"><span class="delete">3.7.4.1</span><span class="insert">3.8.4.1</span> </span>Reserved Type Values</a></li><li class="tocline"><a href="#expression-Time" class="tocxref"><span class="secno"><span class="delete">3.7.4.2</span><span class="insert">3.8.4.2</span> </span>Time Values</a></li></ul></li></ul></li></ul></li><li class="tocline"><a href="#toplevelBundle" class="tocxref"><span class="secno">4. </span><span class="delete">Expression Container</span><span class="delete">5. </span><span class="delete">Account</span><span class="insert">Toplevel Bundle</span></a></li><li class="tocline"><a href="#media-type" class="tocxref"><span class="secno"><span class="delete">6.</span><span class="insert">5.</span> </span>Media Type</a></li><li class="tocline"><a href="#acknowledgements" class="tocxref"><span class="secno">A. </span>Acknowledgements</a></li><li class="tocline"><a href="#references" class="tocxref"><span class="secno">B. </span>References</a><ul class="toc"><li class="tocline"><a href="#normative-references" class="tocxref"><span class="secno">B.1 </span>Normative references</a></li><li class="tocline"><a href="#informative-references" class="tocxref"><span class="secno">B.2 </span>Informative references</a></li></ul></li></ul></div>
@@ -1056,7 +1056,8 @@
<p>This document introduces the PROV-N grammar along with examples of its usage.</p>
<p>Its target audience is twofold:
</p><ul>
-<li>Developers of provenance management applications, as well as implementors of new PROV data model encodings, and thus in particular of PROV-N parsers. These readers may be interested in the entire structure of the grammar, starting from the top level nonterminal <a href="#ExpressionContainer">container</a>.</li>
+<li>Developers of provenance management applications, as well as implementors of new PROV data model encodings, and thus in particular of PROV-N parsers. These readers may be interested in the entire structure of the grammar, starting from the top level nonterminal <span class="delete">container</span>
+<a class="grammarRef" href="#prod-bundle"><span class="insert">bundle</span></a>.</li>
<li>Readers of the [<cite><a class="bibref" rel="biblioentry" href="#bib-PROV-DM">PROV-DM</a></cite>] and of [<cite><a class="bibref" rel="biblioentry" href="#bib-PROV-CONSTRAINTS">PROV-CONSTRAINTS</a></cite>] documents, who are interested in the details of the formal language underpinning the notation used in the examples and in the definition of the constraints. Those readers may find the <a href="#grammar-notation">expression</a> nonterminal a useful entry point into the grammar.</li>
</ul>
@@ -1075,11 +1076,14 @@
<p><a href="#prov-n-expressions">Section 4</a> presents the grammar of all expressions of the language grouped according to the PROV data model components.</p>
-<p><a href="#ExpressionContainer">Section 5</a> defines the grammar of containers, a house-keeping construct of PROV-N capable of packaging up PROV-N expressions and namespace declarations.</p>
-
-<p><a href="#account">Section 6</a> defines the grammar of accounts.</p>
-
-<p><a href="#media-type">Section 7</a> defines media type for the PROV-N notation.</p>
+<p><a href="#toplevelBundle">Section 5</a> defines the grammar of <span class="delete">containers,</span><span class="insert">toplevel bundles,</span> a house-keeping construct of PROV-N capable of packaging up PROV-N expressions and namespace declarations.</p>
+
+<span class="delete">Section 6</span><span class="delete"> defines the grammar of accounts.</span>
+
+
+
+
+<p><a href="#media-type">Section <span class="delete">7</span><span class="insert">6</span></a> defines media type for the PROV-N notation.</p>
</div>
@@ -1179,7 +1183,8 @@
</ul>
</div>
-The grammar is centered on nonterminals for various types of <span class="nonterminal">expression</span>. The main production is introduced here below as it reflects the rationale for the design of the entire grammar. Note that parser developers may use the top level <a href="#ExpressionContainer">container</a> nonterminal as a starting point instead.
+The grammar is centered on nonterminals for various types of <span class="nonterminal">expression</span>. The main production is introduced here below as it reflects the rationale for the design of the entire grammar. Note that parser developers may use the top level <span class="delete">container</span>
+<a class="grammarRef" href="#prod-bundle"><span class="insert">bundle</span></a> nonterminal as a starting point instead.
@@ -1200,49 +1205,52 @@
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-expression"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-expression" name="prod-expression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">2</span></span><span class="insert">] </span></td> <td><code class="production prod">expression
+<tbody class="grammar-ref" data-ref="prod-expression"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-expression" name="prod-expression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">2</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">expression</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-entityExpression"><span class="insert">entityExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-activityExpression"><span class="insert">activityExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-generationExpression"><span class="insert">generationExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-usageExpression"><span class="insert">usageExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-startExpression"><span class="insert">startExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-endExpression"><span class="insert">endExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-invalidationExpression"><span class="insert">invalidationExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-communicationExpression"><span class="insert">communicationExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-agentExpression"><span class="insert">agentExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-associationExpression"><span class="insert">associationExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-attributionExpression"><span class="insert">attributionExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-responsibilityExpression"><span class="insert">responsibilityExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-derivationExpression"><span class="insert">derivationExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-tracedToExpression"><span class="insert">tracedToExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-hadOriginalSourceExpression"><span class="insert">hadOriginalSourceExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-quotationExpression"><span class="insert">quotationExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-revisionExpression"><span class="insert">revisionExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-alternateExpression"><span class="insert">alternateExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-specializationExpression"><span class="insert">specializationExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-insertionExpression"><span class="insert">insertionExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-removalExpression"><span class="insert">removalExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-membershipExpression"><span class="insert">membershipExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-namedBundle"><span class="insert">namedBundle</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-provenanceLocatorExpression"><span class="insert">provenanceLocatorExpression</span></a></span><span class="insert"> )</span></code></td> </tr> </tbody></tbody>
+</table><span class="insert">
+
+
+Each expression non-terminal </span><span class="nonterminal">expression</span>
<span class="delete"> ::=</span>
-</code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-entityExpression">entityExpression
-</a></span> | <span class="prod"><a class="grammarRef" href="#prod-activityExpression">activityExpression
-</a></span> | <span class="prod"><a class="grammarRef" href="#prod-generationExpression">generationExpression
-</a></span> | <span class="prod"><a class="grammarRef" href="#prod-usageExpression">usageExpression
-<span class="delete">
- | </span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-startExpression">startExpression
-</a></span> | <span class="prod"><a class="grammarRef" href="#prod-endExpression">endExpression
-</a></span> | <span class="prod"><a class="grammarRef" href="#prod-invalidationExpression">invalidationExpression
-</a></span> | <span class="prod"><a class="grammarRef" href="#prod-communicationExpression">communicationExpression
-</a></span> | <span class="delete">startByActivityExpression</span>
-<span class="delete">
-
- | </span><span class="prod"><a class="grammarRef" href="#prod-agentExpression">agentExpression
-</a></span> | <span class="prod"><a class="grammarRef" href="#prod-associationExpression"><span class="insert">associationExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-attributionExpression">attributionExpression
-</a></span> | <span class="delete">associationExpression</span>
-<span class="prod"><a class="grammarRef" href="#prod-responsibilityExpression"><span class="insert">responsibilityExpression</span></a></span> | <span class="delete">responsibilityExpression</span>
+<span class="insert">, i.e., </span><span class="nonterminal">entityExpression</span><span class="delete">
+|</span><span class="insert">,</span> <span class="nonterminal">activityExpression</span><span class="delete">
+| </span><span class="delete">generationExpression</span><span class="delete">
+| </span><span class="delete">usageExpression</span>
<span class="delete">
-
- | </span><span class="prod"><a class="grammarRef" href="#prod-derivationExpression">derivationExpression
-</a></span> | <span class="prod"><a class="grammarRef" href="#prod-tracedToExpression"><span class="insert">tracedToExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-hadOriginalSourceExpression"><span class="insert">hadOriginalSourceExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-quotationExpression"><span class="insert">quotationExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-revisionExpression">revisionExpression
-</a></span> | <span class="delete">quotationExpression</span> <span class="delete">
- | </span><span class="delete">hadOriginalSourceExpression</span>
-<span class="prod"><a class="grammarRef" href="#prod-alternateExpression"><span class="insert">alternateExpression</span></a></span> | <span class="delete">traceExpression</span>
+ | </span><span class="delete">startExpression</span><span class="delete">
+| </span><span class="delete">endExpression</span><span class="delete">
+| </span><span class="delete">invalidationExpression</span><span class="delete">
+| </span><span class="delete">communicationExpression</span><span class="delete">
+| </span><span class="delete">startByActivityExpression</span>
<span class="delete">
- | </span><span class="delete">alternateExpression</span>
-<span class="prod"><a class="grammarRef" href="#prod-specializationExpression"><span class="insert">specializationExpression</span></a></span> | <span class="delete">specializationExpression</span>
-<span class="prod"><a class="grammarRef" href="#prod-insertionExpression"><span class="insert">insertionExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-removalExpression"><span class="insert">removalExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-membershipExpression"><span class="insert">membershipExpression</span></a></span><span class="insert"> )</span></code></td> </tr> </tbody></tbody>
-</table>
-
-
-<span class="delete"> | </span><span class="delete">noteExpression</span><span class="delete">
+ | </span><span class="delete">agentExpression</span><span class="delete">
+| </span><span class="delete">attributionExpression</span><span class="delete">
+| </span><span class="delete">associationExpression</span><span class="delete">
+| </span><span class="delete">responsibilityExpression</span>
+<span class="delete">
+
+ | </span><span class="delete">derivationExpression</span><span class="delete">
+| </span><span class="delete">revisionExpression</span><span class="delete">
+| </span><span class="delete">quotationExpression</span> <span class="delete">
+ | </span><span class="delete">hadOriginalSourceExpression</span><span class="delete">
+| </span><span class="delete">traceExpression</span>
+<span class="delete">
+
+ | </span><span class="delete">alternateExpression</span><span class="delete">
+| </span><span class="delete">specializationExpression</span>
+<span class="delete">
+
+
+ | </span><span class="delete">noteExpression</span><span class="delete">
| </span><span class="delete">annotationExpression</span>
-
-
-Each expression non-terminal <span class="nonterminal">expression</span>, i.e., <span class="nonterminal">entityExpression</span>, <span class="nonterminal">activityExpression</span> etc., corresponds to one element (entity, activity, etc.) of the PROV data model.
-<p>A PROV-N document consists of a collection of <a title="expression">expressions</a>, wrapped in an <a href="#dfn-expression-container" class="internalDFN">expression container</a> with some namespace declarations, such that the text for an element matches the corresponding <span class="nonterminal">expression</span> production of the grammar.
+<span class="delete">
+
+Each expression non-terminal </span><span class="delete">expression</span><span class="delete">, i.e., </span><span class="delete">entityExpression</span><span class="delete">, </span><span class="delete">activityExpression</span> etc., corresponds to one element (entity, activity, etc.) of the PROV data model.
+<p>A PROV-N document consists of a collection of <a title="expression">expressions</a>, wrapped in an <span class="delete">expression container</span><a href="#dfn-toplevel-bundle" class="internalDFN"><span class="insert">toplevel bundle</span></a> with some namespace declarations, such that the text for an element matches the corresponding <span class="nonterminal">expression</span> production of the grammar.
</p></div>
@@ -2495,18 +2503,21 @@
<div id="expression-bundle-declaration" class="section">
<h4><span class="secno"><span class="insert">3.6.1 </span></span><span class="insert">Bundle Declaration</span></h4>
+
+<table class="grammar">
+<tbody class="grammar-ref" data-ref="prod-namedBundle"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-namedBundle" name="prod-namedBundle"></a><span class="insert">[</span><span class="prodNo"><span class="insert">32</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">namedBundle</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"bundle" </span><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span><span class="insert"> (</span><span class="prod"><a class="grammarRef" href="#prod-namespaceDeclarations"><span class="insert">namespaceDeclarations</span></a></span><span class="insert">)? (</span><span class="prod"><a class="grammarRef" href="#prod-expression"><span class="insert">expression</span></a></span><span class="insert">)* "endBundle"</span></code></td> </tr> </tbody></tbody>
+</table>
+
</div>
-<div id="expression-bundle-description" class="section">
-<h4><span class="secno"><span class="insert">3.6.2 </span></span><span class="insert">Bundle Description</span></h4>
-</div>
<div id="expression-provenance-locator" class="section">
-<h4><span class="secno"><span class="insert">3.6.3 </span></span><span class="insert">Provenance Locator</span></h4>
+<h4><span class="secno"><span class="insert">3.6.2 </span></span><span class="insert">Provenance Locator</span></h4>
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-provenance-locator"></tbody>
+<tbody class="grammar-ref" data-ref="prod-provenanceLocatorExpression"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-provenanceLocatorExpression" name="prod-provenanceLocatorExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">33</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">provenanceLocatorExpression</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"hasProvenanceIn" "(" </span><span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier"><span class="insert">optionalIdentifier</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-identifierOrMarker"><span class="insert">identifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-identifierOrMarker"><span class="insert">identifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-iriOrMarker"><span class="insert">iriOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-iriOrMarker"><span class="insert">iriOrMarker</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs"><span class="insert">optionalAttributeValuePairs</span></a></span><span class="insert"> ")"</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-iriOrMarker"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-iriOrMarker" name="prod-iriOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">34</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">iriOrMarker</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-IRI_REF"><span class="insert">IRI_REF</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody></tbody>
</table>
@@ -2592,10 +2603,10 @@
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-namespaceDeclarations"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-namespaceDeclarations" name="prod-namespaceDeclarations"></a><span class="insert">[</span><span class="prodNo"><span class="insert">50</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">namespaceDeclarations</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-defaultNamespaceDeclaration"><span class="insert">defaultNamespaceDeclaration</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-namespaceDeclaration"><span class="insert">namespaceDeclaration</span></a></span><span class="insert"> ) (</span><span class="prod"><a class="grammarRef" href="#prod-namespaceDeclaration"><span class="insert">namespaceDeclaration</span></a></span><span class="insert">)*</span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-namespaceDeclaration"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-namespaceDeclaration" name="prod-namespaceDeclaration"></a><span class="insert">[</span><span class="prodNo"><span class="insert">51</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">namespaceDeclaration</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"prefix" </span><span class="prod"><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-namespace"><span class="insert">namespace</span></a></span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-defaultNamespaceDeclaration"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-defaultNamespaceDeclaration" name="prod-defaultNamespaceDeclaration"></a><span class="insert">[</span><span class="prodNo"><span class="insert">52</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">defaultNamespaceDeclaration</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"default" </span><span class="prod"><a class="grammarRef" href="#prod-IRI_REF"><span class="insert">IRI_REF</span></a></span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-IRI_REF"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-IRI_REF" name="prod-IRI_REF"></a><span class="insert">[</span><span class="prodNo"><span class="insert">59</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">IRI_REF</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"<" ( [^<>"{}|^`\] - [#0000- ] | </span><span class="prod"><a class="grammarRef" href="#prod-UCHAR"><span class="insert">UCHAR</span></a></span><span class="insert"> )* ">"</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-namespaceDeclarations"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-namespaceDeclarations" name="prod-namespaceDeclarations"></a><span class="insert">[</span><span class="prodNo"><span class="insert">53</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">namespaceDeclarations</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-defaultNamespaceDeclaration"><span class="insert">defaultNamespaceDeclaration</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-namespaceDeclaration"><span class="insert">namespaceDeclaration</span></a></span><span class="insert"> ) (</span><span class="prod"><a class="grammarRef" href="#prod-namespaceDeclaration"><span class="insert">namespaceDeclaration</span></a></span><span class="insert">)*</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-namespaceDeclaration"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-namespaceDeclaration" name="prod-namespaceDeclaration"></a><span class="insert">[</span><span class="prodNo"><span class="insert">54</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">namespaceDeclaration</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"prefix" </span><span class="prod"><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-namespace"><span class="insert">namespace</span></a></span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-defaultNamespaceDeclaration"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-defaultNamespaceDeclaration" name="prod-defaultNamespaceDeclaration"></a><span class="insert">[</span><span class="prodNo"><span class="insert">55</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">defaultNamespaceDeclaration</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"default" </span><span class="prod"><a class="grammarRef" href="#prod-IRI_REF"><span class="insert">IRI_REF</span></a></span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-IRI_REF"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-IRI_REF" name="prod-IRI_REF"></a><span class="insert">[</span><span class="prodNo"><span class="insert">62</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">IRI_REF</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"<" ( [^<>"{}|^`\] - [#0000- ] | </span><span class="prod"><a class="grammarRef" href="#prod-UCHAR"><span class="insert">UCHAR</span></a></span><span class="insert"> )* ">"</span></code></td> </tr> </tbody></tbody>
</table>
@@ -2610,12 +2621,12 @@
<div class="anexample" id="anexample-namespace">
<p>The following example declares three namespaces, one default, and two with explicit prefixes <span class="name">ex1</span> and <span class="name">ex2</span>.</p>
-<pre class="codeexample">container
+<pre class="codeexample"><span class="delete">container</span><span class="insert">bundle</span>
default <http://example.org/0/>
prefix ex1 <http://example.org/1/>
prefix ex2 <http://example.org/2/>
...
-end
+<span class="delete">end</span><span class="insert">endBundle</span>
</pre>
</div>
@@ -2684,25 +2695,25 @@
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-eIdentifier"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-eIdentifier" name="prod-eIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">32</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">eIdentifier</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-aIdentifier"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-aIdentifier" name="prod-aIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">33</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">aIdentifier</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-agIdentifier"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-agIdentifier" name="prod-agIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">34</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">agIdentifier</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-gIdentifier"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-gIdentifier" name="prod-gIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">35</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">gIdentifier</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-uIdentifier"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-uIdentifier" name="prod-uIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">36</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">uIdentifier</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-cIdentifier"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-cIdentifier" name="prod-cIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">37</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">cIdentifier</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span></code></td> </tr> </tbody></tbody>
-
-<tbody class="grammar-ref" data-ref="prod-eIdentifierOrMarker"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-eIdentifierOrMarker" name="prod-eIdentifierOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">38</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">eIdentifierOrMarker</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-eIdentifier"><span class="insert">eIdentifier</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-aIdentifierOrMarker"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-aIdentifierOrMarker" name="prod-aIdentifierOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">39</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">aIdentifierOrMarker</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-aIdentifier"><span class="insert">aIdentifier</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-agIdentifierOrMarker"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-agIdentifierOrMarker" name="prod-agIdentifierOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">40</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">agIdentifierOrMarker</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-agIdentifier"><span class="insert">agIdentifier</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-gIdentifierOrMarker"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-gIdentifierOrMarker" name="prod-gIdentifierOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">41</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">gIdentifierOrMarker</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-gIdentifier"><span class="insert">gIdentifier</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-uIdentifierOrMarker"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-uIdentifierOrMarker" name="prod-uIdentifierOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">42</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">uIdentifierOrMarker</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-uIdentifier"><span class="insert">uIdentifier</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-identifier"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-identifier" name="prod-identifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">43</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">identifier</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a></span></code></td> </tr> </tbody></tbody>
-
-<tbody class="grammar-ref" data-ref="prod-QUALNAME"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-QUALNAME" name="prod-QUALNAME"></a><span class="insert">[</span><span class="prodNo"><span class="insert">54</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">QUALNAME</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-PN_PREFIX"><span class="insert">PN_PREFIX</span></a></span><span class="insert"> ":" )? </span><span class="prod"><a class="grammarRef" href="#prod-PN_LOCAL"><span class="insert">PN_LOCAL</span></a></span><br><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-PN_PREFIX"><span class="insert">PN_PREFIX</span></a></span><span class="insert"> ":"</span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-PN_LOCAL"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-PN_LOCAL" name="prod-PN_LOCAL"></a><span class="insert">[</span><span class="prodNo"><span class="insert">72</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">PN_LOCAL</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_U"><span class="insert">PN_CHARS_U</span></a></span><span class="insert"> | [0-9] | </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS"><span class="insert">PN_CHARS_OTHERS</span></a></span><span class="insert"> ) ( ( </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS"><span class="insert">PN_CHARS</span></a></span><span class="insert"> | "." | </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS"><span class="insert">PN_CHARS_OTHERS</span></a></span><span class="insert"> )* ( </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS"><span class="insert">PN_CHARS</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS"><span class="insert">PN_CHARS_OTHERS</span></a></span><span class="insert"> ) )?</span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-PN_CHARS_OTHERS"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-PN_CHARS_OTHERS" name="prod-PN_CHARS_OTHERS"></a><span class="insert">[</span><span class="prodNo"><span class="insert">73</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">PN_CHARS_OTHERS</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-PERCENT"><span class="insert">PERCENT</span></a></span><br><span class="insert"> | "/"</span><br><span class="insert"> | "@"</span><br><span class="insert"> | "~"</span><br><span class="insert"> | "&"</span><br><span class="insert"> | "+"</span><br><span class="insert"> | "?"</span><br><span class="insert"> | "#"</span><br><span class="insert"> | "$"</span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-PERCENT"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-PERCENT" name="prod-PERCENT"></a><span class="insert">[</span><span class="prodNo"><span class="insert">74</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">PERCENT</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"%" </span><span class="prod"><a class="grammarRef" href="#prod-HEX"><span class="insert">HEX</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-HEX"><span class="insert">HEX</span></a></span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-HEX"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-HEX" name="prod-HEX"></a><span class="insert">[</span><span class="prodNo"><span class="insert">75</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">HEX</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">[0-9]</span><br><span class="insert"> | [A-F]</span><br><span class="insert"> | [a-f]</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-eIdentifier"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-eIdentifier" name="prod-eIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">35</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">eIdentifier</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-aIdentifier"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-aIdentifier" name="prod-aIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">36</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">aIdentifier</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-agIdentifier"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-agIdentifier" name="prod-agIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">37</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">agIdentifier</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-gIdentifier"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-gIdentifier" name="prod-gIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">38</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">gIdentifier</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-uIdentifier"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-uIdentifier" name="prod-uIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">39</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">uIdentifier</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-cIdentifier"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-cIdentifier" name="prod-cIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">40</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">cIdentifier</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span></code></td> </tr> </tbody></tbody>
+
+<tbody class="grammar-ref" data-ref="prod-eIdentifierOrMarker"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-eIdentifierOrMarker" name="prod-eIdentifierOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">41</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">eIdentifierOrMarker</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-eIdentifier"><span class="insert">eIdentifier</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-aIdentifierOrMarker"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-aIdentifierOrMarker" name="prod-aIdentifierOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">42</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">aIdentifierOrMarker</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-aIdentifier"><span class="insert">aIdentifier</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-agIdentifierOrMarker"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-agIdentifierOrMarker" name="prod-agIdentifierOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">43</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">agIdentifierOrMarker</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-agIdentifier"><span class="insert">agIdentifier</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-gIdentifierOrMarker"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-gIdentifierOrMarker" name="prod-gIdentifierOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">44</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">gIdentifierOrMarker</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-gIdentifier"><span class="insert">gIdentifier</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-uIdentifierOrMarker"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-uIdentifierOrMarker" name="prod-uIdentifierOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">45</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">uIdentifierOrMarker</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-uIdentifier"><span class="insert">uIdentifier</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-identifier"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-identifier" name="prod-identifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">46</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">identifier</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a></span></code></td> </tr> </tbody></tbody>
+
+<tbody class="grammar-ref" data-ref="prod-QUALNAME"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-QUALNAME" name="prod-QUALNAME"></a><span class="insert">[</span><span class="prodNo"><span class="insert">57</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">QUALNAME</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-PN_PREFIX"><span class="insert">PN_PREFIX</span></a></span><span class="insert"> ":" )? </span><span class="prod"><a class="grammarRef" href="#prod-PN_LOCAL"><span class="insert">PN_LOCAL</span></a></span><br><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-PN_PREFIX"><span class="insert">PN_PREFIX</span></a></span><span class="insert"> ":"</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-PN_LOCAL"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-PN_LOCAL" name="prod-PN_LOCAL"></a><span class="insert">[</span><span class="prodNo"><span class="insert">75</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">PN_LOCAL</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_U"><span class="insert">PN_CHARS_U</span></a></span><span class="insert"> | [0-9] | </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS"><span class="insert">PN_CHARS_OTHERS</span></a></span><span class="insert"> ) ( ( </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS"><span class="insert">PN_CHARS</span></a></span><span class="insert"> | "." | </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS"><span class="insert">PN_CHARS_OTHERS</span></a></span><span class="insert"> )* ( </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS"><span class="insert">PN_CHARS</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS"><span class="insert">PN_CHARS_OTHERS</span></a></span><span class="insert"> ) )?</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-PN_CHARS_OTHERS"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-PN_CHARS_OTHERS" name="prod-PN_CHARS_OTHERS"></a><span class="insert">[</span><span class="prodNo"><span class="insert">76</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">PN_CHARS_OTHERS</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-PERCENT"><span class="insert">PERCENT</span></a></span><br><span class="insert"> | "/"</span><br><span class="insert"> | "@"</span><br><span class="insert"> | "~"</span><br><span class="insert"> | "&"</span><br><span class="insert"> | "+"</span><br><span class="insert"> | "?"</span><br><span class="insert"> | "#"</span><br><span class="insert"> | "$"</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-PERCENT"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-PERCENT" name="prod-PERCENT"></a><span class="insert">[</span><span class="prodNo"><span class="insert">77</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">PERCENT</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"%" </span><span class="prod"><a class="grammarRef" href="#prod-HEX"><span class="insert">HEX</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-HEX"><span class="insert">HEX</span></a></span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-HEX"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-HEX" name="prod-HEX"></a><span class="insert">[</span><span class="prodNo"><span class="insert">78</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">HEX</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">[0-9]</span><br><span class="insert"> | [A-F]</span><br><span class="insert"> | [a-f]</span></code></td> </tr> </tbody></tbody>
</table>
@@ -2710,7 +2721,7 @@
<div class="anexample" id="anexample-qualified-name">
<p>Examples of articles on the BBC Web site seen as entities.</p>
-<pre class="codeexample">container
+<pre class="codeexample"><span class="delete">container</span><span class="insert">bundle</span>
prefix bbc <http://www.bbc.co.uk/>
prefix bbcNews <http://www.bbc.co.uk/news/>
@@ -2720,7 +2731,7 @@
entity(bbcNews:) // an alternative way of referring to the bbc news site
-end
+<span class="delete">end</span><span class="insert">endBundle</span>
</pre>
</div>
@@ -2729,7 +2740,7 @@
<div class="anexample" id="anexample-qualified-name2">
<p>Examples of entities with declared and default namespace.</p>
-<pre class="codeexample">container
+<pre class="codeexample"><span class="delete">container</span><span class="insert">bundle</span>
default <http://example.org/2/>
prefix ex <http://example.org/1/>
@@ -2739,7 +2750,7 @@
entity(b) // corresponds to IRI http://example.org/2/b
entity(ex:1234) // corresponds to IRI http://example.org/2/1234
entity(4567) // corresponds to IRI http://example.org/2/4567
-end
+<span class="delete">end</span><span class="insert">endBundle</span>
</pre>
</div>
@@ -2766,7 +2777,7 @@
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-attribute"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-attribute" name="prod-attribute"></a><span class="insert">[</span><span class="prodNo"><span class="insert">44</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">attribute</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a></span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-attribute"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-attribute" name="prod-attribute"></a><span class="insert">[</span><span class="prodNo"><span class="insert">47</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">attribute</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a></span></code></td> </tr> </tbody></tbody>
</table>
@@ -2802,22 +2813,30 @@
</div>
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-literal"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-literal" name="prod-literal"></a><span class="insert">[</span><span class="prodNo"><span class="insert">46</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">literal</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-StringLiteral"><span class="insert">StringLiteral</span></a></span><span class="insert"> "%%" </span><span class="prod"><a class="grammarRef" href="#prod-datatype"><span class="insert">datatype</span></a></span><br><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-StringLiteral"><span class="insert">StringLiteral</span></a></span><br><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-INTLITERAL"><span class="insert">INTLITERAL</span></a></span><br><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-QUALNAME_LITERAL"><span class="insert">QUALNAME_LITERAL</span></a></span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-StringLiteral"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-StringLiteral" name="prod-StringLiteral"></a><span class="insert">[</span><span class="prodNo"><span class="insert">47</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">StringLiteral</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-STRING_LITERAL"><span class="insert">STRING_LITERAL</span></a></span></code></td> </tr> </tbody></tbody>
-
-<tbody class="grammar-ref" data-ref="prod-INTLITERAL"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-INTLITERAL" name="prod-INTLITERAL"></a><span class="insert">[</span><span class="prodNo"><span class="insert">60</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">INTLITERAL</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">("-")? (</span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert">)+</span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-STRING_LITERAL"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-STRING_LITERAL" name="prod-STRING_LITERAL"></a><span class="insert">[</span><span class="prodNo"><span class="insert">61</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">STRING_LITERAL</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">'"' ( ( [^"\
+<tbody class="grammar-ref" data-ref="prod-literal"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-literal" name="prod-literal"></a><span class="insert">[</span><span class="prodNo"><span class="insert">49</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">literal</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-typedLiteral"><span class="insert">typedLiteral</span></a></span><br><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-convenienceNotation"><span class="insert">convenienceNotation</span></a></span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-typedLiteral"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-typedLiteral" name="prod-typedLiteral"></a><span class="insert">[</span><span class="prodNo"><span class="insert">50</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">typedLiteral</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-STRING_LITERAL"><span class="insert">STRING_LITERAL</span></a></span><span class="insert"> "%%" </span><span class="prod"><a class="grammarRef" href="#prod-datatype"><span class="insert">datatype</span></a></span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-datatype"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-datatype" name="prod-datatype"></a><span class="insert">[</span><span class="prodNo"><span class="insert">51</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">datatype</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a></span></code></td> </tr> </tbody></tbody>
+<tbody><tr valign="baseline"><td></td><td><em><span class="insert">where </span><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a><span class="insert"> is listed in Table </span><a href="#permitted-datatypes"><span class="insert">permitted-datatypes</span></a></em></td></tr></tbody>
+<tbody class="grammar-ref" data-ref="prod-convenienceNotation"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-convenienceNotation" name="prod-convenienceNotation"></a><span class="insert">[</span><span class="prodNo"><span class="insert">52</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">convenienceNotation</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-STRING_LITERAL"><span class="insert">STRING_LITERAL</span></a></span><br><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-INT_LITERAL"><span class="insert">INT_LITERAL</span></a></span><br><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-QUALNAME_LITERAL"><span class="insert">QUALNAME_LITERAL</span></a></span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-STRING_LITERAL"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-STRING_LITERAL" name="prod-STRING_LITERAL"></a><span class="insert">[</span><span class="prodNo"><span class="insert">63</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">STRING_LITERAL</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">'"' ( ( [^"\
] ) | </span><span class="prod"><a class="grammarRef" href="#prod-ECHAR"><span class="insert">ECHAR</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-UCHAR"><span class="insert">UCHAR</span></a></span><span class="insert"> )* '"'</span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-QUALNAME_LITERAL"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-QUALNAME_LITERAL" name="prod-QUALNAME_LITERAL"></a><span class="insert">[</span><span class="prodNo"><span class="insert">62</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">QUALNAME_LITERAL</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"'" </span><span class="prod"><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a></span><span class="insert"> "'"</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-INT_LITERAL"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-INT_LITERAL" name="prod-INT_LITERAL"></a><span class="insert">[</span><span class="prodNo"><span class="insert">64</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">INT_LITERAL</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">("-")? (</span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert">)+</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-QUALNAME_LITERAL"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-QUALNAME_LITERAL" name="prod-QUALNAME_LITERAL"></a><span class="insert">[</span><span class="prodNo"><span class="insert">65</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">QUALNAME_LITERAL</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"'" </span><span class="prod"><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a></span><span class="insert"> "'"</span></code></td> </tr> </tbody></tbody>
</table>
-<p>The non terminals <span class="nonterminal">stringLiteral</span> and
-<span class="nonterminal">intLiteral</span>
-are syntactic sugar for quoted strings with datatype <a href="http://www.w3.org/TR/xmlschema-2/#string"><span class="name">xsd:string</span></a> and <a href="http://www.w3.org/TR/xmlschema-2/#int"><span class="name">xsd:int</span></a>, respectively.
+<p>The non terminals <span class="delete">stringLiteral</span>
+<a class="grammarRef" href="#prod-STRING_LITERAL"><span class="insert">STRING_LITERAL</span></a><span class="insert">,
+</span><a class="grammarRef" href="#prod-INT_LITERAL"><span class="insert">INT_LITERAL</span></a><span class="insert">,</span> and
+<span class="delete">intLiteral</span><a class="grammarRef" href="#prod-QUALNAME_LITERAL"><span class="insert">QUALNAME_LITERAL</span></a>
+are syntactic sugar for quoted strings with datatype
+<a href="http://www.w3.org/TR/xmlschema-2/#string"><span class="name">xsd:string</span></a><span class="insert">,
+</span><a href="http://www.w3.org/TR/xmlschema-2/#int"><span class="name"><span class="insert">xsd:int</span></span></a><span class="insert">,</span> and <span class="delete">xsd:int</span><span class="delete">, </span>
+<a class="grammarRef" href="#prod-QUALNAME"><span class="insert">prov:QUALNAME</span></a>
+respectively.
</p>
<p> In particular, a Literal may be an IRI-typed string (with datatype <span class="name">xsd:anyURI</span>); such IRI has no specific interpretation in the context of PROV.</p>
@@ -2840,20 +2859,29 @@
<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#unsignedByte">xsd:unsignedByte</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#anyURI">xsd:QName</a></td><td></td></tr>
</tbody></table>
-<p><b>Note:</b>The productions for <span class="nonterminal">qualifiedName</span> and <span class="nonterminal">intLiteral</span> are conflicting. In the context of a <span class="nonterminal">Literal</span>, a parser should give precedence to the production for <span class="nonterminal">intLiteral</span>.
+<p><b>Note:</b>The productions for <span class="delete">qualifiedName</span><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">prov:QUALNAME</span></a> and <span class="delete">intLiteral</span>
+<a class="grammarRef" href="#prod-INT_LITERAL"><span class="insert">INT_LITERAL</span></a> are conflicting. In the context of a <span class="delete">Literal</span>
+<a class="grammarRef" href="#prod-literal"><span class="insert">literal</span></a>, a parser should give precedence to the production for <span class="delete">intLiteral</span>
+<a class="grammarRef" href="#prod-INT_LITERAL"><span class="insert">INT_LITERAL</span></a>.
+
</p>
-<div class="note">
+<span class="delete">
Wouldn't it be useful to introduce a literal for a qualified name?
Currenlty, we have to write:
-<pre>prov:type="ex:Programmer" %% xsd:QName
-</pre>
+</span><span class="delete">prov:type="ex:Programmer" %% xsd:QName
+</span><span class="delete">
to indicate that ex:Programmer should be interpreted as qualified name (QName).
Instead, we could have a notation such as
-<pre>prov:type='ex:Programmer'
-</pre>
-
-</div>
+</span><span class="delete">prov:type='ex:Programmer'
+</span>
+
+
+
+
+
+
+
<div id="expression-types" class="section">
@@ -2888,10 +2916,10 @@
<p><dfn id="dfn-time">Time instants</dfn> are defined according to xsd:dateTime [<cite><a class="bibref" rel="biblioentry" href="#bib-XMLSCHEMA-2">XMLSCHEMA-2</a></cite>].</p>
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-time"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-time" name="prod-time"></a><span class="insert">[</span><span class="prodNo"><span class="insert">45</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">time</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-ISODATETIME"><span class="insert">ISODATETIME</span></a></span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-DIGIT"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-DIGIT" name="prod-DIGIT"></a><span class="insert">[</span><span class="prodNo"><span class="insert">56</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">DIGIT</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">[0-9]</span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-ISODATETIME"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-ISODATETIME" name="prod-ISODATETIME"></a><span class="insert">[</span><span class="prodNo"><span class="insert">57</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">ISODATETIME</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> "-" </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> "-" </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> "T" </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> ":" </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> ":" </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> ( "." </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> ( </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> (</span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert">)? )? )? ( "Z" | </span><span class="prod"><a class="grammarRef" href="#prod-TIMEZONEOFFSET"><span class="insert">TIMEZONEOFFSET</span></a></span><span class="insert"> )?</span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-TIMEZONEOFFSET"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-TIMEZONEOFFSET" name="prod-TIMEZONEOFFSET"></a><span class="insert">[</span><span class="prodNo"><span class="insert">58</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">TIMEZONEOFFSET</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( "+" | "-" ) </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> ":" </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-time"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-time" name="prod-time"></a><span class="insert">[</span><span class="prodNo"><span class="insert">48</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">time</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-ISODATETIME"><span class="insert">ISODATETIME</span></a></span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-DIGIT"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-DIGIT" name="prod-DIGIT"></a><span class="insert">[</span><span class="prodNo"><span class="insert">59</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">DIGIT</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">[0-9]</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-ISODATETIME"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-ISODATETIME" name="prod-ISODATETIME"></a><span class="insert">[</span><span class="prodNo"><span class="insert">60</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">ISODATETIME</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> "-" </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> "-" </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> "T" </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> ":" </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> ":" </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> ( "." </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> ( </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> (</span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert">)? )? )? ( "Z" | </span><span class="prod"><a class="grammarRef" href="#prod-TIMEZONEOFFSET"><span class="insert">TIMEZONEOFFSET</span></a></span><span class="insert"> )?</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-TIMEZONEOFFSET"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-TIMEZONEOFFSET" name="prod-TIMEZONEOFFSET"></a><span class="insert">[</span><span class="prodNo"><span class="insert">61</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">TIMEZONEOFFSET</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( "+" | "-" ) </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> ":" </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span></code></td> </tr> </tbody></tbody>
</table>
@@ -2929,31 +2957,40 @@
-<div id="ExpressionContainer" class="section">
-<h2><span class="secno">4. </span>Expression Container</h2>
-
-<p>An <dfn id="dfn-expression-container">expression container</dfn> is a house-keeping construct of PROV-N capable of packaging up PROV-N <a title="expression">expressions</a> and namespace declarations. An expression container forms a self-contained package of provenance descriptions for the purpose of <em>exchanging</em> them. An expression container may be used
+<div id="toplevelBundle" class="section">
+<h2><span class="secno">4. </span><span class="delete">Expression Container</span><span class="insert">Toplevel Bundle</span></h2>
+
+<p><span class="delete">An </span><span class="delete">expression container</span><span class="insert">A </span><dfn id="dfn-toplevel-bundle"><span class="insert">toplevel bundle</span></dfn> is a house-keeping construct of PROV-N capable of packaging up PROV-N <a title="expression">expressions</a> and namespace declarations. <span class="delete">An expression container</span><span class="insert">A toplevel bundle</span> forms a self-contained package of provenance descriptions for the purpose of <em>exchanging</em> them. <span class="delete">An expression container</span><span class="insert">A toplevel bundle</span> may be used
to package up PROV-N <a title="record">expressions</a> in response to a request for the provenance of something ([<cite><a class="bibref" rel="biblioentry" href="#bib-PROV-AQ">PROV-AQ</a></cite>]).</p>
-<p> Given its status of house keeping construct for the purpose of exchanging provenance expressions, an expression container is not defined as a PROV-N expression (<a href="#grammar-notation">production <span class="nonterminal">expression</span></a>).</p>
-
-
-<p>An expression container, written <span class="name">container decls exprs endContainer</span> in PROV-N, contains:
+<p> Given its status of house keeping construct for the purpose of exchanging provenance expressions, <span class="delete">an</span><span class="insert">a toplevel bundle is not defined as a PROV-N</span> expression <span class="delete">container is not defined as a PROV-N </span><span class="insert">(production </span><a class="grammarRef" href="#prod-expression">expression<span class="delete"> (</span><span class="delete">production </span><span class="delete">expression</span></a>).</p>
+
+
+<p><span class="delete">An expression container,</span><span class="insert">A toplevel bundle,</span> written <span class="name"><span class="delete">container</span><span class="insert">bundle</span> decls exprs <span class="delete">endContainer</span><span class="insert">bundles endBundle</span></span> in PROV-N, contains:
</p><ul>
<li><em>namespaceDeclarations</em>: a set <span class="name">decls</span> of namespace declarations, declaring namespaces and associated prefixes, which can be used in <a title="attribute">attributes</a> and <a title="identifier">identifiers</a> occurring inside <span class="name">exprs</span>;</li>
-<li><em>expressions</em>: a non-empty set of expressions <span class="name">exprs</span>.</li>
+<li><em>expressions</em>: a non-empty set of expressions <span class="name">exprs</span><span class="delete">.</span><span class="insert">;</span></li>
+<li><em><span class="insert">namedBundles</span></em><span class="insert">: a set of </span><a href="#expression-bundle-declaration"><span class="insert">bundle declarations</span></a> <span class="name"><span class="insert">bundles</span></span><span class="insert">;</span></li>
</ul>
-<p>An expression container's text matches the <span class="nonterminal">expressionContainer</span> production.</p>
-
-
-<div class="grammar">
-<span class="nonterminal">expressionContainer</span> ::=
-<span class="name">container</span>
-<span class="nonterminal">namespaceDeclarations</span>
-<span class="plus"> <span class="nonterminal">expression</span> </span>
-<span class="name">endContainer</span>
-</div>
+<p><span class="delete">An expression container's</span><span class="insert">A toplevel bundle's</span> text matches the <span class="delete">expressionContainer</span><a class="grammarRef" href="#prod-bundle"><span class="insert">bundle</span></a> production.</p>
+
+
+
+<span class="delete">expressionContainer</span><span class="delete"> ::=
+</span><span class="delete">container</span>
+
+
+<table class="grammar">
+<tbody class="grammar-ref" data-ref="prod-bundle"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-bundle" name="prod-bundle"></a><span class="insert">[</span><span class="prodNo"><span class="insert">1</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">bundle</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"bundle" (</span><span class="prod"><a class="grammarRef" href="#prod-namespaceDeclarations">namespaceDeclarations
+ </a></span><span class="insert">)? (</span><span class="prod"><a class="grammarRef" href="#prod-expression">expression
+<span class="delete">endContainer</span>
+
+
+
+</a></span><span class="insert">)* (</span><span class="prod"><a class="grammarRef" href="#prod-namedBundle"><span class="insert">namedBundle</span></a></span><span class="insert">)* "endBundle"</span></code></td> </tr> </tbody></tbody>
+</table>
+
<div class="anexample">
@@ -2961,7 +2998,8 @@
The following container contains expressions related to the provenance of entity
<span class="name">e2</span>.
</p>
-<pre class="codeexample">container
+<pre class="codeexample"><span class="delete">container</span><span class="insert">bundle
+ default <http://anotherexample.org/></span>
prefix ex <http://example.org/>
entity(e2, [ prov:type="File", ex:path="/shared/crime.txt", ex:creator="Alice",
@@ -2971,7 +3009,7 @@
wasAssociatedWith(a1, ag2, -, [prov:role="author"])
agent(ag2, [ prov:type="prov:Person" %% xsd:QName, ex:name="Bob" ])
-endContainer
+<span class="delete">endContainer</span><span class="insert">endBundle</span>
</pre>
<p>This container could for instance be returned as the result of a query to a provenance store for the provenance of entity <span class="name">e2</span> [<cite><a class="bibref" rel="biblioentry" href="#bib-PROV-AQ">PROV-AQ</a></cite>].
</p>
@@ -2981,70 +3019,74 @@
</div>
-<div id="account" class="section">
-<h2><span class="secno">5. </span>Account</h2>
-
-<p>The PROV data model has introduced a notion of account by which a set of provenance descriptions can be bundled up and named. The PROV data model <em>assumes</em> the existence of mechanisms to implement accounts, but such mechanisms remain outside its scope. It is suggested that specific serializations may offer solutions to name bundles of descriptions. </p>
-
-<p>Given that the primary motivation for PROV-N is to provide a notation aimed at human consumption, it is therefore appropriate to introduce a notation for accounts, which would include an account name and a bundle of expressions.</p>
-
-
-
-<p>An account, written <span class="name">account(id, exprs)</span> in PROV-N, contains:</p>
-<ul>
-<li><em>id</em>: an identifier that identifies this account;</li>
-<li><em>expressions</em>: a set <span class="name">exprs</span> of expressions;</li>
-</ul>
-
-<p>In PROV-N, an account's text matches the <span class="nonterminal">accountExpression</span> production of the grammar.</p>
-
-<div class="grammar">
-<span class="nonterminal">accountExpression</span> ::=
-<span class="name">account</span>
-<span class="name">(</span>
-<span class="nonterminal">identifier</span>
-<span class="name">,</span>
-<span class="plus">
-<span class="nonterminal">expression</span> </span>
-<span class="name">)</span>
-</div>
-
-<p>It is also useful to package up one or more account expressions in an expression container, for interchange purpose. Hence, <span class="nonterminal">expressionContainer</span> is revised as follows. </p>
-
-<div class="grammar">
-<span class="nonterminal">expressionContainer</span> ::=
-<span class="name">container</span>
-<span class="nonterminal">namespaceDeclarations</span>
-<span class="plus"> <span class="nonterminal">expression</span> </span>
-<span class="name">endContainer</span> <br>
-| <span class="name">container</span>
-<span class="nonterminal">namespaceDeclarations</span>
-<span class="plus"> <span class="nonterminal">accountExpression</span> </span>
-<span class="name">endContainer</span>
-</div>
-
-
-
-<div class="anexample">
-<p>
-The following container </p>
-<pre class="codeexample">container
+
+
+
+
+<div id="media-type" class="section">
+<h2><span class="secno">5. </span><span class="delete">Account</span>
+
+<span class="delete">The PROV data model has introduced a notion of account by which a set of provenance descriptions can be bundled up and named. The PROV data model </span><span class="delete">assumes</span><span class="delete"> the existence of mechanisms to implement accounts, but such mechanisms remain outside its scope. It is suggested that specific serializations may offer solutions to name bundles of descriptions. </span>
+
+<span class="delete">Given that the primary motivation for PROV-N is to provide a notation aimed at human consumption, it is therefore appropriate to introduce a notation for accounts, which would include an account name and a bundle of expressions.</span>
+
+
+
+<span class="delete">An account, written </span><span class="delete">account(id, exprs)</span><span class="delete"> in PROV-N, contains:</span>
+
+<span class="delete">id</span><span class="delete">: an identifier that identifies this account;</span>
+<span class="delete">expressions</span><span class="delete">: a set </span><span class="delete">exprs</span><span class="delete"> of expressions;</span>
+
+
+<span class="delete">In PROV-N, an account's text matches the </span><span class="delete">accountExpression</span><span class="delete"> production of the grammar.</span>
+
+
+<span class="delete">accountExpression</span><span class="delete"> ::=
+</span><span class="delete">account</span>
+<span class="delete">(</span>
+<span class="delete">identifier</span>
+<span class="delete">,</span>
+
+<span class="delete">expression</span>
+<span class="delete">)</span>
+
+
+<span class="delete">It is also useful to package up one or more account expressions in an expression container, for interchange purpose. Hence, </span><span class="delete">expressionContainer</span><span class="delete"> is revised as follows. </span>
+
+
+<span class="delete">expressionContainer</span><span class="delete"> ::=
+</span><span class="delete">container</span>
+<span class="delete">namespaceDeclarations</span>
+ <span class="delete">expression</span>
+<span class="delete">endContainer</span> <span class="delete">
+| </span><span class="delete">container</span>
+<span class="delete">namespaceDeclarations</span>
+ <span class="delete">accountExpression</span>
+<span class="delete">endContainer</span>
+
+
+
+
+
+<span class="delete">
+The following container </span>
+<span class="delete">container
prefix ex <http://example.org/>
account(ex:acc1,...)
account(ex:acc2,...)
endContainer
-</pre>
-<p> illustrates how two accounts with identifiers <span class="name">ex:acc1</span> and <span class="name">ex:acc2</span> can be returned in a PROV-N serialization of the provenance of
+</span>
+<span class="delete"> illustrates how two accounts with identifiers </span><span class="delete">ex:acc1</span><span class="delete"> and </span><span class="delete">ex:acc2</span><span class="delete"> can be returned in a PROV-N serialization of the provenance of
something.
-</p>
-</div>
-
-
-<div class="anexample">
-<p>
-The following container </p>
-<pre class="codeexample">container
+</span>
+
+
+
+
+<span class="delete">
+The following container </span>
+<span class="delete">container
prefix ex <http://example.org/>
...
@@ -3059,16 +3101,16 @@
wasAttributedTo(ex1:acc1, w3:Consortium))
endContainer
-</pre>
-<p> illustrates a first account, with identifier <span class="name">ex:acc1</span>, containing expressions describing the provenance of the technical report <span class="name">tr:WD-prov-dm-20111215</span>, and a second account <span class="name">ex:acc2</span>, describing the provenance of the first. In account <span class="name">ex:acc2</span>, <span class="name">ex:acc1</span> is the identifier of an entity of type <span class="name">prov:Account</span>.
-</p>
-</div>
-
-
-</div>
-
-<div id="media-type" class="section">
-<h2><span class="secno">6. </span>Media Type</h2>
+</span>
+<span class="delete"> illustrates a first account, with identifier </span><span class="delete">ex:acc1</span><span class="delete">, containing expressions describing the provenance of the technical report </span><span class="delete">tr:WD-prov-dm-20111215</span><span class="delete">, and a second account </span><span class="delete">ex:acc2</span><span class="delete">, describing the provenance of the first. In account </span><span class="delete">ex:acc2</span><span class="delete">, </span><span class="delete">ex:acc1</span><span class="delete"> is the identifier of an entity of type </span><span class="delete">prov:Account</span><span class="delete">.
+</span>
+
+
+
+
+
+
+<span class="delete">6. </span>Media Type</h2>
<p>
The media type of PROV-N is <span class="name">text/prov-n</span>. The content encoding of PROV-N content is UTF-8.