--- a/model/diff-n.html Fri Jul 13 11:58:45 2012 +0100
+++ b/model/diff-n.html Fri Jul 13 12:02:36 2012 +0100
@@ -1,3 +1,4 @@
+
<!DOCTYPE html PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
<html lang="en" dir="ltr">
<head><style type="text/css"><!--
@@ -528,21 +529,18 @@
/* other */
pre.sh_sourceCode .sh_section { color: black; font-weight: bold; }
pre.sh_sourceCode .sh_paren { color: red; }
-pre.sh_sourceCode .sh_attribute { color: #006400; }
-
-
-
-
-</style><style type="text/css">
+pre.sh_sourceCode .sh_attribute { color: #006400; }<span class="delete">
+
+
/* --- EDITORIAL NOTES --- */
.pending {
padding: 1em;
margin: 1em 0em 0em;
border: 1px solid #f00;
background: #BFEFFF;
-}
-
-.pending::before {
+}</span>
+
+<span class="delete">.pending::before {
content: "Pending Review";
display: block;
width: 150px;
@@ -580,23 +578,22 @@
background: #fff;
}
-<span class="insert">/* </span>.inference[id]::before {
- <span class="insert"> */
-/* </span>content: "Inference:<span class="insert"> " attr(id); */
-/* width: 380px; /\* How can we compute the length of "Constraint: " attr(id) *\/ */
-/* } */
-
-
-/* .inference::before { */
-/* content: "Inference"; */
-/* display: block; */
-/* width: 150px; */
-/* margin: -1.5em 0 0.5em 0; */
-/* font-weight: bold; */
-/* border: 1px solid #f00; */
-/* background: #fff; */
-/* padding: 3px 1em; */
-/* } */
+.inference[id]::before {
+ content: "Inference: " attr(id);
+ width: 380px; /* How can we compute the length of "Constraint: " attr(id) */
+}
+
+
+.inference::before {
+ content: "Inference";
+ display: block;
+ width: 150px;
+ margin: -1.5em 0 0.5em 0;
+ font-weight: bold;
+ border: 1px solid #f00;
+ background: #fff;
+ padding: 3px 1em;
+}
.syntax {
padding: 1em;
@@ -606,13 +603,13 @@
}
.syntax[id]::before {
- content: "Syntax:</span> " attr(id);
+ content: "Syntax: " attr(id);
width: 380px; /* How can we compute the length of "Constraint: " attr(id) */
}
-<span class="delete">.inference::before</span><span class="insert">.syntax::before</span> {
- content: <span class="delete">"Inference";</span><span class="insert">"Syntax";</span>
+.syntax::before {
+ content: "Syntax";
display: block;
width: 150px;
margin: -1.5em 0 0.5em 0;
@@ -622,18 +619,16 @@
padding: 3px 1em;
}
-<span class="delete">.syntax</span><span class="insert">.unamedconstraint</span> {
+.unamedconstraint {
padding: 1em;
margin: 1em 0em 0em;
- border: 1px solid <span class="delete">#f00;</span><span class="insert">#00f;</span>
+ border: 1px solid #00f;
background: #fff;
-}<span class="delete">
-
-.syntax[id]::before</span><span class="insert">
-
-
-.unamedconstraint::before</span> {
- content: <span class="delete">"Syntax:</span><span class="insert">"Constraint";
+}
+
+
+.unamedconstraint::before {
+ content: "Constraint";
display: block;
width: 150px;
margin: -1.5em 0 0.5em 0;
@@ -652,22 +647,22 @@
background: #fff;
}
-/* .constraint[id]::before { */
-/* content: "Constraint: " attr(id); */
-/* width: 380px; /\* How can we compute the length of "Constraint: " attr(id) *\/ */
-/* } */
-
-
-/* .constraint::before { */
-/* content: "Constraint"; */
-/* display: block; */
-/* width: 150px; */
-/* margin: -1.5em 0 0.5em 0; */
-/* font-weight: bold; */
-/* border: 1px solid #00f; */
-/* background: #fff; */
-/* padding: 3px 1em; */
-/* } */
+.constraint[id]::before {
+ content: "Constraint: " attr(id);
+ width: 380px; /* How can we compute the length of "Constraint: " attr(id) */
+}
+
+
+.constraint::before {
+ content: "Constraint";
+ display: block;
+ width: 150px;
+ margin: -1.5em 0 0.5em 0;
+ font-weight: bold;
+ border: 1px solid #00f;
+ background: #fff;
+ padding: 3px 1em;
+}
@@ -679,313 +674,7 @@
}
.interpretation[id]::before {
- content: "Interpretation:</span> " attr(id);
- width: 380px; /* How can we compute the length of <span class="delete">"Constraint:</span><span class="insert">"Interpretation:</span> " attr(id) */
-}
-
-
-<span class="delete">.syntax::before</span><span class="insert">.interpretation::before</span> {
- content: <span class="delete">"Syntax";</span><span class="insert">"Interpretation";</span>
- display: block;
- width: 150px;
- margin: -1.5em 0 0.5em 0;
- font-weight: bold;
- border: 1px solid <span class="delete">#f00;</span><span class="insert">#00f;</span>
- background: #fff;
- padding: 3px 1em;
-}
-
-<span class="delete">.unamedconstraint</span><span class="insert">.definition</span> {
- padding: 1em;
- margin: 1em 0em 0em;
- border: 1px solid <span class="delete">#00f;</span><span class="insert">#777;</span>
- background: #fff;
-}<span class="delete">
-
-
-.unamedconstraint::before</span><span class="insert">
-
-/* .definition[id]::before</span> {
- <span class="insert"> */
-/* </span>content: <span class="delete">"Constraint";
- </span><span class="insert">"Definition: " attr(id); */
-/* width: 380px; */
-/* } */
-
-
-/* .definition::before { */
-/* content: "Definition"; */
-/* </span>display: block;
- <span class="insert"> */
-/* </span>width: 150px;
- <span class="insert"> */
-/* </span>margin: -1.5em 0 0.5em 0;
- <span class="insert"> */
-/* </span>font-weight: bold;
- <span class="insert"> */
-/* </span>border: 1px solid <span class="delete">#00f;
- </span><span class="insert">#000; */
-/* </span>background: #fff;
- <span class="insert"> */
-/* </span>padding: 3px 1em;
-<span class="insert"> */
-/* </span>}<span class="delete">
-
-
-
-.constraint</span><span class="insert"> */
-
-
-.deprecatedconstraint</span> {
- padding: 1em;
- margin: 1em 0em 0em;
- border: 1px solid #00f;
- background: #fff;
-}
-
-<span class="delete">.constraint[id]::before</span><span class="insert">.deprecatedconstraint[id]::before</span> {
- content: <span class="delete">"Constraint:</span><span class="insert">"Deprecated:</span> " attr(id);
- width: 380px; /* How can we compute the length of <span class="delete">"Constraint:</span><span class="insert">"Deprecatedconstraint:</span> " attr(id) */
-}
-
-
-<span class="delete">.constraint::before</span><span class="insert">.deprecatedconstraint::before</span> {
- content: <span class="delete">"Constraint";</span><span class="insert">"Deprecated";</span>
- display: block;
- width: 150px;
- margin: -1.5em 0 0.5em 0;
- font-weight: bold;
- border: 1px solid #00f;
- background: #fff;
- padding: 3px 1em;
-}<span class="delete">
-
-
-
-.interpretation</span><span class="insert">
-
-.glossary-ref {
- font-style: italic;
-}
-
-.dfn {
- font-weight: bold;
-}
-
-
-.attribute {
- font-style: italic;
-}
-
-
-.conditional {
- color: blue;
-}
-
-.grammar {
- margin-top: 1ex;
- margin-bottom: 1ex;
- padding-left: 1ex;
- padding-right: 1ex;
- padding-top: 1ex;
- padding-bottom: 0.6ex;
- border: 1px dashed #2f6fab;
- font-size: 95%;
-}
-.nonterminal {
- font-weight: bold;
- font-family: sans-serif;
- font-size: 95%;
-}
-
-.name {
- font-family: monospace;
-}
-
-
-.xmpl</span> {
- padding: 1em;
- margin: 1em 0em 0em;
- border: 1px solid <span class="delete">#00f;</span><span class="insert">#f00;</span>
- background: #fff;
-}
-
-<span class="delete">.interpretation[id]::before</span><span class="insert">.xmpl::before {
- content: "Example";
- display: block;
- width: 150px;
- margin: -1.5em 0 0.5em 0;
- font-weight: bold;
- border: 1px solid #f00;
- background: #fff;
- padding: 3px 1em;
-}
-
-/*
-.anexample[count]::before {
- content: "Example " attr(count) ;
- font-family: sans-serif;
- font-size: 1.6ex;
- font-weight: bold;
-}
-
-.anexample:before {
- content: "Example:";
- font-family: sans-serif;
- font-size: 1.6ex;
- font-weight: bold;
-}
-
-*/
-
-.anexample {
- margin-top: 1ex;
- margin-bottom: 1ex;
- padding-left: 1ex;
- padding-right: 1ex;
- padding-top: 1ex;
- padding-bottom: 0.6ex;
- border: 1px dashed #2f6fab;
- background-color: #f9f9f9;
-}
-.anexample table {
- background-color: #f9f9f9;
-}
-
-.conceptexample:before {
- content: "Example:";
- font-family: sans-serif;
- font-size: 1.6ex;
- font-weight: bold;
-}
-.conceptexample {
- margin-top: 1ex;
- margin-bottom: 1ex;
- padding-left: 1ex;
- padding-right: 1ex;
- padding-top: 1ex;
- padding-bottom: 0.6ex;
- border: 1px dashed #2f6fab;
- background-color: #f9f9f9;
-}
-
-.pnExpression {
- font-weight: normal;
- font-size:120%;
- font-family: monospace;
-}
-
-
-div[class="grammar"] span[class="name"]:before {
- content: "'";
-}
-
-div[class="grammar"] span[class="name"]:after {
- content: "'";
-}
-
-
-div[class="grammar"] span[class="optional"]:before {
- font-weight: normal;
- font-size:130%;
- font-family: monospace;
- content: "(";
-}
-
-div[class="grammar"] span[class="optional"]:after {
- font-weight: normal;
- font-size:130%;
- font-family: monospace;
- content: ")?";
-}
-
-
-div[class="grammar"] span[class="plus"]:before {
- font-weight: normal;
- font-size:130%;
- font-family: monospace;
- content: "(";
-}
-
-div[class="grammar"] span[class="plus"]:after {
- font-weight: normal;
- font-size:130%;
- font-family: monospace;
- content: ")+";
-}
-
-
-div[class="grammar"] span[class="star"]:before {
- font-weight: normal;
- font-size:130%;
- font-family: monospace;
- content: "(";
-}
-
-div[class="grammar"] span[class="star"]:after {
- font-weight: normal;
- font-size:130%;
- font-family: monospace;
- content: ")*";
-}
-
-div[class="grammar"] span[class="choice"]:before {
- font-weight: normal;
- font-size:130%;
- font-family: monospace;
- content: "(";
-}
-
-div[class="grammar"] span[class="choice"]:after {
- font-weight: normal;
- font-size:130%;
- font-family: monospace;
- content: ")";
-}
-
-div[class="grammar"] span[class="group"]:before {
- font-weight: normal;
- font-size:130%;
- font-family: monospace;
- content: "(";
-}
-
-div[class="grammar"] span[class="group"]:after {
- font-weight: normal;
- font-size:130%;
- font-family: monospace;
- content: ")";
-}
-
-table {
- background-color: #f9f9f9;
-}
-
-.component1-color {
- background-color: rgba(255,42,42,0.2);
-}
-
-.component2-color {
- background-color: rgba(0,68,170,0.2);
-}
-
-.component3-color {
- background-color: rgba(0,170,0,0.2);
-}
-.component4-color {
- background-color: rgba(204,255,0,0.2);
-}
-
-.component5-color {
- background-color: rgba(11,40,40,0.2);
-}
-
-.component6-color {
- background-color: rgba(244,105,14,0.2);
-}
-
-.interpretation-forward::before</span> {
- content: "Interpretation: <span class="delete">" attr(id);
+ content: "Interpretation: " attr(id);
width: 380px; /* How can we compute the length of "Interpretation: " attr(id) */
}
@@ -994,22 +683,22 @@
content: "Interpretation";
display: block;
width: 150px;
- margin: -1.5em 0 0.5em 0;</span><span class="insert">";</span>
- font-weight: bold;<span class="delete">
+ margin: -1.5em 0 0.5em 0;
+ font-weight: bold;
border: 1px solid #00f;
background: #fff;
- padding: 3px 1em;</span>
+ padding: 3px 1em;
}
-<span class="delete">.definition {
+.definition {
padding: 1em;
margin: 1em 0em 0em;
border: 1px solid #777;
background: #fff;
}
-.definition[id]::before</span><span class="insert">.structural-forward::before</span> {
- content: <span class="delete">"Definition: " attr(id);
+.definition[id]::before {
+ content: "Definition: " attr(id);
width: 380px;
}
@@ -1018,27 +707,25 @@
content: "Definition";
display: block;
width: 150px;
- margin: -1.5em 0 0.5em 0;</span><span class="insert">"Structural constraint: ";</span>
- font-weight: bold;<span class="delete">
+ margin: -1.5em 0 0.5em 0;
+ font-weight: bold;
border: 1px solid #000;
background: #fff;
- padding: 3px 1em;</span>
+ padding: 3px 1em;
}
-<span class="delete">.deprecatedconstraint</span><span class="insert">code</span> {
- <span class="delete">padding: 1em;
+.deprecatedconstraint {
+ padding: 1em;
margin: 1em 0em 0em;
border: 1px solid #00f;
- background: #fff;</span><span class="insert">color: black;</span>
+ background: #fff;
}
-<span class="delete">.deprecatedconstraint[id]::before</span><span class="insert">.ruleTitle</span> {
- <span class="delete">content: "Deprecated: " attr(id);
- width: 380px; /* How can we compute the length of "Deprecatedconstraint: " attr(id) */</span><span class="insert">font-family: sans-serif;
- font-size: 1.6ex;
- font-weight: bold;</span>
-}<span class="delete">
+.deprecatedconstraint[id]::before {
+ content: "Deprecated: " attr(id);
+ width: 380px; /* How can we compute the length of "Deprecatedconstraint: " attr(id) */
+}
.deprecatedconstraint::before {
@@ -1275,9 +962,7 @@
-</span>
-
-</style><link href="http://www.w3.org/StyleSheets/TR/W3C-WD" rel="stylesheet" type="text/css" charset="utf-8"></head>
+</span></style><link href="./extra.css" rel="stylesheet" type="text/css" charset="utf-8"><link href="http://www.w3.org/StyleSheets/TR/W3C-WD" 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="w3c-working-draft-24-july-2012"><acronym title="World Wide Web Consortium">W3C</acronym> Working Draft <span class="delete">03 May</span><span class="insert">24 July</span> 2012</h2>
<dl><dt>This<span class="insert"> version:</span></dt><dd><a href="http://www.w3.org/TR/2012/WD-prov-n-20120724/"><span class="insert">http://www.w3.org/TR/2012/WD-prov-n-20120724/</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>
@@ -1321,8 +1006,7 @@
</div><div id="sotd" class="introductory section"><h2>Status of This Document</h2><p><em>This section describes the status of this document at the time of its publication. Other documents may supersede this document. A list of current <acronym title="World Wide Web Consortium">W3C</acronym> publications and the latest revision of this technical report can be found in the <a href="http://www.w3.org/TR/"><acronym title="World Wide Web Consortium">W3C</acronym> technical reports index</a> at http://www.w3.org/TR/.</em></p>
<h4 id="last-call"><span class="insert">Last Call</span></h4>
<p><span class="insert">
-Publication as Last Call Working Draft means that
-the Working Group believes that it has satisfied the relevant technical requirements outlined in its charter on this document. The design is not expected to change significantly, going forward, and now is the key time for external review.</span></p>
+This is a Last Call Working Draft. The design is not expected to change significantly, going forward, and now is the key time for external review.</span></p>
<p><span class="insert">This specification identifies one </span><a href="http://www.w3.org/2005/10/Process-20051014/tr#cfi"><span class="insert">feature at risk</span></a><span class="insert">: the expression Mention </span><a href="#expression-mention"><span class="insert">(section 3.5.3)</span></a><span class="insert"> might be removed from PROV if implementation experience reveals problems with supporting this construct.</span></p>
@@ -1428,12 +1112,10 @@
<h3><span class="secno">1.2 </span>Structure of this Document</h3>
<p>This document <span class="delete">defines a grammar using the Extended Backus-Naur Form (EBNF) notation. Its productions correspond to PROV data model types and relations.
-</span><span class="insert">is structured as follows.
-
-</span></p><span class="delete">
-It is structured as follows.
-
-</span><p><a href="#general-conventions">Section 2</a> provides <span class="delete">the design rationale for the PROV Notation.</span>
+</span><span class="delete">
+It </span>is structured as follows.
+
+</p><p><a href="#general-conventions">Section 2</a> provides <span class="delete">the design rationale for the PROV Notation.</span>
<span class="delete">Section 3</span><span class="delete"> defines the notation for the Extended Backus-Naur Form (EBNF) grammar used in this specification.</span><span class="insert">general consideration about the PROV-N grammar.</span></p>
@@ -1571,25 +1253,22 @@
</p><ul>
<li>
<span class="delete">E</span>
- <code class="grammarRef"><span class="insert">expr</span></code>: matches <span class="delete">term satisfying rule</span><span class="insert">production</span> for <span class="insert">nonterminal </span>symbol <span class="delete">E.
-</span>
-
-
-<span class="delete">abc</span><span class="delete">: matches the literal string inside the single quotes.</span><code class="grammarRef"><span class="insert">expr</span></code>
+ <code class="grammarRef"><span class="insert">expr</span></code>: matches <span class="delete">term satisfying rule</span><span class="insert">production</span> for <span class="insert">nonterminal </span>symbol <span class="delete">E.</span><code class="grammarRef"><span class="insert">expr</span></code>
+</li>
+
+
+<li>
+ <code class="grammarRef"><span class="insert">TERMINAL</span></code><span class="insert">: matches production for terminal symbol </span><code class="grammarRef"><span class="insert">TERMINAL</span></code>
+</li>
+
+<li>
+<span class="delete">abc</span>
+ <code class="grammarRef"><span class="insert">"abc"</span></code>: matches the literal string inside the single quotes.
</li>
<li>
- <code class="grammarRef"><span class="insert">TERMINAL</span></code><span class="insert">: matches production for terminal symbol </span><code class="grammarRef"><span class="insert">TERMINAL</span></code>
-</li>
-
-<li>
- <code class="grammarRef"><span class="insert">"abc"</span></code><span class="insert">: matches the literal string inside the single quotes.
-</span></li>
-
-
-<li>
<code class="grammarRef"><span class="insert">(term)?</span></code><span class="insert">: optional, matches </span><em>term</em><span class="delete">: optional </span><span class="delete">term</span><span class="delete">, matches </span><span class="delete">term</span> or nothing.
</li>
@@ -1637,9 +1316,9 @@
<p><span class="insert">Alternatively, the production rule </span><code><a href="#prod-bundle"><span class="grammarRef"><span class="insert">bundle</span></span></a></code><span class="insert">
provides the overall structure of PROV-N descriptions. It</span> is <span class="delete">centered on nonterminals </span><span class="insert">a wrapper </span>for<span class="delete"> various types</span><span class="insert">
- a set</span> of <span class="insert">expressions, such that the text for an element matches the corresponding </span><code><a class="grammarRef" href="#prod-expression">expression<span class="delete">. The main production is introduced here below as it reflects the rationale for the design of the entire grammar. Note that parser developers may use the top level </span><span class="delete">container</span></a></code><span class="insert"> production,</span> <span class="delete">nonterminal as a starting point instead.
-
-</span>
+ a set</span> of <span class="insert">expressions, such that the text for an element matches the corresponding </span><code><a class="grammarRef" href="#prod-expression">expression<span class="delete">. The main production is introduced here below as it reflects the rationale for the design of the entire grammar. Note that parser developers may use the top level </span><span class="delete">container</span></a></code><span class="insert"> production,</span> <span class="delete">nonterminal as a starting point instead.</span><span class="insert">and some namespace declarations.</span></p>
+
+
<span class="delete">expression</span>
<span class="delete"> ::=</span>
@@ -1682,11 +1361,9 @@
<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><span class="delete"> etc., corresponds to one element (entity, activity, etc.) of the PROV data model.
-</span><span class="delete">A PROV-N document consists of a collection of </span><span class="delete">expressions</span><span class="delete">, wrapped in an </span><span class="delete">expression container</span><span class="delete"> with</span><span class="insert">and</span> some namespace <span class="delete">declarations, such that the text for an element matches the corresponding </span><span class="delete">expression</span><span class="delete"> production of the grammar.
-
-</span><span class="insert">declarations.</span></p>
-
-</div>
+</span><span class="delete">A PROV-N document consists of a collection of </span><span class="delete">expressions</span><span class="delete">, wrapped in an </span><span class="delete">expression container</span><span class="delete"> with some namespace declarations, such that the text for an element matches the corresponding </span><span class="delete">expression</span><span class="delete"> production of the grammar.
+
+</span></div>
<div id="prov-n-optionals" class="section">
@@ -1786,9 +1463,7 @@
<div id="prov-n-expressions" class="section">
<h2><span class="secno">3. </span>PROV-N Productions per Component</h2>
-<p>This section introduces grammar productions for each expression, followed by small examples <span class="insert">of expressions </span>illustrating the <span class="delete">use of</span><span class="insert">grammar. Strings conforming to the grammar are valid</span> expressions in <span class="delete">PROV-N. Strings conforming to the grammar are valid expressions in </span>the PROV-N language.
-
-</p>
+<p>This section introduces grammar productions for each expression, followed by small examples <span class="insert">of expressions </span>illustrating the <span class="delete">use of</span><span class="insert">grammar. Strings conforming to the grammar are valid</span> expressions in <span class="delete">PROV-N. Strings conforming to the grammar are valid expressions in </span>the PROV-N language.</p>
<div id="component1" class="section">
<h3><span class="secno">3.1 </span>Component 1: Entities and Activities</h3>
@@ -1864,11 +1539,9 @@
-
-
-
<table class="grammar">
+
<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> (
@@ -1929,11 +1602,9 @@
-
-
-
<table class="grammar">
+
<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> (
@@ -2003,11 +1674,9 @@
-
-
-
<table class="grammar">
+
<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">usageExpression<span class="delete"> ::=
</span><span class="delete">used</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> (
@@ -2119,17 +1788,15 @@
<h4><span class="secno"><span class="insert">3.1.6 </span></span>Start</h4>
-
-
-
<table class="grammar">
-<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">14</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">14</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">startExpression</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="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>
+
+
+<span class="delete">startExpression</span><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">( </span><span class="delete">identifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> ) </span><span class="delete">,</span>
-<span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-eIdentifierOrMarker"><span class="insert">eIdentifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-aIdentifierOrMarker"><span class="insert">aIdentifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-timeOrMarker"><span class="insert">timeOrMarker</span></a></span><span class="insert"> )? </span><span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs"><span class="insert">optionalAttributeValuePairs</span></a></span><span class="insert"> ")"</span></code></td> </tr> </tbody>
-</table>
-
<p><span class="insert">The following table summarizes how each constituent of a PROV-DM Start maps to a PROV-N syntax element.</span></p>
<div style="text-align: left; ">
<table class="thinborder" style="margin-left: auto; margin-right: auto;">
@@ -2194,15 +1861,8 @@
-
-
-
<table class="grammar">
-<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">15</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>
-<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 class="prod"> <tr valign="baseline"> <td><a id="prod-endExpression" name="prod-endExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">15</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">endExpression</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="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>
@@ -2212,19 +1872,24 @@
<tbody><tr><td><b><span class="insert">End</span></b></td><td><b><span class="insert">Non-Terminal</span></b></td></tr>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
<tr><td><a href="http://www.w3.org/TR/prov-dm/#end.id"><span class="attribute" id="end.id"><span class="insert">id</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier"><span class="insert">optionalIdentifier</span></a></code></td></tr>
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#end.activity"><span class="attribute" id="end.activity"><span class="insert">activity</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier
-<span class="delete">,</span><span class="delete">
-( </span><span class="delete">eIdentifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> )
-</span><span class="delete">,</span><span class="delete"> ( </span></a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#end.activity"><span class="attribute" id="end.activity"><span class="insert">activity</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier"><span class="insert">aIdentifier</span></a></code></td></tr>
<tr><td><a href="http://www.w3.org/TR/prov-dm/#end.trigger"><span class="attribute" id="end.trigger"><span class="insert">trigger</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifierOrMarker"><span class="insert">eIdentifierOrMarker</span></a></code></td></tr>
<tr><td><a href="http://www.w3.org/TR/prov-dm/#end.ender"><span class="attribute" id="end.ender"><span class="insert">ender</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifierOrMarker"><span class="insert">aIdentifierOrMarker</span></a></code></td></tr>
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#end.time"><span class="attribute" id="end.time">time</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> )
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#end.time"><span class="attribute" id="end.time"><span class="insert">time</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker"><span class="insert">timeOrMarker</span></a></code></td></tr>
+
+
+<span class="delete">endExpression</span><span class="delete"> ::=
+</span><span class="delete">wasEndedBy</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>
+<span class="delete">aIdentifier</span>
+<span class="delete">,</span><span class="delete">
+( </span><span class="delete">eIdentifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> )
+</span><span class="delete">,</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></a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker"><span class="insert">timeOrMarker</span></a></code></td></tr>
-
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#end.attributes"><span class="attribute" id="end.attributes"><span class="insert">attributes</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs"><span class="insert">optionalAttributeValuePairs</span></a></code></td></tr>
+<span class="delete">)</span><tr><td><a href="http://www.w3.org/TR/prov-dm/#end.attributes"><span class="attribute" id="end.attributes"><span class="insert">attributes</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs"><span class="insert">optionalAttributeValuePairs</span></a></code></td></tr>
</tbody></table>
</div>
@@ -2277,11 +1942,9 @@
<div class="withPn">
-
-
-
<table class="grammar">
+
<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">16</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> (
@@ -2304,17 +1967,15 @@
<tr><td><a href="http://www.w3.org/TR/prov-dm/#invalidation.time"><span class="attribute" id="invalidation.time">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></a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker"><span class="insert">timeOrMarker</span></a></code></td></tr>
+<span class="delete">)</span>
+</a></td><td><code class="content"><a class="grammarRef" href="#prod-timeOrMarker"><span class="insert">timeOrMarker</span></a></code></td></tr>
<tr><td><a href="http://www.w3.org/TR/prov-dm/#invalidation.attributes"><span class="attribute" id="invalidation.attributes"><span class="insert">attributes</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs"><span class="insert">optionalAttributeValuePairs</span></a></code></td></tr>
</tbody></table>
</div>
-
<div class="anexample" id="example_18"><div class="anexampleTitle"><a class="internalDFN" href="#example_18"><span class="insert">Example 18</span></a></div>
-
-
<pre class="codeexample"><span class="delete">wasInvalidatedBy(ex:i1,</span><span class="insert">wasInvalidatedBy(ex:i1;</span> tr:WD-prov-dm-20111215, ex:edit1, 2011-11-16T16:00:00, [ex:fct="save"])
</pre>
<p> Here <span class="name">ex:i1</span> is the optional invalidation identifier, <span class="name">tr:WD-prov-dm-20111215</span> is the identifier of the entity being invalidated,
@@ -2328,13 +1989,28 @@
<span class="delete">wasInvalidatedBy(ex:i1,</span><span class="insert">wasInvalidatedBy(ex:i1;</span> tr:WD-prov-dm-20111215, ex:edit1, -)
<span class="delete">wasInvalidatedBy(-, tr:WD-prov-dm-20111215,</span><span class="insert">wasInvalidatedBy(tr:WD-prov-dm-20111215,</span> ex:edit1, -)
</pre>
-
+</div>
+
+
+<p><span class="insert">Additional semantic rules (</span><a href="#semantic-rules-summary"><span class="insert">Section 3.7.5</span></a><span class="insert">) apply to </span><code class="content"><a class="grammarRef" href="#prod-invalidationExpression"><span class="insert">invalidationExpression</span></a></code><span class="insert">.</span></p>
+
+
+
+
+
+</div></div>
+
+
+
+
+
+</div>
<span class="delete">Even though the production </span><span class="delete">invalidationExpression</span><span class="delete"> allows for expressions </span><span class="delete">wasInvalidatedBy(e2, -, -)</span><span class="delete"> and </span><span class="delete">wasInvalidatedBy(-, e2, -, -)</span><span class="delete">, these expressions are not valid in PROV-N, since
at least one of </span><span class="delete">activity</span><span class="delete">, </span><span class="delete">time</span><span class="delete">, or </span><span class="delete">attributes</span> <span class="delete">must</span><span class="delete"> be present.</span>
-</div>
+
@@ -2343,20 +2019,14 @@
<span class="delete">communicationExpression</span><span class="delete"> ::=
</span><span class="delete">wasInformedBy</span>
-<p><span class="insert">Additional semantic rules </span>(
-<span class="delete">( </span><span class="delete">identifier</span><span class="delete"> | </span><span class="delete">-</span> <a href="#semantic-rules-summary"><span class="insert">Section 3.7.5</span></a>) <span class="delete">,</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>
<span class="delete">aIdentifier</span>
<span class="delete">,</span>
<span class="delete">aIdentifier</span>
<span class="delete">optional-attribute-values</span>
<span class="delete">)</span>
-<span class="insert">apply to </span><code class="content"><a class="grammarRef" href="#prod-invalidationExpression"><span class="insert">invalidationExpression</span></a></code><span class="insert">.</span></p>
-
-
-
-
-
-</div>
+
<span class="delete">wasInformedBy(ex:inf1, ex:a1, ex:a2, [ex:param1="a", ex:param2="b"])
@@ -2373,14 +2043,8 @@
wasInformedBy(-, ex:a1, ex:a2)
wasInformedBy(-, ex:a1, ex:a2, [ex:param1="a", ex:param2="b"])
</span>
-</div>
-
-
-
-
-
-
-</div>
+
+
<span class="delete">3.1.9 </span><span class="delete">Start by Activity</span>
@@ -2420,10 +2084,7 @@
<div id="component2" class="section">
<h3><span class="secno">3.2 </span>Component 2: <span class="delete">Agents and Responsibility</span><span class="insert">Derivations</span></h3>
<div id="Derivation-Relation" class="section">
-<h4><span class="secno">3.2.1 </span><span class="delete">Agent</span><span class="insert">Derivation</span></h4>
-
-
-<span class="delete">agentExpression</span><span class="delete"> ::=</span>
+<h4><span class="secno">3.2.1 </span><span class="insert">Derivation</span></h4>
<table class="grammar">
@@ -2492,8 +2153,8 @@
<h4><span class="secno"><span class="insert">3.2.2 </span></span><span class="insert">Revision</span></h4>
<p id="provn-type-Revision"><span class="insert">
-PROV-N provides no dedicated syntax for Revision. Instead, a Revision </span><em class="rfc2119" title="must"><span class="insert">must</span></em><span class="insert"> be expressed as a</span>
-<code class="content"><a class="grammarRef" href="#prod-derivationExpression"><span class="insert">derivationExpression</span></a></code><span class="insert"> with attribute </span><code><span class="insert">prov:type='prov:Revision'</span></code><span class="insert">.</span></p>
+PROV-N provides no dedicated syntax for Revision. Instead, a Revision </span><em class="rfc2119" title="must"><span class="insert">must</span></em><span class="insert"> be expressed as a
+</span><code class="content"><a class="grammarRef" href="#prod-derivationExpression"><span class="insert">derivationExpression</span></a></code><span class="insert"> with attribute </span><code><span class="insert">prov:type='prov:Revision'</span></code><span class="insert">.</span></p>
@@ -2504,116 +2165,23 @@
</span></pre>
<p><span class="insert">Here, the derivation from
</span><a href="#anexample-derivation" class="anexample-ref"><span><span class="insert">Example 19</span></span></a><span class="insert">
-is extended with a </span><span class="name"><span class="delete">agent</span>
-<span class="insert">prov:type</span></span><span class="insert"> attribute and value </span><span class="name"><span class="delete">(</span>
-<span class="delete">identifier</span>
-<span class="delete">optional-attribute-values</span>
-<span class="delete">)</span>
-
-
-
-
-<span class="delete">agent(ag4, [ prov:type="prov:Person", ex:name="David" ])
-</span>
-<span class="delete">Here </span><span class="delete">ag</span><span class="insert">prov:Revision</span></span><span class="insert">. The expression </span><code><span class="insert">'prov:Revision'</span></code> is <span class="delete">the agent identifier, and
- </span><span class="delete">[ prov:type="prov:Person", ex:name="David" ]</span><span class="delete"> are optional attributes. </span><code class="content"><a class="grammarRef" href="#prod-convenienceNotation"><span class="insert">convenienceNotation</span></a></code><span class="insert"> to denote a </span><code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME"><span class="insert">QUALIFIED_NAME</span></a></code><span class="insert"> literal (See </span><a href="#expression-literal"><span class="insert">Section 3.7.3. Literal</span></a><span class="insert">).
-</span></p><span class="delete">
-In the next example, the optional attributes are omitted.
-
-</span><span class="delete">agent(ag4)
-</span>
-</div>
-
-
-</div>
-
-<span class="delete">3.2.2 </span><span class="delete">Attribution</span>
-
-
-<span class="delete">attributionExpression</span><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>
-<span class="delete">eIdentifier</span>
-<span class="delete">,</span>
-<span class="delete">agIdentifier</span>
-<span class="delete">optional-attribute-values</span>
-<span class="delete">)</span>
-
-
-
-
-<span class="delete">wasAttributedTo(id, e, ag, [ex:license="cc:attributionURL" %% "xsd:QName"])
- </span>
-<span class="delete"> Here </span><span class="delete">id</span><span class="delete"> is the optional attribution identifier, </span><span class="delete">e</span><span class="delete"> is an entity identifier,
- </span><span class="delete">ag</span><span class="delete"> is the identifier of the agent to whom the entity is abscribed,
-and </span><span class="delete">[ex:license="cc:attributionURL" %% "xsd:QName"]</span><span class="delete"> are optional attributes. </span><span class="delete">
-The remaining examples show cases where some of the optionals are omitted.
-
-</span><span class="delete">wasAttributedTo(e, ag)
-wasAttributedTo(e, ag, [ex:license="cc:attributionURL" %% "xsd:QName"])
-wasAttributedTo(-, e, ag, [ex:license="cc:attributionURL" %% "xsd:QName"])
-</span>
-
-
-
-
-
+is extended with a </span><span class="name"><span class="insert">prov:type</span></span><span class="insert"> attribute and value </span><span class="name"><span class="insert">prov:Revision</span></span><span class="insert">. The expression </span><code><span class="insert">'prov:Revision'</span></code><span class="insert"> is </span><code class="content"><a class="grammarRef" href="#prod-convenienceNotation"><span class="insert">convenienceNotation</span></a></code><span class="insert"> to denote a </span><code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME"><span class="insert">QUALIFIED_NAME</span></a></code><span class="insert"> literal (See </span><a href="#expression-literal"><span class="insert">Section 3.7.3. Literal</span></a><span class="insert">).
+</span></p></div>
+
+
+</div>
<div id="expression-quotation" class="section">
-<h4><span class="secno">3.2.3 </span><span class="delete">Association</span><span class="insert">Quotation</span></h4>
-
-
-<span class="delete">associationExpression</span><span class="delete"> ::=
-</span><span class="delete">wasAssociatedWith</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>
-<span class="delete">aIdentifier</span>
-<span class="delete">,</span><span class="delete">
-( </span><span class="delete">agIdentifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> )
-</span><span class="delete">,</span><span class="delete">
-( </span><span class="delete">eIdentifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> )
-</span><span class="delete">optional-attribute-values</span>
-<span class="delete">)</span>
-
-
-
-
-
-<span class="delete">wasAssociatedWith(ex:agas, ex:a1, ex:ag1, ex:e1, [ex:param1="a", ex:param2="b"])
- </span>
-
-<span class="delete"> Here </span><span class="delete">ex:agas</span><span class="delete"> is the optional attribution identifier,
- </span><span class="delete">ex:a1</span><span class="delete"> is an activity identifier,
- </span><span class="delete">ex:ag1</span><span class="delete"> is the optional identifier of the agent associated to the activity,
- </span><span class="delete">ex:e1</span><span class="delete"> is the optional identifier of the plan used by the agent in the context of the activity,
- and </span><span class="delete"> [ex:param1="a", ex:param2="b"]</span><span class="delete"> are optional attributes. </span><span class="delete">
-The remaining examples show cases where some of the optionals are omitted.
-
-
-
-</span><span class="delete">wasAssociatedWith(ex:a1, -, ex:e1)
-wasAssociatedWith(ex:a1, ex:ag1, -)
-wasAssociatedWith(ex:a1, ex:ag1, ex:e1)
-wasAssociatedWith(ex:a1, ex:ag1, ex:e1, [ex:param1="a", ex:param2="b"])
-wasAssociatedWith(a, ex:a1, -, ex:e1)
-wasAssociatedWith(-, ex:a1, -, ex:e1)
-wasAssociatedWith(-, ex:a1, ex:ag1, -)
-</span>
-
-
-<span class="delete">Note:</span><span class="delete">The production </span><span class="delete">associationExpression</span><span class="delete"> allows</span><p id="provn-type-Quotation"><span class="insert">
-PROV-N provides no dedicated syntax</span> for <span class="delete">expressions </span><span class="delete">wasAssociatedWith(a, -, -)</span><span class="delete"> and </span><span class="delete">wasAssociatiedWith(-, a, -, -)</span><span class="delete">. However, these expressions are not valid in PROV-N,
-because at least one of </span><span class="delete">agent</span><span class="delete"> or </span><span class="delete">plan</span><span class="insert">Quotation. Instead, a Quotation</span> <em class="rfc2119" title="must">must</em> be<span class="delete"> present.</span><span class="insert"> expressed as a
+<h4><span class="secno"><span class="insert">3.2.3 </span></span><span class="insert">Quotation</span></h4>
+
+<p id="provn-type-Quotation"><span class="insert">
+PROV-N provides no dedicated syntax for Quotation. Instead, a Quotation </span><em class="rfc2119" title="must"><span class="insert">must</span></em><span class="insert"> be expressed as a
</span><code class="content"><a class="grammarRef" href="#prod-derivationExpression"><span class="insert">derivationExpression</span></a></code><span class="insert"> with attribute </span><code><span class="insert">prov:type='prov:Quotation'</span></code><span class="insert">.</span></p>
-
-
<div class="anexample" id="example_21"><div class="anexampleTitle"><a class="internalDFN" href="#example_21"><span class="insert">Example 21</span></a></div>
-
<pre class="codeexample"><span class="insert">wasDerivedFrom(quoteId1; ex:blockQuote,ex:blog, ex:act1, ex:g, ex:u,
[ prov:type='prov:Quotation' ])
</span></pre>
@@ -2626,77 +2194,39 @@
<div id="expression-primary-source" class="section">
-<h4><span class="secno">3.2.4 </span><span class="delete">Responsibility</span><span class="insert">Primary Source</span></h4>
-
-
-<span class="delete">responsibilityExpression</span><span class="delete"> ::=</span>
+<h4><span class="secno"><span class="insert">3.2.4 </span></span><span class="insert">Primary Source</span></h4>
<p id="provn-type-Primary-Source"><span class="insert">
-PROV-N provides no dedicated syntax for PrimarySource. Instead, a PrimarySource </span><em class="rfc2119" title="must"><span class="insert">must</span></em><span class="insert"> be expressed as a</span>
-<code class="content"><a class="grammarRef" href="#prod-derivationExpression"><span class="insert">derivationExpression</span></a></code><span class="insert"> with attribute </span><code><span class="insert">prov:type='prov:Primary-Source'</span></code><span class="insert">.</span></p>
+PROV-N provides no dedicated syntax for PrimarySource. Instead, a PrimarySource </span><em class="rfc2119" title="must"><span class="insert">must</span></em><span class="insert"> be expressed as a
+</span><code class="content"><a class="grammarRef" href="#prod-derivationExpression"><span class="insert">derivationExpression</span></a></code><span class="insert"> with attribute </span><code><span class="insert">prov:type='prov:Primary-Source'</span></code><span class="insert">.</span></p>
<div class="anexample" id="example_22"><div class="anexampleTitle"><a class="internalDFN" href="#example_22"><span class="insert">Example 22</span></a></div>
<pre class="codeexample"><span class="insert">wasDerivedFrom(src1; ex:e1, ex:e2, ex:act, ex:g, ex:u,
[ prov:type='prov:PrimarySource' ])
</span></pre>
-<p><span class="insert">Here, the derivation is provided with a </span><span class="name"><span class="delete">actedOnBehalfOf</span>
-<span class="insert">prov:type</span></span><span class="insert"> attribute and value </span><span class="name"><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>
-<span class="delete">agIdentifier</span>
-<span class="delete">,</span>
-<span class="delete">agIdentifier</span>
-<span class="delete">,</span><span class="delete">
-( </span><span class="delete">aIdentifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> )
-</span><span class="delete">optional-attribute-values</span>
-<span class="delete">)</span>
-
-
-
-
- <span class="delete">actedOnBehalfOf(act1, ag1, ag2, a, [prov:type="contract"])
- </span>
-<span class="delete"> Here </span><span class="delete">act1</span><span class="delete"> is the optional attribution identifier,
- </span><span class="delete">ag1</span><span class="delete"> is the identifier for the subordinate agent,
- </span><span class="delete">ag2</span><span class="delete"> is the identifier of the responsible agent,
- </span><span class="delete">a</span><span class="delete"> is the optional identifier of the activity for which the responsibility link holds,
- and </span><span class="delete"> [prov:type="contract"]</span><span class="delete"> are optional attributes. </span><span class="insert">prov:PrimarySource</span></span><span class="insert">.
+<p><span class="insert">Here, the derivation is provided with a </span><span class="name"><span class="insert">prov:type</span></span><span class="insert"> attribute and value </span><span class="name"><span class="insert">prov:PrimarySource</span></span><span class="insert">.
-</span></p><span class="delete">
-The remaining examples show cases where some of the optionals are omitted.
-
-
-</span><span class="delete">actedOnBehalfOf(ag1, ag2, -)
-actedOnBehalfOf(ag1, ag2, a)
-actedOnBehalfOf(ag1, ag2, -, [prov:type="delegation"])
-actedOnBehalfOf(ag2, ag3, a, [prov:type="contract"])
-actedOnBehalfOf(r, ag2, ag3, a, [prov:type="contract"])
-actedOnBehalfOf(-, ag1, ag2, -)
-</span>
-</div>
-
+</span></p></div>
+
+
+</div>
</div>
-
-
-</div>
-
<div id="component3" class="section">
-<h3><span class="secno">3.3 </span>Component 3: <span class="delete">Derivations</span><span class="insert">Agents, Responsibility, and Influence</span></h3>
+<h3><span class="secno"><span class="insert">3.3 </span></span><span class="insert">Component 3: Agents, Responsibility, and Influence</span></h3>
<div id="expression-Agent" class="section">
-<h4><span class="secno">3.3.1 </span><span class="delete">Derivation</span><span class="insert">Agent</span></h4>
-
-
-<span class="delete">derivationExpression</span><span class="delete"> ::=</span>
+<h4><span class="secno"><span class="insert">3.3.1 </span></span>Agent</h4>
<table class="grammar">
-<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">18</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">agentExpression</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"><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-agentExpression" name="prod-agentExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">18</span></span><span class="insert">] </span></td> <td><code class="production prod">agentExpression<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"><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>
</table>
@@ -2713,49 +2243,51 @@
<p><span class="insert">
PROV-N provides no dedicated syntax for Person, Organization, SoftwareAgent. Instead, a Person, an Organization, or a SoftwareAgent </span><em class="rfc2119" title="must"><span class="insert">must</span></em><span class="insert"> be expressed as an
</span><code class="content"><a class="grammarRef" href="#prod-agentExpression"><span class="insert">agentExpression</span></a></code><span class="insert"> with attribute</span>
+<span class="delete">agent</span>
+<span class="delete">(</span>
+<span class="delete">identifier</span>
+<span class="delete">optional-attribute-values</span>
+<span class="delete">)</span>
<span id="provn-type-Person" <code=""><span class="insert">prov:type='prov:Person'</span></span><span class="insert">,
</span><span id="provn-type-Organization" <code=""><span class="insert">prov:type='prov:Organization</span></span><span class="insert">, or
</span><span id="provn-type-SoftwareAgent" <code=""><span class="insert">prov:type='prov:SoftwareAgent'</span></span><span class="insert">, respectively.</span></p>
<div class="anexample" id="example_23"><div class="anexampleTitle"><a class="internalDFN" href="#example_23"><span class="insert">Example 23</span></a></div>
-<pre class="codeexample"><span class="insert">agent(ag4, [ prov:type='prov:Person', ex:name="David" ])
-</span></pre>
-<p><span class="insert">Here </span><span class="name"><span class="delete">wasDerivedFrom</span>
-<span class="insert">ag</span></span><span class="insert"> is the agent identifier, and
- </span><span class="name"><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>
-<span class="delete">eIdentifier</span>
-<span class="delete">,</span>
-<span class="delete">eIdentifier</span>
-
-<span class="delete">,</span><span class="delete">
-( </span><span class="delete">aIdentifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> )
-</span><span class="delete">,</span><span class="delete">
-( </span><span class="delete">gIdentifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> )
-</span><span class="delete">,</span><span class="delete">
-( </span><span class="delete">uIdentifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> )
-</span>
-<span class="delete">optional-attribute-values</span>
-<span class="delete">)</span><span class="insert">[ prov:type='prov:Person', ex:name="David" ]</span></span><span class="insert"> are optional attributes. </span></p><span class="insert">
+
+
+
+<pre class="codeexample">agent(ag4, [ <span class="delete">prov:type="prov:Person",</span><span class="insert">prov:type='prov:Person',</span> ex:name="David" ])
+</pre>
+<p>Here <span class="name">ag</span> is the agent identifier, and
+ <span class="name">[ <span class="delete">prov:type="prov:Person",</span><span class="insert">prov:type='prov:Person',</span> ex:name="David" ]</span> are optional attributes. </p>
In the next example, the optional attributes are omitted.
-</span><pre class="codeexample"><span class="insert">agent(ag4)
-</span></pre>
+<pre class="codeexample">agent(ag4)
+</pre>
</div>
-
- </div>
+</div>
<div id="expression-attribution" class="section">
-<h4><span class="secno"><span class="insert">3.3.2 </span></span><span class="insert">Attribution</span></h4>
+<h4><span class="secno"><span class="delete">3.2.2</span><span class="insert">3.3.2</span> </span>Attribution</h4>
<table class="grammar">
-<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">19</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">attributionExpression</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"wasAttributedTo" "(" </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-agIdentifier"><span class="insert">agIdentifier</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-attributionExpression" name="prod-attributionExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">19</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>
+</code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"wasAttributedTo" "(" </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-agIdentifier">agIdentifier
+<span class="delete">optional-attribute-values</span>
+<span class="delete">)</span>
+</a></span> <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs"><span class="insert">optionalAttributeValuePairs</span></a></span><span class="insert"> ")"</span></code></td> </tr> </tbody>
</table>
@@ -2778,29 +2310,37 @@
<div class="anexample" id="example_24"><div class="anexampleTitle"><a class="internalDFN" href="#example_24"><span class="insert">Example 24</span></a></div>
-<pre class="codeexample"><span class="delete">wasDerivedFrom(d, e2, e1, a, g2, u1, [prov:comment="a righteous derivation"])</span><span class="insert">wasAttributedTo(id; e, ag, [ex:license='cc:attributionURL' ])</span>
+
+
+<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><span class="insert"> Here </span><span class="name"><span class="insert">id</span></span><span class="insert"> is the optional attribution identifier, </span><span class="name"><span class="insert">e</span></span><span class="insert"> is an entity identifier,
- </span><span class="name"><span class="insert">ag</span></span><span class="insert"> is the identifier of the agent to whom the entity is abscribed,
-and </span><span class="name"><span class="insert">[ex:license='cc:attributionURL' ]</span></span><span class="insert"> are optional attributes. </span></p><span class="insert">
+<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"><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.
-</span><pre class="codeexample"><span class="insert">wasAttributedTo(e, ag)
-wasAttributedTo(e, ag, [ex:license='cc:attributionURL' ])
-</span></pre>
+<pre class="codeexample">wasAttributedTo(e, ag)
+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>
<div id="expression-Association" class="section">
-<h4><span class="secno"><span class="insert">3.3.3 </span></span><span class="insert">Association</span></h4>
+<h4><span class="secno"><span class="delete">3.2.3</span><span class="insert">3.3.3</span> </span>Association</h4>
<table class="grammar">
-<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">20</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">associationExpression</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="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 class="prod"> <tr valign="baseline"> <td><a id="prod-associationExpression" name="prod-associationExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">20</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="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="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-agIdentifierOrMarker"><span class="insert">agIdentifierOrMarker</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-eIdentifierOrMarker"><span class="insert">eIdentifierOrMarker</span></a></span><span class="insert"> )? </span><span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs"><span class="insert">optionalAttributeValuePairs</span></a></span><span class="insert"> ")"</span></code></td> </tr> </tbody>
</table>
@@ -2813,7 +2353,13 @@
<tr><td><a href="http://www.w3.org/TR/prov-dm/#association.id"><span class="attribute" id="association.id"><span class="insert">id</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier"><span class="insert">optionalIdentifier</span></a></code></td></tr>
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#association.activity"><span class="attribute" id="association.activity"><span class="insert">activity</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier"><span class="insert">aIdentifier</span></a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#association.activity"><span class="attribute" id="association.activity"><span class="insert">activity</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier
+<span class="delete">,</span><span class="delete">
+( </span><span class="delete">agIdentifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> )
+</span><span class="delete">,</span><span class="delete">
+( </span><span class="delete">eIdentifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> )
+</span><span class="delete">optional-attribute-values</span>
+<span class="delete">)</span></a></code></td></tr>
<tr><td><a href="http://www.w3.org/TR/prov-dm/#association.agent"><span class="attribute" id="association.agent"><span class="insert">agent</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-agIdentifierOrMarker"><span class="insert">agIdentifierOrMarker</span></a></code></td></tr>
@@ -2825,30 +2371,37 @@
</div>
+
+
+
+
<p id="provn-type-Plan"><span class="insert">
PROV-N provides no dedicated syntax for Plan. Instead, a Plan </span><em class="rfc2119" title="must"><span class="insert">must</span></em><span class="insert"> be expressed as an
</span><code class="content"><a class="grammarRef" href="#prod-entityExpression"><span class="insert">entityExpression</span></a></code><span class="insert"> with attribute </span><code><span class="insert">prov:type='prov:Plan'</span></code><span class="insert">.</span></p>
<div class="anexample" id="example_25"><div class="anexampleTitle"><a class="internalDFN" href="#example_25"><span class="insert">Example 25</span></a></div>
-<pre class="codeexample"><span class="insert">wasAssociatedWith(ex:agas; ex:a1, ex:ag1, ex:e1, [ex:param1="a", ex:param2="b"])
- </span></pre>
-
-<p> Here
- <span class="name"><span class="delete">d</span><span class="insert">ex:agas</span></span> is the optional <span class="delete">derivation</span><span class="insert">attribution identifier,
- </span><span class="name"><span class="insert">ex:a1</span></span><span class="insert"> is an activity identifier,
- </span><span class="name"><span class="insert">ex:ag1</span></span><span class="insert"> is the optional identifier of the agent associated to the activity,
- </span><span class="name"><span class="insert">ex:e1</span></span><span class="insert"> is the optional identifier of the plan used by the agent in the context of the activity,
- and </span><span class="name"><span class="insert"> [ex:param1="a", ex:param2="b"]</span></span><span class="insert"> are optional attributes. </span></p><span class="insert">
+<pre class="codeexample"><span class="delete">wasAssociatedWith(ex:agas,</span><span class="insert">wasAssociatedWith(ex:agas;</span> ex:a1, ex:ag1, ex:e1, [ex:param1="a", ex:param2="b"])
+ </pre>
+
+<p> Here <span class="name">ex:agas</span> is the optional attribution identifier,
+ <span class="name">ex:a1</span> is an activity identifier,
+ <span class="name">ex:ag1</span> is the optional identifier of the agent associated to the activity,
+ <span class="name">ex:e1</span> is the optional identifier of the plan used by the agent in the context of the activity,
+ and <span class="name"> [ex:param1="a", ex:param2="b"]</span> are optional attributes. </p>
The remaining examples show cases where some of the optionals are omitted.
-</span><pre class="codeexample"><span class="insert">wasAssociatedWith(ex:a1, -, ex:e1)
-wasAssociatedWith(ex:a1, ex:ag1)
-wasAssociatedWith(ex:a1, ex:ag1, ex:e1)
-wasAssociatedWith(ex:a1, ex:ag1, ex:e1, [ex:param1="a", ex:param2="b"])
-wasAssociatedWith(a; ex:a1, -, ex:e1)
+<pre class="codeexample">wasAssociatedWith(ex:a1, -, ex:e1)
+wasAssociatedWith(ex:a1, <span class="insert">ex:ag1)
+wasAssociatedWith(ex:a1, </span>ex:ag1, <span class="delete">-)</span><span class="insert">ex:e1)</span>
+wasAssociatedWith(ex:a1, ex:ag1, <span class="insert">ex:e1, [ex:param1="a", ex:param2="b"])
+wasAssociatedWith(a; ex:a1, -, </span>ex:e1)
+<span class="delete">wasAssociatedWith(ex:a1, ex:ag1, ex:e1, [ex:param1="a", ex:param2="b"])
+wasAssociatedWith(a, ex:a1, -, ex:e1)
+wasAssociatedWith(-, ex:a1, -, ex:e1)
+wasAssociatedWith(-, ex:a1, ex:ag1, -)
</span></pre>
</div>
@@ -2869,7 +2422,8 @@
</table>
-<p><span class="insert">The following table summarizes how each constituent of a PROV-DM Delegation maps to a PROV-N syntax element.</span></p>
+<p><span class="delete">Note:</span>The <span class="delete">production </span><span class="delete">associationExpression</span><span class="delete"> allows for expressions </span><span class="delete">wasAssociatedWith(a, -, -)</span><span class="delete"> and </span><span class="delete">wasAssociatiedWith(-, a, -, -)</span><span class="delete">. However, these expressions are not valid in PROV-N,
+because at least one</span><span class="insert">following table summarizes how each constituent</span> of <span class="delete">agent</span><span class="delete"> or </span><span class="delete">plan</span> <span class="delete">must</span><span class="delete"> be present.</span><span class="insert">a PROV-DM Delegation maps to a PROV-N syntax element.</span></p>
<div style="text-align: left; ">
<table class="thinborder" style="margin-left: auto; margin-right: auto;">
<tbody><tr><td><b><span class="insert">Delegation</span></b></td><td><b><span class="insert">Non-Terminal</span></b></td></tr>
@@ -2889,63 +2443,85 @@
</tbody></table>
</div>
+<span class="delete">3.2.4 </span><span class="delete">Responsibility</span>
+
+
+<span class="delete">responsibilityExpression</span><span class="delete"> ::=
+</span><span class="delete">actedOnBehalfOf</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>
+<span class="delete">agIdentifier</span>
+<span class="delete">,</span>
+<span class="delete">agIdentifier</span>
+<span class="delete">,</span><span class="delete">
+( </span><span class="delete">aIdentifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> )
+</span><span class="delete">optional-attribute-values</span>
+<span class="delete">)</span>
+
+
<div class="anexample" id="example_26"><div class="anexampleTitle"><a class="internalDFN" href="#example_26"><span class="insert">Example 26</span></a></div>
- <pre class="codeexample"><span class="insert">actedOnBehalfOf(del1; ag2, ag1, a, [prov:type="contract"])
- </span></pre>
-<p><span class="insert"> Here </span><span class="name"><span class="insert">del1</span></span><span class="insert"> is the optional delegation identifier,
- </span><span class="name"><span class="insert">ag2</span></span><span class="insert"> is the identifier for the delegate agent,
- </span><span class="name"><span class="insert">ag1</span></span><span class="insert"> is the identifier of the responsible agent,
- </span><span class="name"><span class="insert">a</span></span><span class="insert"> is the optional identifier of the activity for which the delegation link holds,
- and </span><span class="name"><span class="insert">[prov:type="contract"]</span></span><span class="insert"> are optional attributes. </span></p><span class="insert">
+
+
+ <pre class="codeexample"><span class="delete">actedOnBehalfOf(act1,</span><span class="insert">actedOnBehalfOf(del1; ag2,</span> ag1,<span class="delete"> ag2,</span> a, [prov:type="contract"])
+ </pre>
+<p> Here <span class="name"><span class="delete">act1</span><span class="insert">del1</span></span> is the optional <span class="delete">attribution</span><span class="insert">delegation</span> identifier,
+ <span class="name"><span class="delete">ag1</span><span class="insert">ag2</span></span> is the identifier for the <span class="delete">subordinate</span><span class="insert">delegate</span> agent,
+ <span class="name"><span class="delete">ag2</span><span class="insert">ag1</span></span> is the identifier of the responsible agent,
+ <span class="name">a</span> is the optional identifier of the activity for which the <span class="delete">responsibility</span><span class="insert">delegation</span> link holds,
+ and <span class="name"> [prov:type="contract"]</span> are optional attributes. </p>
The remaining examples show cases where some of the optionals are omitted.
-</span><pre class="codeexample"><span class="insert">actedOnBehalfOf(ag1, ag2)
-actedOnBehalfOf(ag1, ag2, a)
-actedOnBehalfOf(ag1, ag2, -, [prov:type="delegation"])
+<pre class="codeexample">actedOnBehalfOf(ag1, <span class="insert">ag2)
+actedOnBehalfOf(ag1, </span>ag2, <span class="delete">-)</span><span class="insert">a)</span>
+actedOnBehalfOf(ag1, ag2, <span class="delete">a)
+actedOnBehalfOf(ag1,</span><span class="insert">-, [prov:type="delegation"])
actedOnBehalfOf(ag2, ag3, a, [prov:type="contract"])
-actedOnBehalfOf(r; ag2, ag3, a, [prov:type="contract"])
-</span></pre>
+actedOnBehalfOf(r;</span> ag2, <span class="delete">-, [prov:type="delegation"])
+actedOnBehalfOf(ag2, </span>ag3, a, [prov:type="contract"])<span class="delete">
+actedOnBehalfOf(r, ag2, ag3, a, [prov:type="contract"])
+actedOnBehalfOf(-, ag1, ag2, -)</span>
+</pre>
</div>
</div>
-<div id="expression-influence" class="section">
-<h4><span class="secno"><span class="insert">3.3.5 </span></span><span class="insert">Influence</span></h4>
-
-
-<table class="grammar">
-<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-influenceExpression" name="prod-influenceExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">22</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">influenceExpression</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"wasInfluencedBy" "(" </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="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs"><span class="insert">optionalAttributeValuePairs</span></a></span><span class="insert"> ")"</span></code></td> </tr> </tbody>
-</table>
-
-
-<p><span class="insert">The following table summarizes how each constituent of a PROV-DM Influence maps to a PROV-N syntax element.</span></p>
-<div style="text-align: left; ">
-<table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tbody><tr><td><b><span class="insert">Influence</span></b></td><td><b><span class="insert">Non-Terminal</span></b></td></tr>
-<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#influence.id"><span class="attribute" id="influence.id"><span class="insert">id</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier"><span class="insert">optionalIdentifier</span></a></code></td></tr>
-
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#influence.influencee"><span class="attribute" id="influence.influencee"><span class="insert">influencee</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier"><span class="insert">eIdentifier</span></a></code></td></tr>
-
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#influence.influencer"><span class="attribute" id="influence.influencer"><span class="insert">influencer</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier"><span class="insert">eIdentifier</span></a></code></td></tr>
-
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#influence.attributes"><span class="attribute" id="influence.attributes"><span class="insert">attributes</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs"><span class="insert">optionalAttributeValuePairs</span></a></code></td></tr>
-</tbody></table>
-</div>
-
-
-<div class="anexample" id="example_27"><div class="anexampleTitle"><a class="internalDFN" href="#example_27"><span class="insert">Example 27</span></a></div>
- <pre class="codeexample"><span class="insert">wasInfluencedBy(id;e2,e1,[ex:param="a"])
- </span></pre>
-<p><span class="insert"> Here
- </span><span class="name"><span class="insert">id</span></span><span class="insert"> is the optional influence</span> identifier,
- <span class="name">e2</span> is <span class="delete">the identifier for the entity being derived,
+
+<span class="delete">3.3 </span><span class="delete">Component 3: Derivations</span>
+
+<span class="delete">3.3.1 </span><span class="delete">Derivation</span>
+
+
+<span class="delete">derivationExpression</span><span class="delete"> ::=
+</span><span class="delete">wasDerivedFrom</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>
+<span class="delete">eIdentifier</span>
+<span class="delete">,</span>
+<span class="delete">eIdentifier</span>
+
+<span class="delete">,</span><span class="delete">
+( </span><span class="delete">aIdentifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> )
+</span><span class="delete">,</span><span class="delete">
+( </span><span class="delete">gIdentifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> )
+</span><span class="delete">,</span><span class="delete">
+( </span><span class="delete">uIdentifier</span><span class="delete"> | </span><span class="delete">-</span><span class="delete"> )
+</span>
+<span class="delete">optional-attribute-values</span>
+<span class="delete">)</span>
+
+
+
+
+ <span class="delete">wasDerivedFrom(d, e2, e1, a, g2, u1, [prov:comment="a righteous derivation"])
+ </span>
+<span class="delete"> Here
+ </span><span class="delete">d</span><span class="delete"> is the optional derivation identifier,
+ </span><span class="delete">e2</span><span class="delete"> is the identifier for the entity being derived,
</span><span class="delete">e1</span><span class="delete"> is the identifier of the entity from which </span><span class="delete">e2</span><span class="delete"> is derived,
</span><span class="delete">a</span><span class="delete"> is the optional identifier of the activity which used/generated the entities,
</span><span class="delete">g2</span><span class="delete"> is the optional identifier of the generation,
@@ -3093,28 +2669,47 @@
-
-<span class="delete">3.3.5 </span><span class="delete">Trace</span>
+<div id="expression-influence" class="section">
+<h4><span class="secno">3.3.5 </span><span class="delete">Trace</span><span class="insert">Influence</span></h4>
+
+
+<table class="grammar">
+<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-influenceExpression" name="prod-influenceExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">22</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">influenceExpression</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"wasInfluencedBy" "(" </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="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs"><span class="insert">optionalAttributeValuePairs</span></a></span><span class="insert"> ")"</span></code></td> </tr> </tbody>
+</table>
+
+
+<p><span class="insert">The following table summarizes how each constituent of a PROV-DM Influence maps to a PROV-N syntax element.</span></p>
+<div style="text-align: left; ">
+<table class="thinborder" style="margin-left: auto; margin-right: auto;">
+<tbody><tr><td><b><span class="insert">Influence</span></b></td><td><b><span class="insert">Non-Terminal</span></b></td></tr>
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
<span class="delete">traceExpression</span><span class="delete"> ::=
</span><span class="delete">tracedTo</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>
-<span class="delete">eIdentifier</span>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#influence.id"><span class="attribute" id="influence.id"><span class="insert">id</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier"><span class="insert">optionalIdentifier</span></a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#influence.influencee"><span class="attribute" id="influence.influencee"><span class="insert">influencee</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier
<span class="delete">,</span>
-<span class="delete">eIdentifier</span>
+</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#influence.influencer"><span class="attribute" id="influence.influencer"><span class="insert">influencer</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier
<span class="delete">optional-attribute-values</span>
-<span class="delete">)</span>
-
-
-
-
- <span class="delete">tracedTo(id,e2,e1,[ex:param="a"])
- </span>
-<span class="delete"> Here
- </span><span class="delete">id</span><span class="delete"> is the optional trace identifier,
- </span><span class="delete">e2</span><span class="delete"> is </span>an entity identifier,
+<span class="delete">)</span></a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#influence.attributes"><span class="attribute" id="influence.attributes"><span class="insert">attributes</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs"><span class="insert">optionalAttributeValuePairs</span></a></code></td></tr>
+</tbody></table>
+</div>
+
+
+<div class="anexample" id="example_27"><div class="anexampleTitle"><a class="internalDFN" href="#example_27"><span class="insert">Example 27</span></a></div>
+ <pre class="codeexample"><span class="delete">tracedTo(id,e2,e1,[ex:param="a"])</span><span class="insert">wasInfluencedBy(id;e2,e1,[ex:param="a"])</span>
+ </pre>
+<p> Here
+ <span class="name">id</span> is the optional <span class="delete">trace</span><span class="insert">influence</span> identifier,
+ <span class="name">e2</span> is an entity identifier,
<span class="name">e1</span> is the identifier for an ancestor entity that <span class="name">e2</span> <span class="delete">depends on,</span><span class="insert">is influenced by,</span>
and <span class="name">[ex:param="a"]</span> is the optional set of attributes. </p>
The remaining examples show cases where some of the optionals are omitted.
@@ -3140,9 +2735,10 @@
<div id="expression-bundle-constructor" class="section">
-<h4><span class="secno">3.4.1 </span><span class="insert">Bundle Constructor</span></h4>
-
-<table class="grammar">
+<h4><span class="secno">3.4.1 </span><span class="delete">Alternate</span><span class="insert">Bundle Constructor</span></h4>
+
+
+ <span class="delete">alternateExpression</span><span class="delete"> ::=</span><table class="grammar">
<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-namedBundle" name="prod-namedBundle"></a><span class="insert">[</span><span class="prodNo"><span class="insert">23</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>
@@ -3151,14 +2747,26 @@
<p><span class="insert">Named bundles are self-contained: each identifier occuring in a named bundle, including the bundle identifier itself, </span><em class="rfc2119" title="must"><span class="insert">must</span></em><span class="insert"> be interpreted with respect to the namespace declarations of that bundle. In other words, for every identifier with a prefix </span><code><span class="insert">p</span></code><span class="insert"> within a named bundle, there </span><em class="rfc2119" title="must"><span class="insert">must</span></em><span class="insert"> be a namespace declaration for </span><code><span class="insert">p</span></code><span class="insert"> in this named bundled; for every identifier without prefix, there </span><em class="rfc2119" title="must"><span class="insert">must</span></em><span class="insert"> be a default namespace declaration in this named bundled.</span></p>
<div class="anexample" id="example_28"><div class="anexampleTitle"><a class="internalDFN" href="#example_28"><span class="insert">Example 28</span></a></div>
- <pre class="codeexample"><span class="insert">bundle ex:author-view
- prefix ex <http://example.org/>
+ <pre class="codeexample"><span class="insert">bundle ex:author-view</span>
+ <span class="delete">alternateOf</span>
+<span class="delete">(</span>
+<span class="delete">eIdentifier</span>
+<span class="delete">,</span>
+<span class="delete">eIdentifier</span>
+<span class="delete">)</span>
+
+
+
+<span class="delete">alternateOf(tr:WD-prov-dm-20111215,ex:alternate-20111215)
+</span><span class="insert">prefix ex <http://example.org/>
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.
+
+<p> Here <span class="name"><span class="delete">tr:WD-prov-dm-20111215</span><span class="insert">ex:author-view</span></span> is <span class="delete">alternate for </span><span class="delete">ex:alternate-20111215</span><span class="delete">.
+</span><span class="insert">the name of the bundle.
</span></p>
@@ -3166,127 +2774,39 @@
</div>
+
+
+
</div>
+
+
<div id="expression-bundle-type" class="section">
-<h4><span class="secno"><span class="insert">3.4.2 </span></span><span class="insert">Bundle Type</span></h4>
-
-<p id="provn-type-Bundle"><span class="insert">
-When described, a Bundle </span><em class="rfc2119" title="must"><span class="insert">must</span></em><span class="insert"> be expressed as an
-</span><code class="content"><a class="grammarRef" href="#prod-entityExpression"><span class="insert">entityExpression</span></a></code><span class="insert"> with attribute </span><code><span class="insert">prov:type='prov:Bundle'</span></code><span class="insert">.</span></p>
+<h4><span class="secno">3.4.2 </span><span class="delete">Specialization</span><span class="insert">Bundle Type</span></h4>
+
+
+ <span class="delete">specializationExpression</span><span class="delete"> ::=
+ </span><span class="delete">specializationOf</span>
+<span class="delete">(</span>
+<span class="delete">eIdentifier</span>
+<span class="delete">,</span>
+<span class="delete">eIdentifier</span>
+<span class="delete">)</span>
+
+
+
+<span class="delete">specializationOf(tr:WD-prov-dm-20111215,tr:prov-dm)
+</span><span class="delete">
+ Here </span><span class="delete">tr:WD-prov-dm-20111215</span><span class="delete"> is</span><p id="provn-type-Bundle"><span class="insert">
+When described,</span> a <span class="delete">specialization of </span><span class="delete">tr:prov-dm</span><span class="insert">Bundle </span><em class="rfc2119" title="must"><span class="insert">must</span></em><span class="insert"> be expressed as an
+</span><code class="content"><a class="grammarRef" href="#prod-entityExpression"><span class="insert">entityExpression</span></a></code><span class="insert"> with attribute </span><code><span class="insert">prov:type='prov:Bundle'</span></code>.
+</p>
</div>
</div>
<div id="component5" class="section">
-<h3><span class="secno"><span class="insert">3.5 </span></span><span class="insert">Component 5: Alternate Entities</span></h3>
-<div id="expression-alternate" class="section">
-<h4><span class="secno"><span class="insert">3.5.1 </span></span>Alternate</h4>
-
-
-
-
-
-
-<table class="grammar">
-
-<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">24</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
-<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>
-
-</table>
-
-
-<p><span class="insert">The following table summarizes how each constituent of a PROV-DM Alternate maps to a PROV-N syntax element.</span></p>
-<div style="text-align: left; ">
-<table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tbody><tr><td><b><span class="insert">Alternate</span></b></td><td><b><span class="insert">Non-Terminal</span></b></td></tr>
-<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-
-
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#alternate.alternate1"><span class="attribute" id="alternate.alternate1"><span class="insert">alternate1</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier"><span class="insert">eIdentifier</span></a></code></td></tr>
-
-
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#alternate.alternate2"><span class="attribute" id="alternate.alternate2"><span class="insert">alternate2</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier"><span class="insert">eIdentifier</span></a></code></td></tr>
-
-</tbody></table>
-</div>
-
-<div class="anexample" id="example_29"><div class="anexampleTitle"><a class="internalDFN" href="#example_29"><span class="insert">Example 29</span></a></div>
-<pre class="codeexample">alternateOf(tr:WD-prov-dm-20111215,ex:alternate-20111215)
-</pre>
- Here <span class="name">tr:WD-prov-dm-20111215</span> is alternate for <span class="name">ex:alternate-20111215</span>.
-</div>
-
-
-</div>
-<div id="expression-specialization" class="section">
-<h4><span class="secno"><span class="delete">3.4.2</span><span class="insert">3.5.2</span> </span>Specialization</h4>
-
-
-
-
-
-
-
-<table class="grammar">
-
-<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">25</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>
-
-</table>
-
-<p><span class="insert">The following table summarizes how each constituent of a PROV-DM Specialization maps to a PROV-N syntax element.</span></p>
-<div style="text-align: left; ">
-<table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tbody><tr><td><b><span class="insert">Specialization</span></b></td><td><b><span class="insert">Non-Terminal</span></b></td></tr>
-<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-
-
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#specialization.specificEntity"><span class="attribute" id="specialization.specificEntity"><span class="insert">specificEntity</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier"><span class="insert">eIdentifier</span></a></code></td></tr>
-
-
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#specialization.generalEntity"><span class="attribute" id="specialization.generalEntity"><span class="insert">generalEntity</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier"><span class="insert">eIdentifier</span></a></code></td></tr>
-
-</tbody></table>
-</div>
-
-
-
-
-<div class="anexample" id="example_30"><div class="anexampleTitle"><a class="internalDFN" href="#example_30"><span class="insert">Example 30</span></a></div>
-<pre class="codeexample">specializationOf(tr:WD-prov-dm-20111215,tr:prov-dm)
-</pre>
- Here <span class="name">tr:WD-prov-dm-20111215</span> is a specialization of <span class="name">tr:prov-dm</span>.
-</div>
-
-</div>
-
-
-
-<div id="expression-mention" class="section">
-<h4><span class="secno"><span class="insert">3.5.3 </span></span><span class="insert">Mention</span></h4>
-
-<div class="note">
-<p><span class="insert">Note: This feature is "</span><a href="http://www.w3.org/2005/10/Process-20051014/tr#cfi"><span class="insert">at risk</span></a><span class="insert">" and may be removed from this specification based on feedback. Please send feedback to public-prov-comments@w3.org.</span></p>
-
-
-<p><span class="insert">The expression Mention might be removed from PROV if implementation experience reveals problems with supporting this construct.</span></p>
-</div>
-
-
-<span class="delete">3.5 </span><span class="delete">Component 5: Collections</span>
+<h3><span class="secno">3.5 </span>Component 5: <span class="delete">Collections</span><span class="insert">Alternate Entities</span></h3>
<span class="delete">Grammar for collections </span><span class="delete">may</span><span class="delete"> under go minor syntactic changes since it has not been implemented yet.</span><span class="delete">
@@ -3319,6 +2839,106 @@
+
+<div id="expression-alternate" class="section">
+<h4><span class="secno">3.5.1 </span><span class="delete">Insertion</span><span class="insert">Alternate</span></h4>
+
+
+
+<table class="grammar">
+
+<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">24</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">alternateExpression</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"><span class="insert">eIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-eIdentifier"><span class="insert">eIdentifier</span></a></span><span class="insert"> ")"</span></code></td> </tr> </tbody>
+
+</table>
+
+
+<p><span class="insert">The following table summarizes how each constituent of a PROV-DM Alternate maps to a PROV-N syntax element.</span></p>
+<div style="text-align: left; ">
+<table class="thinborder" style="margin-left: auto; margin-right: auto;">
+<tbody><tr><td><b><span class="insert">Alternate</span></b></td><td><b><span class="insert">Non-Terminal</span></b></td></tr>
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#alternate.alternate1"><span class="attribute" id="alternate.alternate1"><span class="insert">alternate1</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier"><span class="insert">eIdentifier</span></a></code></td></tr>
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#alternate.alternate2"><span class="attribute" id="alternate.alternate2"><span class="insert">alternate2</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier"><span class="insert">eIdentifier</span></a></code></td></tr>
+
+</tbody></table>
+</div>
+
+<div class="anexample" id="example_29"><div class="anexampleTitle"><a class="internalDFN" href="#example_29"><span class="insert">Example 29</span></a></div>
+<pre class="codeexample"><span class="insert">alternateOf(tr:WD-prov-dm-20111215,ex:alternate-20111215)
+</span></pre><span class="insert">
+ Here </span><span class="name"><span class="insert">tr:WD-prov-dm-20111215</span></span><span class="insert"> is alternate for </span><span class="name"><span class="insert">ex:alternate-20111215</span></span><span class="insert">.
+</span></div>
+
+
+</div>
+<div id="expression-specialization" class="section">
+<h4><span class="secno"><span class="insert">3.5.2 </span></span><span class="insert">Specialization</span></h4>
+
+
+
+
+<table class="grammar">
+
+<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">25</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">specializationExpression</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"><span class="insert">eIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-eIdentifier"><span class="insert">eIdentifier</span></a></span><span class="insert"> ")"</span></code></td> </tr> </tbody>
+
+</table>
+
+<p><span class="insert">The following table summarizes how each constituent of a PROV-DM Specialization maps to a PROV-N syntax element.</span></p>
+<div style="text-align: left; ">
+<table class="thinborder" style="margin-left: auto; margin-right: auto;">
+<tbody><tr><td><b><span class="insert">Specialization</span></b></td><td><b><span class="insert">Non-Terminal</span></b></td></tr>
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#specialization.specificEntity"><span class="attribute" id="specialization.specificEntity"><span class="insert">specificEntity</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier"><span class="insert">eIdentifier</span></a></code></td></tr>
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#specialization.generalEntity"><span class="attribute" id="specialization.generalEntity"><span class="insert">generalEntity</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier"><span class="insert">eIdentifier</span></a></code></td></tr>
+
+</tbody></table>
+</div>
+
+
+<div class="anexample" id="example_30"><div class="anexampleTitle"><a class="internalDFN" href="#example_30"><span class="insert">Example 30</span></a></div>
+<pre class="codeexample"><span class="insert">specializationOf(tr:WD-prov-dm-20111215,tr:prov-dm)
+</span></pre><span class="insert">
+ Here </span><span class="name"><span class="insert">tr:WD-prov-dm-20111215</span></span><span class="insert"> is a specialization of </span><span class="name"><span class="insert">tr:prov-dm</span></span><span class="insert">.
+</span></div>
+
+</div>
+
+
+
+<div id="expression-mention" class="section">
+<h4><span class="secno"><span class="insert">3.5.3 </span></span><span class="insert">Mention</span></h4>
+
+
+ <span class="delete">derivationByInsertionFromExpression</span><span class="delete"> ::=
+</span><span class="delete">derivedByInsertionFrom</span>
+ <span class="delete">(</span>
+ <span class="delete">identifier</span>
+ <span class="delete">,</span>
+<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><div class="note">
+<p><span class="insert">Note: This feature is "</span><a href="http://www.w3.org/2005/10/Process-20051014/tr#cfi"><span class="insert">at risk</span></a><span class="insert">" and may be removed from this specification based on feedback. Please send feedback to public-prov-comments@w3.org.</span></p>
+
+
+<p><span class="insert">The expression Mention might be removed from PROV if implementation experience reveals problems with supporting this construct.</span></p>
+</div>
+
+
+
<table class="grammar">
<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-mentionExpression" name="prod-mentionExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">26</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">mentionExpression</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"mentionOf" "(" </span><span class="prod"><a class="grammarRef" href="#prod-eIdentifier"><span class="insert">eIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-eIdentifier"><span class="insert">eIdentifier</span></a></span><span class="insert"> "," </span><span class="prod"><a class="grammarRef" href="#prod-bIdentifier"><span class="insert">bIdentifier</span></a></span><span class="insert"> ")"</span></code></td> </tr> </tbody>
</table>
@@ -3336,34 +2956,14 @@
<tr><td><a href="http://www.w3.org/TR/prov-dm/#mention.generalEntity"><span class="attribute" id="mention.generalEntity"><span class="insert">generalEntity</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier"><span class="insert">eIdentifier</span></a></code></td></tr>
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#mention.bundle"><span class="attribute" id="mention.bundle"><span class="insert">bundle</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-bIdentifier"><span class="insert">bIdentifier</span></a></code></td></tr>
+
+ <tr><td><a href="http://www.w3.org/TR/prov-dm/#mention.bundle"><span class="attribute" id="mention.bundle"><span class="insert">bundle</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-bIdentifier"><span class="insert">bIdentifier</span></a></code></td></tr>
</tbody></table>
</div>
-
-<span class="delete">3.5.1 </span><span class="delete">Insertion</span>
-
-
- <span class="delete">derivationByInsertionFromExpression</span><span class="delete"> ::=
-</span><span class="delete">derivedByInsertionFrom</span>
- <span class="delete">(</span>
- <span class="delete">identifier</span>
- <span class="delete">,</span>
-<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>
<div class="anexample" id="example_31"><div class="anexampleTitle"><a class="internalDFN" href="#example_31"><span class="insert">Example 31</span></a></div>
-
-
-
<pre class="codeexample"><span class="delete"> derivedByInsertionFrom(id, c1, c, {("k1", v1), ("k2", v2)}, [])
</span><span class="insert"> mention(ex:report1_as_in_b1, ex:report1, ex:b1)
</span></pre>
@@ -3519,10 +3119,6 @@
<h4><span class="secno">3.6.2 </span><span class="delete">Annotation</span><span class="insert">Membership</span></h4>
-<span class="delete">annotationExpression</span><span class="delete"> ::=
-</span>
-
-
<table class="grammar">
<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-membershipExpression" name="prod-membershipExpression"></a><span class="insert">[</span><span class="prodNo"><span class="insert">27</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">"hadMember" "(" </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-eIdentifier"><span class="insert">eIdentifier</span></a></span><span class="insert"> ")"</span></code></td> </tr> </tbody>
@@ -3538,7 +3134,9 @@
<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership.collection"><span class="attribute" id="membership.collection"><span class="insert">collection</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-cIdentifier"><span class="insert">cIdentifier</span></a></code></td></tr>
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership.member"><span class="attribute" id="membership.member"><span class="insert">member</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier"><span class="insert">eIdentifier</span></a></code></td></tr>
+
+<span class="delete">annotationExpression</span><span class="delete"> ::=
+</span><tr><td><a href="http://www.w3.org/TR/prov-dm/#membership.member"><span class="attribute" id="membership.member"><span class="insert">member</span></span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier"><span class="insert">eIdentifier</span></a></code></td></tr>
</tbody></table>
@@ -3599,7 +3197,7 @@
<div id="expression-identifier" class="section">
-<h4><span class="secno">3.7.1 </span><span class="delete">Namespace Declaration</span>
+<h4><span class="secno">3.7.1 <span class="delete">Namespace Declaration</span>
@@ -3636,7 +3234,7 @@
-<span class="delete">3.7.2 </span>Identifier</h4>
+<span class="delete">3.7.2</span> </span>Identifier</h4>
<p><span class="insert">Various kinds of identifiers are used in productions.</span></p>
@@ -3722,8 +3320,6 @@
<p>A <span class="delete">PROV</span><span class="insert">PROV-N</span> qualified name <span class="delete">has a more permissive syntax then XML's </span><span class="delete">QName</span><span class="delete"> [</span><span class="delete">XML-NAMES</span><span class="delete">] since it allows any syntax for its local part provided that the concatenation with the namespace results in</span><code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME"><span class="insert">QUALIFIED_NAME</span></a></code><span class="insert"> can be mapped to</span> a valid IRI [<cite><a class="bibref" rel="biblioentry" href="#bib-IRI">IRI</a></cite><span class="delete">]. </span><span class="insert">] by concatenating the namespace denoted its local name </span><code class="content"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX"><span class="insert">PN_PREFIX</span></a></code><span class="insert"> to the local name </span><code class="content"><a class="grammarRef" href="#prod-PN_LOCAL"><span class="insert">PN_LOCAL</span></a></code><span class="insert">, whose \-escaped characters have been unescaped by dropping the character '\' (backslash).</span></p>
-
-
<table class="grammar">
<tbody class="term"> <tr valign="baseline"> <td><a id="prod-QUALIFIED_NAME" name="prod-QUALIFIED_NAME"></a><span class="insert">[</span><span class="prodNo"><span class="insert">61</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">QUALIFIED_NAME</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">( </span><span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_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="http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX"><span class="insert">PN_PREFIX</span></a></span><span class="insert"> ":"</span></code></td> </tr> </tbody>
@@ -3857,22 +3453,20 @@
<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">44</span></span><span class="insert">] </span></td> <td><code class="production prod"><span class="insert">datatype</span></code></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME"><span class="insert">QUALIFIED_NAME</span></a></span></code></td> </tr> </tbody>
<tbody><tr valign="baseline"><td></td><td></td><td></td></tr></tbody>
<tbody class="prod"> <tr valign="baseline"> <td><a id="prod-convenienceNotation" name="prod-convenienceNotation"></a><span class="insert">[</span><span class="prodNo"><span class="insert">45</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><span class="insert"> (</span><span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rLANGTAG"><span class="insert">LANGTAG</span></a></span><span class="insert">)?</span><br>
-<span class="delete">typedLiteral</span><span class="delete"> ::= </span><span class="delete">quotedString</span> <span class="delete">%%</span> <span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-INT_LITERAL"><span class="insert">INT_LITERAL</span></a></span><br><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME_LITERAL"><span class="insert">QUALIFIED_NAME_LITERAL</span></a></span></code></td> </tr> </tbody>
-<tbody class="term"> <tr valign="baseline"> <td><a id="prod-STRING_LITERAL" name="prod-STRING_LITERAL"></a><span class="insert">[</span><span class="prodNo"><span class="insert">67</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="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rSTRING_LITERAL2"><span class="insert">STRING_LITERAL2</span></a></span><br><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rSTRING_LITERAL_LONG2"><span class="insert">STRING_LITERAL_LONG2</span></a></span></code></td> </tr> </tbody>
+<span class="delete">typedLiteral</span><span class="delete"> ::= </span><span class="delete">quotedString</span> <span class="delete">%%</span> <span class="delete">datatype</span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-INT_LITERAL"><span class="insert">INT_LITERAL</span></a></span><br>
+<span class="delete">datatype</span><span class="delete"> ::= </span><span class="delete">qualifiedName</span> <span class="delete"> listed in Table </span><span class="delete">permitted-datatypes</span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME_LITERAL"><span class="insert">QUALIFIED_NAME_LITERAL</span></a></span></code></td> </tr> </tbody>
+<tbody class="term"> <tr valign="baseline"> <td><a id="prod-STRING_LITERAL" name="prod-STRING_LITERAL"></a><span class="insert">[</span><span class="prodNo"><span class="insert">67</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="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rSTRING_LITERAL2"><span class="insert">STRING_LITERAL2</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="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="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rSTRING_LITERAL_LONG2"><span class="insert">STRING_LITERAL_LONG2</span></a></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">69</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">INT_LITERAL</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">("-")? (</span><span class="prod"><a class="grammarRef" href="#prod-DIGIT"><span class="insert">DIGIT</span></a></span><span class="insert">)+</span></code></td> </tr> </tbody>
<tbody class="term"> <tr valign="baseline"> <td><a id="prod-QUALIFIED_NAME_LITERAL" name="prod-QUALIFIED_NAME_LITERAL"></a><span class="insert">[</span><span class="prodNo"><span class="insert">70</span></span><span class="insert">] </span></td> <td><span class="insert"><</span><code class="production term"><span class="insert">QUALIFIED_NAME_LITERAL</span></code><span class="insert">></span></td> <td><span class="insert"> ::= </span></td> <td><code class="content"><span class="insert">"'" </span><span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME"><span class="insert">QUALIFIED_NAME</span></a></span><span class="insert"> "'"</span></code></td> </tr> </tbody>
</table>
-<p><span class="insert">In production </span><code class="content"><a class="grammarRef" href="#prod-datatype">datatype
-<span class="delete">datatype</span><span class="delete"> ::= </span><span class="delete">qualifiedName</span> <span class="delete"> listed in Table </span><span class="delete">permitted-datatypes</span>
-<span class="delete">convenienceNotation</span><span class="delete"> ::= </span><span class="delete">stringLiteral</span><span class="delete"> | </span><span class="delete">intLiteral</span>
-<span class="delete">stringLiteral</span><span class="delete"> ::= </span><span class="delete">quotedString</span>
-<span class="delete">quotedString</span><span class="delete"> ::= </span></a></code><span class="insert">, the </span><code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME"><span class="insert">QUALIFIED_NAME</span></a></code><span class="insert"> is used to denote </span>a <span class="delete">finite sequence of characters in which " (#x22) and \ (#x5C) occur only in pairs of the form \" (#x5C, #x22) and \\ (#x5C,
-#x5C), enclosed in a pair of " (#x22) characters</span>
-<span class="delete">intLiteral</span><span class="delete"> ::= </span><span class="delete">a finite-length non-empty sequence of decimal digits (#x30-#x39) with an optional leading negative sign (-)</span>
-
-
-<a href="http://www.w3.org/TR/prov-dm/#term-value"><span class="insert">PROV data type</span></a><span class="insert"> [</span><cite><a class="bibref" rel="biblioentry" href="#bib-PROV-DM"><span class="insert">PROV-DM</span></a></cite><span class="insert">].
+<p><span class="insert">In production </span><code class="content"><a class="grammarRef" href="#prod-datatype"><span class="insert">datatype</span></a></code><span class="insert">, the </span><code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME"><span class="insert">QUALIFIED_NAME</span></a></code><span class="insert"> is used to denote a </span><a href="http://www.w3.org/TR/prov-dm/#term-value"><span class="insert">PROV data type</span></a><span class="insert"> [</span><cite><a class="bibref" rel="biblioentry" href="#bib-PROV-DM"><span class="insert">PROV-DM</span></a></cite><span class="insert">].
</span></p><p>The non terminals <span class="delete">stringLiteral</span>
@@ -3910,42 +3504,45 @@
<p><b>Note:</b>The productions for <span class="delete">qualifiedName</span><span class="insert">terminals </span><code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME"><span class="insert">QUALIFIED_NAME</span></a></code> and <span class="delete">intLiteral</span>
-<code class="content"><a class="grammarRef" href="#prod-INT_LITERAL"><span class="insert">INT_LITERAL</span></a></code> are conflicting.<span class="insert">
-Indeed, for a tokenizer operating independently of the parse tree, </span><code><span class="insert">1234</span></code><span class="insert"> matches both </span><code class="content"><a class="grammarRef" href="#prod-INT_LITERAL"><span class="insert">INT_LITERAL</span></a></code><span class="insert"> and </span><code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME"><span class="insert">QUALIFIED_NAME</span></a></code><span class="insert"> (local name without prefix). In the context of
-a </span><code class="content"><a class="grammarRef" href="#prod-convenienceNotation"><span class="insert">convenienceNotation</span></a></code><span class="insert">, a tokenizer should give preference to the production
-</span><code class="content"><a class="grammarRef" href="#prod-INT_LITERAL"><span class="insert">INT_LITERAL</span></a></code><span class="insert">.
-</span></p>
-
-<div class="anexample" id="anexample-convenience"><div class="anexampleTitle"><a class="internalDFN" href="#anexample-convenience"><span class="insert">Example 36</span></a></div>
+<code class="content"><a class="grammarRef" href="#prod-INT_LITERAL"><span class="insert">INT_LITERAL</span></a></code> are conflicting. <span class="insert">
+Indeed, for a tokenizer operating independently of the parse tree, </span><code><span class="insert">1234</span></code><span class="insert"> matches both </span><code class="content"><a class="grammarRef" href="#prod-INT_LITERAL"><span class="insert">INT_LITERAL</span></a></code><span class="insert"> and </span><code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME"><span class="insert">QUALIFIED_NAME</span></a></code><span class="insert"> (local name without prefix). </span>In the context of
+a <span class="delete">Literal</span><code class="content"><a class="grammarRef" href="#prod-convenienceNotation"><span class="insert">convenienceNotation</span></a></code>, a <span class="delete">parser</span><span class="insert">tokenizer</span> should give <span class="delete">precedence</span><span class="insert">preference</span> to the production<span class="delete"> for </span><span class="delete">intLiteral</span>
+<code class="content"><a class="grammarRef" href="#prod-INT_LITERAL"><span class="insert">INT_LITERAL</span></a></code>.
+
+</p>
+
+<span class="delete">
+Wouldn't</span><div class="anexample" id="anexample-convenience"><div class="anexampleTitle"><a class="internalDFN" href="#anexample-convenience"><span class="insert">Example 36</span></a></div>
<p><span class="insert">
The following examples illustrate convenience notations.</span></p>
-<p><span class="insert">The two following expressions are strings; if </span><code class="content"><a class="grammarRef" href="#prod-datatype"><span class="insert">datatype</span></a></code><span class="insert"> is not specified, it is </span><code><span class="insert">xsd:string</span></code><span class="insert">.</span></p>
-<pre class="codeexample"> <span class="delete">In the context</span><span class="insert">"abc" %% xsd:string
+<p><span class="insert">The two following expressions are strings; if </span><code class="content"><a class="grammarRef" href="#prod-datatype"><span class="insert">datatype</span></a></code><span class="insert"> is not specified,</span> it <span class="delete">be useful to introduce</span><span class="insert">is </span><code><span class="insert">xsd:string</span></code><span class="insert">.</span></p>
+<pre class="codeexample"><span class="insert"> "abc" %% xsd:string
"abc"
</span></pre>
-<p><span class="insert">The two following expressions are integers. For convenience, numbers, expressed as digits optionally preceded by a minus sign, can occur without quotes.</span></p>
-<pre class="codeexample"><span class="insert"> "1234" %% xsd:integer
+<p><span class="insert">The two following expressions are integers. For convenience, numbers, expressed as digits optionally preceded by</span> a <span class="delete">literal for a qualified name?
+Currenlty, we have to write:
+</span><span class="delete">prov:type="ex:Programmer"</span><span class="insert">minus sign, can occur without quotes.</span></p>
+<pre class="codeexample"> <span class="insert">"1234" </span>%% <span class="delete">xsd:QName
+</span><span class="delete">
+to indicate that ex:Programmer should be interpreted as qualified name (QName).
+Instead, we could have a notation such as
+</span><span class="delete">prov:type='ex:Programmer'</span><span class="insert">xsd:integer
1234
"-1234" %% xsd:integer
- -1234
+ -1234</span>
+</pre>
+
+<p><span class="insert">The two following expressions are qualified names. Values of type qualified name can be conveniently expressed within single quotes.</span></p>
+<pre class="codeexample"><span class="insert"> "ex:value" %% prov:QUALIFIED_NAME
+ 'ex:value'
</span></pre>
-
-<p><span class="insert">The two following expressions are qualified names. Values</span> of <span class="delete">a </span><span class="delete">Literal</span><span class="delete">, a parser should give precedence to the production for </span><span class="delete">intLiteral</span><span class="delete">.
-</span><span class="insert">type qualified name can be conveniently expressed within single quotes.</span></p>
-
-<span class="delete">
-Wouldn't it be useful to introduce a literal for a qualified name?
-Currenlty, we have to write:
-</span><span class="delete">prov:type="ex:Programmer"</span>
-<pre class="codeexample"> <span class="insert">"ex:value" </span>%% <span class="delete">xsd:QName</span><span class="insert">prov:QUALIFIED_NAME
- 'ex:value'</span>
-</pre>
-<span class="delete">to indicate that ex:Programmer should be interpreted as qualified name (QName).
-Instead, we could have a notation such as
-</span><span class="delete">prov:type='ex:Programmer'</span></div>
+</div>
+
+
+
<div class="anexample" id="anexample-value"><div class="anexampleTitle"><a class="internalDFN" href="#anexample-value"><span class="insert">Example 37</span></a></div>
<p><span class="insert">
@@ -3953,17 +3550,12 @@
</span></p><pre class="codeexample"><span class="insert"> "abc"
"bonjour"@fr
"1" %% xsd:integer
- "http://example.org/foo" %% xsd:anyURI</span>
-</pre>
-
-
+ "http://example.org/foo" %% xsd:anyURI
+</span></pre>
</div>
-
-
-
<div id="expression-types" class="section">
<h5><span class="secno"><span class="delete">3.7.4.1</span><span class="insert">3.7.3.1</span> </span>Reserved Type Values</h5>