Mercurial > hg > prov / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset
added productions for collections
authorLuc Moreau <l.moreau@ecs.soton.ac.uk>
Tue, 15 May 2012 12:04:26 +0100
changeset 2825 fd42c7763d12
parent 2824 3b4f0160cc1c
child 2826 4763bb8a9373
added productions for collections
model/diff-n.html
model/diff.html 
--- a/model/diff-n.html	Tue May 15 12:02:15 2012 +0100
+++ b/model/diff-n.html	Tue May 15 12:04:26 2012 +0100
@@ -1004,7 +1004,7 @@
 from its constraints, and the notation used to illustrate it. The
 PROV-N release is synchronized with the release of the PROV-DM, PROV-O,
 PROV-PRIMER, and PROV-CONSTRAINTS documents.
-</p><p>This document was published by the <a href="http://www.w3.org/2011/prov/">Provenance Working Group</a> as <span class="delete">a First Public Working</span><span class="insert">an Editor's</span> Draft.<span class="delete"> This document is intended to become a </span><span class="delete">W3C</span><span class="delete"> Recommendation.</span> If you wish to make comments regarding this document, please send them to <a href="mailto:public-prov-wg@w3.org">public-prov-wg@w3.org</a> (<a href="mailto:public-prov-wg-request@w3.org?subject=subscribe">subscribe</a>, <a href="http://lists.w3.org/Archives/Public/public-prov-wg/">archives</a>). All feedback is welcome.</p><p>Publication as <span class="delete">a Working</span><span class="insert">an Editor's</span> Draft does not imply endorsement by the <acronym title="World Wide Web Consortium">W3C</acronym> Membership. This is a draft document and may be updated, replaced or obsoleted by other documents at any time. It is inappropriate to cite this document as other than work in progress.</p><p>This document was produced by a group operating under the <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5 February 2004 <acronym title="World Wide Web Consortium">W3C</acronym> Patent Policy</a>. <acronym title="World Wide Web Consortium">W3C</acronym> maintains a <a href="http://www.w3.org/2004/01/pp-impl/46974/status" rel="disclosure">public list of any patent disclosures</a> made in connection with the deliverables of the group; that page also includes instructions for disclosing a patent. An individual who has actual knowledge of a patent which the individual believes contains <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/#def-essential">Essential Claim(s)</a> must disclose the information in accordance with <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/#sec-Disclosure">section 6 of the <acronym title="World Wide Web Consortium">W3C</acronym> Patent Policy</a>.</p></div><div id="toc" class="section"><h2 class="introductory">Table of Contents</h2><ul class="toc"><li class="tocline"><a href="#introduction" class="tocxref"><span class="secno">1. </span>Introduction</a><ul class="toc"><li class="tocline"><a href="#purpose" class="tocxref"><span class="secno">1.1 </span>Purpose of this Document and target audience</a></li><li class="tocline"><a href="#structure-of-this-document" class="tocxref"><span class="secno">1.2 </span>Structure of this Document</a></li><li class="tocline"><a href="#prov-dm-namespace" class="tocxref"><span class="secno">1.3 </span>Notational Conventions</a></li></ul></li><li class="tocline"><a href="#general-conventions" class="tocxref"><span class="secno">2. </span>General grammar considerations</a><ul class="toc"><li class="tocline"><a href="#functional-syntax" class="tocxref"><span class="secno">2.1 </span>Functional-style Syntax</a></li><li class="tocline"><a href="#grammar-notation" class="tocxref"><span class="secno">2.2 </span>EBNF Grammar</a></li><li class="tocline"><a href="#prov-n-optionals" class="tocxref"><span class="secno">2.3 </span>Optional terms in expressions</a></li><li class="tocline"><a href="#prov-n-standard-terms" class="tocxref"><span class="secno">2.4 </span>Identifiers and attributes</a></li></ul></li><li class="tocline"><a href="#prov-n-expressions" class="tocxref"><span class="secno">3. </span>PROV-N Productions per Component</a><ul class="toc"><li class="tocline"><a href="#component1" class="tocxref"><span class="secno">3.1 </span>Component 1: Entities and Activities</a><ul class="toc"><li class="tocline"><a href="#expression-Entity" class="tocxref"><span class="secno">3.1.1 </span>Entity</a></li><li class="tocline"><a href="#expression-Activity" class="tocxref"><span class="secno">3.1.2 </span>Activity</a></li><li class="tocline"><a href="#expression-Generation" class="tocxref"><span class="secno">3.1.3 </span>Generation</a></li><li class="tocline"><a href="#expression-Usage" class="tocxref"><span class="secno">3.1.4 </span>Usage</a></li><li class="tocline"><a href="#expression-Start" class="tocxref"><span class="secno">3.1.5 </span>Start</a></li><li class="tocline"><a href="#expression-End" class="tocxref"><span class="secno">3.1.6 </span>End</a></li><li class="tocline"><a href="#expression-Invalidation" class="tocxref"><span class="secno">3.1.7 </span>Invalidation</a></li><li class="tocline"><a href="#expression-wasInformedBy" class="tocxref"><span class="secno">3.1.8 </span>Communication<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: Agents and Responsibility</a><ul class="toc"><li class="tocline"><a href="#expression-Agent" class="tocxref"><span class="secno">3.2.1 </span>Agent</a></li><li class="tocline"><a href="#expression-attribution" class="tocxref"><span class="secno">3.2.2 </span>Attribution</a></li><li class="tocline"><a href="#expression-Association" class="tocxref"><span class="secno">3.2.3 </span>Association</a></li><li class="tocline"><a href="#expression-responsibility" class="tocxref"><span class="secno">3.2.4 </span>Responsibility</a></li></ul></li><li class="tocline"><a href="#component3" class="tocxref"><span class="secno">3.3 </span>Component 3: Derivations</a><ul class="toc"><li class="tocline"><a href="#Derivation-Relation" class="tocxref"><span class="secno">3.3.1 </span>Derivation</a></li><li class="tocline"><a href="#expression-Revision" class="tocxref"><span class="secno">3.3.2 </span>Revision</a></li><li class="tocline"><a href="#expression-quotation" class="tocxref"><span class="secno">3.3.3 </span>Quotation</a></li><li class="tocline"><a href="#expression-original-source" class="tocxref"><span class="secno">3.3.4 </span>Original Source</a></li><li class="tocline"><a href="#expression-trace" class="tocxref"><span class="secno">3.3.5 </span>Trace</a></li></ul></li><li class="tocline"><a href="#component4" class="tocxref"><span class="secno">3.4 </span>Component 4: Alternate Entities</a><ul class="toc"><li class="tocline"><a href="#expression-alternate" class="tocxref"><span class="secno">3.4.1 </span>Alternate</a></li><li class="tocline"><a href="#expression-specialization" class="tocxref"><span class="secno">3.4.2 </span>Specialization</a></li></ul></li><li class="tocline"><a href="#component5" class="tocxref"><span class="secno">3.5 </span>Component 5: Collections</a><ul class="toc"><li class="tocline"><a href="#expression-collection-insertion" class="tocxref"><span class="secno">3.5.1 </span>Insertion</a></li><li class="tocline"><a href="#expression-collection-removal" class="tocxref"><span class="secno">3.5.2 </span>Removal</a></li><li class="tocline"><a href="#expression-collection-membership" class="tocxref"><span class="secno">3.5.3 </span>Membership</a></li></ul></li><li class="tocline"><a href="#component6" class="tocxref"><span class="secno">3.6 </span>Component 6: Annotations</a><ul class="toc"><li class="tocline"><a href="#expression-note" class="tocxref"><span class="secno">3.6.1 </span>Note</a></li><li class="tocline"><a href="#expression-annotation" class="tocxref"><span class="secno">3.6.2 </span>Annotation</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="#ExpressionContainer" class="tocxref"><span class="secno">4. </span>Expression Container</a></li><li class="tocline"><a href="#account" class="tocxref"><span class="secno">5. </span>Account</a></li><li class="tocline"><a href="#media-type" class="tocxref"><span class="secno">6. </span>Media Type</a></li><li class="tocline"><a href="#acknowledgements" class="tocxref"><span class="secno">A. </span>Acknowledgements</a></li><li class="tocline"><a href="#references" class="tocxref"><span class="secno">B. </span>References</a><ul class="toc"><li class="tocline"><a href="#normative-references" class="tocxref"><span class="secno">B.1 </span>Normative references</a></li><li class="tocline"><a href="#informative-references" class="tocxref"><span class="secno">B.2 </span>Informative references</a></li></ul></li></ul></div> 
+</p><p>This document was published by the <a href="http://www.w3.org/2011/prov/">Provenance Working Group</a> as <span class="delete">a First Public Working</span><span class="insert">an Editor's</span> Draft.<span class="delete"> This document is intended to become a </span><span class="delete">W3C</span><span class="delete"> Recommendation.</span> If you wish to make comments regarding this document, please send them to <a href="mailto:public-prov-wg@w3.org">public-prov-wg@w3.org</a> (<a href="mailto:public-prov-wg-request@w3.org?subject=subscribe">subscribe</a>, <a href="http://lists.w3.org/Archives/Public/public-prov-wg/">archives</a>). All feedback is welcome.</p><p>Publication as <span class="delete">a Working</span><span class="insert">an Editor's</span> Draft does not imply endorsement by the <acronym title="World Wide Web Consortium">W3C</acronym> Membership. This is a draft document and may be updated, replaced or obsoleted by other documents at any time. It is inappropriate to cite this document as other than work in progress.</p><p>This document was produced by a group operating under the <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5 February 2004 <acronym title="World Wide Web Consortium">W3C</acronym> Patent Policy</a>. <acronym title="World Wide Web Consortium">W3C</acronym> maintains a <a href="http://www.w3.org/2004/01/pp-impl/46974/status" rel="disclosure">public list of any patent disclosures</a> made in connection with the deliverables of the group; that page also includes instructions for disclosing a patent. An individual who has actual knowledge of a patent which the individual believes contains <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/#def-essential">Essential Claim(s)</a> must disclose the information in accordance with <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/#sec-Disclosure">section 6 of the <acronym title="World Wide Web Consortium">W3C</acronym> Patent Policy</a>.</p></div><div id="toc" class="section"><h2 class="introductory">Table of Contents</h2><ul class="toc"><li class="tocline"><a href="#introduction" class="tocxref"><span class="secno">1. </span>Introduction</a><ul class="toc"><li class="tocline"><a href="#purpose" class="tocxref"><span class="secno">1.1 </span>Purpose of this Document and target audience</a></li><li class="tocline"><a href="#structure-of-this-document" class="tocxref"><span class="secno">1.2 </span>Structure of this Document</a></li><li class="tocline"><a href="#prov-dm-namespace" class="tocxref"><span class="secno">1.3 </span>Notational Conventions</a></li></ul></li><li class="tocline"><a href="#general-conventions" class="tocxref"><span class="secno">2. </span>General grammar considerations</a><ul class="toc"><li class="tocline"><a href="#functional-syntax" class="tocxref"><span class="secno">2.1 </span>Functional-style Syntax</a></li><li class="tocline"><a href="#grammar-notation" class="tocxref"><span class="secno">2.2 </span>EBNF Grammar</a></li><li class="tocline"><a href="#prov-n-optionals" class="tocxref"><span class="secno">2.3 </span>Optional terms in expressions</a></li><li class="tocline"><a href="#prov-n-standard-terms" class="tocxref"><span class="secno">2.4 </span>Identifiers and attributes</a></li></ul></li><li class="tocline"><a href="#prov-n-expressions" class="tocxref"><span class="secno">3. </span>PROV-N Productions per Component</a><ul class="toc"><li class="tocline"><a href="#component1" class="tocxref"><span class="secno">3.1 </span>Component 1: Entities and Activities</a><ul class="toc"><li class="tocline"><a href="#expression-Entity" class="tocxref"><span class="secno">3.1.1 </span>Entity</a></li><li class="tocline"><a href="#expression-Activity" class="tocxref"><span class="secno">3.1.2 </span>Activity</a></li><li class="tocline"><a href="#expression-Generation" class="tocxref"><span class="secno">3.1.3 </span>Generation</a></li><li class="tocline"><a href="#expression-Usage" class="tocxref"><span class="secno">3.1.4 </span>Usage</a></li><li class="tocline"><a href="#expression-Start" class="tocxref"><span class="secno">3.1.5 </span>Start</a></li><li class="tocline"><a href="#expression-End" class="tocxref"><span class="secno">3.1.6 </span>End</a></li><li class="tocline"><a href="#expression-Invalidation" class="tocxref"><span class="secno">3.1.7 </span>Invalidation</a></li><li class="tocline"><a href="#expression-wasInformedBy" class="tocxref"><span class="secno">3.1.8 </span>Communication</a></li><span class="delete">3.1.9 </span><span class="delete">Start by Activity</span></ul></li><li class="tocline"><a href="#component2" class="tocxref"><span class="secno">3.2 </span>Component 2: Agents and Responsibility</a><ul class="toc"><li class="tocline"><a href="#expression-Agent" class="tocxref"><span class="secno">3.2.1 </span>Agent</a></li><li class="tocline"><a href="#expression-attribution" class="tocxref"><span class="secno">3.2.2 </span>Attribution</a></li><li class="tocline"><a href="#expression-Association" class="tocxref"><span class="secno">3.2.3 </span>Association</a></li><li class="tocline"><a href="#expression-responsibility" class="tocxref"><span class="secno">3.2.4 </span>Responsibility</a></li></ul></li><li class="tocline"><a href="#component3" class="tocxref"><span class="secno">3.3 </span>Component 3: Derivations</a><ul class="toc"><li class="tocline"><a href="#Derivation-Relation" class="tocxref"><span class="secno">3.3.1 </span>Derivation</a></li><li class="tocline"><a href="#expression-Revision" class="tocxref"><span class="secno">3.3.2 </span>Revision</a></li><li class="tocline"><a href="#expression-quotation" class="tocxref"><span class="secno">3.3.3 </span>Quotation</a></li><li class="tocline"><a href="#expression-original-source" class="tocxref"><span class="secno">3.3.4 </span>Original Source</a></li><li class="tocline"><a href="#expression-trace" class="tocxref"><span class="secno">3.3.5 </span>Trace</a></li></ul></li><li class="tocline"><a href="#component4" class="tocxref"><span class="secno">3.4 </span>Component 4: Alternate Entities</a><ul class="toc"><li class="tocline"><a href="#expression-alternate" class="tocxref"><span class="secno">3.4.1 </span>Alternate</a></li><li class="tocline"><a href="#expression-specialization" class="tocxref"><span class="secno">3.4.2 </span>Specialization</a></li></ul></li><li class="tocline"><a href="#component5" class="tocxref"><span class="secno">3.5 </span>Component 5: Collections</a><ul class="toc"><li class="tocline"><a href="#expression-collection-insertion" class="tocxref"><span class="secno">3.5.1 </span>Insertion</a></li><li class="tocline"><a href="#expression-collection-removal" class="tocxref"><span class="secno">3.5.2 </span>Removal</a></li><li class="tocline"><a href="#expression-collection-membership" class="tocxref"><span class="secno">3.5.3 </span>Membership</a></li></ul></li><li class="tocline"><a href="#component6" class="tocxref"><span class="secno">3.6 </span>Component 6: <span class="insert">Bundles</span></a><ul class="toc"><li class="tocline"><a href="#expression-bundle-declaration" class="tocxref"><span class="secno"><span class="insert">3.6.1 </span></span><span class="insert">Bundle Declaration</span></a></li><li class="tocline"><a href="#expression-bundle-description" class="tocxref"><span class="secno"><span class="insert">3.6.2 </span></span><span class="insert">Bundle Description</span></a></li><li class="tocline"><a href="#expression-provenance-locator" class="tocxref"><span class="secno"><span class="insert">3.6.3 </span></span><span class="insert">Provenance Locator</span></a></li></ul></li><li class="tocline"><a href="#component6" class="tocxref"><span class="secno"><span class="insert">3.7 </span></span><span class="insert">Component 6: </span>Annotations<span class="insert"> (OBSOLETE, TO DISAPPEAR)</span></a><ul class="toc"><li class="tocline"><a href="#expression-note" class="tocxref"><span class="secno"><span class="delete">3.6.1</span><span class="insert">3.7.1</span> </span>Note</a></li><li class="tocline"><a href="#expression-annotation" class="tocxref"><span class="secno"><span class="delete">3.6.2</span><span class="insert">3.7.2</span> </span>Annotation</a></li></ul></li><li class="tocline"><a href="#subexpressions" class="tocxref"><span class="secno"><span class="delete">3.7</span><span class="insert">3.8</span> </span>Further Expressions</a><ul class="toc"><li class="tocline"><a href="#expression-NamespaceDeclaration" class="tocxref"><span class="secno"><span class="delete">3.7.1</span><span class="insert">3.8.1</span> </span>Namespace Declaration</a></li><li class="tocline"><a href="#expression-identifier" class="tocxref"><span class="secno"><span class="delete">3.7.2</span><span class="insert">3.8.2</span> </span>Identifier</a></li><li class="tocline"><a href="#expression-attribute" class="tocxref"><span class="secno"><span class="delete">3.7.3</span><span class="insert">3.8.3</span> </span>Attribute</a></li><li class="tocline"><a href="#expression-literal" class="tocxref"><span class="secno"><span class="delete">3.7.4</span><span class="insert">3.8.4</span> </span>Literal</a><ul class="toc"><li class="tocline"><a href="#expression-types" class="tocxref"><span class="secno"><span class="delete">3.7.4.1</span><span class="insert">3.8.4.1</span> </span>Reserved Type Values</a></li><li class="tocline"><a href="#expression-Time" class="tocxref"><span class="secno"><span class="delete">3.7.4.2</span><span class="insert">3.8.4.2</span> </span>Time Values</a></li></ul></li></ul></li></ul></li><li class="tocline"><a href="#ExpressionContainer" class="tocxref"><span class="secno">4. </span>Expression Container</a></li><li class="tocline"><a href="#account" class="tocxref"><span class="secno">5. </span>Account</a></li><li class="tocline"><a href="#media-type" class="tocxref"><span class="secno">6. </span>Media Type</a></li><li class="tocline"><a href="#acknowledgements" class="tocxref"><span class="secno">A. </span>Acknowledgements</a></li><li class="tocline"><a href="#references" class="tocxref"><span class="secno">B. </span>References</a><ul class="toc"><li class="tocline"><a href="#normative-references" class="tocxref"><span class="secno">B.1 </span>Normative references</a></li><li class="tocline"><a href="#informative-references" class="tocxref"><span class="secno">B.2 </span>Informative references</a></li></ul></li></ul></div> 
 
 
 
@@ -1199,8 +1199,8 @@
 
 
 
-<div>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-expression" name="prod-expression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">2</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">expression 
+<table class="grammar">
+<tbody class="grammar-ref" data-ref="prod-expression"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-expression" name="prod-expression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">2</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">expression 
 <span class="delete">&nbsp;::=</span>
 
 </code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-entityExpression">entityExpression 
@@ -1230,9 +1230,7 @@
 
 &nbsp;&nbsp;| </span><span class="delete">alternateExpression</span> 
 <span class="prod"><a class="grammarRef" href="#prod-specializationExpression"><span class="insert">specializationExpression</span></a></span> | <span class="delete">specializationExpression</span>
-<span class="prod"><a class="grammarRef" href="#prod-insertionExpression"><span class="insert">insertionExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-removalExpression"><span class="insert">removalExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-membershipExpression"><span class="insert">membershipExpression</span></a></span><span class="insert"> )</span></code></td> </tr> </tbody>
-</div><table class="grammar">
-
+<span class="prod"><a class="grammarRef" href="#prod-insertionExpression"><span class="insert">insertionExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-removalExpression"><span class="insert">removalExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-membershipExpression"><span class="insert">membershipExpression</span></a></span><span class="insert"> )</span></code></td> </tr> </tbody></tbody>
 </table>
 
 
@@ -1292,7 +1290,7 @@
 <div id="prov-n-standard-terms" class="section"> 
 <h3><span class="secno">2.4 </span>Identifiers and attributes</h3>
 
-<p>Most expressions defined in the grammar include the use of two terms: an identifier for the predicate, and a set of attribute-value pairs, delimited by square brackets. Both are optional (unless specified otherwise). By convention, the identifier is the first term in any expression, <span class="insert">followed by a semi-colon ';' </span>and the  set of attribute-value pairs is the last. </p><span class="delete">
+<p>Most expressions defined in the grammar include the use of two terms: an identifier for the predicate, and a set of attribute-value pairs, delimited by square brackets. <span class="delete">Both</span><span class="insert">Identifiers</span> are optional <span class="delete">(unless specified otherwise).</span><span class="insert">except for Entities, Activites, and Agents. Identifiers are always the first term in any expression.</span> By convention, <span class="delete">the</span><span class="insert">optional identifiers are separated using a semi-colon ';'. This makes it possible to completely omit an optional</span> identifier <span class="insert">with no ambiguity arising. Also, the  set of attribute-value pairs </span>is <span class="delete">the first</span><span class="insert">always the last</span> term in any <span class="delete">expression, and the  set of attribute-value pairs is the last.</span><span class="insert">expression.</span> </p><span class="delete">
 Consistent with the convention on optional terms, the  '</span><span class="delete">-</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.</span>
 
 <div class="anexample">
@@ -1303,9 +1301,15 @@
 </pre>
 </div>
 
-A distinction is made between expressions with no attributes, and expressions that include an empty list of attributes.
+<span class="delete">A distinction is made between expressions with no attributes, and expressions that include</span><span class="insert">Lack of attributes can be equivalently expressed by omitting the list, or by using</span> an empty list<span class="delete"> of attributes.
+</span>
+
+
+
 <div class="anexample">
-<p>The first activity does not have any attributes. The second has an empty list of attributes. The third activity  has two attributes. 
+<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. 
 </p><pre class="codeexample">activity(ex:a10)
 activity(ex:a10, [])
 activity(ex:a10, [ex:param1="a", ex:param2="b"])
@@ -1332,13 +1336,11 @@
 
 
 
-</p><div>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-entityExpression" name="prod-entityExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">3</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">entityExpression</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"entity" "(" </span><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</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-optionalAttributeValuePairs" name="prod-optionalAttributeValuePairs"></a><span class="insert">[</span><span class="prodNo"><span class="insert">4</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">optionalAttributeValuePairs</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">( "," "[" </span><span class="prod"><a class="grammarRef" href="#prod-attributeValuePairs"><span class="insert">attributeValuePairs</span></a></span><span class="insert"> "]" )?</span></code></td> </tr> </tbody>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-attributeValuePairs" name="prod-attributeValuePairs"></a><span class="insert">[</span><span class="prodNo"><span class="insert">5</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">attributeValuePairs</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">(  | </span><span class="prod"><a class="grammarRef" href="#prod-attributeValuePair"><span class="insert">attributeValuePair</span></a></span><span class="insert"> ( "," </span><span class="prod"><a class="grammarRef" href="#prod-attributeValuePair"><span class="insert">attributeValuePair</span></a></span><span class="insert"> )* )</span></code></td> </tr> </tbody>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-attributeValuePair" name="prod-attributeValuePair"></a><span class="insert">[</span><span class="prodNo"><span class="insert">6</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">attributeValuePair</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-attribute"><span class="insert">attribute</span></a></span><span class="insert"> "=" </span><span class="prod"><a class="grammarRef" href="#prod-literal"><span class="insert">literal</span></a></span></code></td> </tr> </tbody>
-</div><table class="grammar">
-
+</p><table class="grammar">
+<tbody class="grammar-ref" data-ref="prod-entityExpression"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-entityExpression" name="prod-entityExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">3</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">entityExpression</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"entity" "(" </span><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs"><span class="insert">optionalAttributeValuePairs</span></a></span><span class="insert"> ")"</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-optionalAttributeValuePairs"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-optionalAttributeValuePairs" name="prod-optionalAttributeValuePairs"></a><span class="insert">[</span><span class="prodNo"><span class="insert">4</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">optionalAttributeValuePairs</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">( "," "[" </span><span class="prod"><a class="grammarRef" href="#prod-attributeValuePairs"><span class="insert">attributeValuePairs</span></a></span><span class="insert"> "]" )?</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-attributeValuePairs"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-attributeValuePairs" name="prod-attributeValuePairs"></a><span class="insert">[</span><span class="prodNo"><span class="insert">5</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">attributeValuePairs</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">(  | </span><span class="prod"><a class="grammarRef" href="#prod-attributeValuePair"><span class="insert">attributeValuePair</span></a></span><span class="insert"> ( "," </span><span class="prod"><a class="grammarRef" href="#prod-attributeValuePair"><span class="insert">attributeValuePair</span></a></span><span class="insert"> )* )</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-attributeValuePair"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-attributeValuePair" name="prod-attributeValuePair"></a><span class="insert">[</span><span class="prodNo"><span class="insert">6</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">attributeValuePair</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-attribute"><span class="insert">attribute</span></a></span><span class="insert"> "=" </span><span class="prod"><a class="grammarRef" href="#prod-literal"><span class="insert">literal</span></a></span></code></td> </tr> </tbody></tbody>
 </table>
 
 
@@ -1389,20 +1391,20 @@
 
 
 
-<div>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-activityExpression" name="prod-activityExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">7</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">activityExpression<span class="delete">&nbsp;::=  
+<table class="grammar">
+
+<tbody class="grammar-ref" data-ref="prod-activityExpression"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-activityExpression" name="prod-activityExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">7</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">activityExpression<span class="delete">&nbsp;::=  
 </span><span class="delete">activity</span>
 </code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"activity" "(" </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="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-timeOrMarker"><span class="insert">timeOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-timeOrMarker"><span class="insert">timeOrMarker</span></a></span><span class="insert"> )? </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-timeOrMarker" name="prod-timeOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">8</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">timeOrMarker</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-time">time</a></span> | <span class="delete">-</span><span class="insert">"-"</span> )
+<span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-timeOrMarker"><span class="insert">timeOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-timeOrMarker"><span class="insert">timeOrMarker</span></a></span><span class="insert"> )? </span><span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs"><span class="insert">optionalAttributeValuePairs</span></a></span><span class="insert"> ")"</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-timeOrMarker"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-timeOrMarker" name="prod-timeOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">8</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">timeOrMarker</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-time">time</a></span> | <span class="delete">-</span><span class="insert">"-"</span> )
 <span class="delete">,</span><span class="delete">
 (</span><span class="delete">time</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> )</span>
 <span class="delete">optional-attribute-values</span>
-<span class="delete">)</span></code></td> </tr> </tbody>
-</div><table class="grammar">
-
+<span class="delete">)</span>
+</code></td> </tr> </tbody></tbody>
 </table>
 
 
@@ -1434,21 +1436,22 @@
 
 
 
-<div>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-generationExpression" name="prod-generationExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">9</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">generationExpression<span class="delete">&nbsp;::=  
+<table class="grammar">
+
+<tbody class="grammar-ref" data-ref="prod-generationExpression"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-generationExpression" name="prod-generationExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">9</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">generationExpression<span class="delete">&nbsp;::=  
 </span><span class="delete">wasGeneratedBy</span>
 </code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"wasGeneratedBy" "(" </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-eIdentifier"><span class="insert">eIdentifier</span></a></span> (
-<span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-aIdentifierOrMarker"><span class="insert">aIdentifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-timeOrMarker"><span class="insert">timeOrMarker</span></a></span><span class="insert"> )? </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-optionalIdentifier" name="prod-optionalIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">10</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">optionalIdentifier</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-identifierOrMarker"><span class="insert">identifierOrMarker</span></a></span><span class="insert"> ";" )?</span></code></td> </tr> </tbody>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-identifierOrMarker" name="prod-identifierOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">11</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">identifierOrMarker</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-identifier">identifier</a></span> | <span class="delete">-</span><span class="insert">"-"</span> ) <span class="delete">,</span> 
+<span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-aIdentifierOrMarker"><span class="insert">aIdentifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-timeOrMarker"><span class="insert">timeOrMarker</span></a></span><span class="insert"> )? </span><span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs"><span class="insert">optionalAttributeValuePairs</span></a></span><span class="insert"> ")"</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-optionalIdentifier"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-optionalIdentifier" name="prod-optionalIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">10</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">optionalIdentifier</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-identifierOrMarker"><span class="insert">identifierOrMarker</span></a></span><span class="insert"> ";" )?</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-identifierOrMarker"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-identifierOrMarker" name="prod-identifierOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">11</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">identifierOrMarker</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-identifier">identifier</a></span> | <span class="delete">-</span><span class="insert">"-"</span> ) <span class="delete">,</span> 
 <span class="delete">eIdentifier</span>
 <span class="delete">,</span><span class="delete">
 ( </span><span class="delete">aIdentifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> )
 </span><span class="delete">,</span><span class="delete"> ( </span><span class="delete">time</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> )
 </span><span class="delete">optional-attribute-values</span>
-<span class="delete">)</span></code></td> </tr> </tbody>
-</div>
-<table class="grammar">
+<span class="delete">)</span>
+
+</code></td> </tr> </tbody></tbody>
 
 </table>
 
@@ -1500,10 +1503,9 @@
 
 
 
-<div>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-usageExpression" name="prod-usageExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">12</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">usageExpression</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"used" "(" </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-aIdentifier"><span class="insert">aIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-eIdentifier"><span class="insert">eIdentifier</span></a></span><span class="insert"> ( "," </span><span class="prod"><a class="grammarRef" href="#prod-timeOrMarker"><span class="insert">timeOrMarker</span></a></span><span class="insert"> )? </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>
-</div><table class="grammar">
-
+<table class="grammar">
+
+<tbody class="grammar-ref" data-ref="prod-usageExpression"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-usageExpression" name="prod-usageExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">12</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">usageExpression</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"used" "(" </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-aIdentifier"><span class="insert">aIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-eIdentifier"><span class="insert">eIdentifier</span></a></span><span class="insert"> ( "," </span><span class="prod"><a class="grammarRef" href="#prod-timeOrMarker"><span class="insert">timeOrMarker</span></a></span><span class="insert"> )? </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>
 </table>
 
 <div class="note"><span class="insert">should this: 	usageExpression	   ::=   	"used" "(" optionalIdentifier aIdentifier "," eIdentifier ( "," timeOrMarker )? optionalAttributeValuePairs ")"  </span><br><span class="insert">
@@ -1541,8 +1543,8 @@
 
 
 
-<div>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-startExpression" name="prod-startExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">13</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">startExpression<span class="delete">&nbsp;::= 
+<table class="grammar">
+<tbody class="grammar-ref" data-ref="prod-startExpression"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-startExpression" name="prod-startExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">13</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">startExpression<span class="delete">&nbsp;::= 
 </span><span class="delete">wasStartedBy</span>
 </code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"wasStartedBy" "(" </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-aIdentifier"><span class="insert">aIdentifier</span></a></span> (
 <span class="delete">( </span><span class="delete">identifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> ) </span><span class="delete">,</span> 
@@ -1551,11 +1553,10 @@
 ( </span><span class="delete">eIdentifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> )
 </span><span class="delete">,</span><span class="delete"> ( </span><span class="delete">time</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> )
 </span><span class="delete">optional-attribute-values</span>
-<span class="delete">)</span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-eIdentifierOrMarker"><span class="insert">eIdentifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-aIdentifierOrMarker"><span class="insert">aIdentifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-timeOrMarker"><span class="insert">timeOrMarker</span></a></span><span class="insert"> )? </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>
-</div>
-
-<table class="grammar">
-
+<span class="delete">)</span>
+
+
+<span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-eIdentifierOrMarker"><span class="insert">eIdentifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-aIdentifierOrMarker"><span class="insert">aIdentifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-timeOrMarker"><span class="insert">timeOrMarker</span></a></span><span class="insert"> )? </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>
 </table>
 
 
@@ -1594,8 +1595,8 @@
 
 
 
-<div>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-endExpression" name="prod-endExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">14</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">endExpression<span class="delete">&nbsp;::= 
+<table class="grammar">
+<tbody class="grammar-ref" data-ref="prod-endExpression"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-endExpression" name="prod-endExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">14</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">endExpression<span class="delete">&nbsp;::= 
 </span><span class="delete">wasEndedBy</span>
 </code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"wasEndedBy" "(" </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-aIdentifier"><span class="insert">aIdentifier</span></a></span> (
 <span class="delete">( </span><span class="delete">identifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> ) </span><span class="delete">,</span> 
@@ -1604,11 +1605,10 @@
 ( </span><span class="delete">eIdentifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> )
 </span><span class="delete">,</span><span class="delete"> ( </span><span class="delete">time</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> )
 </span><span class="delete">optional-attribute-values</span>
-<span class="delete">)</span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-eIdentifierOrMarker"><span class="insert">eIdentifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-aIdentifierOrMarker"><span class="insert">aIdentifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-timeOrMarker"><span class="insert">timeOrMarker</span></a></span><span class="insert"> )? </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>
-</div>
-
-<table class="grammar">
-
+<span class="delete">)</span>
+
+
+<span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-eIdentifierOrMarker"><span class="insert">eIdentifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-aIdentifierOrMarker"><span class="insert">aIdentifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-timeOrMarker"><span class="insert">timeOrMarker</span></a></span><span class="insert"> )? </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>
 </table>
 
 
@@ -1650,8 +1650,9 @@
 
 
 
-<div>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-invalidationExpression" name="prod-invalidationExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">15</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">invalidationExpression<span class="delete">&nbsp;::=  
+<table class="grammar">
+
+<tbody class="grammar-ref" data-ref="prod-invalidationExpression"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-invalidationExpression" name="prod-invalidationExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">15</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">invalidationExpression<span class="delete">&nbsp;::=  
 </span><span class="delete">wasInvalidatedBy</span>
 </code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"wasInvalidatedBy" "(" </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-eIdentifier"><span class="insert">eIdentifier</span></a></span> (
 <span class="delete">( </span><span class="delete">identifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> ) </span><span class="delete">,</span> 
@@ -1660,12 +1661,11 @@
 ( </span><span class="delete">aIdentifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> )
 </span><span class="delete">,</span><span class="delete"> ( </span><span class="delete">time</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> )
 </span><span class="delete">optional-attribute-values</span>
-<span class="delete">)</span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-aIdentifierOrMarker"><span class="insert">aIdentifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-timeOrMarker"><span class="insert">timeOrMarker</span></a></span><span class="insert"> )? </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>
-</div>
-
-
-<table class="grammar">
-
+<span class="delete">)</span>
+
+
+
+<span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-aIdentifierOrMarker"><span class="insert">aIdentifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-timeOrMarker"><span class="insert">timeOrMarker</span></a></span><span class="insert"> )? </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>
 </table>
 
 
@@ -1702,8 +1702,9 @@
 
 
 
-<div>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-communicationExpression" name="prod-communicationExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">16</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">communicationExpression<span class="delete"> &nbsp;::= 
+<table class="grammar">
+
+<tbody class="grammar-ref" data-ref="prod-communicationExpression"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-communicationExpression" name="prod-communicationExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">16</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">communicationExpression<span class="delete"> &nbsp;::= 
 </span><span class="delete">wasInformedBy</span>
 <span class="delete">(</span>
 <span class="delete">( </span><span class="delete">identifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> ) </span><span class="delete">,</span> 
@@ -1711,10 +1712,10 @@
 <span class="delete">,</span>
 </a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier
 <span class="delete">optional-attribute-values</span>
-<span class="delete">)</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>
-</div>
-
-<table class="grammar">
+<span class="delete">)</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>
 
 </table>
 
@@ -1786,14 +1787,15 @@
 
 
 
-<div>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-agentExpression" name="prod-agentExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">17</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">agentExpression<span class="delete">&nbsp;::= 
+<table class="grammar">
+
+<tbody class="grammar-ref" data-ref="prod-agentExpression"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-agentExpression" name="prod-agentExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">17</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">agentExpression<span class="delete">&nbsp;::= 
 </span><span class="delete">agent</span>
 <span class="delete">(</span>
 </code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"agent" "(" </span><span class="prod"><a class="grammarRef" href="#prod-identifier">identifier
 <span class="delete">optional-attribute-values</span>
-<span class="delete">)</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>
-</div><table class="grammar">
+<span class="delete">)</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>
 
 </table>
 
@@ -1820,8 +1822,9 @@
 
 
 
-<div>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-attributionExpression" name="prod-attributionExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">18</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">attributionExpression<span class="delete">&nbsp;::=  
+<table class="grammar">
+
+<tbody class="grammar-ref" data-ref="prod-attributionExpression"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-attributionExpression" name="prod-attributionExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">18</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">attributionExpression<span class="delete">&nbsp;::=  
 </span><span class="delete">wasAttributedTo</span> 
 <span class="delete">(</span> 
 <span class="delete">( </span><span class="delete">identifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> ) </span><span class="delete">,</span> 
@@ -1830,10 +1833,9 @@
 </a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-agIdentifier">agIdentifier
 <span class="delete">optional-attribute-values</span>
 <span class="delete">)</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>
-</div>
-
-<table class="grammar">
+
+
+</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>
 
 </table>
 
@@ -1864,8 +1866,9 @@
 
 
 
-<div>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-associationExpression" name="prod-associationExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">19</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">associationExpression<span class="delete">&nbsp;::= 
+<table class="grammar">
+
+<tbody class="grammar-ref" data-ref="prod-associationExpression"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-associationExpression" name="prod-associationExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">19</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">associationExpression<span class="delete">&nbsp;::= 
 </span><span class="delete">wasAssociatedWith</span>
 </code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"wasAssociatedWith" "(" </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-aIdentifier"><span class="insert">aIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-agIdentifierOrMarker"><span class="insert">agIdentifierOrMarker</span></a></span> (
 <span class="delete">( </span><span class="delete">identifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> ) </span><span class="delete">,</span> 
@@ -1875,12 +1878,12 @@
 </span><span class="delete">,</span><span class="delete"> 
 ( </span><span class="delete">eIdentifier</span><span class="delete">  | </span><span class="delete">-</span><span class="delete"> )
 </span><span class="delete">optional-attribute-values</span>
-<span class="delete">)</span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-eIdentifierOrMarker"><span class="insert">eIdentifierOrMarker</span></a></span><span class="insert"> )? </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>
-</div>
-
-
-
-<table class="grammar">
+<span class="delete">)</span>
+
+
+
+
+<span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-eIdentifierOrMarker"><span class="insert">eIdentifierOrMarker</span></a></span><span class="insert"> )? </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>
 
 </table>
 
@@ -1922,8 +1925,9 @@
 
 
 
-<div>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-responsibilityExpression" name="prod-responsibilityExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">20</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">responsibilityExpression<span class="delete">&nbsp;::= 
+<table class="grammar">
+
+<tbody class="grammar-ref" data-ref="prod-responsibilityExpression"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-responsibilityExpression" name="prod-responsibilityExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">20</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">responsibilityExpression<span class="delete">&nbsp;::= 
 </span><span class="delete">actedOnBehalfOf</span>
 </code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"actedOnBehalfOf" "(" </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-agIdentifier"><span class="insert">agIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-agIdentifier"><span class="insert">agIdentifier</span></a></span> (
 <span class="delete">( </span><span class="delete">identifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> ) </span><span class="delete">,</span> 
@@ -1933,8 +1937,8 @@
 <span class="delete">,</span><span class="delete">
 ( </span><span class="delete">aIdentifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> )
 </span><span class="delete">optional-attribute-values</span>
-<span class="delete">)</span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-aIdentifierOrMarker"><span class="insert">aIdentifierOrMarker</span></a></span><span class="insert"> )? </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>
-</div><table class="grammar">
+<span class="delete">)</span>
+<span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-aIdentifierOrMarker"><span class="insert">aIdentifierOrMarker</span></a></span><span class="insert"> )? </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>
 
 </table>
 
@@ -1970,32 +1974,33 @@
 <div id="Derivation-Relation" class="section">
 <h4><span class="secno">3.3.1 </span>Derivation</h4>
 
-<div class="grammar">
-<span class="nonterminal">derivationExpression</span>&nbsp;::= 
-<span class="name">wasDerivedFrom</span>
-<span class="name">(</span>
-<span class="optional">( <span class="nonterminal">identifier</span> | <span class="name">-</span> ) <span class="name">,</span> </span>
-<span class="nonterminal">eIdentifier</span>
-<span class="name">,</span>
-<span class="nonterminal">eIdentifier</span>
-<span class="optional">
-<span class="name">,</span>
-( <span class="nonterminal">aIdentifier</span> | <span class="name">-</span> )
-<span class="name">,</span>
-( <span class="nonterminal">gIdentifier</span> | <span class="name">-</span> )
-<span class="name">,</span>
-( <span class="nonterminal">uIdentifier</span> | <span class="name">-</span> )
+
+
+
+
+<table class="grammar">
+
+<tbody class="grammar-ref" data-ref="prod-derivationExpression"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-derivationExpression" name="prod-derivationExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">21</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">derivationExpression<span class="delete">&nbsp;::= 
+</span><span class="delete">wasDerivedFrom</span>
+</code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"wasDerivedFrom" "(" </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-eIdentifier"><span class="insert">eIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-eIdentifier"><span class="insert">eIdentifier</span></a></span> (
+<span class="delete">( </span><span class="delete">identifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> ) </span><span class="delete">,</span> 
+<span class="delete">eIdentifier</span>
+<span class="delete">,</span>
+<span class="delete">eIdentifier</span>
+
+<span class="delete">,</span><span class="delete">
+( </span><span class="delete">aIdentifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> )
+</span><span class="delete">,</span><span class="delete">
+( </span><span class="delete">gIdentifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> )
+</span><span class="delete">,</span><span class="delete">
+( </span><span class="delete">uIdentifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> )
 </span>
-<span class="nonterminal">optional-attribute-values</span>
-<span class="name">)</span>
-</div>
-
-
-
-
-<div>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-derivationExpression" name="prod-derivationExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">21</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">derivationExpression</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"wasDerivedFrom" "(" </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-eIdentifier"><span class="insert">eIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-eIdentifier"><span class="insert">eIdentifier</span></a></span><span class="insert"> ( "," </span><span class="prod"><a class="grammarRef" href="#prod-aIdentifierOrMarker"><span class="insert">aIdentifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-gIdentifierOrMarker"><span class="insert">gIdentifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-uIdentifierOrMarker"><span class="insert">uIdentifierOrMarker</span></a></span><span class="insert"> )? </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>
-</div><table class="grammar">
+<span class="delete">optional-attribute-values</span>
+<span class="delete">)</span>
+
+
+
+<span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-aIdentifierOrMarker"><span class="insert">aIdentifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-gIdentifierOrMarker"><span class="insert">gIdentifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-uIdentifierOrMarker"><span class="insert">uIdentifierOrMarker</span></a></span><span class="insert"> )? </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>
 
 </table>
 
@@ -2037,8 +2042,9 @@
 
 
 
-<div>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-revisionExpression" name="prod-revisionExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">22</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">revisionExpression<span class="delete">&nbsp;::= 
+<table class="grammar">
+
+<tbody class="grammar-ref" data-ref="prod-revisionExpression"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-revisionExpression" name="prod-revisionExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">22</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">revisionExpression<span class="delete">&nbsp;::= 
 </span><span class="delete">wasRevisionOf</span>
 </code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"wasRevisionOf" "(" </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-eIdentifier"><span class="insert">eIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-eIdentifier"><span class="insert">eIdentifier</span></a></span> (
 <span class="delete">( </span><span class="delete">identifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> ) </span><span class="delete">,</span> 
@@ -2048,8 +2054,8 @@
 <span class="delete">,</span><span class="delete">
 ( </span><span class="delete">agIdentifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> )
 </span><span class="delete">optional-attribute-values</span>
-<span class="delete">)</span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-aIdentifierOrMarker"><span class="insert">aIdentifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-gIdentifierOrMarker"><span class="insert">gIdentifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-uIdentifierOrMarker"><span class="insert">uIdentifierOrMarker</span></a></span><span class="insert"> )? </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>
-</div><table class="grammar">
+<span class="delete">)</span>
+<span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-aIdentifierOrMarker"><span class="insert">aIdentifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-gIdentifierOrMarker"><span class="insert">gIdentifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-uIdentifierOrMarker"><span class="insert">uIdentifierOrMarker</span></a></span><span class="insert"> )? </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>
 
 </table>
 
@@ -2090,8 +2096,9 @@
 
 
 
-<div>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-quotationExpression" name="prod-quotationExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">23</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">quotationExpression<span class="delete">&nbsp;::=  
+<table class="grammar">
+
+<tbody class="grammar-ref" data-ref="prod-quotationExpression"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-quotationExpression" name="prod-quotationExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">23</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">quotationExpression<span class="delete">&nbsp;::=  
 </span><span class="delete">wasQuotedFrom</span> 
 </code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"wasQuotedFrom" "(" </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-eIdentifier"><span class="insert">eIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-eIdentifier"><span class="insert">eIdentifier</span></a></span> ( 
 <span class="delete">( </span><span class="delete">identifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> ) </span><span class="delete">,</span> 
@@ -2106,11 +2113,10 @@
 </span>
 <span class="delete">optional-attribute-values</span>
 <span class="delete">)</span> 
-<span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-aIdentifierOrMarker"><span class="insert">aIdentifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-gIdentifierOrMarker"><span class="insert">gIdentifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-uIdentifierOrMarker"><span class="insert">uIdentifierOrMarker</span></a></span><span class="insert"> )? </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>
-</div>
-
-
-<table class="grammar">
+
+
+
+<span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-aIdentifierOrMarker"><span class="insert">aIdentifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-gIdentifierOrMarker"><span class="insert">gIdentifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-uIdentifierOrMarker"><span class="insert">uIdentifierOrMarker</span></a></span><span class="insert"> )? </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>
 
 </table>
 
@@ -2159,19 +2165,19 @@
 
 
 
-<div>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-hadOriginalSourceExpression" name="prod-hadOriginalSourceExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">24</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">hadOriginalSourceExpression</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"hadOriginalSource" "(" </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-eIdentifier"><span class="insert">eIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-eIdentifier"><span class="insert">eIdentifier</span></a></span> ( 
+<table class="grammar">
+
+<tbody class="grammar-ref" data-ref="prod-hadOriginalSourceExpression"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-hadOriginalSourceExpression" name="prod-hadOriginalSourceExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">24</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">hadOriginalSourceExpression</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"hadOriginalSource" "(" </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-eIdentifier"><span class="insert">eIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-eIdentifier"><span class="insert">eIdentifier</span></a></span> ( 
 <span class="delete">( </span><span class="delete">identifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> ) </span><span class="delete">,</span> 
 <span class="delete">eIdentifier</span>
 <span class="delete">,</span> 
 <span class="delete">eIdentifier</span>
 <span class="delete">optional-attribute-values</span>
 <span class="delete">)</span> 
-<span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-aIdentifierOrMarker"><span class="insert">aIdentifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-gIdentifierOrMarker"><span class="insert">gIdentifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-uIdentifierOrMarker"><span class="insert">uIdentifierOrMarker</span></a></span><span class="insert"> )? </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>
-</div>
-
-
-<table class="grammar">
+
+
+
+<span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-aIdentifierOrMarker"><span class="insert">aIdentifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-gIdentifierOrMarker"><span class="insert">gIdentifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-uIdentifierOrMarker"><span class="insert">uIdentifierOrMarker</span></a></span><span class="insert"> )? </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>
 
 </table>
 
@@ -2212,16 +2218,17 @@
 
 
 
-<div>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-tracedToExpression" name="prod-tracedToExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">25</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">tracedToExpression</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"tracedTo" "(" </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-eIdentifier">eIdentifier
+<table class="grammar">
+
+<tbody class="grammar-ref" data-ref="prod-tracedToExpression"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-tracedToExpression" name="prod-tracedToExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">25</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">tracedToExpression</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"tracedTo" "(" </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-eIdentifier">eIdentifier
 <span class="delete">,</span>
 </a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier
 <span class="delete">optional-attribute-values</span>
-<span class="delete">)</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>
-</div>
-
-
-<table class="grammar">
+<span class="delete">)</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>
 
 </table>
 
@@ -2254,18 +2261,18 @@
 
 
 
-<div>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-alternateExpression" name="prod-alternateExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">26</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">alternateExpression<span class="delete">&nbsp;::=
+<table class="grammar">
+
+<tbody class="grammar-ref" data-ref="prod-alternateExpression"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-alternateExpression" name="prod-alternateExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">26</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">alternateExpression<span class="delete">&nbsp;::=
   </span><span class="delete">alternateOf</span> 
 <span class="delete">(</span> 
 </code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"alternateOf" "(" </span><span class="prod"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier 
 <span class="delete">,</span> 
 </a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier 
 <span class="delete">)</span>  
-</a></span><span class="insert"> ")"</span></code></td> </tr> </tbody>
-</div>
-
-<table class="grammar">
+
+
+</a></span><span class="insert"> ")"</span></code></td> </tr> </tbody></tbody>
 
 </table>
 
@@ -2287,16 +2294,16 @@
 
 
 
-<div>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-specializationExpression" name="prod-specializationExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">27</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">specializationExpression<span class="delete">&nbsp;::=
+<table class="grammar">
+
+<tbody class="grammar-ref" data-ref="prod-specializationExpression"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-specializationExpression" name="prod-specializationExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">27</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod">specializationExpression<span class="delete">&nbsp;::=
   </span><span class="delete">specializationOf</span> 
 <span class="delete">(</span> 
 </code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"specializationOf" "(" </span><span class="prod"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier 
 <span class="delete">,</span> 
 </a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier 
 <span class="delete">)</span>  
-</a></span><span class="insert"> ")"</span></code></td> </tr> </tbody>
-</div><table class="grammar">
+</a></span><span class="insert"> ")"</span></code></td> </tr> </tbody></tbody>
 
 </table>
 
@@ -2364,11 +2371,10 @@
 </div>
 
 <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">28</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">insertionExpression</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</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">29</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">keyEntitySet</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</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>
+<tbody class="grammar-ref" data-ref="prod-insertionExpression"><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">28</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">insertionExpression</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</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>
+<tbody class="grammar-ref" data-ref="prod-keyEntitySet"><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">29</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">keyEntitySet</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</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></tbody>
 </table>
 
-
 <div class="anexample">
     <pre class="codeexample"> <span class="delete">derivedByInsertionFrom(id,</span><span class="insert">derivedByInsertionFrom(id;</span> c1, c, {("k1", v1), ("k2", v2)}, [])  
   </pre>
@@ -2412,7 +2418,7 @@
 </div>
 
 <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">30</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">removalExpression</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</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-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><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="grammar-ref" data-ref="prod-removalExpression"><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">30</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">removalExpression</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</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-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><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>
 </table>
 
 
@@ -2455,13 +2461,11 @@
   <br>
 </div>
 
-
-
-
 <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">31</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">membershipExpression</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</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="insert"> ( "," ( "true" | "false" ) )? </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="grammar-ref" data-ref="prod-membershipExpression"><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">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">membershipExpression</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</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="insert"> ( "," ( "true" | "false" ) )? </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>
 </table>
 
+
 <div class="anexample">
     <pre class="codeexample">   <span class="delete">memberOf(mid,</span><span class="insert">memberOf(mId,</span> c, {("k4", v4), ("k5", v5)}, [])
   </pre>
@@ -2484,10 +2488,40 @@
 
 
 </div>   
+   
+
 <div id="component6" class="section"> 
-<h3><span class="secno">3.6 </span>Component 6: Annotations</h3>
+<h3><span class="secno">3.6 </span>Component 6: <span class="insert">Bundles</span></h3>
+
+<div id="expression-bundle-declaration" class="section"> 
+<h4><span class="secno"><span class="insert">3.6.1 </span></span><span class="insert">Bundle Declaration</span></h4>
+</div>
+
+<div id="expression-bundle-description" class="section"> 
+<h4><span class="secno"><span class="insert">3.6.2 </span></span><span class="insert">Bundle Description</span></h4>
+</div>
+
+<div id="expression-provenance-locator" class="section"> 
+<h4><span class="secno"><span class="insert">3.6.3 </span></span><span class="insert">Provenance Locator</span></h4>
+
+
+<table class="grammar">
+<tbody class="grammar-ref" data-ref="prod-provenance-locator"></tbody>
+</table>
+
+
+</div>
+</div>
+
+
+
+
+
+
+<div id="component6" class="section"> 
+<h3><span class="secno"><span class="insert">3.7 </span></span><span class="insert">Component 6: </span>Annotations<span class="insert"> (OBSOLETE, TO DISAPPEAR)</span></h3>
    <div id="expression-note" class="section"> 
-<h4><span class="secno">3.6.1 </span>Note</h4>
+<h4><span class="secno"><span class="delete">3.6.1</span><span class="insert">3.7.1</span> </span>Note</h4>
 
 <div class="grammar">
 <span class="nonterminal">noteExpression</span>&nbsp;::= 
@@ -2507,7 +2541,7 @@
    </div> 
 
 <div id="expression-annotation" class="section">
-<h4><span class="secno">3.6.2 </span>Annotation</h4>
+<h4><span class="secno"><span class="delete">3.6.2</span><span class="insert">3.7.2</span> </span>Annotation</h4>
 
 <div class="grammar">
 <span class="nonterminal">annotationExpression</span>&nbsp;::=  
@@ -2538,13 +2572,13 @@
 
 
 <div id="subexpressions" class="section">
-<h3><span class="secno">3.7 </span>Further Expressions</h3>
+<h3><span class="secno"><span class="delete">3.7</span><span class="insert">3.8</span> </span>Further Expressions</h3>
 
 This section defines further expressions of PROV-N.
 
 
 <div id="expression-NamespaceDeclaration" class="section">
-<h4><span class="secno">3.7.1 </span>Namespace Declaration</h4>
+<h4><span class="secno"><span class="delete">3.7.1</span><span class="insert">3.8.1</span> </span>Namespace Declaration</h4>
 
 
 <div class="grammar">
@@ -2556,12 +2590,12 @@
  <span class="name">default</span> <span class="nonterminal">IRI</span> <br>
 </div>
 
-<div>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-namespaceDeclarations" name="prod-namespaceDeclarations"></a><span class="insert">[</span><span class="prodNo"><span class="insert">50</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">namespaceDeclarations</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</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">51</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">namespaceDeclaration</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"prefix" </span><span class="prod"><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-namespace"><span class="insert">namespace</span></a></span></code></td> </tr> </tbody>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-defaultNamespaceDeclaration" name="prod-defaultNamespaceDeclaration"></a><span class="insert">[</span><span class="prodNo"><span class="insert">52</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">defaultNamespaceDeclaration</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</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">59</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">IRI_REF</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"&lt;" ( [^&lt;&gt;"{}|^`\] - [#0000- ] | </span><span class="prod"><a class="grammarRef" href="#prod-UCHAR"><span class="insert">UCHAR</span></a></span><span class="insert"> )* "&gt;"</span></code></td> </tr> </tbody>
-</div><table class="grammar">
+<table class="grammar">
+
+<tbody class="grammar-ref" data-ref="prod-namespaceDeclarations"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-namespaceDeclarations" name="prod-namespaceDeclarations"></a><span class="insert">[</span><span class="prodNo"><span class="insert">50</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">namespaceDeclarations</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-defaultNamespaceDeclaration"><span class="insert">defaultNamespaceDeclaration</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-namespaceDeclaration"><span class="insert">namespaceDeclaration</span></a></span><span class="insert"> ) (</span><span class="prod"><a class="grammarRef" href="#prod-namespaceDeclaration"><span class="insert">namespaceDeclaration</span></a></span><span class="insert">)*</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-namespaceDeclaration"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-namespaceDeclaration" name="prod-namespaceDeclaration"></a><span class="insert">[</span><span class="prodNo"><span class="insert">51</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">namespaceDeclaration</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"prefix" </span><span class="prod"><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-namespace"><span class="insert">namespace</span></a></span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-defaultNamespaceDeclaration"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-defaultNamespaceDeclaration" name="prod-defaultNamespaceDeclaration"></a><span class="insert">[</span><span class="prodNo"><span class="insert">52</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">defaultNamespaceDeclaration</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"default" </span><span class="prod"><a class="grammarRef" href="#prod-IRI_REF"><span class="insert">IRI_REF</span></a></span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-IRI_REF"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-IRI_REF" name="prod-IRI_REF"></a><span class="insert">[</span><span class="prodNo"><span class="insert">59</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">IRI_REF</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"&lt;" ( [^&lt;&gt;"{}|^`\] - [#0000- ] | </span><span class="prod"><a class="grammarRef" href="#prod-UCHAR"><span class="insert">UCHAR</span></a></span><span class="insert"> )* "&gt;"</span></code></td> </tr> </tbody></tbody>
 
 </table>
 
@@ -2591,7 +2625,7 @@
 
 
 <div id="expression-identifier" class="section">
-<h4><span class="secno">3.7.2 </span>Identifier</h4>
+<h4><span class="secno"><span class="delete">3.7.2</span><span class="insert">3.8.2</span> </span>Identifier</h4>
 
 <p>
 A <dfn id="dfn-qualifiedName">qualified name</dfn> is a name subject to <a>namespace</a> interpretation. It consists of a <a>namespace</a>, denoted by an optional prefix, and a local name.
@@ -2649,28 +2683,26 @@
 <p><span class="insert">Qualified names </span><a class="grammarRef" href="#term-prov_n_LL-QUALNAME"><span class="insert">QUALNAME</span></a><span class="insert"> consist of a prefix and a local part. Prefixes follow the production </span><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX"><span class="insert">PN_PREFIX</span></a><span class="insert"> defined by SPARQL [</span><cite><a class="bibref" rel="biblioentry" href="#bib-RDF-SPARQL-QUERY"><span class="insert">RDF-SPARQL-QUERY</span></a></cite><span class="insert">]. Local parts have to be conformant with </span><a class="grammarRef" href="#term-prov_n_LL-PN_LOCAL"><span class="insert">PN_LOCAL</span></a><span class="insert">, which extends the original SPARQL </span><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_LOCAL"><span class="insert">PN_LOCAL</span></a><span class="insert"> definition by allowing further characters and %-escaped charaters (see </span><a class="grammarRef" href="#term-prov_n_LL-PN_CHARS_OTHERS"><span class="insert">PN_CHARS_OTHERS</span></a><span class="insert">).</span></p>
 
  
-<div>
-<div>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-eIdentifier" name="prod-eIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">32</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">eIdentifier</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</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">33</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">aIdentifier</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</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">34</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">agIdentifier</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</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">35</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">gIdentifier</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</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">36</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">uIdentifier</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</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">37</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">cIdentifier</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</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">38</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">eIdentifierOrMarker</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</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">39</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">aIdentifierOrMarker</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</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">40</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">agIdentifierOrMarker</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</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">41</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">gIdentifierOrMarker</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</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">42</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">uIdentifierOrMarker</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</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">43</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">identifier</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a></span></code></td> </tr> </tbody>
-
-<tbody class="term"> <tr valign="baseline"> <td><a id="prod-QUALNAME" name="prod-QUALNAME"></a><span class="insert">[</span><span class="prodNo"><span class="insert">54</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">QUALNAME</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-PN_PREFIX"><span class="insert">PN_PREFIX</span></a></span><span class="insert"> ":" )? </span><span class="prod"><a class="grammarRef" href="#prod-PN_LOCAL"><span class="insert">PN_LOCAL</span></a></span><br><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-PN_PREFIX"><span class="insert">PN_PREFIX</span></a></span><span class="insert"> ":"</span></code></td> </tr> </tbody>
-<tbody class="term"> <tr valign="baseline"> <td><a id="prod-PN_LOCAL" name="prod-PN_LOCAL"></a><span class="insert">[</span><span class="prodNo"><span class="insert">72</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">PN_LOCAL</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_U"><span class="insert">PN_CHARS_U</span></a></span><span class="insert"> | [0-9] | </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS"><span class="insert">PN_CHARS_OTHERS</span></a></span><span class="insert"> ) ( ( </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS"><span class="insert">PN_CHARS</span></a></span><span class="insert"> | "." | </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS"><span class="insert">PN_CHARS_OTHERS</span></a></span><span class="insert"> )* ( </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS"><span class="insert">PN_CHARS</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS"><span class="insert">PN_CHARS_OTHERS</span></a></span><span class="insert"> ) )?</span></code></td> </tr> </tbody>
-<tbody class="term"> <tr valign="baseline"> <td><a id="prod-PN_CHARS_OTHERS" name="prod-PN_CHARS_OTHERS"></a><span class="insert">[</span><span class="prodNo"><span class="insert">73</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">PN_CHARS_OTHERS</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</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"> | "&amp;"</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">74</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">PERCENT</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</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">75</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">HEX</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</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>
-</div></div><table class="grammar">
+<table class="grammar">
+<tbody class="grammar-ref" data-ref="prod-eIdentifier"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-eIdentifier" name="prod-eIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">32</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">eIdentifier</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-aIdentifier"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-aIdentifier" name="prod-aIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">33</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">aIdentifier</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-agIdentifier"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-agIdentifier" name="prod-agIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">34</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">agIdentifier</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-gIdentifier"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-gIdentifier" name="prod-gIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">35</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">gIdentifier</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-uIdentifier"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-uIdentifier" name="prod-uIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">36</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">uIdentifier</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-cIdentifier"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-cIdentifier" name="prod-cIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">37</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">cIdentifier</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span></code></td> </tr> </tbody></tbody>
+
+<tbody class="grammar-ref" data-ref="prod-eIdentifierOrMarker"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-eIdentifierOrMarker" name="prod-eIdentifierOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">38</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">eIdentifierOrMarker</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-eIdentifier"><span class="insert">eIdentifier</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-aIdentifierOrMarker"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-aIdentifierOrMarker" name="prod-aIdentifierOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">39</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">aIdentifierOrMarker</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-aIdentifier"><span class="insert">aIdentifier</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-agIdentifierOrMarker"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-agIdentifierOrMarker" name="prod-agIdentifierOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">40</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">agIdentifierOrMarker</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-agIdentifier"><span class="insert">agIdentifier</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-gIdentifierOrMarker"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-gIdentifierOrMarker" name="prod-gIdentifierOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">41</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">gIdentifierOrMarker</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-gIdentifier"><span class="insert">gIdentifier</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-uIdentifierOrMarker"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-uIdentifierOrMarker" name="prod-uIdentifierOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">42</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">uIdentifierOrMarker</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-uIdentifier"><span class="insert">uIdentifier</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-identifier"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-identifier" name="prod-identifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">43</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">identifier</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a></span></code></td> </tr> </tbody></tbody>
+
+<tbody class="grammar-ref" data-ref="prod-QUALNAME"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-QUALNAME" name="prod-QUALNAME"></a><span class="insert">[</span><span class="prodNo"><span class="insert">54</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">QUALNAME</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-PN_PREFIX"><span class="insert">PN_PREFIX</span></a></span><span class="insert"> ":" )? </span><span class="prod"><a class="grammarRef" href="#prod-PN_LOCAL"><span class="insert">PN_LOCAL</span></a></span><br><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-PN_PREFIX"><span class="insert">PN_PREFIX</span></a></span><span class="insert"> ":"</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-PN_LOCAL"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-PN_LOCAL" name="prod-PN_LOCAL"></a><span class="insert">[</span><span class="prodNo"><span class="insert">72</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">PN_LOCAL</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_U"><span class="insert">PN_CHARS_U</span></a></span><span class="insert"> | [0-9] | </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS"><span class="insert">PN_CHARS_OTHERS</span></a></span><span class="insert"> ) ( ( </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS"><span class="insert">PN_CHARS</span></a></span><span class="insert"> | "." | </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS"><span class="insert">PN_CHARS_OTHERS</span></a></span><span class="insert"> )* ( </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS"><span class="insert">PN_CHARS</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS"><span class="insert">PN_CHARS_OTHERS</span></a></span><span class="insert"> ) )?</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-PN_CHARS_OTHERS"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-PN_CHARS_OTHERS" name="prod-PN_CHARS_OTHERS"></a><span class="insert">[</span><span class="prodNo"><span class="insert">73</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">PN_CHARS_OTHERS</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</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"> | "&amp;"</span><br><span class="insert"> | "+"</span><br><span class="insert"> | "?"</span><br><span class="insert"> | "#"</span><br><span class="insert"> | "$"</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-PERCENT"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-PERCENT" name="prod-PERCENT"></a><span class="insert">[</span><span class="prodNo"><span class="insert">74</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">PERCENT</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"%" </span><span class="prod"><a class="grammarRef" href="#prod-HEX"><span class="insert">HEX</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-HEX"><span class="insert">HEX</span></a></span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-HEX"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-HEX" name="prod-HEX"></a><span class="insert">[</span><span class="prodNo"><span class="insert">75</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">HEX</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">[0-9]</span><br><span class="insert"> | [A-F]</span><br><span class="insert"> | [a-f]</span></code></td> </tr> </tbody></tbody>
 
 </table>
 
@@ -2724,7 +2756,7 @@
 </div>
 
 <div id="expression-attribute" class="section">
-<h4><span class="secno">3.7.3 </span>Attribute</h4>
+<h4><span class="secno"><span class="delete">3.7.3</span><span class="insert">3.8.3</span> </span>Attribute</h4>
 
 <div class="grammar">
 <span class="nonterminal">attribute</span>&nbsp;::=  <span class="nonterminal">qualifiedName</span><br>
@@ -2733,11 +2765,8 @@
 
 
 
-<div>
-<div>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-attribute" name="prod-attribute"></a><span class="insert">[</span><span class="prodNo"><span class="insert">44</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">attribute</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a></span></code></td> </tr> </tbody>
-</div></div><table class="grammar">
-
+<table class="grammar">
+<tbody class="grammar-ref" data-ref="prod-attribute"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-attribute" name="prod-attribute"></a><span class="insert">[</span><span class="prodNo"><span class="insert">44</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">attribute</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a></span></code></td> </tr> </tbody></tbody>
 </table>
 
 
@@ -2759,7 +2788,7 @@
 
 
 <div id="expression-literal" class="section">
-<h4><span class="secno">3.7.4 </span>Literal</h4>
+<h4><span class="secno"><span class="delete">3.7.4</span><span class="insert">3.8.4</span> </span>Literal</h4>
 
 <div class="grammar">
 <span class="nonterminal">Literal</span> &nbsp;::= <span class="nonterminal">typedLiteral</span> | <span class="nonterminal">convenienceNotation</span> <br>
@@ -2772,18 +2801,15 @@
 <span class="nonterminal">intLiteral</span> ::= <em>a finite-length non-empty sequence of decimal digits (#x30-#x39) with an optional leading negative sign (-)</em>
 </div>
 
-<div>
-<div>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-literal" name="prod-literal"></a><span class="insert">[</span><span class="prodNo"><span class="insert">46</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">literal</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-StringLiteral"><span class="insert">StringLiteral</span></a></span><span class="insert"> "%%" </span><span class="prod"><a class="grammarRef" href="#prod-datatype"><span class="insert">datatype</span></a></span><br><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-StringLiteral"><span class="insert">StringLiteral</span></a></span><br><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-INTLITERAL"><span class="insert">INTLITERAL</span></a></span><br><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-QUALNAME_LITERAL"><span class="insert">QUALNAME_LITERAL</span></a></span></code></td> </tr> </tbody>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-StringLiteral" name="prod-StringLiteral"></a><span class="insert">[</span><span class="prodNo"><span class="insert">47</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">StringLiteral</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-STRING_LITERAL"><span class="insert">STRING_LITERAL</span></a></span></code></td> </tr> </tbody>
-
-<tbody class="term"> <tr valign="baseline"> <td><a id="prod-INTLITERAL" name="prod-INTLITERAL"></a><span class="insert">[</span><span class="prodNo"><span class="insert">60</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">INTLITERAL</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</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-STRING_LITERAL" name="prod-STRING_LITERAL"></a><span class="insert">[</span><span class="prodNo"><span class="insert">61</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">STRING_LITERAL</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</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-QUALNAME_LITERAL" name="prod-QUALNAME_LITERAL"></a><span class="insert">[</span><span class="prodNo"><span class="insert">62</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">QUALNAME_LITERAL</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"'" </span><span class="prod"><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a></span><span class="insert"> "'"</span></code></td> </tr> </tbody>
-</div></div><table class="grammar">
-
+<table class="grammar">
+<tbody class="grammar-ref" data-ref="prod-literal"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-literal" name="prod-literal"></a><span class="insert">[</span><span class="prodNo"><span class="insert">46</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">literal</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-StringLiteral"><span class="insert">StringLiteral</span></a></span><span class="insert"> "%%" </span><span class="prod"><a class="grammarRef" href="#prod-datatype"><span class="insert">datatype</span></a></span><br><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-StringLiteral"><span class="insert">StringLiteral</span></a></span><br><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-INTLITERAL"><span class="insert">INTLITERAL</span></a></span><br><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-QUALNAME_LITERAL"><span class="insert">QUALNAME_LITERAL</span></a></span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-StringLiteral"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-StringLiteral" name="prod-StringLiteral"></a><span class="insert">[</span><span class="prodNo"><span class="insert">47</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">StringLiteral</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-STRING_LITERAL"><span class="insert">STRING_LITERAL</span></a></span></code></td> </tr> </tbody></tbody>
+
+<tbody class="grammar-ref" data-ref="prod-INTLITERAL"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-INTLITERAL" name="prod-INTLITERAL"></a><span class="insert">[</span><span class="prodNo"><span class="insert">60</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">INTLITERAL</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">("-")? (</span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert">)+</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-STRING_LITERAL"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-STRING_LITERAL" name="prod-STRING_LITERAL"></a><span class="insert">[</span><span class="prodNo"><span class="insert">61</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">STRING_LITERAL</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">'"' ( ( [^"\
+
+] ) | </span><span class="prod"><a class="grammarRef" href="#prod-ECHAR"><span class="insert">ECHAR</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-UCHAR"><span class="insert">UCHAR</span></a></span><span class="insert"> )* '"'</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-QUALNAME_LITERAL"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-QUALNAME_LITERAL" name="prod-QUALNAME_LITERAL"></a><span class="insert">[</span><span class="prodNo"><span class="insert">62</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">QUALNAME_LITERAL</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">"'" </span><span class="prod"><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a></span><span class="insert"> "'"</span></code></td> </tr> </tbody></tbody>
 </table>
 
 
@@ -2831,7 +2857,7 @@
 
 
 <div id="expression-types" class="section">
-<h5><span class="secno">3.7.4.1 </span>Reserved Type Values</h5>
+<h5><span class="secno"><span class="delete">3.7.4.1</span><span class="insert">3.8.4.1</span> </span>Reserved Type Values</h5>
 
 <p>The  reserved type values in the PROV namespace are the following.</p>
 
@@ -2857,17 +2883,15 @@
 </div>
 
 <div id="expression-Time" class="section">
-<h5><span class="secno">3.7.4.2 </span>Time Values</h5>
+<h5><span class="secno"><span class="delete">3.7.4.2</span><span class="insert">3.8.4.2</span> </span>Time Values</h5>
 
 <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> 
 
-<div>
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-time" name="prod-time"></a><span class="insert">[</span><span class="prodNo"><span class="insert">45</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">time</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</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">56</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">DIGIT</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</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">57</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">ISODATETIME</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</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">58</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">TIMEZONEOFFSET</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</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>
-</div><table class="grammar">
-
+<table class="grammar">
+<tbody class="grammar-ref" data-ref="prod-time"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-time" name="prod-time"></a><span class="insert">[</span><span class="prodNo"><span class="insert">45</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><code class="production prod"><span class="insert">time</span></code></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-ISODATETIME"><span class="insert">ISODATETIME</span></a></span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-DIGIT"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-DIGIT" name="prod-DIGIT"></a><span class="insert">[</span><span class="prodNo"><span class="insert">56</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">DIGIT</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">[0-9]</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-ISODATETIME"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-ISODATETIME" name="prod-ISODATETIME"></a><span class="insert">[</span><span class="prodNo"><span class="insert">57</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">ISODATETIME</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> "-" </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> "-" </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> "T" </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> ":" </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> ":" </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> ( "." </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> ( </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> (</span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert">)? )? )? ( "Z" | </span><span class="prod"><a class="grammarRef" href="#prod-TIMEZONEOFFSET"><span class="insert">TIMEZONEOFFSET</span></a></span><span class="insert"> )?</span></code></td> </tr> </tbody></tbody>
+<tbody class="grammar-ref" data-ref="prod-TIMEZONEOFFSET"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-TIMEZONEOFFSET" name="prod-TIMEZONEOFFSET"></a><span class="insert">[</span><span class="prodNo"><span class="insert">58</span></span><span class="insert">]&nbsp;&nbsp;&nbsp;</span></td> <td><span class="insert">&lt;</span><code class="production term"><span class="insert">TIMEZONEOFFSET</span></code><span class="insert">&gt;</span></td> <td><span class="insert">&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</span></td> <td><code class="content"><span class="insert">( "+" | "-" ) </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> ":" </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span></code></td> </tr> </tbody></tbody>
 </table>
 
 
--- a/model/diff.html	Tue May 15 12:02:15 2012 +0100
+++ b/model/diff.html	Tue May 15 12:04:26 2012 +0100
@@ -917,7 +917,7 @@
     font-weight:    bold;
 }
 </span></style><link href="./extra-dm.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-DM: The PROV Data Model</h1><h2 id="subtitle"><span class="insert">working towards WD6 (</span><a href="diff.html"><span class="insert">Diffs since last release</span></a><span class="insert">)</span></h2><h2 id="w3c-editor-s-draft-10-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">10</span> May 2012</h2><dl><dt>This version:</dt><dd><span class="delete">http://www.w3.org/TR/2012/WD-prov-dm-20120503/</span><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html"><span class="insert">http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html</span></a></dd><dt>Latest published version:</dt><dd><a href="http://www.w3.org/TR/prov-dm/">http://www.w3.org/TR/prov-dm/</a></dd><dt>Latest editor's draft:</dt><dd><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html">http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html</a></dd><dt>Previous version:</dt><dd><span class="delete">http://www.w3.org/TR/2012/WD-prov-dm-20120202/</span><a href="http://www.w3.org/TR/2012/WD-prov-dm-20120503/"><span class="insert">http://www.w3.org/TR/2012/WD-prov-dm-20120503/</span></a></dd><dt>Editors:</dt><dd><a href="http://www.ecs.soton.ac.uk/~lavm/">Luc Moreau</a>, University of Southampton</dd>
+  <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-DM: The PROV Data Model</h1><h2 id="subtitle"><span class="insert">working towards WD6 (</span><a href="diff.html"><span class="insert">Diffs since last release</span></a><span class="insert">)</span></h2><h2 id="w3c-editor-s-draft-08-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">08</span> May 2012</h2><dl><dt>This version:</dt><dd><span class="delete">http://www.w3.org/TR/2012/WD-prov-dm-20120503/</span><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html"><span class="insert">http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html</span></a></dd><dt>Latest published version:</dt><dd><a href="http://www.w3.org/TR/prov-dm/">http://www.w3.org/TR/prov-dm/</a></dd><dt>Latest editor's draft:</dt><dd><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html">http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html</a></dd><dt>Previous version:</dt><dd><span class="delete">http://www.w3.org/TR/2012/WD-prov-dm-20120202/</span><a href="http://www.w3.org/TR/2012/WD-prov-dm-20120503/"><span class="insert">http://www.w3.org/TR/2012/WD-prov-dm-20120503/</span></a></dd><dt>Editors:</dt><dd><a href="http://www.ecs.soton.ac.uk/~lavm/">Luc Moreau</a>, University of Southampton</dd>
 <dd><a href="http://www.cs.ncl.ac.uk/people/Paolo.Missier">Paolo Missier</a>, Newcastle University</dd>
 <dt><span class="delete">Contributors:</span><span class="insert">Authors:</span></dt><dd><a href="http://semanticweb.org/wiki/Khalid_Belhajjame">Khalid Belhajjame</a>, University of Manchester</dd>
 <dd><span>Reza B'Far</span>, Oracle Corporation</dd>
@@ -986,7 +986,7 @@
 <h4 id="fourth-public-working-draft">Fourth Public Working Draft</h4>
 <p>This is the fourth public release of the PROV-DM document. Following feedback, the Working Group has decided to reorganize this document substantially, separating the data model from its contraints and the notation used to illustrate it. The PROV-DM release is synchronized with the release of the PROV-O, PROV-PRIMER, PROV-N, and PROV-CONSTRAINTS documents. We are now clarifying the entry path to the PROV family of specifications.</p>
 <p>This document was published by the <a href="http://www.w3.org/2011/prov/">Provenance Working Group</a> as <span class="delete">a 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<br>
-</a><ul class="toc"><li class="tocline"><a href="#structure-of-this-document" class="tocxref"><span class="secno">1.1 </span>Structure of this Document</a></li><li class="tocline"><a href="#conventions" class="tocxref"><span class="secno">1.2 </span>Notational Conventions</a></li></ul></li><li class="tocline"><a href="#starting-points" class="tocxref"><span class="secno">2. </span>PROV Starting Points</a><ul class="toc"><li class="tocline"><a href="#section-entity-activity" class="tocxref"><span class="secno">2.1 </span>Entity and Activity</a></li><li class="tocline"><a href="#section-generation-usage-derivation" class="tocxref"><span class="secno">2.2 </span>Generation, Usage, Derivation</a></li><li class="tocline"><a href="#section-agents-attribution-association-responsibility" class="tocxref"><span class="secno">2.3 </span>Agents, Attribution, Association, and Responsibility</a></li><li class="tocline"><a href="#section-types-entities-agents" class="tocxref"><span class="secno">2.4 </span>Further Entities: Collections and Accounts</a></li><li class="tocline"><a href="#section-UML" class="tocxref"><span class="secno">2.5 </span>Simplified Overview Diagram</a></li><li class="tocline"><a href="#prov-n" class="tocxref"><span class="secno">2.6 </span>PROV-N: The Provenance Notation</a></li></ul></li><li class="tocline"><a href="#prov-dm-example" class="tocxref"><span class="secno">3. </span>Illustration of PROV-DM by an Example</a><ul class="toc"><li class="tocline"><a href="#section-example-one" class="tocxref"><span class="secno">3.1 </span>The Authors View</a></li><li class="tocline"><a href="#section-example-two" class="tocxref"><span class="secno">3.2 </span>The Process View</a></li><li class="tocline"><a href="#section-example-c" class="tocxref"><span class="secno">3.3 </span>Attribution of Provenance</a></li></ul></li><li class="tocline"><a href="#data-model-components" class="tocxref"><span class="secno">4. </span>PROV-DM Types and Relations</a><ul class="toc"><li class="tocline"><a href="#component1" class="tocxref"><span class="secno">4.1 </span>Component 1: Entities and Activities</a><ul class="toc"><li class="tocline"><a href="#term-Entity" class="tocxref"><span class="secno">4.1.1 </span>Entity</a></li><li class="tocline"><a href="#term-Activity" class="tocxref"><span class="secno">4.1.2 </span>Activity</a></li><li class="tocline"><a href="#term-Generation" class="tocxref"><span class="secno">4.1.3 </span>Generation</a></li><li class="tocline"><a href="#term-Usage" class="tocxref"><span class="secno">4.1.4 </span>Usage</a></li><li class="tocline"><a href="#term-Start" class="tocxref"><span class="secno">4.1.5 </span>Start</a></li><li class="tocline"><a href="#term-End" class="tocxref"><span class="secno">4.1.6 </span>End</a></li><li class="tocline"><a href="#term-Invalidation" class="tocxref"><span class="secno">4.1.7 </span>Invalidation</a></li><li class="tocline"><a href="#term-wasInformedBy" class="tocxref"><span class="secno">4.1.8 </span>Communication<span class="delete">4.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">4.2 </span>Component 2: Agents and Responsibility</a><ul class="toc"><li class="tocline"><a href="#term-Agent" class="tocxref"><span class="secno">4.2.1 </span>Agent</a></li><li class="tocline"><a href="#term-attribution" class="tocxref"><span class="secno">4.2.2 </span>Attribution</a></li><li class="tocline"><a href="#term-ActivityAssociation" class="tocxref"><span class="secno">4.2.3 </span>Association</a></li><li class="tocline"><a href="#term-responsibility" class="tocxref"><span class="secno">4.2.4 </span>Responsibility</a></li></ul></li><li class="tocline"><a href="#component3" class="tocxref"><span class="secno">4.3 </span>Component 3: Derivations</a><ul class="toc"><li class="tocline"><a href="#Derivation-Relation" class="tocxref"><span class="secno">4.3.1 </span>Derivation</a></li><li class="tocline"><a href="#term-Revision" class="tocxref"><span class="secno">4.3.2 </span>Revision</a></li><li class="tocline"><a href="#term-quotation" class="tocxref"><span class="secno">4.3.3 </span>Quotation</a></li><li class="tocline"><a href="#term-original-source" class="tocxref"><span class="secno">4.3.4 </span>Original Source</a></li><li class="tocline"><a href="#term-trace" class="tocxref"><span class="secno">4.3.5 </span>Trace</a></li></ul></li><li class="tocline"><a href="#component4" class="tocxref"><span class="secno">4.4 </span>Component 4: Alternate Entities</a><ul class="toc"><li class="tocline"><a href="#term-specialization" class="tocxref"><span class="secno">4.4.1 </span>Specialization</a></li><li class="tocline"><a href="#term-alternate" class="tocxref"><span class="secno">4.4.2 </span>Alternate</a></li></ul></li><li class="tocline"><a href="#component5" class="tocxref"><span class="secno">4.5 </span>Component 5: Collections</a><ul class="toc"><li class="tocline"><a href="#term-collection" class="tocxref"><span class="secno">4.5.1 </span>Collection</a></li><li class="tocline"><a href="#term-dictinonary" class="tocxref"><span class="secno">4.5.2 </span>Dictionary</a></li><li class="tocline"><a href="#term-dictionary-insertion" class="tocxref"><span class="secno">4.5.3 </span>Insertion</a></li><li class="tocline"><a href="#term-dictionary-removal" class="tocxref"><span class="secno">4.5.4 </span>Removal</a></li><li class="tocline"><a href="#term-dictionary-membership" class="tocxref"><span class="secno">4.5.5 </span>Membership</a></li></ul></li><li class="tocline"><a href="#component6" class="tocxref"><span class="secno">4.6 </span>Component 6: Annotations</a><ul class="toc"><li class="tocline"><a href="#term-note" class="tocxref"><span class="secno">4.6.1 </span>Note</a></li><li class="tocline"><a href="#term-annotation" class="tocxref"><span class="secno">4.6.2 </span>Annotation</a></li></ul></li><li class="tocline"><a href="#second-class-elements" class="tocxref"><span class="secno">4.7 </span>Further Elements of PROV-DM</a><ul class="toc"><li class="tocline"><a href="#term-NamespaceDeclaration" class="tocxref"><span class="secno">4.7.1 </span>Namespace Declaration</a></li><li class="tocline"><a href="#term-qualified-name" class="tocxref"><span class="secno">4.7.2 </span>Qualified Name</a></li><li class="tocline"><a href="#term-identifier" class="tocxref"><span class="secno">4.7.3 </span>Identifier</a></li><li class="tocline"><a href="#term-attribute" class="tocxref"><span class="secno">4.7.4 </span>Attribute</a><ul class="toc"><li class="tocline"><a href="#term-attribute-label" class="tocxref"><span class="secno">4.7.4.1 </span>prov:label</a></li><li class="tocline"><a href="#term-attribute-location" class="tocxref"><span class="secno">4.7.4.2 </span>prov:location</a></li><li class="tocline"><a href="#term-attribute-role" class="tocxref"><span class="secno">4.7.4.3 </span>prov:role</a></li><li class="tocline"><a href="#term-attribute-type" class="tocxref"><span class="secno">4.7.4.4 </span>prov:type</a></li><li class="tocline"><a href="#term-attribute-value" class="tocxref"><span class="secno">4.7.4.5 </span>prov:value</a></li></ul></li><li class="tocline"><a href="#term-value" class="tocxref"><span class="secno">4.7.5 </span>Value</a></li></ul></li></ul></li><li class="tocline"><a href="#extensibility-section" class="tocxref"><span class="secno">5. </span>PROV-DM Extensibility Points</a></li><li class="tocline"><a href="#valid-provenance" class="tocxref"><span class="secno">6. </span>Creating Valid Provenance</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> 
+</a><ul class="toc"><li class="tocline"><a href="#structure-of-this-document" class="tocxref"><span class="secno">1.1 </span>Structure of this Document</a></li><li class="tocline"><a href="#conventions" class="tocxref"><span class="secno">1.2 </span>Notational Conventions</a></li></ul></li><li class="tocline"><a href="#starting-points" class="tocxref"><span class="secno">2. </span>PROV Starting Points</a><ul class="toc"><li class="tocline"><a href="#section-entity-activity" class="tocxref"><span class="secno">2.1 </span>Entity and Activity</a></li><li class="tocline"><a href="#section-generation-usage-derivation" class="tocxref"><span class="secno">2.2 </span>Generation, Usage, Derivation</a></li><li class="tocline"><a href="#section-agents-attribution-association-responsibility" class="tocxref"><span class="secno">2.3 </span>Agents, Attribution, Association, and Responsibility</a></li><li class="tocline"><a href="#section-types-entities-agents" class="tocxref"><span class="secno">2.4 </span>Further Entities: Collections and Accounts</a></li><li class="tocline"><a href="#section-UML" class="tocxref"><span class="secno">2.5 </span>Simplified Overview Diagram</a></li><li class="tocline"><a href="#prov-n" class="tocxref"><span class="secno">2.6 </span>PROV-N: The Provenance Notation</a></li></ul></li><li class="tocline"><a href="#prov-dm-example" class="tocxref"><span class="secno">3. </span>Illustration of PROV-DM by an Example</a><ul class="toc"><li class="tocline"><a href="#section-example-one" class="tocxref"><span class="secno">3.1 </span>The Authors View</a></li><li class="tocline"><a href="#section-example-two" class="tocxref"><span class="secno">3.2 </span>The Process View</a></li><li class="tocline"><a href="#section-example-c" class="tocxref"><span class="secno">3.3 </span>Attribution of Provenance</a></li></ul></li><li class="tocline"><a href="#data-model-components" class="tocxref"><span class="secno">4. </span>PROV-DM Types and Relations</a><ul class="toc"><li class="tocline"><a href="#component1" class="tocxref"><span class="secno">4.1 </span>Component 1: Entities and Activities</a><ul class="toc"><li class="tocline"><a href="#term-Entity" class="tocxref"><span class="secno">4.1.1 </span>Entity</a></li><li class="tocline"><a href="#term-Activity" class="tocxref"><span class="secno">4.1.2 </span>Activity</a></li><li class="tocline"><a href="#term-Generation" class="tocxref"><span class="secno">4.1.3 </span>Generation</a></li><li class="tocline"><a href="#term-Usage" class="tocxref"><span class="secno">4.1.4 </span>Usage</a></li><li class="tocline"><a href="#term-Start" class="tocxref"><span class="secno">4.1.5 </span>Start</a></li><li class="tocline"><a href="#term-End" class="tocxref"><span class="secno">4.1.6 </span>End</a></li><li class="tocline"><a href="#term-Invalidation" class="tocxref"><span class="secno">4.1.7 </span>Invalidation</a></li><li class="tocline"><a href="#term-wasInformedBy" class="tocxref"><span class="secno">4.1.8 </span>Communication</a></li><li class="tocline"><a href="#term-wasStartedByActivity" class="tocxref"><span class="secno">4.1.9 </span>Start by Activity</a></li></ul></li><li class="tocline"><a href="#component2" class="tocxref"><span class="secno">4.2 </span>Component 2: Agents and Responsibility</a><ul class="toc"><li class="tocline"><a href="#term-Agent" class="tocxref"><span class="secno">4.2.1 </span>Agent</a></li><li class="tocline"><a href="#term-attribution" class="tocxref"><span class="secno">4.2.2 </span>Attribution</a></li><li class="tocline"><a href="#term-ActivityAssociation" class="tocxref"><span class="secno">4.2.3 </span>Association</a></li><li class="tocline"><a href="#term-responsibility" class="tocxref"><span class="secno">4.2.4 </span>Responsibility</a></li></ul></li><li class="tocline"><a href="#component3" class="tocxref"><span class="secno">4.3 </span>Component 3: Derivations</a><ul class="toc"><li class="tocline"><a href="#Derivation-Relation" class="tocxref"><span class="secno">4.3.1 </span>Derivation</a></li><li class="tocline"><a href="#term-Revision" class="tocxref"><span class="secno">4.3.2 </span>Revision</a></li><li class="tocline"><a href="#term-quotation" class="tocxref"><span class="secno">4.3.3 </span>Quotation</a></li><li class="tocline"><a href="#term-original-source" class="tocxref"><span class="secno">4.3.4 </span>Original Source</a></li><li class="tocline"><a href="#term-trace" class="tocxref"><span class="secno">4.3.5 </span>Trace</a></li></ul></li><li class="tocline"><a href="#component4" class="tocxref"><span class="secno">4.4 </span>Component 4: Alternate Entities</a><ul class="toc"><li class="tocline"><a href="#term-specialization" class="tocxref"><span class="secno">4.4.1 </span>Specialization</a></li><li class="tocline"><a href="#term-alternate" class="tocxref"><span class="secno">4.4.2 </span>Alternate</a></li></ul></li><li class="tocline"><a href="#component5" class="tocxref"><span class="secno">4.5 </span>Component 5: Collections</a><ul class="toc"><li class="tocline"><a href="#term-collection" class="tocxref"><span class="secno">4.5.1 </span>Collection</a></li><li class="tocline"><a href="#term-dictinonary" class="tocxref"><span class="secno">4.5.2 </span>Dictionary</a></li><li class="tocline"><a href="#term-dictionary-insertion" class="tocxref"><span class="secno">4.5.3 </span>Insertion</a></li><li class="tocline"><a href="#term-dictionary-removal" class="tocxref"><span class="secno">4.5.4 </span>Removal</a></li><li class="tocline"><a href="#term-dictionary-membership" class="tocxref"><span class="secno">4.5.5 </span>Membership</a></li></ul></li><li class="tocline"><a href="#component6" class="tocxref"><span class="secno">4.6 </span>Component 6: Annotations</a><ul class="toc"><li class="tocline"><a href="#term-note" class="tocxref"><span class="secno">4.6.1 </span>Note</a></li><li class="tocline"><a href="#term-annotation" class="tocxref"><span class="secno">4.6.2 </span>Annotation</a></li></ul></li><li class="tocline"><a href="#second-class-elements" class="tocxref"><span class="secno">4.7 </span>Further Elements of PROV-DM</a><ul class="toc"><li class="tocline"><a href="#term-NamespaceDeclaration" class="tocxref"><span class="secno">4.7.1 </span>Namespace Declaration</a></li><li class="tocline"><a href="#term-qualified-name" class="tocxref"><span class="secno">4.7.2 </span>Qualified Name</a></li><li class="tocline"><a href="#term-identifier" class="tocxref"><span class="secno">4.7.3 </span>Identifier</a></li><li class="tocline"><a href="#term-attribute" class="tocxref"><span class="secno">4.7.4 </span>Attribute</a><ul class="toc"><li class="tocline"><a href="#term-attribute-label" class="tocxref"><span class="secno">4.7.4.1 </span>prov:label</a></li><li class="tocline"><a href="#term-attribute-location" class="tocxref"><span class="secno">4.7.4.2 </span>prov:location</a></li><li class="tocline"><a href="#term-attribute-role" class="tocxref"><span class="secno">4.7.4.3 </span>prov:role</a></li><li class="tocline"><a href="#term-attribute-type" class="tocxref"><span class="secno">4.7.4.4 </span>prov:type</a></li><li class="tocline"><a href="#term-attribute-value" class="tocxref"><span class="secno">4.7.4.5 </span>prov:value</a></li></ul></li><li class="tocline"><a href="#term-value" class="tocxref"><span class="secno">4.7.5 </span>Value</a></li></ul></li></ul></li><li class="tocline"><a href="#extensibility-section" class="tocxref"><span class="secno">5. </span>PROV-DM Extensibility Points</a></li><li class="tocline"><a href="#valid-provenance" class="tocxref"><span class="secno">6. </span>Creating Valid Provenance</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> 
 
 
 
@@ -1141,7 +1141,7 @@
 
 
 <p><span class="delete">Things</span><span class="insert">In PROV, things</span> we want to describe   the provenance of are called <em>entities</em> <span class="delete">in PROV.</span><span class="insert">and have some fixed aspect.</span> The term "things" encompasses a broad diversity of notions, including digital objects such as a file or web page, 
-physical things such as a <span class="delete">building</span><span class="insert">mountain, a building, a printed book,</span> or a <span class="delete">printed book, or a </span>car as well as abstract concepts and ideas.  
+physical things such as a building or a printed book, or a car as well as abstract concepts and ideas.  
 </p>
 
 <p>
@@ -1678,7 +1678,7 @@
 <caption id="relations-at-a-glance">Table 3: PROV-DM Relations At a Glance</caption>
 <tbody><tr><td></td><td>Entity</td><td>Activity</td><td>Agent</td><td>Note</td></tr> 
 <tr><td>Entity</td><td><div class="component3-color"><a href="#dfn-wasderivedfrom" class="internalDFN">wasDerivedFrom</a><br><a href="#dfn-wasrevisionof" class="internalDFN">wasRevisionOf</a><br><a href="#dfn-wasquotedfrom" class="internalDFN">wasQuotedFrom</a><br><a href="#dfn-hadoriginalsource" class="internalDFN">hadOriginalSource</a></div><div class="component4-color"><a href="#dfn-alternateof" class="internalDFN">alternateOf</a><br><a href="#dfn-specializationof" class="internalDFN">specializationOf</a></div></td><td class="component1-color"><a title="wasGeneratedBy" href="#dfn-wasgeneratedby" class="internalDFN">wasGeneratedBy</a><br><a title="wasInvalidatedBy" href="#dfn-wasinvalidatedby" class="internalDFN">wasInvalidatedBy</a></td><td class="component2-color"><a href="#dfn-wasattributedto" class="internalDFN">wasAttributedTo</a></td><td class="component6-color"><a href="#dfn-hasannotation" class="internalDFN">hasAnnotation</a></td></tr>
-<tr><td>Activity</td><td><div class="component1-color"><a href="#dfn-used" class="internalDFN">used</a><br><a href="#dfn-wasstartedby" class="internalDFN">wasStartedBy</a><br><a href="#dfn-wasendedby" class="internalDFN">wasEndedBy</a></div></td><td class="component1-color"><span class="delete">wasStartedByActivity</span><a href="#dfn-wasinformedby" class="internalDFN">wasInformedBy</a></td><td class="component2-color"><a href="#dfn-wasassociatedwith" class="internalDFN">wasAssociatedWith</a></td><td class="component6-color"><a href="#dfn-hasannotation" class="internalDFN">hasAnnotation</a></td></tr>
+<tr><td>Activity</td><td><div class="component1-color"><a href="#dfn-used" class="internalDFN">used</a><br><a href="#dfn-wasstartedby" class="internalDFN">wasStartedBy</a><br><a href="#dfn-wasendedby" class="internalDFN">wasEndedBy</a></div></td><td class="component1-color"><a href="#dfn-wasstartedbyactivity" class="internalDFN">wasStartedByActivity</a><br><a href="#dfn-wasinformedby" class="internalDFN">wasInformedBy</a></td><td class="component2-color"><a href="#dfn-wasassociatedwith" class="internalDFN">wasAssociatedWith</a></td><td class="component6-color"><a href="#dfn-hasannotation" class="internalDFN">hasAnnotation</a></td></tr>
 <tr><td>Agent</td><td>—</td><td>—</td><td class="component2-color"><a href="#dfn-actedonbehalfof" class="internalDFN">actedOnBehalfOf</a></td><td class="component6-color"><a href="#dfn-hasannotation" class="internalDFN">hasAnnotation</a></td></tr>
 <tr><td>Note</td><td>—</td><td>—</td><td>—</td><td class="component6-color"><a href="#dfn-hasannotation" class="internalDFN">hasAnnotation</a></td></tr>
 </tbody></table>
@@ -1695,11 +1695,11 @@
 <tr class="component1-color"><td><a href="#concept-activity" class="internalDFN">Activity</a></td><td><a title="dfn-Activity" href="#dfn-activity" class="internalDFN">activity(id, st, et, [ attr1=val1, ...])</a></td></tr>
 <tr class="component1-color"><td><a href="#concept-generation" class="internalDFN">Generation</a></td><td><a title="wasGeneratedBy" href="#dfn-wasgeneratedby" class="internalDFN">wasGeneratedBy(id,e,a,t,attrs)</a></td></tr>
 <tr class="component1-color"><td><a href="#concept-usage" class="internalDFN">Usage</a></td><td><a title="used" href="#dfn-used" class="internalDFN">used(id,a,e,t,attrs)</a></td></tr>
-<tr class="component1-color"><td><a href="#concept-start" class="internalDFN">Start</a></td><td><a title="wasStartedBy" href="#dfn-wasstartedby" class="internalDFN"><span class="delete">wasStartedBy(id,a,e,t,attrs)</span><span class="insert">wasStartedBy(id,a2,e,a1,t,attrs)</span></a></td></tr>
-<tr class="component1-color"><td><a href="#concept-end" class="internalDFN">End</a></td><td><a title="wasEndedBy" href="#dfn-wasendedby" class="internalDFN"><span class="delete">wasEndedBy(id,a,e,t,attrs)</span><span class="insert">wasEndedBy(id,a2,e,a1,t,attrs)</span></a></td></tr>
+<tr class="component1-color"><td><a href="#concept-start" class="internalDFN">Start</a></td><td><a title="wasStartedBy" href="#dfn-wasstartedby" class="internalDFN">wasStartedBy(id,a,e,t,attrs)</a></td></tr>
+<tr class="component1-color"><td><a href="#concept-end" class="internalDFN">End</a></td><td><a title="wasEndedBy" href="#dfn-wasendedby" class="internalDFN">wasEndedBy(id,a,e,t,attrs)</a></td></tr>
 <tr class="component1-color"><td><a href="#concept-invalidation" class="internalDFN">Invalidation</a></td><td><a title="wasInvalidatedBy" href="#dfn-wasinvalidatedby" class="internalDFN">wasInvalidatedBy(id,e,a,t,attrs)</a></td></tr>
 <tr class="component1-color"><td><a href="#concept-communication" class="internalDFN">Communication</a></td><td><a title="wasInformedBy" href="#dfn-wasinformedby" class="internalDFN">wasInformedBy(id,a2,a1,attrs)</a></td></tr>
-<span class="delete">Start by Activity</span><span class="delete">wasStartedByActivity(id, a2, a1, attrs)</span>
+<tr class="component1-color"><td><a href="#concept-startByActivity" class="internalDFN">Start by Activity</a></td><td><a title="wasStartedByActivity" href="#dfn-wasstartedbyactivity" class="internalDFN">wasStartedByActivity(id, a2, a1, attrs)</a></td></tr>
 <tr class="component2-color"><td><a href="#concept-agent" class="internalDFN">Agent</a></td><td><a title="dfn-agent" href="#dfn-agent" class="internalDFN">agent(id, [ attr1=val1, ...])</a></td></tr>
 <tr class="component2-color"><td><a href="#concept-attribution" class="internalDFN">Attribution</a></td><td><a title="wasAttributedTo" href="#dfn-wasattributedto" class="internalDFN">wasAttributedTo(id,e,ag,attr)</a></td></tr>
 <tr class="component2-color"><td><a href="#concept-activityAssociation" class="internalDFN">Association</a></td><td><a title="wasAssociatedWith" href="#dfn-wasassociatedwith" class="internalDFN">wasAssociatedWith(id,a,ag,pl,attrs)</a></td></tr>
@@ -1730,9 +1730,8 @@
 <div id="component1" class="section"> 
 <h3><span class="secno">4.1 </span>Component 1: Entities and Activities</h3>
 
-<p>The first component of PROV-DM is concerned with <a title="entity" href="#concept-entity" class="internalDFN">entities</a> and <a title="activity" href="#concept-activity" class="internalDFN">activities</a>, and their interrelations: <a href="#concept-usage" class="internalDFN">Usage</a>, <a href="#concept-generation" class="internalDFN">Generation</a>, <a href="#concept-start" class="internalDFN">Start</a>, <a href="#concept-end" class="internalDFN">End</a>, <a href="#concept-invalidation" class="internalDFN">Invalidation</a>, <span class="insert">and </span><a href="#concept-communication" class="internalDFN">Communication<span class="delete">, and </span><span class="delete">Start by Activity</span></a>.  <a href="#figure-component1">Figure 5</a> uses UML to depict the first component, with two classes and <span class="delete">binary </span>associations between them.<span class="delete"> Associations are not just binary: indeed, </span>  <a href="#concept-usage" class="internalDFN">Usage</a>, <a href="#concept-generation" class="internalDFN">Generation</a>, <a href="#concept-start" class="internalDFN">Start</a>, <a href="#concept-end" class="internalDFN">End</a><span class="delete"> also </span>  include <em>time</em> attributes.
-<span class="insert">UML association classes are used to express n-ary relations </span><a href="#concept-start" class="internalDFN"><span class="insert">Start</span></a><span class="insert"> and </span><a href="#concept-end" class="internalDFN"><span class="insert">End</span></a><span class="insert">. 
-</span></p>
+<p>The first component of PROV-DM is concerned with <a title="entity" href="#concept-entity" class="internalDFN">entities</a> and <a title="activity" href="#concept-activity" class="internalDFN">activities</a>, and their interrelations: <a href="#concept-usage" class="internalDFN">Usage</a>, <a href="#concept-generation" class="internalDFN">Generation</a>, <a href="#concept-start" class="internalDFN">Start</a>, <a href="#concept-end" class="internalDFN">End</a>, <a href="#concept-invalidation" class="internalDFN">Invalidation</a>, <a href="#concept-communication" class="internalDFN">Communication</a>, and <a href="#concept-startByActivity" class="internalDFN">Start by Activity</a>.  <a href="#figure-component1">Figure 5</a> uses UML to depict the first component, with two classes and binary associations between them. Associations are not just binary: indeed, <a href="#concept-usage" class="internalDFN">Usage</a>, <a href="#concept-generation" class="internalDFN">Generation</a>, <a href="#concept-start" class="internalDFN">Start</a>, <a href="#concept-end" class="internalDFN">End</a> also include <em>time</em> attributes.
+</p>
 
 <div style="text-align: center;">
 <figure>
@@ -1896,15 +1895,14 @@
 <div id="term-Start" class="section">
 <h4><span class="secno">4.1.5 </span>Start</h4>
 
-<div class="glossary-ref">   <dfn id="concept-start">Start</dfn> is when an activity is deemed to have started.  The activity did not exist before its start. Any usage or generation involving an activity follows the activity's start. A start may refer to an entity, known as <dfn id="concept-start-trigger">trigger</dfn>, that initiated the <span class="delete">activity.</span><span class="insert">activity, or to an activity, known as </span><dfn id="concept-start-starter"><span class="insert">starter</span></dfn><span class="insert">, that generated the trigger.</span> </div>
-
-
-<p></p><div class="attributes" id="attributes-start">An activity <dfn title="wasStartedBy" id="dfn-wasstartedby">start</dfn><span class="withPn">, written <span class="pnExpression"><span class="delete">wasStartedBy(id,a,e,t,attrs)</span><span class="insert">wasStartedBy(id, a2, e, a1, t, attrs)</span></span> in PROV-N,</span> has:
+<div class="glossary-ref">   <dfn id="concept-start">Start</dfn> is when an activity is deemed to have started.  The activity did not exist before its start. Any usage or generation involving an activity follows the activity's start. A start may refer to an entity, known as <dfn id="concept-start-trigger">trigger</dfn>, that initiated the activity. </div>
+
+
+<p></p><div class="attributes" id="attributes-start">An activity <dfn title="wasStartedBy" id="dfn-wasstartedby">start</dfn><span class="withPn">, written <span class="pnExpression">wasStartedBy(id,a,e,t,attrs)</span> in PROV-N,</span> has:
 <ul>
 <li><span class="attribute" id="start.id">id</span>:  an <em class="rfc2119" title="optional">optional</em> identifier for the activity start;</li> 
-<li><span class="attribute" id="start.activity">activity</span>: an identifier (<span class="name"><span class="delete">a</span><span class="insert">a2</span></span>) for the started activity;</li> 
+<li><span class="attribute" id="start.activity">activity</span>: an identifier (<span class="name">a</span>) for the started activity;</li> 
 <li><span class="attribute" id="start.trigger">trigger</span>: an <em class="rfc2119" title="optional">optional</em> identifier (<span class="name">e</span>) for the entity triggering the activity;</li> 
-<li><span class="attribute" id="start.starter"><span class="insert">starter</span></span><span class="insert">: an </span><em class="rfc2119" title="optional"><span class="insert">optional</span></em><span class="insert"> identifier (</span><span class="name"><span class="insert">a1</span></span><span class="insert">) for the activity that generated the (possibly unspecified) entity (</span><span class="name"><span class="insert">e</span></span><span class="insert">);</span></li> 
 <li><span class="attribute" id="start.time">time</span>: the <em class="rfc2119" title="optional">optional</em> time (<span class="name">t</span>) at which the activity was started; </li> 
 <li><span class="attribute" id="start.attributes">attributes</span>: an <em class="rfc2119" title="optional">optional</em> set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this activity start.
 </li></ul>
@@ -1913,19 +1911,12 @@
 <div class="anexample">
 <p>
 The following example contains the description of an activity <span class="name">a1</span> (a discussion), which was started at a specific time, and was triggered by an email message <span class="name">e1</span>.</p>
-<pre class="codeexample"><span class="delete">entity(e1,[prov:type="email message"])
+<pre class="codeexample">entity(e1,[prov:type="email message"])
 activity(a1,[prov:type="Discuss"])
-wasStartedBy(a1,e1,2011-11-16T16:05:00)</span><span class="insert">entity(e1, [prov:type="email message"] )
-activity(a1, [ prov:type="Discuss" ])
-wasStartedBy(a1, e1, -, 2011-11-16T16:05:00)</span>
+wasStartedBy(a1,e1,2011-11-16T16:05:00)
 </pre>
 Furthermore, if the message is also an input to the activity, this can be described as follows:
-<pre class="codeexample"><span class="delete">used(a1,e1,-)</span><span class="insert">used(a1, e1, -)
-</span></pre>
-<p><span class="insert">Alternatively, one can also describe the activity that generated the email message.</span></p>
-<pre class="codeexample"><span class="insert">activity(a0, [ prov:type="Write" ])
-wasGeneratedBy(e1, a0)
-wasStartedBy(a1, e1, a0, 2011-11-16T16:05:00)</span>
+<pre class="codeexample">used(a1,e1,-)
 </pre>
 </div>
 
@@ -1934,31 +1925,13 @@
 In the following example, a race is started by a bang, and responsibility for this trigger is attributed to an agent 
  <span class="name">ex:Bob</span>.
 </p><pre class="codeexample">activity(ex:foot_race)
-<span class="delete">wasStartedBy(ex:foot_race,ex:bang,2012-03-09T08:05:08-05:00)</span><span class="insert">wasStartedBy(ex:foot_race, ex:bang, -, 2012-03-09T08:05:08-05:00)</span>
+wasStartedBy(ex:foot_race,ex:bang,2012-03-09T08:05:08-05:00)
 entity(ex:bang)
 agent(ex:Bob)
-<span class="delete">wasAttributedTo(ex:bang,ex:Bob)</span><span class="insert">wasAttributedTo(ex:bang, ex:Bob)</span>
+wasAttributedTo(ex:bang,ex:Bob)
 </pre>
 </div>
 
-<div class="anexample">
-<p><span class="insert">
-In this example, filling fuel was started as a consequence of
-observing the low fuel. The trigger entity is unspecified, it could
-for instance have been the low fuel warning light, the fuel tank
-indicator needle position, or the engine not running properly.</span>
-
-
-</p><pre class="codeexample"><span class="insert">activity(ex:filling-fuel)
-activity(ex:observing-low-fuel)
-
-agent(ex:driver, [ prov:type="prov:Person" %% xsd:QName )
-wasAssociatedWith(ex:filling-fuel, ex:driver)
-wasAssociatedWith(ex:observing-low-fuel, ex:driver)
-
-wasStartedBy(ex:filling-fuel, -, ex:observing-low-fuel, -)
-</span></pre>
-</div>
 
 <p>The relations wasStartedBy and used are orthogonal, and thus need to be expressed independently, according to the situation being described.</p>
 
@@ -1967,16 +1940,15 @@
 <div id="term-End" class="section">
 <h4><span class="secno">4.1.6 </span>End</h4>
 
-<div class="glossary-ref">   <dfn id="concept-end">End</dfn> is when an activity is deemed to have ended.  The activity no longer exists after its end. Any usage, generation, or invalidation involving an activity precedes the activity's end. An end may refer to an entity, known as <dfn id="concept-end-trigger">trigger</dfn>, that terminated the <span class="delete">activity.</span><span class="insert">activity, or to an activity, known as </span><dfn id="concept-end-ender"><span class="insert">ender</span></dfn><span class="insert"> that generated the trigger.</span> </div>
-
-
-<p></p><div class="attributes" id="attributes-end">An activity <dfn title="wasEndedBy" id="dfn-wasendedby">end</dfn><span class="withAsn">, written <span class="pnExpression"><span class="delete">wasEndedBy(id,a,e,t,attrs)</span><span class="insert">wasEndedBy(id,a2,e,a1,t,attrs)</span></span> in PROV-N,</span> has:
+<div class="glossary-ref">   <dfn id="concept-end">End</dfn> is when an activity is deemed to have ended.  The activity no longer exists after its end. Any usage, generation, or invalidation involving an activity precedes the activity's end. An end may refer to an entity, known as <dfn id="concept-end-trigger">trigger</dfn>, that terminated the activity. </div>
+
+
+<p></p><div class="attributes" id="attributes-end">An activity <dfn title="wasEndedBy" id="dfn-wasendedby">end</dfn><span class="withAsn">, written <span class="pnExpression">wasEndedBy(id,a,e,t,attrs)</span> in PROV-N,</span> has:
 <ul>
 <li><span class="attribute" id="end.id">id</span>:  an <em class="rfc2119" title="optional">optional</em> identifier for the activity end;</li> 
-<li><span class="attribute" id="end.activity">activity</span>: an identifier (<span class="name"><span class="delete">a</span><span class="insert">a2</span></span>) for the ended activity;
+<li><span class="attribute" id="end.activity">activity</span>: an identifier (<span class="name">a</span>) for the ended activity;
 </li><li><span class="attribute" id="end.trigger">trigger</span>: an <em class="rfc2119" title="optional">optional</em> identifier (<span class="name">e</span>) for the entity triggering the activity ending;
-</li><li><span class="attribute" id="end.ender"><span class="insert">ender</span></span><span class="insert">: an </span><em class="rfc2119" title="optional"><span class="insert">optional</span></em><span class="insert"> identifier (</span><span class="name"><span class="insert">a1</span></span><span class="insert">) for the activity that generated the (possibly unspecified) entity (</span><span class="name"><span class="insert">e</span></span><span class="insert">);</span></li> 
-<li><span class="attribute" id="end.time">time</span>: the <em class="rfc2119" title="optional">optional</em> time (<span class="name">t</span>) at which the activity was ended; </li> 
+</li><li><span class="attribute" id="end.time">time</span>: the <em class="rfc2119" title="optional">optional</em> time (<span class="name">t</span>) at which the activity was ended; </li> 
 <li><span class="attribute" id="end.attributes">attributes</span>: an <em class="rfc2119" title="optional">optional</em> set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this activity end.
 </li></ul>
 </div>
@@ -2121,37 +2093,37 @@
 </div>
 </div>
 
-
-<span class="delete">4.1.9 </span><span class="delete">Start by Activity</span>
-
-   <span class="delete">Start by Activity</span><span class="delete"> is the start of an activity with an implicit trigger generated by another activity. </span>
-
-
-
-<span class="delete">
-A </span><span class="delete">start by activity</span><span class="delete">, written as 
-</span><span class="delete">wasStartedByActivity(id, a2, a1, attrs)</span><span class="delete"> in PROV-N,</span><span class="delete"> has:
-</span>
-<span class="delete">id</span><span class="delete">:  an </span><span class="delete">optional</span><span class="delete"> identifier of the relation;</span> 
-<span class="delete">started</span><span class="delete">: the identifier (</span><span class="delete">a2</span><span class="delete">) of  the started activity;
-</span><span class="delete">starter</span><span class="delete">: the identifier (</span><span class="delete">a1</span><span class="delete">) of the activity that started the other;</span>
-<span class="delete">attributes</span><span class="delete">: an </span><span class="delete">optional</span><span class="delete"> set (</span><span class="delete">attrs</span><span class="delete">) of attribute-value pairs representing additional information about this start by activity.</span>
-
-
-
-
-
-
-<span class="delete">
-Suppose activities </span><span class="delete">a1</span><span class="delete"> and </span><span class="delete">a2</span><span class="delete"> are computer processes that are executed on different hosts, and that </span><span class="delete">a1</span><span class="delete"> started </span><span class="delete">a2</span><span class="delete">. This can be expressed as in the following fragment:</span>
-<span class="delete">activity(a1,t1,t2,[ex:host="server1.example.org",prov:type="workflow"])
+<div id="term-wasStartedByActivity" class="section">
+<h4><span class="secno">4.1.9 </span>Start by Activity</h4>
+
+<div class="glossary-ref">   <dfn id="concept-startByActivity">Start by Activity</dfn> is the start of an activity with an implicit trigger generated by another activity. </div>
+
+
+
+<p></p><div class="attributes" id="attributes-startByActivity">
+A <dfn title="wasStartedByActivity" id="dfn-wasstartedbyactivity">start by activity</dfn><span class="withPn">, written as 
+<span class="pnExpression">wasStartedByActivity(id, a2, a1, attrs)</span> in PROV-N,</span> has:
+<ul>
+<li><span class="attribute" id="startByActivity.id">id</span>:  an <em class="rfc2119" title="optional">optional</em> identifier of the relation;</li> 
+<li><span class="attribute" id="startByActivity.started">started</span>: the identifier (<span class="name">a2</span>) of  the started activity;
+</li><li><span class="attribute" id="startByActivity.starter">starter</span>: the identifier (<span class="name">a1</span>) of the activity that started the other;</li>
+<li><span class="attribute" id="startByActivity.attributes">attributes</span>: an <em class="rfc2119" title="optional">optional</em> set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this start by activity.</li>
+</ul>
+</div>
+
+
+
+<div class="anexample">
+<p>
+Suppose activities <span class="name">a1</span> and <span class="name">a2</span> are computer processes that are executed on different hosts, and that <span class="name">a1</span> started <span class="name">a2</span>. This can be expressed as in the following fragment:</p>
+<pre class="codeexample">activity(a1,t1,t2,[ex:host="server1.example.org",prov:type="workflow"])
 activity(a2,t3,t4,[ex:host="server2.example.org",prov:type="subworkflow"])
 wasStartedByActivity(a2,a1)
-</span><span class="delete">
-It is assumed that the activities </span><span class="delete">a1</span><span class="delete"> and </span><span class="delete">a2</span><span class="delete"> are of type "workflow" and "subworkflow", respectively; the latter was started by the former.
-</span>
-
-
+</pre>
+It is assumed that the activities <span class="name">a1</span> and <span class="name">a2</span> are of type "workflow" and "subworkflow", respectively; the latter was started by the former.
+</div>
+
+</div>
 
 
 </div>
prov

Hosted by W3C Systems Team, please report bugs to sysreq@w3.org