--- a/model/grammar/ll.html Fri Jun 29 11:49:08 2012 +0100
+++ b/model/grammar/ll.html Fri Jun 29 12:38:41 2012 +0100
@@ -400,16 +400,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-timeZZ" name="prod-prov_n_LL-timeZZ"></a>[<span class="prodNo">45</span>] </td>
-<td><code class="production prod">timeZZ</code></td>
-<td> ::= </td>
-<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-ISODATETIME">ISODATETIME</a></span></code></td>
-</tr>
-</tbody>
-
-<tbody class="prod">
-<tr valign="baseline">
-<td><a id="prod-prov_n_LL-literal" name="prod-prov_n_LL-literal"></a>[<span class="prodNo">46</span>] </td>
+<td><a id="prod-prov_n_LL-literal" name="prod-prov_n_LL-literal"></a>[<span class="prodNo">45</span>] </td>
<td><code class="production prod">literal</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-typedLiteral">typedLiteral</a></span><br/>
@@ -419,7 +410,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-typedLiteral" name="prod-prov_n_LL-typedLiteral"></a>[<span class="prodNo">47</span>] </td>
+<td><a id="prod-prov_n_LL-typedLiteral" name="prod-prov_n_LL-typedLiteral"></a>[<span class="prodNo">46</span>] </td>
<td><code class="production prod">typedLiteral</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-STRING_LITERAL">STRING_LITERAL</a></span> "%%" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-datatype">datatype</a></span></code></td>
@@ -428,7 +419,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-datatype" name="prod-prov_n_LL-datatype"></a>[<span class="prodNo">48</span>] </td>
+<td><a id="prod-prov_n_LL-datatype" name="prod-prov_n_LL-datatype"></a>[<span class="prodNo">47</span>] </td>
<td><code class="production prod">datatype</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span></code></td>
@@ -437,7 +428,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-convenienceNotation" name="prod-prov_n_LL-convenienceNotation"></a>[<span class="prodNo">49</span>] </td>
+<td><a id="prod-prov_n_LL-convenienceNotation" name="prod-prov_n_LL-convenienceNotation"></a>[<span class="prodNo">48</span>] </td>
<td><code class="production prod">convenienceNotation</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-STRING_LITERAL">STRING_LITERAL</a></span> (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-LANGTAG">LANGTAG</a></span>)?<br/>
@@ -448,6 +439,15 @@
<tbody class="prod">
<tr valign="baseline">
+<td><a id="prod-prov_n_LL-timeZZ" name="prod-prov_n_LL-timeZZ"></a>[<span class="prodNo">49</span>] </td>
+<td><code class="production prod">timeZZ</code></td>
+<td> ::= </td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-ISODATETIME">ISODATETIME</a></span></code></td>
+</tr>
+</tbody>
+
+<tbody class="prod">
+<tr valign="baseline">
<td><a id="prod-prov_n_LL-namespaceDeclarations" name="prod-prov_n_LL-namespaceDeclarations"></a>[<span class="prodNo">50</span>] </td>
<td><code class="production prod">namespaceDeclarations</code></td>
<td> ::= </td>
@@ -539,52 +539,53 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-PREFX" name="term-prov_n_LL-PREFX"></a>[<span class="prodNo">60</span>] </td>
-<td><<code class="production term">PREFX</code>></td>
+<td><a id="term-prov_n_LL-PN_LOCAL" name="term-prov_n_LL-PN_LOCAL"></a>[<span class="prodNo">60</span>] </td>
+<td><<code class="production term">PN_LOCAL</code>></td>
<td> ::= </td>
-<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_PREFIX">PN_PREFIX</a></span></code></td>
-</tr>
-</tbody>
-
-<tbody class="term">
-<tr valign="baseline">
-<td><a id="term-prov_n_LL-DIGIT" name="term-prov_n_LL-DIGIT"></a>[<span class="prodNo">61</span>] </td>
-<td><<code class="production term">DIGIT</code>></td>
-<td> ::= </td>
-<td><code class="content">[0-9]</code></td>
+<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_U">PN_CHARS_U</a></span> | [0-9] | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ) (( (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS">PN_CHARS</a></span> | "." | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ))* ( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS">PN_CHARS</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ) ))?</code></td>
</tr>
</tbody>
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-ISODATETIME" name="term-prov_n_LL-ISODATETIME"></a>[<span class="prodNo">62</span>] </td>
-<td><<code class="production term">ISODATETIME</code>></td>
+<td><a id="term-prov_n_LL-PN_CHARS_OTHERS" name="term-prov_n_LL-PN_CHARS_OTHERS"></a>[<span class="prodNo">61</span>] </td>
+<td><<code class="production term">PN_CHARS_OTHERS</code>></td>
<td> ::= </td>
-<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> "-" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> "-" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> "T" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> (( "." <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span>)? ))? ))? (( "Z" | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-TIMEZONEOFFSET">TIMEZONEOFFSET</a></span> ))?</code></td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PERCENT">PERCENT</a></span><br/>
+| "/"<br/>
+| "@"<br/>
+| "~"<br/>
+| "&"<br/>
+| "+"<br/>
+| "?"<br/>
+| "#"<br/>
+| "$"</code></td>
</tr>
</tbody>
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-TIMEZONEOFFSET" name="term-prov_n_LL-TIMEZONEOFFSET"></a>[<span class="prodNo">63</span>] </td>
-<td><<code class="production term">TIMEZONEOFFSET</code>></td>
+<td><a id="term-prov_n_LL-PERCENT" name="term-prov_n_LL-PERCENT"></a>[<span class="prodNo">62</span>] </td>
+<td><<code class="production term">PERCENT</code>></td>
<td> ::= </td>
-<td><code class="content">( "+" | "-" ) <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span></code></td>
+<td><code class="content">"%" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span></code></td>
</tr>
</tbody>
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-IRI_REF" name="term-prov_n_LL-IRI_REF"></a>[<span class="prodNo">64</span>] </td>
-<td><<code class="production term">IRI_REF</code>></td>
+<td><a id="term-prov_n_LL-HEX" name="term-prov_n_LL-HEX"></a>[<span class="prodNo">63</span>] </td>
+<td><<code class="production term">HEX</code>></td>
<td> ::= </td>
-<td><code class="content">"<" (( [^<>\"{}|^`\\] - [#0000- ] | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-UCHAR">UCHAR</a></span> ))* ">"</code></td>
+<td><code class="content">[0-9]<br/>
+| [A-F]<br/>
+| [a-f]</code></td>
</tr>
</tbody>
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-STRING_LITERAL" name="term-prov_n_LL-STRING_LITERAL"></a>[<span class="prodNo">65</span>] </td>
+<td><a id="term-prov_n_LL-STRING_LITERAL" name="term-prov_n_LL-STRING_LITERAL"></a>[<span class="prodNo">64</span>] </td>
<td><<code class="production term">STRING_LITERAL</code>></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-STRING_LITERAL2">STRING_LITERAL2</a></span><br/>
@@ -594,7 +595,70 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-STRING_LITERAL2" name="term-prov_n_LL-STRING_LITERAL2"></a>[<span class="prodNo">66</span>] </td>
+<td><a id="term-prov_n_LL-PREFX" name="term-prov_n_LL-PREFX"></a>[<span class="prodNo">65</span>] </td>
+<td><<code class="production term">PREFX</code>></td>
+<td> ::= </td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_PREFIX">PN_PREFIX</a></span></code></td>
+</tr>
+</tbody>
+
+<tbody class="term">
+<tr valign="baseline">
+<td><a id="term-prov_n_LL-INT_LITERAL" name="term-prov_n_LL-INT_LITERAL"></a>[<span class="prodNo">66</span>] </td>
+<td><<code class="production term">INT_LITERAL</code>></td>
+<td> ::= </td>
+<td><code class="content">("-")? (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span>)+</code></td>
+</tr>
+</tbody>
+
+<tbody class="term">
+<tr valign="baseline">
+<td><a id="term-prov_n_LL-QUALIFIED_NAME_LITERAL" name="term-prov_n_LL-QUALIFIED_NAME_LITERAL"></a>[<span class="prodNo">67</span>] </td>
+<td><<code class="production term">QUALIFIED_NAME_LITERAL</code>></td>
+<td> ::= </td>
+<td><code class="content">"'" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span> "'"</code></td>
+</tr>
+</tbody>
+
+<tbody class="term">
+<tr valign="baseline">
+<td><a id="term-prov_n_LL-DIGIT" name="term-prov_n_LL-DIGIT"></a>[<span class="prodNo">68</span>] </td>
+<td><<code class="production term">DIGIT</code>></td>
+<td> ::= </td>
+<td><code class="content">[0-9]</code></td>
+</tr>
+</tbody>
+
+<tbody class="term">
+<tr valign="baseline">
+<td><a id="term-prov_n_LL-ISODATETIME" name="term-prov_n_LL-ISODATETIME"></a>[<span class="prodNo">69</span>] </td>
+<td><<code class="production term">ISODATETIME</code>></td>
+<td> ::= </td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> "-" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> "-" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> "T" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> (( "." <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span>)? ))? ))? (( "Z" | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-TIMEZONEOFFSET">TIMEZONEOFFSET</a></span> ))?</code></td>
+</tr>
+</tbody>
+
+<tbody class="term">
+<tr valign="baseline">
+<td><a id="term-prov_n_LL-TIMEZONEOFFSET" name="term-prov_n_LL-TIMEZONEOFFSET"></a>[<span class="prodNo">70</span>] </td>
+<td><<code class="production term">TIMEZONEOFFSET</code>></td>
+<td> ::= </td>
+<td><code class="content">( "+" | "-" ) <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span></code></td>
+</tr>
+</tbody>
+
+<tbody class="term">
+<tr valign="baseline">
+<td><a id="term-prov_n_LL-IRI_REF" name="term-prov_n_LL-IRI_REF"></a>[<span class="prodNo">71</span>] </td>
+<td><<code class="production term">IRI_REF</code>></td>
+<td> ::= </td>
+<td><code class="content">"<" (( [^<>\"{}|^`\\] - [#0000- ] | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-UCHAR">UCHAR</a></span> ))* ">"</code></td>
+</tr>
+</tbody>
+
+<tbody class="term">
+<tr valign="baseline">
+<td><a id="term-prov_n_LL-STRING_LITERAL2" name="term-prov_n_LL-STRING_LITERAL2"></a>[<span class="prodNo">72</span>] </td>
<td><<code class="production term">STRING_LITERAL2</code>></td>
<td> ::= </td>
<td><code class="content">'"' (( ( [^\"\\\n\r] ) | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-ECHAR">ECHAR</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-UCHAR">UCHAR</a></span> ))* '"'</code></td>
@@ -603,7 +667,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-STRING_LITERAL_LONG2" name="term-prov_n_LL-STRING_LITERAL_LONG2"></a>[<span class="prodNo">67</span>] </td>
+<td><a id="term-prov_n_LL-STRING_LITERAL_LONG2" name="term-prov_n_LL-STRING_LITERAL_LONG2"></a>[<span class="prodNo">73</span>] </td>
<td><<code class="production term">STRING_LITERAL_LONG2</code>></td>
<td> ::= </td>
<td><code class="content">'"' (( ( [^\"\\\n\r] ) | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-ECHAR">ECHAR</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-UCHAR">UCHAR</a></span> ))* '"'</code></td>
@@ -612,25 +676,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-INT_LITERAL" name="term-prov_n_LL-INT_LITERAL"></a>[<span class="prodNo">68</span>] </td>
-<td><<code class="production term">INT_LITERAL</code>></td>
-<td> ::= </td>
-<td><code class="content">("-")? (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span>)+</code></td>
-</tr>
-</tbody>
-
-<tbody class="term">
-<tr valign="baseline">
-<td><a id="term-prov_n_LL-QUALIFIED_NAME_LITERAL" name="term-prov_n_LL-QUALIFIED_NAME_LITERAL"></a>[<span class="prodNo">69</span>] </td>
-<td><<code class="production term">QUALIFIED_NAME_LITERAL</code>></td>
-<td> ::= </td>
-<td><code class="content">"'" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span> "'"</code></td>
-</tr>
-</tbody>
-
-<tbody class="term">
-<tr valign="baseline">
-<td><a id="term-prov_n_LL-LANGTAG" name="term-prov_n_LL-LANGTAG"></a>[<span class="prodNo">70</span>] </td>
+<td><a id="term-prov_n_LL-LANGTAG" name="term-prov_n_LL-LANGTAG"></a>[<span class="prodNo">74</span>] </td>
<td><<code class="production term">LANGTAG</code>></td>
<td> ::= </td>
<td><code class="content">"@" ([a-zA-Z])+ (( "-" ([a-zA-Z0-9])+ ))*</code></td>
@@ -639,7 +685,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-UCHAR" name="term-prov_n_LL-UCHAR"></a>[<span class="prodNo">71</span>] </td>
+<td><a id="term-prov_n_LL-UCHAR" name="term-prov_n_LL-UCHAR"></a>[<span class="prodNo">75</span>] </td>
<td><<code class="production term">UCHAR</code>></td>
<td> ::= </td>
<td><code class="content">( "\\u" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span> )<br/>
@@ -649,7 +695,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-ECHAR" name="term-prov_n_LL-ECHAR"></a>[<span class="prodNo">72</span>] </td>
+<td><a id="term-prov_n_LL-ECHAR" name="term-prov_n_LL-ECHAR"></a>[<span class="prodNo">76</span>] </td>
<td><<code class="production term">ECHAR</code>></td>
<td> ::= </td>
<td><code class="content">"\\" [tbnrf\\\"']</code></td>
@@ -658,7 +704,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-NIL" name="term-prov_n_LL-NIL"></a>[<span class="prodNo">73</span>] </td>
+<td><a id="term-prov_n_LL-NIL" name="term-prov_n_LL-NIL"></a>[<span class="prodNo">77</span>] </td>
<td><<code class="production term">NIL</code>></td>
<td> ::= </td>
<td><code class="content">"(" (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-WS">WS</a></span> ))* ")"</code></td>
@@ -667,7 +713,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-WS" name="term-prov_n_LL-WS"></a>[<span class="prodNo">74</span>] </td>
+<td><a id="term-prov_n_LL-WS" name="term-prov_n_LL-WS"></a>[<span class="prodNo">78</span>] </td>
<td><<code class="production term">WS</code>></td>
<td> ::= </td>
<td><code class="content">" "<br/>
@@ -679,7 +725,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-ANON" name="term-prov_n_LL-ANON"></a>[<span class="prodNo">75</span>] </td>
+<td><a id="term-prov_n_LL-ANON" name="term-prov_n_LL-ANON"></a>[<span class="prodNo">79</span>] </td>
<td><<code class="production term">ANON</code>></td>
<td> ::= </td>
<td><code class="content">"[" (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-WS">WS</a></span> ))* "]"</code></td>
@@ -688,7 +734,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_CHARS_BASE" name="term-prov_n_LL-PN_CHARS_BASE"></a>[<span class="prodNo">76</span>] </td>
+<td><a id="term-prov_n_LL-PN_CHARS_BASE" name="term-prov_n_LL-PN_CHARS_BASE"></a>[<span class="prodNo">80</span>] </td>
<td><<code class="production term">PN_CHARS_BASE</code>></td>
<td> ::= </td>
<td><code class="content">[A-Z]<br/>
@@ -710,7 +756,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_CHARS_U" name="term-prov_n_LL-PN_CHARS_U"></a>[<span class="prodNo">77</span>] </td>
+<td><a id="term-prov_n_LL-PN_CHARS_U" name="term-prov_n_LL-PN_CHARS_U"></a>[<span class="prodNo">81</span>] </td>
<td><<code class="production term">PN_CHARS_U</code>></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_BASE">PN_CHARS_BASE</a></span><br/>
@@ -720,7 +766,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_CHARS" name="term-prov_n_LL-PN_CHARS"></a>[<span class="prodNo">78</span>] </td>
+<td><a id="term-prov_n_LL-PN_CHARS" name="term-prov_n_LL-PN_CHARS"></a>[<span class="prodNo">82</span>] </td>
<td><<code class="production term">PN_CHARS</code>></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_U">PN_CHARS_U</a></span><br/>
@@ -734,7 +780,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_PREFIX" name="term-prov_n_LL-PN_PREFIX"></a>[<span class="prodNo">79</span>] </td>
+<td><a id="term-prov_n_LL-PN_PREFIX" name="term-prov_n_LL-PN_PREFIX"></a>[<span class="prodNo">83</span>] </td>
<td><<code class="production term">PN_PREFIX</code>></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_BASE">PN_CHARS_BASE</a></span> (( (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS">PN_CHARS</a></span> | "." ))* <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS">PN_CHARS</a></span> ))?</code></td>
@@ -743,52 +789,6 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_LOCAL" name="term-prov_n_LL-PN_LOCAL"></a>[<span class="prodNo">80</span>] </td>
-<td><<code class="production term">PN_LOCAL</code>></td>
-<td> ::= </td>
-<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_U">PN_CHARS_U</a></span> | [0-9] | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ) (( (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS">PN_CHARS</a></span> | "." | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ))* ( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS">PN_CHARS</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ) ))?</code></td>
-</tr>
-</tbody>
-
-<tbody class="term">
-<tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_CHARS_OTHERS" name="term-prov_n_LL-PN_CHARS_OTHERS"></a>[<span class="prodNo">81</span>] </td>
-<td><<code class="production term">PN_CHARS_OTHERS</code>></td>
-<td> ::= </td>
-<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PERCENT">PERCENT</a></span><br/>
-| "/"<br/>
-| "@"<br/>
-| "~"<br/>
-| "&"<br/>
-| "+"<br/>
-| "?"<br/>
-| "#"<br/>
-| "$"</code></td>
-</tr>
-</tbody>
-
-<tbody class="term">
-<tr valign="baseline">
-<td><a id="term-prov_n_LL-PERCENT" name="term-prov_n_LL-PERCENT"></a>[<span class="prodNo">82</span>] </td>
-<td><<code class="production term">PERCENT</code>></td>
-<td> ::= </td>
-<td><code class="content">"%" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span></code></td>
-</tr>
-</tbody>
-
-<tbody class="term">
-<tr valign="baseline">
-<td><a id="term-prov_n_LL-HEX" name="term-prov_n_LL-HEX"></a>[<span class="prodNo">83</span>] </td>
-<td><<code class="production term">HEX</code>></td>
-<td> ::= </td>
-<td><code class="content">[0-9]<br/>
-| [A-F]<br/>
-| [a-f]</code></td>
-</tr>
-</tbody>
-
-<tbody class="term">
-<tr valign="baseline">
<td><a id="term-prov_n_LL-PASSED_TOKENS" name="term-prov_n_LL-PASSED_TOKENS"></a>[<span class="prodNo">84</span>] </td>
<td><code class="production directive">PASSED TOKENS</code></td>
<td> ::= </td>
--- a/model/grammar/ll.js Fri Jun 29 11:49:08 2012 +0100
+++ b/model/grammar/ll.js Fri Jun 29 12:38:41 2012 +0100
@@ -401,16 +401,7 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-time" name="prod-time"></a>[<span class="prodNo">45</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> ' +
-'</tbody> ' +
-' ' +
-'<tbody class="prod"> ' +
-'<tr valign="baseline"> ' +
-'<td><a id="prod-literal" name="prod-literal"></a>[<span class="prodNo">46</span>] </td> ' +
+'<td><a id="prod-literal" name="prod-literal"></a>[<span class="prodNo">45</span>] </td> ' +
'<td><code class="production prod">literal</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-typedLiteral">typedLiteral</a></span><br/> ' +
@@ -420,7 +411,7 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-typedLiteral" name="prod-typedLiteral"></a>[<span class="prodNo">47</span>] </td> ' +
+'<td><a id="prod-typedLiteral" name="prod-typedLiteral"></a>[<span class="prodNo">46</span>] </td> ' +
'<td><code class="production prod">typedLiteral</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-STRING_LITERAL">STRING_LITERAL</a></span> "%%" <span class="prod"><a class="grammarRef" href="#prod-datatype">datatype</a></span></code></td> ' +
@@ -429,7 +420,7 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-datatype" name="prod-datatype"></a>[<span class="prodNo">48</span>] </td> ' +
+'<td><a id="prod-datatype" name="prod-datatype"></a>[<span class="prodNo">47</span>] </td> ' +
'<td><code class="production prod">datatype</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></span></code></td> ' +
@@ -438,7 +429,7 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-convenienceNotation" name="prod-convenienceNotation"></a>[<span class="prodNo">49</span>] </td> ' +
+'<td><a id="prod-convenienceNotation" name="prod-convenienceNotation"></a>[<span class="prodNo">48</span>] </td> ' +
'<td><code class="production prod">convenienceNotation</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-STRING_LITERAL">STRING_LITERAL</a></span> (<span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rLANGTAG">LANGTAG</a></span>)?<br/> ' +
@@ -449,6 +440,15 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
+'<td><a id="prod-time" name="prod-time"></a>[<span class="prodNo">49</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> ' +
+'</tbody> ' +
+' ' +
+'<tbody class="prod"> ' +
+'<tr valign="baseline"> ' +
'<td><a id="prod-namespaceDeclarations" name="prod-namespaceDeclarations"></a>[<span class="prodNo">50</span>] </td> ' +
'<td><code class="production prod">namespaceDeclarations</code></td> ' +
'<td> ::= </td> ' +
@@ -540,52 +540,53 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-PREFX" name="prod-PREFX"></a>[<span class="prodNo">60</span>] </td> ' +
-'<td><<code class="production term">PREFX</code>></td> ' +
+'<td><a id="prod-PN_LOCAL" name="prod-PN_LOCAL"></a>[<span class="prodNo">60</span>] </td> ' +
+'<td><<code class="production term">PN_LOCAL</code>></td> ' +
'<td> ::= </td> ' +
-'<td><code class="content"><span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_LOCAL">PN_PREFIX</a></span></code></td> ' +
-'</tr> ' +
-'</tbody> ' +
-' ' +
-'<tbody class="term"> ' +
-'<tr valign="baseline"> ' +
-'<td><a id="prod-DIGIT" name="prod-DIGIT"></a>[<span class="prodNo">61</span>] </td> ' +
-'<td><<code class="production term">DIGIT</code>></td> ' +
-'<td> ::= </td> ' +
-'<td><code class="content">[0-9]</code></td> ' +
+'<td><code class="content">( <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_CHARS_U">PN_CHARS_U</a></span> | [0-9] | <span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ) ( ( <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_CHARS">PN_CHARS</a></span> | "." | <span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> )* ( <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_CHARS">PN_CHARS</a></span> | <span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ) )?</code></td> ' +
'</tr> ' +
'</tbody> ' +
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-ISODATETIME" name="prod-ISODATETIME"></a>[<span class="prodNo">62</span>] </td> ' +
-'<td><<code class="production term">ISODATETIME</code>></td> ' +
+'<td><a id="prod-PN_CHARS_OTHERS" name="prod-PN_CHARS_OTHERS"></a>[<span class="prodNo">61</span>] </td> ' +
+'<td><<code class="production term">PN_CHARS_OTHERS</code>></td> ' +
'<td> ::= </td> ' +
-'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> "-" <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> "-" <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> "T" <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> ( "." <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> ( <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> (<span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span>)? )? )? ( "Z" | <span class="prod"><a class="grammarRef" href="#prod-TIMEZONEOFFSET">TIMEZONEOFFSET</a></span> )?</code></td> ' +
+'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-PERCENT">PERCENT</a></span><br/> ' +
+'| "/"<br/> ' +
+'| "@"<br/> ' +
+'| "~"<br/> ' +
+'| "&"<br/> ' +
+'| "+"<br/> ' +
+'| "?"<br/> ' +
+'| "#"<br/> ' +
+'| "$"</code></td> ' +
'</tr> ' +
'</tbody> ' +
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-TIMEZONEOFFSET" name="prod-TIMEZONEOFFSET"></a>[<span class="prodNo">63</span>] </td> ' +
-'<td><<code class="production term">TIMEZONEOFFSET</code>></td> ' +
+'<td><a id="prod-PERCENT" name="prod-PERCENT"></a>[<span class="prodNo">62</span>] </td> ' +
+'<td><<code class="production term">PERCENT</code>></td> ' +
'<td> ::= </td> ' +
-'<td><code class="content">( "+" | "-" ) <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span></code></td> ' +
+'<td><code class="content">"%" <span class="prod"><a class="grammarRef" href="#prod-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-HEX">HEX</a></span></code></td> ' +
'</tr> ' +
'</tbody> ' +
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-IRI_REF" name="prod-IRI_REF"></a>[<span class="prodNo">64</span>] </td> ' +
-'<td><<code class="production term">IRI_REF</code>></td> ' +
+'<td><a id="prod-HEX" name="prod-HEX"></a>[<span class="prodNo">63</span>] </td> ' +
+'<td><<code class="production term">HEX</code>></td> ' +
'<td> ::= </td> ' +
-'<td><code class="content">"<" ( [^<>\"{}|^`\\] - [#0000- ] | <span class="prod"><a class="grammarRef" href="#prod-UCHAR">UCHAR</a></span> )* ">"</code></td> ' +
+'<td><code class="content">[0-9]<br/> ' +
+'| [A-F]<br/> ' +
+'| [a-f]</code></td> ' +
'</tr> ' +
'</tbody> ' +
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-STRING_LITERAL" name="prod-STRING_LITERAL"></a>[<span class="prodNo">65</span>] </td> ' +
+'<td><a id="prod-STRING_LITERAL" name="prod-STRING_LITERAL"></a>[<span class="prodNo">64</span>] </td> ' +
'<td><<code class="production term">STRING_LITERAL</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rSTRING_LITERAL2">STRING_LITERAL2</a></span><br/> ' +
@@ -595,7 +596,70 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-STRING_LITERAL2" name="prod-STRING_LITERAL2"></a>[<span class="prodNo">66</span>] </td> ' +
+'<td><a id="prod-PREFX" name="prod-PREFX"></a>[<span class="prodNo">65</span>] </td> ' +
+'<td><<code class="production term">PREFX</code>></td> ' +
+'<td> ::= </td> ' +
+'<td><code class="content"><span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_LOCAL">PN_PREFIX</a></span></code></td> ' +
+'</tr> ' +
+'</tbody> ' +
+' ' +
+'<tbody class="term"> ' +
+'<tr valign="baseline"> ' +
+'<td><a id="prod-INT_LITERAL" name="prod-INT_LITERAL"></a>[<span class="prodNo">66</span>] </td> ' +
+'<td><<code class="production term">INT_LITERAL</code>></td> ' +
+'<td> ::= </td> ' +
+'<td><code class="content">("-")? (<span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span>)+</code></td> ' +
+'</tr> ' +
+'</tbody> ' +
+' ' +
+'<tbody class="term"> ' +
+'<tr valign="baseline"> ' +
+'<td><a id="prod-QUALIFIED_NAME_LITERAL" name="prod-QUALIFIED_NAME_LITERAL"></a>[<span class="prodNo">67</span>] </td> ' +
+'<td><<code class="production term">QUALIFIED_NAME_LITERAL</code>></td> ' +
+'<td> ::= </td> ' +
+'<td><code class="content">"\'" <span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></span> "\'"</code></td> ' +
+'</tr> ' +
+'</tbody> ' +
+' ' +
+'<tbody class="term"> ' +
+'<tr valign="baseline"> ' +
+'<td><a id="prod-DIGIT" name="prod-DIGIT"></a>[<span class="prodNo">68</span>] </td> ' +
+'<td><<code class="production term">DIGIT</code>></td> ' +
+'<td> ::= </td> ' +
+'<td><code class="content">[0-9]</code></td> ' +
+'</tr> ' +
+'</tbody> ' +
+' ' +
+'<tbody class="term"> ' +
+'<tr valign="baseline"> ' +
+'<td><a id="prod-ISODATETIME" name="prod-ISODATETIME"></a>[<span class="prodNo">69</span>] </td> ' +
+'<td><<code class="production term">ISODATETIME</code>></td> ' +
+'<td> ::= </td> ' +
+'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> "-" <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> "-" <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> "T" <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> ( "." <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> ( <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> (<span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span>)? )? )? ( "Z" | <span class="prod"><a class="grammarRef" href="#prod-TIMEZONEOFFSET">TIMEZONEOFFSET</a></span> )?</code></td> ' +
+'</tr> ' +
+'</tbody> ' +
+' ' +
+'<tbody class="term"> ' +
+'<tr valign="baseline"> ' +
+'<td><a id="prod-TIMEZONEOFFSET" name="prod-TIMEZONEOFFSET"></a>[<span class="prodNo">70</span>] </td> ' +
+'<td><<code class="production term">TIMEZONEOFFSET</code>></td> ' +
+'<td> ::= </td> ' +
+'<td><code class="content">( "+" | "-" ) <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span></code></td> ' +
+'</tr> ' +
+'</tbody> ' +
+' ' +
+'<tbody class="term"> ' +
+'<tr valign="baseline"> ' +
+'<td><a id="prod-IRI_REF" name="prod-IRI_REF"></a>[<span class="prodNo">71</span>] </td> ' +
+'<td><<code class="production term">IRI_REF</code>></td> ' +
+'<td> ::= </td> ' +
+'<td><code class="content">"<" ( [^<>\"{}|^`\\] - [#0000- ] | <span class="prod"><a class="grammarRef" href="#prod-UCHAR">UCHAR</a></span> )* ">"</code></td> ' +
+'</tr> ' +
+'</tbody> ' +
+' ' +
+'<tbody class="term"> ' +
+'<tr valign="baseline"> ' +
+'<td><a id="prod-STRING_LITERAL2" name="prod-STRING_LITERAL2"></a>[<span class="prodNo">72</span>] </td> ' +
'<td><<code class="production term">STRING_LITERAL2</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">\'"\' ( ( [^\"\\\n\r] ) | <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rECHAR">ECHAR</a></span> | <span class="prod"><a class="grammarRef" href="#prod-UCHAR">UCHAR</a></span> )* \'"\'</code></td> ' +
@@ -604,7 +668,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-STRING_LITERAL_LONG2" name="prod-STRING_LITERAL_LONG2"></a>[<span class="prodNo">67</span>] </td> ' +
+'<td><a id="prod-STRING_LITERAL_LONG2" name="prod-STRING_LITERAL_LONG2"></a>[<span class="prodNo">73</span>] </td> ' +
'<td><<code class="production term">STRING_LITERAL_LONG2</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">\'"\' ( ( [^\"\\\n\r] ) | <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rECHAR">ECHAR</a></span> | <span class="prod"><a class="grammarRef" href="#prod-UCHAR">UCHAR</a></span> )* \'"\'</code></td> ' +
@@ -613,25 +677,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-INT_LITERAL" name="prod-INT_LITERAL"></a>[<span class="prodNo">68</span>] </td> ' +
-'<td><<code class="production term">INT_LITERAL</code>></td> ' +
-'<td> ::= </td> ' +
-'<td><code class="content">("-")? (<span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span>)+</code></td> ' +
-'</tr> ' +
-'</tbody> ' +
-' ' +
-'<tbody class="term"> ' +
-'<tr valign="baseline"> ' +
-'<td><a id="prod-QUALIFIED_NAME_LITERAL" name="prod-QUALIFIED_NAME_LITERAL"></a>[<span class="prodNo">69</span>] </td> ' +
-'<td><<code class="production term">QUALIFIED_NAME_LITERAL</code>></td> ' +
-'<td> ::= </td> ' +
-'<td><code class="content">"\'" <span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></span> "\'"</code></td> ' +
-'</tr> ' +
-'</tbody> ' +
-' ' +
-'<tbody class="term"> ' +
-'<tr valign="baseline"> ' +
-'<td><a id="prod-LANGTAG" name="prod-LANGTAG"></a>[<span class="prodNo">70</span>] </td> ' +
+'<td><a id="prod-LANGTAG" name="prod-LANGTAG"></a>[<span class="prodNo">74</span>] </td> ' +
'<td><<code class="production term">LANGTAG</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">"@" ([a-zA-Z])+ ( "-" ([a-zA-Z0-9])+ )*</code></td> ' +
@@ -640,7 +686,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-UCHAR" name="prod-UCHAR"></a>[<span class="prodNo">71</span>] </td> ' +
+'<td><a id="prod-UCHAR" name="prod-UCHAR"></a>[<span class="prodNo">75</span>] </td> ' +
'<td><<code class="production term">UCHAR</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">( "\\u" <span class="prod"><a class="grammarRef" href="#prod-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-HEX">HEX</a></span> )<br/> ' +
@@ -650,7 +696,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-ECHAR" name="prod-ECHAR"></a>[<span class="prodNo">72</span>] </td> ' +
+'<td><a id="prod-ECHAR" name="prod-ECHAR"></a>[<span class="prodNo">76</span>] </td> ' +
'<td><<code class="production term">ECHAR</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">"\\" [tbnrf\\\"\']</code></td> ' +
@@ -659,7 +705,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-NIL" name="prod-NIL"></a>[<span class="prodNo">73</span>] </td> ' +
+'<td><a id="prod-NIL" name="prod-NIL"></a>[<span class="prodNo">77</span>] </td> ' +
'<td><<code class="production term">NIL</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">"(" ( <span class="prod"><a class="grammarRef" href="#prod-WS">WS</a></span> )* ")"</code></td> ' +
@@ -668,7 +714,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-WS" name="prod-WS"></a>[<span class="prodNo">74</span>] </td> ' +
+'<td><a id="prod-WS" name="prod-WS"></a>[<span class="prodNo">78</span>] </td> ' +
'<td><<code class="production term">WS</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">" "<br/> ' +
@@ -680,7 +726,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-ANON" name="prod-ANON"></a>[<span class="prodNo">75</span>] </td> ' +
+'<td><a id="prod-ANON" name="prod-ANON"></a>[<span class="prodNo">79</span>] </td> ' +
'<td><<code class="production term">ANON</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">"[" ( <span class="prod"><a class="grammarRef" href="#prod-WS">WS</a></span> )* "]"</code></td> ' +
@@ -689,7 +735,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-PN_CHARS_BASE" name="prod-PN_CHARS_BASE"></a>[<span class="prodNo">76</span>] </td> ' +
+'<td><a id="prod-PN_CHARS_BASE" name="prod-PN_CHARS_BASE"></a>[<span class="prodNo">80</span>] </td> ' +
'<td><<code class="production term">PN_CHARS_BASE</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">[A-Z]<br/> ' +
@@ -711,7 +757,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-PN_CHARS_U" name="prod-PN_CHARS_U"></a>[<span class="prodNo">77</span>] </td> ' +
+'<td><a id="prod-PN_CHARS_U" name="prod-PN_CHARS_U"></a>[<span class="prodNo">81</span>] </td> ' +
'<td><<code class="production term">PN_CHARS_U</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_BASE">PN_CHARS_BASE</a></span><br/> ' +
@@ -721,7 +767,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-PN_CHARS" name="prod-PN_CHARS"></a>[<span class="prodNo">78</span>] </td> ' +
+'<td><a id="prod-PN_CHARS" name="prod-PN_CHARS"></a>[<span class="prodNo">82</span>] </td> ' +
'<td><<code class="production term">PN_CHARS</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_CHARS_U">PN_CHARS_U</a></span><br/> ' +
@@ -735,7 +781,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-PN_PREFIX" name="prod-PN_PREFIX"></a>[<span class="prodNo">79</span>] </td> ' +
+'<td><a id="prod-PN_PREFIX" name="prod-PN_PREFIX"></a>[<span class="prodNo">83</span>] </td> ' +
'<td><<code class="production term">PN_PREFIX</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_BASE">PN_CHARS_BASE</a></span> ( ( <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_CHARS">PN_CHARS</a></span> | "." )* <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_CHARS">PN_CHARS</a></span> )?</code></td> ' +
@@ -744,52 +790,6 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-PN_LOCAL" name="prod-PN_LOCAL"></a>[<span class="prodNo">80</span>] </td> ' +
-'<td><<code class="production term">PN_LOCAL</code>></td> ' +
-'<td> ::= </td> ' +
-'<td><code class="content">( <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_CHARS_U">PN_CHARS_U</a></span> | [0-9] | <span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ) ( ( <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_CHARS">PN_CHARS</a></span> | "." | <span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> )* ( <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_CHARS">PN_CHARS</a></span> | <span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ) )?</code></td> ' +
-'</tr> ' +
-'</tbody> ' +
-' ' +
-'<tbody class="term"> ' +
-'<tr valign="baseline"> ' +
-'<td><a id="prod-PN_CHARS_OTHERS" name="prod-PN_CHARS_OTHERS"></a>[<span class="prodNo">81</span>] </td> ' +
-'<td><<code class="production term">PN_CHARS_OTHERS</code>></td> ' +
-'<td> ::= </td> ' +
-'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-PERCENT">PERCENT</a></span><br/> ' +
-'| "/"<br/> ' +
-'| "@"<br/> ' +
-'| "~"<br/> ' +
-'| "&"<br/> ' +
-'| "+"<br/> ' +
-'| "?"<br/> ' +
-'| "#"<br/> ' +
-'| "$"</code></td> ' +
-'</tr> ' +
-'</tbody> ' +
-' ' +
-'<tbody class="term"> ' +
-'<tr valign="baseline"> ' +
-'<td><a id="prod-PERCENT" name="prod-PERCENT"></a>[<span class="prodNo">82</span>] </td> ' +
-'<td><<code class="production term">PERCENT</code>></td> ' +
-'<td> ::= </td> ' +
-'<td><code class="content">"%" <span class="prod"><a class="grammarRef" href="#prod-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-HEX">HEX</a></span></code></td> ' +
-'</tr> ' +
-'</tbody> ' +
-' ' +
-'<tbody class="term"> ' +
-'<tr valign="baseline"> ' +
-'<td><a id="prod-HEX" name="prod-HEX"></a>[<span class="prodNo">83</span>] </td> ' +
-'<td><<code class="production term">HEX</code>></td> ' +
-'<td> ::= </td> ' +
-'<td><code class="content">[0-9]<br/> ' +
-'| [A-F]<br/> ' +
-'| [a-f]</code></td> ' +
-'</tr> ' +
-'</tbody> ' +
-' ' +
-'<tbody class="term"> ' +
-'<tr valign="baseline"> ' +
'<td><a id="prod-PASSED_TOKENS" name="prod-PASSED_TOKENS"></a>[<span class="prodNo">84</span>] </td> ' +
'<td><code class="production directive">PASSED TOKENS</code></td> ' +
'<td> ::= </td> ' +
--- a/model/grammar/yack/prov-n-LL.bnf Fri Jun 29 11:49:08 2012 +0100
+++ b/model/grammar/yack/prov-n-LL.bnf Fri Jun 29 12:38:41 2012 +0100
@@ -130,11 +130,6 @@
-timeZZ::= ISODATETIME
-
-
-
-
@@ -155,14 +150,19 @@
+[49] timeZZ::= ISODATETIME
+
+
+
+
-[4] namespaceDeclarations ::= (defaultNamespaceDeclaration | namespaceDeclaration) namespaceDeclaration*
-[5] namespaceDeclaration ::= "prefix" QUALIFIED_NAME namespace
-[7] defaultNamespaceDeclaration ::= "default" IRI_REF
-[6] namespace ::= IRI_REF
+[50] namespaceDeclarations ::= (defaultNamespaceDeclaration | namespaceDeclaration) namespaceDeclaration*
+[51] namespaceDeclaration ::= "prefix" QUALIFIED_NAME namespace
+[52] defaultNamespaceDeclaration ::= "default" IRI_REF
+[53] namespace ::= IRI_REF
[31c] dictMembershipExpression::= "memberOf" "(" optionalIdentifier dIdentifier "," keyEntitySet complete optionalAttributeValuePairs ")"
@@ -180,30 +180,41 @@
@terminals
QUALIFIED_NAME::= (PN_PREFIX ":")? PN_LOCAL | PN_PREFIX ":"
+[100s] PN_LOCAL ::= ( PN_CHARS_U | [0-9] | PN_CHARS_OTHERS ) ( ( PN_CHARS | '.' | PN_CHARS_OTHERS )* ( PN_CHARS | PN_CHARS_OTHERS ) ) ?
+
+[160s] PN_CHARS_OTHERS ::= PERCENT | '/' | '@' | '~' | '&' | '+' | '?' | '#' | '$'
+
+[161s] PERCENT ::= '%' HEX HEX
+
+[162s] HEX ::= [0-9] | [A-F] | [a-f]
+
+
+[149s] STRING_LITERAL ::= STRING_LITERAL2 | STRING_LITERAL_LONG2
+
+
PREFX::= PN_PREFIX
+
+INT_LITERAL::= '-'? DIGIT+
+
+
+[149s] QUALIFIED_NAME_LITERAL ::= '\'' QUALIFIED_NAME '\''
+
+
DIGIT::=[0-9]
ISODATETIME::= DIGIT DIGIT DIGIT DIGIT "-" DIGIT DIGIT "-" DIGIT DIGIT "T" DIGIT DIGIT ":" DIGIT DIGIT ":" DIGIT DIGIT ("." DIGIT (DIGIT DIGIT?)?)? ("Z" | TIMEZONEOFFSET)?
TIMEZONEOFFSET::= ("+" | "-") DIGIT DIGIT ":" DIGIT DIGIT;
-
-
[70s] IRI_REF ::= "<" ( [^<>\"{}|^`\\] - [#x00-#x20] | UCHAR )* ">"
-[149s] STRING_LITERAL ::= STRING_LITERAL2 | STRING_LITERAL_LONG2
+
[149s] STRING_LITERAL2 ::= '"' ( ( [^#x22#x5C#xA#xD]) | ECHAR | UCHAR )* '"'
[149s] STRING_LITERAL_LONG2 ::= '"' ( ( [^#x22#x5C#xA#xD]) | ECHAR | UCHAR )* '"'
-
-INT_LITERAL::= '-'? DIGIT+
-
-
-[149s] QUALIFIED_NAME_LITERAL ::= '\'' QUALIFIED_NAME '\''
-
LANGTAG ::= '@' [a-zA-Z]+ ( '-' [a-zA-Z0-9]+ )*
[19] UCHAR ::= ( "\\u" HEX HEX HEX HEX )
@@ -243,14 +254,6 @@
| [#203F-#2040]
[99s] PN_PREFIX ::= PN_CHARS_BASE ( ( PN_CHARS | "." )* PN_CHARS )?
-[100s] PN_LOCAL ::= ( PN_CHARS_U | [0-9] | PN_CHARS_OTHERS ) ( ( PN_CHARS | '.' | PN_CHARS_OTHERS )* ( PN_CHARS | PN_CHARS_OTHERS ) ) ?
-
-[160s] PN_CHARS_OTHERS ::= PERCENT | '/' | '@' | '~' | '&' | '+' | '?' | '#' | '$'
-
-[161s] PERCENT ::= '%' HEX HEX
-
-[162s] HEX ::= [0-9] | [A-F] | [a-f]
-
--- a/model/grammar/yack/prov-n-LL.bnf.html Fri Jun 29 11:49:08 2012 +0100
+++ b/model/grammar/yack/prov-n-LL.bnf.html Fri Jun 29 12:38:41 2012 +0100
@@ -399,16 +399,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-timeZZ" name="prod-prov_n_LL-timeZZ"></a>[<span class="prodNo">45</span>] </td>
-<td><code class="production prod">timeZZ</code></td>
-<td> ::= </td>
-<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-ISODATETIME">ISODATETIME</a></span></code></td>
-</tr>
-</tbody>
-
-<tbody class="prod">
-<tr valign="baseline">
-<td><a id="prod-prov_n_LL-literal" name="prod-prov_n_LL-literal"></a>[<span class="prodNo">46</span>] </td>
+<td><a id="prod-prov_n_LL-literal" name="prod-prov_n_LL-literal"></a>[<span class="prodNo">45</span>] </td>
<td><code class="production prod">literal</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-typedLiteral">typedLiteral</a></span><br/>
@@ -418,7 +409,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-typedLiteral" name="prod-prov_n_LL-typedLiteral"></a>[<span class="prodNo">47</span>] </td>
+<td><a id="prod-prov_n_LL-typedLiteral" name="prod-prov_n_LL-typedLiteral"></a>[<span class="prodNo">46</span>] </td>
<td><code class="production prod">typedLiteral</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-STRING_LITERAL">STRING_LITERAL</a></span> "%%" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-datatype">datatype</a></span></code></td>
@@ -427,7 +418,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-datatype" name="prod-prov_n_LL-datatype"></a>[<span class="prodNo">48</span>] </td>
+<td><a id="prod-prov_n_LL-datatype" name="prod-prov_n_LL-datatype"></a>[<span class="prodNo">47</span>] </td>
<td><code class="production prod">datatype</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span></code></td>
@@ -436,7 +427,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-convenienceNotation" name="prod-prov_n_LL-convenienceNotation"></a>[<span class="prodNo">49</span>] </td>
+<td><a id="prod-prov_n_LL-convenienceNotation" name="prod-prov_n_LL-convenienceNotation"></a>[<span class="prodNo">48</span>] </td>
<td><code class="production prod">convenienceNotation</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-STRING_LITERAL">STRING_LITERAL</a></span> (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-LANGTAG">LANGTAG</a></span>)?<br/>
@@ -447,6 +438,15 @@
<tbody class="prod">
<tr valign="baseline">
+<td><a id="prod-prov_n_LL-timeZZ" name="prod-prov_n_LL-timeZZ"></a>[<span class="prodNo">49</span>] </td>
+<td><code class="production prod">timeZZ</code></td>
+<td> ::= </td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-ISODATETIME">ISODATETIME</a></span></code></td>
+</tr>
+</tbody>
+
+<tbody class="prod">
+<tr valign="baseline">
<td><a id="prod-prov_n_LL-namespaceDeclarations" name="prod-prov_n_LL-namespaceDeclarations"></a>[<span class="prodNo">50</span>] </td>
<td><code class="production prod">namespaceDeclarations</code></td>
<td> ::= </td>
@@ -538,52 +538,53 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-PREFX" name="term-prov_n_LL-PREFX"></a>[<span class="prodNo">60</span>] </td>
-<td><<code class="production term">PREFX</code>></td>
+<td><a id="term-prov_n_LL-PN_LOCAL" name="term-prov_n_LL-PN_LOCAL"></a>[<span class="prodNo">60</span>] </td>
+<td><<code class="production term">PN_LOCAL</code>></td>
<td> ::= </td>
-<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_PREFIX">PN_PREFIX</a></span></code></td>
-</tr>
-</tbody>
-
-<tbody class="term">
-<tr valign="baseline">
-<td><a id="term-prov_n_LL-DIGIT" name="term-prov_n_LL-DIGIT"></a>[<span class="prodNo">61</span>] </td>
-<td><<code class="production term">DIGIT</code>></td>
-<td> ::= </td>
-<td><code class="content">[0-9]</code></td>
+<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_U">PN_CHARS_U</a></span> | [0-9] | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ) (( (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS">PN_CHARS</a></span> | "." | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ))* ( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS">PN_CHARS</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ) ))?</code></td>
</tr>
</tbody>
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-ISODATETIME" name="term-prov_n_LL-ISODATETIME"></a>[<span class="prodNo">62</span>] </td>
-<td><<code class="production term">ISODATETIME</code>></td>
+<td><a id="term-prov_n_LL-PN_CHARS_OTHERS" name="term-prov_n_LL-PN_CHARS_OTHERS"></a>[<span class="prodNo">61</span>] </td>
+<td><<code class="production term">PN_CHARS_OTHERS</code>></td>
<td> ::= </td>
-<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> "-" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> "-" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> "T" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> (( "." <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span>)? ))? ))? (( "Z" | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-TIMEZONEOFFSET">TIMEZONEOFFSET</a></span> ))?</code></td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PERCENT">PERCENT</a></span><br/>
+| "/"<br/>
+| "@"<br/>
+| "~"<br/>
+| "&"<br/>
+| "+"<br/>
+| "?"<br/>
+| "#"<br/>
+| "$"</code></td>
</tr>
</tbody>
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-TIMEZONEOFFSET" name="term-prov_n_LL-TIMEZONEOFFSET"></a>[<span class="prodNo">63</span>] </td>
-<td><<code class="production term">TIMEZONEOFFSET</code>></td>
+<td><a id="term-prov_n_LL-PERCENT" name="term-prov_n_LL-PERCENT"></a>[<span class="prodNo">62</span>] </td>
+<td><<code class="production term">PERCENT</code>></td>
<td> ::= </td>
-<td><code class="content">( "+" | "-" ) <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span></code></td>
+<td><code class="content">"%" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span></code></td>
</tr>
</tbody>
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-IRI_REF" name="term-prov_n_LL-IRI_REF"></a>[<span class="prodNo">64</span>] </td>
-<td><<code class="production term">IRI_REF</code>></td>
+<td><a id="term-prov_n_LL-HEX" name="term-prov_n_LL-HEX"></a>[<span class="prodNo">63</span>] </td>
+<td><<code class="production term">HEX</code>></td>
<td> ::= </td>
-<td><code class="content">"<" (( [^<>\"{}|^`\\] - [#0000- ] | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-UCHAR">UCHAR</a></span> ))* ">"</code></td>
+<td><code class="content">[0-9]<br/>
+| [A-F]<br/>
+| [a-f]</code></td>
</tr>
</tbody>
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-STRING_LITERAL" name="term-prov_n_LL-STRING_LITERAL"></a>[<span class="prodNo">65</span>] </td>
+<td><a id="term-prov_n_LL-STRING_LITERAL" name="term-prov_n_LL-STRING_LITERAL"></a>[<span class="prodNo">64</span>] </td>
<td><<code class="production term">STRING_LITERAL</code>></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-STRING_LITERAL2">STRING_LITERAL2</a></span><br/>
@@ -593,7 +594,70 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-STRING_LITERAL2" name="term-prov_n_LL-STRING_LITERAL2"></a>[<span class="prodNo">66</span>] </td>
+<td><a id="term-prov_n_LL-PREFX" name="term-prov_n_LL-PREFX"></a>[<span class="prodNo">65</span>] </td>
+<td><<code class="production term">PREFX</code>></td>
+<td> ::= </td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_PREFIX">PN_PREFIX</a></span></code></td>
+</tr>
+</tbody>
+
+<tbody class="term">
+<tr valign="baseline">
+<td><a id="term-prov_n_LL-INT_LITERAL" name="term-prov_n_LL-INT_LITERAL"></a>[<span class="prodNo">66</span>] </td>
+<td><<code class="production term">INT_LITERAL</code>></td>
+<td> ::= </td>
+<td><code class="content">("-")? (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span>)+</code></td>
+</tr>
+</tbody>
+
+<tbody class="term">
+<tr valign="baseline">
+<td><a id="term-prov_n_LL-QUALIFIED_NAME_LITERAL" name="term-prov_n_LL-QUALIFIED_NAME_LITERAL"></a>[<span class="prodNo">67</span>] </td>
+<td><<code class="production term">QUALIFIED_NAME_LITERAL</code>></td>
+<td> ::= </td>
+<td><code class="content">"'" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span> "'"</code></td>
+</tr>
+</tbody>
+
+<tbody class="term">
+<tr valign="baseline">
+<td><a id="term-prov_n_LL-DIGIT" name="term-prov_n_LL-DIGIT"></a>[<span class="prodNo">68</span>] </td>
+<td><<code class="production term">DIGIT</code>></td>
+<td> ::= </td>
+<td><code class="content">[0-9]</code></td>
+</tr>
+</tbody>
+
+<tbody class="term">
+<tr valign="baseline">
+<td><a id="term-prov_n_LL-ISODATETIME" name="term-prov_n_LL-ISODATETIME"></a>[<span class="prodNo">69</span>] </td>
+<td><<code class="production term">ISODATETIME</code>></td>
+<td> ::= </td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> "-" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> "-" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> "T" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> (( "." <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span>)? ))? ))? (( "Z" | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-TIMEZONEOFFSET">TIMEZONEOFFSET</a></span> ))?</code></td>
+</tr>
+</tbody>
+
+<tbody class="term">
+<tr valign="baseline">
+<td><a id="term-prov_n_LL-TIMEZONEOFFSET" name="term-prov_n_LL-TIMEZONEOFFSET"></a>[<span class="prodNo">70</span>] </td>
+<td><<code class="production term">TIMEZONEOFFSET</code>></td>
+<td> ::= </td>
+<td><code class="content">( "+" | "-" ) <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span></code></td>
+</tr>
+</tbody>
+
+<tbody class="term">
+<tr valign="baseline">
+<td><a id="term-prov_n_LL-IRI_REF" name="term-prov_n_LL-IRI_REF"></a>[<span class="prodNo">71</span>] </td>
+<td><<code class="production term">IRI_REF</code>></td>
+<td> ::= </td>
+<td><code class="content">"<" (( [^<>\"{}|^`\\] - [#0000- ] | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-UCHAR">UCHAR</a></span> ))* ">"</code></td>
+</tr>
+</tbody>
+
+<tbody class="term">
+<tr valign="baseline">
+<td><a id="term-prov_n_LL-STRING_LITERAL2" name="term-prov_n_LL-STRING_LITERAL2"></a>[<span class="prodNo">72</span>] </td>
<td><<code class="production term">STRING_LITERAL2</code>></td>
<td> ::= </td>
<td><code class="content">'"' (( ( [^\"\\\n\r] ) | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-ECHAR">ECHAR</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-UCHAR">UCHAR</a></span> ))* '"'</code></td>
@@ -602,7 +666,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-STRING_LITERAL_LONG2" name="term-prov_n_LL-STRING_LITERAL_LONG2"></a>[<span class="prodNo">67</span>] </td>
+<td><a id="term-prov_n_LL-STRING_LITERAL_LONG2" name="term-prov_n_LL-STRING_LITERAL_LONG2"></a>[<span class="prodNo">73</span>] </td>
<td><<code class="production term">STRING_LITERAL_LONG2</code>></td>
<td> ::= </td>
<td><code class="content">'"' (( ( [^\"\\\n\r] ) | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-ECHAR">ECHAR</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-UCHAR">UCHAR</a></span> ))* '"'</code></td>
@@ -611,25 +675,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-INT_LITERAL" name="term-prov_n_LL-INT_LITERAL"></a>[<span class="prodNo">68</span>] </td>
-<td><<code class="production term">INT_LITERAL</code>></td>
-<td> ::= </td>
-<td><code class="content">("-")? (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span>)+</code></td>
-</tr>
-</tbody>
-
-<tbody class="term">
-<tr valign="baseline">
-<td><a id="term-prov_n_LL-QUALIFIED_NAME_LITERAL" name="term-prov_n_LL-QUALIFIED_NAME_LITERAL"></a>[<span class="prodNo">69</span>] </td>
-<td><<code class="production term">QUALIFIED_NAME_LITERAL</code>></td>
-<td> ::= </td>
-<td><code class="content">"'" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span> "'"</code></td>
-</tr>
-</tbody>
-
-<tbody class="term">
-<tr valign="baseline">
-<td><a id="term-prov_n_LL-LANGTAG" name="term-prov_n_LL-LANGTAG"></a>[<span class="prodNo">70</span>] </td>
+<td><a id="term-prov_n_LL-LANGTAG" name="term-prov_n_LL-LANGTAG"></a>[<span class="prodNo">74</span>] </td>
<td><<code class="production term">LANGTAG</code>></td>
<td> ::= </td>
<td><code class="content">"@" ([a-zA-Z])+ (( "-" ([a-zA-Z0-9])+ ))*</code></td>
@@ -638,7 +684,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-UCHAR" name="term-prov_n_LL-UCHAR"></a>[<span class="prodNo">71</span>] </td>
+<td><a id="term-prov_n_LL-UCHAR" name="term-prov_n_LL-UCHAR"></a>[<span class="prodNo">75</span>] </td>
<td><<code class="production term">UCHAR</code>></td>
<td> ::= </td>
<td><code class="content">( "\\u" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span> )<br/>
@@ -648,7 +694,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-ECHAR" name="term-prov_n_LL-ECHAR"></a>[<span class="prodNo">72</span>] </td>
+<td><a id="term-prov_n_LL-ECHAR" name="term-prov_n_LL-ECHAR"></a>[<span class="prodNo">76</span>] </td>
<td><<code class="production term">ECHAR</code>></td>
<td> ::= </td>
<td><code class="content">"\\" [tbnrf\\\"']</code></td>
@@ -657,7 +703,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-NIL" name="term-prov_n_LL-NIL"></a>[<span class="prodNo">73</span>] </td>
+<td><a id="term-prov_n_LL-NIL" name="term-prov_n_LL-NIL"></a>[<span class="prodNo">77</span>] </td>
<td><<code class="production term">NIL</code>></td>
<td> ::= </td>
<td><code class="content">"(" (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-WS">WS</a></span> ))* ")"</code></td>
@@ -666,7 +712,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-WS" name="term-prov_n_LL-WS"></a>[<span class="prodNo">74</span>] </td>
+<td><a id="term-prov_n_LL-WS" name="term-prov_n_LL-WS"></a>[<span class="prodNo">78</span>] </td>
<td><<code class="production term">WS</code>></td>
<td> ::= </td>
<td><code class="content">" "<br/>
@@ -678,7 +724,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-ANON" name="term-prov_n_LL-ANON"></a>[<span class="prodNo">75</span>] </td>
+<td><a id="term-prov_n_LL-ANON" name="term-prov_n_LL-ANON"></a>[<span class="prodNo">79</span>] </td>
<td><<code class="production term">ANON</code>></td>
<td> ::= </td>
<td><code class="content">"[" (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-WS">WS</a></span> ))* "]"</code></td>
@@ -687,7 +733,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_CHARS_BASE" name="term-prov_n_LL-PN_CHARS_BASE"></a>[<span class="prodNo">76</span>] </td>
+<td><a id="term-prov_n_LL-PN_CHARS_BASE" name="term-prov_n_LL-PN_CHARS_BASE"></a>[<span class="prodNo">80</span>] </td>
<td><<code class="production term">PN_CHARS_BASE</code>></td>
<td> ::= </td>
<td><code class="content">[A-Z]<br/>
@@ -709,7 +755,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_CHARS_U" name="term-prov_n_LL-PN_CHARS_U"></a>[<span class="prodNo">77</span>] </td>
+<td><a id="term-prov_n_LL-PN_CHARS_U" name="term-prov_n_LL-PN_CHARS_U"></a>[<span class="prodNo">81</span>] </td>
<td><<code class="production term">PN_CHARS_U</code>></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_BASE">PN_CHARS_BASE</a></span><br/>
@@ -719,7 +765,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_CHARS" name="term-prov_n_LL-PN_CHARS"></a>[<span class="prodNo">78</span>] </td>
+<td><a id="term-prov_n_LL-PN_CHARS" name="term-prov_n_LL-PN_CHARS"></a>[<span class="prodNo">82</span>] </td>
<td><<code class="production term">PN_CHARS</code>></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_U">PN_CHARS_U</a></span><br/>
@@ -733,7 +779,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_PREFIX" name="term-prov_n_LL-PN_PREFIX"></a>[<span class="prodNo">79</span>] </td>
+<td><a id="term-prov_n_LL-PN_PREFIX" name="term-prov_n_LL-PN_PREFIX"></a>[<span class="prodNo">83</span>] </td>
<td><<code class="production term">PN_PREFIX</code>></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_BASE">PN_CHARS_BASE</a></span> (( (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS">PN_CHARS</a></span> | "." ))* <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS">PN_CHARS</a></span> ))?</code></td>
@@ -742,52 +788,6 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_LOCAL" name="term-prov_n_LL-PN_LOCAL"></a>[<span class="prodNo">80</span>] </td>
-<td><<code class="production term">PN_LOCAL</code>></td>
-<td> ::= </td>
-<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_U">PN_CHARS_U</a></span> | [0-9] | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ) (( (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS">PN_CHARS</a></span> | "." | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ))* ( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS">PN_CHARS</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ) ))?</code></td>
-</tr>
-</tbody>
-
-<tbody class="term">
-<tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_CHARS_OTHERS" name="term-prov_n_LL-PN_CHARS_OTHERS"></a>[<span class="prodNo">81</span>] </td>
-<td><<code class="production term">PN_CHARS_OTHERS</code>></td>
-<td> ::= </td>
-<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PERCENT">PERCENT</a></span><br/>
-| "/"<br/>
-| "@"<br/>
-| "~"<br/>
-| "&"<br/>
-| "+"<br/>
-| "?"<br/>
-| "#"<br/>
-| "$"</code></td>
-</tr>
-</tbody>
-
-<tbody class="term">
-<tr valign="baseline">
-<td><a id="term-prov_n_LL-PERCENT" name="term-prov_n_LL-PERCENT"></a>[<span class="prodNo">82</span>] </td>
-<td><<code class="production term">PERCENT</code>></td>
-<td> ::= </td>
-<td><code class="content">"%" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span></code></td>
-</tr>
-</tbody>
-
-<tbody class="term">
-<tr valign="baseline">
-<td><a id="term-prov_n_LL-HEX" name="term-prov_n_LL-HEX"></a>[<span class="prodNo">83</span>] </td>
-<td><<code class="production term">HEX</code>></td>
-<td> ::= </td>
-<td><code class="content">[0-9]<br/>
-| [A-F]<br/>
-| [a-f]</code></td>
-</tr>
-</tbody>
-
-<tbody class="term">
-<tr valign="baseline">
<td><a id="term-prov_n_LL-PASSED_TOKENS" name="term-prov_n_LL-PASSED_TOKENS"></a>[<span class="prodNo">84</span>] </td>
<td><code class="production directive">PASSED TOKENS</code></td>
<td> ::= </td>
--- a/model/prov-n.html Fri Jun 29 11:49:08 2012 +0100
+++ b/model/prov-n.html Fri Jun 29 12:38:41 2012 +0100
@@ -229,7 +229,7 @@
// if your specification has a subtitle that goes below the main
// formal title, define it here
// subtitle : "About-to-be-frozen WD4 (for internal release)",
- subtitle : "Post internal release (<a href=\"diff-n.html\">Diffs since last release</a>)",
+ subtitle : "Final review before Last Call Vote (<a href=\"diff-n.html\">Diffs since last release</a>)",
// if you wish the publication date to be other than today, set this
// publishDate: "2012-05-03",
@@ -297,17 +297,19 @@
<section id="abstract">
<p>
-PROV-DM, the PROV conceptual data model, is a data model for provenance that describes
-the entities, people and activities involved in
-producing a piece of data or thing.
-PROV-DM distinguishes core structures, forming the essence of provenance descriptions, from
-extended structures catering for more advanced uses of provenance.
+Provenance is information about entities, activities, and people
+involved in producing a piece of data or thing, which can be used
+ to form assessments about its quality, reliability or trustworthiness.
+PROV-DM is the conceptual data model that forms a basis for the W3C
+provenance (PROV) family of specifications.
+PROV-DM distinguishes core structures, forming the essence of provenance information, from
+extended structures catering for more specific uses of provenance.
PROV-DM is organized in six components, respectively dealing with:
(1) entities and activities, and the time at which they were created, used, or ended;
-(2) agents bearing responsibility for entities that were generated and activities that happened;
-(3) derivations of entities from entities;
-(4) properties to link entities that refer to the same thing;
-(5) a notion of bundle, a mechanism to support provenance of provenance; and,
+(2) derivations of entities from entities;
+(3) agents bearing responsibility for entities that were generated and activities that happened;
+(4) a notion of bundle, a mechanism to support provenance of provenance; and,
+(5) properties to link entities that refer to the same thing;
(6) collections forming a logical structure for its members.
</p>
<p>To provide examples of the PROV data model, the PROV notation (PROV-N) is introduced: aimed at human consumption, PROV-N allows serializations of PROV
@@ -451,8 +453,7 @@
<caption id="namespace-table">Table 1: Prefix and Namespaces used in this specification</caption>
<tr><td><a><b>prefix</b></a></td><td><b>namespace uri</b></td> <td><b>definition</b></td></tr>
<tr><td><a>prov</a></td><td>http://www.w3.org/ns/prov#</td><td>The PROV namespace (see Section <a href="#expression-NamespaceDeclaration">4.7.1</a>)</td></tr>
-<tr><td><a>xsd</a></td><td>http://www.w3.org/2000/10/XMLSchema#</td><td>XML Schema Namespace [[!XMLSCHEMA-2]]</td></tr>
-<tr><td><a>rdf</a></td><td>http://www.w3.org/1999/02/22-rdf-syntax-ns#</td><td>The RDF namespace [[!RDF-CONCEPTS]]</td></tr>
+<tr><td><a>xsd</a></td><td>http://www.w3.org/2000/10/XMLSchema#</td><td>XML Schema Namespace [[!XMLSCHEMA11-2]]</td></tr>
<tr><td><a>(others)</a></td><td>(various)</td><td>All other namespace prefixes are used in examples only. <br/> In particular, URIs starting with "http://example.com" represent<br/> some application-dependent URI [[!URI]]</td></tr>
</table>
</div>
@@ -1349,37 +1350,16 @@
-<!--
-<div class="grammar">
-<span class="nonterminal">revisionExpression</span> ::=
-<span class="name">wasRevisionOf</span>
-<span class="name">(</span>
-<span class="optional">( <span class="nonterminal">identifier</span> | <span class="name">-</span> ) <span class="name">,</span> </span>
-<span class="nonterminal">eIdentifier</span>
-<span class="name">,</span>
-<span class="nonterminal">eIdentifier</span>
-<span class="name">,</span>
-( <span class="nonterminal">agIdentifier</span> | <span class="name">-</span> )
-<span class="nonterminal">optional-attribute-values</span>
-<span class="name">)</span>
-</div>
--->
-<!--
-<table class="grammar">
-
-<tbody class="grammar-ref" data-ref="prod-revisionExpression"></tbody>
-
-</table>
-
--->
<div class="anexample">
<pre class="codeexample">
-wasDerivedFrom(d, e2, e1, a, g2, u1, [prov:type="prov:WasRevisionOf", ex:comment="a righteous derivation"])
+wasDerivedFrom(d; e2, e1, a, g2, u1,
+ [prov:type='prov:Revision',
+ ex:comment="a righteous derivation"])
</pre>
<p>Here, the derivation from
<a href="#anexample-derivation" class="anexample-ref"><span>Example REF</span></a>
-is extended with a <span class="name">prov:type</span> attribute and value <span class="name">prov:WasRevisionOf</span>.
+is extended with a <span class="name">prov:type</span> attribute and value <span class="name">prov:Revision</span>.
</div>
@@ -1389,128 +1369,38 @@
-<!--
-<div class="grammar">
-<span class="nonterminal">quotationExpression</span> ::=
-<span class="name">wasQuotedFrom</span>
-<span class="name">(</span>
-<span class="optional">( <span class="nonterminal">identifier</span> | <span class="name">-</span> ) <span class="name">,</span> </span>
-<span class="nonterminal">eIdentifier</span>
-<span class="name">,</span>
-<span class="nonterminal">eIdentifier</span>
-<span class="optional">
-<span class="name">,</span>
-( <span class="nonterminal">agIdentifier</span> | <span class="name">-</span> )
-<span class="name">,</span>
-( <span class="nonterminal">agIdentifier</span> | <span class="name">-</span> )
-</span>
-<span class="nonterminal">optional-attribute-values</span>
-<span class="name">)</span>
-</div>
-
-
-<table class="grammar">
-
-<tbody class="grammar-ref" data-ref="prod-quotationExpression"></tbody>
-
-</table>
--->
+
<div class="anexample">
<pre class="codeexample">
-wasDerivedFrom(quoteId1; ex:blockQuote,ex:blog, ex:act1, ex:g, ex:u, [ prov:type='prov:WasQuotedFrom' ])
- </pre>
-
-<p>Here, the derivation is provided with a <span class="name">prov:type</span> attribute and value <span class="name">prov:WasQuotedFrom</span>.
-</div>
-
-<!--
-<div class="anexample">
- <pre class="codeexample">
-wasQuotedFrom(quoteId1; ex:blockQuote,ex:blog, ex:act1, ex:g, ex:u, [])
+wasDerivedFrom(quoteId1; ex:blockQuote,ex:blog, ex:act1, ex:g, ex:u,
+ [ prov:type='prov:Quotation' ])
</pre>
-<p> Here
- <span class="name">quoteId1</span> is the optional revision identifier,
- <span class="name">ex:blockQuote</span> is the identifier of the entity that represents the quote (the partial copy)
- <span class="name">ex:blog</span> is the identifier of the original entity being quoted,
- <span class="name">ex:act1</span> is the identifier for the activity using and generating <span class="name">ex:blockQuote</span> and <span class="name">ex:blog</span>,
- <span class="name">ex:g</span> is the identifier for the generation involving the quoted entity <span class="name">ex:blockQuote</span> and activity <span class="name">ex:act1</span>;
- <span class="name">ex:u</span> is the identifier for the usage involving the original entity <span class="name">ex:blog</span> and activity <span class="name">ex:act1</span>,
- and <span class="name">[]</span> is the (empty) optional set of attributes. </p>
-The remaining examples show cases where some of the optionals are omitted.
-
-
- <pre class="codeexample">
-wasQuotedFrom(ex:blockQuote,ex:blog)
-wasQuotedFrom(ex:blockQuote,ex:blog, ex:act1, -,-)
-wasQuotedFrom(ex:blockQuote,ex:blog,-,ex:g, ex:u)
-wasQuotedFrom(ex:blockQuote,ex:blog,[])
-wasQuotedFrom(id; ex:blockQuote,ex:blog,ex:act1, -,-)
-</pre>
+
+<p>Here, the derivation is provided with a <span class="name">prov:type</span> attribute and value <span class="name">prov:Quotation</span>.
</div>
--->
+
+
</section> <!-- end quotation -->
<section id="expression-original-source">
-<h4>Original Source</h4>
-
-
-
-<!--
-<div class="grammar">
-<span class="nonterminal">originalSourceExpression</span> ::=
-<span class="name">hadOriginalSource</span>
-<span class="name">(</span>
-<span class="optional">( <span class="nonterminal">identifier</span> | <span class="name">-</span> ) <span class="name">,</span> </span>
-<span class="nonterminal">eIdentifier</span>
-<span class="name">,</span>
-<span class="nonterminal">eIdentifier</span>
-<span class="nonterminal">optional-attribute-values</span>
-<span class="name">)</span>
-</div>
-
-
-<table class="grammar">
-
-<tbody class="grammar-ref" data-ref="prod-hadOriginalSourceExpression"></tbody>
-
-</table>
--->
+<h4>Primary Source</h4>
+
+
+
<div class="anexample">
<pre class="codeexample">
-wasDerivedFrom(src1; ex:e1, ex:e2, ex:act, ex:g, ex:u, [ prove:type='prov:HadOriginalSource' ])
+wasDerivedFrom(src1; ex:e1, ex:e2, ex:act, ex:g, ex:u,
+ [ prove:type='prov:PrimarySource' ])
</pre>
-<p>Here, the derivation is provided with a <span class="name">prov:type</span> attribute and value <span class="name">prov:HadOriginalSource</span>.
+<p>Here, the derivation is provided with a <span class="name">prov:type</span> attribute and value <span class="name">prov:PrimarySource</span>.
</pre>
</div>
-<!--
-<div class="anexample">
- <pre class="codeexample">
-hadOriginalSource(src1; ex:e1, ex:e2, ex:act, ex:g, ex:u, [ex:param="a"])
- </pre>
-<p> Here
- <span class="name">src1</span> is the optional original source identifier,
- <span class="name">ex:e1</span> is the identifier of the derived entity,
- <span class="name">ex:e2</span> is the identifier of the original source entity,
- <span class="name">ex:act1</span> is the identifier for the activity using and generating <span class="name">ex:e1</span> and <span class="name">ex:e2</span>,
- <span class="name">ex:g</span> is the identifier for the generation involving the quoted entity <span class="name">ex:e1</span> and activity <span class="name">ex:act1</span>;
- <span class="name">ex:u</span> is the identifier for the usage involving the original entity <span class="name">ex:e2</span> and activity <span class="name">ex:act1</span>,
- and <span class="name">[ex:param="a"]</span> is the optional set of attributes. </p>
-The remaining examples show cases where some of the optionals are omitted.
-
-
- <pre class="codeexample">
-hadOriginalSource(ex:e1, ex:e2)
-hadOriginalSource(ex:e1, ex:e2,[ex:param="a"])
-hadOriginalSource(id; ex:e1, ex:e2, ex:act, -, -, [ex:param="a"])
-</pre>
-</div>
--->
-
-</section> <!-- end original source -->
+
+</section> <!-- end primary source -->
</section>
@@ -1780,7 +1670,7 @@
</table>
-<p>The following table summarizes how each constituent of a PROV-DM Trace maps to a non-terminal.</p>
+<p>The following table summarizes how each constituent of a PROV-DM Influence maps to a non-terminal.</p>
<div style="text-align: left; ">
<table class="thinborder" style="margin-left: auto; margin-right: auto;">
<tr><td><b>Trace</b></td><td><b>Non-Terminal</b></td></tr>
@@ -1790,7 +1680,6 @@
<tr><td><a href="http://www.w3.org/TR/prov-dm/#trace.entity"><span class='attribute' id="trace.entity">entity</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
-
<tr><td><a href="http://www.w3.org/TR/prov-dm/#trace.ancestor"><span class='attribute' id="trace.ancestor">ancestor</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></code></td></tr>
<tr><td><a href="http://www.w3.org/TR/prov-dm/#trace.attributes"><span class='attribute' id="trace.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
@@ -2354,7 +2243,7 @@
<tbody class="grammar-ref" data-ref="prod-QUALIFIED_NAME_LITERAL"></tbody>
</table>
-<p>In production <code class="content"><a class="grammarRef" href="#prod-datatype">prod-datatype</a></code>, the <code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></code> is used to denote a <a href="http://www.w3.org/TR/prov-dm/#term-value">PROV data type</a> [[PROV-DM]].
+<p>In production <code class="content"><a class="grammarRef" href="#prod-datatype">datatype</a></code>, the <code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></code> is used to denote a <a href="http://www.w3.org/TR/prov-dm/#term-value">PROV data type</a> [[PROV-DM]].
<p>The non terminals
@@ -2406,15 +2295,14 @@
<ol>
<li> <span class="name">prov:Bundle</span>
<li> <span class="name">prov:Collection</span>
-<li> <span class="name">prov:Dictionary</span>
-<li> <span class="name">prov:EmptyDictionary</span>
-<li> <span class="name">prov:HadOriginalSource</span>
+<li> <span class="name">prov:EmptyCollection</span>
<li> <span class="name">prov:Organization</span>
<li> <span class="name">prov:Person</span>
<li> <span class="name">prov:Plan</span>
+<li> <span class="name">prov:PrimarySource</span>
+<li> <span class="name">prov:Quotation</span>
+<li> <span class="name">prov:Revision</span>
<li> <span class="name">prov:SoftwareAgent</span>
-<li> <span class="name">prov:WasQuotedFrom</span>
-<li> <span class="name">prov:WasRevisionOf</span>
</ol>
<div class="anexample" id="anexample-types">
@@ -2432,7 +2320,7 @@
<section id="expression-Time">
<h4>Time Values</h4>
-<p><dfn id="dfn-time">Time instants</dfn> are defined according to xsd:dateTime [[!XMLSCHEMA-2]].</p>
+<p><dfn id="dfn-time">Time instants</dfn> are defined according to xsd:dateTime [[!XMLSCHEMA11-2]].</p>
<table class="grammar">
<tbody class="grammar-ref" data-ref="prod-time"></tbody>
@@ -2465,17 +2353,6 @@
<section id="expression-NamespaceDeclaration">
<h3>Namespace Declaration</h3>
-<!--
-<div class='grammar'>
-<span class="nonterminal">namespaceDeclarations</span> ::=
- | <span class="group"><span class="nonterminal">defaultNamespaceDeclaration</span> | <span class="nonterminal">namespaceDeclaration</span></span> <span class="star"> <span
-class="nonterminal">namespaceDeclaration</span></span><br>
-<span class="nonterminal">namespaceDeclaration</span> ::=
-<span class="name">prefix</span> <span class="nonterminal">prefix</span> <span class="nonterminal">IRI</span><br/>
-<span class="nonterminal">defaultNamespaceDeclaration</span> ::=
- <span class="name">default</span> <span class="nonterminal">IRI</span> <br/>
-</div>
--->
<table class="grammar">
@@ -2486,6 +2363,10 @@
</table>
+<p>A <a class="grammarRef" href="#prod-namespaceDeclaration">namespaceDeclaration</a> consists of a binding between a prefix and a namespace. Every qualified name with this prefix in the scope of this declaration refers to this namespace. The scope of a namespace declaration is the <a class="grammarRef" href="#prod-namedBundle">namedBundle</a> or <a class="grammarRef" href="#prod-bundle">toplevel bundle</a> in which it directly occurs.</p>
+
+
+
<p>In PROV-N, the following prefixes are reserved:
<ul>
@@ -2772,7 +2653,7 @@
<h2>Acknowledgements</h2>
<p>
-This document has been produced by the PROV Working Group, and its contents reflect extensive discussion within the Working Group as a whole. The editors extend special thanks to Sandro Hawke (W3C/MIT), Ivan Herman (W3C/ERCIM), Tom Baker for their thoroguh reviews
+This document has been produced by the PROV Working Group, and its contents reflect extensive discussion within the Working Group as a whole.
</p>
<p>