--- a/rdf-turtle/turtle-bnf.html	Wed May 16 07:06:03 2012 -0700
+++ b/rdf-turtle/turtle-bnf.html	Wed May 16 07:38:02 2012 -0700
@@ -10,7 +10,7 @@
     <td>[2]<td>
     <td><code>statement</code><td>
     <td>::=</td>
-    <td><a href='#grammar-production-directive'>directive</a> '<code class='grammar-literal'>.</code>' <code>|</code> <a href='#grammar-production-triples'>triples</a> '<code class='grammar-literal'>.</code>'</td>
+    <td>(<a href='#grammar-production-directive'>directive</a> '<code class='grammar-literal'>.</code>') <code>|</code> (<a href='#grammar-production-triples'>triples</a> '<code class='grammar-literal'>.</code>')</td>
 </tr>
             <tr id="grammar-production-directive" data-grammar-original="[3] directive ::= prefixID| base" data-grammar-expression="(&#x27;|&#x27;, [(&#x27;id&#x27;, &#x27;prefixID&#x27;), (&#x27;id&#x27;, &#x27;base&#x27;)])" >
     <td>[3]<td>
@@ -34,7 +34,7 @@
     <td>[6]<td>
     <td><code>triples</code><td>
     <td>::=</td>
-    <td><a href='#grammar-production-subject'>subject</a> <a href='#grammar-production-predicateObjectList'>predicateObjectList</a> <code>|</code> <a href='#grammar-production-blankNodePropertyList'>blankNodePropertyList</a> (<a href='#grammar-production-predicateObjectList'>predicateObjectList</a>)?</td>
+    <td>(<a href='#grammar-production-subject'>subject</a> <a href='#grammar-production-predicateObjectList'>predicateObjectList</a>) <code>|</code> (<a href='#grammar-production-blankNodePropertyList'>blankNodePropertyList</a> (<a href='#grammar-production-predicateObjectList'>predicateObjectList</a>)?)</td>
 </tr>
             <tr id="grammar-production-predicateObjectList" data-grammar-original="[7] predicateObjectList ::= verb objectList ( &quot;;&quot; verb objectList )* (&quot;;&quot;)?" data-grammar-expression="(&#x27;,&#x27;, [(&#x27;id&#x27;, &#x27;verb&#x27;), (&#x27;id&#x27;, &#x27;objectList&#x27;), (&#x27;*&#x27;, (&#x27;,&#x27;, [(&quot;&#x27;&quot;, &#x27;;&#x27;), (&#x27;id&#x27;, &#x27;verb&#x27;), (&#x27;id&#x27;, &#x27;objectList&#x27;)])), (&#x27;?&#x27;, (&quot;&#x27;&quot;, &#x27;;&#x27;))])" >
     <td>[7]<td>
@@ -100,7 +100,7 @@
     <td>[60s]<td>
     <td><code>RDFLiteral</code><td>
     <td>::=</td>
-    <td><a href='#grammar-production-String'>String</a> (<a href='#grammar-production-LANGTAG'>LANGTAG</a> <code>|</code> '<code class='grammar-literal'>^^</code>' <a href='#grammar-production-iri'>iri</a>)?</td>
+    <td><a href='#grammar-production-String'>String</a> (<a href='#grammar-production-LANGTAG'>LANGTAG</a> <code>|</code> ('<code class='grammar-literal'>^^</code>' <a href='#grammar-production-iri'>iri</a>))?</td>
 </tr>
             <tr id="grammar-production-NumericLiteral" data-grammar-original="[61s] NumericLiteral ::= NumericLiteralUnsigned| NumericLiteralPositive| NumericLiteralNegative" data-grammar-expression="(&#x27;|&#x27;, [(&#x27;id&#x27;, &#x27;NumericLiteralUnsigned&#x27;), (&#x27;id&#x27;, &#x27;NumericLiteralPositive&#x27;), (&#x27;id&#x27;, &#x27;NumericLiteralNegative&#x27;)])" >
     <td>[61s]<td>
@@ -198,13 +198,13 @@
     <td>[21]<td>
     <td><code>DECIMAL</code><td>
     <td>::=</td>
-    <td>([<code class='grammar-chars'>+-</code>])? ([<code class='grammar-chars'>0-9</code>])<code class='grammar-plus'>+</code> '<code class='grammar-literal'>.</code>' ([<code class='grammar-chars'>0-9</code>])<code class='grammar-plus'>+</code> <code>|</code> '<code class='grammar-literal'>.</code>' ([<code class='grammar-chars'>0-9</code>])<code class='grammar-plus'>+</code></td>
+    <td>(([<code class='grammar-chars'>+-</code>])? ([<code class='grammar-chars'>0-9</code>])<code class='grammar-plus'>+</code> '<code class='grammar-literal'>.</code>' ([<code class='grammar-chars'>0-9</code>])<code class='grammar-plus'>+</code>) <code>|</code> ('<code class='grammar-literal'>.</code>' ([<code class='grammar-chars'>0-9</code>])<code class='grammar-plus'>+</code>)</td>
 </tr>
             <tr id="grammar-production-DOUBLE" data-grammar-original="[22] DOUBLE ::= [+-]? [0-9]+ &quot;.&quot; [0-9]+ EXPONENT| &quot;.&quot; ( [0-9] )+ EXPONENT| ( [0-9] )+ EXPONENT" data-grammar-expression="(&#x27;|&#x27;, [(&#x27;,&#x27;, [(&#x27;?&#x27;, (&#x27;[&#x27;, &#x27;+-&#x27;)), (&#x27;+&#x27;, (&#x27;[&#x27;, &#x27;0-9&#x27;)), (&quot;&#x27;&quot;, &#x27;.&#x27;), (&#x27;+&#x27;, (&#x27;[&#x27;, &#x27;0-9&#x27;)), (&#x27;id&#x27;, &#x27;EXPONENT&#x27;)]), (&#x27;,&#x27;, [(&quot;&#x27;&quot;, &#x27;.&#x27;), (&#x27;+&#x27;, (&#x27;[&#x27;, &#x27;0-9&#x27;)), (&#x27;id&#x27;, &#x27;EXPONENT&#x27;)]), (&#x27;,&#x27;, [(&#x27;+&#x27;, (&#x27;[&#x27;, &#x27;0-9&#x27;)), (&#x27;id&#x27;, &#x27;EXPONENT&#x27;)])])" class='grammar-token'>
     <td>[22]<td>
     <td><code>DOUBLE</code><td>
     <td>::=</td>
-    <td>([<code class='grammar-chars'>+-</code>])? ([<code class='grammar-chars'>0-9</code>])<code class='grammar-plus'>+</code> '<code class='grammar-literal'>.</code>' ([<code class='grammar-chars'>0-9</code>])<code class='grammar-plus'>+</code> <a href='#grammar-production-EXPONENT'>EXPONENT</a> <code>|</code> '<code class='grammar-literal'>.</code>' ([<code class='grammar-chars'>0-9</code>])<code class='grammar-plus'>+</code> <a href='#grammar-production-EXPONENT'>EXPONENT</a> <code>|</code> ([<code class='grammar-chars'>0-9</code>])<code class='grammar-plus'>+</code> <a href='#grammar-production-EXPONENT'>EXPONENT</a></td>
+    <td>(([<code class='grammar-chars'>+-</code>])? ([<code class='grammar-chars'>0-9</code>])<code class='grammar-plus'>+</code> '<code class='grammar-literal'>.</code>' ([<code class='grammar-chars'>0-9</code>])<code class='grammar-plus'>+</code> <a href='#grammar-production-EXPONENT'>EXPONENT</a>) <code>|</code> ('<code class='grammar-literal'>.</code>' ([<code class='grammar-chars'>0-9</code>])<code class='grammar-plus'>+</code> <a href='#grammar-production-EXPONENT'>EXPONENT</a>) <code>|</code> (([<code class='grammar-chars'>0-9</code>])<code class='grammar-plus'>+</code> <a href='#grammar-production-EXPONENT'>EXPONENT</a>)</td>
 </tr>
             <tr id="grammar-production-EXPONENT" data-grammar-original="[148s] EXPONENT ::= [eE] [+-]? [0-9]+" data-grammar-expression="(&#x27;,&#x27;, [(&#x27;[&#x27;, &#x27;eE&#x27;), (&#x27;?&#x27;, (&#x27;[&#x27;, &#x27;+-&#x27;)), (&#x27;+&#x27;, (&#x27;[&#x27;, &#x27;0-9&#x27;))])" class='grammar-token'>
     <td>[148s]<td>
@@ -240,7 +240,7 @@
     <td>[19]<td>
     <td><code>UCHAR</code><td>
     <td>::=</td>
-    <td>'<code class='grammar-literal'>\u</code>' <a href='#grammar-production-HEX'>HEX</a> <a href='#grammar-production-HEX'>HEX</a> <a href='#grammar-production-HEX'>HEX</a> <a href='#grammar-production-HEX'>HEX</a> <code>|</code> '<code class='grammar-literal'>\U</code>' <a href='#grammar-production-HEX'>HEX</a> <a href='#grammar-production-HEX'>HEX</a> <a href='#grammar-production-HEX'>HEX</a> <a href='#grammar-production-HEX'>HEX</a> <a href='#grammar-production-HEX'>HEX</a> <a href='#grammar-production-HEX'>HEX</a> <a href='#grammar-production-HEX'>HEX</a> <a href='#grammar-production-HEX'>HEX</a></td>
+    <td>('<code class='grammar-literal'>\u</code>' <a href='#grammar-production-HEX'>HEX</a> <a href='#grammar-production-HEX'>HEX</a> <a href='#grammar-production-HEX'>HEX</a> <a href='#grammar-production-HEX'>HEX</a>) <code>|</code> ('<code class='grammar-literal'>\U</code>' <a href='#grammar-production-HEX'>HEX</a> <a href='#grammar-production-HEX'>HEX</a> <a href='#grammar-production-HEX'>HEX</a> <a href='#grammar-production-HEX'>HEX</a> <a href='#grammar-production-HEX'>HEX</a> <a href='#grammar-production-HEX'>HEX</a> <a href='#grammar-production-HEX'>HEX</a> <a href='#grammar-production-HEX'>HEX</a>)</td>
 </tr>
             <tr id="grammar-production-ECHAR" data-grammar-original="[153s] ECHAR ::= &quot;\&quot; [tbnrf\&quot;&#x27;]" data-grammar-expression="(&#x27;,&#x27;, [(&quot;&#x27;&quot;, &#x27;\\&#x27;), (&#x27;[&#x27;, &#x27;tbnrf\\&quot;\&#x27;&#x27;)])" class='grammar-token'>
     <td>[153s]<td>