--- a/model/diff-n.html Wed May 16 09:17:03 2012 +0100
+++ b/model/diff-n.html Wed May 16 09:18:04 2012 +0100
@@ -943,7 +943,7 @@
</style><link href="./extra.css" rel="stylesheet" type="text/css" charset="utf-8"><link href="http://www.w3.org/StyleSheets/TR/W3C-ED" rel="stylesheet" type="text/css" charset="utf-8"></head>
<body style="display: inherit; "><div class="head"><p><a href="http://www.w3.org/"><img width="72" height="48" src="http://www.w3.org/Icons/w3c_home" alt="W3C"></a></p><h1 class="title" id="title">PROV-N: The Provenance Notation</h1>
-<h2 id="subtitle"><span class="insert">towards second working draft (</span><a href="diff-n.html"><span class="insert">Diffs since last release</span></a><span class="insert">)</span></h2><h2 id="w3c-editor-s-draft-15-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">15</span> May 2012</h2>
+<h2 id="subtitle"><span class="insert">towards second working draft (</span><a href="diff-n.html"><span class="insert">Diffs since last release</span></a><span class="insert">)</span></h2><h2 id="w3c-editor-s-draft-16-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">16</span> May 2012</h2>
<dl><dt>This<span class="insert"> version:</span></dt><dd><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-n.html"><span class="insert">http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-n.html</span></a></dd><dt><span class="insert">Latest published version:</span></dt><dd><a href="http://www.w3.org/TR/prov-n/"><span class="insert">http://www.w3.org/TR/prov-n/</span></a></dd><dt><span class="insert">Latest editor's draft:</span></dt><dd><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-n.html"><span class="insert">http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-n.html</span></a></dd><dt><span class="insert">Previous</span> version:</dt><dd><a href="http://www.w3.org/TR/2012/WD-prov-n-20120503/">http://www.w3.org/TR/2012/WD-prov-n-20120503/</a></dd>
<span class="delete">Latest published version:</span><span class="delete">http://www.w3.org/TR/prov-n/</span>
<span class="delete">Latest editor's draft:</span><span class="delete">http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-n.html</span>
@@ -1205,51 +1205,48 @@
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-expression"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-expression" name="prod-expression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">2</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">expression</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-entityExpression"><span class="insert">entityExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-activityExpression"><span class="insert">activityExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-generationExpression"><span class="insert">generationExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-usageExpression"><span class="insert">usageExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-startExpression"><span class="insert">startExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-endExpression"><span class="insert">endExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-invalidationExpression"><span class="insert">invalidationExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-communicationExpression"><span class="insert">communicationExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-agentExpression"><span class="insert">agentExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-associationExpression"><span class="insert">associationExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-attributionExpression"><span class="insert">attributionExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-responsibilityExpression"><span class="insert">responsibilityExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-derivationExpression"><span class="insert">derivationExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-tracedToExpression"><span class="insert">tracedToExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-hadOriginalSourceExpression"><span class="insert">hadOriginalSourceExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-quotationExpression"><span class="insert">quotationExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-revisionExpression"><span class="insert">revisionExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-alternateExpression"><span class="insert">alternateExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-specializationExpression"><span class="insert">specializationExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-insertionExpression"><span class="insert">insertionExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-removalExpression"><span class="insert">removalExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-membershipExpression"><span class="insert">membershipExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-namedBundle"><span class="insert">namedBundle</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-provenanceLocatorExpression"><span class="insert">provenanceLocatorExpression</span></a></span><span class="insert"> )</span></code></td> </tr> </tbody></tbody>
-</table><span class="insert">
-
-
-Each expression non-terminal </span><span class="nonterminal">expression</span>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-expression" name="prod-expression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">2</span></span><span class="insert">] </span></td> <td><code class="production prod">expression
<span class="delete"> ::=</span>
-<span class="insert">, i.e., </span><span class="nonterminal">entityExpression</span><span class="delete">
-|</span><span class="insert">,</span> <span class="nonterminal">activityExpression</span><span class="delete">
-| </span><span class="delete">generationExpression</span><span class="delete">
-| </span><span class="delete">usageExpression</span>
-<span class="delete">
- | </span><span class="delete">startExpression</span><span class="delete">
-| </span><span class="delete">endExpression</span><span class="delete">
-| </span><span class="delete">invalidationExpression</span><span class="delete">
-| </span><span class="delete">communicationExpression</span><span class="delete">
-| </span><span class="delete">startByActivityExpression</span>
+</code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-entityExpression">entityExpression
+</a></span> | <span class="prod"><a class="grammarRef" href="#prod-activityExpression">activityExpression
+</a></span> | <span class="prod"><a class="grammarRef" href="#prod-generationExpression">generationExpression
+</a></span> | <span class="prod"><a class="grammarRef" href="#prod-usageExpression">usageExpression
<span class="delete">
-
- | </span><span class="delete">agentExpression</span><span class="delete">
-| </span><span class="delete">attributionExpression</span><span class="delete">
-| </span><span class="delete">associationExpression</span><span class="delete">
-| </span><span class="delete">responsibilityExpression</span>
-<span class="delete">
-
- | </span><span class="delete">derivationExpression</span><span class="delete">
-| </span><span class="delete">revisionExpression</span><span class="delete">
-| </span><span class="delete">quotationExpression</span> <span class="delete">
- | </span><span class="delete">hadOriginalSourceExpression</span><span class="delete">
-| </span><span class="delete">traceExpression</span>
+ | </span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-startExpression">startExpression
+</a></span> | <span class="prod"><a class="grammarRef" href="#prod-endExpression">endExpression
+</a></span> | <span class="prod"><a class="grammarRef" href="#prod-invalidationExpression">invalidationExpression
+</a></span> | <span class="prod"><a class="grammarRef" href="#prod-communicationExpression">communicationExpression
+</a></span> | <span class="delete">startByActivityExpression</span>
<span class="delete">
- | </span><span class="delete">alternateExpression</span><span class="delete">
-| </span><span class="delete">specializationExpression</span>
+ | </span><span class="prod"><a class="grammarRef" href="#prod-agentExpression">agentExpression
+</a></span> | <span class="prod"><a class="grammarRef" href="#prod-associationExpression"><span class="insert">associationExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-attributionExpression">attributionExpression
+</a></span> | <span class="delete">associationExpression</span>
+<span class="prod"><a class="grammarRef" href="#prod-responsibilityExpression"><span class="insert">responsibilityExpression</span></a></span> | <span class="delete">responsibilityExpression</span>
<span class="delete">
-
- | </span><span class="delete">noteExpression</span><span class="delete">
+ | </span><span class="prod"><a class="grammarRef" href="#prod-derivationExpression">derivationExpression
+</a></span> | <span class="prod"><a class="grammarRef" href="#prod-tracedToExpression"><span class="insert">tracedToExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-hadOriginalSourceExpression"><span class="insert">hadOriginalSourceExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-quotationExpression"><span class="insert">quotationExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-revisionExpression">revisionExpression
+</a></span> | <span class="delete">quotationExpression</span> <span class="delete">
+ | </span><span class="delete">hadOriginalSourceExpression</span>
+<span class="prod"><a class="grammarRef" href="#prod-alternateExpression"><span class="insert">alternateExpression</span></a></span> | <span class="delete">traceExpression</span>
+<span class="delete">
+
+ | </span><span class="delete">alternateExpression</span>
+<span class="prod"><a class="grammarRef" href="#prod-specializationExpression"><span class="insert">specializationExpression</span></a></span> | <span class="delete">specializationExpression</span>
+<span class="prod"><a class="grammarRef" href="#prod-insertionExpression"><span class="insert">insertionExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-removalExpression"><span class="insert">removalExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-membershipExpression"><span class="insert">membershipExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-provenanceLocatorExpression"><span class="insert">provenanceLocatorExpression</span></a></span><span class="insert"> )</span></code></td> </tr> </tbody>
+</table>
+
+
+<span class="delete"> | </span><span class="delete">noteExpression</span><span class="delete">
| </span><span class="delete">annotationExpression</span>
-<span class="delete">
-
-Each expression non-terminal </span><span class="delete">expression</span><span class="delete">, i.e., </span><span class="delete">entityExpression</span><span class="delete">, </span><span class="delete">activityExpression</span> etc., corresponds to one element (entity, activity, etc.) of the PROV data model.
+
+
+Each expression non-terminal <span class="nonterminal">expression</span>, i.e., <span class="nonterminal">entityExpression</span>, <span class="nonterminal">activityExpression</span> etc., corresponds to one element (entity, activity, etc.) of the PROV data model.
<p>A PROV-N document consists of a collection of <a title="expression">expressions</a>, wrapped in an <span class="delete">expression container</span><a href="#dfn-toplevel-bundle" class="internalDFN"><span class="insert">toplevel bundle</span></a> with some namespace declarations, such that the text for an element matches the corresponding <span class="nonterminal">expression</span> production of the grammar.
</p></div>
@@ -1298,23 +1295,26 @@
<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. <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>
+<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, if the set of attribute-value pairs </span>is <span class="insert">present, it is always the last term in any expression.</span></p>
<div class="anexample">
-<p>Derivation has an optional identifier. In the first expression, the identifier is not <span class="delete">available. It</span><span class="insert">available, while it</span> is explicit in the <span class="delete">second, and marked by a</span><span class="insert">second. The third example shows that one can optionally indicate the missing identifier using the</span> <span class="name">-</span> <span class="delete">in the third.</span><span class="insert">marker.</span></p>
+<p><span class="insert">Derivation has an optional identifier. In </span>the first <span class="delete">term</span><span class="insert">expression, the identifier is not available, while it is explicit</span> in <span class="delete">any expression, and the set of attribute-value pairs is the last. </span><span class="delete">
+Consistent with the convention on optional terms, the '</span><span class="insert">the second. The third example shows that one can optionally indicate the missing identifier using the </span><span class="name">-</span><span class="delete">' marker can be used when the identifier is not available. Additionally, the grammar rules are defined in such a way that the optional identifier can be omitted altogether with no ambiguity arising.
+
+</span>
+<span class="delete">Derivation has an optional identifier. In the first expression, the identifier is not available. It is explicit in the second, and marked by a </span><span class="delete">-</span><span class="delete"> in the third.</span><span class="insert"> marker.</span></p>
<pre class="codeexample">wasDerivedFrom(e2, e1)
<span class="delete">wasDerivedFrom(d,</span><span class="insert">wasDerivedFrom(d;</span> e2, e1)
<span class="delete">wasDerivedFrom(-,</span><span class="insert">wasDerivedFrom(-;</span> e2, e1)
</pre>
</div>
-<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">
+<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 <span class="delete">list of attributes.
+</span><span class="insert">list.
+
+
+
+</span><div class="anexample">
<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.
@@ -1345,10 +1345,10 @@
</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">] </span></td> <td><code class="production prod"><span class="insert">entityExpression</span></code></td> <td><span class="insert"> ::= </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">] </span></td> <td><code class="production prod"><span class="insert">optionalAttributeValuePairs</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( "," "[" </span><span class="prod"><a class="grammarRef" href="#prod-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">] </span></td> <td><code class="production prod"><span class="insert">attributeValuePairs</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( | </span><span class="prod"><a class="grammarRef" href="#prod-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">] </span></td> <td><code class="production prod"><span class="insert">attributeValuePair</span></code></td> <td><span class="insert"> ::= </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>
+<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">] </span></td> <td><code class="production prod"><span class="insert">entityExpression</span></code></td> <td><span class="insert"> ::= </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">] </span></td> <td><code class="production prod"><span class="insert">optionalAttributeValuePairs</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( "," "[" </span><span class="prod"><a class="grammarRef" href="#prod-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">] </span></td> <td><code class="production prod"><span class="insert">attributeValuePairs</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( | </span><span class="prod"><a class="grammarRef" href="#prod-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">] </span></td> <td><code class="production prod"><span class="insert">attributeValuePair</span></code></td> <td><span class="insert"> ::= </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>
</table>
@@ -1381,7 +1381,7 @@
<div class="anexample">
<pre class="codeexample">entity(tr:WD-prov-dm-20111215, [ prov:type="document" ])
</pre>
- Here <span class="name">tr:WD-prov-dm-20111215</span> is the <span class="insert">entity identifier, and </span><span class="name"><span class="insert">[ prov:type="document" ]</span></span><span class="insert"> groups the </span>optional <span class="delete">entity identifier, and </span><span class="delete">[ prov:type="document" ]</span><span class="delete"> groups the optional attributes </span><span class="insert">attributes, only one in this example, </span>with their values.
+ Here <span class="name">tr:WD-prov-dm-20111215</span> is the <span class="delete">optional </span>entity identifier, and <span class="name">[ prov:type="document" ]</span> groups the optional <span class="delete">attributes </span><span class="insert">attributes, only one in this example, </span>with their values.
<pre class="codeexample">
entity(tr:WD-prov-dm-20111215)
</pre>
@@ -1401,18 +1401,18 @@
<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">] </span></td> <td><code class="production prod">activityExpression<span class="delete"> ::=
+<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">] </span></td> <td><code class="production prod">activityExpression<span class="delete"> ::=
</span><span class="delete">activity</span>
</code></td> <td><span class="insert"> ::= </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>
-<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">] </span></td> <td><code class="production prod"><span class="insert">timeOrMarker</span></code></td> <td><span class="insert"> ::= </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 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">] </span></td> <td><code class="production prod"><span class="insert">timeOrMarker</span></code></td> <td><span class="insert"> ::= </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></tbody>
+</code></td> </tr> </tbody>
</table>
@@ -1446,12 +1446,12 @@
<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">] </span></td> <td><code class="production prod">generationExpression<span class="delete"> ::=
+<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">] </span></td> <td><code class="production prod">generationExpression<span class="delete"> ::=
</span><span class="delete">wasGeneratedBy</span>
</code></td> <td><span class="insert"> ::= </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>
-<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">] </span></td> <td><code class="production prod"><span class="insert">optionalIdentifier</span></code></td> <td><span class="insert"> ::= </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">] </span></td> <td><code class="production prod"><span class="insert">identifierOrMarker</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-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 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">] </span></td> <td><code class="production prod"><span class="insert">optionalIdentifier</span></code></td> <td><span class="insert"> ::= </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">] </span></td> <td><code class="production prod"><span class="insert">identifierOrMarker</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-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"> )
@@ -1459,7 +1459,7 @@
</span><span class="delete">optional-attribute-values</span>
<span class="delete">)</span>
-</code></td> </tr> </tbody></tbody>
+</code></td> </tr> </tbody>
</table>
@@ -1513,7 +1513,7 @@
<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">] </span></td> <td><code class="production prod"><span class="insert">usageExpression</span></code></td> <td><span class="insert"> ::= </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>
+<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">] </span></td> <td><code class="production prod"><span class="insert">usageExpression</span></code></td> <td><span class="insert"> ::= </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>
</table>
<div class="note"><span class="insert">should this: usageExpression ::= "used" "(" optionalIdentifier aIdentifier "," eIdentifier ( "," timeOrMarker )? optionalAttributeValuePairs ")" </span><br><span class="insert">
@@ -1552,7 +1552,7 @@
<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">] </span></td> <td><code class="production prod">startExpression<span class="delete"> ::=
+<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">] </span></td> <td><code class="production prod">startExpression<span class="delete"> ::=
</span><span class="delete">wasStartedBy</span>
</code></td> <td><span class="insert"> ::= </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>
@@ -1564,7 +1564,7 @@
<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>
+<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>
</table>
@@ -1604,7 +1604,7 @@
<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">] </span></td> <td><code class="production prod">endExpression<span class="delete"> ::=
+<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">] </span></td> <td><code class="production prod">endExpression<span class="delete"> ::=
</span><span class="delete">wasEndedBy</span>
</code></td> <td><span class="insert"> ::= </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>
@@ -1616,7 +1616,7 @@
<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>
+<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>
</table>
@@ -1660,7 +1660,7 @@
<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">] </span></td> <td><code class="production prod">invalidationExpression<span class="delete"> ::=
+<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">] </span></td> <td><code class="production prod">invalidationExpression<span class="delete"> ::=
</span><span class="delete">wasInvalidatedBy</span>
</code></td> <td><span class="insert"> ::= </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>
@@ -1673,7 +1673,7 @@
-<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>
+<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>
</table>
@@ -1712,7 +1712,7 @@
<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">] </span></td> <td><code class="production prod">communicationExpression<span class="delete"> ::=
+<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">] </span></td> <td><code class="production prod">communicationExpression<span class="delete"> ::=
</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>
@@ -1723,7 +1723,7 @@
<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>
+</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>
</table>
@@ -1797,13 +1797,13 @@
<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">] </span></td> <td><code class="production prod">agentExpression<span class="delete"> ::=
+<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">] </span></td> <td><code class="production prod">agentExpression<span class="delete"> ::=
</span><span class="delete">agent</span>
<span class="delete">(</span>
</code></td> <td><span class="insert"> ::= </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></tbody>
+</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>
</table>
@@ -1832,7 +1832,7 @@
<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">] </span></td> <td><code class="production prod">attributionExpression<span class="delete"> ::=
+<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">] </span></td> <td><code class="production prod">attributionExpression<span class="delete"> ::=
</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>
@@ -1843,24 +1843,24 @@
<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>
+</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>
</table>
<div class="anexample">
-<pre class="codeexample"><span class="delete">wasAttributedTo(id,</span><span class="insert">wasAttributedTo(id;</span> e, ag, [ex:license="cc:attributionURL" %% "xsd:QName"])
+<pre class="codeexample"><span class="delete">wasAttributedTo(id,</span><span class="insert">wasAttributedTo(id;</span> e, ag, <span class="delete">[ex:license="cc:attributionURL" %% "xsd:QName"])</span><span class="insert">[ex:license='cc:attributionURL' ])</span>
</pre>
<p> Here <span class="name">id</span> is the optional attribution identifier, <span class="name">e</span> is an entity identifier,
<span class="name">ag</span> is the identifier of the agent to whom the entity is abscribed,
-and <span class="name">[ex:license="cc:attributionURL" %% "xsd:QName"]</span> are optional attributes. </p>
+and <span class="name"><span class="delete">[ex:license="cc:attributionURL" %% "xsd:QName"]</span><span class="insert">[ex:license='cc:attributionURL' ]</span></span> are optional attributes. </p>
The remaining examples show cases where some of the optionals are omitted.
<pre class="codeexample">wasAttributedTo(e, ag)
-wasAttributedTo(e, ag, [ex:license="cc:attributionURL" %% "xsd:QName"])
-<span class="delete">wasAttributedTo(-, e, ag, [ex:license="cc:attributionURL" %% "xsd:QName"])
-</span></pre>
+wasAttributedTo(e, ag, <span class="delete">[ex:license="cc:attributionURL" %% "xsd:QName"])
+wasAttributedTo(-, e, ag, [ex:license="cc:attributionURL" %% "xsd:QName"])</span><span class="insert">[ex:license='cc:attributionURL' ])</span>
+</pre>
</div>
</div>
@@ -1876,7 +1876,7 @@
<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">] </span></td> <td><code class="production prod">associationExpression<span class="delete"> ::=
+<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">] </span></td> <td><code class="production prod">associationExpression<span class="delete"> ::=
</span><span class="delete">wasAssociatedWith</span>
</code></td> <td><span class="insert"> ::= </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>
@@ -1891,7 +1891,7 @@
-<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>
+<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>
</table>
@@ -1935,7 +1935,7 @@
<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">] </span></td> <td><code class="production prod">responsibilityExpression<span class="delete"> ::=
+<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">] </span></td> <td><code class="production prod">responsibilityExpression<span class="delete"> ::=
</span><span class="delete">actedOnBehalfOf</span>
</code></td> <td><span class="insert"> ::= </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>
@@ -1946,7 +1946,7 @@
( </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></tbody>
+<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>
</table>
@@ -1988,7 +1988,7 @@
<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">] </span></td> <td><code class="production prod">derivationExpression<span class="delete"> ::=
+<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">] </span></td> <td><code class="production prod">derivationExpression<span class="delete"> ::=
</span><span class="delete">wasDerivedFrom</span>
</code></td> <td><span class="insert"> ::= </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>
@@ -2008,7 +2008,7 @@
-<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>
+<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>
</table>
@@ -2052,7 +2052,7 @@
<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">] </span></td> <td><code class="production prod">revisionExpression<span class="delete"> ::=
+<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">] </span></td> <td><code class="production prod">revisionExpression<span class="delete"> ::=
</span><span class="delete">wasRevisionOf</span>
</code></td> <td><span class="insert"> ::= </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>
@@ -2063,7 +2063,7 @@
( </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></tbody>
+<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>
</table>
@@ -2106,7 +2106,7 @@
<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">] </span></td> <td><code class="production prod">quotationExpression<span class="delete"> ::=
+<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">] </span></td> <td><code class="production prod">quotationExpression<span class="delete"> ::=
</span><span class="delete">wasQuotedFrom</span>
</code></td> <td><span class="insert"> ::= </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>
@@ -2124,7 +2124,7 @@
-<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>
+<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>
</table>
@@ -2175,7 +2175,7 @@
<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">] </span></td> <td><code class="production prod"><span class="insert">hadOriginalSourceExpression</span></code></td> <td><span class="insert"> ::= </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> (
+<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">] </span></td> <td><code class="production prod"><span class="insert">hadOriginalSourceExpression</span></code></td> <td><span class="insert"> ::= </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>
@@ -2185,7 +2185,7 @@
-<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>
+<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>
</table>
@@ -2228,7 +2228,7 @@
<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">] </span></td> <td><code class="production prod"><span class="insert">tracedToExpression</span></code></td> <td><span class="insert"> ::= </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
+<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">] </span></td> <td><code class="production prod"><span class="insert">tracedToExpression</span></code></td> <td><span class="insert"> ::= </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>
@@ -2236,7 +2236,7 @@
-</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>
+</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>
</table>
@@ -2271,7 +2271,7 @@
<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">] </span></td> <td><code class="production prod">alternateExpression<span class="delete"> ::=
+<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">] </span></td> <td><code class="production prod">alternateExpression<span class="delete"> ::=
</span><span class="delete">alternateOf</span>
<span class="delete">(</span>
</code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"alternateOf" "(" </span><span class="prod"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier
@@ -2280,7 +2280,7 @@
<span class="delete">)</span>
-</a></span><span class="insert"> ")"</span></code></td> </tr> </tbody></tbody>
+</a></span><span class="insert"> ")"</span></code></td> </tr> </tbody>
</table>
@@ -2304,14 +2304,14 @@
<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">] </span></td> <td><code class="production prod">specializationExpression<span class="delete"> ::=
+<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">] </span></td> <td><code class="production prod">specializationExpression<span class="delete"> ::=
</span><span class="delete">specializationOf</span>
<span class="delete">(</span>
</code></td> <td><span class="insert"> ::= </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></tbody>
+</a></span><span class="insert"> ")"</span></code></td> </tr> </tbody>
</table>
@@ -2329,58 +2329,67 @@
<span class="delete">Grammar for collections </span><span class="delete">may</span><span class="delete"> under go minor syntactic changes since it has not been implemented yet.</span>
+
+
+
In the productions in this section, nonterminals <span class="nonterminal">keyValuePairs</span> and <span class="nonterminal">keySet</span> are defined as follows.
-<div class="grammar">
-<span class="nonterminal">keyValuePairs</span> ::=
-<span class="name">(</span>
- <span class="nonterminal">literal</span>
- <span class="name">,</span>
-<span class="nonterminal">eidentifier</span>
- <span class="name">)</span>
+
+<span class="delete">keyValuePairs</span><span class="delete"> ::=
+</span><span class="delete">(</span>
+ <span class="delete">literal</span>
+ <span class="delete">,</span>
+<span class="delete">eidentifier</span>
+ <span class="delete">)</span><span class="delete">
|
-<span class="name">(</span>
- <span class="nonterminal">literal</span>
- <span class="name">,</span>
-<span class="nonterminal">eidentifier</span>
-<span class="name">)</span>
- <span class="name">,</span>
-<span class="nonterminal">keyValuePairs</span>
-</div>
-
- <div class="grammar">
-<span class="nonterminal">keySet</span> ::=
- <span class="nonterminal">literal</span>
+</span><span class="delete">(</span>
+ <span class="delete">literal</span>
+ <span class="delete">,</span>
+<span class="delete">eidentifier</span>
+<span class="delete">)</span>
+ <span class="delete">,</span>
+<span class="delete">keyValuePairs</span>
+
+
+
+<span class="delete">keySet</span><span class="delete"> ::=
+ </span><span class="delete">literal</span><span class="delete">
|
- <span class="nonterminal">literal</span>
- <span class="name">,</span>
-<span class="nonterminal">keySet</span>
-</div>
+ </span><span class="delete">literal</span>
+ <span class="delete">,</span>
+<span class="delete">keySet</span>
+
+
+
+
+
<div id="expression-collection-insertion" class="section">
<h4><span class="secno">3.5.1 </span>Insertion</h4>
-<div class="grammar">
- <span class="nonterminal">derivationByInsertionFromExpression</span> ::=
-<span class="name">derivedByInsertionFrom</span>
- <span class="name">(</span>
- <span class="optional"><span class="nonterminal">identifier</span>
- <span class="name">,</span></span>
-<span class="nonterminal">cIdentifier</span>
- <span class="name">,</span>
-<span class="nonterminal">cIdentifier</span>
- <span class="name">,</span>
- <span class="name">{</span>
- <span class="nonterminal">keyValuePairs</span>
- <span class="name">}</span>
-<span class="nonterminal">optional-attribute-values</span>
- <span class="name">)</span>
-</div>
+
+ <span class="delete">derivationByInsertionFromExpression</span><span class="delete"> ::=
+</span><span class="delete">derivedByInsertionFrom</span>
+
+
+
<table class="grammar">
-<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">] </span></td> <td><code class="production prod"><span class="insert">insertionExpression</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"derivedByInsertionFrom" "(" </span><span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier"><span class="insert">optionalIdentifier</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-cIdentifier"><span class="insert">cIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-cIdentifier"><span class="insert">cIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-keyEntitySet"><span class="insert">keyEntitySet</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs"><span class="insert">optionalAttributeValuePairs</span></a></span><span class="insert"> ")"</span></code></td> </tr> </tbody></tbody>
-<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">] </span></td> <td><code class="production prod"><span class="insert">keyEntitySet</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"{" "(" </span><span class="prod"><a class="grammarRef" href="#prod-literal"><span class="insert">literal</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span><span class="insert"> ")" ( "," "(" </span><span class="prod"><a class="grammarRef" href="#prod-literal"><span class="insert">literal</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span><span class="insert"> ")" )* "}"</span></code></td> </tr> </tbody></tbody>
+<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">] </span></td> <td><code class="production prod"><span class="insert">insertionExpression</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"derivedByInsertionFrom" "(" </span><span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier"><span class="insert">optionalIdentifier</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-cIdentifier"><span class="insert">cIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-cIdentifier"><span class="insert">cIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-keyEntitySet"><span class="insert">keyEntitySet</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs"><span class="insert">optionalAttributeValuePairs</span></a></span><span class="insert"> ")"</span></code></td> </tr> </tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-keyEntitySet" name="prod-keyEntitySet"></a><span class="insert">[</span><span class="prodNo"><span class="insert">29</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">keyEntitySet</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"{" "(" </span><span class="prod"><a class="grammarRef" href="#prod-literal"><span class="insert">literal</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span><span class="insert"> ")" </span>(
+ <span class="insert"> "," "(" </span><span class="prod"><a class="grammarRef" href="#prod-literal"><span class="insert">literal</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-identifier">identifier
+ <span class="delete">,</span>
+<span class="delete">cIdentifier</span>
+ <span class="delete">,</span>
+<span class="delete">cIdentifier</span>
+ <span class="delete">,</span>
+ <span class="delete">{</span>
+ <span class="delete">keyValuePairs</span>
+ <span class="delete">}</span>
+<span class="delete">optional-attribute-values</span>
+ <span class="delete">)</span>
+</a></span><span class="insert"> ")" )* "}"</span></code></td> </tr> </tbody>
</table>
<div class="anexample">
@@ -2407,26 +2416,30 @@
<div id="expression-collection-removal" class="section">
<h4><span class="secno">3.5.2 </span>Removal</h4>
-<div class="grammar">
- <span class="nonterminal">derivationByRemovalFromExpression</span> ::=
-<span class="name">derivedByRemovalFrom</span>
- <span class="name">(</span>
- <span class="optional"><span class="nonterminal">identifier</span>
- <span class="name">,</span></span>
-<span class="nonterminal">cIdentifier</span>
- <span class="name">,</span>
-<span class="nonterminal">cIdentifier</span>
- <span class="name">,</span>
- <span class="name">{</span>
- <span class="nonterminal">keySet</span>
- <span class="name">}</span>
-<span class="nonterminal">optional-attribute-values</span>
- <span class="name">)</span>
- <br>
-</div>
+
+ <span class="delete">derivationByRemovalFromExpression</span><span class="delete"> ::=
+</span><span class="delete">derivedByRemovalFrom</span>
+
+
+
<table class="grammar">
-<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">] </span></td> <td><code class="production prod"><span class="insert">removalExpression</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"derivedByRemovalFrom" "(" </span><span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier"><span class="insert">optionalIdentifier</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-cIdentifier"><span class="insert">cIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-cIdentifier"><span class="insert">cIdentifier</span></a></span><span class="insert"> "," "{" </span><span class="prod"><a class="grammarRef" href="#prod-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>
+<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">] </span></td> <td><code class="production prod"><span class="insert">removalExpression</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"derivedByRemovalFrom" "(" </span><span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier"><span class="insert">optionalIdentifier</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-cIdentifier"><span class="insert">cIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-cIdentifier"><span class="insert">cIdentifier</span></a></span><span class="insert"> "," "{" </span><span class="prod"><a class="grammarRef" href="#prod-literal"><span class="insert">literal</span></a></span> (
+ <span class="delete">identifier</span>
+ <span class="delete">,</span>
+<span class="delete">cIdentifier</span>
+ <span class="delete">,</span>
+<span class="delete">cIdentifier</span>
+ <span class="delete">,</span>
+ <span class="delete">{</span>
+ <span class="delete">keySet</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-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>
</table>
@@ -2453,24 +2466,26 @@
<div id="expression-collection-membership" class="section">
<h4><span class="secno">3.5.3 </span>Membership</h4>
-<div class="grammar">
- <span class="nonterminal">membershipExpression</span> ::=
-<span class="name">isMemberOf</span>
- <span class="name">(</span>
- <span class="optional"><span class="nonterminal">identifier</span>
- <span class="name">,</span></span>
-<span class="nonterminal">cIdentifier</span>
- <span class="name">,</span>
- <span class="name">{</span>
- <span class="nonterminal">keyValuePairs</span>
- <span class="name">}</span>
-<span class="nonterminal">optional-attribute-values</span>
- <span class="name">)</span>
- <br>
-</div>
+
+
+
+
<table class="grammar">
-<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">] </span></td> <td><code class="production prod"><span class="insert">membershipExpression</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"memberOf" "(" </span><span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier"><span class="insert">optionalIdentifier</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-cIdentifier"><span class="insert">cIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-keyEntitySet"><span class="insert">keyEntitySet</span></a></span><span class="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>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-membershipExpression" name="prod-membershipExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">31</span></span><span class="insert">] </span></td> <td><code class="production prod">membershipExpression<span class="delete"> ::=
+</span><span class="delete">isMemberOf</span>
+ </code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"memberOf" "(" </span><span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier"><span class="insert">optionalIdentifier</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-cIdentifier"><span class="insert">cIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-keyEntitySet"><span class="insert">keyEntitySet</span></a></span> (
+ <span class="delete">identifier</span>
+ <span class="delete">,</span>
+<span class="delete">cIdentifier</span>
+ <span class="delete">,</span>
+ <span class="delete">{</span>
+ <span class="delete">keyValuePairs</span>
+ <span class="delete">}</span>
+<span class="delete">optional-attribute-values</span>
+ <span class="insert"> "," ( "true" | "false" </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>
</table>
@@ -2505,9 +2520,19 @@
<h4><span class="secno"><span class="insert">3.6.1 </span></span><span class="insert">Bundle Declaration</span></h4>
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-namedBundle"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-namedBundle" name="prod-namedBundle"></a><span class="insert">[</span><span class="prodNo"><span class="insert">32</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">namedBundle</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"bundle" </span><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span><span class="insert"> (</span><span class="prod"><a class="grammarRef" href="#prod-namespaceDeclarations"><span class="insert">namespaceDeclarations</span></a></span><span class="insert">)? (</span><span class="prod"><a class="grammarRef" href="#prod-expression"><span class="insert">expression</span></a></span><span class="insert">)* "endBundle"</span></code></td> </tr> </tbody></tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-namedBundle" name="prod-namedBundle"></a><span class="insert">[</span><span class="prodNo"><span class="insert">32</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">namedBundle</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"bundle" </span><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span><span class="insert"> (</span><span class="prod"><a class="grammarRef" href="#prod-namespaceDeclarations"><span class="insert">namespaceDeclarations</span></a></span><span class="insert">)? (</span><span class="prod"><a class="grammarRef" href="#prod-expression"><span class="insert">expression</span></a></span><span class="insert">)* "endBundle"</span></code></td> </tr> </tbody>
</table>
+<div class="anexample">
+ <pre class="codeexample"><span class="insert">bundle ex:author-view
+ agent(ex:Paolo, [ prov:type='prov:Person' ])
+ agent(ex:Simon, [ prov:type='prov:Person' ])
+ ...
+endBundle
+ </span></pre>
+<p><span class="insert"> Here </span><span class="name"><span class="insert">ex:author-view</span></span><span class="insert"> is the name of the bundle.
+</span></p></div>
+
</div>
@@ -2516,11 +2541,29 @@
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-provenanceLocatorExpression"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-provenanceLocatorExpression" name="prod-provenanceLocatorExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">33</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">provenanceLocatorExpression</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"hasProvenanceIn" "(" </span><span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier"><span class="insert">optionalIdentifier</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-identifierOrMarker"><span class="insert">identifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-identifierOrMarker"><span class="insert">identifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-iriOrMarker"><span class="insert">iriOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-iriOrMarker"><span class="insert">iriOrMarker</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs"><span class="insert">optionalAttributeValuePairs</span></a></span><span class="insert"> ")"</span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-iriOrMarker"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-iriOrMarker" name="prod-iriOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">34</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">iriOrMarker</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-IRI_REF"><span class="insert">IRI_REF</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody></tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-provenanceLocatorExpression" name="prod-provenanceLocatorExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">33</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">provenanceLocatorExpression</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"hasProvenanceIn" "(" </span><span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier"><span class="insert">optionalIdentifier</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-identifierOrMarker"><span class="insert">identifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-identifierOrMarker"><span class="insert">identifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-iriOrMarker"><span class="insert">iriOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-iriOrMarker"><span class="insert">iriOrMarker</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs"><span class="insert">optionalAttributeValuePairs</span></a></span><span class="insert"> ")"</span></code></td> </tr> </tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-iriOrMarker" name="prod-iriOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">34</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">iriOrMarker</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-IRI_REF"><span class="insert">IRI_REF</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody>
</table>
+<div class="anexample">
+ <pre class="codeexample"><span class="insert">
+bundle bob:bundle4
+ entity(ex:report1, ...)
+endBundle
+
+bundle alice:bundle5
+ entity(ex:report1)
+ hasProvenanceIn(ex:report1, bob:bundle4, -, -, -)
+ entity(ex:report2, ...)
+ wasDerivedFrom(ex:report2, ex:report1)
+endBundle
+</span></pre><span class="insert">
+
+In bundle </span><span class="name"><span class="insert">alice:bundle5</span></span><span class="insert">, there is a description for entity </span><span class="name"><span class="insert">ex:report1</span></span><span class="insert">, and a provenance locator pointing to bundle </span><span class="name"><span class="insert">bob:bundle4</span></span><span class="insert">.
+The locator indicates that some provenance description for </span><span class="name"><span class="insert">ex:report1</span></span><span class="insert"> can be found in bundle </span><span class="name"><span class="insert">bob:bundle4</span></span><span class="insert">.
+</span></div>
+
</div>
</div>
@@ -2592,25 +2635,26 @@
<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">
-<span class="nonterminal">namespaceDeclarations</span> ::=
- | <span class="group"><span class="nonterminal">defaultNamespaceDeclaration</span> | <span class="nonterminal">namespaceDeclaration</span></span> <span class="star"> <span class="nonterminal">namespaceDeclaration</span></span><br>
-<span class="nonterminal">namespaceDeclaration</span> ::=
-<span class="name">prefix</span> <span class="nonterminal">prefix</span> <span class="nonterminal">IRI</span><br>
-<span class="nonterminal">defaultNamespaceDeclaration</span> ::=
- <span class="name">default</span> <span class="nonterminal">IRI</span> <br>
-</div>
<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">53</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">namespaceDeclarations</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-defaultNamespaceDeclaration"><span class="insert">defaultNamespaceDeclaration</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-namespaceDeclaration"><span class="insert">namespaceDeclaration</span></a></span><span class="insert"> ) (</span><span class="prod"><a class="grammarRef" href="#prod-namespaceDeclaration"><span class="insert">namespaceDeclaration</span></a></span><span class="insert">)*</span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-namespaceDeclaration"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-namespaceDeclaration" name="prod-namespaceDeclaration"></a><span class="insert">[</span><span class="prodNo"><span class="insert">54</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">namespaceDeclaration</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"prefix" </span><span class="prod"><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-namespace"><span class="insert">namespace</span></a></span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-defaultNamespaceDeclaration"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-defaultNamespaceDeclaration" name="prod-defaultNamespaceDeclaration"></a><span class="insert">[</span><span class="prodNo"><span class="insert">55</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">defaultNamespaceDeclaration</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"default" </span><span class="prod"><a class="grammarRef" href="#prod-IRI_REF"><span class="insert">IRI_REF</span></a></span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-IRI_REF"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-IRI_REF" name="prod-IRI_REF"></a><span class="insert">[</span><span class="prodNo"><span class="insert">62</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">IRI_REF</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"<" ( [^<>"{}|^`\] - [#0000- ] | </span><span class="prod"><a class="grammarRef" href="#prod-UCHAR"><span class="insert">UCHAR</span></a></span><span class="insert"> )* ">"</span></code></td> </tr> </tbody></tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-namespaceDeclarations" name="prod-namespaceDeclarations"></a><span class="insert">[</span><span class="prodNo"><span class="insert">53</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">namespaceDeclarations</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-defaultNamespaceDeclaration"><span class="insert">defaultNamespaceDeclaration</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-namespaceDeclaration"><span class="insert">namespaceDeclaration</span></a></span><span class="insert"> ) (</span><span class="prod"><a class="grammarRef" href="#prod-namespaceDeclaration"><span class="insert">namespaceDeclaration</span></a></span><span class="insert">)*</span></code></td> </tr> </tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-namespaceDeclaration" name="prod-namespaceDeclaration"></a><span class="insert">[</span><span class="prodNo"><span class="insert">54</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">namespaceDeclaration</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"prefix" </span><span class="prod"><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-namespace"><span class="insert">namespace</span></a></span></code></td> </tr> </tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-defaultNamespaceDeclaration" name="prod-defaultNamespaceDeclaration"></a><span class="insert">[</span><span class="prodNo"><span class="insert">55</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">defaultNamespaceDeclaration</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"default" </span><span class="prod"><a class="grammarRef" href="#prod-IRI_REF"><span class="insert">IRI_REF</span></a></span></code></td> </tr> </tbody>
+<tbody class="term"> <tr valign="baseline"> <td><a id="prod-IRI_REF" name="prod-IRI_REF"></a><span class="insert">[</span><span class="prodNo"><span class="insert">62</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">IRI_REF</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"<" ( [^<>"{}|^`\] - [#0000- ] | </span><span class="prod"><a class="grammarRef" href="#prod-UCHAR"><span class="insert">UCHAR</span></a></span><span class="insert"> )* ">"</span></code></td> </tr> </tbody>
</table>
+
+<span class="delete">namespaceDeclarations</span><span class="delete"> ::=
+ | </span><span class="delete">defaultNamespaceDeclaration</span><span class="delete"> | </span><span class="delete">namespaceDeclaration</span> <span class="delete">namespaceDeclaration</span>
+<span class="delete">namespaceDeclaration</span><span class="delete"> ::=
+</span><span class="delete">prefix</span> <span class="delete">prefix</span> <span class="delete">IRI</span>
+<span class="delete">defaultNamespaceDeclaration</span><span class="delete"> ::=
+ </span><span class="delete">default</span> <span class="delete">IRI</span>
+
+
<p>In PROV-N, the following prefixes are reserved:
</p><ul>
<li> <span class="name">prov</span> denotes the PROV namespace with URI <span class="name">http://www.w3.org/ns/prov#</span></li>
@@ -2646,31 +2690,27 @@
qualified name, it refers to a <a>namespace</a> declared in a namespace declaration. In the absence of prefix, the qualified name
refers to the <a title="default namespace declaration">default namespace</a>.</p>
-<div class="grammar">
-<span class="nonterminal"><span class="insert">eIdentifier</span></span><span class="insert"> ::= </span><span class="nonterminal">identifier</span><br>
-<span class="nonterminal"><span class="insert">aIdentifier</span></span> ::= <span class="nonterminal"><span class="delete">qualifiedName</span><span class="insert">identifier</span></span><br>
-<span class="nonterminal"><span class="insert">agIdentifier</span></span><span class="insert"> ::= </span><span class="nonterminal"><span class="insert">identifier</span></span><br>
-<span class="nonterminal"><span class="insert">gIdentifier</span></span><span class="insert"> ::= </span><span class="nonterminal"><span class="insert">identifier</span></span><br>
-
-<span class="nonterminal"><span class="insert">identifier</span></span><span class="insert"> ::= </span><span class="nonterminal"><span class="insert">QUALNAME</span></span><br>
-<span class="nonterminal">eIdentifier</span> ::= <span class="nonterminal">identifier</span> <em>(intended to denote an entity)</em><br>
-<span class="nonterminal">aIdentifier</span> ::= <span class="nonterminal">identifier</span> <em>(intended to denote an activity)</em><br>
-<span class="nonterminal">agIdentifier</span> ::= <span class="nonterminal">identifier</span> <em>(intended to denote an agent)</em><br>
-<span class="nonterminal">gIdentifier</span>::= <span class="nonterminal">identifier</span> <em>(intended to denote a generation)</em><br>
-<span class="nonterminal">uIdentifier</span>::= <span class="nonterminal">identifier</span> <em>(intended to denote a usage)</em><br>
-<span class="nonterminal">nIdentifier</span>::= <span class="nonterminal">identifier</span> <em>(intended to denote a note)</em><br>
-<span class="nonterminal">cIdentifier</span>::= <span class="nonterminal">identifier</span> <em>(intended to denote a collection)</em><br>
+
+<span class="delete">identifier</span><span class="delete"> ::= </span><span class="delete">qualifiedName</span>
+<span class="delete">eIdentifier</span><span class="delete"> ::= </span><span class="delete">identifier</span> <span class="delete">(intended to denote an entity)</span>
+<span class="delete">aIdentifier</span><span class="delete"> ::= </span><span class="delete">identifier</span> <span class="delete">(intended to denote an activity)</span>
+<span class="delete">agIdentifier</span><span class="delete"> ::= </span><span class="delete">identifier</span> <span class="delete">(intended to denote an agent)</span>
+<span class="delete">gIdentifier</span><span class="delete">::= </span><span class="delete">identifier</span> <span class="delete">(intended to denote</span>
+
+
+
+
+<p><span class="insert">A PROV qualified name </span><a class="grammarRef" href="#term-prov_n_LL-QUALNAME"><span class="insert">QUALNAME</span></a><span class="insert"> has</span> a <span class="delete">generation)</span>
+<span class="delete">uIdentifier</span><span class="delete">::= </span><span class="delete">identifier</span> <span class="delete">(intended to denote a usage)</span>
+<span class="delete">nIdentifier</span><span class="delete">::= </span><span class="delete">identifier</span> <span class="delete">(intended to denote a note)</span>
+<span class="delete">cIdentifier</span><span class="delete">::= </span><span class="delete">identifier</span> <span class="delete">(intended to denote a collection)</span>
<span class="delete">qualifiedName</span><span class="delete"> ::=
</span>
<span class="delete">prefix</span> <span class="delete">:</span>
<span class="delete">localPart</span><span class="delete"> | </span><span class="delete">:</span> <span class="delete">localPart</span>
-<span class="delete">prefix</span><span class="delete"> ::= </span></div>
-
-
-
-<p><span class="insert">A PROV qualified name </span><a class="grammarRef" href="#term-prov_n_LL-QUALNAME"><span class="insert">QUALNAME</span></a><span class="insert"> has </span>a <span class="delete">name without colon compatible with the </span><span class="delete">NC_NAME</span><span class="delete"> production</span><span class="insert">more permissive syntax then XML's </span><a href="http://www.w3.org/TR/2009/REC-xml-names-20091208/#NT-QName"><span class="insert">QName</span></a> [<cite><a class="bibref" rel="biblioentry" href="#bib-XML-NAMES">XML-NAMES</a></cite>]
+<span class="delete">prefix</span><span class="delete"> ::= </span><span class="delete">a name without colon compatible with the </span><span class="delete">NC_NAME</span><span class="delete"> production</span><span class="insert">more permissive syntax then XML's </span><a href="http://www.w3.org/TR/2009/REC-xml-names-20091208/#NT-QName"><span class="insert">QName</span></a> [<cite><a class="bibref" rel="biblioentry" href="#bib-XML-NAMES">XML-NAMES</a></cite>]
<span class="delete">localPart</span><span class="delete"> ::= </span><span class="delete">a name compatible with the
</span><span class="delete">reference</span><span class="delete"> production</span><span class="insert">
and SPARQL </span><a href="http://www.w3.org/TR/2008/REC-rdf-sparql-query-20080115/#rPrefixedName"><span class="insert">PrefixedName</span></a> [<cite><span class="delete">RDFA-CORE</span><a class="bibref" rel="biblioentry" href="#bib-RDF-SPARQL-QUERY"><span class="insert">RDF-SPARQL-QUERY</span></a></cite><span class="delete">]</span>
@@ -2695,25 +2735,25 @@
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-eIdentifier"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-eIdentifier" name="prod-eIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">35</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">eIdentifier</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-aIdentifier"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-aIdentifier" name="prod-aIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">36</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">aIdentifier</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-agIdentifier"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-agIdentifier" name="prod-agIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">37</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">agIdentifier</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-gIdentifier"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-gIdentifier" name="prod-gIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">38</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">gIdentifier</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-uIdentifier"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-uIdentifier" name="prod-uIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">39</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">uIdentifier</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-cIdentifier"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-cIdentifier" name="prod-cIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">40</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">cIdentifier</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span></code></td> </tr> </tbody></tbody>
-
-<tbody class="grammar-ref" data-ref="prod-eIdentifierOrMarker"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-eIdentifierOrMarker" name="prod-eIdentifierOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">41</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">eIdentifierOrMarker</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-eIdentifier"><span class="insert">eIdentifier</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-aIdentifierOrMarker"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-aIdentifierOrMarker" name="prod-aIdentifierOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">42</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">aIdentifierOrMarker</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-aIdentifier"><span class="insert">aIdentifier</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-agIdentifierOrMarker"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-agIdentifierOrMarker" name="prod-agIdentifierOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">43</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">agIdentifierOrMarker</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-agIdentifier"><span class="insert">agIdentifier</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-gIdentifierOrMarker"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-gIdentifierOrMarker" name="prod-gIdentifierOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">44</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">gIdentifierOrMarker</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-gIdentifier"><span class="insert">gIdentifier</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-uIdentifierOrMarker"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-uIdentifierOrMarker" name="prod-uIdentifierOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">45</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">uIdentifierOrMarker</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-uIdentifier"><span class="insert">uIdentifier</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-identifier"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-identifier" name="prod-identifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">46</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">identifier</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a></span></code></td> </tr> </tbody></tbody>
-
-<tbody class="grammar-ref" data-ref="prod-QUALNAME"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-QUALNAME" name="prod-QUALNAME"></a><span class="insert">[</span><span class="prodNo"><span class="insert">57</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">QUALNAME</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-PN_PREFIX"><span class="insert">PN_PREFIX</span></a></span><span class="insert"> ":" )? </span><span class="prod"><a class="grammarRef" href="#prod-PN_LOCAL"><span class="insert">PN_LOCAL</span></a></span><br><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-PN_PREFIX"><span class="insert">PN_PREFIX</span></a></span><span class="insert"> ":"</span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-PN_LOCAL"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-PN_LOCAL" name="prod-PN_LOCAL"></a><span class="insert">[</span><span class="prodNo"><span class="insert">75</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">PN_LOCAL</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_U"><span class="insert">PN_CHARS_U</span></a></span><span class="insert"> | [0-9] | </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS"><span class="insert">PN_CHARS_OTHERS</span></a></span><span class="insert"> ) ( ( </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS"><span class="insert">PN_CHARS</span></a></span><span class="insert"> | "." | </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS"><span class="insert">PN_CHARS_OTHERS</span></a></span><span class="insert"> )* ( </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS"><span class="insert">PN_CHARS</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS"><span class="insert">PN_CHARS_OTHERS</span></a></span><span class="insert"> ) )?</span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-PN_CHARS_OTHERS"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-PN_CHARS_OTHERS" name="prod-PN_CHARS_OTHERS"></a><span class="insert">[</span><span class="prodNo"><span class="insert">76</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">PN_CHARS_OTHERS</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-PERCENT"><span class="insert">PERCENT</span></a></span><br><span class="insert"> | "/"</span><br><span class="insert"> | "@"</span><br><span class="insert"> | "~"</span><br><span class="insert"> | "&"</span><br><span class="insert"> | "+"</span><br><span class="insert"> | "?"</span><br><span class="insert"> | "#"</span><br><span class="insert"> | "$"</span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-PERCENT"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-PERCENT" name="prod-PERCENT"></a><span class="insert">[</span><span class="prodNo"><span class="insert">77</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">PERCENT</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"%" </span><span class="prod"><a class="grammarRef" href="#prod-HEX"><span class="insert">HEX</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-HEX"><span class="insert">HEX</span></a></span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-HEX"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-HEX" name="prod-HEX"></a><span class="insert">[</span><span class="prodNo"><span class="insert">78</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">HEX</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">[0-9]</span><br><span class="insert"> | [A-F]</span><br><span class="insert"> | [a-f]</span></code></td> </tr> </tbody></tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-eIdentifier" name="prod-eIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">35</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">eIdentifier</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span></code></td> </tr> </tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-aIdentifier" name="prod-aIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">36</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">aIdentifier</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span></code></td> </tr> </tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-agIdentifier" name="prod-agIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">37</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">agIdentifier</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span></code></td> </tr> </tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-gIdentifier" name="prod-gIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">38</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">gIdentifier</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span></code></td> </tr> </tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-uIdentifier" name="prod-uIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">39</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">uIdentifier</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span></code></td> </tr> </tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-cIdentifier" name="prod-cIdentifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">40</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">cIdentifier</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier"><span class="insert">identifier</span></a></span></code></td> </tr> </tbody>
+
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-eIdentifierOrMarker" name="prod-eIdentifierOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">41</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">eIdentifierOrMarker</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-eIdentifier"><span class="insert">eIdentifier</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-aIdentifierOrMarker" name="prod-aIdentifierOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">42</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">aIdentifierOrMarker</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-aIdentifier"><span class="insert">aIdentifier</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-agIdentifierOrMarker" name="prod-agIdentifierOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">43</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">agIdentifierOrMarker</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-agIdentifier"><span class="insert">agIdentifier</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-gIdentifierOrMarker" name="prod-gIdentifierOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">44</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">gIdentifierOrMarker</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-gIdentifier"><span class="insert">gIdentifier</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-uIdentifierOrMarker" name="prod-uIdentifierOrMarker"></a><span class="insert">[</span><span class="prodNo"><span class="insert">45</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">uIdentifierOrMarker</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-uIdentifier"><span class="insert">uIdentifier</span></a></span><span class="insert"> | "-" )</span></code></td> </tr> </tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-identifier" name="prod-identifier"></a><span class="insert">[</span><span class="prodNo"><span class="insert">46</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">identifier</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a></span></code></td> </tr> </tbody>
+
+<tbody class="term"> <tr valign="baseline"> <td><a id="prod-QUALNAME" name="prod-QUALNAME"></a><span class="insert">[</span><span class="prodNo"><span class="insert">57</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">QUALNAME</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-PN_PREFIX"><span class="insert">PN_PREFIX</span></a></span><span class="insert"> ":" )? </span><span class="prod"><a class="grammarRef" href="#prod-PN_LOCAL"><span class="insert">PN_LOCAL</span></a></span><br><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-PN_PREFIX"><span class="insert">PN_PREFIX</span></a></span><span class="insert"> ":"</span></code></td> </tr> </tbody>
+<tbody class="term"> <tr valign="baseline"> <td><a id="prod-PN_LOCAL" name="prod-PN_LOCAL"></a><span class="insert">[</span><span class="prodNo"><span class="insert">75</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">PN_LOCAL</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_U"><span class="insert">PN_CHARS_U</span></a></span><span class="insert"> | [0-9] | </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS"><span class="insert">PN_CHARS_OTHERS</span></a></span><span class="insert"> ) ( ( </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS"><span class="insert">PN_CHARS</span></a></span><span class="insert"> | "." | </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS"><span class="insert">PN_CHARS_OTHERS</span></a></span><span class="insert"> )* ( </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS"><span class="insert">PN_CHARS</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS"><span class="insert">PN_CHARS_OTHERS</span></a></span><span class="insert"> ) )?</span></code></td> </tr> </tbody>
+<tbody class="term"> <tr valign="baseline"> <td><a id="prod-PN_CHARS_OTHERS" name="prod-PN_CHARS_OTHERS"></a><span class="insert">[</span><span class="prodNo"><span class="insert">76</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">PN_CHARS_OTHERS</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-PERCENT"><span class="insert">PERCENT</span></a></span><br><span class="insert"> | "/"</span><br><span class="insert"> | "@"</span><br><span class="insert"> | "~"</span><br><span class="insert"> | "&"</span><br><span class="insert"> | "+"</span><br><span class="insert"> | "?"</span><br><span class="insert"> | "#"</span><br><span class="insert"> | "$"</span></code></td> </tr> </tbody>
+<tbody class="term"> <tr valign="baseline"> <td><a id="prod-PERCENT" name="prod-PERCENT"></a><span class="insert">[</span><span class="prodNo"><span class="insert">77</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">PERCENT</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"%" </span><span class="prod"><a class="grammarRef" href="#prod-HEX"><span class="insert">HEX</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-HEX"><span class="insert">HEX</span></a></span></code></td> </tr> </tbody>
+<tbody class="term"> <tr valign="baseline"> <td><a id="prod-HEX" name="prod-HEX"></a><span class="insert">[</span><span class="prodNo"><span class="insert">78</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">HEX</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">[0-9]</span><br><span class="insert"> | [A-F]</span><br><span class="insert"> | [a-f]</span></code></td> </tr> </tbody>
</table>
@@ -2769,15 +2809,16 @@
<div id="expression-attribute" class="section">
<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> ::= <span class="nonterminal">qualifiedName</span><br>
-</div>
+
<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">47</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">attribute</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a></span></code></td> </tr> </tbody></tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-attribute" name="prod-attribute"></a><span class="insert">[</span><span class="prodNo"><span class="insert">47</span></span><span class="insert">] </span></td> <td><code class="production prod">attribute<span class="delete"> ::= </span><span class="delete">qualifiedName</span>
+
+
+</code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a></span></code></td> </tr> </tbody>
</table>
@@ -2801,28 +2842,32 @@
<div id="expression-literal" class="section">
<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> ::= <span class="nonterminal">typedLiteral</span> | <span class="nonterminal">convenienceNotation</span> <br>
-<span class="nonterminal">typedLiteral</span> ::= <span class="nonterminal">quotedString</span> <span class="name">%%</span> <span class="nonterminal">datatype</span><br>
-<span class="nonterminal">datatype</span> ::= <span class="nonterminal">qualifiedName</span> <em> listed in Table <a href="#permitted-datatypes">permitted-datatypes</a></em><br>
-<span class="nonterminal">convenienceNotation</span> ::= <span class="nonterminal">stringLiteral</span> | <span class="nonterminal">intLiteral</span><br>
-<span class="nonterminal">stringLiteral</span> ::= <span class="nonterminal">quotedString</span><br>
-<span class="nonterminal">quotedString</span> ::= <em>a finite sequence of characters in which " (#x22) and \ (#x5C) occur only in pairs of the form \" (#x5C, #x22) and \\ (#x5C,
-#x5C), enclosed in a pair of " (#x22) characters</em><br>
-<span class="nonterminal">intLiteral</span> ::= <em>a finite-length non-empty sequence of decimal digits (#x30-#x39) with an optional leading negative sign (-)</em>
-</div>
+
+<span class="delete">Literal</span><span class="delete"> ::= </span>
+
+
<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">49</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">literal</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-typedLiteral"><span class="insert">typedLiteral</span></a></span><br><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-convenienceNotation"><span class="insert">convenienceNotation</span></a></span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-typedLiteral"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-typedLiteral" name="prod-typedLiteral"></a><span class="insert">[</span><span class="prodNo"><span class="insert">50</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">typedLiteral</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-STRING_LITERAL"><span class="insert">STRING_LITERAL</span></a></span><span class="insert"> "%%" </span><span class="prod"><a class="grammarRef" href="#prod-datatype"><span class="insert">datatype</span></a></span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-datatype"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-datatype" name="prod-datatype"></a><span class="insert">[</span><span class="prodNo"><span class="insert">51</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">datatype</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a></span></code></td> </tr> </tbody></tbody>
-<tbody><tr valign="baseline"><td></td><td><em><span class="insert">where </span><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a><span class="insert"> is listed in Table </span><a href="#permitted-datatypes"><span class="insert">permitted-datatypes</span></a></em></td></tr></tbody>
-<tbody class="grammar-ref" data-ref="prod-convenienceNotation"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-convenienceNotation" name="prod-convenienceNotation"></a><span class="insert">[</span><span class="prodNo"><span class="insert">52</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">convenienceNotation</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-STRING_LITERAL"><span class="insert">STRING_LITERAL</span></a></span><br><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-INT_LITERAL"><span class="insert">INT_LITERAL</span></a></span><br><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-QUALNAME_LITERAL"><span class="insert">QUALNAME_LITERAL</span></a></span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-STRING_LITERAL"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-STRING_LITERAL" name="prod-STRING_LITERAL"></a><span class="insert">[</span><span class="prodNo"><span class="insert">63</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">STRING_LITERAL</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">'"' ( ( [^"\
-
-] ) | </span><span class="prod"><a class="grammarRef" href="#prod-ECHAR"><span class="insert">ECHAR</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-UCHAR"><span class="insert">UCHAR</span></a></span><span class="insert"> )* '"'</span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-INT_LITERAL"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-INT_LITERAL" name="prod-INT_LITERAL"></a><span class="insert">[</span><span class="prodNo"><span class="insert">64</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">INT_LITERAL</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">("-")? (</span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert">)+</span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-QUALNAME_LITERAL"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-QUALNAME_LITERAL" name="prod-QUALNAME_LITERAL"></a><span class="insert">[</span><span class="prodNo"><span class="insert">65</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">QUALNAME_LITERAL</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"'" </span><span class="prod"><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a></span><span class="insert"> "'"</span></code></td> </tr> </tbody></tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-literal" name="prod-literal"></a><span class="insert">[</span><span class="prodNo"><span class="insert">49</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">literal</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-typedLiteral">typedLiteral</a></span><br> | <span class="prod"><a class="grammarRef" href="#prod-convenienceNotation">convenienceNotation
+</a></span></code></td> </tr> </tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-typedLiteral" name="prod-typedLiteral"></a><span class="insert">[</span><span class="prodNo"><span class="insert">50</span></span><span class="insert">] </span></td> <td><code class="production prod">typedLiteral<span class="delete"> ::= </span><span class="delete">quotedString</span> <span class="delete">%%</span> </code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-STRING_LITERAL"><span class="insert">STRING_LITERAL</span></a></span><span class="insert"> "%%" </span><span class="prod"><a class="grammarRef" href="#prod-datatype">datatype
+</a></span></code></td> </tr> </tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-datatype" name="prod-datatype"></a><span class="insert">[</span><span class="prodNo"><span class="insert">51</span></span><span class="insert">] </span></td> <td><code class="production prod">datatype<span class="delete"> ::= </span><span class="delete">qualifiedName</span> </code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a></span></code></td> </tr> </tbody>
+<tbody><tr valign="baseline"><td></td><td><em><span class="insert">where </span><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a><span class="insert"> is</span> listed in Table <a href="#permitted-datatypes">permitted-datatypes</a></em></td></tr></tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-convenienceNotation" name="prod-convenienceNotation"></a><span class="insert">[</span><span class="prodNo"><span class="insert">52</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">convenienceNotation</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-STRING_LITERAL"><span class="insert">STRING_LITERAL</span></a></span><br>
+<span class="delete">convenienceNotation</span><span class="delete"> ::= </span><span class="delete">stringLiteral</span> | <span class="delete">intLiteral</span><span class="prod"><a class="grammarRef" href="#prod-INT_LITERAL"><span class="insert">INT_LITERAL</span></a></span><br>
+<span class="delete">stringLiteral</span><span class="delete"> ::= </span><span class="delete">quotedString</span>
+<span class="delete">quotedString</span><span class="delete"> ::= </span><span class="delete">a finite sequence of characters in which " (#x22) and \ (#x5C) occur only in pairs of the form \" (#x5C, #x22) and \\ (#x5C,
+#x5C), enclosed in a pair of " (#x22) characters</span>
+<span class="delete">intLiteral</span><span class="delete"> ::= </span><span class="delete">a finite-length non-empty sequence of decimal digits (#x30-#x39) with an optional leading negative sign (-)</span>
+
+
+<span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-QUALNAME_LITERAL"><span class="insert">QUALNAME_LITERAL</span></a></span></code></td> </tr> </tbody>
+<tbody class="term"> <tr valign="baseline"> <td><a id="prod-STRING_LITERAL" name="prod-STRING_LITERAL"></a><span class="insert">[</span><span class="prodNo"><span class="insert">63</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">STRING_LITERAL</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">'"' ( ( [^"\
+
+] ) | </span><span class="prod"><a class="grammarRef" href="#prod-ECHAR"><span class="insert">ECHAR</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-UCHAR"><span class="insert">UCHAR</span></a></span><span class="insert"> )* '"'</span></code></td> </tr> </tbody>
+<tbody class="term"> <tr valign="baseline"> <td><a id="prod-INT_LITERAL" name="prod-INT_LITERAL"></a><span class="insert">[</span><span class="prodNo"><span class="insert">64</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">INT_LITERAL</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">("-")? (</span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert">)+</span></code></td> </tr> </tbody>
+<tbody class="term"> <tr valign="baseline"> <td><a id="prod-QUALNAME_LITERAL" name="prod-QUALNAME_LITERAL"></a><span class="insert">[</span><span class="prodNo"><span class="insert">65</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">QUALNAME_LITERAL</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"'" </span><span class="prod"><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">QUALNAME</span></a></span><span class="insert"> "'"</span></code></td> </tr> </tbody>
</table>
@@ -2833,9 +2878,9 @@
</span><a class="grammarRef" href="#prod-INT_LITERAL"><span class="insert">INT_LITERAL</span></a><span class="insert">,</span> and
<span class="delete">intLiteral</span><a class="grammarRef" href="#prod-QUALNAME_LITERAL"><span class="insert">QUALNAME_LITERAL</span></a>
are syntactic sugar for quoted strings with datatype
-<a href="http://www.w3.org/TR/xmlschema-2/#string"><span class="name">xsd:string</span></a><span class="insert">,
-</span><a href="http://www.w3.org/TR/xmlschema-2/#int"><span class="name"><span class="insert">xsd:int</span></span></a><span class="insert">,</span> and <span class="delete">xsd:int</span><span class="delete">, </span>
-<a class="grammarRef" href="#prod-QUALNAME"><span class="insert">prov:QUALNAME</span></a>
+<a href="http://www.w3.org/TR/xmlschema-2/#string"><span class="name">xsd:string</span></a><span class="delete"> and </span><span class="insert">,
+</span><a href="http://www.w3.org/TR/xmlschema-2/#int"><span class="name">xsd:int</span></a>, <span class="insert">and
+</span><a class="grammarRef" href="#prod-QUALNAME"><span class="insert">prov:QUALNAME</span></a>
respectively.
</p>
@@ -2902,8 +2947,9 @@
<div class="anexample" id="anexample-types">
<p>The entity <span class="name">ag</span> is a person (type: <span class="name">prov:Person</span>), whereas the entity
<span class="name">pl</span> is a plan (type: <span class="name">prov:Plan</span>).</p>
-<pre class="codeexample">agent(ag,[prov:type="prov:Person" %% xsd:QName])
-entity(pl,[prov:type="prov:Plan" %% xsd:QName])
+<pre class="codeexample"><span class="delete">agent(ag,[prov:type="prov:Person" %% xsd:QName])
+entity(pl,[prov:type="prov:Plan" %% xsd:QName])</span><span class="insert">agent(ag, [ prov:type='prov:Person' ])
+entity(pl, [ prov:type='prov:Plan' ])</span>
</pre>
</div>
@@ -2916,10 +2962,10 @@
<p><dfn id="dfn-time">Time instants</dfn> are defined according to xsd:dateTime [<cite><a class="bibref" rel="biblioentry" href="#bib-XMLSCHEMA-2">XMLSCHEMA-2</a></cite>].</p>
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-time"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-time" name="prod-time"></a><span class="insert">[</span><span class="prodNo"><span class="insert">48</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">time</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-ISODATETIME"><span class="insert">ISODATETIME</span></a></span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-DIGIT"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-DIGIT" name="prod-DIGIT"></a><span class="insert">[</span><span class="prodNo"><span class="insert">59</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">DIGIT</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">[0-9]</span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-ISODATETIME"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-ISODATETIME" name="prod-ISODATETIME"></a><span class="insert">[</span><span class="prodNo"><span class="insert">60</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">ISODATETIME</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> "-" </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> "-" </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> "T" </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> ":" </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> ":" </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> ( "." </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> ( </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> (</span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert">)? )? )? ( "Z" | </span><span class="prod"><a class="grammarRef" href="#prod-TIMEZONEOFFSET"><span class="insert">TIMEZONEOFFSET</span></a></span><span class="insert"> )?</span></code></td> </tr> </tbody></tbody>
-<tbody class="grammar-ref" data-ref="prod-TIMEZONEOFFSET"><tbody class="term"> <tr valign="baseline"> <td><a id="prod-TIMEZONEOFFSET" name="prod-TIMEZONEOFFSET"></a><span class="insert">[</span><span class="prodNo"><span class="insert">61</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">TIMEZONEOFFSET</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( "+" | "-" ) </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> ":" </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span></code></td> </tr> </tbody></tbody>
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-time" name="prod-time"></a><span class="insert">[</span><span class="prodNo"><span class="insert">48</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">time</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-ISODATETIME"><span class="insert">ISODATETIME</span></a></span></code></td> </tr> </tbody>
+<tbody class="term"> <tr valign="baseline"> <td><a id="prod-DIGIT" name="prod-DIGIT"></a><span class="insert">[</span><span class="prodNo"><span class="insert">59</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">DIGIT</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">[0-9]</span></code></td> </tr> </tbody>
+<tbody class="term"> <tr valign="baseline"> <td><a id="prod-ISODATETIME" name="prod-ISODATETIME"></a><span class="insert">[</span><span class="prodNo"><span class="insert">60</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">ISODATETIME</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> "-" </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> "-" </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> "T" </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> ":" </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> ":" </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> ( "." </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> ( </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> (</span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert">)? )? )? ( "Z" | </span><span class="prod"><a class="grammarRef" href="#prod-TIMEZONEOFFSET"><span class="insert">TIMEZONEOFFSET</span></a></span><span class="insert"> )?</span></code></td> </tr> </tbody>
+<tbody class="term"> <tr valign="baseline"> <td><a id="prod-TIMEZONEOFFSET" name="prod-TIMEZONEOFFSET"></a><span class="insert">[</span><span class="prodNo"><span class="insert">61</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">TIMEZONEOFFSET</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( "+" | "-" ) </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert"> ":" </span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span></code></td> </tr> </tbody>
</table>
@@ -2982,13 +3028,13 @@
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-bundle"><tbody class="prod"> <tr valign="baseline"> <td><a id="prod-bundle" name="prod-bundle"></a><span class="insert">[</span><span class="prodNo"><span class="insert">1</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">bundle</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"bundle" (</span><span class="prod"><a class="grammarRef" href="#prod-namespaceDeclarations">namespaceDeclarations
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-bundle" name="prod-bundle"></a><span class="insert">[</span><span class="prodNo"><span class="insert">1</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">bundle</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"bundle" (</span><span class="prod"><a class="grammarRef" href="#prod-namespaceDeclarations">namespaceDeclarations
</a></span><span class="insert">)? (</span><span class="prod"><a class="grammarRef" href="#prod-expression">expression
<span class="delete">endContainer</span>
-</a></span><span class="insert">)* (</span><span class="prod"><a class="grammarRef" href="#prod-namedBundle"><span class="insert">namedBundle</span></a></span><span class="insert">)* "endBundle"</span></code></td> </tr> </tbody></tbody>
+</a></span><span class="insert">)* (</span><span class="prod"><a class="grammarRef" href="#prod-namedBundle"><span class="insert">namedBundle</span></a></span><span class="insert">)* "endBundle"</span></code></td> </tr> </tbody>
</table>
@@ -3007,7 +3053,7 @@
activity(a1, 2011-11-16T16:05:00, -,[prov:type="edit"])
wasGeneratedBy(e2, a1, -, [ex:fct="save"])
wasAssociatedWith(a1, ag2, -, [prov:role="author"])
- agent(ag2, [ prov:type="prov:Person" %% xsd:QName, ex:name="Bob" ])
+ agent(ag2, [ <span class="delete">prov:type="prov:Person" %% xsd:QName,</span><span class="insert">prov:type='prov:Person' ,</span> ex:name="Bob" ])
<span class="delete">endContainer</span><span class="insert">endBundle</span>
</pre>