--- a/model/grammar/Makefile Mon May 14 11:29:36 2012 +0100
+++ b/model/grammar/Makefile Mon May 14 11:37:20 2012 +0100
@@ -32,9 +32,9 @@
IN.HTML=ll.html
IN2.HTML=tmp/ll2.html
-do.ll.js: do.ll.html
+do.ll.js: ll.provn do.ll.html
@echo "grammar_string= " > $(OUT.JS)
- @cat $(IN.HTML) | sed -e "s/\d039/\\\'/g" | sed -e "s/prod-prov_n_LL/prod/g" | sed -e "s/term-prov_n_LL/prod/g" > $(IN2.HTML)
+ @cat $(IN.HTML) | sed -e "s/\d039/\\\'/g" | sed -e "s/prod-prov_n_LL/prod/g" | sed -e "s/term-prov_n_LL/prod/g" | sed -e "s/timeZZ/time/g" > $(IN2.HTML)
@cat $(IN2.HTML) | awk '{ print "'\''" $$0 " '\'' + " }' >> $(OUT.JS)
@echo "' ' ;" >> $(OUT.JS)
--- a/model/grammar/ll.js Mon May 14 11:29:36 2012 +0100
+++ b/model/grammar/ll.js Mon May 14 11:37:20 2012 +0100
@@ -98,7 +98,7 @@
'<td><a id="prod-timeOrMarker" name="prod-timeOrMarker"></a>[<span class="prodNo">11</span>] </td> ' +
'<td><code class="production prod">timeOrMarker</code></td> ' +
'<td> ::= </td> ' +
-'<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-timeZZ">timeZZ</a></span> | "-" )</code></td> ' +
+'<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-time">time</a></span> | "-" )</code></td> ' +
'</tr> ' +
'</tbody> ' +
' ' +
@@ -410,8 +410,8 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-timeZZ" name="prod-timeZZ"></a>[<span class="prodNo">46</span>] </td> ' +
-'<td><code class="production prod">timeZZ</code></td> ' +
+'<td><a id="prod-time" name="prod-time"></a>[<span class="prodNo">46</span>] </td> ' +
+'<td><code class="production prod">time</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-ISODATETIME">ISODATETIME</a></span></code></td> ' +
'</tr> ' +
--- a/model/prov-n.html Mon May 14 11:29:36 2012 +0100
+++ b/model/prov-n.html Mon May 14 11:37:20 2012 +0100
@@ -496,6 +496,14 @@
</table>
</div>
+
+<table class="grammar">
+<div>
+<div class="grammar-ref" data-ref="prod-expression"></div>
+</div>
+</table>
+
+
Each expression non-terminal <span class="nonterminal">expression</span>, i.e., <span class="nonterminal">entityExpression</span>, <span class="nonterminal">activityExpression</span> etc., corresponds to one element (entity, activity, etc.) of the PROV data model.
<p>A PROV-N document consists of a collection of <a title="expression">expressions</a>, wrapped in an <a>expression container</a> with some namespace declarations, such that the text for an element matches the corresponding <span class="nonterminal">expression</span> production of the grammar.
@@ -661,6 +669,7 @@
<table class="grammar">
<div>
<div class="grammar-ref" data-ref="prod-activityExpression"></div>
+<div class="grammar-ref" data-ref="prod-timeOrMarker"></div>
</div>
</table>
@@ -2121,6 +2130,16 @@
<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-ISODATETIME"></div>
+<div class="grammar-ref" data-ref="prod-DIGIT"></div>
+<div class="grammar-ref" data-ref="prod-TIMEZONEOFFSET"></div>
+</div>
+</table>
+
+
<div class="anexample" id="anexample-time">
<p>The third argument in the following usage expression is a time instance, namely 4pm on 2011-11-16.</p>