--- a/model/diff-n.html Thu Jun 14 09:52:08 2012 +0100
+++ b/model/diff-n.html Thu Jun 14 09:57:57 2012 +0100
@@ -965,7 +965,7 @@
</style><link href="./extra.css" rel="stylesheet" type="text/css" charset="utf-8"><link href="http://www.w3.org/StyleSheets/TR/W3C-ED" rel="stylesheet" type="text/css" charset="utf-8"></head>
<body style="display: inherit; "><div class="head"><p><a href="http://www.w3.org/"><img width="72" height="48" src="http://www.w3.org/Icons/w3c_home" alt="W3C"></a></p><h1 class="title" id="title">PROV-N: The Provenance Notation</h1>
-<h2 id="subtitle"><span class="insert">towards second working draft (</span><a href="diff-n.html"><span class="insert">Diffs since last release</span></a><span class="insert">)</span></h2><h2 id="w3c-editor-s-draft-31-may-2012"><acronym title="World Wide Web Consortium">W3C</acronym> <span class="delete">Working</span><span class="insert">Editor's</span> Draft <span class="delete">03</span><span class="insert">31</span> May 2012</h2>
+<h2 id="subtitle"><span class="insert">towards second working draft (</span><a href="diff-n.html"><span class="insert">Diffs since last release</span></a><span class="insert">)</span></h2><h2 id="w3c-editor-s-draft-14-june-2012"><acronym title="World Wide Web Consortium">W3C</acronym> <span class="delete">Working</span><span class="insert">Editor's</span> Draft <span class="delete">03 May</span><span class="insert">14 June</span> 2012</h2>
<dl><dt>This<span class="insert"> version:</span></dt><dd><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-n.html"><span class="insert">http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-n.html</span></a></dd><dt><span class="insert">Latest published version:</span></dt><dd><a href="http://www.w3.org/TR/prov-n/"><span class="insert">http://www.w3.org/TR/prov-n/</span></a></dd><dt><span class="insert">Latest editor's draft:</span></dt><dd><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-n.html"><span class="insert">http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-n.html</span></a></dd><dt><span class="insert">Previous</span> version:</dt><dd><a href="http://www.w3.org/TR/2012/WD-prov-n-20120503/">http://www.w3.org/TR/2012/WD-prov-n-20120503/</a></dd>
<span class="delete">Latest published version:</span><span class="delete">http://www.w3.org/TR/prov-n/</span>
<span class="delete">Latest editor's draft:</span><span class="delete">http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-n.html</span>
@@ -1040,7 +1040,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.
-</span><span class="delete">This </span>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="#notational-conventions" 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><li class="tocline"><a href="#comments" class="tocxref"><span class="secno"><span class="insert">2.5 </span></span><span class="insert">Comments</span></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-wasInformedBy" class="tocxref"><span class="secno"><span class="insert">3.1.5 </span></span><span class="insert">Communication</span></a></li><li class="tocline"><a href="#expression-Start" class="tocxref"><span class="secno"><span class="delete">3.1.5</span><span class="insert">3.1.6</span> </span>Start</a></li><li class="tocline"><a href="#expression-End" class="tocxref"><span class="secno"><span class="delete">3.1.6</span><span class="insert">3.1.7</span> </span>End</a></li><li class="tocline"><a href="#expression-Invalidation" class="tocxref"><span class="secno"><span class="delete">3.1.7</span><span class="insert">3.1.8</span> </span>Invalidation<span class="delete">3.1.8 </span><span class="delete">Communication</span><span class="delete">3.1.9 </span><span class="delete">Start by Activity</span></a></li></ul></li><li class="tocline"><a href="#component2" class="tocxref"><span class="secno">3.2 </span>Component 2: <span class="delete">Agents and Responsibility</span><span class="insert">Derivations</span></a><ul class="toc"><li class="tocline"><a href="#Derivation-Relation" class="tocxref"><span class="secno">3.2.1 </span><span class="delete">Agent</span><span class="insert">Derivation</span></a></li><li class="tocline"><a href="#expression-Revision" class="tocxref"><span class="secno">3.2.2 </span><span class="delete">Attribution</span><span class="insert">Revision</span></a></li><li class="tocline"><a href="#expression-quotation" class="tocxref"><span class="secno">3.2.3 </span><span class="delete">Association</span><span class="insert">Quotation</span></a></li><li class="tocline"><a href="#expression-original-source" class="tocxref"><span class="secno">3.2.4 </span><span class="delete">Responsibility</span><span class="insert">Original Source</span></a></li></ul></li><li class="tocline"><a href="#component3" class="tocxref"><span class="secno">3.3 </span>Component 3: <span class="delete">Derivations</span><span class="insert">Agents and Responsibility</span></a><ul class="toc"><li class="tocline"><a href="#expression-Agent" class="tocxref"><span class="secno">3.3.1 </span><span class="delete">Derivation</span><span class="insert">Agent</span></a></li><li class="tocline"><a href="#expression-attribution" class="tocxref"><span class="secno">3.3.2 </span><span class="delete">Revision</span><span class="insert">Attribution</span></a></li><li class="tocline"><a href="#expression-Association" class="tocxref"><span class="secno">3.3.3 </span><span class="delete">Quotation</span><span class="insert">Association</span></a></li><li class="tocline"><a href="#expression-delegation" class="tocxref"><span class="secno">3.3.4 </span><span class="delete">Original Source</span><span class="insert">Delegation</span></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: <span class="delete">Collections</span><span class="insert">Bundles</span></a><ul class="toc"><li class="tocline"><a href="#expression-bundle-declaration" class="tocxref"><span class="secno">3.5.1 </span><span class="delete">Insertion</span><span class="insert">Bundle Declaration</span></a></li><li class="tocline"><a href="#expression-provenance-locator" class="tocxref"><span class="secno">3.5.2 </span><span class="delete">Removal</span><span class="delete">3.5.3 </span><span class="delete">Membership</span><span class="insert">Provenance Locator</span></a></li></ul></li><li class="tocline"><a href="#component6" class="tocxref"><span class="secno">3.6 </span>Component 6: <span class="delete">Annotations</span><span class="insert">Collections</span></a><ul class="toc"><li class="tocline"><a href="#expression-collection-insertion" class="tocxref"><span class="secno">3.6.1 </span><span class="delete">Note</span><span class="insert">Insertion</span></a></li><li class="tocline"><a href="#expression-collection-removal" class="tocxref"><span class="secno">3.6.2 </span><span class="delete">Annotation</span><span class="insert">Removal</span></a></li><li class="tocline"><a href="#expression-collection-membership" class="tocxref"><span class="secno"><span class="insert">3.6.3 </span></span><span class="insert">Membership</span></a></li></ul></li><li class="tocline"><a href="#subexpressions" class="tocxref"><span class="secno">3.7 </span>Further Expressions</a><ul class="toc"><li class="tocline"><a href="#expression-NamespaceDeclaration" class="tocxref"><span class="secno">3.7.1 </span>Namespace Declaration</a></li><li class="tocline"><a href="#expression-identifier" class="tocxref"><span class="secno">3.7.2 </span>Identifier</a></li><li class="tocline"><a href="#expression-attribute" class="tocxref"><span class="secno">3.7.3 </span>Attribute</a></li><li class="tocline"><a href="#expression-literal" class="tocxref"><span class="secno">3.7.4 </span>Literal</a><ul class="toc"><li class="tocline"><a href="#expression-types" class="tocxref"><span class="secno">3.7.4.1 </span>Reserved Type Values</a></li><li class="tocline"><a href="#expression-Time" class="tocxref"><span class="secno">3.7.4.2 </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>
+</span><span class="delete">This </span>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="#notational-conventions" 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><li class="tocline"><a href="#comments" class="tocxref"><span class="secno"><span class="insert">2.5 </span></span><span class="insert">Comments</span></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-wasInformedBy" class="tocxref"><span class="secno"><span class="insert">3.1.5 </span></span><span class="insert">Communication</span></a></li><li class="tocline"><a href="#expression-Start" class="tocxref"><span class="secno"><span class="delete">3.1.5</span><span class="insert">3.1.6</span> </span>Start</a></li><li class="tocline"><a href="#expression-End" class="tocxref"><span class="secno"><span class="delete">3.1.6</span><span class="insert">3.1.7</span> </span>End</a></li><li class="tocline"><a href="#expression-Invalidation" class="tocxref"><span class="secno"><span class="delete">3.1.7</span><span class="insert">3.1.8</span> </span>Invalidation<span class="delete">3.1.8 </span><span class="delete">Communication</span><span class="delete">3.1.9 </span><span class="delete">Start by Activity</span></a></li></ul></li><li class="tocline"><a href="#component2" class="tocxref"><span class="secno">3.2 </span>Component 2: <span class="delete">Agents and Responsibility</span><span class="insert">Derivations</span></a><ul class="toc"><li class="tocline"><a href="#Derivation-Relation" class="tocxref"><span class="secno">3.2.1 </span><span class="delete">Agent</span><span class="insert">Derivation</span></a></li><li class="tocline"><a href="#expression-Revision" class="tocxref"><span class="secno">3.2.2 </span><span class="delete">Attribution</span><span class="insert">Revision</span></a></li><li class="tocline"><a href="#expression-quotation" class="tocxref"><span class="secno">3.2.3 </span><span class="delete">Association</span><span class="insert">Quotation</span></a></li><li class="tocline"><a href="#expression-original-source" class="tocxref"><span class="secno">3.2.4 </span><span class="delete">Responsibility</span><span class="insert">Original Source</span></a></li></ul></li><li class="tocline"><a href="#component3" class="tocxref"><span class="secno">3.3 </span>Component 3: <span class="delete">Derivations</span><span class="insert">Agents and Responsibility</span></a><ul class="toc"><li class="tocline"><a href="#expression-Agent" class="tocxref"><span class="secno">3.3.1 </span><span class="delete">Derivation</span><span class="insert">Agent</span></a></li><li class="tocline"><a href="#expression-attribution" class="tocxref"><span class="secno">3.3.2 </span><span class="delete">Revision</span><span class="insert">Attribution</span></a></li><li class="tocline"><a href="#expression-Association" class="tocxref"><span class="secno">3.3.3 </span><span class="delete">Quotation</span><span class="insert">Association</span></a></li><li class="tocline"><a href="#expression-delegation" class="tocxref"><span class="secno">3.3.4 </span><span class="delete">Original Source</span><span class="insert">Delegation</span></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: <span class="delete">Alternate Entities</span><span class="insert">Bundles</span></a><ul class="toc"><li class="tocline"><a href="#expression-bundle-declaration" class="tocxref"><span class="secno">3.4.1 </span><span class="delete">Alternate</span><span class="delete">3.4.2 </span><span class="delete">Specialization</span><span class="insert">Bundle Declaration</span></a></li></ul></li><li class="tocline"><a href="#component5" class="tocxref"><span class="secno">3.5 </span>Component 5: <span class="delete">Collections</span><span class="insert">Alternate Entities</span></a><ul class="toc"><li class="tocline"><a href="#expression-alternate" class="tocxref"><span class="secno">3.5.1 </span><span class="delete">Insertion</span><span class="insert">Alternate</span></a></li><li class="tocline"><a href="#expression-specialization" class="tocxref"><span class="secno">3.5.2 </span><span class="delete">Removal</span><span class="insert">Specialization</span></a></li><li class="tocline"><a href="#expression-contextualization" class="tocxref"><span class="secno">3.5.3 </span><span class="delete">Membership</span><span class="insert">Contextualization</span></a></li></ul></li><li class="tocline"><a href="#component6" class="tocxref"><span class="secno">3.6 </span>Component 6: <span class="delete">Annotations</span><span class="insert">Collections</span></a><ul class="toc"><li class="tocline"><a href="#expression-collection-insertion" class="tocxref"><span class="secno">3.6.1 </span><span class="delete">Note</span><span class="insert">Insertion</span></a></li><li class="tocline"><a href="#expression-collection-removal" class="tocxref"><span class="secno">3.6.2 </span><span class="delete">Annotation</span><span class="insert">Removal</span></a></li><li class="tocline"><a href="#expression-collection-membership" class="tocxref"><span class="secno"><span class="insert">3.6.3 </span></span><span class="insert">Membership</span></a></li></ul></li><li class="tocline"><a href="#subexpressions" class="tocxref"><span class="secno">3.7 </span>Further Expressions</a><ul class="toc"><li class="tocline"><a href="#expression-NamespaceDeclaration" class="tocxref"><span class="secno">3.7.1 </span>Namespace Declaration</a></li><li class="tocline"><a href="#expression-identifier" class="tocxref"><span class="secno">3.7.2 </span>Identifier</a></li><li class="tocline"><a href="#expression-attribute" class="tocxref"><span class="secno">3.7.3 </span>Attribute</a></li><li class="tocline"><a href="#expression-literal" class="tocxref"><span class="secno">3.7.4 </span>Literal</a><ul class="toc"><li class="tocline"><a href="#expression-types" class="tocxref"><span class="secno">3.7.4.1 </span>Reserved Type Values</a></li><li class="tocline"><a href="#expression-Time" class="tocxref"><span class="secno">3.7.4.2 </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>
@@ -1167,13 +1167,13 @@
<p> PROV-N adopts a functional-style syntax consisting of a predicate name and an ordered list of terms.
All PROV data model relations involve two primary elements, the <em>subject</em> and the <em>object</em>, in this order. Furthermore, some expressions also admit additional elements that further characterize it.
-</p><div class="anexample" count="1">
+</p><div class="anexample" id="example_1" data-count="1"><div class="anexampleTitle"><a class="internalDFN" href="#example_1"><span class="insert">Example 1</span></a></div>
The following expression should be read as "<span class="name">e2</span> was derived from <span class="name">e1</span>". Here <span class="name">e2</span> is the subject, and <span class="name">e1</span> is the object.
<pre class="codeexample">wasDerivedFrom(e2, e1)
</pre>
</div>
-<div class="anexample" count="2">
+<div class="anexample" id="example_2" data-count="2"><div class="anexampleTitle"><a class="internalDFN" href="#example_2"><span class="insert">Example 2</span></a></div>
In the following expressions, the optional activity <span class="name">a</span> along with the generation and usage <span class="delete">identifiers,</span><span class="insert">identifiers </span><span class="name"><span class="insert">g2</span></span> and <span class="delete">timestamps have been added to further qualify the derivation:</span><span class="name"><span class="insert">u1</span></span><span class="insert">:</span>
<pre class="codeexample">wasDerivedFrom(e2, e1, a, g2, u1)<span class="delete">
activity(a2, 2011-11-16T16:00:00, 2011-11-16T16:00:01)</span>
@@ -1273,7 +1273,7 @@
| </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><span class="prod"><a class="grammarRef" href="#prod-provenanceLocatorExpression"><span class="insert">provenanceLocatorExpression</span></a></span><span class="insert"> )</span></code></td> </tr> </tbody>
+<span class="prod"><a class="grammarRef" href="#prod-contextualizationExpression"><span class="insert">contextualizationExpression</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></code></td> </tr> </tbody>
</table>
@@ -1295,14 +1295,14 @@
Some terms in an expression may be optional. For example:
-<div class="anexample" count="3">
+<div class="anexample" id="example_3" data-count="3"><div class="anexampleTitle"><a class="internalDFN" href="#example_3"><span class="insert">Example 3</span></a></div>
<pre class="codeexample">wasDerivedFrom(e2, e1, a, g2, u1)
wasDerivedFrom(e2, e1)
</pre>
In a derivation expression, the activity, generation, and usage are optional terms. They are specified in the first derivation, but not in the second.
</div>
-<div class="anexample" count="4">
+<div class="anexample" id="example_4" data-count="4"><div class="anexampleTitle"><a class="internalDFN" href="#example_4"><span class="insert">Example 4</span></a></div>
<pre class="codeexample">activity(a2, 2011-11-16T16:00:00, 2011-11-16T16:00:01)
activity(a1)
</pre>
@@ -1312,7 +1312,7 @@
<p>The general rule for optionals is that, if <em>none</em> of the optionals are used in the expression, then they are simply omitted, resulting in a simpler expression as in the examples above.</p>
However, it may be the case that only some of the optional terms are omitted. Because the position of the terms in the expression matters, an additional marker must be used to indicate that a particular term is not available. The symbol <span class="name"><span class="delete">-</span><span class="insert">'-'</span></span> is used for this purpose.
-<div class="anexample" count="5">
+<div class="anexample" id="example_5" data-count="5"><div class="anexampleTitle"><a class="internalDFN" href="#example_5"><span class="insert">Example 5</span></a></div>
<p>In the first expression below, all optionals are specified. However in the <span class="delete">second,</span><span class="insert">second and third,</span> only <span class="delete">the last </span>one <span class="insert">optional </span>is specified, forcing the use of the marker for the missing terms.<span class="delete"> In the last, no marker is necessary because all </span><span class="delete">remaining</span><span class="delete"> optionals after </span><span class="delete">a</span><span class="delete"> are missing.
</span>
@@ -1323,7 +1323,7 @@
</pre>
</div>
Note that the more succinct form is just shorthand for a complete expression with all the markers specified:
-<div class="anexample" count="6">
+<div class="anexample" id="example_6" data-count="6"><div class="anexampleTitle"><a class="internalDFN" href="#example_6"><span class="insert">Example 6</span></a></div>
<pre class="codeexample">activity(a1)
activity(a1, -, -)
</pre>
@@ -1337,7 +1337,7 @@
<p>Most expressions defined in the grammar include the use of two terms: an identifier <span class="insert">and a set of attribute-value pairs, delimited by square brackets. Identifiers are optional except </span>for <span class="delete">the predicate,</span><span class="insert">Entities, Activites,</span> and <span class="insert">Agents. Identifiers are always the first term in any expression. By convention, optional identifiers are separated using </span>a <span class="insert">semi-colon ';'. This makes it possible to completely omit an optional identifier with no ambiguity arising. Also, if the </span>set of attribute-value <span class="delete">pairs, delimited by square brackets. Both are</span><span class="insert">pairs is present, it is always the last term in any expression.</span></p>
-<div class="anexample" count="7">
+<div class="anexample" id="example_7" data-count="7"><div class="anexampleTitle"><a class="internalDFN" href="#example_7"><span class="insert">Example 7</span></a></div>
<p><span class="insert">Derivation has an</span> optional <span class="delete">(unless specified otherwise). By convention,</span><span class="insert">identifier. In the first expression,</span> the identifier is <span class="delete">the first term</span><span class="insert">not available, while it is explicit</span> in <span class="delete">any expression, and the set of attribute-value pairs is the last. </span><span class="delete">
Consistent with the convention on optional terms, the '</span><span class="insert">the second. The third example shows that one can optionally indicate the missing identifier using the </span><span class="name">-</span><span class="delete">' marker can be used when the identifier is not available. Additionally, the grammar rules are defined in such a way that the optional identifier can be omitted altogether with no ambiguity arising.
@@ -1354,7 +1354,7 @@
-</span><div class="anexample" count="8">
+</span><div class="anexample" id="example_8" data-count="8"><div class="anexampleTitle"><a class="internalDFN" href="#example_8"><span class="insert">Example 8</span></a></div>
<p>The first <span class="delete">activity does not</span><span class="insert">and second activities</span> have <span class="delete">any</span><span class="insert">no</span> attributes.<span class="delete"> The second has an empty list of attributes. </span>
The third activity has two attributes.
@@ -1443,9 +1443,9 @@
-
-
-<div class="anexample" count="9">
+<div class="anexample" id="example_9" data-count="9"><div class="anexampleTitle"><a class="internalDFN" href="#example_9"><span class="insert">Example 9</span></a></div>
+
+
<pre class="codeexample">entity(tr:WD-prov-dm-20111215, [ prov:type="document" ])
</pre>
Here <span class="name">tr:WD-prov-dm-20111215</span> is the <span class="delete">optional </span>entity identifier, and <span class="name">[ prov:type="document" ]</span> groups the optional <span class="delete">attributes </span><span class="insert">attributes, only one in this example, </span>with their values.
@@ -1503,7 +1503,7 @@
-<div class="anexample" count="10">
+<div class="anexample" id="example_10" data-count="10"><div class="anexampleTitle"><a class="internalDFN" href="#example_10"><span class="insert">Example 10</span></a></div>
<pre class="codeexample">activity(ex:a10, 2011-11-16T16:00:00, 2011-11-16T16:00:01, [prov:type="createFile"])
</pre>
<p>Here <span class="name">ex:a10</span> is the<span class="delete"> optional </span> activity identifier, <span class="name">2011-11-16T16:00:00</span> and <span class="name">2011-11-16T16:00:01</span> are the optional start and end times for the activity, and <span class="name">[prov:type="createFile"]</span> are optional attributes. </p>
@@ -1565,9 +1565,9 @@
-
-
-<div class="anexample" count="11">
+<div class="anexample" id="example_11" data-count="11"><div class="anexampleTitle"><a class="internalDFN" href="#example_11"><span class="insert">Example 11</span></a></div>
+
+
<pre class="codeexample"><span class="delete">wasGeneratedBy(ex:g1,</span><span class="insert">wasGeneratedBy(ex:g1;</span> tr:WD-prov-dm-20111215, ex:edit1, 2011-11-16T16:00:00, [ex:fct="save"])
</pre>
@@ -1638,7 +1638,7 @@
-<div class="anexample" count="12">
+<div class="anexample" id="example_12" data-count="12"><div class="anexampleTitle"><a class="internalDFN" href="#example_12"><span class="insert">Example 12</span></a></div>
<pre class="codeexample"><span class="delete">used(ex:u1,</span><span class="insert">used(ex:u1;</span> ex:act2, ar3:0111, 2011-11-16T16:00:00, [ex:fct="load"])
</pre>
@@ -1691,7 +1691,7 @@
-<div class="anexample" count="13">
+<div class="anexample" id="example_13" data-count="13"><div class="anexampleTitle"><a class="internalDFN" href="#example_13"><span class="insert">Example 13</span></a></div>
<pre class="codeexample"><span class="insert">wasInformedBy(ex:inf1; ex:a1, ex:a2, [ex:param1="a", ex:param2="b"])
</span></pre>
<p><span class="insert"> Here </span><span class="name"><span class="insert">ex:inf1</span></span><span class="insert"> is the optional communication identifier, </span><span class="name"><span class="insert">ex:a1</span></span><span class="insert"> is the identifier of the informed activity,
@@ -1750,7 +1750,7 @@
-<div class="anexample" count="14">
+<div class="anexample" id="example_14" data-count="14"><div class="anexampleTitle"><a class="internalDFN" href="#example_14"><span class="insert">Example 14</span></a></div>
<pre class="codeexample"><span class="delete">wasStartedBy(s,</span><span class="insert">wasStartedBy(s;</span> ex:act2, <span class="delete">ar3:0111,</span><span class="insert">ex:trigger, ex:act1,</span> 2011-11-16T16:00:00, [ex:param="a"])
</pre>
@@ -1818,7 +1818,7 @@
-<div class="anexample" count="15">
+<div class="anexample" id="example_15" data-count="15"><div class="anexampleTitle"><a class="internalDFN" href="#example_15"><span class="insert">Example 15</span></a></div>
<pre class="codeexample"><span class="delete">wasEndedBy(s,</span><span class="insert">wasEndedBy(s;</span> ex:act2, <span class="delete">ex:trigger, </span><span class="insert">ex:trigger,ex:act3, </span>2011-11-16T16:00:00, [ex:param="a"])
</pre>
@@ -1891,9 +1891,9 @@
</div>
-
-
-<div class="anexample" count="16">
+<div class="anexample" id="example_16" data-count="16"><div class="anexampleTitle"><a class="internalDFN" href="#example_16"><span class="insert">Example 16</span></a></div>
+
+
<pre class="codeexample"><span class="delete">wasInvalidatedBy(ex:i1,</span><span class="insert">wasInvalidatedBy(ex:i1;</span> tr:WD-prov-dm-20111215, ex:edit1, 2011-11-16T16:00:00, [ex:fct="save"])
</pre>
@@ -2207,7 +2207,7 @@
-<div class="anexample" id="anexample-derivation" count="17">
+<div class="anexample" id="anexample-derivation" data-count="17"><div class="anexampleTitle"><a class="internalDFN" href="#anexample-derivation"><span class="insert">Example 17</span></a></div>
<pre class="codeexample">wasDerivedFrom(d, e2, e1, a, g2, u1, <span class="delete">[prov:comment="a</span><span class="insert">[ex:comment="a</span> righteous derivation"])
</pre>
<p> Here
@@ -2257,10 +2257,10 @@
-
-
-
-<div class="anexample" count="18">
+<div class="anexample" id="example_18" data-count="18"><div class="anexampleTitle"><a class="internalDFN" href="#example_18"><span class="insert">Example 18</span></a></div>
+
+
+
<pre class="codeexample"><span class="delete">wasRevisionOf(rev1, tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018, w3:Consortium, [prov:comment="??"] )</span><span class="insert">wasDerivedFrom(d, e2, e1, a, g2, u1, [prov:type="prov:WasRevisionOf", ex:comment="a righteous derivation"])</span>
</pre>
<p><span class="delete"> Here
@@ -2297,7 +2297,7 @@
-<div class="anexample" count="19">
+<div class="anexample" id="example_19" data-count="19"><div class="anexampleTitle"><a class="internalDFN" href="#example_19"><span class="insert">Example 19</span></a></div>
<pre class="codeexample"><span class="insert">wasDerivedFrom(quoteId1; ex:blockQuote,ex:blog, ex:act1, ex:g, ex:u, [ prov:type='prov:WasQuotedFrom' ])
</span></pre>
@@ -2329,7 +2329,7 @@
-<div class="anexample" count="20">
+<div class="anexample" id="example_20" data-count="20"><div class="anexampleTitle"><a class="internalDFN" href="#example_20"><span class="insert">Example 20</span></a></div>
<pre class="codeexample"><span class="delete">wasQuotedFrom(quoteId1, ex:blockQuote,ex:blog,ex:Luc,ex:Paul,[])</span><span class="insert">wasDerivedFrom(src1; ex:e1, ex:e2, ex:act, ex:g, ex:u, [ prove:type='prov:HadOriginalSource' ])
</span></pre>
<p><span class="insert">Here, the derivation is provided with a </span><span class="name"><span class="insert">prov:type</span></span><span class="insert"> attribute and value </span><span class="name"><span class="insert">prov:HadOriginalSource</span></span><span class="insert">.
@@ -2368,7 +2368,7 @@
-<div class="anexample" count="21">
+<div class="anexample" id="example_21" data-count="21"><div class="anexampleTitle"><a class="internalDFN" href="#example_21"><span class="insert">Example 21</span></a></div>
<pre class="codeexample"><span class="insert">agent(ag4, [ prov:type="prov:Person", ex:name="David" ])
</span></pre>
<p><span class="insert">Here </span><span class="name"><span class="insert">ag</span></span><span class="insert"> is the agent identifier, and
@@ -2410,7 +2410,7 @@
-<div class="anexample" count="22">
+<div class="anexample" id="example_22" data-count="22"><div class="anexampleTitle"><a class="internalDFN" href="#example_22"><span class="insert">Example 22</span></a></div>
<pre class="codeexample"><span class="insert">wasAttributedTo(id; e, ag, [ex:license='cc:attributionURL' ])</span>
</pre>
@@ -2459,7 +2459,7 @@
</div>
-<div class="anexample" count="23">
+<div class="anexample" id="example_23" data-count="23"><div class="anexampleTitle"><a class="internalDFN" href="#example_23"><span class="insert">Example 23</span></a></div>
<pre class="codeexample"><span class="insert">wasAssociatedWith(ex:agas; ex:a1, ex:ag1, ex:e1, [ex:param1="a", ex:param2="b"])
</span></pre>
@@ -2554,7 +2554,7 @@
-<div class="anexample" count="24">
+<div class="anexample" id="example_24" data-count="24"><div class="anexampleTitle"><a class="internalDFN" href="#example_24"><span class="insert">Example 24</span></a></div>
<pre class="codeexample"><span class="delete">hadOriginalSource(src1, ex:e1, ex:e2,[ex:param="a"])</span><span class="insert">actedOnBehalfOf(del1; ag2, ag1, a, [prov:type="contract"])</span>
</pre>
@@ -2626,7 +2626,7 @@
</div>
-<div class="anexample" count="25">
+<div class="anexample" id="example_25" data-count="25"><div class="anexampleTitle"><a class="internalDFN" href="#example_25"><span class="insert">Example 25</span></a></div>
<pre class="codeexample">tracedTo(id,e2,e1,[ex:param="a"])
</pre>
<p> Here
@@ -2649,11 +2649,35 @@
</div>
-
<div id="component4" class="section">
-<h3><span class="secno">3.4 </span>Component 4: Alternate Entities</h3>
+<h3><span class="secno">3.4 </span>Component 4: <span class="delete">Alternate Entities</span><span class="insert">Bundles</span></h3>
+
+
+
+<div id="expression-bundle-declaration" class="section">
+<h4><span class="secno">3.4.1 </span><span class="insert">Bundle Declaration</span></h4>
+
+<table class="grammar">
+<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">33</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>
+</table>
+
+<div class="anexample" id="example_26" data-count="26"><div class="anexampleTitle"><a class="internalDFN" href="#example_26"><span class="insert">Example 26</span></a></div>
+ <pre class="codeexample"><span class="insert">bundle ex:author-view
+ agent(ex:Paolo, [ prov:type='prov:Person' ])
+ agent(ex:Simon, [ prov:type='prov:Person' ])
+ ...
+endBundle
+ </span></pre>
+<p><span class="insert"> Here </span><span class="name"><span class="insert">ex:author-view</span></span><span class="insert"> is the name of the bundle.
+</span></p></div>
+
+</div>
+</div>
+
+<div id="component5" class="section">
+<h3><span class="secno"><span class="insert">3.5 </span></span><span class="insert">Component 5: Alternate Entities</span></h3>
<div id="expression-alternate" class="section">
-<h4><span class="secno">3.4.1 </span>Alternate</h4>
+<h4><span class="secno"><span class="insert">3.5.1 </span></span>Alternate</h4>
@@ -2689,7 +2713,7 @@
</tbody></table>
</div>
-<div class="anexample" count="26">
+<div class="anexample" id="example_27" data-count="27"><div class="anexampleTitle"><a class="internalDFN" href="#example_27"><span class="insert">Example 27</span></a></div>
<pre class="codeexample">alternateOf(tr:WD-prov-dm-20111215,ex:alternate-20111215)
</pre>
Here <span class="name">tr:WD-prov-dm-20111215</span> is alternate for <span class="name">ex:alternate-20111215</span>.
@@ -2698,7 +2722,7 @@
</div>
<div id="expression-specialization" class="section">
-<h4><span class="secno">3.4.2 </span>Specialization</h4>
+<h4><span class="secno"><span class="delete">3.4.2</span><span class="insert">3.5.2</span> </span>Specialization</h4>
@@ -2737,26 +2761,89 @@
-<div class="anexample" count="27">
+<div class="anexample" id="example_28" data-count="28"><div class="anexampleTitle"><a class="internalDFN" href="#example_28"><span class="insert">Example 28</span></a></div>
<pre class="codeexample">specializationOf(tr:WD-prov-dm-20111215,tr:prov-dm)
</pre>
Here <span class="name">tr:WD-prov-dm-20111215</span> is a specialization of <span class="name">tr:prov-dm</span>.
</div>
</div>
+
+
+
+<div id="expression-contextualization" class="section">
+<h4><span class="secno"><span class="insert">3.5.3 </span></span><span class="insert">Contextualization</span></h4>
+
+
+<table class="grammar">
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-contextualizationExpression" name="prod-contextualizationExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">25</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">contextualizationExpression</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"contextualizationOf" "(" </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-identifier"><span class="insert">identifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-bIdentifier"><span class="insert">bIdentifier</span></a></span><span class="insert"> ")"</span></code></td> </tr> </tbody>
+</table>
+
+
+<p><span class="insert">The following table summarizes how each constituent of a PROV-DM Contextualization maps to a non-terminal.</span></p>
+<div style="text-align: left; ">
+<table class="thinborder" style="margin-left: auto; margin-right: auto;">
+<tbody><tr><td><b><span class="insert">Contextualization</span></b></td><td><b><span class="insert">Non-Terminal</span></b></td></tr>
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#contextualization.specificEntity"><span class="attribute" id="contextualization.local"><span class="insert">local</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier"><span class="insert">eIdentifier</span></a></code></td></tr>
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#contextualization.generalEntity"><span class="attribute" id="contextualization.contextualized"><span class="insert">contextualized</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier"><span class="insert">eIdentifier</span></a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#contextualization.context"><span class="attribute" id="contextualization.context"><span class="insert">context</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-bIdentifier"><span class="insert">bIdentifier</span></a></code></td></tr>
+
+</tbody></table>
</div>
-<div id="component5" class="section">
-<h3><span class="secno">3.5 </span>Component 5: <span class="delete">Collections</span><span class="insert">Bundles</span></h3>
+
+
+
+<div class="anexample" id="example_29" data-count="29"><div class="anexampleTitle"><a class="internalDFN" href="#example_29"><span class="insert">Example 29</span></a></div>
+<pre class="codeexample"><span class="insert"> contextualization(ex:report1_as_in_b1, ex:report1, ex:b1)
+</span></pre>
+<p><span class="insert"> Here
+ </span><span class="name"><span class="insert">ex:report1_as_in_b1</span></span><span class="insert"> is an entity identifier,
+ </span><span class="name"><span class="insert">ex:report1</span></span><span class="insert"> is an entity identifier,
+ </span><span class="name"><span class="insert">ex:b1</span></span><span class="insert"> is the identifier for a bundle
+</span></p></div>
+
+
+
+</div>
+
+
+
+
+</div>
+
+
+
+<div id="component6" class="section">
+<h3><span class="secno"><span class="delete">3.5</span><span class="insert">3.6</span> </span>Component <span class="delete">5:</span><span class="insert">6:</span> Collections</h3>
<span class="delete">Grammar for collections </span><span class="delete">may</span><span class="delete"> under go minor syntactic changes since it has not been implemented yet.</span><span class="delete">
In the productions in this section, nonterminals </span><span class="delete">keyValuePairs</span><span class="delete"> and </span><span class="delete">keySet</span><span class="delete"> are defined as follows.
</span>
-<span class="delete">keyValuePairs</span><span class="delete"> ::=</span><div id="expression-bundle-declaration" class="section">
-<span class="delete">(</span>
- <span class="delete">literal</span>
+<span class="delete">keyValuePairs</span><span class="delete"> ::=
+</span>
+
+
+
+
+
+<div id="expression-collection-insertion" class="section">
+<h4><span class="secno"><span class="insert">3.6.1 </span></span><span class="insert">Insertion</span></h4>
+
+
+
+<table class="grammar">
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-insertionExpression" name="prod-insertionExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">26</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">insertionExpression</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"derivedByInsertionFrom" "(" </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-dIdentifier"><span class="insert">dIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-dIdentifier"><span class="insert">dIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-keyEntitySet"><span class="insert">keyEntitySet</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 class="prod"> <tr valign="baseline"> <td><a id="prod-keyEntitySet" name="prod-keyEntitySet"></a><span class="insert">[</span><span class="prodNo"><span class="insert">27</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">keyEntitySet</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-literal"><span class="insert">literal</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span><span class="insert"> ")" </span>(
+ <span class="insert"> "," "(" </span><span class="prod"><a class="grammarRef" href="#prod-literal">literal
<span class="delete">,</span>
<span class="delete">eidentifier</span>
<span class="delete">)</span><span class="delete">
@@ -2776,104 +2863,12 @@
|
</span><span class="delete">literal</span>
<span class="delete">,</span>
-<span class="delete">keySet</span>
-
-
-
-
-<h4><span class="secno">3.5.1 </span><span class="delete">Insertion</span><span class="insert">Bundle Declaration</span></h4>
-
-
- <span class="delete">derivationByInsertionFromExpression</span><span class="delete"> ::=
-</span><span class="delete">derivedByInsertionFrom</span>
- <table class="grammar">
-<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">31</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="delete">identifier</span>
- <span class="delete">,</span>
-<span class="delete">cIdentifier</span>
- <span class="delete">,</span>
-<span class="delete">cIdentifier</span>
- <span class="delete">,</span>
- <span class="delete">{</span>
- <span class="delete">keyValuePairs</span>
- <span class="delete">}</span>
-<span class="delete">optional-attribute-values</span>
- <span class="delete">)</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>
-</table>
-
-<div class="anexample" count="28">
- <pre class="codeexample"><span class="delete"> derivedByInsertionFrom(id, c1, c, {("k1", v1), ("k2", v2)}, [])
- </span><span class="insert">bundle ex:author-view
- agent(ex:Paolo, [ prov:type='prov:Person' ])
- agent(ex:Simon, [ prov:type='prov:Person' ])
- ...
-endBundle
- </span></pre>
-<p><span class="insert"> Here </span><span class="name"><span class="insert">ex:author-view</span></span><span class="insert"> is the name of the bundle.
-</span></p></div>
-
-</div>
-
-
-<div id="expression-provenance-locator" class="section">
-<h4><span class="secno"><span class="insert">3.5.2 </span></span><span class="insert">Provenance Locator</span></h4>
-
-
-<table class="grammar">
-<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">32</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="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs"><span class="insert">optionalAttributeValuePairs</span></a></span><span class="insert"> ")"</span></code></td> </tr> </tbody>
+<span class="delete">keySet</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span><span class="insert"> ")" )* "}"</span></code></td> </tr> </tbody>
</table>
-<div class="anexample" count="29">
-<pre class="codeexample"><span class="insert"> hasProvenanceIn(id; ex:report1, bob:bundle4, bob:r1, [ex:param="a"])
-</span></pre>
-<p> Here
- <span class="name">id</span> is the optional <span class="delete">insertion</span><span class="insert">provenance locator</span> identifier,
- <span class="name"><span class="delete">c1</span><span class="insert">ex:report1</span></span> is <span class="delete">the identifier for the collection after the insertion,</span><span class="insert">an entity identifier,</span>
- <span class="name"><span class="delete">c</span><span class="insert">bob:bundle4</span></span> is the identifier for <span class="delete">the collection before the insertion,</span><span class="insert">a bundle</span>
- <span class="name"><span class="delete"> {("k1", v1), ("k2", v2)}</span><span class="insert">bob:r1</span></span> is the <span class="insert">identifier for an identifier
- and </span><span class="name"><span class="insert">[ex:param="a"]</span></span><span class="insert"> is the optional </span>set of <span class="delete">key-value pairs that have been inserted in</span><span class="insert">attributes. </span></p><span class="insert">
-The remaining examples show cases where some of the optionals are omitted.</span>
- <span class="delete">c</span><span class="delete">,
- and </span><span class="delete">[]</span><span class="delete"> is the optional (empty) set</span><pre class="codeexample"><span class="insert">hasProvenanceIn(id; ex:report1, bob:bundle4, -)
-hasProvenanceIn(id; ex:report1, -, -, [ prov:service-uri="http://example.com/service" %% xsd:anyURI ])
-hasProvenanceIn(id; ex:report1, -, bob:r1, [ prov:service-uri="http://example.com/service" %% xsd:anyURI ])
-</span></pre>
-</div>
-
-</div>
-</div>
-
-
-
-<div id="component6" class="section">
-<h3><span class="secno"><span class="insert">3.6 </span></span><span class="insert">Component 6: Collections</span></h3>
-
-
-
-
-
-<div id="expression-collection-insertion" class="section">
-<h4><span class="secno"><span class="insert">3.6.1 </span></span><span class="insert">Insertion</span></h4>
-
-
-
-<table class="grammar">
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-insertionExpression" name="prod-insertionExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">25</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">insertionExpression</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"derivedByInsertionFrom" "(" </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-cIdentifier"><span class="insert">cIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-cIdentifier"><span class="insert">cIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-keyEntitySet"><span class="insert">keyEntitySet</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 class="prod"> <tr valign="baseline"> <td><a id="prod-keyEntitySet" name="prod-keyEntitySet"></a><span class="insert">[</span><span class="prodNo"><span class="insert">26</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">keyEntitySet</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-literal"><span class="insert">literal</span></a></span><span class="insert"> "," </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-literal"><span class="insert">literal</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span><span class="insert"> ")" )* "}"</span></code></td> </tr> </tbody>
-</table>
-
-
-<p><span class="insert">The following table summarizes how each constituent</span> of <span class="delete">attributes. </span><span class="insert">a PROV-DM Insertion maps to a non-terminal.</span></p>
-<span class="delete">The remaining examples show cases where some of the optionals are omitted.
-
- </span><span class="delete"> derivedByInsertionFrom(c1, c, {("k1", v1), ("k2", v2)})
- derivedByInsertionFrom(c1, c, {("k1", v1)})
- derivedByInsertionFrom(c1, c, {("k1", v1), ("k2", v2)}, [])
-</span><div style="text-align: left; ">
+<p><span class="insert">The following table summarizes how each constituent of a PROV-DM Insertion maps to a non-terminal.</span></p>
+<div style="text-align: left; ">
<table class="thinborder" style="margin-left: auto; margin-right: auto;">
<tbody><tr><td><b><span class="insert">Insertion</span></b></td><td><b><span class="insert">Non-Terminal</span></b></td></tr>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
@@ -2893,13 +2888,11 @@
-
-
-<span class="delete">3.5.2 </span><span class="delete">Removal</span>
-
-
- <span class="delete">derivationByRemovalFromExpression</span><span class="delete"> ::=
-</span><span class="delete">derivedByRemovalFrom</span>
+<span class="delete">3.5.1 </span><span class="delete">Insertion</span>
+
+
+ <span class="delete">derivationByInsertionFromExpression</span><span class="delete"> ::=
+</span><span class="delete">derivedByInsertionFrom</span>
<span class="delete">(</span>
<span class="delete">identifier</span>
<span class="delete">,</span>
@@ -2908,42 +2901,49 @@
<span class="delete">cIdentifier</span>
<span class="delete">,</span>
<span class="delete">{</span>
- <span class="delete">keySet</span>
+ <span class="delete">keyValuePairs</span>
<span class="delete">}</span>
<span class="delete">optional-attribute-values</span>
<span class="delete">)</span>
-
-
-
-<div class="anexample" count="30">
- <pre class="codeexample"> <span class="delete">derivedByRemovalFrom(id, c3,</span><span class="insert">derivedByInsertionFrom(id; c1,</span> c, <span class="delete">{"k1", "k3"},</span><span class="insert">{("k1", v1), ("k2", v2)},</span> [])
+<div class="anexample" id="example_30" data-count="30"><div class="anexampleTitle"><a class="internalDFN" href="#example_30"><span class="insert">Example 30</span></a></div>
+
+
+ <pre class="codeexample"> <span class="delete">derivedByInsertionFrom(id,</span><span class="insert">derivedByInsertionFrom(id;</span> c1, c, {("k1", v1), ("k2", v2)}, [])
</pre>
<p> Here
- <span class="name">id</span> is the optional <span class="insert">insertion identifier,
- </span><span class="name"><span class="insert">c1</span></span><span class="insert"> is the identifier for the collection after the insertion,
- </span><span class="name"><span class="insert">c</span></span><span class="insert"> is the identifier for the collection before the insertion,
- </span><span class="name"><span class="insert"> {("k1", v1), ("k2", v2)}</span></span><span class="insert"> is the set of key-value pairs that have been inserted in
- </span><span class="name"><span class="insert">c</span></span><span class="insert">,
- and </span><span class="name"><span class="insert">[]</span></span><span class="insert"> is the optional (empty) set of attributes. </span></p><span class="insert">
+ <span class="name">id</span> is the optional insertion identifier,
+ <span class="name">c1</span> is the identifier for the collection after the insertion,
+ <span class="name">c</span> is the identifier for the collection before the insertion,
+ <span class="name"> {("k1", v1), ("k2", v2)}</span> is the set of key-value pairs that have been inserted in
+ <span class="name">c</span>,
+ and <span class="name">[]</span> is the optional (empty) set of attributes. </p>
The remaining examples show cases where some of the optionals are omitted.
- </span><pre class="codeexample"><span class="insert"> derivedByInsertionFrom(c1, c, {("k1", v1), ("k2", v2)})
+ <pre class="codeexample"> derivedByInsertionFrom(c1, c, {("k1", v1), ("k2", v2)})
derivedByInsertionFrom(c1, c, {("k1", v1)})
derivedByInsertionFrom(c1, c, {("k1", v1), ("k2", v2)}, [])
-</span></pre>
+</pre>
</div>
</div>
<div id="expression-collection-removal" class="section">
-<h4><span class="secno"><span class="insert">3.6.2 </span></span><span class="insert">Removal</span></h4>
+<h4><span class="secno"><span class="delete">3.5.2</span><span class="insert">3.6.2</span> </span>Removal</h4>
+
+
+ <span class="delete">derivationByRemovalFromExpression</span><span class="delete"> ::=
+</span><span class="delete">derivedByRemovalFrom</span>
+
<table class="grammar">
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-removalExpression" name="prod-removalExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">27</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">removalExpression</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"derivedByRemovalFrom" "(" </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-cIdentifier"><span class="insert">cIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-cIdentifier"><span class="insert">cIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-keySet"><span class="insert">keySet</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 class="prod"> <tr valign="baseline"> <td><a id="prod-keySet" name="prod-keySet"></a><span class="insert">[</span><span class="prodNo"><span class="insert">28</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">keySet</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-literal"><span class="insert">literal</span></a></span><span class="insert"> ( "," </span><span class="prod"><a class="grammarRef" href="#prod-literal"><span class="insert">literal</span></a></span><span class="insert"> )* "}"</span></code></td> </tr> </tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-removalExpression" name="prod-removalExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">29</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">removalExpression</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"derivedByRemovalFrom" "(" </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-dIdentifier"><span class="insert">dIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-dIdentifier"><span class="insert">dIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-keySet"><span class="insert">keySet</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 class="prod"> <tr valign="baseline"> <td><a id="prod-keySet" name="prod-keySet"></a><span class="insert">[</span><span class="prodNo"><span class="insert">30</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">keySet</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-literal"><span class="insert">literal</span></a></span> (
+ <span class="delete">identifier</span>
+ <span class="delete">,</span>
+<span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-literal"><span class="insert">literal</span></a></span><span class="insert"> )* "}"</span></code></td> </tr> </tbody>
</table>
<p><span class="insert">The following table summarizes how each constituent of a PROV-DM Removal maps to a non-terminal.</span></p>
@@ -2954,12 +2954,21 @@
<tr><td><a href="http://www.w3.org/TR/prov-dm/#removal.id"><span class="attribute" id="removal.id"><span class="insert">id</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier"><span class="insert">optionalIdentifier</span></a></code></td></tr>
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#removal.after"><span class="attribute" id="removal.after"><span class="insert">after</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-cIdentifier"><span class="insert">cIdentifier</span></a></code></td></tr>
-
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#removal.before"><span class="attribute" id="removal.before"><span class="insert">before</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-cIdentifier"><span class="insert">cIdentifier</span></a></code></td></tr>
-
-
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#removal.key-set"><span class="attribute" id="removal.key-set"><span class="insert">key-set</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-keySet"><span class="insert">keySet</span></a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#removal.after"><span class="attribute" id="removal.after"><span class="insert">after</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-cIdentifier">cIdentifier
+ <span class="delete">,</span>
+</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#removal.before"><span class="attribute" id="removal.before"><span class="insert">before</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-cIdentifier">cIdentifier
+ <span class="delete">,</span>
+ <span class="delete">{</span>
+ </a></code></td></tr>
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#removal.key-set"><span class="attribute" id="removal.key-set"><span class="insert">key-set</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-keySet">keySet
+ <span class="delete">}</span>
+<span class="delete">optional-attribute-values</span>
+ <span class="delete">)</span>
+ </a></code></td></tr>
<tr><td><a href="http://www.w3.org/TR/prov-dm/#removal.attributes"><span class="attribute" id="removal.attributes"><span class="insert">attributes</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs"><span class="insert">optionalAttributeValuePairs</span></a></code></td></tr>
</tbody></table>
@@ -2968,11 +2977,13 @@
-<div class="anexample" count="31">
- <pre class="codeexample"><span class="insert"> derivedByRemovalFrom(id; c3, c, {"k1", "k3"}, [])
- </span></pre>
-<p><span class="insert"> Here
- </span><span class="name"><span class="insert">id</span></span><span class="insert"> is the optional </span>removal identifier,
+
+
+<div class="anexample" id="example_31" data-count="31"><div class="anexampleTitle"><a class="internalDFN" href="#example_31"><span class="insert">Example 31</span></a></div>
+ <pre class="codeexample"> <span class="delete">derivedByRemovalFrom(id,</span><span class="insert">derivedByRemovalFrom(id;</span> c3, c, {"k1", "k3"}, [])
+ </pre>
+<p> Here
+ <span class="name">id</span> is the optional removal identifier,
<span class="name">c1</span> is the identifier for the collection after the removal,
<span class="name">c</span> is the identifier for the collection before the removal,
<span class="name"> {("k1", v1), ("k2", v2)}</span> is the set of key-value pairs that have been removed from
@@ -2997,20 +3008,21 @@
<table class="grammar">
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-membershipExpression" name="prod-membershipExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">29</span></span><span class="insert">] </span></td> <td><code class="production prod">membershipExpression<span class="delete"> ::=
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-membershipExpression" name="prod-membershipExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">31</span></span><span class="insert">] </span></td> <td><code class="production prod">membershipExpression<span class="delete"> ::=
</span><span class="delete">isMemberOf</span>
- </code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"memberOf" "(" </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-cIdentifier"><span class="insert">cIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-keyEntitySet"><span class="insert">keyEntitySet</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-complete"><span class="insert">complete</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 class="prod"> <tr valign="baseline"> <td><a id="prod-complete" name="prod-complete"></a><span class="insert">[</span><span class="prodNo"><span class="insert">30</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">complete</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content">(
+ </code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"memberOf" "(" </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-dIdentifier"><span class="insert">dIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-keyEntitySet"><span class="insert">keyEntitySet</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-complete"><span class="insert">complete</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs"><span class="insert">optionalAttributeValuePairs</span></a></span><span class="insert"> ")"</span><br><span class="insert"> | "memberOf" "(" </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-cIdentifier"><span class="insert">cIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-entitySet"><span class="insert">entitySet</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-complete"><span class="insert">complete</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 class="prod"> <tr valign="baseline"> <td><a id="prod-complete" name="prod-complete"></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">complete</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content">(
<span class="delete">identifier</span>
<span class="delete">,</span>
<span class="insert"> "," ( "true" | "false" | "-" ) )?</span></code></td> </tr> </tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-entitySet" name="prod-entitySet"></a><span class="insert">[</span><span class="prodNo"><span class="insert">28</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">entitySet</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>
</table>
<p><span class="insert">The following table summarizes how each constituent of a PROV-DM Membership maps to a non-terminal.</span></p>
<div style="text-align: left; ">
<table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tbody><tr><td><b><span class="insert">Membership</span></b></td><td><b><span class="insert">Non-Terminal</span></b></td></tr>
+<tbody><tr><td><b><span class="insert">Collection Membership</span></b></td><td><b><span class="insert">Non-Terminal</span></b></td></tr>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership.id"><span class="attribute" id="membership.id"><span class="insert">id</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier"><span class="insert">optionalIdentifier</span></a></code></td></tr>
@@ -3024,7 +3036,7 @@
<span class="delete">)</span>
</a></code></td></tr>
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership.key-entity-set"><span class="attribute" id="membership.key-entity-set"><span class="insert">key-entity-set</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-keyEntitySet"><span class="insert">keyEntitySet</span></a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership.entity-set"><span class="attribute" id="membership.entity-set"><span class="insert">entity-set</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-entitySet"><span class="insert">entitySet</span></a></code></td></tr>
<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership.complete"><span class="attribute" id="membership.complete"><span class="insert">complete</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-complete"><span class="insert">complete</span></a></code></td></tr>
@@ -3035,10 +3047,28 @@
-
-
-<div class="anexample" count="32">
- <pre class="codeexample"> <span class="delete">memberOf(mid,</span><span class="insert">memberOf(mId,</span> c, {("k4", v4), ("k5", v5)}, [])
+<div style="text-align: left; ">
+<table class="thinborder" style="margin-left: auto; margin-right: auto;">
+<tbody><tr><td><b><span class="insert">Dictionary Membership</span></b></td><td><b><span class="insert">Non-Terminal</span></b></td></tr>
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership-d.id"><span class="attribute" id="membership-d.id"><span class="insert">id</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier"><span class="insert">optionalIdentifier</span></a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership-d.dictionary"><span class="attribute" id="membership-d.dictionary"><span class="insert">dictionary</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-dIdentifier"><span class="insert">dIdentifier</span></a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership-d.key-entity-set"><span class="attribute" id="membership-d.key-entity-set"><span class="insert">key-entity-set</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-keyEntitySet"><span class="insert">keyEntitySet</span></a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership-d.complete"><span class="attribute" id="membership-d.complete"><span class="insert">complete</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-complete"><span class="insert">complete</span></a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership-d.attributes"><span class="attribute" id="membership-d.attributes"><span class="insert">attributes</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs"><span class="insert">optionalAttributeValuePairs</span></a></code></td></tr>
+</tbody></table>
+</div>
+
+
+
+<div class="anexample" id="example_32" data-count="32"><div class="anexampleTitle"><a class="internalDFN" href="#example_32"><span class="insert">Example 32</span></a></div>
+ <pre class="codeexample"> <span class="delete">memberOf(mid,</span><span class="insert">memberOf(mId,</span> c, <span class="insert">{e1, e2, e3}, []) // Collection membership
+ memberOf(mId, c, </span>{("k4", v4), ("k5", v5)}, [])<span class="insert"> // Dictionary membership</span>
</pre>
<p> Here
<span class="name">mid</span> is the optional membership identifier,
@@ -3046,13 +3076,12 @@
<span class="name"> {("k4", v4), ("k5", v5)}</span> is the set of key-value pairs that are members of
<span class="name">c</span>,
and <span class="name">[]</span> is the optional (empty) set of attributes. </p>
-The remaining examples show cases where some of the optionals are omitted.
-
-
-
-
-
-<pre class="codeexample"> memberOf(c3, {("k4", v4), ("k5", v5)})
+The remaining examples show cases <span class="insert">for Dictionaries, </span>where some of the optionals are omitted.
+
+
+ <span class="insert"> Key-entity sets are replaced with Entity sets for the corresponding generic Collections examples.
+
+</span><pre class="codeexample"> memberOf(c3, {("k4", v4), ("k5", v5)})
memberOf(c3, {("k4", v4)})
@@ -3140,10 +3169,10 @@
<table class="grammar">
-<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">51</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 class="prod"> <tr valign="baseline"> <td><a id="prod-namespaceDeclaration" name="prod-namespaceDeclaration"></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">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-QUALIFIED_NAME"><span class="insert">QUALIFIED_NAME</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-namespace"><span class="insert">namespace</span></a></span></code></td> </tr> </tbody>
-<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">53</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 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">60</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 class="prod"> <tr valign="baseline"> <td><a id="prod-namespaceDeclarations" name="prod-namespaceDeclarations"></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">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 class="prod"> <tr valign="baseline"> <td><a id="prod-namespaceDeclaration" name="prod-namespaceDeclaration"></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">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-QUALIFIED_NAME"><span class="insert">QUALIFIED_NAME</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-namespace"><span class="insert">namespace</span></a></span></code></td> </tr> </tbody>
+<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">56</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 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">63</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>
</table>
@@ -3165,7 +3194,7 @@
</ul>
<p>A PROV-N document <em class="rfc2119" title="must not">must not</em> redeclare prefixes <span class="name">prov</span> and <span class="name">xsd</span>.</p>
-<div class="anexample" id="anexample-namespace" count="33">
+<div class="anexample" id="anexample-namespace" data-count="33"><div class="anexampleTitle"><a class="internalDFN" href="#anexample-namespace"><span class="insert">Example 33</span></a></div>
<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"><span class="delete">container</span><span class="insert">bundle</span>
default <http://example.org/0/>
@@ -3237,31 +3266,33 @@
<table class="grammar">
-<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">33</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 class="prod"> <tr valign="baseline"> <td><a id="prod-aIdentifier" name="prod-aIdentifier"></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">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 class="prod"> <tr valign="baseline"> <td><a id="prod-agIdentifier" name="prod-agIdentifier"></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">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 class="prod"> <tr valign="baseline"> <td><a id="prod-gIdentifier" name="prod-gIdentifier"></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">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 class="prod"> <tr valign="baseline"> <td><a id="prod-uIdentifier" name="prod-uIdentifier"></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">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 class="prod"> <tr valign="baseline"> <td><a id="prod-cIdentifier" name="prod-cIdentifier"></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">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 class="prod"> <tr valign="baseline"> <td><a id="prod-eIdentifierOrMarker" name="prod-eIdentifierOrMarker"></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">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 class="prod"> <tr valign="baseline"> <td><a id="prod-aIdentifierOrMarker" name="prod-aIdentifierOrMarker"></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">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 class="prod"> <tr valign="baseline"> <td><a id="prod-agIdentifierOrMarker" name="prod-agIdentifierOrMarker"></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">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 class="prod"> <tr valign="baseline"> <td><a id="prod-gIdentifierOrMarker" name="prod-gIdentifierOrMarker"></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">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 class="prod"> <tr valign="baseline"> <td><a id="prod-uIdentifierOrMarker" name="prod-uIdentifierOrMarker"></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">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 class="prod"> <tr valign="baseline"> <td><a id="prod-identifier" name="prod-identifier"></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">identifier</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME"><span class="insert">QUALIFIED_NAME</span></a></span></code></td> </tr> </tbody>
-
-<tbody class="term"> <tr valign="baseline"> <td><a id="prod-QUALIFIED_NAME" name="prod-QUALIFIED_NAME"></a><span class="insert">[</span><span class="prodNo"><span class="insert">55</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">QUALIFIED_NAME</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="http://www.w3.org/TR/rdf-sparql-query/#rPN_LOCAL"><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="http://www.w3.org/TR/rdf-sparql-query/#rPN_LOCAL"><span class="insert">PN_PREFIX</span></a></span><span class="insert"> ":"</span></code></td> </tr> </tbody>
-<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">73</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="http://www.w3.org/TR/rdf-sparql-query/#rPN_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="http://www.w3.org/TR/rdf-sparql-query/#rPN_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="http://www.w3.org/TR/rdf-sparql-query/#rPN_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 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">74</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 class="term"> <tr valign="baseline"> <td><a id="prod-PERCENT" name="prod-PERCENT"></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">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 class="term"> <tr valign="baseline"> <td><a id="prod-HEX" name="prod-HEX"></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">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 class="prod"> <tr valign="baseline"> <td><a id="prod-eIdentifier" name="prod-eIdentifier"></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">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 class="prod"> <tr valign="baseline"> <td><a id="prod-aIdentifier" name="prod-aIdentifier"></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">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 class="prod"> <tr valign="baseline"> <td><a id="prod-agIdentifier" name="prod-agIdentifier"></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">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 class="prod"> <tr valign="baseline"> <td><a id="prod-gIdentifier" name="prod-gIdentifier"></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">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 class="prod"> <tr valign="baseline"> <td><a id="prod-uIdentifier" name="prod-uIdentifier"></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">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 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 class="prod"> <tr valign="baseline"> <td><a id="prod-dIdentifier" name="prod-dIdentifier"></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">dIdentifier</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 class="prod"> <tr valign="baseline"> <td><a id="prod-bIdentifier" name="prod-bIdentifier"></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">bIdentifier</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 class="prod"> <tr valign="baseline"> <td><a id="prod-eIdentifierOrMarker" name="prod-eIdentifierOrMarker"></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">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 class="prod"> <tr valign="baseline"> <td><a id="prod-aIdentifierOrMarker" name="prod-aIdentifierOrMarker"></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">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 class="prod"> <tr valign="baseline"> <td><a id="prod-agIdentifierOrMarker" name="prod-agIdentifierOrMarker"></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">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 class="prod"> <tr valign="baseline"> <td><a id="prod-gIdentifierOrMarker" name="prod-gIdentifierOrMarker"></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">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 class="prod"> <tr valign="baseline"> <td><a id="prod-uIdentifierOrMarker" name="prod-uIdentifierOrMarker"></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">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 class="prod"> <tr valign="baseline"> <td><a id="prod-identifier" name="prod-identifier"></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">identifier</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME"><span class="insert">QUALIFIED_NAME</span></a></span></code></td> </tr> </tbody>
+
+<tbody class="term"> <tr valign="baseline"> <td><a id="prod-QUALIFIED_NAME" name="prod-QUALIFIED_NAME"></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">QUALIFIED_NAME</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="http://www.w3.org/TR/rdf-sparql-query/#rPN_LOCAL"><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="http://www.w3.org/TR/rdf-sparql-query/#rPN_LOCAL"><span class="insert">PN_PREFIX</span></a></span><span class="insert"> ":"</span></code></td> </tr> </tbody>
+<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">76</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="http://www.w3.org/TR/rdf-sparql-query/#rPN_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="http://www.w3.org/TR/rdf-sparql-query/#rPN_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="http://www.w3.org/TR/rdf-sparql-query/#rPN_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 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">77</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 class="term"> <tr valign="baseline"> <td><a id="prod-PERCENT" name="prod-PERCENT"></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">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 class="term"> <tr valign="baseline"> <td><a id="prod-HEX" name="prod-HEX"></a><span class="insert">[</span><span class="prodNo"><span class="insert">79</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>
</table>
-<div class="anexample" id="anexample-qualified-name" count="34">
+<div class="anexample" id="anexample-qualified-name" data-count="34"><div class="anexampleTitle"><a class="internalDFN" href="#anexample-qualified-name"><span class="insert">Example 34</span></a></div>
<p>Examples of articles on the BBC Web site seen as entities.</p>
<pre class="codeexample"><span class="delete">container</span><span class="insert">bundle</span>
prefix bbc <http://www.bbc.co.uk/>
@@ -3280,7 +3311,7 @@
-<div class="anexample" id="anexample-qualified-name2" count="35">
+<div class="anexample" id="anexample-qualified-name2" data-count="35"><div class="anexampleTitle"><a class="internalDFN" href="#anexample-qualified-name2"><span class="insert">Example 35</span></a></div>
<p>Examples of entities with declared and default namespace.</p>
<pre class="codeexample"><span class="delete">container</span><span class="insert">bundle</span>
default <http://example.org/2/>
@@ -3317,7 +3348,7 @@
<table class="grammar">
-<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">45</span></span><span class="insert">] </span></td> <td><code class="production prod">attribute<span class="delete"> ::= </span><span class="delete">qualifiedName</span>
+<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">48</span></span><span class="insert">] </span></td> <td><code class="production prod">attribute<span class="delete"> ::= </span><span class="delete">qualifiedName</span>
</code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME"><span class="insert">QUALIFIED_NAME</span></a></span></code></td> </tr> </tbody>
@@ -3332,8 +3363,6 @@
</li><li> <span class="name">prov:role</span>
</li><li> <span class="name">prov:type</span>
</li><li> <span class="name">prov:value</span>
-</li><li> <span class="name"><span class="insert">prov:provenance-uri</span></span>
-</li><li> <span class="name"><span class="insert">prov:service-uri</span></span>
</li></ol>
@@ -3352,61 +3381,64 @@
<table class="grammar">
-<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">47</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">typedLiteral</a></span><br> | <span class="prod"><a class="grammarRef" href="#prod-convenienceNotation">convenienceNotation
-</a></span></code></td> </tr> </tbody>
-<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">48</span></span><span class="insert">] </span></td> <td><code class="production prod">typedLiteral<span class="delete"> ::= </span><span class="delete">quotedString</span> <span class="delete">%%</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">datatype
-</a></span></code></td> </tr> </tbody>
-<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">49</span></span><span class="insert">] </span></td> <td><code class="production prod">datatype<span class="delete"> ::= </span><span class="delete">qualifiedName</span> </code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME"><span class="insert">QUALIFIED_NAME</span></a></span></code></td> </tr> </tbody>
-<tbody><tr valign="baseline"><td></td><td></td><td></td><td><em><span class="insert">where</span></em> <a class="grammarRef" href="#prod-QUALIFIED_NAME"><span class="insert">QUALIFIED_NAME</span></a> <em><span class="insert">is</span> listed in Table <a href="#permitted-datatypes">permitted-datatypes</a></em></td></tr></tbody>
-<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">50</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="delete">convenienceNotation</span><span class="delete"> ::= </span><span class="delete">stringLiteral</span> | <span class="delete">intLiteral</span><span class="prod"><a class="grammarRef" href="#prod-INT_LITERAL"><span class="insert">INT_LITERAL</span></a></span><br>
+<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">50</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">typedLiteral</a></span><br> | <span class="prod"><a class="grammarRef" href="#prod-convenienceNotation">convenienceNotation </a></span></code></td> </tr> </tbody>
+<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">51</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 class="prod"> <tr valign="baseline"> <td><a id="prod-datatype" name="prod-datatype"></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">datatype</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME"><span class="insert">QUALIFIED_NAME</span></a></span></code></td> </tr> </tbody>
+<tbody><tr valign="baseline"><td></td><td></td><td></td></tr></tbody>
+<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">53</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="delete">typedLiteral</span><span class="delete"> ::= </span><span class="delete">quotedString</span> <span class="delete">%%</span> <span class="delete">datatype</span><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="delete">datatype</span><span class="delete"> ::= </span><span class="delete">qualifiedName</span> <span class="delete"> listed in Table </span><span class="delete">permitted-datatypes</span>
+<span class="delete">convenienceNotation</span><span class="delete"> ::= </span><span class="delete">stringLiteral</span> | <span class="delete">intLiteral</span>
<span class="delete">stringLiteral</span><span class="delete"> ::= </span><span class="delete">quotedString</span>
-<span class="delete">quotedString</span><span class="delete"> ::= </span><span class="delete">a finite sequence of characters in which " (#x22) and \ (#x5C) occur only in pairs of the form \" (#x5C, #x22) and \\ (#x5C,
+<span class="delete">quotedString</span><span class="delete"> ::= </span><span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME_LITERAL"><span class="insert">QUALIFIED_NAME_LITERAL</span></a></span></code></td> </tr> </tbody>
+<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">64</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 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">65</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 class="term"> <tr valign="baseline"> <td><a id="prod-QUALIFIED_NAME_LITERAL" name="prod-QUALIFIED_NAME_LITERAL"></a><span class="insert">[</span><span class="prodNo"><span class="insert">66</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">QUALIFIED_NAME_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-QUALIFIED_NAME"><span class="insert">QUALIFIED_NAME</span></a></span><span class="insert"> "'"</span></code></td> </tr> </tbody>
+</table>
+
+<p><span class="insert">In production </span><code class="content"><a class="grammarRef" href="#prod-datatype"><span class="insert">prod-datatype</span></a></code><span class="insert">, the </span><code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME"><span class="insert">QUALIFIED_NAME</span></a></code><span class="insert"> is used to denote </span>a <span class="delete">finite sequence of characters in which " (#x22) and \ (#x5C) occur only in pairs of the form \" (#x5C, #x22) and \\ (#x5C,
#x5C), enclosed in a pair of " (#x22) characters</span>
<span class="delete">intLiteral</span><span class="delete"> ::= </span><span class="delete">a finite-length non-empty sequence of decimal digits (#x30-#x39) with an optional leading negative sign (-)</span>
-<span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME_LITERAL"><span class="insert">QUALIFIED_NAME_LITERAL</span></a></span></code></td> </tr> </tbody>
-<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">'"' ( ( [^"\
-
-] ) | </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 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">62</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 class="term"> <tr valign="baseline"> <td><a id="prod-QUALIFIED_NAME_LITERAL" name="prod-QUALIFIED_NAME_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">QUALIFIED_NAME_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-QUALIFIED_NAME"><span class="insert">QUALIFIED_NAME</span></a></span><span class="insert"> "'"</span></code></td> </tr> </tbody>
-</table>
-
-
-
-
-<p>The non terminals <span class="delete">stringLiteral</span>
+<a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html#term-value"><span class="insert">PROV data type</span></a><span class="insert"> [</span><cite><a class="bibref" rel="biblioentry" href="#bib-PROV-DM"><span class="insert">PROV-DM</span></a></cite><span class="insert">].
+
+
+</span></p><p>The non terminals <span class="delete">stringLiteral</span>
<code class="content"><a class="grammarRef" href="#prod-STRING_LITERAL"><span class="insert">STRING_LITERAL</span></a></code><span class="insert">,
</span><code class="content"><a class="grammarRef" href="#prod-INT_LITERAL"><span class="insert">INT_LITERAL</span></a></code><span class="insert">,</span> and
<span class="delete">intLiteral</span><code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME_LITERAL"><span class="insert">QUALIFIED_NAME_LITERAL</span></a></code>
are syntactic sugar for quoted strings with datatype
-<code class="content"><a href="http://www.w3.org/TR/xmlschema-2/#string"><span class="name">xsd:string</span></a><span class="delete"> and </span></code><span class="insert">,
-</span><code class="content"><a href="http://www.w3.org/TR/xmlschema-2/#int"><span class="name">xsd:int</span></a></code>, <span class="insert">and
+<code class="content"><a href="http://www.w3.org/TR/xmlschema11-2/#string"><span class="name">xsd:string</span></a><span class="delete"> and </span></code><span class="insert">,
+</span><code class="content"><a href="http://www.w3.org/TR/xmlschema11-2/#int"><span class="name">xsd:int</span></a></code>, <span class="insert">and
</span><code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME"><span class="insert">prov:QUALIFIED_NAME</span></a></code>
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>
-<table border="1" style="margin-left: auto; margin-right: auto;">
-<caption id="permitted-datatypes">Permitted datatypes in literals</caption>
-<tbody><tr><td><a href="http://www.w3.org/TR/xmlschema-2/#decimal">xsd:decimal</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#double">xsd:double</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#dateTime">xsd:dateTime</a></td> </tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#integer">xsd:integer</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#float">xsd:float</a></td> <td><a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#section-XMLLiteral"><span class="insert">rdf:XMLLiteral</span></a></td></tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#nonNegativeInteger">xsd:nonNegativeInteger</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#string">xsd:string</a></td> <td><span class="delete">rdf:XMLLiteral</span><a href="#prod-QUALIFIED_NAME"><span class="insert">prov:QUALIFIED_NAME</span></a></td> </tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#nonPositiveInteger">xsd:nonPositiveInteger</a></td><td><a href="http://www.w3.org/TR/xmlschema-2/#normalizedString">xsd:normalizedString</a></td> <td></td></tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#positiveInteger">xsd:positiveInteger</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#token">xsd:token</a></td> <td></td></tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#negativeInteger">xsd:negativeInteger</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#language">xsd:language</a></td> <td></td></tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#long">xsd:long</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#Name">xsd:Name</a></td> <td></td></tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#int">xsd:int</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#NCName">xsd:NCName</a></td> <td></td></tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#short">xsd:short</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#NMTOKEN">xsd:NMTOKEN</a></td> <td></td></tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#byte">xsd:byte</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#boolean">xsd:boolean</a></td> <td></td></tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#unsignedLong">xsd:unsignedLong</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#hexBinary">xsd:hexBinary</a></td> <td></td></tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#unsignedInt">xsd:unsignedInt</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#base64Binary">xsd:base64Binary</a></td><td></td> </tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#unsignedShort">xsd:unsignedShort</a></td><td><a href="http://www.w3.org/TR/xmlschema-2/#anyURI">xsd:anyURI</a></td> <td></td></tr>
-<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>
+
+<span class="delete">Permitted datatypes in literals</span>
+<span class="delete">xsd:decimal</span> <span class="delete">xsd:double</span> <span class="delete">xsd:dateTime</span>
+<span class="delete">xsd:integer</span> <span class="delete">xsd:float</span>
+<span class="delete">xsd:nonNegativeInteger</span> <span class="delete">xsd:string</span> <span class="delete">rdf:XMLLiteral</span>
+<span class="delete">xsd:nonPositiveInteger</span><span class="delete">xsd:normalizedString</span>
+<span class="delete">xsd:positiveInteger</span> <span class="delete">xsd:token</span>
+<span class="delete">xsd:negativeInteger</span> <span class="delete">xsd:language</span>
+<span class="delete">xsd:long</span> <span class="delete">xsd:Name</span>
+<span class="delete">xsd:int</span> <span class="delete">xsd:NCName</span>
+<span class="delete">xsd:short</span> <span class="delete">xsd:NMTOKEN</span>
+<span class="delete">xsd:byte</span> <span class="delete">xsd:boolean</span>
+<span class="delete">xsd:unsignedLong</span> <span class="delete">xsd:hexBinary</span>
+<span class="delete">xsd:unsignedInt</span> <span class="delete">xsd:base64Binary</span>
+<span class="delete">xsd:unsignedShort</span><span class="delete">xsd:anyURI</span>
+<span class="delete">xsd:unsignedByte</span> <span class="delete">xsd:QName</span>
+
+
+
+
<p><b>Note:</b>The productions for <span class="delete">qualifiedName</span><code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME"><span class="insert">prov:QUALIFIED_NAME</span></a></code> and <span class="delete">intLiteral</span>
<code class="content"><a class="grammarRef" href="#prod-INT_LITERAL"><span class="insert">INT_LITERAL</span></a></code> are conflicting. In the context of a <span class="delete">Literal</span>
@@ -3455,7 +3487,7 @@
<span class="delete">prov:EmptyCollection</span><span class="insert">prov:WasRevisionOf</span></span>
</li></ol>
-<div class="anexample" id="anexample-types" count="36">
+<div class="anexample" id="anexample-types" data-count="36"><div class="anexampleTitle"><a class="internalDFN" href="#anexample-types"><span class="insert">Example 36</span></a></div>
<p>The <span class="delete">entity</span><span class="insert">agent</span> <span class="name">ag</span> is a person (type: <span class="name">prov:Person</span>), whereas the entity
<span class="name">pl</span> is a plan (type: <span class="name">prov:Plan</span>).</p>
<pre class="codeexample"><span class="delete">agent(ag,[prov:type="prov:Person" %% xsd:QName])
@@ -3473,14 +3505,14 @@
<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="prod"> <tr valign="baseline"> <td><a id="prod-time" name="prod-time"></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">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 class="term"> <tr valign="baseline"> <td><a id="prod-DIGIT" name="prod-DIGIT"></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">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 class="term"> <tr valign="baseline"> <td><a id="prod-ISODATETIME" name="prod-ISODATETIME"></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">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 class="term"> <tr valign="baseline"> <td><a id="prod-TIMEZONEOFFSET" name="prod-TIMEZONEOFFSET"></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">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 class="prod"> <tr valign="baseline"> <td><a id="prod-time" name="prod-time"></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">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 class="term"> <tr valign="baseline"> <td><a id="prod-DIGIT" name="prod-DIGIT"></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">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 class="term"> <tr valign="baseline"> <td><a id="prod-ISODATETIME" name="prod-ISODATETIME"></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">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 class="term"> <tr valign="baseline"> <td><a id="prod-TIMEZONEOFFSET" name="prod-TIMEZONEOFFSET"></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">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>
</table>
-<div class="anexample" id="anexample-time" count="37">
+<div class="anexample" id="anexample-time" data-count="37"><div class="anexampleTitle"><a class="internalDFN" href="#anexample-time"><span class="insert">Example 37</span></a></div>
<p>The third argument in the following usage expression is a time instance, namely 4pm on 2011-11-16.</p>
<pre class="codeexample">used(ex:act2, ar3:0111, 2011-11-16T16:00:00)
@@ -3542,15 +3574,15 @@
<span class="delete">namespaceDeclarations</span>
<span class="delete">expression</span>
<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>
</table>
-<div class="anexample" count="38">
+<div class="anexample" id="example_38" data-count="38"><div class="anexampleTitle"><a class="internalDFN" href="#example_38"><span class="insert">Example 38</span></a></div>
+
+
+
<p>
The following container contains expressions related to the provenance of entity
<span class="name">e2</span>.