--- a/model/grammar/Makefile	Thu Jun 14 10:33:54 2012 +0100
+++ b/model/grammar/Makefile	Thu Jun 14 11:00:20 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" | 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 $(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-ECHAR/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rECHAR/g"  | sed -e "s/\d035prod-UCHAR/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rUCHAR/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	Thu Jun 14 10:33:54 2012 +0100
+++ b/model/grammar/ll.js	Thu Jun 14 11:00:20 2012 +0100
@@ -571,7 +571,7 @@
 '<td><a id="prod-IRI_REF" name="prod-IRI_REF"></a>[<span class="prodNo">63</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td>&lt;<code class="production term">IRI_REF</code>&gt;</td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
-'<td><code class="content">"&lt;" ( [^&lt;&gt;\"{}|^`\\] - [#0000- ] | <span class="prod"><a class="grammarRef" href="#prod-UCHAR">UCHAR</a></span> )* "&gt;"</code></td> ' + 
+'<td><code class="content">"&lt;" ( [^&lt;&gt;\"{}|^`\\] - [#0000- ] | <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rUCHAR">UCHAR</a></span> )* "&gt;"</code></td> ' + 
 '</tr> ' + 
 '</tbody> ' + 
 ' ' + 
@@ -580,7 +580,7 @@
 '<td><a id="prod-STRING_LITERAL" name="prod-STRING_LITERAL"></a>[<span class="prodNo">64</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td>&lt;<code class="production term">STRING_LITERAL</code>&gt;</td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
-'<td><code class="content">\'"\' ( ( [^\"\\\n\r] ) | <span class="prod"><a class="grammarRef" href="#prod-ECHAR">ECHAR</a></span> | <span class="prod"><a class="grammarRef" href="#prod-UCHAR">UCHAR</a></span> )* \'"\'</code></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="http://www.w3.org/TR/rdf-sparql-query/#rUCHAR">UCHAR</a></span> )* \'"\'</code></td> ' + 
 '</tr> ' + 
 '</tbody> ' + 
 ' ' + 

--- a/model/releases/ED-prov-n-20120614/prov-n.html	Thu Jun 14 10:33:54 2012 +0100
+++ b/model/releases/ED-prov-n-20120614/prov-n.html	Thu Jun 14 11:00:20 2012 +0100
@@ -2520,7 +2520,7 @@
 <tbody class="prod"> <tr valign="baseline"> <td><a id="prod-namespaceDeclaration" name="prod-namespaceDeclaration"></a>[<span class="prodNo">55</span>]&nbsp;&nbsp;&nbsp;</td> <td><code class="production prod">namespaceDeclaration</code></td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">"prefix" <span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></span> <span class="prod"><a class="grammarRef" href="#prod-namespace">namespace</a></span></code></td> </tr> </tbody>
 <tbody class="prod"> <tr valign="baseline"> <td><a id="prod-namespace" name="prod-namespace"></a>[<span class="prodNo">57</span>]&nbsp;&nbsp;&nbsp;</td> <td><code class="production prod">namespace</code></td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-IRI_REF">IRI_REF</a></span></code></td> </tr> </tbody>
 <tbody class="prod"> <tr valign="baseline"> <td><a id="prod-defaultNamespaceDeclaration" name="prod-defaultNamespaceDeclaration"></a>[<span class="prodNo">56</span>]&nbsp;&nbsp;&nbsp;</td> <td><code class="production prod">defaultNamespaceDeclaration</code></td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">"default" <span class="prod"><a class="grammarRef" href="#prod-IRI_REF">IRI_REF</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">63</span>]&nbsp;&nbsp;&nbsp;</td> <td>&lt;<code class="production term">IRI_REF</code>&gt;</td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">"&lt;" ( [^&lt;&gt;"{}|^`\] - [#0000- ] | <span class="prod"><a class="grammarRef" href="#prod-UCHAR">UCHAR</a></span> )* "&gt;"</code></td> </tr> </tbody>
+<tbody class="term"> <tr valign="baseline"> <td><a id="prod-IRI_REF" name="prod-IRI_REF"></a>[<span class="prodNo">63</span>]&nbsp;&nbsp;&nbsp;</td> <td>&lt;<code class="production term">IRI_REF</code>&gt;</td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">"&lt;" ( [^&lt;&gt;"{}|^`\] - [#0000- ] | <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rUCHAR">UCHAR</a></span> )* "&gt;"</code></td> </tr> </tbody>
 
 </table>
 
@@ -2716,7 +2716,7 @@
 <tbody class="prod"> <tr valign="baseline"> <td><a id="prod-convenienceNotation" name="prod-convenienceNotation"></a>[<span class="prodNo">53</span>]&nbsp;&nbsp;&nbsp;</td> <td><code class="production prod">convenienceNotation</code></td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-STRING_LITERAL">STRING_LITERAL</a></span><br> | <span class="prod"><a class="grammarRef" href="#prod-INT_LITERAL">INT_LITERAL</a></span><br> | <span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME_LITERAL">QUALIFIED_NAME_LITERAL</a></span></code></td> </tr> </tbody>
 <tbody class="term"> <tr valign="baseline"> <td><a id="prod-STRING_LITERAL" name="prod-STRING_LITERAL"></a>[<span class="prodNo">64</span>]&nbsp;&nbsp;&nbsp;</td> <td>&lt;<code class="production term">STRING_LITERAL</code>&gt;</td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">'"' ( ( [^"\
 
-] ) | <span class="prod"><a class="grammarRef" href="#prod-ECHAR">ECHAR</a></span> | <span class="prod"><a class="grammarRef" href="#prod-UCHAR">UCHAR</a></span> )* '"'</code></td> </tr> </tbody>
+] ) | <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="http://www.w3.org/TR/rdf-sparql-query/#rUCHAR">UCHAR</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">65</span>]&nbsp;&nbsp;&nbsp;</td> <td>&lt;<code class="production term">INT_LITERAL</code>&gt;</td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</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">66</span>]&nbsp;&nbsp;&nbsp;</td> <td>&lt;<code class="production term">QUALIFIED_NAME_LITERAL</code>&gt;</td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">"'" <span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></span> "'"</code></td> </tr> </tbody>
 </table>