--- a/rdf-turtle/index.html Wed Feb 29 18:25:43 2012 +0100
+++ b/rdf-turtle/index.html Wed Feb 29 18:27:34 2012 +0100
@@ -540,94 +540,8 @@
</p>
</section>
- <section id="sec-strings" class="issue">
- <h3><span style="color:red;">REMOVE: </span>String Escape Sequences</h3>
-
- <p>Turtle strings, IRIs and <a href="#term-turtle2-PN_LOCAL">local names</a> can use <code>\</code>-escape sequences to
- represent Unicode code points.</p>
-
- <p class="note">
- Some character escapes are allowed
- in the local part of prefixed names. These are the non-alphanumeric
- characters allowed in an IRI path. The characters are
- <code>~.-!$&'()*+,;=:/?#@%_</code>. It is not necessary to escape
- these characters in strings or IRIs.</p>
-
- <p class="note">The <a href="#term-turtle2-PERCENT"><PERCENT></a> terminal matches %-encoding
- sequences. These sequences are <em>not</em> decoded during processing; a term written as
- <code><http://a.example/%66oo\-bar></code> in Turtle designates the RDF IRI
- <code>http://a.example/%66oo-bar</code>.</p>
-
-
- <p>The following table describes all the escape sequences
- allowed inside a <a href="#prod-turtle2-String">string</a>
- or <a href="#prod-turtle2-IRI_REF">IRI_REF</a>:</p>
-
- <table>
- <thead>
- <tr>
- <th>Escape sequence</th>
-
- <th>Unicode code point</th>
-
- </tr>
- </thead>
- <tbody>
-
- <tr>
- <td>'\u' <a href="#rHEX">hex</a> <a href="#rHEX">hex</a> <a href="#rHEX">hex</a> <a href="#rHEX">hex</a></td>
- <td>A Unicode codepoint in the range U+0 to U+FFFF inclusive
- corresponding to the encoded hexadecimal value.</td>
- </tr>
-
-
- <tr>
- <td>'\U' <a href="#rHEX">hex</a> <a href="#rHEX">hex</a> <a href="#rHEX">hex</a> <a href="#rHEX">hex</a> <a href="#rHEX">hex</a> <a href="#rHEX">hex</a> <a href="#rHEX">hex</a> <a href="#rHEX">hex</a></td>
-
- <td>A Unicode codepoint in the range U+10000 to U+10FFFF inclusive
- corresponding to the encoded hexadecimal value.</td>
- </tr>
-
- <tr>
- <td>'\t'</td>
- <td>U+0009</td>
- </tr>
-
- <tr>
-
- <td>'\n'</td>
- <td>U+000A</td>
- </tr>
-
- <tr>
- <td>'\r'</td>
- <td>U+000D</td>
- </tr>
-
- <tr>
- <td>'\"'<br />
- (inside <a href="#prod-turtle2-String">string</a>)</td>
- <td>U+0022</td>
- </tr>
-
- <tr>
- <td>'\\'</td>
-
- <td>U+005C</td>
- </tr>
-
- </tbody>
- </table>
-
- <p>where <a href="#rHEX">HEX</a> is a hexadecimal character</p>
- <blockquote>
- <p><span style="font-family: monospace; font-size: 85%;"><a id="rHEX">HEX</a>
- ::= [0-9] | [A-F] | [a-f]</span></p>
-
- </blockquote>
- </section>
- <section id="sec-escapes" class="issue">
- <h3><span style="color:red;">ADD: </span>Escape Sequences</h3>
+ <section id="sec-escapes">
+ <h3>Escape Sequences</h3>
<p><span style="font-weight:bold;">IRI</span>s, used as <a href="#prod-turtle2-IRIref">RDF terms</a> or as in <a href="#prod-turtle2-prefixID">@prefix</a> or <a href="#prod-turtle2-base">@base</a> declarations, may include <code>\</code>-escape sequences to represent Unicode code points:</p>
@@ -667,12 +581,10 @@
</blockquote>
<p>
- <a href="#term-turtle2-BLANK_NODE_LABEL"><span style="font-weight:bold;">Blank node label</span>s</a> and <a href="#term-turtle2-PN_LOCAL"><span style="font-weight:bold;">local name</span>s</a> may include:
+ <a href="#term-turtle2-BLANK_NODE_LABEL"><span style="font-weight:bold;">Blank node label</span>s</a> and <a href="#term-turtle2-PN_LOCAL"><span style="font-weight:bold;">local name</span>s</a> may include escaped punctuation. A '\' followed by one of <code>~.-!$&'()*+,;=:/?#@%_</code> represents the character to the right of the '\'.
</p>
- <ul>
- <li>%-encoded sequences. A '%' followed by two hex characters represents that same sequence of three characters. These sequences are <em>not</em> decoded during processing; a term written as <code><http://a.example/%66oo\-bar></code> in Turtle designates the RDF IRI <code>http://a.example/%66oo-bar</code>.</li>
- <li>escaped punctuation: A '\' followed by one of <code>~.-!$&'()*+,;=:/?#@%_</code> represents the character to the right of the '\'.</li>
- </ul>
+
+ <p class="note">%-encoded sequences are in the <a href="#term-turtle2-IRI_REF">character range for IRIs</a> and are <a href="#term-turtle2-PERCENT">explicitly allowed</a> in blank node labels and local names. These appear as a '%' followed by two hex characters and represent that same sequence of three characters. These sequences are <em>not</em> decoded during processing. A term written as <code><http://a.example/%66oo-bar></code> in Turtle designates the RDF IRI <code>http://a.example/%66oo-bar</code> and not RDF IRI <code>http://a.example/foo-bar</code>. A term written as <code>ex:%66oo-bar</code> with a prefix <code>@prefix ex: <http://a.example/></code> also designates the RDF IRI <code>http://a.example/%66oo-bar</code>.</p>
<p>
<a href="#prod-turtle2-String"><span style="font-weight:bold;">String</span>s</a> may include the <code>\</code>-escape sequences allowed in IRIs, as well as the the following escape sequences, which also map to Unicode code points:</p>
--- a/rdf-turtle/turtle-bnf.html Wed Feb 29 18:25:43 2012 +0100
+++ b/rdf-turtle/turtle-bnf.html Wed Feb 29 18:27:34 2012 +0100
@@ -41,7 +41,7 @@
<td><code class="production prod">prefixID</code></td>
<td> ::= </td>
-<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-turtle2-PREFIX">PREFIX</a></span> <span class="prod"><a class="grammarRef" href="#prod-turtle2-PNAME_NS">PNAME_NS</a></span> <span class="prod"><a class="grammarRef" href="#prod-turtle2-IRI_REF">IRI_REF</a></span></code></td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#term-turtle2-PREFIX">PREFIX</a></span> <span class="prod"><a class="grammarRef" href="#term-turtle2-PNAME_NS">PNAME_NS</a></span> <span class="prod"><a class="grammarRef" href="#term-turtle2-IRI_REF">IRI_REF</a></span></code></td>
</tr>
</tbody>
@@ -51,7 +51,7 @@
<td><code class="production prod">base</code></td>
<td> ::= </td>
-<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-turtle2-BASE">BASE</a></span> <span class="prod"><a class="grammarRef" href="#prod-turtle2-IRI_REF">IRI_REF</a></span></code></td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#term-turtle2-BASE">BASE</a></span> <span class="prod"><a class="grammarRef" href="#term-turtle2-IRI_REF">IRI_REF</a></span></code></td>
</tr>
</tbody>
@@ -179,7 +179,7 @@
<td><code class="production prod">RDFLiteral</code></td>
<td> ::= </td>
-<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-turtle2-String">String</a></span> (( <span class="prod"><a class="grammarRef" href="#prod-turtle2-LANGTAG">LANGTAG</a></span> | ( "^^" <span class="prod"><a class="grammarRef" href="#prod-turtle2-IRIref">IRIref</a></span> ) ))?</code></td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-turtle2-String">String</a></span> (( <span class="prod"><a class="grammarRef" href="#term-turtle2-LANGTAG">LANGTAG</a></span> | ( "^^" <span class="prod"><a class="grammarRef" href="#prod-turtle2-IRIref">IRIref</a></span> ) ))?</code></td>
</tr>
</tbody>
@@ -201,10 +201,10 @@
<td><a id="prod-turtle2-NumericLiteralUnsigned" name="prod-turtle2-NumericLiteralUnsigned"></a>[<span class="prodNo">19</span>] </td>
<td><code class="production prod">NumericLiteralUnsigned</code></td>
<td> ::= </td>
-<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-turtle2-INTEGER">INTEGER</a></span><br/>
-| <span class="prod"><a class="grammarRef" href="#prod-turtle2-DECIMAL">DECIMAL</a></span><br/>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#term-turtle2-INTEGER">INTEGER</a></span><br/>
+| <span class="prod"><a class="grammarRef" href="#term-turtle2-DECIMAL">DECIMAL</a></span><br/>
-| <span class="prod"><a class="grammarRef" href="#prod-turtle2-DOUBLE">DOUBLE</a></span></code></td>
+| <span class="prod"><a class="grammarRef" href="#term-turtle2-DOUBLE">DOUBLE</a></span></code></td>
</tr>
</tbody>
@@ -213,10 +213,10 @@
<td><a id="prod-turtle2-NumericLiteralPositive" name="prod-turtle2-NumericLiteralPositive"></a>[<span class="prodNo">20</span>] </td>
<td><code class="production prod">NumericLiteralPositive</code></td>
<td> ::= </td>
-<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-turtle2-INTEGER_POSITIVE">INTEGER_POSITIVE</a></span><br/>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#term-turtle2-INTEGER_POSITIVE">INTEGER_POSITIVE</a></span><br/>
-| <span class="prod"><a class="grammarRef" href="#prod-turtle2-DECIMAL_POSITIVE">DECIMAL_POSITIVE</a></span><br/>
-| <span class="prod"><a class="grammarRef" href="#prod-turtle2-DOUBLE_POSITIVE">DOUBLE_POSITIVE</a></span></code></td>
+| <span class="prod"><a class="grammarRef" href="#term-turtle2-DECIMAL_POSITIVE">DECIMAL_POSITIVE</a></span><br/>
+| <span class="prod"><a class="grammarRef" href="#term-turtle2-DOUBLE_POSITIVE">DOUBLE_POSITIVE</a></span></code></td>
</tr>
</tbody>
@@ -226,9 +226,9 @@
<td><code class="production prod">NumericLiteralNegative</code></td>
<td> ::= </td>
-<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-turtle2-INTEGER_NEGATIVE">INTEGER_NEGATIVE</a></span><br/>
-| <span class="prod"><a class="grammarRef" href="#prod-turtle2-DECIMAL_NEGATIVE">DECIMAL_NEGATIVE</a></span><br/>
-| <span class="prod"><a class="grammarRef" href="#prod-turtle2-DOUBLE_NEGATIVE">DOUBLE_NEGATIVE</a></span></code></td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#term-turtle2-INTEGER_NEGATIVE">INTEGER_NEGATIVE</a></span><br/>
+| <span class="prod"><a class="grammarRef" href="#term-turtle2-DECIMAL_NEGATIVE">DECIMAL_NEGATIVE</a></span><br/>
+| <span class="prod"><a class="grammarRef" href="#term-turtle2-DOUBLE_NEGATIVE">DOUBLE_NEGATIVE</a></span></code></td>
</tr>
</tbody>
@@ -249,10 +249,10 @@
<td><code class="production prod">String</code></td>
<td> ::= </td>
-<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-turtle2-STRING_LITERAL1">STRING_LITERAL1</a></span><br/>
-| <span class="prod"><a class="grammarRef" href="#prod-turtle2-STRING_LITERAL2">STRING_LITERAL2</a></span><br/>
-| <span class="prod"><a class="grammarRef" href="#prod-turtle2-STRING_LITERAL_LONG1">STRING_LITERAL_LONG1</a></span><br/>
-| <span class="prod"><a class="grammarRef" href="#prod-turtle2-STRING_LITERAL_LONG2">STRING_LITERAL_LONG2</a></span></code></td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#term-turtle2-STRING_LITERAL1">STRING_LITERAL1</a></span><br/>
+| <span class="prod"><a class="grammarRef" href="#term-turtle2-STRING_LITERAL2">STRING_LITERAL2</a></span><br/>
+| <span class="prod"><a class="grammarRef" href="#term-turtle2-STRING_LITERAL_LONG1">STRING_LITERAL_LONG1</a></span><br/>
+| <span class="prod"><a class="grammarRef" href="#term-turtle2-STRING_LITERAL_LONG2">STRING_LITERAL_LONG2</a></span></code></td>
</tr>
</tbody>
@@ -261,7 +261,7 @@
<td><a id="prod-turtle2-IRIref" name="prod-turtle2-IRIref"></a>[<span class="prodNo">24</span>] </td>
<td><code class="production prod">IRIref</code></td>
<td> ::= </td>
-<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-turtle2-IRI_REF">IRI_REF</a></span><br/>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#term-turtle2-IRI_REF">IRI_REF</a></span><br/>
| <span class="prod"><a class="grammarRef" href="#prod-turtle2-PrefixedName">PrefixedName</a></span></code></td>
</tr>
@@ -272,8 +272,8 @@
<td><a id="prod-turtle2-PrefixedName" name="prod-turtle2-PrefixedName"></a>[<span class="prodNo">25</span>] </td>
<td><code class="production prod">PrefixedName</code></td>
<td> ::= </td>
-<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-turtle2-PNAME_LN">PNAME_LN</a></span><br/>
-| <span class="prod"><a class="grammarRef" href="#prod-turtle2-PNAME_NS">PNAME_NS</a></span></code></td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#term-turtle2-PNAME_LN">PNAME_LN</a></span><br/>
+| <span class="prod"><a class="grammarRef" href="#term-turtle2-PNAME_NS">PNAME_NS</a></span></code></td>
</tr>
</tbody>
@@ -283,8 +283,8 @@
<td><a id="prod-turtle2-BlankNode" name="prod-turtle2-BlankNode"></a>[<span class="prodNo">26</span>] </td>
<td><code class="production prod">BlankNode</code></td>
<td> ::= </td>
-<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-turtle2-BLANK_NODE_LABEL">BLANK_NODE_LABEL</a></span><br/>
-| <span class="prod"><a class="grammarRef" href="#prod-turtle2-ANON">ANON</a></span></code></td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#term-turtle2-BLANK_NODE_LABEL">BLANK_NODE_LABEL</a></span><br/>
+| <span class="prod"><a class="grammarRef" href="#term-turtle2-ANON">ANON</a></span></code></td>
</tr>
</tbody>
@@ -313,7 +313,7 @@
<td><a id="term-turtle2-IRI_REF" name="term-turtle2-IRI_REF"></a>[<span class="prodNo">29</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-turtle2-UCHAR">UCHAR</a></span> ))* ">"</code></td>
+<td><code class="content">"<" (( [^<>\"{}|^`\\] - [#0000- ] | <span class="prod"><a class="grammarRef" href="#term-turtle2-UCHAR">UCHAR</a></span> ))* ">"</code></td>
</tr>
</tbody>
@@ -323,7 +323,7 @@
<td><a id="term-turtle2-PNAME_NS" name="term-turtle2-PNAME_NS"></a>[<span class="prodNo">30</span>] </td>
<td><<code class="production term">PNAME_NS</code>></td>
<td> ::= </td>
-<td><code class="content">(( <span class="prod"><a class="grammarRef" href="#prod-turtle2-PN_PREFIX">PN_PREFIX</a></span> ))? ":"</code></td>
+<td><code class="content">(( <span class="prod"><a class="grammarRef" href="#term-turtle2-PN_PREFIX">PN_PREFIX</a></span> ))? ":"</code></td>
</tr>
</tbody>
@@ -333,7 +333,7 @@
<td><a id="term-turtle2-PNAME_LN" name="term-turtle2-PNAME_LN"></a>[<span class="prodNo">31</span>] </td>
<td><<code class="production term">PNAME_LN</code>></td>
<td> ::= </td>
-<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-turtle2-PNAME_NS">PNAME_NS</a></span> <span class="prod"><a class="grammarRef" href="#prod-turtle2-PN_LOCAL">PN_LOCAL</a></span></code></td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#term-turtle2-PNAME_NS">PNAME_NS</a></span> <span class="prod"><a class="grammarRef" href="#term-turtle2-PN_LOCAL">PN_LOCAL</a></span></code></td>
</tr>
</tbody>
@@ -343,7 +343,7 @@
<td><a id="term-turtle2-BLANK_NODE_LABEL" name="term-turtle2-BLANK_NODE_LABEL"></a>[<span class="prodNo">32</span>] </td>
<td><<code class="production term">BLANK_NODE_LABEL</code>></td>
<td> ::= </td>
-<td><code class="content">"_:" <span class="prod"><a class="grammarRef" href="#prod-turtle2-PN_LOCAL">PN_LOCAL</a></span></code></td>
+<td><code class="content">"_:" <span class="prod"><a class="grammarRef" href="#term-turtle2-PN_LOCAL">PN_LOCAL</a></span></code></td>
</tr>
</tbody>
@@ -353,8 +353,8 @@
<td><a id="term-turtle2-LANGTAG" name="term-turtle2-LANGTAG"></a>[<span class="prodNo">33</span>] </td>
<td><<code class="production term">LANGTAG</code>></td>
<td> ::= </td>
-<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-turtle2-BASE">BASE</a></span><br/>
-| <span class="prod"><a class="grammarRef" href="#prod-turtle2-PREFIX">PREFIX</a></span><br/>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#term-turtle2-BASE">BASE</a></span><br/>
+| <span class="prod"><a class="grammarRef" href="#term-turtle2-PREFIX">PREFIX</a></span><br/>
| "@" ([a-zA-Z])+ (( "-" ([a-zA-Z0-9])+ ))*</code></td>
</tr>
@@ -386,10 +386,10 @@
<td><a id="term-turtle2-DOUBLE" name="term-turtle2-DOUBLE"></a>[<span class="prodNo">36</span>] </td>
<td><<code class="production term">DOUBLE</code>></td>
<td> ::= </td>
-<td><code class="content">([0-9])+ "." ([0-9])+ <span class="prod"><a class="grammarRef" href="#prod-turtle2-EXPONENT">EXPONENT</a></span><br/>
-| "." (( [0-9] ))+ <span class="prod"><a class="grammarRef" href="#prod-turtle2-EXPONENT">EXPONENT</a></span><br/>
+<td><code class="content">([0-9])+ "." ([0-9])+ <span class="prod"><a class="grammarRef" href="#term-turtle2-EXPONENT">EXPONENT</a></span><br/>
+| "." (( [0-9] ))+ <span class="prod"><a class="grammarRef" href="#term-turtle2-EXPONENT">EXPONENT</a></span><br/>
-| (( [0-9] ))+ <span class="prod"><a class="grammarRef" href="#prod-turtle2-EXPONENT">EXPONENT</a></span></code></td>
+| (( [0-9] ))+ <span class="prod"><a class="grammarRef" href="#term-turtle2-EXPONENT">EXPONENT</a></span></code></td>
</tr>
</tbody>
@@ -398,7 +398,7 @@
<td><a id="term-turtle2-INTEGER_POSITIVE" name="term-turtle2-INTEGER_POSITIVE"></a>[<span class="prodNo">37</span>] </td>
<td><<code class="production term">INTEGER_POSITIVE</code>></td>
<td> ::= </td>
-<td><code class="content">"+" <span class="prod"><a class="grammarRef" href="#prod-turtle2-INTEGER">INTEGER</a></span></code></td>
+<td><code class="content">"+" <span class="prod"><a class="grammarRef" href="#term-turtle2-INTEGER">INTEGER</a></span></code></td>
</tr>
</tbody>
@@ -408,7 +408,7 @@
<td><a id="term-turtle2-DECIMAL_POSITIVE" name="term-turtle2-DECIMAL_POSITIVE"></a>[<span class="prodNo">38</span>] </td>
<td><<code class="production term">DECIMAL_POSITIVE</code>></td>
<td> ::= </td>
-<td><code class="content">"+" <span class="prod"><a class="grammarRef" href="#prod-turtle2-DECIMAL">DECIMAL</a></span></code></td>
+<td><code class="content">"+" <span class="prod"><a class="grammarRef" href="#term-turtle2-DECIMAL">DECIMAL</a></span></code></td>
</tr>
</tbody>
@@ -418,7 +418,7 @@
<td><a id="term-turtle2-DOUBLE_POSITIVE" name="term-turtle2-DOUBLE_POSITIVE"></a>[<span class="prodNo">39</span>] </td>
<td><<code class="production term">DOUBLE_POSITIVE</code>></td>
<td> ::= </td>
-<td><code class="content">"+" <span class="prod"><a class="grammarRef" href="#prod-turtle2-DOUBLE">DOUBLE</a></span></code></td>
+<td><code class="content">"+" <span class="prod"><a class="grammarRef" href="#term-turtle2-DOUBLE">DOUBLE</a></span></code></td>
</tr>
</tbody>
@@ -427,7 +427,7 @@
<td><a id="term-turtle2-INTEGER_NEGATIVE" name="term-turtle2-INTEGER_NEGATIVE"></a>[<span class="prodNo">40</span>] </td>
<td><<code class="production term">INTEGER_NEGATIVE</code>></td>
<td> ::= </td>
-<td><code class="content">"-" <span class="prod"><a class="grammarRef" href="#prod-turtle2-INTEGER">INTEGER</a></span></code></td>
+<td><code class="content">"-" <span class="prod"><a class="grammarRef" href="#term-turtle2-INTEGER">INTEGER</a></span></code></td>
</tr>
</tbody>
@@ -436,7 +436,7 @@
<td><a id="term-turtle2-DECIMAL_NEGATIVE" name="term-turtle2-DECIMAL_NEGATIVE"></a>[<span class="prodNo">41</span>] </td>
<td><<code class="production term">DECIMAL_NEGATIVE</code>></td>
<td> ::= </td>
-<td><code class="content">"-" <span class="prod"><a class="grammarRef" href="#prod-turtle2-DECIMAL">DECIMAL</a></span></code></td>
+<td><code class="content">"-" <span class="prod"><a class="grammarRef" href="#term-turtle2-DECIMAL">DECIMAL</a></span></code></td>
</tr>
</tbody>
@@ -446,7 +446,7 @@
<td><a id="term-turtle2-DOUBLE_NEGATIVE" name="term-turtle2-DOUBLE_NEGATIVE"></a>[<span class="prodNo">42</span>] </td>
<td><<code class="production term">DOUBLE_NEGATIVE</code>></td>
<td> ::= </td>
-<td><code class="content">"-" <span class="prod"><a class="grammarRef" href="#prod-turtle2-DOUBLE">DOUBLE</a></span></code></td>
+<td><code class="content">"-" <span class="prod"><a class="grammarRef" href="#term-turtle2-DOUBLE">DOUBLE</a></span></code></td>
</tr>
</tbody>
@@ -466,7 +466,7 @@
<td><<code class="production term">STRING_LITERAL1</code>></td>
<td> ::= </td>
-<td><code class="content">"'" (( ( [^'\\\n\r] ) | <span class="prod"><a class="grammarRef" href="#prod-turtle2-ECHAR">ECHAR</a></span> | <span class="prod"><a class="grammarRef" href="#prod-turtle2-UCHAR">UCHAR</a></span> ))* "'"</code></td>
+<td><code class="content">"'" (( ( [^'\\\n\r] ) | <span class="prod"><a class="grammarRef" href="#term-turtle2-ECHAR">ECHAR</a></span> | <span class="prod"><a class="grammarRef" href="#term-turtle2-UCHAR">UCHAR</a></span> ))* "'"</code></td>
</tr>
</tbody>
@@ -476,7 +476,7 @@
<td><a id="term-turtle2-STRING_LITERAL2" name="term-turtle2-STRING_LITERAL2"></a>[<span class="prodNo">45</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-turtle2-ECHAR">ECHAR</a></span> | <span class="prod"><a class="grammarRef" href="#prod-turtle2-UCHAR">UCHAR</a></span> ))* '"'</code></td>
+<td><code class="content">'"' (( ( [^\"\\\n\r] ) | <span class="prod"><a class="grammarRef" href="#term-turtle2-ECHAR">ECHAR</a></span> | <span class="prod"><a class="grammarRef" href="#term-turtle2-UCHAR">UCHAR</a></span> ))* '"'</code></td>
</tr>
</tbody>
@@ -486,7 +486,7 @@
<td><a id="term-turtle2-STRING_LITERAL_LONG1" name="term-turtle2-STRING_LITERAL_LONG1"></a>[<span class="prodNo">46</span>] </td>
<td><<code class="production term">STRING_LITERAL_LONG1</code>></td>
<td> ::= </td>
-<td><code class="content">"'''" (( (( "'" | "''" ))? ( [^'\\] | <span class="prod"><a class="grammarRef" href="#prod-turtle2-ECHAR">ECHAR</a></span> | <span class="prod"><a class="grammarRef" href="#prod-turtle2-UCHAR">UCHAR</a></span> ) ))* "'''"</code></td>
+<td><code class="content">"'''" (( (( "'" | "''" ))? ( [^'\\] | <span class="prod"><a class="grammarRef" href="#term-turtle2-ECHAR">ECHAR</a></span> | <span class="prod"><a class="grammarRef" href="#term-turtle2-UCHAR">UCHAR</a></span> ) ))* "'''"</code></td>
</tr>
</tbody>
@@ -496,7 +496,7 @@
<td><a id="term-turtle2-STRING_LITERAL_LONG2" name="term-turtle2-STRING_LITERAL_LONG2"></a>[<span class="prodNo">47</span>] </td>
<td><<code class="production term">STRING_LITERAL_LONG2</code>></td>
<td> ::= </td>
-<td><code class="content">'"""' (( (( '"' | '""' ))? ( [^\"\\] | <span class="prod"><a class="grammarRef" href="#prod-turtle2-ECHAR">ECHAR</a></span> | <span class="prod"><a class="grammarRef" href="#prod-turtle2-UCHAR">UCHAR</a></span> ) ))* '"""'</code></td>
+<td><code class="content">'"""' (( (( '"' | '""' ))? ( [^\"\\] | <span class="prod"><a class="grammarRef" href="#term-turtle2-ECHAR">ECHAR</a></span> | <span class="prod"><a class="grammarRef" href="#term-turtle2-UCHAR">UCHAR</a></span> ) ))* '"""'</code></td>
</tr>
</tbody>
@@ -506,9 +506,9 @@
<td><a id="term-turtle2-UCHAR" name="term-turtle2-UCHAR"></a>[<span class="prodNo">48</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-turtle2-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-turtle2-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-turtle2-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-turtle2-HEX">HEX</a></span> )<br/>
+<td><code class="content">( "\\u" <span class="prod"><a class="grammarRef" href="#term-turtle2-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#term-turtle2-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#term-turtle2-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#term-turtle2-HEX">HEX</a></span> )<br/>
-| ( "\\U" <span class="prod"><a class="grammarRef" href="#prod-turtle2-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-turtle2-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-turtle2-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-turtle2-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-turtle2-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-turtle2-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-turtle2-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-turtle2-HEX">HEX</a></span> )</code></td>
+| ( "\\U" <span class="prod"><a class="grammarRef" href="#term-turtle2-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#term-turtle2-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#term-turtle2-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#term-turtle2-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#term-turtle2-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#term-turtle2-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#term-turtle2-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#term-turtle2-HEX">HEX</a></span> )</code></td>
</tr>
</tbody>
@@ -527,7 +527,7 @@
<td><a id="term-turtle2-NIL" name="term-turtle2-NIL"></a>[<span class="prodNo">50</span>] </td>
<td><<code class="production term">NIL</code>></td>
<td> ::= </td>
-<td><code class="content">"(" (( <span class="prod"><a class="grammarRef" href="#prod-turtle2-WS">WS</a></span> ))* ")"</code></td>
+<td><code class="content">"(" (( <span class="prod"><a class="grammarRef" href="#term-turtle2-WS">WS</a></span> ))* ")"</code></td>
</tr>
</tbody>
@@ -550,7 +550,7 @@
<td><a id="term-turtle2-ANON" name="term-turtle2-ANON"></a>[<span class="prodNo">52</span>] </td>
<td><<code class="production term">ANON</code>></td>
<td> ::= </td>
-<td><code class="content">"[" (( <span class="prod"><a class="grammarRef" href="#prod-turtle2-WS">WS</a></span> ))* "]"</code></td>
+<td><code class="content">"[" (( <span class="prod"><a class="grammarRef" href="#term-turtle2-WS">WS</a></span> ))* "]"</code></td>
</tr>
</tbody>
@@ -576,7 +576,7 @@
| [#F900-#FDCF]<br/>
| [#FDF0-#FFFD]<br/>
| [#10000-#EFFFF]<br/>
-| <span class="prod"><a class="grammarRef" href="#prod-turtle2-UCHAR">UCHAR</a></span></code></td>
+| <span class="prod"><a class="grammarRef" href="#term-turtle2-UCHAR">UCHAR</a></span></code></td>
</tr>
</tbody>
@@ -586,7 +586,7 @@
<td><<code class="production term">PN_CHARS_U</code>></td>
<td> ::= </td>
-<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-turtle2-PN_CHARS_BASE">PN_CHARS_BASE</a></span><br/>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#term-turtle2-PN_CHARS_BASE">PN_CHARS_BASE</a></span><br/>
| "_"</code></td>
</tr>
</tbody>
@@ -597,7 +597,7 @@
<td><<code class="production term">PN_CHARS</code>></td>
<td> ::= </td>
-<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-turtle2-PN_CHARS_U">PN_CHARS_U</a></span><br/>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#term-turtle2-PN_CHARS_U">PN_CHARS_U</a></span><br/>
| "-"<br/>
| [0-9]<br/>
| <br/>
@@ -612,7 +612,7 @@
<td><a id="term-turtle2-PN_PREFIX" name="term-turtle2-PN_PREFIX"></a>[<span class="prodNo">56</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-turtle2-PN_CHARS_BASE">PN_CHARS_BASE</a></span> (( (( <span class="prod"><a class="grammarRef" href="#prod-turtle2-PN_CHARS">PN_CHARS</a></span> | "." ))* <span class="prod"><a class="grammarRef" href="#prod-turtle2-PN_CHARS">PN_CHARS</a></span> ))?</code></td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#term-turtle2-PN_CHARS_BASE">PN_CHARS_BASE</a></span> (( (( <span class="prod"><a class="grammarRef" href="#term-turtle2-PN_CHARS">PN_CHARS</a></span> | "." ))* <span class="prod"><a class="grammarRef" href="#term-turtle2-PN_CHARS">PN_CHARS</a></span> ))?</code></td>
</tr>
</tbody>
@@ -622,7 +622,7 @@
<td><a id="term-turtle2-PN_LOCAL" name="term-turtle2-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="#prod-turtle2-PN_CHARS_U">PN_CHARS_U</a></span> | [0-9] | <span class="prod"><a class="grammarRef" href="#prod-turtle2-PLX">PLX</a></span> ) (( (( <span class="prod"><a class="grammarRef" href="#prod-turtle2-PN_CHARS">PN_CHARS</a></span> | "." | <span class="prod"><a class="grammarRef" href="#prod-turtle2-PLX">PLX</a></span> ))* ( <span class="prod"><a class="grammarRef" href="#prod-turtle2-PN_CHARS">PN_CHARS</a></span> | <span class="prod"><a class="grammarRef" href="#prod-turtle2-PLX">PLX</a></span> ) ))?</code></td>
+<td><code class="content">( <span class="prod"><a class="grammarRef" href="#term-turtle2-PN_CHARS_U">PN_CHARS_U</a></span> | [0-9] | <span class="prod"><a class="grammarRef" href="#term-turtle2-PLX">PLX</a></span> ) (( (( <span class="prod"><a class="grammarRef" href="#term-turtle2-PN_CHARS">PN_CHARS</a></span> | "." | <span class="prod"><a class="grammarRef" href="#term-turtle2-PLX">PLX</a></span> ))* ( <span class="prod"><a class="grammarRef" href="#term-turtle2-PN_CHARS">PN_CHARS</a></span> | <span class="prod"><a class="grammarRef" href="#term-turtle2-PLX">PLX</a></span> ) ))?</code></td>
</tr>
</tbody>
@@ -632,8 +632,8 @@
<td><a id="term-turtle2-PLX" name="term-turtle2-PLX"></a>[<span class="prodNo">58</span>] </td>
<td><<code class="production term">PLX</code>></td>
<td> ::= </td>
-<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-turtle2-PERCENT">PERCENT</a></span><br/>
-| <span class="prod"><a class="grammarRef" href="#prod-turtle2-PN_LOCAL_ESC">PN_LOCAL_ESC</a></span></code></td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#term-turtle2-PERCENT">PERCENT</a></span><br/>
+| <span class="prod"><a class="grammarRef" href="#term-turtle2-PN_LOCAL_ESC">PN_LOCAL_ESC</a></span></code></td>
</tr>
</tbody>
@@ -643,7 +643,7 @@
<td><a id="term-turtle2-PERCENT" name="term-turtle2-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="#prod-turtle2-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-turtle2-HEX">HEX</a></span></code></td>
+<td><code class="content">"%" <span class="prod"><a class="grammarRef" href="#term-turtle2-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#term-turtle2-HEX">HEX</a></span></code></td>
</tr>
</tbody>