--- a/model/prov-n.html Mon May 14 18:11:18 2012 +0100
+++ b/model/prov-n.html Mon May 14 21:54:09 2012 +0100
@@ -1306,6 +1306,7 @@
<section id="expression-Revision">
<h4>Revision</h4>
+<!--
<div class="grammar">
<span class="nonterminal">revisionExpression</span> ::=
<span class="name">wasRevisionOf</span>
@@ -1319,6 +1320,7 @@
<span class="nonterminal">optional-attribute-values</span>
<span class="name">)</span>
</div>
+-->
<table class="grammar">
<div>
@@ -1329,24 +1331,25 @@
<div class="anexample">
<pre class="codeexample">
-wasRevisionOf(rev1, tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018, w3:Consortium, [prov:comment="??"] )
+wasRevisionOf(rev1, tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018, ex:act1, ex:g, ex:u, [prov:comment="??"] )
</pre>
<p> Here
<span class="name">rev1</span> is the optional revision identifier,
<span class="name">tr:WD-prov-dm-20111215</span> is the identifier of the revised entity,
<span class="name">tr:WD-prov-dm-20111018</span> is the identifier of the original entity,
- <span class="name">w3:Consortium</span> is the optional identifier of the agent involved in the revision,
- and <span class="name"> [prov:comment="??"] )</span> are optional attributes. </p>
+ <span class="name">ex:act1</span> is the identifier for the activity using and generating <span class="name">tr:WD-prov-dm-20111215</span> and <span class="name">tr:WD-prov-dm-20111018</span>,
+ <span class="name">ex:g</span> is the identifier for the generation involving the revised entity <span class="name">tr:WD-prov-dm-20111215</span> and activity <span class="name">ex:act1</span>;
+ <span class="name">ex:u</span> is the identifier for the usage involving the used entity <span class="name">tr:WD-prov-dm-20111018</span> and activity <span class="name">ex:act1</span>,
+ and <span class="name"> [prov:comment="??"]</span> are optional attributes. </p>
The remaining examples show cases where some of the optionals are omitted.
<pre class="codeexample">
-wasRevisionOf(tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018, -)
-wasRevisionOf(tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018, w3:Consortium)
-wasRevisionOf(id,tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018, w3:Consortium)
-wasRevisionOf(tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018, -)
-wasRevisionOf(id,tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018, -)
-wasRevisionOf(-,tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018, -)
+wasRevisionOf(tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018)
+wasRevisionOf(tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018, ex:act1, ex:g, ex:u)
+wasRevisionOf(id; tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018, , ex:act1, ex:g, ex:u)
+wasRevisionOf(id;tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018)
+wasRevisionOf(tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018, [prov:comment="??"])
</pre>
</div>
@@ -1355,6 +1358,7 @@
<section id="expression-quotation">
<h4>Quotation</h4>
+<!--
<div class="grammar">
<span class="nonterminal">quotationExpression</span> ::=
<span class="name">wasQuotedFrom</span>
@@ -1372,7 +1376,7 @@
<span class="nonterminal">optional-attribute-values</span>
<span class="name">)</span>
</div>
-
+-->
<table class="grammar">
<div>
@@ -1384,27 +1388,25 @@
<div class="anexample">
<pre class="codeexample">
-wasQuotedFrom(quoteId1, ex:blockQuote,ex:blog,ex:Luc,ex:Paul,[])
+wasQuotedFrom(quoteId1; ex:blockQuote,ex:blog, ex:act1, ex:g, ex:u, [])
</pre>
<p> Here
<span class="name">quoteId1</span> is the optional revision identifier,
<span class="name">ex:blockQuote</span> is the identifier of the entity that represents the quote (the partial copy)
<span class="name">ex:blog</span> is the identifier of the original entity being quoted,
- <span class="name">ex:Luc</span> is the optional identifier of the agent who performs the quoting,
- <span class="name">ex:Paul</span> is the optional identifier of the agent to whom the original entity is attributed,
+ <span class="name">ex:act1</span> is the identifier for the activity using and generating <span class="name">ex:blockQuote</span> and <span class="name">ex:blog</span>,
+ <span class="name">ex:g</span> is the identifier for the generation involving the quoted entity <span class="name">ex:blockQuote</span> and activity <span class="name">ex:act1</span>;
+ <span class="name">ex:u</span> is the identifier for the usage involving the original entity <span class="name">ex:blog</span> and activity <span class="name">ex:act1</span>,
and <span class="name">[]</span> is the (empty) optional set of attributes. </p>
The remaining examples show cases where some of the optionals are omitted.
<pre class="codeexample">
wasQuotedFrom(ex:blockQuote,ex:blog)
-wasQuotedFrom(ex:blockQuote,ex:blog,ex:Luc,ex:Paul)
-wasQuotedFrom(ex:blockQuote,ex:blog,-,ex:Paul)
-wasQuotedFrom(ex:blockQuote,ex:blog,ex:Luc,ex:Paul,[])
-wasQuotedFrom(ex:blockQuote,ex:blog, -, -)
-wasQuotedFrom(id,ex:blockQuote,ex:blog,ex:Luc,ex:Paul)
-wasQuotedFrom(-,ex:blockQuote,ex:blog,ex:Luc,-)
-
+wasQuotedFrom(ex:blockQuote,ex:blog, ex:act1, -,-)
+wasQuotedFrom(ex:blockQuote,ex:blog,-,ex:g, ex:u)
+wasQuotedFrom(ex:blockQuote,ex:blog,[])
+wasQuotedFrom(id; ex:blockQuote,ex:blog,ex:act1, -,-)
</pre>
</div>
@@ -1414,6 +1416,7 @@
<section id="expression-original-source">
<h4>Original Source</h4>
+<!--
<div class="grammar">
<span class="nonterminal">originalSourceExpression</span> ::=
<span class="name">hadOriginalSource</span>
@@ -1425,6 +1428,7 @@
<span class="nonterminal">optional-attribute-values</span>
<span class="name">)</span>
</div>
+-->
<table class="grammar">
<div>
@@ -1436,12 +1440,15 @@
<div class="anexample">
<pre class="codeexample">
-hadOriginalSource(src1, ex:e1, ex:e2,[ex:param="a"])
+hadOriginalSource(src1; ex:e1, ex:e2, ex:act, ex:g, ex:u, [ex:param="a"])
</pre>
<p> Here
<span class="name">src1</span> is the optional original source identifier,
<span class="name">ex:e1</span> is the identifier of the derived entity,
<span class="name">ex:e2</span> is the identifier of the original source entity,
+ <span class="name">ex:act1</span> is the identifier for the activity using and generating <span class="name">ex:e1</span> and <span class="name">ex:e2</span>,
+ <span class="name">ex:g</span> is the identifier for the generation involving the quoted entity <span class="name">ex:e1</span> and activity <span class="name">ex:act1</span>;
+ <span class="name">ex:u</span> is the identifier for the usage involving the original entity <span class="name">ex:e2</span> and activity <span class="name">ex:act1</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.
@@ -1449,8 +1456,7 @@
<pre class="codeexample">
hadOriginalSource(ex:e1, ex:e2)
hadOriginalSource(ex:e1, ex:e2,[ex:param="a"])
-hadOriginalSource(-,ex:e1, ex:e2,[ex:param="a"])
-hadOriginalSource(-,ex:e1, ex:e2)
+hadOriginalSource(id; ex:e1, ex:e2, ex:act, -, -, [ex:param="a"])
</pre>
</div>
@@ -1458,6 +1464,7 @@
<section id="expression-trace">
<h4>Trace</h4>
+<!--
<div class="grammar">
<span class="nonterminal">traceExpression</span> ::=
<span class="name">tracedTo</span>
@@ -1469,6 +1476,7 @@
<span class="nonterminal">optional-attribute-values</span>
<span class="name">)</span>
</div>
+-->
<table class="grammar">
@@ -1492,7 +1500,7 @@
<pre class="codeexample">
tracedTo(e2,e1)
tracedTo(e2,e1,[ex:param="a"])
-tracedTo(-,e2,e1)
+tracedTo(id; e2,e1)
</pre>
</div>
@@ -1503,6 +1511,7 @@
<section id="expression-alternate">
<h4>Alternate</h4>
+<!--
<div class='grammar'>
<span class="nonterminal">alternateExpression</span> ::=
<span class="name">alternateOf</span>
@@ -1512,7 +1521,7 @@
<span class="nonterminal">eIdentifier</span>
<span class="name">)</span>
</div>
-
+-->
<table class="grammar">
<div>
@@ -1533,6 +1542,8 @@
<section id="expression-specialization">
<h4>Specialization</h4>
+
+<!--
<div class='grammar'>
<span class="nonterminal">specializationExpression</span> ::=
<span class="name">specializationOf</span>
@@ -1542,6 +1553,7 @@
<span class="nonterminal">eIdentifier</span>
<span class="name">)</span>
</div>
+-->
<table class="grammar">
<div>
@@ -1562,8 +1574,6 @@
<section id="component5">
<h3>Component 5: Collections</h3>
-<div class="note">Grammar for collections MAY under go minor syntactic changes since it has not been implemented yet.</div>
-
In the productions in this section, nonterminals <span class="nonterminal">keyValuePairs</span> and <span class="nonterminal">keySet</span> are defined as follows.
<div class="grammar">
@@ -1615,7 +1625,7 @@
<div class="anexample">
<pre class="codeexample">
- derivedByInsertionFrom(id, c1, c, {("k1", v1), ("k2", v2)}, [])
+ derivedByInsertionFrom(id; c1, c, {("k1", v1), ("k2", v2)}, [])
</pre>
<p> Here
<span class="name">id</span> is the optional insertion identifier,
@@ -1659,7 +1669,7 @@
<div class="anexample">
<pre class="codeexample">
- derivedByRemovalFrom(id, c3, c, {"k1", "k3"}, [])
+ derivedByRemovalFrom(id; c3, c, {"k1", "k3"}, [])
</pre>
<p> Here
<span class="name">id</span> is the optional removal identifier,
@@ -1701,7 +1711,7 @@
<div class="anexample">
<pre class="codeexample">
- memberOf(mid, c, {("k4", v4), ("k5", v5)}, [])
+ memberOf(mId, c, {("k4", v4), ("k5", v5)}, [])
</pre>
<p> Here
<span class="name">mid</span> is the optional membership identifier,
@@ -1740,7 +1750,7 @@
<div class="anexample">
<pre class="codeexample">
-note(ann1,[ex:color="blue", ex:screenX=20, ex:screenY=30])
+note(ann1; [ex:color="blue", ex:screenX=20, ex:screenY=30])
</pre>
</div>