--- a/dictionary/Overview.html Thu Apr 11 09:39:05 2013 +0200
+++ b/dictionary/Overview.html Thu Apr 11 10:41:45 2013 +0200
@@ -987,22 +987,26 @@
</div>
</section>
<section id="expression-dictionary-membership">
-<h3>Membership</h3>
-
-<div class="grammar">
- <span class="nonterminal">membershipExpression</span> ::=
-<span class="name">prov:hadDictionaryMember</span>
- <span class="name">(</span>
-<span class="nonterminal">dIdentifier</span>
- <span class="name">,</span>
- <span class="nonterminal">eIdentifier</span>
- <span class="name">,</span>
- <span class="nonterminal">key</span>
- <span class="name">)</span>
- <br>
-</div>
-
-<p>The following table summarizes how each constituent of a PROV-DM Membership maps to a non-terminal.</p>
+<h3>Dictionary Membership</h3>
+<table class="grammar">
+<tbody class="prod">
+<tr style="vertical-align: baseline; ">
+<td><a id="prod-dictionaryMembershipExpression" data-name="prod-dictionaryMembershipExpression"></a>[<span class="prodNo">1</span>] </td>
+<td><code class="production prod">dictionaryMembershipExpression</code></td>
+<td> ::= </td>
+<td><code class="content">"prov:hadDictionaryMember" "(" <span class="prod"><a class="grammarRef" href="#prod-dIdentifier">dIdentifier</a></span>
+ ","
+ <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/2013/PR-prov-n-20130312/#prod-eIdentifier">eIdentifier</a></span>
+ ","
+ <span class="prod"><a class="grammarRef" href="#prod-key">key</a></span>
+ ")"
+ </code>
+ </td>
+</tr>
+</tbody>
+</table>
+
+<p>The following table summarizes how each constituent of a PROV-Dictionary Membership maps to a non-terminal.</p>
<div style="text-align: left; ">
<table class="thinborder" style="margin-left: auto; margin-right: auto;">
@@ -1033,23 +1037,28 @@
</section> <!-- membership -->
<section id="expression-dictionary-insertion">
<h3>Insertion</h3>
-<div class="grammar">
- <span class="nonterminal">derivationByInsertionFromExpression</span> ::=
-<span class="name">prov:derivedByInsertionFrom</span>
- <span class="name">(</span>
- <span class="optional"><span class="nonterminal">optionalIdentifier</span>
- <span class="name">;</span></span>
-<span class="nonterminal">dIdentifier</span>
- <span class="name">,</span>
-<span class="nonterminal">dIdentifier</span>
- <span class="name">,</span>
- <span class="name">{</span>
- <span class="nonterminal">keyEntityPairs</span>
- <span class="name">}</span>
- <span class="name">,</span>
-<span class="nonterminal">optionalAttributeValuePairs</span>
- <span class="name">)</span>
-</div>
+<table class="grammar">
+<tbody class="prod">
+ <tr style="vertical-align: baseline; ">
+<td><a id="prod-derivationByInsertionFromExpression" data-name="prod-derivationByInsertionFromExpression"></a>[<span class="prodNo">2</span>] </td>
+<td><code class="production prod">derivationByInsertionFromExpression</code></td>
+<td> ::= </td>
+<td><code class="content">"prov:derivedByInsertionFrom" "("
+ (<span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/2013/PR-prov-n-20130312/#prod-optionalIdentifier">optionalIdentifier</a></span>
+ ";")?
+ <span class="prod"><a class="grammarRef" href="#prod-dIdentifier">dIdentifier</a></span>
+ ","
+ <span class="prod"><a class="grammarRef" href="#prod-dIdentifier">dIdentifier</a></span>
+ "," "{"
+ <span class="prod"><a class="grammarRef" href="#prod-keyEntityPairs">keyEntityPairs</a></span>
+ "}"
+ <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/2013/PR-prov-n-20130312/#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span>
+ ")"
+ </code>
+ </td>
+</tr>
+</tbody>
+</table>
<p>The following table summarizes how each constituent of a PROV-Dictionary Insertion maps to a non-terminal.</p>
@@ -1096,24 +1105,29 @@
</section> <!-- Insertion -->
<section id="expression-dictionary-removal">
<h3>Removal</h3>
-<div class="grammar">
- <span class="nonterminal">derivationByRemovalFromExpression</span> ::=
-<span class="name">prov:derivedByRemovalFrom</span>
- <span class="name">(</span>
- <span class="optional"><span class="nonterminal">optionalIdentifier</span>
- <span class="name">;</span></span>
-<span class="nonterminal">dIdentifier</span>
- <span class="name">,</span>
-<span class="nonterminal">dIdentifier</span>
- <span class="name">,</span>
- <span class="name">{</span>
- <span class="nonterminal">keySet</span>
- <span class="name">}</span>
- <span class="name">,</span>
-<span class="nonterminal">optionalAttributeValuePairs</span>
- <span class="name">)</span>
- <br>
-</div>
+<table class="grammar">
+<tbody class="prod">
+ <tr style="vertical-align: baseline; ">
+<td><a id="prod-derivationByRemovalFromExpression" data-name="prod-derivationByRemovalFromExpression"></a>[<span class="prodNo">3</span>] </td>
+<td><code class="production prod">derivationByRemovalFromExpression</code></td>
+<td> ::= </td>
+<td><code class="content">"prov:derivedByRemovalFrom" "("
+ (<span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/2013/PR-prov-n-20130312/#prod-optionalIdentifier">optionalIdentifier</a></span>
+ ";")?
+ <span class="prod"><a class="grammarRef" href="#prod-dIdentifier">dIdentifier</a></span>
+ ","
+ <span class="prod"><a class="grammarRef" href="#prod-dIdentifier">dIdentifier</a></span>
+ "," "{"
+ <span class="prod"><a class="grammarRef" href="#prod-keySet">keySet</a></span>
+ "}"
+ <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/2013/PR-prov-n-20130312/#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span>
+ ")"
+ </code>
+ </td>
+</tr>
+</tbody>
+</table>
+
<p>The following table summarizes how each constituent of a PROV-Dictionary Removal maps to a non-terminal.</p>
<div style="text-align: left; ">
@@ -1164,23 +1178,52 @@
<h3>Other expressions</h3>
For the notation of dictionaries, we used some new non-terminals. We provide their production rules here.
-<div class="grammar">
-<p id="prod-dIdentifier"><span class="nonterminal">dIdentifier</span> ::=
- <a href="http://www.w3.org/TR/2013/PR-prov-n-20130312/#prod-identifier" class="nonterminal">identifier</a> </p>
-
-<p id="prod-key"><span class="nonterminal">key</span> ::=
- <a href="http://www.w3.org/TR/2013/PR-prov-n-20130312/#prod-literal" class="nonterminal">literal</a> </p>
-
- <p id="prod-keyEntityPairs"><span class="nonterminal">keyEntityPairs</span> ::=
- <a href="#prod-keyEntityPair" class="nonterminal">keyEntityPair</a> <span class="star"><span class="name">,</span> <a href="#prod-keyEntityPair" class="nonterminal">keyEntityPair</a></span> </p>
-
- <p id="prod-keyEntityPair"><span class="nonterminal">keyEntityPair</span> ::=
- <span class="name">(</span> <a href="#prod-key" class="nonterminal">key</a> <span class="name">,</span> <a href="http://www.w3.org/TR/2013/PR-prov-n-20130312/#prod-eIdentifier" class="nonterminal">eIdentifier</a> <span class="name">)</span> </p>
-
- <p id="prod-keySet"><span class="nonterminal">keySet</span> ::=
- <a href="#prod-key" class="nonterminal">key</a> <span class="star"><span class="name">,</span> <a href="#prod-key" class="nonterminal">key</a></span> </p>
-
-</div>
+<table class="grammar">
+<tbody class="prod">
+ <tr style="vertical-align: baseline; ">
+ <td><a id="prod-dIdentifier" data-name="prod-dIdentifier"></a>[<span class="prodNo">4</span>] </td>
+ <td><code class="production prod">dIdentifier</code></td>
+ <td> ::= </td>
+ <td><code class="content"><span class="prod"><a href="http://www.w3.org/TR/2013/PR-prov-n-20130312/#prod-identifier" class="nonterminal">identifier</a></span>
+ </code></td>
+ </tr>
+
+ <tr style="vertical-align: baseline; ">
+ <td><a id="prod-key" data-name="prod-key"></a>[<span class="prodNo">5</span>] </td>
+ <td><code class="production prod">key</code></td>
+ <td> ::= </td>
+ <td><code class="content"><span class="prod"><a href="http://www.w3.org/TR/2013/PR-prov-n-20130312/#prod-literal" class="nonterminal">literal</a></span> </code>
+ </td>
+ </tr>
+
+ <tr style="vertical-align: baseline; ">
+ <td><a id="prod-keyEntityPairs" data-name="prod-keyEntityPairs"></a>[<span class="prodNo">6</span>] </td>
+ <td><code class="production prod">keyEntityPairs</code></td>
+ <td> ::= </td>
+ <td><code class="content"><span class="prod"><a href="#prod-keyEntityPair" class="nonterminal">keyEntityPair</a></span>
+ ("," <span class="prod"><a href="#prod-keyEntityPair" class="nonterminal">keyEntityPair</a></span>)*</code>
+ </td>
+ </tr>
+
+ <tr style="vertical-align: baseline; ">
+ <td><a id="prod-keyEntityPair" data-name="prod-keyEntityPair"></a>[<span class="prodNo">7</span>] </td>
+ <td><code class="production prod">keyEntityPair</code></td>
+ <td> ::= </td>
+ <td><code class="content">"(" <span class="prod"><a href="#prod-key" class="nonterminal">key</a> </span>
+ "," <span class="prod"><a href="http://www.w3.org/TR/2013/PR-prov-n-20130312/#prod-eIdentifier" class="nonterminal">eIdentifier</a></span> ")"</code>
+ </td>
+ </tr>
+
+ <tr style="vertical-align: baseline; ">
+ <td><a id="prod-keySet" data-name="prod-keySet"></a>[<span class="prodNo">8</span>] </td>
+ <td><code class="production prod">keySet</code></td>
+ <td> ::= </td>
+ <td><code class="content"><span class="prod"><a href="#prod-key" class="nonterminal">key</a></span>
+ ("," <span class="prod"><a href="#prod-key" class="nonterminal">key</a></span>)*</code>
+ </td>
+ </tr>
+</tbody>
+</table>
</section> <!-- other -->
</section>