--- a/model/grammar/Makefile Wed May 16 09:26:42 2012 +0100
+++ b/model/grammar/Makefile Wed May 16 09:43:01 2012 +0100
@@ -34,7 +34,7 @@
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" | sed -e "s/((/(/g" | sed -e "s/))/)/g" | sed -e "s/timeZZ/time/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/((/(/g" | sed -e "s/))/)/g" | sed -e "s/timeZZ/time/g" | sed -e "s/\d035prod-PN_PREFIX/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rPN_LOCAL/g" | sed -e "s/\d035prod-PN_CHARS_U/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rPN_CHARS_U/g" | sed -e "s/\d035prod-PN_CHARS\"/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rPN_CHARS\"/g" > $(IN2.HTML)
@cat $(IN2.HTML) | awk '{ print "'\''" $$0 " '\'' + " }' >> $(OUT.JS)
@echo "' ' ;" >> $(OUT.JS)
--- a/model/grammar/ll.js Wed May 16 09:26:42 2012 +0100
+++ b/model/grammar/ll.js Wed May 16 09:43:01 2012 +0100
@@ -515,8 +515,8 @@
'<td><a id="prod-QUALIFIED_NAME" name="prod-QUALIFIED_NAME"></a>[<span class="prodNo">57</span>] </td> ' +
'<td><<code class="production term">QUALIFIED_NAME</code>></td> ' +
'<td> ::= </td> ' +
-'<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-PN_PREFIX">PN_PREFIX</a></span> ":" )? <span class="prod"><a class="grammarRef" href="#prod-PN_LOCAL">PN_LOCAL</a></span><br/> ' +
-'| <span class="prod"><a class="grammarRef" href="#prod-PN_PREFIX">PN_PREFIX</a></span> ":"</code></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> ":" )? <span class="prod"><a class="grammarRef" href="#prod-PN_LOCAL">PN_LOCAL</a></span><br/> ' +
+'| <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> ' +
' ' +
@@ -525,7 +525,7 @@
'<td><a id="prod-PREFX" name="prod-PREFX"></a>[<span class="prodNo">58</span>] </td> ' +
'<td><<code class="production term">PREFX</code>></td> ' +
'<td> ::= </td> ' +
-'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-PN_PREFIX">PN_PREFIX</a></span></code></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> ' +
' ' +
@@ -678,7 +678,7 @@
'<td><a id="prod-PN_CHARS" name="prod-PN_CHARS"></a>[<span class="prodNo">73</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-PN_CHARS_U">PN_CHARS_U</a></span><br/> ' +
+'<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/> ' +
'| "-"<br/> ' +
'| [0-9]<br/> ' +
'| <br/> ' +
@@ -692,7 +692,7 @@
'<td><a id="prod-PN_PREFIX" name="prod-PN_PREFIX"></a>[<span class="prodNo">74</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="#prod-PN_CHARS">PN_CHARS</a></span> | "." )* <span class="prod"><a class="grammarRef" href="#prod-PN_CHARS">PN_CHARS</a></span> )?</code></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> ' +
'</tr> ' +
'</tbody> ' +
' ' +
@@ -701,7 +701,7 @@
'<td><a id="prod-PN_LOCAL" name="prod-PN_LOCAL"></a>[<span class="prodNo">75</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-PN_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="#prod-PN_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="#prod-PN_CHARS">PN_CHARS</a></span> | <span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ) )?</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> ' +
' ' +
--- a/model/prov-n.html Wed May 16 09:26:42 2012 +0100
+++ b/model/prov-n.html Wed May 16 09:43:01 2012 +0100
@@ -1972,7 +1972,7 @@
</p>
-<p>Qualified names <a class="grammarRef" href="#term-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a> consist of a prefix and a local part. Prefixes follow the production <a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX">PN_PREFIX</a> defined by SPARQL [[!RDF-SPARQL-QUERY]]. Local parts have to be conformant with <a class="grammarRef" href="#term-prov_n_LL-PN_LOCAL">PN_LOCAL</a>, which extends the original SPARQL <a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_LOCAL">PN_LOCAL</a> definition by allowing further characters and %-escaped charaters (see <a class="grammarRef" href="#term-prov_n_LL-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a>).</p>
+<p>Qualified names <a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a> consist of a prefix and a local part. Prefixes follow the production <a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX">PN_PREFIX</a> defined by SPARQL [[!RDF-SPARQL-QUERY]]. Local parts have to be conformant with <a class="grammarRef" href="#prod-PN_LOCAL">PN_LOCAL</a>, which extends the original SPARQL <a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_LOCAL">PN_LOCAL</a> definition by allowing further characters and %-escaped charaters (see <a class="grammarRef" href="#prod-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a>).</p>
<table class="grammar">
@@ -1998,72 +1998,7 @@
</table>
-<!--
-
-<table class="grammar">
-<tbody class="prod">
-<tr valign="baseline">
-<td><a id="prod-prov_n_LL-identifier" name="prod-prov_n_LL-identifier"></a>[<span class="prodNo">31</span>] </td>
-<td><code class="production prod">identifier</code></td>
-<td> ::= </td>
-<td><code class="content"><span class="prod"><a class="grammarRef" href="#term-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-QUALIFIED_NAME" name="term-prov_n_LL-QUALIFIED_NAME"></a>[<span class="prodNo">39</span>] </td>
-<td><<code class="production term">QUALIFIED_NAME</code>></td>
-<td> ::= </td>
-<td><code class="content">( <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX">PN_PREFIX</a></span> ":" )? <span class="prod"><a class="grammarRef" href="#term-prov_n_LL-PN_LOCAL">PN_LOCAL</a></span><br/>
-| <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX">PN_PREFIX</a></span> ":"</code></td>
-</tr>
-</tbody>
-<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">57</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="#term-prov_n_LL-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="#term-prov_n_LL-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="#term-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">58</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="#term-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">59</span>] </td>
-<td><<code class="production term">PERCENT</code>></td>
-<td> ::= </td>
-<td><code class="content">"%" <span class="prod"><a class="grammarRef" href="#term-prov_n_LL-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#term-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">60</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>
-</table>
-
--->
+
<div class="anexample" id="anexample-qualified-name">
<p>Examples of articles on the BBC Web site seen as entities.</p>
@@ -2158,7 +2093,7 @@
<tbody class="grammar-ref" data-ref="prod-literal"></tbody>
<tbody class="grammar-ref" data-ref="prod-typedLiteral"></tbody>
<tbody class="grammar-ref" data-ref="prod-datatype"></tbody>
-<tbody><tr valign="baseline"><td></td><td><em>where <a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a> is listed in Table <a href="#permitted-datatypes">permitted-datatypes</a></em></td></tbody>
+<tbody><tr valign="baseline"><td></td><td></td><td></td><td><em>where</em> <a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a> <em>is listed in Table <a href="#permitted-datatypes">permitted-datatypes</a></em></td></tbody>
<tbody class="grammar-ref" data-ref="prod-convenienceNotation"></tbody>
<tbody class="grammar-ref" data-ref="prod-STRING_LITERAL"></tbody>
<tbody class="grammar-ref" data-ref="prod-INT_LITERAL"></tbody>