--- a/model/grammar/ll.html Fri Jun 29 11:18:00 2012 +0100
+++ b/model/grammar/ll.html Fri Jun 29 11:24:12 2012 +0100
@@ -16,7 +16,7 @@
<td><a id="prod-prov_n_LL-expression" name="prod-prov_n_LL-expression"></a>[<span class="prodNo">2</span>] </td>
<td><code class="production prod">expression</code></td>
<td> ::= </td>
-<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-entityExpression">entityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-activityExpression">activityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-generationExpression">generationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-usageExpression">usageExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-startExpression">startExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-endExpression">endExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-invalidationExpression">invalidationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-communicationExpression">communicationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-agentExpression">agentExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-associationExpression">associationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-attributionExpression">attributionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-delegationExpression">delegationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-derivationExpression">derivationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-influenceExpression">influenceExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-alternateExpression">alternateExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-specializationExpression">specializationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-contextualizationExpression">contextualizationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-membershipExpression">membershipExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-insertionExpression">insertionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-removalExpression">removalExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-dictMembershipExpression">dictMembershipExpression</a></span> )</code></td>
+<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-entityExpression">entityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-activityExpression">activityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-generationExpression">generationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-usageExpression">usageExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-startExpression">startExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-endExpression">endExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-invalidationExpression">invalidationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-communicationExpression">communicationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-agentExpression">agentExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-associationExpression">associationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-attributionExpression">attributionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-delegationExpression">delegationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-derivationExpression">derivationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-influenceExpression">influenceExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-alternateExpression">alternateExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-specializationExpression">specializationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-mentionExpression">mentionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-membershipExpression">membershipExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-insertionExpression">insertionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-removalExpression">removalExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-dictMembershipExpression">dictMembershipExpression</a></span> )</code></td>
</tr>
</tbody>
@@ -229,10 +229,10 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-contextualizationExpression" name="prod-prov_n_LL-contextualizationExpression"></a>[<span class="prodNo">26</span>] </td>
-<td><code class="production prod">contextualizationExpression</code></td>
+<td><a id="prod-prov_n_LL-mentionExpression" name="prod-prov_n_LL-mentionExpression"></a>[<span class="prodNo">26</span>] </td>
+<td><code class="production prod">mentionExpression</code></td>
<td> ::= </td>
-<td><code class="content">"contextualizationOf" "(" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-bIdentifier">bIdentifier</a></span> ")"</code></td>
+<td><code class="content">"mentionOf" "(" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-bIdentifier">bIdentifier</a></span> ")"</code></td>
</tr>
</tbody>
--- a/model/grammar/ll.js Fri Jun 29 11:18:00 2012 +0100
+++ b/model/grammar/ll.js Fri Jun 29 11:24:12 2012 +0100
@@ -17,7 +17,7 @@
'<td><a id="prod-expression" name="prod-expression"></a>[<span class="prodNo">2</span>] </td> ' +
'<td><code class="production prod">expression</code></td> ' +
'<td> ::= </td> ' +
-'<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-entityExpression">entityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-activityExpression">activityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-generationExpression">generationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-usageExpression">usageExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-startExpression">startExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-endExpression">endExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-invalidationExpression">invalidationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-communicationExpression">communicationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-agentExpression">agentExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-associationExpression">associationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-attributionExpression">attributionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-delegationExpression">delegationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-derivationExpression">derivationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-influenceExpression">influenceExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-alternateExpression">alternateExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-specializationExpression">specializationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-contextualizationExpression">contextualizationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-membershipExpression">membershipExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-insertionExpression">insertionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-removalExpression">removalExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-dictMembershipExpression">dictMembershipExpression</a></span> )</code></td> ' +
+'<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-entityExpression">entityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-activityExpression">activityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-generationExpression">generationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-usageExpression">usageExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-startExpression">startExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-endExpression">endExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-invalidationExpression">invalidationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-communicationExpression">communicationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-agentExpression">agentExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-associationExpression">associationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-attributionExpression">attributionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-delegationExpression">delegationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-derivationExpression">derivationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-influenceExpression">influenceExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-alternateExpression">alternateExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-specializationExpression">specializationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-mentionExpression">mentionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-membershipExpression">membershipExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-insertionExpression">insertionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-removalExpression">removalExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-dictMembershipExpression">dictMembershipExpression</a></span> )</code></td> ' +
'</tr> ' +
'</tbody> ' +
' ' +
@@ -230,10 +230,10 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-contextualizationExpression" name="prod-contextualizationExpression"></a>[<span class="prodNo">26</span>] </td> ' +
-'<td><code class="production prod">contextualizationExpression</code></td> ' +
+'<td><a id="prod-mentionExpression" name="prod-mentionExpression"></a>[<span class="prodNo">26</span>] </td> ' +
+'<td><code class="production prod">mentionExpression</code></td> ' +
'<td> ::= </td> ' +
-'<td><code class="content">"contextualizationOf" "(" <span class="prod"><a class="grammarRef" href="#prod-identifier">identifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-identifier">identifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-bIdentifier">bIdentifier</a></span> ")"</code></td> ' +
+'<td><code class="content">"mentionOf" "(" <span class="prod"><a class="grammarRef" href="#prod-identifier">identifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-identifier">identifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-bIdentifier">bIdentifier</a></span> ")"</code></td> ' +
'</tr> ' +
'</tbody> ' +
' ' +
--- a/model/grammar/yack/prov-n-LL.bnf Fri Jun 29 11:18:00 2012 +0100
+++ b/model/grammar/yack/prov-n-LL.bnf Fri Jun 29 11:24:12 2012 +0100
@@ -11,7 +11,7 @@
| startExpression | endExpression | invalidationExpression | communicationExpression
| agentExpression | associationExpression | attributionExpression | delegationExpression
| derivationExpression | influenceExpression
- | alternateExpression | specializationExpression | contextualizationExpression | membershipExpression
+ | alternateExpression | specializationExpression | mentionExpression | membershipExpression
| insertionExpression | removalExpression | dictMembershipExpression
)
@@ -83,7 +83,7 @@
[27] specializationExpression::= "specializationOf" "(" eIdentifier "," eIdentifier ")"
-[33] contextualizationExpression::= "contextualizationOf" "(" identifier "," identifier "," bIdentifier ")"
+[33] mentionExpression::= "mentionOf" "(" identifier "," identifier "," bIdentifier ")"
--- a/model/grammar/yack/prov-n-LL.bnf.html Fri Jun 29 11:18:00 2012 +0100
+++ b/model/grammar/yack/prov-n-LL.bnf.html Fri Jun 29 11:24:12 2012 +0100
@@ -15,7 +15,7 @@
<td><a id="prod-prov_n_LL-expression" name="prod-prov_n_LL-expression"></a>[<span class="prodNo">2</span>] </td>
<td><code class="production prod">expression</code></td>
<td> ::= </td>
-<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-entityExpression">entityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-activityExpression">activityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-generationExpression">generationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-usageExpression">usageExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-startExpression">startExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-endExpression">endExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-invalidationExpression">invalidationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-communicationExpression">communicationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-agentExpression">agentExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-associationExpression">associationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-attributionExpression">attributionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-delegationExpression">delegationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-derivationExpression">derivationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-influenceExpression">influenceExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-alternateExpression">alternateExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-specializationExpression">specializationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-contextualizationExpression">contextualizationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-membershipExpression">membershipExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-insertionExpression">insertionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-removalExpression">removalExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-dictMembershipExpression">dictMembershipExpression</a></span> )</code></td>
+<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-entityExpression">entityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-activityExpression">activityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-generationExpression">generationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-usageExpression">usageExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-startExpression">startExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-endExpression">endExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-invalidationExpression">invalidationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-communicationExpression">communicationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-agentExpression">agentExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-associationExpression">associationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-attributionExpression">attributionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-delegationExpression">delegationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-derivationExpression">derivationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-influenceExpression">influenceExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-alternateExpression">alternateExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-specializationExpression">specializationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-mentionExpression">mentionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-membershipExpression">membershipExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-insertionExpression">insertionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-removalExpression">removalExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-dictMembershipExpression">dictMembershipExpression</a></span> )</code></td>
</tr>
</tbody>
@@ -228,10 +228,10 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-contextualizationExpression" name="prod-prov_n_LL-contextualizationExpression"></a>[<span class="prodNo">26</span>] </td>
-<td><code class="production prod">contextualizationExpression</code></td>
+<td><a id="prod-prov_n_LL-mentionExpression" name="prod-prov_n_LL-mentionExpression"></a>[<span class="prodNo">26</span>] </td>
+<td><code class="production prod">mentionExpression</code></td>
<td> ::= </td>
-<td><code class="content">"contextualizationOf" "(" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-bIdentifier">bIdentifier</a></span> ")"</code></td>
+<td><code class="content">"mentionOf" "(" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-bIdentifier">bIdentifier</a></span> ")"</code></td>
</tr>
</tbody>
--- a/model/prov-n.html Fri Jun 29 11:18:00 2012 +0100
+++ b/model/prov-n.html Fri Jun 29 11:24:12 2012 +0100
@@ -1939,28 +1939,28 @@
-<section id="expression-contextualization">
-<h4>Contextualization</h4>
+<section id="expression-mention">
+<h4>Mention</h4>
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-contextualizationExpression"></tbody>
+<tbody class="grammar-ref" data-ref="prod-mentionExpression"></tbody>
</table>
-<p>The following table summarizes how each constituent of a PROV-DM Contextualization maps to a non-terminal.</p>
+<p>The following table summarizes how each constituent of a PROV-DM Mention maps to a non-terminal.</p>
<div style="text-align: left; ">
<table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tr><td><b>Contextualization</b></td><td><b>Non-Terminal</b></td></tr>
+<tr><td><b>Mention</b></td><td><b>Non-Terminal</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/#contextualization.local"><span class='attribute' id="contextualization.local">local</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
-
-
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#contextualization.contextualized"><span class='attribute' id="contextualization.contextualized">contextualized</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#contextualization.context"><span class='attribute' id="contextualization.context">context</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-bIdentifier">bIdentifier</a></code></td></tr>
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#mention.specificEntity"><span class='attribute' id="mention.specificEntity">specificEntity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#mention.generalEntity"><span class='attribute' id="mention.generalEntity">generalEntity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#mention.bundle"><span class='attribute' id="mention.bundle">bundle</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-bIdentifier">bIdentifier</a></code></td></tr>
</table>
</div>
@@ -1968,7 +1968,7 @@
<div class="anexample">
<pre class="codeexample">
- contextualization(ex:report1_as_in_b1, ex:report1, ex:b1)
+ mention(ex:report1_as_in_b1, ex:report1, ex:b1)
</pre>
<p> Here
<span class="name">ex:report1_as_in_b1</span> is an entity identifier,