--- a/model/grammar/yack/prov-n-LL.bnf Mon May 14 13:48:07 2012 +0100
+++ b/model/grammar/yack/prov-n-LL.bnf Mon May 14 16:19:32 2012 +0100
@@ -1,10 +1,10 @@
-[2] bundle ::= "bundle" namespaceDeclarations? expression* (namedBundle namedBundle*)? "endBundle"
+[1] bundle ::= "bundle" namespaceDeclarations? expression* (namedBundle namedBundle*)? "endBundle"
-[10] expression::=
+[2] expression::=
(
entityExpression | activityExpression | generationExpression | usageExpression
@@ -15,76 +15,76 @@
)
-[11] entityExpression::= "entity" "(" identifier optionalAttributeValuePairs ")"
+[3] entityExpression::= "entity" "(" identifier optionalAttributeValuePairs ")"
-optionalAttributeValuePairs::= ("," "[" attributeValuePairs "]")?
-attributeValuePairs::= ( | attributeValuePair ( "," attributeValuePair )* )
-attributeValuePair::= attribute '=' literal
+[4]optionalAttributeValuePairs::= ("," "[" attributeValuePairs "]")?
+[5]attributeValuePairs::= ( | attributeValuePair ( "," attributeValuePair )* )
+[6]attributeValuePair::= attribute '=' literal
-[12] activityExpression::= "activity" "(" identifier ("," timeOrMarker "," timeOrMarker)? optionalAttributeValuePairs ")"
+[7] activityExpression::= "activity" "(" identifier ("," timeOrMarker "," timeOrMarker)? optionalAttributeValuePairs ")"
-timeOrMarker::=(timeZZ | "-")
+[8]timeOrMarker::=(timeZZ | "-")
-generationExpression::= "wasGeneratedBy" "(" optionalIdentifier eIdentifier ("," aIdentifierOrMarker "," timeOrMarker)? optionalAttributeValuePairs ")"
+[9]generationExpression::= "wasGeneratedBy" "(" optionalIdentifier eIdentifier ("," aIdentifierOrMarker "," timeOrMarker)? optionalAttributeValuePairs ")"
-optionalIdentifier::=(identifierOrMarker ";")?
+[10]optionalIdentifier::=(identifierOrMarker ";")?
-identifierOrMarker::=(identifier | "-")
+[11] identifierOrMarker::=(identifier | "-")
-usageExpression::= "used" "(" optionalIdentifier aIdentifier "," eIdentifier ("," timeOrMarker)? optionalAttributeValuePairs ")"
+[12] usageExpression::= "used" "(" optionalIdentifier aIdentifier "," eIdentifier ("," timeOrMarker)? optionalAttributeValuePairs ")"
-startExpression::= "wasStartedBy" "(" optionalIdentifier aIdentifier ("," eIdentifierOrMarker "," aIdentifierOrMarker "," timeOrMarker)? optionalAttributeValuePairs ")"
+[13] startExpression::= "wasStartedBy" "(" optionalIdentifier aIdentifier ("," eIdentifierOrMarker "," aIdentifierOrMarker "," timeOrMarker)? optionalAttributeValuePairs ")"
-endExpression::= "wasEndedBy" "(" optionalIdentifier aIdentifier ("," eIdentifierOrMarker "," aIdentifierOrMarker "," timeOrMarker)? optionalAttributeValuePairs ")"
-
-
-invalidationExpression::= "wasInvalidatedBy" "(" optionalIdentifier eIdentifier ("," aIdentifierOrMarker "," timeOrMarker)? optionalAttributeValuePairs ")"
-
+[14] endExpression::= "wasEndedBy" "(" optionalIdentifier aIdentifier ("," eIdentifierOrMarker "," aIdentifierOrMarker "," timeOrMarker)? optionalAttributeValuePairs ")"
-communicationExpression::= "wasInformedBy" "(" optionalIdentifier aIdentifier "," aIdentifier optionalAttributeValuePairs ")"
-
-
-agentExpression::= "agent" "(" identifier optionalAttributeValuePairs ")"
-
-attributionExpression::= "wasAttributedTo" "(" optionalIdentifier eIdentifier "," agIdentifier optionalAttributeValuePairs ")"
-
-associationExpression::= "wasAssociatedWith" "(" optionalIdentifier aIdentifier "," agIdentifierOrMarker ("," eIdentifierOrMarker)? optionalAttributeValuePairs ")"
-
-
-responsibilityExpression::= "actedOnBehalfOf" "(" optionalIdentifier agIdentifier "," agIdentifier ("," aIdentifierOrMarker)? optionalAttributeValuePairs ")"
+[15] invalidationExpression::= "wasInvalidatedBy" "(" optionalIdentifier eIdentifier ("," aIdentifierOrMarker "," timeOrMarker)? optionalAttributeValuePairs ")"
-derivationExpression::= "wasDerivedFrom" "(" optionalIdentifier eIdentifier "," eIdentifier ("," aIdentifierOrMarker "," gIdentifierOrMarker "," uIdentifierOrMarker )? optionalAttributeValuePairs ")"
+[16] communicationExpression::= "wasInformedBy" "(" optionalIdentifier aIdentifier "," aIdentifier optionalAttributeValuePairs ")"
+[17] agentExpression::= "agent" "(" identifier optionalAttributeValuePairs ")"
-revisionExpression::= "wasRevisionOf" "(" optionalIdentifier eIdentifier "," eIdentifier ("," aIdentifierOrMarker "," gIdentifierOrMarker "," uIdentifierOrMarker )? optionalAttributeValuePairs ")"
+[18] attributionExpression::= "wasAttributedTo" "(" optionalIdentifier eIdentifier "," agIdentifier optionalAttributeValuePairs ")"
+
+[19] associationExpression::= "wasAssociatedWith" "(" optionalIdentifier aIdentifier "," agIdentifierOrMarker ("," eIdentifierOrMarker)? optionalAttributeValuePairs ")"
+
+
+[20] responsibilityExpression::= "actedOnBehalfOf" "(" optionalIdentifier agIdentifier "," agIdentifier ("," aIdentifierOrMarker)? optionalAttributeValuePairs ")"
-quotationExpression::= "wasQuotedFrom" "(" optionalIdentifier eIdentifier "," eIdentifier ("," aIdentifierOrMarker "," gIdentifierOrMarker "," uIdentifierOrMarker )? optionalAttributeValuePairs ")"
+[21] derivationExpression::= "wasDerivedFrom" "(" optionalIdentifier eIdentifier "," eIdentifier ("," aIdentifierOrMarker "," gIdentifierOrMarker "," uIdentifierOrMarker )? optionalAttributeValuePairs ")"
-hadOriginalSourceExpression::= "hadOriginalSource" "(" optionalIdentifier eIdentifier "," eIdentifier ("," aIdentifierOrMarker "," gIdentifierOrMarker "," uIdentifierOrMarker )? optionalAttributeValuePairs ")"
+
+[22] revisionExpression::= "wasRevisionOf" "(" optionalIdentifier eIdentifier "," eIdentifier ("," aIdentifierOrMarker "," gIdentifierOrMarker "," uIdentifierOrMarker )? optionalAttributeValuePairs ")"
-tracedToExpression::= "tracedTo" "(" optionalIdentifier eIdentifier "," eIdentifier optionalAttributeValuePairs ')'
-alternateExpression::= "alternateOf" "(" eIdentifier "," eIdentifier ")"
+[23] quotationExpression::= "wasQuotedFrom" "(" optionalIdentifier eIdentifier "," eIdentifier ("," aIdentifierOrMarker "," gIdentifierOrMarker "," uIdentifierOrMarker )? optionalAttributeValuePairs ")"
-specializationExpression::= "specializationOf" "(" eIdentifier "," eIdentifier ")"
+
+[24] hadOriginalSourceExpression::= "hadOriginalSource" "(" optionalIdentifier eIdentifier "," eIdentifier ("," aIdentifierOrMarker "," gIdentifierOrMarker "," uIdentifierOrMarker )? optionalAttributeValuePairs ")"
+
+
+[25] tracedToExpression::= "tracedTo" "(" optionalIdentifier eIdentifier "," eIdentifier optionalAttributeValuePairs ')'
+
+[26] alternateExpression::= "alternateOf" "(" eIdentifier "," eIdentifier ")"
+
+[27] specializationExpression::= "specializationOf" "(" eIdentifier "," eIdentifier ")"
-eIdentifier ::=identifier
+[28] eIdentifier ::=identifier
aIdentifier ::=identifier
agIdentifier ::=identifier
gIdentifier ::=identifier
--- a/model/prov-n.html Mon May 14 13:48:07 2012 +0100
+++ b/model/prov-n.html Mon May 14 16:19:32 2012 +0100
@@ -55,10 +55,12 @@
$('.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()});
+ //$('#'+ref).parents("tbody").clone().appendTo($(this));
+
+
+ //$(this).replaceWith(function() {return $('#'+ref).parents("tbody").clone()});
+
+ $(this).replaceWith($('#'+ref).parents("tbody").clone());
});
}
@@ -498,9 +500,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>
@@ -625,12 +625,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>
@@ -667,10 +665,8 @@
</div>
<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>
@@ -715,11 +711,9 @@
<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">
@@ -766,9 +760,7 @@
</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>
@@ -810,9 +802,7 @@
</div>
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-startExpression"></div>
-</div>
+<tbody class="grammar-ref" data-ref="prod-startExpression"></tbody>
</table>
@@ -859,9 +849,7 @@
</div>
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-endExpression"></div>
-</div>
+<tbody class="grammar-ref" data-ref="prod-endExpression"></tbody>
</table>
@@ -913,14 +901,11 @@
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-invalidationExpression"></div>
-</div>
+<tbody class="grammar-ref" data-ref="prod-invalidationExpression"></tbody>
</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>
@@ -961,9 +946,7 @@
</div>
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-communicationExpression"></div>
-</div>
+<tbody class="grammar-ref" data-ref="prod-communicationExpression"></tbody>
</table>
@@ -1040,9 +1023,7 @@
</div>
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-agentExpression"></div>
-</div>
+<tbody class="grammar-ref" data-ref="prod-agentExpression"></tbody>
</table>
@@ -1077,14 +1058,11 @@
</div>
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-attributionExpression"></div>
-</div>
+<tbody class="grammar-ref" data-ref="prod-attributionExpression"></tbody>
</table>
<div class="anexample">
-
<pre class="codeexample">
wasAttributedTo(id, e, ag, [ex:license="cc:attributionURL" %% "xsd:QName"])
</pre>
@@ -1121,9 +1099,7 @@
</div>
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-associationExpression"></div>
-</div>
+<tbody class="grammar-ref" data-ref="prod-associationExpression"></tbody>
</table>
@@ -1174,9 +1150,7 @@
<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">
@@ -1230,9 +1204,7 @@
</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>
@@ -1285,9 +1257,7 @@
</div>
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-revisionExpression"></div>
-</div>
+<tbody class="grammar-ref" data-ref="prod-revisionExpression"></tbody>
</table>
@@ -1339,9 +1309,7 @@
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-quotationExpression"></div>
-</div>
+<tbody class="grammar-ref" data-ref="prod-quotationExpression"></tbody>
</table>
@@ -1391,9 +1359,7 @@
</div>
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-hadOriginalSourceExpression"></div>
-</div>
+<tbody class="grammar-ref" data-ref="prod-hadOriginalSourceExpression"></tbody>
</table>
@@ -1436,9 +1402,7 @@
<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">
@@ -1479,9 +1443,7 @@
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-alternateExpression"></div>
-</div>
+<tbody class="grammar-ref" data-ref="prod-alternateExpression"></tbody>
</table>
@@ -1508,9 +1470,7 @@
</div>
<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">
@@ -1783,13 +1743,11 @@
</div>
<table class="grammar">
-<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-namespace"></div>
-<div class="grammar-ref" data-ref="prod-IRI_REF"></div>
-</div>
+<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>
</table>
@@ -1863,28 +1821,25 @@
<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>
<!--
@@ -2005,10 +1960,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>
@@ -2044,15 +1996,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>
@@ -2119,12 +2068,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>
@@ -2260,10 +2207,8 @@
</div>
<table class="grammar">
-<div>
-<div class="grammar-ref" data-ref="prod-bundle"></div>
-<div class="grammar-ref" data-ref="prod-namedBundle"></div>
-</div>
+<tbody class="grammar-ref" data-ref="prod-bundle"></tbody>
+<tbody class="grammar-ref" data-ref="prod-namedBundle"></tbody>
</table>