--- a/model/prov-n.html Tue May 15 11:46:00 2012 +0100
+++ b/model/prov-n.html Tue May 15 11:57:01 2012 +0100
@@ -55,12 +55,10 @@
$('.grammar-ref').each(function(index) {
var ref=$(this).attr('data-ref');
console.log( "updating grammar for " + ref);
- // $('#'+ref).parents("tbody").clone().appendTo($(this));
+ $('#'+ref).parents("tbody").clone().appendTo($(this));
// $(this).replaceWith(function() {return $('#'+ref).parents("tbody").clone()});
-
- $(this).replaceWith($('#'+ref).parents("tbody").clone());
});
}
@@ -512,9 +510,7 @@
-->
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-expression"></div>
-</div>
+<tbody class="grammar-ref" data-ref="prod-expression"></tbody>
</table>
@@ -571,7 +567,7 @@
<section id="prov-n-standard-terms">
<h3>Identifiers and attributes</h3>
-<p>Most expressions defined in the grammar include the use of two terms: an identifier for the predicate, and a set of attribute-value pairs, delimited by square brackets. Both are optional (unless specified otherwise). By convention, the identifier is the first term in any expression, followed by a semi-colon ';' and the set of attribute-value pairs is the last. </p>
+<p>Most expressions defined in the grammar include the use of two terms: an identifier for the predicate, and a set of attribute-value pairs, delimited by square brackets. Identifiers are optional except for Entities, Activites, and Agents. Identifiers are always the first term in any expression. By convention, </em>optional</em> identifiers are separated using a semi-colon ';'. This makes it possible to completely omit an optional identifier with no ambiguity arising. Also, the set of attribute-value pairs is always the last term in any expression. </p>
<div class="anexample">
<p>Derivation has an optional identifier. In the first expression, the identifier is not available, while it is explicit in the second. The third example shows that one can optionally indicate the missing identifier using the <span class="name">-</span> marker.</p>
@@ -582,9 +578,14 @@
</pre>
</div>
-A distinction is made between expressions with no attributes, and expressions that include an empty list of attributes.
+Lack of attributes can be equivalently expressed by omitting the list, or by using an empty list
+
+<!-- Expressions with no attributes A distinction is made between expressions with no attributes, and expressions that include an empty list of attributes. -->
+
<div class="anexample">
-<p>The first activity does not have any attributes. The second has an empty list of attributes. The third activity has two attributes.
+<p>The first and second activities have no attributes.
+<!-- does not have any attributes. The second has an empty list of attributes. -->
+The third activity has two attributes.
<pre class="codeexample" >
activity(ex:a10)
activity(ex:a10, [])
@@ -639,12 +640,10 @@
-->
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-entityExpression"></div>
-<div class="grammar-ref" data-ref="prod-optionalAttributeValuePairs"></div>
-<div class="grammar-ref" data-ref="prod-attributeValuePairs"></div>
-<div class="grammar-ref" data-ref="prod-attributeValuePair"></div>
-</div>
+<tbody class="grammar-ref" data-ref="prod-entityExpression"></tbody>
+<tbody class="grammar-ref" data-ref="prod-optionalAttributeValuePairs"></tbody>
+<tbody class="grammar-ref" data-ref="prod-attributeValuePairs"></tbody>
+<tbody class="grammar-ref" data-ref="prod-attributeValuePair"></tbody>
</table>
@@ -683,10 +682,9 @@
-->
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-activityExpression"></div>
-<div class="grammar-ref" data-ref="prod-timeOrMarker"></div>
-</div>
+
+<tbody class="grammar-ref" data-ref="prod-activityExpression"></tbody>
+<tbody class="grammar-ref" data-ref="prod-timeOrMarker"></tbody>
</table>
@@ -732,11 +730,11 @@
-->
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-generationExpression"></div>
-<div class="grammar-ref" data-ref="prod-optionalIdentifier"></div>
-<div class="grammar-ref" data-ref="prod-identifierOrMarker"></div>
-</div>
+
+<tbody class="grammar-ref" data-ref="prod-generationExpression"></tbody>
+<tbody class="grammar-ref" data-ref="prod-optionalIdentifier"></tbody>
+<tbody class="grammar-ref" data-ref="prod-identifierOrMarker"></tbody>
+
</table>
<div class="anexample">
@@ -782,9 +780,8 @@
</div>
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-usageExpression"></div>
-</div>
+
+<tbody class="grammar-ref" data-ref="prod-usageExpression"></tbody>
</table>
<div class="note">should this: usageExpression ::= "used" "(" optionalIdentifier aIdentifier "," eIdentifier ( "," timeOrMarker )? optionalAttributeValuePairs ")" <br/>
@@ -834,9 +831,7 @@
-->
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-startExpression"></div>
-</div>
+<tbody class="grammar-ref" data-ref="prod-startExpression"></tbody>
</table>
@@ -886,9 +881,7 @@
-->
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-endExpression"></div>
-</div>
+<tbody class="grammar-ref" data-ref="prod-endExpression"></tbody>
</table>
@@ -942,9 +935,8 @@
-->
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-invalidationExpression"></div>
-</div>
+
+<tbody class="grammar-ref" data-ref="prod-invalidationExpression"></tbody>
</table>
@@ -993,9 +985,9 @@
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-communicationExpression"></div>
-</div>
+
+<tbody class="grammar-ref" data-ref="prod-communicationExpression"></tbody>
+
</table>
@@ -1074,9 +1066,9 @@
-->
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-agentExpression"></div>
-</div>
+
+<tbody class="grammar-ref" data-ref="prod-agentExpression"></tbody>
+
</table>
@@ -1114,9 +1106,9 @@
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-attributionExpression"></div>
-</div>
+
+<tbody class="grammar-ref" data-ref="prod-attributionExpression"></tbody>
+
</table>
@@ -1159,9 +1151,9 @@
-->
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-associationExpression"></div>
-</div>
+
+<tbody class="grammar-ref" data-ref="prod-associationExpression"></tbody>
+
</table>
@@ -1212,9 +1204,9 @@
-->
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-responsibilityExpression"></div>
-</div>
+
+<tbody class="grammar-ref" data-ref="prod-responsibilityExpression"></tbody>
+
</table>
<div class="anexample">
@@ -1247,6 +1239,7 @@
<section id="Derivation-Relation">
<h4>Derivation</h4>
+<!--
<div class='grammar'>
<span class="nonterminal">derivationExpression</span> ::=
<span class="name">wasDerivedFrom</span>
@@ -1266,11 +1259,11 @@
<span class="nonterminal">optional-attribute-values</span>
<span class="name">)</span>
</div>
-
+-->
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-derivationExpression"></div>
-</div>
+
+<tbody class="grammar-ref" data-ref="prod-derivationExpression"></tbody>
+
</table>
@@ -1325,9 +1318,9 @@
-->
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-revisionExpression"></div>
-</div>
+
+<tbody class="grammar-ref" data-ref="prod-revisionExpression"></tbody>
+
</table>
@@ -1381,9 +1374,9 @@
-->
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-quotationExpression"></div>
-</div>
+
+<tbody class="grammar-ref" data-ref="prod-quotationExpression"></tbody>
+
</table>
@@ -1433,9 +1426,9 @@
-->
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-hadOriginalSourceExpression"></div>
-</div>
+
+<tbody class="grammar-ref" data-ref="prod-hadOriginalSourceExpression"></tbody>
+
</table>
@@ -1482,9 +1475,9 @@
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-tracedToExpression"></div>
-</div>
+
+<tbody class="grammar-ref" data-ref="prod-tracedToExpression"></tbody>
+
</table>
<div class="anexample">
@@ -1526,9 +1519,9 @@
-->
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-alternateExpression"></div>
-</div>
+
+<tbody class="grammar-ref" data-ref="prod-alternateExpression"></tbody>
+
</table>
@@ -1558,9 +1551,9 @@
-->
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-specializationExpression"></div>
-</div>
+
+<tbody class="grammar-ref" data-ref="prod-specializationExpression"></tbody>
+
</table>
<div class="anexample">
@@ -1625,12 +1618,6 @@
<span class="name">)</span>
</div>
-<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-insertionExpression"></tbody>
-<tbody class="grammar-ref" data-ref="prod-keyEntitySet"></tbody>
-</table>
-
-
<div class="anexample">
<pre class="codeexample">
derivedByInsertionFrom(id; c1, c, {("k1", v1), ("k2", v2)}, [])
@@ -1675,11 +1662,6 @@
<br>
</div>
-<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-removalExpression"></tbody>
-</table>
-
-
<div class="anexample">
<pre class="codeexample">
derivedByRemovalFrom(id; c3, c, {"k1", "k3"}, [])
@@ -1721,9 +1703,6 @@
<br>
</div>
-<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-membershipExpression"></tbody>
-</table>
<div class="anexample">
<pre class="codeexample">
@@ -1749,34 +1728,8 @@
</section> <!-- end collections-->
-
<section id="component6">
-<h3>Component 6: Bundles</h3>
-
-<section id="expression-bundle-declaration">
-<h4>Bundle Declaration</h4>
-</section>
-
-<section id="expression-bundle-description">
-<h4>Bundle Description</h4>
-</section>
-
-<section id="expression-provenance-locator">
-<h4>Provenance Locator</h4>
-
-
-<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-provenance-locator"></tbody>
-</table>
-
-
-</section>
-</section>
-
-
-
-<section id="component6">
-<h3>Component 6: Annotations (OBSOLETE, TO DISAPPEAR)</h3>
+<h3>Component 6: Annotations</h3>
<section id="expression-note">
<h4>Note</h4>
@@ -1871,10 +1824,12 @@
</div>
<table class="grammar">
+
<tbody class="grammar-ref" data-ref="prod-namespaceDeclarations"></tbody>
<tbody class="grammar-ref" data-ref="prod-namespaceDeclaration"></tbody>
<tbody class="grammar-ref" data-ref="prod-defaultNamespaceDeclaration"></tbody>
<tbody class="grammar-ref" data-ref="prod-IRI_REF"></tbody>
+
</table>
@@ -1948,28 +1903,26 @@
<table class="grammar">
-<div>
-<div>
-<div class="grammar-ref" data-ref="prod-eIdentifier"></div>
-<div class="grammar-ref" data-ref="prod-aIdentifier"></div>
-<div class="grammar-ref" data-ref="prod-agIdentifier"></div>
-<div class="grammar-ref" data-ref="prod-gIdentifier"></div>
-<div class="grammar-ref" data-ref="prod-uIdentifier"></div>
-<div class="grammar-ref" data-ref="prod-cIdentifier"></div>
-
-<div class="grammar-ref" data-ref="prod-eIdentifierOrMarker"></div>
-<div class="grammar-ref" data-ref="prod-aIdentifierOrMarker"></div>
-<div class="grammar-ref" data-ref="prod-agIdentifierOrMarker"></div>
-<div class="grammar-ref" data-ref="prod-gIdentifierOrMarker"></div>
-<div class="grammar-ref" data-ref="prod-uIdentifierOrMarker"></div>
-<div class="grammar-ref" data-ref="prod-identifier"></div>
-
-<div class="grammar-ref" data-ref="prod-QUALNAME"></div>
-<div class="grammar-ref" data-ref="prod-PN_LOCAL"></div>
-<div class="grammar-ref" data-ref="prod-PN_CHARS_OTHERS"></div>
-<div class="grammar-ref" data-ref="prod-PERCENT"></div>
-<div class="grammar-ref" data-ref="prod-HEX"></div>
-</div></div>
+<tbody class="grammar-ref" data-ref="prod-eIdentifier"></tbody>
+<tbody class="grammar-ref" data-ref="prod-aIdentifier"></tbody>
+<tbody class="grammar-ref" data-ref="prod-agIdentifier"></tbody>
+<tbody class="grammar-ref" data-ref="prod-gIdentifier"></tbody>
+<tbody class="grammar-ref" data-ref="prod-uIdentifier"></tbody>
+<tbody class="grammar-ref" data-ref="prod-cIdentifier"></tbody>
+
+<tbody class="grammar-ref" data-ref="prod-eIdentifierOrMarker"></tbody>
+<tbody class="grammar-ref" data-ref="prod-aIdentifierOrMarker"></tbody>
+<tbody class="grammar-ref" data-ref="prod-agIdentifierOrMarker"></tbody>
+<tbody class="grammar-ref" data-ref="prod-gIdentifierOrMarker"></tbody>
+<tbody class="grammar-ref" data-ref="prod-uIdentifierOrMarker"></tbody>
+<tbody class="grammar-ref" data-ref="prod-identifier"></tbody>
+
+<tbody class="grammar-ref" data-ref="prod-QUALNAME"></tbody>
+<tbody class="grammar-ref" data-ref="prod-PN_LOCAL"></tbody>
+<tbody class="grammar-ref" data-ref="prod-PN_CHARS_OTHERS"></tbody>
+<tbody class="grammar-ref" data-ref="prod-PERCENT"></tbody>
+<tbody class="grammar-ref" data-ref="prod-HEX"></tbody>
+
</table>
<!--
@@ -2090,10 +2043,7 @@
<table class="grammar">
-<div>
-<div>
-<div class="grammar-ref" data-ref="prod-attribute"></div>
-</div></div>
+<tbody class="grammar-ref" data-ref="prod-attribute"></tbody>
</table>
@@ -2129,15 +2079,12 @@
</div>
<table class="grammar">
-<div>
-<div>
-<div class="grammar-ref" data-ref="prod-literal"></div>
-<div class="grammar-ref" data-ref="prod-StringLiteral"></div>
-
-<div class="grammar-ref" data-ref="prod-INTLITERAL"></div>
-<div class="grammar-ref" data-ref="prod-STRING_LITERAL"></div>
-<div class="grammar-ref" data-ref="prod-QUALNAME_LITERAL"></div>
-</div></div>
+<tbody class="grammar-ref" data-ref="prod-literal"></tbody>
+<tbody class="grammar-ref" data-ref="prod-StringLiteral"></tbody>
+
+<tbody class="grammar-ref" data-ref="prod-INTLITERAL"></tbody>
+<tbody class="grammar-ref" data-ref="prod-STRING_LITERAL"></tbody>
+<tbody class="grammar-ref" data-ref="prod-QUALNAME_LITERAL"></tbody>
</table>
@@ -2219,12 +2166,10 @@
<p><dfn id="dfn-time">Time instants</dfn> are defined according to xsd:dateTime [[!XMLSCHEMA-2]].</p>
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-time"></div>
-<div class="grammar-ref" data-ref="prod-DIGIT"></div>
-<div class="grammar-ref" data-ref="prod-ISODATETIME"></div>
-<div class="grammar-ref" data-ref="prod-TIMEZONEOFFSET"></div>
-</div>
+<tbody class="grammar-ref" data-ref="prod-time"></tbody>
+<tbody class="grammar-ref" data-ref="prod-DIGIT"></tbody>
+<tbody class="grammar-ref" data-ref="prod-ISODATETIME"></tbody>
+<tbody class="grammar-ref" data-ref="prod-TIMEZONEOFFSET"></tbody>
</table>