--- a/model/working-copy/wd5-prov-n.html Wed Mar 21 10:30:15 2012 +0000
+++ b/model/working-copy/wd5-prov-n.html Wed Mar 21 10:30:46 2012 +0000
@@ -393,7 +393,7 @@
<section id="component1">
<h3>Component 1: Entities and Activities</h3>
-<section id="term-Entity">
+<section id="expression-Entity">
<h4>Entity</h4>
<div class="withPn">
@@ -438,7 +438,7 @@
</section>
-<section id="term-Activity">
+<section id="expression-Activity">
<h4>Activity</h4>
@@ -463,20 +463,20 @@
<div class="anexample">
<pre class="codeexample">
-activity(ex:edit1)
-activity(ex:a0, 2011-11-16T16:00:00,-)
-activity(ex:a0, -, 2011-11-16T16:00:00)
-activity(ex:edit1,-,-)
-activity(ex:edit1,[prov:type="edit"])
-activity(ex:edit1,-,-, [prov:type="edit"])
-activity(ex:a0, 2011-11-16T16:00:00,-,[prov:type="createFile"])
-activity(ex:a0, 2011-11-16T16:00:00, 2011-11-16T16:00:01, [prov:type="createFile"])
+activity(ex:a10)
+activity(ex:a10, -, -)
+activity(ex:a10, -, -, [prov:type="edit"])
+activity(ex:a10, -, 2011-11-16T16:00:00)
+activity(ex:a10, 2011-11-16T16:00:00, -)
+activity(ex:a10, 2011-11-16T16:00:00, -, [prov:type="createFile"])
+activity(ex:a10, 2011-11-16T16:00:00, 2011-11-16T16:00:01, [prov:type="createFile"])
+activity(ex:a10, [prov:type="edit"])
</pre>
</div>
</section>
-<section id="term-Generation">
+<section id="expression-Generation">
<h4>Generation</h4>
@@ -499,18 +499,22 @@
<div class="anexample">
<pre class="codeexample">
-wasGeneratedBy(tr:WD-prov-dm-20111215, ex:edit1)
+wasGeneratedBy(tr:WD-prov-dm-20111215, ex:edit1, -)
wasGeneratedBy(tr:WD-prov-dm-20111215, ex:edit1, 2011-11-16T16:00:00)
-wasGeneratedBy(ex:g1, tr:WD-prov-dm-20111215, ex:edit1)
-wasGeneratedBy(e2, a1, [ex:fct="save"])
-wasGeneratedBy(e2, -)
-wasGeneratedBy(e2, -, [ex:fct="save"])
+wasGeneratedBy(e2, a1, -, [ex:fct="save"])
+wasGeneratedBy(e2, -, -, [ex:fct="save"])
+wasGeneratedBy(ex:g1, tr:WD-prov-dm-20111215, ex:edit1, -)
+wasGeneratedBy(ex:g1, tr:WD-prov-dm-20111215, ex:edit1, 2011-11-16T16:00:00)
+wasGeneratedBy(-, tr:WD-prov-dm-20111215, ex:edit1, -)
</pre>
</div>
+<p>Even though the production <span class="nonterminal">generationExpression</span> allows for expressions <span class="name">wasGeneratedBy(e2, -, -)</span> and <span class="name">wasGeneratedBy(-, e2, -, -)</span>, these expressions are not valid in PROV-N.</p>
+
+
</section>
-<section id="term-Usage">
+<section id="expression-Usage">
<h4>Usage</h4>
@@ -532,16 +536,18 @@
<div class="anexample">
<pre class="codeexample">
-used(ex:act2, ar3:0111)
+used(ex:act2, ar3:0111, -)
used(ex:act2, ar3:0111, 2011-11-16T16:00:00)
-used(ex:u1, ex:act2, ar3:0111)
-used(a1,e1,[ex:fct="load"])
+used(a1,e1, -, [ex:fct="load"])
+used(ex:u1, ex:act2, ar3:0111, -)
+used(-, ex:act2, ar3:0111, -)
</pre>
</div>
+<p>Even though the production <span class="nonterminal">usageExpression</span> allows for expressions <span class="name">used(e2, -, -)</span> and <span class="name">used(-, e2, -, -)</span>, these expressions are not valid in PROV-N.</p>
</section>
-<section id="term-Start">
+<section id="expression-Start">
<h4>Start</h4>
<p>An activity start's text matches the <span class="nonterminal">startExpression</span> production of the grammar
@@ -563,16 +569,21 @@
<div class="anexample">
<pre class="codeexample">
-wasStartedBy(ex:act2, ar3:0111)
+wasStartedBy(ex:act2, ar3:0111, -)
wasStartedBy(ex:act2, ar3:0111, 2011-11-16T16:00:00)
wasStartedBy(ex:act2, -, 2011-11-16T16:00:00)
-wasStartedBy(ex:act2, -)
+wasStartedBy(ex:act2, -, -)
+wasStartedBy(ex:act2, -, -, [ex:param="a"])
+wasStartedBy(s, ex:act2, ar3:0111, 2011-11-16T16:00:00)
+wasStartedBy(-, ex:act2, ar3:0111, 2011-11-16T16:00:00)
</pre>
</div>
+<p>Even though the production <span class="nonterminal">startExpression</span> allows for expressions <span class="name">wasStartedBy(e2, -, -)</span> and <span class="name">wasStartedBy(-, e2, -, -)</span>, these expressions are not valid in PROV-N.</p>
+
</section>
-<section id="term-End">
+<section id="expression-End">
<h4>End</h4>
<p>An activity end's text matches the <span class="nonterminal">endExpression</span> production of the grammar.
@@ -594,16 +605,20 @@
<div class="anexample">
<pre class="codeexample">
-wasEndedBy(ex:act2, ex:trigger)
+wasEndedBy(ex:act2, ex:trigger, -)
wasEndedBy(ex:act2, ex:trigger, 2011-11-16T16:00:00)
wasEndedBy(ex:act2, -, 2011-11-16T16:00:00)
-wasEndedBy(e,ex:act2, -)
+wasEndedBy(ex:act2, -, 2011-11-16T16:00:00, [ex:param="a"])
+wasEndedBy(e,ex:act2, -, -)
+wasEndedBy(e, ex:act2, ex:trigger, 2011-11-16T16:00:00)
+wasEndedBy(-, ex:act2, ex:trigger, 2011-11-16T16:00:00)
</pre>
</div>
+<p>Even though the production <span class="nonterminal">endExpression</span> allows for expressions <span class="name">wasEndedBy(e2, -, -)</span> and <span class="name">wasEndedBy(-, e2, -, -)</span>, these expressions are not valid in PROV-N.</p>
</section>
-<section id="term-wasInformedBy">
+<section id="expression-wasInformedBy">
<h4>Communication</h4>
@@ -621,12 +636,17 @@
<div class="anexample">
<pre class="codeexample">
-TODO
+wasInformedBy(ex:a1, ex:a2)
+wasInformedBy(ex:a1, ex:a2, [ex:param1="a", ex:param2="b"])
+wasInformedBy(i, ex:a1, ex:a2)
+wasInformedBy(i, ex:a1, ex:a2, [ex:param1="a", ex:param2="b"])
+wasInformedBy(-, ex:a1, ex:a2)
+wasInformedBy(-, ex:a1, ex:a2, [ex:param1="a", ex:param2="b"])
</pre>
</div>
</section>
-<section id="term-startByActivity">
+<section id="expression-startByActivity">
<h4>Start by Activity</h4>
<div class="grammar">
@@ -644,7 +664,12 @@
<div class="anexample">
<pre class="codeexample">
-TODO
+wasStartedByActivity(ex:a1, ex:a2)
+wasStartedByActivity(ex:a1, ex:a2, [ex:param1="a", ex:param2="b"])
+wasStartedByActivity(s,ex:a1, ex:a2)
+wasStartedByActivity(s,ex:a1, ex:a2, [ex:param1="a", ex:param2="b"])
+wasStartedByActivity(-,ex:a1, ex:a2)
+wasStartedByActivity(-,ex:a1, ex:a2, [ex:param1="a", ex:param2="b"])
</pre>
</div>
</section>
@@ -653,7 +678,7 @@
<section id="component2">
<h3>Component 2: Agents and Responsibility</h3>
-<section id="term-Agent">
+<section id="expression-Agent">
<h4>Agent</h4>
@@ -681,7 +706,7 @@
</section>
-<section id="term-attribution">
+<section id="expression-attribution">
<h4>Attribution</h4>
<div class="grammar">
@@ -701,20 +726,21 @@
wasAttributedTo(e,ag)
wasAttributedTo(e,ag,[ex:license="cc:attributionURL" %% "xsd:QName"])
wasAttributedTo(id,e,ag,[ex:license="cc:attributionURL" %% "xsd:QName"])
+wasAttributedTo(-,e,ag,[ex:license="cc:attributionURL" %% "xsd:QName"])
</pre>
</div>
</section> <!-- end attribution -->
-<section id="term-ActivityAssociation">
-<h4>Activity Association</h4>
+<section id="expression-Association">
+<h4>Association</h4>
-<p>An activity association's text matches the <span class="nonterminal">activityAssociationExpression</span> productions of the grammar defined in this specification
+<p>An association's text matches the <span class="nonterminal">activityAssociationExpression</span> productions of the grammar defined in this specification
document.</p>
<div class='grammar'>
-<span class="nonterminal">activityAssociationExpression</span> ::=
+<span class="nonterminal">associationExpression</span> ::=
<span class="name">wasAssociatedWith</span>
<span class="name">(</span>
<span class="optional">( <span class="nonterminal">identifier</span> | <span class="name">-</span> ) <span class="name">,</span> </span>
@@ -731,14 +757,19 @@
<div class="anexample">
<pre class="codeexample">
-wasAssociatedWith(ex:pub2, w3:Consortium)
-wasAssociatedWith(ex:pub2, w3:Consortium @ pr:rec-advance)
-wasAssociatedWith(ex:pub2, w3:Consortium @ pr:rec-advance, [prov:role="funder"])
+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, -)
</pre>
</div>
+<p>Even though the production <span class="nonterminal">associationExpression</span> allows for expressions <span class="name">wasAssociatedWith(a, -, -)</span> and <span class="name">wasAssociatiedWith(-, a, -, -)</span>, these expressions are not valid in PROV-N.</p>
</section>
-<section id="term-responsibility">
+<section id="expression-responsibility">
<h4>Responsibility</h4>
<div class='grammar'>
@@ -757,10 +788,12 @@
<div class="anexample">
<pre class="codeexample">
-actedOnBehalfOf(ag1,ag2)
-actedOnBehalfOf(ag1,ag2,a)
-actedOnBehalfOf(ag1,ag2,[prov:type="delegation"])
-actedOnBehalfOf(ag2,ag3,a,[prov:type="contract"])
+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, -)
</pre>
</div>
@@ -797,13 +830,21 @@
<div class="anexample">
<pre class="codeexample">
-wasDerivedFrom(tr:WD-prov-dm-20111215, tr:WD-prov-dm-20111018)
+wasDerivedFrom(e2, e1)
wasDerivedFrom(e2, e1, a, g2, u1)
+wasDerivedFrom(e2, e1, -, g2, u1)
+wasDerivedFrom(e2, e1, a, -, u1)
+wasDerivedFrom(e2, e1, a, g2, -)
+wasDerivedFrom(e2, e1, a, -, -)
+wasDerivedFrom(e2, e1, -, -, u1)
+wasDerivedFrom(e2, e1, -, -, -)
+wasDerivedFrom(d, e2, e1, a, g2, u1)
+wasDerivedFrom(-, e2, e1, a, g2, u1)
</pre>
</div>
</section>
-<section id="term-Revision">
+<section id="expression-Revision">
<h4>Revision</h4>
<div class="grammar">
@@ -823,17 +864,18 @@
<div class="anexample">
<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, -)
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, -)
</pre>
</div>
</section> <!-- end revision -->
-<section id="term-quotation">
+<section id="expression-quotation">
<h4>Quotation</h4>
<p>A quotation expression's text matches the <span class="nonterminal">quotationExpression</span> production of the grammar.</p>
@@ -861,15 +903,19 @@
<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,-)
+
</pre>
</div>
</section> <!-- end quotation -->
-<section id="term-original-source">
+<section id="expression-original-source">
<h4>Original Source</h4>
<p>An original source record's text matches the <span class="nonterminal">originalSourceExpression</span> production of the grammar.</p>
@@ -889,13 +935,15 @@
<div class="anexample">
<pre class="codeexample">
-hadOriginalSource(dm:term-original-source,go:credit-where-credit-is-due.html)
-hadOriginalSource(dm:term-original-source,go:credit-where-credit-is-due.html,[...])
+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)
</pre>
</div>
</section> <!-- end original source -->
-<section id="term-traceability">
+<section id="expression-traceability">
<h4>Traceability</h4>
<p>A traceability expression's text matches the <span class="nonterminal">traceabilityExpression</span> production of the grammar.</p>
@@ -918,7 +966,9 @@
<div class="anexample">
<pre class="codeexample">
tracedTo(e2,e1)
-tracedTo(e2,e1,[])
+tracedTo(e2,e1,[ex:param="a"])
+tracedTo(id,e2,e1,[ex:param="a"])
+tracedTo(-,e2,e1)
</pre>
</div>
@@ -926,7 +976,7 @@
</section>
<section id="component4">
<h3>Component 4: Alternate Entities</h3>
-<section id="term-alternate">
+<section id="expression-alternate">
<h4>Alternate</h4>
<p>An alternate relation's text matches the <span class="nonterminal">alternateExpression</span> production.</p>
@@ -949,7 +999,7 @@
</section>
-<section id="term-specialization">
+<section id="expression-specialization">
<h4>Specialization</h4>
<p>A specialization relation's text matches the <span class="nonterminal">specializationExpression</span> production.</p>
@@ -978,7 +1028,7 @@
<div class="note">To be checked: Grammar has not been implemented yet.</div>
-<section id="term-collection-insertion">
+<section id="expression-collection-insertion">
<h3>Insertion</h3>
A Derivation-by-Insertion relation's text matches the <span class="nonterminal">derivationByInsertionFromExpression</span> production.</p>
@@ -1012,7 +1062,7 @@
</section>
-<section id="term-collection-removal">
+<section id="expression-collection-removal">
<h3>Removal</h3>
A Derivation-by-Removal relation's text matches the <span class="nonterminal">derivationByRemovalFromExpression</span> production.</p>
@@ -1044,7 +1094,7 @@
</section>
-<section id="term-collection-containment">
+<section id="expression-collection-containment">
<h3>Containment</h3>
A Containment relation's text matches the <span class="nonterminal">containedExpression</span> production.</p>
@@ -1199,7 +1249,7 @@
</section> <!-- end collections-->
<section id="component6">
<h3>Component 6: Annotations</h3>
- <section id="term-note">
+ <section id="expression-note">
<h4>Note</h4>
<div class="withPn">
@@ -1212,10 +1262,8 @@
<span class="name">note</span>
<span class="name">(</span>
<span class="nonterminal">identifier</span>
-<span class="name">,</span>
-<span class="nonterminal">attribute-values</span>
-<span class="name">)</span><br/>
-<!-- -->
+<span class="nonterminal">optional-attribute-values</span>
+<span class="name">)</span>
</div>
</div>
@@ -1241,7 +1289,6 @@
<span class="nonterminal">identifier</span>
<span class="name">,</span>
<span class="nonterminal">nIdentifier</span>
-<span class="nonterminal">optional-attribute-values</span>
<span class="name">)</span>
</div>
@@ -1255,21 +1302,21 @@
</section>
<section id="second-class-elements">
-<section id="term-NamespaceDeclaration">
-</section>
-<section id="term-identifier">
+<section id="expression-NamespaceDeclaration">
</section>
-<section id="term-attribute">
-<section id="term-attribute-role">
+<section id="expression-identifier">
</section>
-<section id="term-attribute-type">
+<section id="expression-attribute">
+<section id="expression-attribute-role">
</section>
-<section id="term-attribute-label">
+<section id="expression-attribute-type">
</section>
-<section id="term-attribute-location">
+<section id="expression-attribute-label">
+</section>
+<section id="expression-attribute-location">
</section>
</section>
-<section id="term-value">
+<section id="expression-value">
</section>
</section>
</section>