--- a/model/prov-n.html Mon May 14 17:33:44 2012 +0100
+++ b/model/prov-n.html Mon May 14 17:34:00 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));
-
-
- //$(this).replaceWith(function() {return $('#'+ref).parents("tbody").clone()});
-
- $(this).replaceWith($('#'+ref).parents("tbody").clone());
+ $('#'+ref).parents("tbody").clone().appendTo($(this));
+
+
+ // $(this).replaceWith(function() {return $('#'+ref).parents("tbody").clone()});
});
}
@@ -500,7 +498,9 @@
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-expression"></tbody>
+<div>
+<div class="grammar-ref" data-ref="prod-expression"></div>
+</div>
</table>
@@ -596,7 +596,7 @@
<div class="withPn">
<p>
-
+<!--
<div class='grammar'>
<span class="nonterminal">entityExpression</span> ::=
<span class="name">entity</span>
@@ -604,7 +604,7 @@
<a href="#expression-identifier"><span class="nonterminal">identifier</span></a>
<span class="nonterminal">optional-attribute-values</span>
<span class="name">)</span><br/><br/>
-<!-- -->
+
<span class="nonterminal">optional-attribute-values</span> ::=
<span class="optional"><span class="name">,</span>
<span class="name">[</span>
@@ -622,13 +622,15 @@
<br/>
</div>
</div>
-
+-->
<table class="grammar">
-<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>
+<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>
</table>
@@ -665,8 +667,10 @@
</div>
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-activityExpression"></tbody>
-<tbody class="grammar-ref" data-ref="prod-timeOrMarker"></tbody>
+<div>
+<div class="grammar-ref" data-ref="prod-activityExpression"></div>
+<div class="grammar-ref" data-ref="prod-timeOrMarker"></div>
+</div>
</table>
@@ -711,9 +715,11 @@
<table class="grammar">
-<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>
+<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>
</table>
<div class="anexample">
@@ -760,7 +766,9 @@
</div>
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-usageExpression"></tbody>
+<div>
+<div class="grammar-ref" data-ref="prod-usageExpression"></div>
+</div>
</table>
@@ -802,7 +810,9 @@
</div>
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-startExpression"></tbody>
+<div>
+<div class="grammar-ref" data-ref="prod-startExpression"></div>
+</div>
</table>
@@ -849,7 +859,9 @@
</div>
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-endExpression"></tbody>
+<div>
+<div class="grammar-ref" data-ref="prod-endExpression"></div>
+</div>
</table>
@@ -901,11 +913,14 @@
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-invalidationExpression"></tbody>
+<div>
+<div class="grammar-ref" data-ref="prod-invalidationExpression"></div>
+</div>
</table>
<div class="anexample">
+
<pre class="codeexample">
wasInvalidatedBy(ex:i1; tr:WD-prov-dm-20111215, ex:edit1, 2011-11-16T16:00:00, [ex:fct="save"])
</pre>
@@ -946,7 +961,9 @@
</div>
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-communicationExpression"></tbody>
+<div>
+<div class="grammar-ref" data-ref="prod-communicationExpression"></div>
+</div>
</table>
@@ -1023,7 +1040,9 @@
</div>
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-agentExpression"></tbody>
+<div>
+<div class="grammar-ref" data-ref="prod-agentExpression"></div>
+</div>
</table>
@@ -1058,13 +1077,16 @@
</div>
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-attributionExpression"></tbody>
+<div>
+<div class="grammar-ref" data-ref="prod-attributionExpression"></div>
+</div>
</table>
<div class="anexample">
+
<pre class="codeexample">
-wasAttributedTo(id, e, ag, [ex:license="cc:attributionURL" %% "xsd:QName"])
+wasAttributedTo(id; e, ag, [ex:license="cc:attributionURL" %% "xsd:QName"])
</pre>
<p> Here <span class="name">id</span> is the optional attribution identifier, <span class="name">e</span> is an entity identifier,
<span class="name">ag</span> is the identifier of the agent to whom the entity is abscribed,
@@ -1099,7 +1121,9 @@
</div>
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-associationExpression"></tbody>
+<div>
+<div class="grammar-ref" data-ref="prod-associationExpression"></div>
+</div>
</table>
@@ -1150,7 +1174,9 @@
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-responsibilityExpression"></tbody>
+<div>
+<div class="grammar-ref" data-ref="prod-responsibilityExpression"></div>
+</div>
</table>
<div class="anexample">
@@ -1204,7 +1230,9 @@
</div>
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-derivationExpression"></tbody>
+<div>
+<div class="grammar-ref" data-ref="prod-derivationExpression"></div>
+</div>
</table>
@@ -1257,7 +1285,9 @@
</div>
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-revisionExpression"></tbody>
+<div>
+<div class="grammar-ref" data-ref="prod-revisionExpression"></div>
+</div>
</table>
@@ -1309,7 +1339,9 @@
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-quotationExpression"></tbody>
+<div>
+<div class="grammar-ref" data-ref="prod-quotationExpression"></div>
+</div>
</table>
@@ -1359,7 +1391,9 @@
</div>
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-hadOriginalSourceExpression"></tbody>
+<div>
+<div class="grammar-ref" data-ref="prod-hadOriginalSourceExpression"></div>
+</div>
</table>
@@ -1402,7 +1436,9 @@
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-tracedToExpression"></tbody>
+<div>
+<div class="grammar-ref" data-ref="prod-tracedToExpression"></div>
+</div>
</table>
<div class="anexample">
@@ -1443,7 +1479,9 @@
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-alternateExpression"></tbody>
+<div>
+<div class="grammar-ref" data-ref="prod-alternateExpression"></div>
+</div>
</table>
@@ -1470,7 +1508,9 @@
</div>
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-specializationExpression"></tbody>
+<div>
+<div class="grammar-ref" data-ref="prod-specializationExpression"></div>
+</div>
</table>
<div class="anexample">
@@ -1743,11 +1783,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-namespace"></tbody>
-<tbody class="grammar-ref" data-ref="prod-IRI_REF"></tbody>
+<div>
+<div class="grammar-ref" data-ref="prod-namespaceDeclarations"></div>
+<div class="grammar-ref" data-ref="prod-namespaceDeclaration"></div>
+<div class="grammar-ref" data-ref="prod-defaultNamespaceDeclaration"></div>
+<div class="grammar-ref" data-ref="prod-IRI_REF"></div>
+</div>
</table>
@@ -1821,25 +1862,28 @@
<table class="grammar">
-<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>
+<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>
</table>
<!--
@@ -1960,7 +2004,10 @@
<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-attribute"></tbody>
+<div>
+<div>
+<div class="grammar-ref" data-ref="prod-attribute"></div>
+</div></div>
</table>
@@ -1996,12 +2043,15 @@
</div>
<table class="grammar">
-<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>
+<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>
</table>
@@ -2035,6 +2085,21 @@
<p><b>Note:</b>The productions for <span class="nonterminal">qualifiedName</span> and <span class="nonterminal">intLiteral</span> are conflicting. In the context of a <span class="nonterminal">Literal</span>, a parser should give precedence to the production for <span class="nonterminal">intLiteral</span>.
</p>
+<div class="note">
+Wouldn't it be useful to introduce a literal for a qualified name?
+Currenlty, we have to write:
+<pre>
+prov:type="ex:Programmer" %% xsd:QName
+</pre>
+to indicate that ex:Programmer should be interpreted as qualified name (QName).
+Instead, we could have a notation such as
+<pre>
+prov:type='ex:Programmer'
+</pre>
+
+</div>
+
+
<section id="expression-types">
<h4>Reserved Type Values</h4>
@@ -2068,10 +2133,12 @@
<p><dfn id="dfn-time">Time instants</dfn> are defined according to xsd:dateTime [[!XMLSCHEMA-2]].</p>
<table class="grammar">
-<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>
+<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>
</table>
@@ -2206,14 +2273,6 @@
<span class="name">endContainer</span>
</div>
-<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-bundle"></tbody>
-<tbody class="grammar-ref" data-ref="prod-namedBundle"></tbody>
-</table>
-
-
-
-
<div class="anexample">