diff -Nru xml2rfc-2.39.0/changelog xml2rfc-2.40.0/changelog
--- xml2rfc-2.39.0/changelog	2020-01-31 11:37:59.000000000 +0000
+++ xml2rfc-2.40.0/changelog	2020-02-18 21:37:07.000000000 +0000
@@ -1,3 +1,41 @@
+xml2rfc (2.40.0) ietf; urgency=medium
+
+  * Worked around weasyprint's failure to honour <ol> type attributes by 
+    using the appropriate CSS list-style-type to control the list style.  Fixes 
+    issue #489.
+
+  * Added <br/> to the v3 grammar.  Fixes issue #492.
+
+  * Fixed an issue where comments inside ascii-art artwork would cause 
+    following artwork not to be rendered.
+
+  * Fixed an issue where use of .splitlines() instead of .split('\n') 
+    caused unexpected removal of blank lines at the beginning or end of artwork.
+
+  * Allowed Latin script content in <organization> without requiring an ascii 
+    attribute, to match the treatment of author and contact names.  Fixes issue 
+    #493
+
+  * Added additional error information when text content is found where 
+    the schema does not allow it.
+
+  * Fixed an issue where trailing whitespace in artwork can trigger bad
+    rendering, by removing whitespace at the end of lines in <artwork> and
+    <sourcecode>.  Fixes issue #490
+
+  * Changed the plain text URL for the trust license-info in TLP 
+    boilerplate to an <eref> also for IAB documents.  Fixes issue #456.
+
+  * Removed indentation from lists rendered in table cells.
+
+  * Fixed an incorrect attribute grouping in the v3 schema
+
+  * Fixed two off-by-one errors in the calculation of the length of 
+    Updates/Obsoletes lists.  Addresses issue #472
+
+ -- Henrik Levkowetz <henrik@levkowetz.com>  18 Feb 2020 13:37:07 -0800
+
+
 xml2rfc (2.39.0) ietf; urgency=medium
 
 
diff -Nru xml2rfc-2.39.0/debian/changelog xml2rfc-2.40.0/debian/changelog
--- xml2rfc-2.39.0/debian/changelog	2020-02-04 18:43:15.000000000 +0000
+++ xml2rfc-2.40.0/debian/changelog	2020-02-21 06:18:30.000000000 +0000
@@ -1,3 +1,9 @@
+xml2rfc (2.40.0-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Scott Kitterman <scott@kitterman.com>  Fri, 21 Feb 2020 01:18:30 -0500
+
 xml2rfc (2.39.0-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru xml2rfc-2.39.0/PKG-INFO xml2rfc-2.40.0/PKG-INFO
--- xml2rfc-2.39.0/PKG-INFO	2020-01-31 11:39:02.000000000 +0000
+++ xml2rfc-2.40.0/PKG-INFO	2020-02-18 21:37:36.000000000 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: xml2rfc
-Version: 2.39.0
+Version: 2.40.0
 Summary: Xml2rfc generates RFCs and IETF drafts from document source in XML according to the IETF xml2rfc v2 and v3 vocabularies.
 Home-page: https://tools.ietf.org/tools/xml2rfc/trac/
 Author: Henrik Levkowetz, Josh Bothun
@@ -103,6 +103,49 @@
         =========
         
         
+        Version 2.40.0 (18 Feb 2020)
+        ------------------------------------------------
+        
+        
+          * Worked around weasyprint's failure to honour <ol> type attributes by 
+            using the appropriate CSS list-style-type to control the list style.  Fixes 
+            issue #489.
+        
+          * Added <br/> to the v3 grammar.  Fixes issue #492.
+        
+          * Fixed an issue where comments inside ascii-art artwork would cause 
+            following artwork not to be rendered.
+        
+          * Fixed an issue where use of .splitlines() instead of .split('\n') 
+            caused unexpected removal of blank lines at the beginning or end of artwork.
+        
+          * Allowed Latin script content in <organization> without requiring an ascii 
+            attribute, to match the treatment of author and contact names.  Fixes issue 
+            #493
+        
+          * Added additional error information when text content is found where 
+            the schema does not allow it.
+        
+          * Fixed an issue where trailing whitespace in artwork can trigger bad
+            rendering, by removing whitespace at the end of lines in <artwork> and
+            <sourcecode>.  Fixes issue #490
+        
+          * Changed the plain text URL for the trust license-info in TLP 
+            boilerplate to an <eref> also for IAB documents.  Fixes issue #456.
+        
+          * Removed indentation from lists rendered in table cells.
+        
+          * Fixed an incorrect attribute grouping in the v3 schema
+        
+          * Fixed two off-by-one errors in the calculation of the length of 
+            Updates/Obsoletes lists.  Addresses issue #472
+        
+        
+        
+        
+        
+        
+        
         Version 2.39.0 (31 Jan 2020)
         ------------------------------------------------
         
@@ -153,37 +196,6 @@
         
         
         
-        
-        
-        
-        
-        Version 2.38.1 (20 Jan 2020)
-        ------------------------------------------------
-        
-        
-          * Added a preptool check for numbered sections occurring after or under
-            unnumbered sections, and changed the code for Reference sections to
-            not emit section numbers if the previous section was unnumbered.  
-            Fixes issue #433
-        
-          * Refactored the code for reference anchor to display string mapping,
-            locating it in a base class method.  Updated it to honour the symRefs
-            setting.  Fixes issue #476.
-        
-          * Added installation of Python 3.8 to Dockerfile, and updated the minor
-            version numbers for the other Python installation stanzas.
-        
-          * Fixed a problem rendering multiple authors with organization 
-            showOnFrontPage='false'.  Further addresses issue #483.
-        
-          * Added a switch --no-external-js, and some other --no-* switches to 
-            invert boolean settings.  Fixes issue #486.
-        
-          * Added an early return from cache() when repeated attempts to fetch an 
-            URL fails.
-        
-        
-        
         
         
         
diff -Nru xml2rfc-2.39.0/setup.py xml2rfc-2.40.0/setup.py
--- xml2rfc-2.39.0/setup.py	2020-01-31 11:38:01.000000000 +0000
+++ xml2rfc-2.40.0/setup.py	2020-02-18 21:37:07.000000000 +0000
@@ -81,7 +81,7 @@
 setup(
     # Package metadata
     name='xml2rfc',
-    version='2.39.0',
+    version='2.40.0',
     author='Henrik Levkowetz, Josh Bothun',
     author_email='tools-discuss@ietf.org',
     maintainer = "Henrik Levkowetz",
diff -Nru xml2rfc-2.39.0/tests/input/elements.xml xml2rfc-2.40.0/tests/input/elements.xml
--- xml2rfc-2.39.0/tests/input/elements.xml	2020-01-18 15:12:19.000000000 +0000
+++ xml2rfc-2.40.0/tests/input/elements.xml	2020-02-18 20:15:35.000000000 +0000
@@ -11,7 +11,7 @@
    <?v3xml2rfc silence=".*[Pp]ostal address" ?>
    <?v3xml2rfc silence="The document date .*? is more than 3 days away from today's date" ?>
    <front>
-      <title abbrev="Xml2rfc Vocabulary V3 Elements">Xml2rfc Vocabulary V3 Elements&br;Combined Test File</title>
+      <title abbrev="Xml2rfc Vocabulary V3 Elements">Xml2rfc Vocabulary V3 Elements<br/>Combined Test File</title>
       <author fullname="An Author">
          <organization showOnFrontPage="false">ElfTools</organization>
          <address>
@@ -247,7 +247,7 @@
                   Unordered list, third bullet, element t.  Quid? si nos non interpretum fungimur munere, sed tuemur ea, quae audiebamus, conferebamus, neque erat umquam controversia, quid ego intellegerem, sed quid probarem.  Extremum autem esse bonorum eum voluptate vivere.  Sic faciam igitur, inquit: unam rem explicabo, eamque maximam, de physicis alias, et quidem locis pluribus. 
                </t>
                <artwork>
-        Unordered list, third bullet, second element:
+        Unordered list, third bullet, second element:  <!-- Comment inside artwork -->
         +-------------------------------------------+
         |                                           |       
         |                  Artwork                  |       
@@ -830,7 +830,7 @@
          </aside>
          <aside>
             <t>
-               This sentence |&br; has <strong>three</strong> forced breaks |&br; in order to be displayed |&br; on multiple lines.
+               This sentence |<br/> has <strong>three</strong> forced breaks |<br/> in order to be displayed |<br/> on multiple lines.
                This second sentence does not have a forced break, and should end up being wrapped.
             </t>
          </aside>
diff -Nru xml2rfc-2.39.0/tests/valid/draft-miek-test.v3.py27.html xml2rfc-2.40.0/tests/valid/draft-miek-test.v3.py27.html
--- xml2rfc-2.39.0/tests/valid/draft-miek-test.v3.py27.html	2020-01-10 23:04:16.000000000 +0000
+++ xml2rfc-2.40.0/tests/valid/draft-miek-test.v3.py27.html	2020-02-18 20:15:35.000000000 +0000
@@ -16,7 +16,7 @@
             This version is adapted to work with "xml2rfc" version 2.x.  
        
     ' name="description">
-<meta content="xml2rfc 2.37.2" name="generator">
+<meta content="xml2rfc 2.39.0" name="generator">
 <meta content="RFC" name="keyword">
 <meta content="Request for Comments" name="keyword">
 <meta content="I-D" name="keyword">
@@ -364,17 +364,17 @@
 <figure id="figure-1">
         <div class="artwork art-text alignLeft" id="section-2-5.1">
 <pre>
-+-------------------+   pandoc   +---------+  
-| ALMOST PLAIN TEXT |   ------&gt;  | DOCBOOK |  
-+-------------------+            +---------+  
++-------------------+   pandoc   +---------+
+| ALMOST PLAIN TEXT |   ------&gt;  | DOCBOOK |
++-------------------+            +---------+
               |                       |
 non-existent  |                       | xsltproc
   faster way  |                       |
               v                       v
-      +------------+    xml2rfc  +---------+ 
-      | PLAIN TEXT |  &lt;--------  | XML2RFC | 
-      +------------+             +---------+ 
-            </pre>
+      +------------+    xml2rfc  +---------+
+      | PLAIN TEXT |  &lt;--------  | XML2RFC |
+      +------------+             +---------+
+</pre>
 </div>
 <figcaption><a href="#figure-1" class="selfRef">Figure 1</a>:
 <a href="#name-attempt-to-justify-pandoc2r" class="selfRef">Attempt to justify Pandoc2rfc.</a>
@@ -413,7 +413,7 @@
 &lt;/back&gt;
 
 &lt;/rfc&gt;
-            </pre>
+</pre>
 </div>
 <figcaption><a href="#figure-2" class="selfRef">Figure 2</a>:
 <a href="#name-a-minimal-templatexml" class="selfRef">A minimal template.xml.</a>
@@ -422,7 +422,7 @@
 <p id="section-2-8">
             See the Makefile for an example of this. In this case you need to
             edit 3 documents:<a href="#section-2-8" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-2-9">
+<ol start="1" type="1" class="normal type-1" id="section-2-9">
         <li id="section-2-9.1">
                   middle.pdc - contains the main body of text;<a href="#section-2-9.1" class="pilcrow">¶</a>
 </li>
@@ -460,7 +460,7 @@
 <div class="artwork art-text alignLeft" id="section-2.1-3">
 <pre>
  This document was produced using the Pandoc2rfc tool.
-               </pre><a href="#section-2.1-3" class="pilcrow">¶</a>
+</pre><a href="#section-2.1-3" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -647,7 +647,7 @@
 <pre>
 # Section1 One
 Bla
-               </pre><a href="#section-7.2-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.2-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.2-3">
                Converts to: <code>&lt;section title="Section1
@@ -678,7 +678,7 @@
 
 * Item one;
 * Item two.
-                  </pre><a href="#section-7.3.1-1" class="pilcrow">¶</a>
+</pre><a href="#section-7.3.1-1" class="pilcrow">¶</a>
 </div>
 <p id="section-7.3.1-2">
                   Converts to <code>&lt;list style="symbol"&gt;</code>:<a href="#section-7.3.1-2" class="pilcrow">¶</a></p>
@@ -703,11 +703,11 @@
 
 1. Item one;
 1. Item two.
-                  </pre><a href="#section-7.3.2-1" class="pilcrow">¶</a>
+</pre><a href="#section-7.3.2-1" class="pilcrow">¶</a>
 </div>
 <p id="section-7.3.2-2">
                   Converts to <code>&lt;list style="numbers"&gt;</code>:<a href="#section-7.3.2-2" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-7.3.2-3">
+<ol start="1" type="1" class="normal type-1" id="section-7.3.2-3">
             <li id="section-7.3.2-3.1">
                         Item one;<a href="#section-7.3.2-3.1" class="pilcrow">¶</a>
 </li>
@@ -730,7 +730,7 @@
 
 #. Item one;
 #. Item two.
-                  </pre><a href="#section-7.3.3-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.3.3-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.3.3-3">
                   Converts to <code>&lt;list style="empty"&gt;</code>:<a href="#section-7.3.3-3" class="pilcrow">¶</a></p>
@@ -755,7 +755,7 @@
 <pre>
 ii. Item one;
 ii. Item two.
-                  </pre><a href="#section-7.3.4-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.3.4-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.3.4-3">
                   Converts to <code>&lt;list style="format %i."&gt;</code>:<a href="#section-7.3.4-3" class="pilcrow">¶</a></p>
@@ -775,7 +775,7 @@
 <pre>
 II. Item one;
 II. Item two.
-                  </pre><a href="#section-7.3.4-6" class="pilcrow">¶</a>
+</pre><a href="#section-7.3.4-6" class="pilcrow">¶</a>
 </div>
 <p id="section-7.3.4-7">
                   Yields <code>&lt;list style="format (%d) "&gt;</code>:<a href="#section-7.3.4-7" class="pilcrow">¶</a></p>
@@ -802,11 +802,11 @@
 <pre>
 a.  Item one;
 b.  Item two.
-                  </pre><a href="#section-7.3.5-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.3.5-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.3.5-3">
                   Converts to <code>&lt;list style="letters"&gt;</code>:<a href="#section-7.3.5-3" class="pilcrow">¶</a></p>
-<ol start="1" type="a" class="normal" id="section-7.3.5-4">
+<ol start="1" type="a" class="normal type-a" id="section-7.3.5-4">
             <li id="section-7.3.5-4.1">
                         Item one;<a href="#section-7.3.5-4.1" class="pilcrow">¶</a>
 </li>
@@ -820,7 +820,7 @@
 <pre>
 A.  Item one;
 B.  Item two.
-                  </pre><a href="#section-7.3.5-6" class="pilcrow">¶</a>
+</pre><a href="#section-7.3.5-6" class="pilcrow">¶</a>
 </div>
 <p id="section-7.3.5-7">
                   Becomes:<a href="#section-7.3.5-7" class="pilcrow">¶</a></p>
@@ -855,7 +855,7 @@
 Second item that needs clarification:
 
 :   Explanation two
-                  </pre><a href="#section-7.3.6-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.3.6-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.3.6-3">
                   Converts to: <code>&lt;list style="hanging"&gt;</code> and <code>&lt;t hangText="First item that..."&gt;</code><a href="#section-7.3.6-3" class="pilcrow">¶</a></p>
@@ -875,7 +875,7 @@
 <div class="artwork art-text alignLeft" id="section-7.4-2">
 <pre>
 Like this
-               </pre><a href="#section-7.4-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.4-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.4-3">
                Converts to:
@@ -938,7 +938,7 @@
 <div class="artwork art-text alignLeft" id="section-7.5-2">
 <pre>
 &gt; quoted text
-               </pre><a href="#section-7.5-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.5-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.5-3">
                Converts to: <code>&lt;t&gt;&lt;list style="empty"&gt; ...</code>
@@ -960,7 +960,7 @@
 <div class="artwork art-text alignLeft" id="section-7.6.1-2">
 <pre>
 [Click here](URI)
-                  </pre><a href="#section-7.6.1-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.6.1-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.6.1-3">
                   Converts to: <code>&lt;ulink target="URI"&gt;Click here ...</code><a href="#section-7.6.1-3" class="pilcrow">¶</a></p>
@@ -976,7 +976,7 @@
 <div class="artwork art-text alignLeft" id="section-7.6.2-2">
 <pre>
 [Click here](#localid)
-                  </pre><a href="#section-7.6.2-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.6.2-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.6.2-3">
                   Converts to: <code>&lt;link target="localid"&gt;Click here ...</code><a href="#section-7.6.2-3" class="pilcrow">¶</a></p>
@@ -986,14 +986,14 @@
 <div class="artwork art-text alignLeft" id="section-7.6.2-5">
 <pre>
 [](#RFC2119)
-                  </pre><a href="#section-7.6.2-5" class="pilcrow">¶</a>
+</pre><a href="#section-7.6.2-5" class="pilcrow">¶</a>
 </div>
 <p id="section-7.6.2-6">
                   And it does the right thing. Referencing sections is done with:<a href="#section-7.6.2-6" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-7.6.2-7">
 <pre>
 See [](#pandoc-constructs)
-                  </pre><a href="#section-7.6.2-7" class="pilcrow">¶</a>
+</pre><a href="#section-7.6.2-7" class="pilcrow">¶</a>
 </div>
 <p id="section-7.6.2-8">
                   The word 'Section' is inserted automatically: ... see
@@ -1037,14 +1037,14 @@
 <figure id="figure-3">
           <div class="artwork art-text alignLeft" id="section-7.8-2.1">
 <pre>
-  Right     Left     Center     Default                                                                  
-  -------   ------ ----------   -------                                                                  
-       12     12        12        12                                                                   
-      123     123       123       123                                                                   
-        1     1         1         1       
+  Right     Left     Center     Default
+  -------   ------ ----------   -------
+       12     12        12        12
+      123     123       123       123
+        1     1         1         1
 
   Table: A caption describing the table.
-               </pre>
+</pre>
 </div>
 <figcaption><a href="#figure-3" class="selfRef">Figure 3</a>:
 <a href="#name-a-caption-describing-the-fi" class="selfRef">A caption describing the figure describing the table.</a>
@@ -1110,21 +1110,21 @@
 [^1]
 
 [^1]: footnote text
-               </pre><a href="#section-7.9-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.9-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.9-3">
                We re-use this syntax for the <code>&lt;iref&gt;</code> tag.  The above text translates to:<a href="#section-7.9-3" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-7.9-4">
 <pre>
 &lt;iref item="footnote text"/&gt;
-               </pre><a href="#section-7.9-4" class="pilcrow">¶</a>
+</pre><a href="#section-7.9-4" class="pilcrow">¶</a>
 </div>
 <p id="section-7.9-5">
                Sub items are also supported. Use an exclamation mark (<code>!</code>) to separate them:<a href="#section-7.9-5" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-7.9-6">
 <pre>
 [^1]: item!sub item
-               </pre><a href="#section-7.9-6" class="pilcrow">¶</a>
+</pre><a href="#section-7.9-6" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -1153,7 +1153,7 @@
 <pre>
 allsections.pdc: section.pdc.1 section.pdc.2 section.pdc.3
         cat $@ &gt; allsections.pdc
-               </pre><a href="#section-8.1-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.1-2" class="pilcrow">¶</a>
 </div>
 <p id="section-8.1-3">
                And then process <code>allsection.pdc</code> in the normal way.<a href="#section-8.1-3" class="pilcrow">¶</a></p>
@@ -1170,14 +1170,14 @@
 <div class="artwork art-text alignLeft" id="section-8.2-2">
 <pre>
 &lt;rfc ipr="trust200902" docName="draft-gieben-writing-rfcs-pandoc-02"&gt;
-               </pre><a href="#section-8.2-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.2-2" class="pilcrow">¶</a>
 </div>
 <p id="section-8.2-3">
                The Makefile will pick this up automatically and make a symbolic link:<a href="#section-8.2-3" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-8.2-4">
 <pre>
 draft-gieben-writing-rfcs-pandoc-00.txt -&gt; draft.txt
-               </pre><a href="#section-8.2-4" class="pilcrow">¶</a>
+</pre><a href="#section-8.2-4" class="pilcrow">¶</a>
 </div>
 <p id="section-8.2-5">
                This makes uploading the file to the i-d tracker a bit easier.<a href="#section-8.2-5" class="pilcrow">¶</a></p>
@@ -1300,7 +1300,7 @@
 <pre>
 A verbatim code block
 jkasjksajassjasjsajsajkas
-               </pre><a href="#section-a.4-1" class="pilcrow">¶</a>
+</pre><a href="#section-a.4-1" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -1339,7 +1339,7 @@
         <h2 id="name-list-tests">
 <a href="#section-a.7" class="section-number selfRef">A.7. </a><a href="#name-list-tests" class="section-name selfRef">List Tests</a>
         </h2>
-<ol start="1" type="1" class="normal" id="section-a.7-1">
+<ol start="1" type="1" class="normal type-1" id="section-a.7-1">
           <li id="section-a.7-1.1">
                      First we do<a href="#section-a.7-1.1" class="pilcrow">¶</a>
 </li>
@@ -1365,7 +1365,7 @@
 <li id="section-a.7-3.2">
             <p id="section-a.7-3.2.1">
                      Then<a href="#section-a.7-3.2.1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-a.7-3.2.2">
+<ol start="1" type="1" class="normal type-1" id="section-a.7-3.2.2">
               <li id="section-a.7-3.2.2.1">
                            Something<a href="#section-a.7-3.2.2.1" class="pilcrow">¶</a>
 </li>
@@ -1393,7 +1393,7 @@
           <dt id="section-a.7-7.1">Item to explain:</dt>
 <dd id="section-a.7-7.2">
             <p id="section-a.7-7.2.1">It works because of<a href="#section-a.7-7.2.1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-a.7-7.2.2">
+<ol start="1" type="1" class="normal type-1" id="section-a.7-7.2.2">
               <li id="section-a.7-7.2.2.1">
                         One<a href="#section-a.7-7.2.2.1" class="pilcrow">¶</a>
 </li>
@@ -1408,7 +1408,7 @@
 <dt id="section-a.7-7.5">Item to explain:</dt>
 <dd id="section-a.7-7.6">
             <p id="section-a.7-7.6.1">It works because of<a href="#section-a.7-7.6.1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-a.7-7.6.2">
+<ol start="1" type="1" class="normal type-1" id="section-a.7-7.6.2">
               <li id="section-a.7-7.6.2.1">
                         One1<a href="#section-a.7-7.6.2.1" class="pilcrow">¶</a>
 </li>
@@ -1432,7 +1432,7 @@
 </dl>
 <p id="section-a.7-8">
                list with description lists.<a href="#section-a.7-8" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-a.7-9">
+<ol start="1" type="1" class="normal type-1" id="section-a.7-9">
           <li id="section-a.7-9.1">
             <p id="section-a.7-9.1.1">
                      More<a href="#section-a.7-9.1.1" class="pilcrow">¶</a></p>
@@ -1451,7 +1451,7 @@
 </ol>
 <p id="section-a.7-10">
                Multiple paragraphs in a list.<a href="#section-a.7-10" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-a.7-11">
+<ol start="1" type="1" class="normal type-1" id="section-a.7-11">
           <li id="section-a.7-11.1">
             <p id="section-a.7-11.1.1">
                      This is the first bullet point and it needs multiple paragraphs...<a href="#section-a.7-11.1.1" class="pilcrow">¶</a></p>
@@ -1466,7 +1466,7 @@
 <div class="artwork art-text alignLeft" id="section-a.7-11.3.2">
 <pre>
 Artwork
-                        </pre><a href="#section-a.7-11.3.2" class="pilcrow">¶</a>
+</pre><a href="#section-a.7-11.3.2" class="pilcrow">¶</a>
 </div>
 </li>
 <li id="section-a.7-11.4">
@@ -1478,11 +1478,11 @@
 <div class="artwork art-text alignLeft" id="section-a.7-13">
 <pre>
 &lt;vspace blankLines='1'&gt;
-               </pre><a href="#section-a.7-13" class="pilcrow">¶</a>
+</pre><a href="#section-a.7-13" class="pilcrow">¶</a>
 </div>
 <p id="section-a.7-14">
                Ordered lists.<a href="#section-a.7-14" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-a.7-15">
+<ol start="1" type="1" class="normal type-1" id="section-a.7-15">
           <li id="section-a.7-15.1">
                      First item<a href="#section-a.7-15.1" class="pilcrow">¶</a>
 </li>
@@ -1540,7 +1540,7 @@
                Text at the end.<a href="#section-a.7-23" class="pilcrow">¶</a></p>
 <p id="section-a.7-24">
                Lowercase letters list.<a href="#section-a.7-24" class="pilcrow">¶</a></p>
-<ol start="1" type="a" class="normal" id="section-a.7-25">
+<ol start="1" type="a" class="normal type-a" id="section-a.7-25">
           <li id="section-a.7-25.1">
                      First item<a href="#section-a.7-25.1" class="pilcrow">¶</a>
 </li>
@@ -1572,9 +1572,9 @@
       it. Tell something about it. Tell something about it. Tell something about it.<a href="#section-a.7-30.2.1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-a.7-30.2.2">
 <pre>
-miek.nl.    IN  NS  a.miek.nl.                             
-a.miek.nl.  IN  A   192.0.2.1    ; &lt;- this is glue            
-                     </pre><a href="#section-a.7-30.2.2" class="pilcrow">¶</a>
+miek.nl.    IN  NS  a.miek.nl.
+a.miek.nl.  IN  A   192.0.2.1    ; &lt;- this is glue
+</pre><a href="#section-a.7-30.2.2" class="pilcrow">¶</a>
 </div>
 <p id="section-a.7-30.2.3">
                      Tell some more about it. Tell some more about it. Tell some more about it.<a href="#section-a.7-30.2.3" class="pilcrow">¶</a></p>
@@ -1585,7 +1585,7 @@
 </dl>
 <p id="section-a.7-31">
                List with a sublist with a paragraph above the sublist<a href="#section-a.7-31" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-a.7-32">
+<ol start="1" type="1" class="normal type-1" id="section-a.7-32">
           <li id="section-a.7-32.1">
                      First Item<a href="#section-a.7-32.1" class="pilcrow">¶</a>
 </li>
@@ -1596,7 +1596,7 @@
             <p id="section-a.7-32.3.1">
                      Third item<a href="#section-a.7-32.3.1" class="pilcrow">¶</a></p>
 <p id="section-a.7-32.3.2"> A paragraph that comes first<a href="#section-a.7-32.3.2" class="pilcrow">¶</a></p>
-<ol start="1" type="a" class="normal" id="section-a.7-32.3.3">
+<ol start="1" type="a" class="normal type-a" id="section-a.7-32.3.3">
               <li id="section-a.7-32.3.3.1">
                            But what do you know<a href="#section-a.7-32.3.3.1" class="pilcrow">¶</a>
 </li>
@@ -1739,7 +1739,7 @@
 <div class="artwork art-text alignLeft" id="section-a.8-8">
 <pre>
 See [](#tab-here-s-the)
-               </pre><a href="#section-a.8-8" class="pilcrow">¶</a>
+</pre><a href="#section-a.8-8" class="pilcrow">¶</a>
 </div>
 <p id="section-a.8-9">
                Which will become "See <a href="#tab-here-s-the" class="xref">Table 2</a>".<a href="#section-a.8-9" class="pilcrow">¶</a></p>
@@ -1760,7 +1760,7 @@
         </h2>
 <p id="section-a.9-1">
                This is another example:<a href="#section-a.9-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-a.9-2">
+<ol start="1" type="1" class="normal type-1" id="section-a.9-2">
           <li id="section-a.9-2.1">
                      Another bla bla..<a href="#section-a.9-2.1" class="pilcrow">¶</a>
 </li>
@@ -1782,7 +1782,7 @@
 This is a figure
 This is a figure
 This is a figure
-               </pre>
+</pre>
 </div>
 <figcaption><a href="#figure-4" class="selfRef">Figure 4</a>:
 <a href="#name-this-is-the-caption-with-te" class="selfRef">This is the caption, with text in `typewriter`. Which isnt converted to a &lt;spanx&gt; style, because this is copied as-is.</a>
@@ -1796,7 +1796,7 @@
 <pre>
 This is a figure
 This is a figure
-               </pre>
+</pre>
 </div>
 <figcaption><a href="#figure-5" class="selfRef">Figure 5</a>:
 <a href="#name-a-non-centered-figure" class="selfRef">A non centered figure.</a>
@@ -1809,7 +1809,7 @@
 This is a figure with a title
 This is a figure with a title
 @title: and here it is: a title, don't mess it up *
-               </pre><a href="#section-a.10-5" class="pilcrow">¶</a>
+</pre><a href="#section-a.10-5" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
diff -Nru xml2rfc-2.39.0/tests/valid/draft-miek-test.v3.py35.html xml2rfc-2.40.0/tests/valid/draft-miek-test.v3.py35.html
--- xml2rfc-2.39.0/tests/valid/draft-miek-test.v3.py35.html	2019-12-22 18:00:56.000000000 +0000
+++ xml2rfc-2.40.0/tests/valid/draft-miek-test.v3.py35.html	2020-02-18 20:15:35.000000000 +0000
@@ -16,7 +16,7 @@
             This version is adapted to work with "xml2rfc" version 2.x.  
        
     ' name="description">
-<meta content="xml2rfc 2.37.0" name="generator">
+<meta content="xml2rfc 2.39.0" name="generator">
 <meta content="RFC" name="keyword">
 <meta content="Request for Comments" name="keyword">
 <meta content="I-D" name="keyword">
@@ -364,17 +364,17 @@
 <figure id="figure-1">
         <div class="artwork art-text alignLeft" id="section-2-5.1">
 <pre>
-+-------------------+   pandoc   +---------+  
-| ALMOST PLAIN TEXT |   ------&gt;  | DOCBOOK |  
-+-------------------+            +---------+  
++-------------------+   pandoc   +---------+
+| ALMOST PLAIN TEXT |   ------&gt;  | DOCBOOK |
++-------------------+            +---------+
               |                       |
 non-existent  |                       | xsltproc
   faster way  |                       |
               v                       v
-      +------------+    xml2rfc  +---------+ 
-      | PLAIN TEXT |  &lt;--------  | XML2RFC | 
-      +------------+             +---------+ 
-            </pre>
+      +------------+    xml2rfc  +---------+
+      | PLAIN TEXT |  &lt;--------  | XML2RFC |
+      +------------+             +---------+
+</pre>
 </div>
 <figcaption><a href="#figure-1" class="selfRef">Figure 1</a>:
 <a href="#name-attempt-to-justify-pandoc2r" class="selfRef">Attempt to justify Pandoc2rfc.</a>
@@ -413,7 +413,7 @@
 &lt;/back&gt;
 
 &lt;/rfc&gt;
-            </pre>
+</pre>
 </div>
 <figcaption><a href="#figure-2" class="selfRef">Figure 2</a>:
 <a href="#name-a-minimal-templatexml" class="selfRef">A minimal template.xml.</a>
@@ -422,7 +422,7 @@
 <p id="section-2-8">
             See the Makefile for an example of this. In this case you need to
             edit 3 documents:<a href="#section-2-8" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-2-9">
+<ol start="1" type="1" class="normal type-1" id="section-2-9">
         <li id="section-2-9.1">
                   middle.pdc - contains the main body of text;<a href="#section-2-9.1" class="pilcrow">¶</a>
 </li>
@@ -460,7 +460,7 @@
 <div class="artwork art-text alignLeft" id="section-2.1-3">
 <pre>
  This document was produced using the Pandoc2rfc tool.
-               </pre><a href="#section-2.1-3" class="pilcrow">¶</a>
+</pre><a href="#section-2.1-3" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -647,7 +647,7 @@
 <pre>
 # Section1 One
 Bla
-               </pre><a href="#section-7.2-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.2-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.2-3">
                Converts to: <code>&lt;section title="Section1
@@ -678,7 +678,7 @@
 
 * Item one;
 * Item two.
-                  </pre><a href="#section-7.3.1-1" class="pilcrow">¶</a>
+</pre><a href="#section-7.3.1-1" class="pilcrow">¶</a>
 </div>
 <p id="section-7.3.1-2">
                   Converts to <code>&lt;list style="symbol"&gt;</code>:<a href="#section-7.3.1-2" class="pilcrow">¶</a></p>
@@ -703,11 +703,11 @@
 
 1. Item one;
 1. Item two.
-                  </pre><a href="#section-7.3.2-1" class="pilcrow">¶</a>
+</pre><a href="#section-7.3.2-1" class="pilcrow">¶</a>
 </div>
 <p id="section-7.3.2-2">
                   Converts to <code>&lt;list style="numbers"&gt;</code>:<a href="#section-7.3.2-2" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-7.3.2-3">
+<ol start="1" type="1" class="normal type-1" id="section-7.3.2-3">
             <li id="section-7.3.2-3.1">
                         Item one;<a href="#section-7.3.2-3.1" class="pilcrow">¶</a>
 </li>
@@ -730,7 +730,7 @@
 
 #. Item one;
 #. Item two.
-                  </pre><a href="#section-7.3.3-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.3.3-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.3.3-3">
                   Converts to <code>&lt;list style="empty"&gt;</code>:<a href="#section-7.3.3-3" class="pilcrow">¶</a></p>
@@ -755,7 +755,7 @@
 <pre>
 ii. Item one;
 ii. Item two.
-                  </pre><a href="#section-7.3.4-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.3.4-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.3.4-3">
                   Converts to <code>&lt;list style="format %i."&gt;</code>:<a href="#section-7.3.4-3" class="pilcrow">¶</a></p>
@@ -775,7 +775,7 @@
 <pre>
 II. Item one;
 II. Item two.
-                  </pre><a href="#section-7.3.4-6" class="pilcrow">¶</a>
+</pre><a href="#section-7.3.4-6" class="pilcrow">¶</a>
 </div>
 <p id="section-7.3.4-7">
                   Yields <code>&lt;list style="format (%d) "&gt;</code>:<a href="#section-7.3.4-7" class="pilcrow">¶</a></p>
@@ -802,11 +802,11 @@
 <pre>
 a.  Item one;
 b.  Item two.
-                  </pre><a href="#section-7.3.5-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.3.5-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.3.5-3">
                   Converts to <code>&lt;list style="letters"&gt;</code>:<a href="#section-7.3.5-3" class="pilcrow">¶</a></p>
-<ol start="1" type="a" class="normal" id="section-7.3.5-4">
+<ol start="1" type="a" class="normal type-a" id="section-7.3.5-4">
             <li id="section-7.3.5-4.1">
                         Item one;<a href="#section-7.3.5-4.1" class="pilcrow">¶</a>
 </li>
@@ -820,7 +820,7 @@
 <pre>
 A.  Item one;
 B.  Item two.
-                  </pre><a href="#section-7.3.5-6" class="pilcrow">¶</a>
+</pre><a href="#section-7.3.5-6" class="pilcrow">¶</a>
 </div>
 <p id="section-7.3.5-7">
                   Becomes:<a href="#section-7.3.5-7" class="pilcrow">¶</a></p>
@@ -855,7 +855,7 @@
 Second item that needs clarification:
 
 :   Explanation two
-                  </pre><a href="#section-7.3.6-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.3.6-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.3.6-3">
                   Converts to: <code>&lt;list style="hanging"&gt;</code> and <code>&lt;t hangText="First item that..."&gt;</code><a href="#section-7.3.6-3" class="pilcrow">¶</a></p>
@@ -875,7 +875,7 @@
 <div class="artwork art-text alignLeft" id="section-7.4-2">
 <pre>
 Like this
-               </pre><a href="#section-7.4-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.4-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.4-3">
                Converts to:
@@ -938,7 +938,7 @@
 <div class="artwork art-text alignLeft" id="section-7.5-2">
 <pre>
 &gt; quoted text
-               </pre><a href="#section-7.5-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.5-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.5-3">
                Converts to: <code>&lt;t&gt;&lt;list style="empty"&gt; ...</code>
@@ -960,7 +960,7 @@
 <div class="artwork art-text alignLeft" id="section-7.6.1-2">
 <pre>
 [Click here](URI)
-                  </pre><a href="#section-7.6.1-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.6.1-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.6.1-3">
                   Converts to: <code>&lt;ulink target="URI"&gt;Click here ...</code><a href="#section-7.6.1-3" class="pilcrow">¶</a></p>
@@ -976,7 +976,7 @@
 <div class="artwork art-text alignLeft" id="section-7.6.2-2">
 <pre>
 [Click here](#localid)
-                  </pre><a href="#section-7.6.2-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.6.2-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.6.2-3">
                   Converts to: <code>&lt;link target="localid"&gt;Click here ...</code><a href="#section-7.6.2-3" class="pilcrow">¶</a></p>
@@ -986,14 +986,14 @@
 <div class="artwork art-text alignLeft" id="section-7.6.2-5">
 <pre>
 [](#RFC2119)
-                  </pre><a href="#section-7.6.2-5" class="pilcrow">¶</a>
+</pre><a href="#section-7.6.2-5" class="pilcrow">¶</a>
 </div>
 <p id="section-7.6.2-6">
                   And it does the right thing. Referencing sections is done with:<a href="#section-7.6.2-6" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-7.6.2-7">
 <pre>
 See [](#pandoc-constructs)
-                  </pre><a href="#section-7.6.2-7" class="pilcrow">¶</a>
+</pre><a href="#section-7.6.2-7" class="pilcrow">¶</a>
 </div>
 <p id="section-7.6.2-8">
                   The word 'Section' is inserted automatically: ... see
@@ -1037,14 +1037,14 @@
 <figure id="figure-3">
           <div class="artwork art-text alignLeft" id="section-7.8-2.1">
 <pre>
-  Right     Left     Center     Default                                                                  
-  -------   ------ ----------   -------                                                                  
-       12     12        12        12                                                                   
-      123     123       123       123                                                                   
-        1     1         1         1       
+  Right     Left     Center     Default
+  -------   ------ ----------   -------
+       12     12        12        12
+      123     123       123       123
+        1     1         1         1
 
   Table: A caption describing the table.
-               </pre>
+</pre>
 </div>
 <figcaption><a href="#figure-3" class="selfRef">Figure 3</a>:
 <a href="#name-a-caption-describing-the-fi" class="selfRef">A caption describing the figure describing the table.</a>
@@ -1110,21 +1110,21 @@
 [^1]
 
 [^1]: footnote text
-               </pre><a href="#section-7.9-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.9-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.9-3">
                We re-use this syntax for the <code>&lt;iref&gt;</code> tag.  The above text translates to:<a href="#section-7.9-3" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-7.9-4">
 <pre>
 &lt;iref item="footnote text"/&gt;
-               </pre><a href="#section-7.9-4" class="pilcrow">¶</a>
+</pre><a href="#section-7.9-4" class="pilcrow">¶</a>
 </div>
 <p id="section-7.9-5">
                Sub items are also supported. Use an exclamation mark (<code>!</code>) to separate them:<a href="#section-7.9-5" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-7.9-6">
 <pre>
 [^1]: item!sub item
-               </pre><a href="#section-7.9-6" class="pilcrow">¶</a>
+</pre><a href="#section-7.9-6" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -1153,7 +1153,7 @@
 <pre>
 allsections.pdc: section.pdc.1 section.pdc.2 section.pdc.3
         cat $@ &gt; allsections.pdc
-               </pre><a href="#section-8.1-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.1-2" class="pilcrow">¶</a>
 </div>
 <p id="section-8.1-3">
                And then process <code>allsection.pdc</code> in the normal way.<a href="#section-8.1-3" class="pilcrow">¶</a></p>
@@ -1170,14 +1170,14 @@
 <div class="artwork art-text alignLeft" id="section-8.2-2">
 <pre>
 &lt;rfc ipr="trust200902" docName="draft-gieben-writing-rfcs-pandoc-02"&gt;
-               </pre><a href="#section-8.2-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.2-2" class="pilcrow">¶</a>
 </div>
 <p id="section-8.2-3">
                The Makefile will pick this up automatically and make a symbolic link:<a href="#section-8.2-3" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-8.2-4">
 <pre>
 draft-gieben-writing-rfcs-pandoc-00.txt -&gt; draft.txt
-               </pre><a href="#section-8.2-4" class="pilcrow">¶</a>
+</pre><a href="#section-8.2-4" class="pilcrow">¶</a>
 </div>
 <p id="section-8.2-5">
                This makes uploading the file to the i-d tracker a bit easier.<a href="#section-8.2-5" class="pilcrow">¶</a></p>
@@ -1300,7 +1300,7 @@
 <pre>
 A verbatim code block
 jkasjksajassjasjsajsajkas
-               </pre><a href="#section-a.4-1" class="pilcrow">¶</a>
+</pre><a href="#section-a.4-1" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -1339,7 +1339,7 @@
         <h2 id="name-list-tests">
 <a href="#section-a.7" class="section-number selfRef">A.7. </a><a href="#name-list-tests" class="section-name selfRef">List Tests</a>
         </h2>
-<ol start="1" type="1" class="normal" id="section-a.7-1">
+<ol start="1" type="1" class="normal type-1" id="section-a.7-1">
           <li id="section-a.7-1.1">
                      First we do<a href="#section-a.7-1.1" class="pilcrow">¶</a>
 </li>
@@ -1365,7 +1365,7 @@
 <li id="section-a.7-3.2">
             <p id="section-a.7-3.2.1">
                      Then<a href="#section-a.7-3.2.1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-a.7-3.2.2">
+<ol start="1" type="1" class="normal type-1" id="section-a.7-3.2.2">
               <li id="section-a.7-3.2.2.1">
                            Something<a href="#section-a.7-3.2.2.1" class="pilcrow">¶</a>
 </li>
@@ -1393,7 +1393,7 @@
           <dt id="section-a.7-7.1">Item to explain:</dt>
 <dd id="section-a.7-7.2">
             <p id="section-a.7-7.2.1">It works because of<a href="#section-a.7-7.2.1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-a.7-7.2.2">
+<ol start="1" type="1" class="normal type-1" id="section-a.7-7.2.2">
               <li id="section-a.7-7.2.2.1">
                         One<a href="#section-a.7-7.2.2.1" class="pilcrow">¶</a>
 </li>
@@ -1408,7 +1408,7 @@
 <dt id="section-a.7-7.5">Item to explain:</dt>
 <dd id="section-a.7-7.6">
             <p id="section-a.7-7.6.1">It works because of<a href="#section-a.7-7.6.1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-a.7-7.6.2">
+<ol start="1" type="1" class="normal type-1" id="section-a.7-7.6.2">
               <li id="section-a.7-7.6.2.1">
                         One1<a href="#section-a.7-7.6.2.1" class="pilcrow">¶</a>
 </li>
@@ -1432,7 +1432,7 @@
 </dl>
 <p id="section-a.7-8">
                list with description lists.<a href="#section-a.7-8" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-a.7-9">
+<ol start="1" type="1" class="normal type-1" id="section-a.7-9">
           <li id="section-a.7-9.1">
             <p id="section-a.7-9.1.1">
                      More<a href="#section-a.7-9.1.1" class="pilcrow">¶</a></p>
@@ -1451,7 +1451,7 @@
 </ol>
 <p id="section-a.7-10">
                Multiple paragraphs in a list.<a href="#section-a.7-10" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-a.7-11">
+<ol start="1" type="1" class="normal type-1" id="section-a.7-11">
           <li id="section-a.7-11.1">
             <p id="section-a.7-11.1.1">
                      This is the first bullet point and it needs multiple paragraphs...<a href="#section-a.7-11.1.1" class="pilcrow">¶</a></p>
@@ -1466,7 +1466,7 @@
 <div class="artwork art-text alignLeft" id="section-a.7-11.3.2">
 <pre>
 Artwork
-                        </pre><a href="#section-a.7-11.3.2" class="pilcrow">¶</a>
+</pre><a href="#section-a.7-11.3.2" class="pilcrow">¶</a>
 </div>
 </li>
 <li id="section-a.7-11.4">
@@ -1478,11 +1478,11 @@
 <div class="artwork art-text alignLeft" id="section-a.7-13">
 <pre>
 &lt;vspace blankLines='1'&gt;
-               </pre><a href="#section-a.7-13" class="pilcrow">¶</a>
+</pre><a href="#section-a.7-13" class="pilcrow">¶</a>
 </div>
 <p id="section-a.7-14">
                Ordered lists.<a href="#section-a.7-14" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-a.7-15">
+<ol start="1" type="1" class="normal type-1" id="section-a.7-15">
           <li id="section-a.7-15.1">
                      First item<a href="#section-a.7-15.1" class="pilcrow">¶</a>
 </li>
@@ -1540,7 +1540,7 @@
                Text at the end.<a href="#section-a.7-23" class="pilcrow">¶</a></p>
 <p id="section-a.7-24">
                Lowercase letters list.<a href="#section-a.7-24" class="pilcrow">¶</a></p>
-<ol start="1" type="a" class="normal" id="section-a.7-25">
+<ol start="1" type="a" class="normal type-a" id="section-a.7-25">
           <li id="section-a.7-25.1">
                      First item<a href="#section-a.7-25.1" class="pilcrow">¶</a>
 </li>
@@ -1572,9 +1572,9 @@
       it. Tell something about it. Tell something about it. Tell something about it.<a href="#section-a.7-30.2.1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-a.7-30.2.2">
 <pre>
-miek.nl.    IN  NS  a.miek.nl.                             
-a.miek.nl.  IN  A   192.0.2.1    ; &lt;- this is glue            
-                     </pre><a href="#section-a.7-30.2.2" class="pilcrow">¶</a>
+miek.nl.    IN  NS  a.miek.nl.
+a.miek.nl.  IN  A   192.0.2.1    ; &lt;- this is glue
+</pre><a href="#section-a.7-30.2.2" class="pilcrow">¶</a>
 </div>
 <p id="section-a.7-30.2.3">
                      Tell some more about it. Tell some more about it. Tell some more about it.<a href="#section-a.7-30.2.3" class="pilcrow">¶</a></p>
@@ -1585,7 +1585,7 @@
 </dl>
 <p id="section-a.7-31">
                List with a sublist with a paragraph above the sublist<a href="#section-a.7-31" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-a.7-32">
+<ol start="1" type="1" class="normal type-1" id="section-a.7-32">
           <li id="section-a.7-32.1">
                      First Item<a href="#section-a.7-32.1" class="pilcrow">¶</a>
 </li>
@@ -1596,7 +1596,7 @@
             <p id="section-a.7-32.3.1">
                      Third item<a href="#section-a.7-32.3.1" class="pilcrow">¶</a></p>
 <p id="section-a.7-32.3.2"> A paragraph that comes first<a href="#section-a.7-32.3.2" class="pilcrow">¶</a></p>
-<ol start="1" type="a" class="normal" id="section-a.7-32.3.3">
+<ol start="1" type="a" class="normal type-a" id="section-a.7-32.3.3">
               <li id="section-a.7-32.3.3.1">
                            But what do you know<a href="#section-a.7-32.3.3.1" class="pilcrow">¶</a>
 </li>
@@ -1739,7 +1739,7 @@
 <div class="artwork art-text alignLeft" id="section-a.8-8">
 <pre>
 See [](#tab-here-s-the)
-               </pre><a href="#section-a.8-8" class="pilcrow">¶</a>
+</pre><a href="#section-a.8-8" class="pilcrow">¶</a>
 </div>
 <p id="section-a.8-9">
                Which will become "See <a href="#tab-here-s-the" class="xref">Table 2</a>".<a href="#section-a.8-9" class="pilcrow">¶</a></p>
@@ -1760,7 +1760,7 @@
         </h2>
 <p id="section-a.9-1">
                This is another example:<a href="#section-a.9-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-a.9-2">
+<ol start="1" type="1" class="normal type-1" id="section-a.9-2">
           <li id="section-a.9-2.1">
                      Another bla bla..<a href="#section-a.9-2.1" class="pilcrow">¶</a>
 </li>
@@ -1782,7 +1782,7 @@
 This is a figure
 This is a figure
 This is a figure
-               </pre>
+</pre>
 </div>
 <figcaption><a href="#figure-4" class="selfRef">Figure 4</a>:
 <a href="#name-this-is-the-caption-with-te" class="selfRef">This is the caption, with text in `typewriter`. Which isnt converted to a &lt;spanx&gt; style, because this is copied as-is.</a>
@@ -1796,7 +1796,7 @@
 <pre>
 This is a figure
 This is a figure
-               </pre>
+</pre>
 </div>
 <figcaption><a href="#figure-5" class="selfRef">Figure 5</a>:
 <a href="#name-a-non-centered-figure" class="selfRef">A non centered figure.</a>
@@ -1809,7 +1809,7 @@
 This is a figure with a title
 This is a figure with a title
 @title: and here it is: a title, don't mess it up *
-               </pre><a href="#section-a.10-5" class="pilcrow">¶</a>
+</pre><a href="#section-a.10-5" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
diff -Nru xml2rfc-2.39.0/tests/valid/draft-miek-test.v3.py36.html xml2rfc-2.40.0/tests/valid/draft-miek-test.v3.py36.html
--- xml2rfc-2.39.0/tests/valid/draft-miek-test.v3.py36.html	2019-12-22 18:00:56.000000000 +0000
+++ xml2rfc-2.40.0/tests/valid/draft-miek-test.v3.py36.html	2020-02-18 20:15:35.000000000 +0000
@@ -16,7 +16,7 @@
             This version is adapted to work with "xml2rfc" version 2.x.  
        
     ' name="description">
-<meta content="xml2rfc 2.37.0" name="generator">
+<meta content="xml2rfc 2.39.0" name="generator">
 <meta content="RFC" name="keyword">
 <meta content="Request for Comments" name="keyword">
 <meta content="I-D" name="keyword">
@@ -364,17 +364,17 @@
 <figure id="figure-1">
         <div class="artwork art-text alignLeft" id="section-2-5.1">
 <pre>
-+-------------------+   pandoc   +---------+  
-| ALMOST PLAIN TEXT |   ------&gt;  | DOCBOOK |  
-+-------------------+            +---------+  
++-------------------+   pandoc   +---------+
+| ALMOST PLAIN TEXT |   ------&gt;  | DOCBOOK |
++-------------------+            +---------+
               |                       |
 non-existent  |                       | xsltproc
   faster way  |                       |
               v                       v
-      +------------+    xml2rfc  +---------+ 
-      | PLAIN TEXT |  &lt;--------  | XML2RFC | 
-      +------------+             +---------+ 
-            </pre>
+      +------------+    xml2rfc  +---------+
+      | PLAIN TEXT |  &lt;--------  | XML2RFC |
+      +------------+             +---------+
+</pre>
 </div>
 <figcaption><a href="#figure-1" class="selfRef">Figure 1</a>:
 <a href="#name-attempt-to-justify-pandoc2r" class="selfRef">Attempt to justify Pandoc2rfc.</a>
@@ -413,7 +413,7 @@
 &lt;/back&gt;
 
 &lt;/rfc&gt;
-            </pre>
+</pre>
 </div>
 <figcaption><a href="#figure-2" class="selfRef">Figure 2</a>:
 <a href="#name-a-minimal-templatexml" class="selfRef">A minimal template.xml.</a>
@@ -422,7 +422,7 @@
 <p id="section-2-8">
             See the Makefile for an example of this. In this case you need to
             edit 3 documents:<a href="#section-2-8" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-2-9">
+<ol start="1" type="1" class="normal type-1" id="section-2-9">
         <li id="section-2-9.1">
                   middle.pdc - contains the main body of text;<a href="#section-2-9.1" class="pilcrow">¶</a>
 </li>
@@ -460,7 +460,7 @@
 <div class="artwork art-text alignLeft" id="section-2.1-3">
 <pre>
  This document was produced using the Pandoc2rfc tool.
-               </pre><a href="#section-2.1-3" class="pilcrow">¶</a>
+</pre><a href="#section-2.1-3" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -647,7 +647,7 @@
 <pre>
 # Section1 One
 Bla
-               </pre><a href="#section-7.2-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.2-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.2-3">
                Converts to: <code>&lt;section title="Section1
@@ -678,7 +678,7 @@
 
 * Item one;
 * Item two.
-                  </pre><a href="#section-7.3.1-1" class="pilcrow">¶</a>
+</pre><a href="#section-7.3.1-1" class="pilcrow">¶</a>
 </div>
 <p id="section-7.3.1-2">
                   Converts to <code>&lt;list style="symbol"&gt;</code>:<a href="#section-7.3.1-2" class="pilcrow">¶</a></p>
@@ -703,11 +703,11 @@
 
 1. Item one;
 1. Item two.
-                  </pre><a href="#section-7.3.2-1" class="pilcrow">¶</a>
+</pre><a href="#section-7.3.2-1" class="pilcrow">¶</a>
 </div>
 <p id="section-7.3.2-2">
                   Converts to <code>&lt;list style="numbers"&gt;</code>:<a href="#section-7.3.2-2" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-7.3.2-3">
+<ol start="1" type="1" class="normal type-1" id="section-7.3.2-3">
             <li id="section-7.3.2-3.1">
                         Item one;<a href="#section-7.3.2-3.1" class="pilcrow">¶</a>
 </li>
@@ -730,7 +730,7 @@
 
 #. Item one;
 #. Item two.
-                  </pre><a href="#section-7.3.3-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.3.3-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.3.3-3">
                   Converts to <code>&lt;list style="empty"&gt;</code>:<a href="#section-7.3.3-3" class="pilcrow">¶</a></p>
@@ -755,7 +755,7 @@
 <pre>
 ii. Item one;
 ii. Item two.
-                  </pre><a href="#section-7.3.4-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.3.4-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.3.4-3">
                   Converts to <code>&lt;list style="format %i."&gt;</code>:<a href="#section-7.3.4-3" class="pilcrow">¶</a></p>
@@ -775,7 +775,7 @@
 <pre>
 II. Item one;
 II. Item two.
-                  </pre><a href="#section-7.3.4-6" class="pilcrow">¶</a>
+</pre><a href="#section-7.3.4-6" class="pilcrow">¶</a>
 </div>
 <p id="section-7.3.4-7">
                   Yields <code>&lt;list style="format (%d) "&gt;</code>:<a href="#section-7.3.4-7" class="pilcrow">¶</a></p>
@@ -802,11 +802,11 @@
 <pre>
 a.  Item one;
 b.  Item two.
-                  </pre><a href="#section-7.3.5-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.3.5-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.3.5-3">
                   Converts to <code>&lt;list style="letters"&gt;</code>:<a href="#section-7.3.5-3" class="pilcrow">¶</a></p>
-<ol start="1" type="a" class="normal" id="section-7.3.5-4">
+<ol start="1" type="a" class="normal type-a" id="section-7.3.5-4">
             <li id="section-7.3.5-4.1">
                         Item one;<a href="#section-7.3.5-4.1" class="pilcrow">¶</a>
 </li>
@@ -820,7 +820,7 @@
 <pre>
 A.  Item one;
 B.  Item two.
-                  </pre><a href="#section-7.3.5-6" class="pilcrow">¶</a>
+</pre><a href="#section-7.3.5-6" class="pilcrow">¶</a>
 </div>
 <p id="section-7.3.5-7">
                   Becomes:<a href="#section-7.3.5-7" class="pilcrow">¶</a></p>
@@ -855,7 +855,7 @@
 Second item that needs clarification:
 
 :   Explanation two
-                  </pre><a href="#section-7.3.6-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.3.6-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.3.6-3">
                   Converts to: <code>&lt;list style="hanging"&gt;</code> and <code>&lt;t hangText="First item that..."&gt;</code><a href="#section-7.3.6-3" class="pilcrow">¶</a></p>
@@ -875,7 +875,7 @@
 <div class="artwork art-text alignLeft" id="section-7.4-2">
 <pre>
 Like this
-               </pre><a href="#section-7.4-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.4-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.4-3">
                Converts to:
@@ -938,7 +938,7 @@
 <div class="artwork art-text alignLeft" id="section-7.5-2">
 <pre>
 &gt; quoted text
-               </pre><a href="#section-7.5-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.5-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.5-3">
                Converts to: <code>&lt;t&gt;&lt;list style="empty"&gt; ...</code>
@@ -960,7 +960,7 @@
 <div class="artwork art-text alignLeft" id="section-7.6.1-2">
 <pre>
 [Click here](URI)
-                  </pre><a href="#section-7.6.1-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.6.1-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.6.1-3">
                   Converts to: <code>&lt;ulink target="URI"&gt;Click here ...</code><a href="#section-7.6.1-3" class="pilcrow">¶</a></p>
@@ -976,7 +976,7 @@
 <div class="artwork art-text alignLeft" id="section-7.6.2-2">
 <pre>
 [Click here](#localid)
-                  </pre><a href="#section-7.6.2-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.6.2-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.6.2-3">
                   Converts to: <code>&lt;link target="localid"&gt;Click here ...</code><a href="#section-7.6.2-3" class="pilcrow">¶</a></p>
@@ -986,14 +986,14 @@
 <div class="artwork art-text alignLeft" id="section-7.6.2-5">
 <pre>
 [](#RFC2119)
-                  </pre><a href="#section-7.6.2-5" class="pilcrow">¶</a>
+</pre><a href="#section-7.6.2-5" class="pilcrow">¶</a>
 </div>
 <p id="section-7.6.2-6">
                   And it does the right thing. Referencing sections is done with:<a href="#section-7.6.2-6" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-7.6.2-7">
 <pre>
 See [](#pandoc-constructs)
-                  </pre><a href="#section-7.6.2-7" class="pilcrow">¶</a>
+</pre><a href="#section-7.6.2-7" class="pilcrow">¶</a>
 </div>
 <p id="section-7.6.2-8">
                   The word 'Section' is inserted automatically: ... see
@@ -1037,14 +1037,14 @@
 <figure id="figure-3">
           <div class="artwork art-text alignLeft" id="section-7.8-2.1">
 <pre>
-  Right     Left     Center     Default                                                                  
-  -------   ------ ----------   -------                                                                  
-       12     12        12        12                                                                   
-      123     123       123       123                                                                   
-        1     1         1         1       
+  Right     Left     Center     Default
+  -------   ------ ----------   -------
+       12     12        12        12
+      123     123       123       123
+        1     1         1         1
 
   Table: A caption describing the table.
-               </pre>
+</pre>
 </div>
 <figcaption><a href="#figure-3" class="selfRef">Figure 3</a>:
 <a href="#name-a-caption-describing-the-fi" class="selfRef">A caption describing the figure describing the table.</a>
@@ -1110,21 +1110,21 @@
 [^1]
 
 [^1]: footnote text
-               </pre><a href="#section-7.9-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.9-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.9-3">
                We re-use this syntax for the <code>&lt;iref&gt;</code> tag.  The above text translates to:<a href="#section-7.9-3" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-7.9-4">
 <pre>
 &lt;iref item="footnote text"/&gt;
-               </pre><a href="#section-7.9-4" class="pilcrow">¶</a>
+</pre><a href="#section-7.9-4" class="pilcrow">¶</a>
 </div>
 <p id="section-7.9-5">
                Sub items are also supported. Use an exclamation mark (<code>!</code>) to separate them:<a href="#section-7.9-5" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-7.9-6">
 <pre>
 [^1]: item!sub item
-               </pre><a href="#section-7.9-6" class="pilcrow">¶</a>
+</pre><a href="#section-7.9-6" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -1153,7 +1153,7 @@
 <pre>
 allsections.pdc: section.pdc.1 section.pdc.2 section.pdc.3
         cat $@ &gt; allsections.pdc
-               </pre><a href="#section-8.1-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.1-2" class="pilcrow">¶</a>
 </div>
 <p id="section-8.1-3">
                And then process <code>allsection.pdc</code> in the normal way.<a href="#section-8.1-3" class="pilcrow">¶</a></p>
@@ -1170,14 +1170,14 @@
 <div class="artwork art-text alignLeft" id="section-8.2-2">
 <pre>
 &lt;rfc ipr="trust200902" docName="draft-gieben-writing-rfcs-pandoc-02"&gt;
-               </pre><a href="#section-8.2-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.2-2" class="pilcrow">¶</a>
 </div>
 <p id="section-8.2-3">
                The Makefile will pick this up automatically and make a symbolic link:<a href="#section-8.2-3" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-8.2-4">
 <pre>
 draft-gieben-writing-rfcs-pandoc-00.txt -&gt; draft.txt
-               </pre><a href="#section-8.2-4" class="pilcrow">¶</a>
+</pre><a href="#section-8.2-4" class="pilcrow">¶</a>
 </div>
 <p id="section-8.2-5">
                This makes uploading the file to the i-d tracker a bit easier.<a href="#section-8.2-5" class="pilcrow">¶</a></p>
@@ -1300,7 +1300,7 @@
 <pre>
 A verbatim code block
 jkasjksajassjasjsajsajkas
-               </pre><a href="#section-a.4-1" class="pilcrow">¶</a>
+</pre><a href="#section-a.4-1" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -1339,7 +1339,7 @@
         <h2 id="name-list-tests">
 <a href="#section-a.7" class="section-number selfRef">A.7. </a><a href="#name-list-tests" class="section-name selfRef">List Tests</a>
         </h2>
-<ol start="1" type="1" class="normal" id="section-a.7-1">
+<ol start="1" type="1" class="normal type-1" id="section-a.7-1">
           <li id="section-a.7-1.1">
                      First we do<a href="#section-a.7-1.1" class="pilcrow">¶</a>
 </li>
@@ -1365,7 +1365,7 @@
 <li id="section-a.7-3.2">
             <p id="section-a.7-3.2.1">
                      Then<a href="#section-a.7-3.2.1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-a.7-3.2.2">
+<ol start="1" type="1" class="normal type-1" id="section-a.7-3.2.2">
               <li id="section-a.7-3.2.2.1">
                            Something<a href="#section-a.7-3.2.2.1" class="pilcrow">¶</a>
 </li>
@@ -1393,7 +1393,7 @@
           <dt id="section-a.7-7.1">Item to explain:</dt>
 <dd id="section-a.7-7.2">
             <p id="section-a.7-7.2.1">It works because of<a href="#section-a.7-7.2.1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-a.7-7.2.2">
+<ol start="1" type="1" class="normal type-1" id="section-a.7-7.2.2">
               <li id="section-a.7-7.2.2.1">
                         One<a href="#section-a.7-7.2.2.1" class="pilcrow">¶</a>
 </li>
@@ -1408,7 +1408,7 @@
 <dt id="section-a.7-7.5">Item to explain:</dt>
 <dd id="section-a.7-7.6">
             <p id="section-a.7-7.6.1">It works because of<a href="#section-a.7-7.6.1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-a.7-7.6.2">
+<ol start="1" type="1" class="normal type-1" id="section-a.7-7.6.2">
               <li id="section-a.7-7.6.2.1">
                         One1<a href="#section-a.7-7.6.2.1" class="pilcrow">¶</a>
 </li>
@@ -1432,7 +1432,7 @@
 </dl>
 <p id="section-a.7-8">
                list with description lists.<a href="#section-a.7-8" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-a.7-9">
+<ol start="1" type="1" class="normal type-1" id="section-a.7-9">
           <li id="section-a.7-9.1">
             <p id="section-a.7-9.1.1">
                      More<a href="#section-a.7-9.1.1" class="pilcrow">¶</a></p>
@@ -1451,7 +1451,7 @@
 </ol>
 <p id="section-a.7-10">
                Multiple paragraphs in a list.<a href="#section-a.7-10" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-a.7-11">
+<ol start="1" type="1" class="normal type-1" id="section-a.7-11">
           <li id="section-a.7-11.1">
             <p id="section-a.7-11.1.1">
                      This is the first bullet point and it needs multiple paragraphs...<a href="#section-a.7-11.1.1" class="pilcrow">¶</a></p>
@@ -1466,7 +1466,7 @@
 <div class="artwork art-text alignLeft" id="section-a.7-11.3.2">
 <pre>
 Artwork
-                        </pre><a href="#section-a.7-11.3.2" class="pilcrow">¶</a>
+</pre><a href="#section-a.7-11.3.2" class="pilcrow">¶</a>
 </div>
 </li>
 <li id="section-a.7-11.4">
@@ -1478,11 +1478,11 @@
 <div class="artwork art-text alignLeft" id="section-a.7-13">
 <pre>
 &lt;vspace blankLines='1'&gt;
-               </pre><a href="#section-a.7-13" class="pilcrow">¶</a>
+</pre><a href="#section-a.7-13" class="pilcrow">¶</a>
 </div>
 <p id="section-a.7-14">
                Ordered lists.<a href="#section-a.7-14" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-a.7-15">
+<ol start="1" type="1" class="normal type-1" id="section-a.7-15">
           <li id="section-a.7-15.1">
                      First item<a href="#section-a.7-15.1" class="pilcrow">¶</a>
 </li>
@@ -1540,7 +1540,7 @@
                Text at the end.<a href="#section-a.7-23" class="pilcrow">¶</a></p>
 <p id="section-a.7-24">
                Lowercase letters list.<a href="#section-a.7-24" class="pilcrow">¶</a></p>
-<ol start="1" type="a" class="normal" id="section-a.7-25">
+<ol start="1" type="a" class="normal type-a" id="section-a.7-25">
           <li id="section-a.7-25.1">
                      First item<a href="#section-a.7-25.1" class="pilcrow">¶</a>
 </li>
@@ -1572,9 +1572,9 @@
       it. Tell something about it. Tell something about it. Tell something about it.<a href="#section-a.7-30.2.1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-a.7-30.2.2">
 <pre>
-miek.nl.    IN  NS  a.miek.nl.                             
-a.miek.nl.  IN  A   192.0.2.1    ; &lt;- this is glue            
-                     </pre><a href="#section-a.7-30.2.2" class="pilcrow">¶</a>
+miek.nl.    IN  NS  a.miek.nl.
+a.miek.nl.  IN  A   192.0.2.1    ; &lt;- this is glue
+</pre><a href="#section-a.7-30.2.2" class="pilcrow">¶</a>
 </div>
 <p id="section-a.7-30.2.3">
                      Tell some more about it. Tell some more about it. Tell some more about it.<a href="#section-a.7-30.2.3" class="pilcrow">¶</a></p>
@@ -1585,7 +1585,7 @@
 </dl>
 <p id="section-a.7-31">
                List with a sublist with a paragraph above the sublist<a href="#section-a.7-31" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-a.7-32">
+<ol start="1" type="1" class="normal type-1" id="section-a.7-32">
           <li id="section-a.7-32.1">
                      First Item<a href="#section-a.7-32.1" class="pilcrow">¶</a>
 </li>
@@ -1596,7 +1596,7 @@
             <p id="section-a.7-32.3.1">
                      Third item<a href="#section-a.7-32.3.1" class="pilcrow">¶</a></p>
 <p id="section-a.7-32.3.2"> A paragraph that comes first<a href="#section-a.7-32.3.2" class="pilcrow">¶</a></p>
-<ol start="1" type="a" class="normal" id="section-a.7-32.3.3">
+<ol start="1" type="a" class="normal type-a" id="section-a.7-32.3.3">
               <li id="section-a.7-32.3.3.1">
                            But what do you know<a href="#section-a.7-32.3.3.1" class="pilcrow">¶</a>
 </li>
@@ -1739,7 +1739,7 @@
 <div class="artwork art-text alignLeft" id="section-a.8-8">
 <pre>
 See [](#tab-here-s-the)
-               </pre><a href="#section-a.8-8" class="pilcrow">¶</a>
+</pre><a href="#section-a.8-8" class="pilcrow">¶</a>
 </div>
 <p id="section-a.8-9">
                Which will become "See <a href="#tab-here-s-the" class="xref">Table 2</a>".<a href="#section-a.8-9" class="pilcrow">¶</a></p>
@@ -1760,7 +1760,7 @@
         </h2>
 <p id="section-a.9-1">
                This is another example:<a href="#section-a.9-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-a.9-2">
+<ol start="1" type="1" class="normal type-1" id="section-a.9-2">
           <li id="section-a.9-2.1">
                      Another bla bla..<a href="#section-a.9-2.1" class="pilcrow">¶</a>
 </li>
@@ -1782,7 +1782,7 @@
 This is a figure
 This is a figure
 This is a figure
-               </pre>
+</pre>
 </div>
 <figcaption><a href="#figure-4" class="selfRef">Figure 4</a>:
 <a href="#name-this-is-the-caption-with-te" class="selfRef">This is the caption, with text in `typewriter`. Which isnt converted to a &lt;spanx&gt; style, because this is copied as-is.</a>
@@ -1796,7 +1796,7 @@
 <pre>
 This is a figure
 This is a figure
-               </pre>
+</pre>
 </div>
 <figcaption><a href="#figure-5" class="selfRef">Figure 5</a>:
 <a href="#name-a-non-centered-figure" class="selfRef">A non centered figure.</a>
@@ -1809,7 +1809,7 @@
 This is a figure with a title
 This is a figure with a title
 @title: and here it is: a title, don't mess it up *
-               </pre><a href="#section-a.10-5" class="pilcrow">¶</a>
+</pre><a href="#section-a.10-5" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
diff -Nru xml2rfc-2.39.0/tests/valid/draft-miek-test.v3.py37.html xml2rfc-2.40.0/tests/valid/draft-miek-test.v3.py37.html
--- xml2rfc-2.39.0/tests/valid/draft-miek-test.v3.py37.html	2019-12-22 18:00:56.000000000 +0000
+++ xml2rfc-2.40.0/tests/valid/draft-miek-test.v3.py37.html	2020-02-18 20:15:35.000000000 +0000
@@ -16,7 +16,7 @@
             This version is adapted to work with "xml2rfc" version 2.x.  
        
     ' name="description">
-<meta content="xml2rfc 2.37.0" name="generator">
+<meta content="xml2rfc 2.39.0" name="generator">
 <meta content="RFC" name="keyword">
 <meta content="Request for Comments" name="keyword">
 <meta content="I-D" name="keyword">
@@ -364,17 +364,17 @@
 <figure id="figure-1">
         <div class="artwork art-text alignLeft" id="section-2-5.1">
 <pre>
-+-------------------+   pandoc   +---------+  
-| ALMOST PLAIN TEXT |   ------&gt;  | DOCBOOK |  
-+-------------------+            +---------+  
++-------------------+   pandoc   +---------+
+| ALMOST PLAIN TEXT |   ------&gt;  | DOCBOOK |
++-------------------+            +---------+
               |                       |
 non-existent  |                       | xsltproc
   faster way  |                       |
               v                       v
-      +------------+    xml2rfc  +---------+ 
-      | PLAIN TEXT |  &lt;--------  | XML2RFC | 
-      +------------+             +---------+ 
-            </pre>
+      +------------+    xml2rfc  +---------+
+      | PLAIN TEXT |  &lt;--------  | XML2RFC |
+      +------------+             +---------+
+</pre>
 </div>
 <figcaption><a href="#figure-1" class="selfRef">Figure 1</a>:
 <a href="#name-attempt-to-justify-pandoc2r" class="selfRef">Attempt to justify Pandoc2rfc.</a>
@@ -413,7 +413,7 @@
 &lt;/back&gt;
 
 &lt;/rfc&gt;
-            </pre>
+</pre>
 </div>
 <figcaption><a href="#figure-2" class="selfRef">Figure 2</a>:
 <a href="#name-a-minimal-templatexml" class="selfRef">A minimal template.xml.</a>
@@ -422,7 +422,7 @@
 <p id="section-2-8">
             See the Makefile for an example of this. In this case you need to
             edit 3 documents:<a href="#section-2-8" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-2-9">
+<ol start="1" type="1" class="normal type-1" id="section-2-9">
         <li id="section-2-9.1">
                   middle.pdc - contains the main body of text;<a href="#section-2-9.1" class="pilcrow">¶</a>
 </li>
@@ -460,7 +460,7 @@
 <div class="artwork art-text alignLeft" id="section-2.1-3">
 <pre>
  This document was produced using the Pandoc2rfc tool.
-               </pre><a href="#section-2.1-3" class="pilcrow">¶</a>
+</pre><a href="#section-2.1-3" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -647,7 +647,7 @@
 <pre>
 # Section1 One
 Bla
-               </pre><a href="#section-7.2-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.2-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.2-3">
                Converts to: <code>&lt;section title="Section1
@@ -678,7 +678,7 @@
 
 * Item one;
 * Item two.
-                  </pre><a href="#section-7.3.1-1" class="pilcrow">¶</a>
+</pre><a href="#section-7.3.1-1" class="pilcrow">¶</a>
 </div>
 <p id="section-7.3.1-2">
                   Converts to <code>&lt;list style="symbol"&gt;</code>:<a href="#section-7.3.1-2" class="pilcrow">¶</a></p>
@@ -703,11 +703,11 @@
 
 1. Item one;
 1. Item two.
-                  </pre><a href="#section-7.3.2-1" class="pilcrow">¶</a>
+</pre><a href="#section-7.3.2-1" class="pilcrow">¶</a>
 </div>
 <p id="section-7.3.2-2">
                   Converts to <code>&lt;list style="numbers"&gt;</code>:<a href="#section-7.3.2-2" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-7.3.2-3">
+<ol start="1" type="1" class="normal type-1" id="section-7.3.2-3">
             <li id="section-7.3.2-3.1">
                         Item one;<a href="#section-7.3.2-3.1" class="pilcrow">¶</a>
 </li>
@@ -730,7 +730,7 @@
 
 #. Item one;
 #. Item two.
-                  </pre><a href="#section-7.3.3-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.3.3-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.3.3-3">
                   Converts to <code>&lt;list style="empty"&gt;</code>:<a href="#section-7.3.3-3" class="pilcrow">¶</a></p>
@@ -755,7 +755,7 @@
 <pre>
 ii. Item one;
 ii. Item two.
-                  </pre><a href="#section-7.3.4-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.3.4-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.3.4-3">
                   Converts to <code>&lt;list style="format %i."&gt;</code>:<a href="#section-7.3.4-3" class="pilcrow">¶</a></p>
@@ -775,7 +775,7 @@
 <pre>
 II. Item one;
 II. Item two.
-                  </pre><a href="#section-7.3.4-6" class="pilcrow">¶</a>
+</pre><a href="#section-7.3.4-6" class="pilcrow">¶</a>
 </div>
 <p id="section-7.3.4-7">
                   Yields <code>&lt;list style="format (%d) "&gt;</code>:<a href="#section-7.3.4-7" class="pilcrow">¶</a></p>
@@ -802,11 +802,11 @@
 <pre>
 a.  Item one;
 b.  Item two.
-                  </pre><a href="#section-7.3.5-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.3.5-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.3.5-3">
                   Converts to <code>&lt;list style="letters"&gt;</code>:<a href="#section-7.3.5-3" class="pilcrow">¶</a></p>
-<ol start="1" type="a" class="normal" id="section-7.3.5-4">
+<ol start="1" type="a" class="normal type-a" id="section-7.3.5-4">
             <li id="section-7.3.5-4.1">
                         Item one;<a href="#section-7.3.5-4.1" class="pilcrow">¶</a>
 </li>
@@ -820,7 +820,7 @@
 <pre>
 A.  Item one;
 B.  Item two.
-                  </pre><a href="#section-7.3.5-6" class="pilcrow">¶</a>
+</pre><a href="#section-7.3.5-6" class="pilcrow">¶</a>
 </div>
 <p id="section-7.3.5-7">
                   Becomes:<a href="#section-7.3.5-7" class="pilcrow">¶</a></p>
@@ -855,7 +855,7 @@
 Second item that needs clarification:
 
 :   Explanation two
-                  </pre><a href="#section-7.3.6-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.3.6-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.3.6-3">
                   Converts to: <code>&lt;list style="hanging"&gt;</code> and <code>&lt;t hangText="First item that..."&gt;</code><a href="#section-7.3.6-3" class="pilcrow">¶</a></p>
@@ -875,7 +875,7 @@
 <div class="artwork art-text alignLeft" id="section-7.4-2">
 <pre>
 Like this
-               </pre><a href="#section-7.4-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.4-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.4-3">
                Converts to:
@@ -938,7 +938,7 @@
 <div class="artwork art-text alignLeft" id="section-7.5-2">
 <pre>
 &gt; quoted text
-               </pre><a href="#section-7.5-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.5-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.5-3">
                Converts to: <code>&lt;t&gt;&lt;list style="empty"&gt; ...</code>
@@ -960,7 +960,7 @@
 <div class="artwork art-text alignLeft" id="section-7.6.1-2">
 <pre>
 [Click here](URI)
-                  </pre><a href="#section-7.6.1-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.6.1-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.6.1-3">
                   Converts to: <code>&lt;ulink target="URI"&gt;Click here ...</code><a href="#section-7.6.1-3" class="pilcrow">¶</a></p>
@@ -976,7 +976,7 @@
 <div class="artwork art-text alignLeft" id="section-7.6.2-2">
 <pre>
 [Click here](#localid)
-                  </pre><a href="#section-7.6.2-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.6.2-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.6.2-3">
                   Converts to: <code>&lt;link target="localid"&gt;Click here ...</code><a href="#section-7.6.2-3" class="pilcrow">¶</a></p>
@@ -986,14 +986,14 @@
 <div class="artwork art-text alignLeft" id="section-7.6.2-5">
 <pre>
 [](#RFC2119)
-                  </pre><a href="#section-7.6.2-5" class="pilcrow">¶</a>
+</pre><a href="#section-7.6.2-5" class="pilcrow">¶</a>
 </div>
 <p id="section-7.6.2-6">
                   And it does the right thing. Referencing sections is done with:<a href="#section-7.6.2-6" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-7.6.2-7">
 <pre>
 See [](#pandoc-constructs)
-                  </pre><a href="#section-7.6.2-7" class="pilcrow">¶</a>
+</pre><a href="#section-7.6.2-7" class="pilcrow">¶</a>
 </div>
 <p id="section-7.6.2-8">
                   The word 'Section' is inserted automatically: ... see
@@ -1037,14 +1037,14 @@
 <figure id="figure-3">
           <div class="artwork art-text alignLeft" id="section-7.8-2.1">
 <pre>
-  Right     Left     Center     Default                                                                  
-  -------   ------ ----------   -------                                                                  
-       12     12        12        12                                                                   
-      123     123       123       123                                                                   
-        1     1         1         1       
+  Right     Left     Center     Default
+  -------   ------ ----------   -------
+       12     12        12        12
+      123     123       123       123
+        1     1         1         1
 
   Table: A caption describing the table.
-               </pre>
+</pre>
 </div>
 <figcaption><a href="#figure-3" class="selfRef">Figure 3</a>:
 <a href="#name-a-caption-describing-the-fi" class="selfRef">A caption describing the figure describing the table.</a>
@@ -1110,21 +1110,21 @@
 [^1]
 
 [^1]: footnote text
-               </pre><a href="#section-7.9-2" class="pilcrow">¶</a>
+</pre><a href="#section-7.9-2" class="pilcrow">¶</a>
 </div>
 <p id="section-7.9-3">
                We re-use this syntax for the <code>&lt;iref&gt;</code> tag.  The above text translates to:<a href="#section-7.9-3" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-7.9-4">
 <pre>
 &lt;iref item="footnote text"/&gt;
-               </pre><a href="#section-7.9-4" class="pilcrow">¶</a>
+</pre><a href="#section-7.9-4" class="pilcrow">¶</a>
 </div>
 <p id="section-7.9-5">
                Sub items are also supported. Use an exclamation mark (<code>!</code>) to separate them:<a href="#section-7.9-5" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-7.9-6">
 <pre>
 [^1]: item!sub item
-               </pre><a href="#section-7.9-6" class="pilcrow">¶</a>
+</pre><a href="#section-7.9-6" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -1153,7 +1153,7 @@
 <pre>
 allsections.pdc: section.pdc.1 section.pdc.2 section.pdc.3
         cat $@ &gt; allsections.pdc
-               </pre><a href="#section-8.1-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.1-2" class="pilcrow">¶</a>
 </div>
 <p id="section-8.1-3">
                And then process <code>allsection.pdc</code> in the normal way.<a href="#section-8.1-3" class="pilcrow">¶</a></p>
@@ -1170,14 +1170,14 @@
 <div class="artwork art-text alignLeft" id="section-8.2-2">
 <pre>
 &lt;rfc ipr="trust200902" docName="draft-gieben-writing-rfcs-pandoc-02"&gt;
-               </pre><a href="#section-8.2-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.2-2" class="pilcrow">¶</a>
 </div>
 <p id="section-8.2-3">
                The Makefile will pick this up automatically and make a symbolic link:<a href="#section-8.2-3" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-8.2-4">
 <pre>
 draft-gieben-writing-rfcs-pandoc-00.txt -&gt; draft.txt
-               </pre><a href="#section-8.2-4" class="pilcrow">¶</a>
+</pre><a href="#section-8.2-4" class="pilcrow">¶</a>
 </div>
 <p id="section-8.2-5">
                This makes uploading the file to the i-d tracker a bit easier.<a href="#section-8.2-5" class="pilcrow">¶</a></p>
@@ -1300,7 +1300,7 @@
 <pre>
 A verbatim code block
 jkasjksajassjasjsajsajkas
-               </pre><a href="#section-a.4-1" class="pilcrow">¶</a>
+</pre><a href="#section-a.4-1" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -1339,7 +1339,7 @@
         <h2 id="name-list-tests">
 <a href="#section-a.7" class="section-number selfRef">A.7. </a><a href="#name-list-tests" class="section-name selfRef">List Tests</a>
         </h2>
-<ol start="1" type="1" class="normal" id="section-a.7-1">
+<ol start="1" type="1" class="normal type-1" id="section-a.7-1">
           <li id="section-a.7-1.1">
                      First we do<a href="#section-a.7-1.1" class="pilcrow">¶</a>
 </li>
@@ -1365,7 +1365,7 @@
 <li id="section-a.7-3.2">
             <p id="section-a.7-3.2.1">
                      Then<a href="#section-a.7-3.2.1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-a.7-3.2.2">
+<ol start="1" type="1" class="normal type-1" id="section-a.7-3.2.2">
               <li id="section-a.7-3.2.2.1">
                            Something<a href="#section-a.7-3.2.2.1" class="pilcrow">¶</a>
 </li>
@@ -1393,7 +1393,7 @@
           <dt id="section-a.7-7.1">Item to explain:</dt>
 <dd id="section-a.7-7.2">
             <p id="section-a.7-7.2.1">It works because of<a href="#section-a.7-7.2.1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-a.7-7.2.2">
+<ol start="1" type="1" class="normal type-1" id="section-a.7-7.2.2">
               <li id="section-a.7-7.2.2.1">
                         One<a href="#section-a.7-7.2.2.1" class="pilcrow">¶</a>
 </li>
@@ -1408,7 +1408,7 @@
 <dt id="section-a.7-7.5">Item to explain:</dt>
 <dd id="section-a.7-7.6">
             <p id="section-a.7-7.6.1">It works because of<a href="#section-a.7-7.6.1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-a.7-7.6.2">
+<ol start="1" type="1" class="normal type-1" id="section-a.7-7.6.2">
               <li id="section-a.7-7.6.2.1">
                         One1<a href="#section-a.7-7.6.2.1" class="pilcrow">¶</a>
 </li>
@@ -1432,7 +1432,7 @@
 </dl>
 <p id="section-a.7-8">
                list with description lists.<a href="#section-a.7-8" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-a.7-9">
+<ol start="1" type="1" class="normal type-1" id="section-a.7-9">
           <li id="section-a.7-9.1">
             <p id="section-a.7-9.1.1">
                      More<a href="#section-a.7-9.1.1" class="pilcrow">¶</a></p>
@@ -1451,7 +1451,7 @@
 </ol>
 <p id="section-a.7-10">
                Multiple paragraphs in a list.<a href="#section-a.7-10" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-a.7-11">
+<ol start="1" type="1" class="normal type-1" id="section-a.7-11">
           <li id="section-a.7-11.1">
             <p id="section-a.7-11.1.1">
                      This is the first bullet point and it needs multiple paragraphs...<a href="#section-a.7-11.1.1" class="pilcrow">¶</a></p>
@@ -1466,7 +1466,7 @@
 <div class="artwork art-text alignLeft" id="section-a.7-11.3.2">
 <pre>
 Artwork
-                        </pre><a href="#section-a.7-11.3.2" class="pilcrow">¶</a>
+</pre><a href="#section-a.7-11.3.2" class="pilcrow">¶</a>
 </div>
 </li>
 <li id="section-a.7-11.4">
@@ -1478,11 +1478,11 @@
 <div class="artwork art-text alignLeft" id="section-a.7-13">
 <pre>
 &lt;vspace blankLines='1'&gt;
-               </pre><a href="#section-a.7-13" class="pilcrow">¶</a>
+</pre><a href="#section-a.7-13" class="pilcrow">¶</a>
 </div>
 <p id="section-a.7-14">
                Ordered lists.<a href="#section-a.7-14" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-a.7-15">
+<ol start="1" type="1" class="normal type-1" id="section-a.7-15">
           <li id="section-a.7-15.1">
                      First item<a href="#section-a.7-15.1" class="pilcrow">¶</a>
 </li>
@@ -1540,7 +1540,7 @@
                Text at the end.<a href="#section-a.7-23" class="pilcrow">¶</a></p>
 <p id="section-a.7-24">
                Lowercase letters list.<a href="#section-a.7-24" class="pilcrow">¶</a></p>
-<ol start="1" type="a" class="normal" id="section-a.7-25">
+<ol start="1" type="a" class="normal type-a" id="section-a.7-25">
           <li id="section-a.7-25.1">
                      First item<a href="#section-a.7-25.1" class="pilcrow">¶</a>
 </li>
@@ -1572,9 +1572,9 @@
       it. Tell something about it. Tell something about it. Tell something about it.<a href="#section-a.7-30.2.1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-a.7-30.2.2">
 <pre>
-miek.nl.    IN  NS  a.miek.nl.                             
-a.miek.nl.  IN  A   192.0.2.1    ; &lt;- this is glue            
-                     </pre><a href="#section-a.7-30.2.2" class="pilcrow">¶</a>
+miek.nl.    IN  NS  a.miek.nl.
+a.miek.nl.  IN  A   192.0.2.1    ; &lt;- this is glue
+</pre><a href="#section-a.7-30.2.2" class="pilcrow">¶</a>
 </div>
 <p id="section-a.7-30.2.3">
                      Tell some more about it. Tell some more about it. Tell some more about it.<a href="#section-a.7-30.2.3" class="pilcrow">¶</a></p>
@@ -1585,7 +1585,7 @@
 </dl>
 <p id="section-a.7-31">
                List with a sublist with a paragraph above the sublist<a href="#section-a.7-31" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-a.7-32">
+<ol start="1" type="1" class="normal type-1" id="section-a.7-32">
           <li id="section-a.7-32.1">
                      First Item<a href="#section-a.7-32.1" class="pilcrow">¶</a>
 </li>
@@ -1596,7 +1596,7 @@
             <p id="section-a.7-32.3.1">
                      Third item<a href="#section-a.7-32.3.1" class="pilcrow">¶</a></p>
 <p id="section-a.7-32.3.2"> A paragraph that comes first<a href="#section-a.7-32.3.2" class="pilcrow">¶</a></p>
-<ol start="1" type="a" class="normal" id="section-a.7-32.3.3">
+<ol start="1" type="a" class="normal type-a" id="section-a.7-32.3.3">
               <li id="section-a.7-32.3.3.1">
                            But what do you know<a href="#section-a.7-32.3.3.1" class="pilcrow">¶</a>
 </li>
@@ -1739,7 +1739,7 @@
 <div class="artwork art-text alignLeft" id="section-a.8-8">
 <pre>
 See [](#tab-here-s-the)
-               </pre><a href="#section-a.8-8" class="pilcrow">¶</a>
+</pre><a href="#section-a.8-8" class="pilcrow">¶</a>
 </div>
 <p id="section-a.8-9">
                Which will become "See <a href="#tab-here-s-the" class="xref">Table 2</a>".<a href="#section-a.8-9" class="pilcrow">¶</a></p>
@@ -1760,7 +1760,7 @@
         </h2>
 <p id="section-a.9-1">
                This is another example:<a href="#section-a.9-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-a.9-2">
+<ol start="1" type="1" class="normal type-1" id="section-a.9-2">
           <li id="section-a.9-2.1">
                      Another bla bla..<a href="#section-a.9-2.1" class="pilcrow">¶</a>
 </li>
@@ -1782,7 +1782,7 @@
 This is a figure
 This is a figure
 This is a figure
-               </pre>
+</pre>
 </div>
 <figcaption><a href="#figure-4" class="selfRef">Figure 4</a>:
 <a href="#name-this-is-the-caption-with-te" class="selfRef">This is the caption, with text in `typewriter`. Which isnt converted to a &lt;spanx&gt; style, because this is copied as-is.</a>
@@ -1796,7 +1796,7 @@
 <pre>
 This is a figure
 This is a figure
-               </pre>
+</pre>
 </div>
 <figcaption><a href="#figure-5" class="selfRef">Figure 5</a>:
 <a href="#name-a-non-centered-figure" class="selfRef">A non centered figure.</a>
@@ -1809,7 +1809,7 @@
 This is a figure with a title
 This is a figure with a title
 @title: and here it is: a title, don't mess it up *
-               </pre><a href="#section-a.10-5" class="pilcrow">¶</a>
+</pre><a href="#section-a.10-5" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
diff -Nru xml2rfc-2.39.0/tests/valid/draft-template.prepped.xml xml2rfc-2.40.0/tests/valid/draft-template.prepped.xml
--- xml2rfc-2.39.0/tests/valid/draft-template.prepped.xml	2020-01-10 23:04:16.000000000 +0000
+++ xml2rfc-2.40.0/tests/valid/draft-template.prepped.xml	2020-02-13 15:46:29.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" category="info" consensus="false" docName="draft-ietf-xml2rfc-template-05" indexInclude="true" ipr="trust200902" prepTime="2020-01-10T17:13:01" scripts="Common,Latin" sortRefs="true" submissionType="IETF" symRefs="true" tocDepth="4" tocInclude="true" xml:lang="en">
-  <!-- xml2rfc v2v3 conversion 2.37.2 -->
+<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" category="info" consensus="false" docName="draft-ietf-xml2rfc-template-05" indexInclude="true" ipr="trust200902" prepTime="2020-02-06T11:08:07" scripts="Common,Latin" sortRefs="true" submissionType="IETF" symRefs="true" tocDepth="4" tocInclude="true" xml:lang="en">
+  <!-- xml2rfc v2v3 conversion 2.39.0 -->
   
   
   
@@ -483,11 +483,11 @@
         also be colorized in HTML output to highlight the syntactic
         components. Checking of additional "types" may be provided in future
         versions of xml2rfc.</t>
-      <sourcecode name="example.c" type="" markers="true" pn="section-6-2"><![CDATA[
+      <sourcecode name="example.c" type="" markers="true" pn="section-6-2">
 
 /**** an example C program */
 
-#include <stdio.h>
+#include &lt;stdio.h&gt;
 
 void
 main(int argc, char *argv[])
@@ -495,7 +495,7 @@
     int i;
 
     printf("program arguments are:\n");
-    for (i = 0; i < argc; i++) {
+    for (i = 0; i &lt; argc; i++) {
         printf("%d: \"%s\"\n", i, argv[i]);
     }
 
@@ -504,7 +504,7 @@
 
 /* end of file */
 
-]]></sourcecode>
+</sourcecode>
     </section>
     <section anchor="Acknowledgements" numbered="true" toc="include" removeInRFC="false" pn="section-7">
       <name slugifiedName="name-acknowledgements">Acknowledgements</name>
diff -Nru xml2rfc-2.39.0/tests/valid/draft-template.v3.py27.html xml2rfc-2.40.0/tests/valid/draft-template.v3.py27.html
--- xml2rfc-2.39.0/tests/valid/draft-template.v3.py27.html	2020-01-10 23:04:16.000000000 +0000
+++ xml2rfc-2.40.0/tests/valid/draft-template.v3.py27.html	2020-02-18 20:15:35.000000000 +0000
@@ -11,7 +11,7 @@
        Insert an abstract: MANDATORY. This template is for creating an
       Internet Draft. 
     " name="description">
-<meta content="xml2rfc 2.37.2" name="generator">
+<meta content="xml2rfc 2.39.0" name="generator">
 <meta content="template" name="keyword">
 <meta content="draft-ietf-xml2rfc-template-05" name="ietf.draft">
 <link href="tests/input/draft-template.xml" type="application/rfc+xml" rel="alternate">
@@ -319,7 +319,7 @@
 </dl>
 <p id="section-5-3">Simulating more than one paragraph in a list item using
       &lt;vspace&gt;:<a href="#section-5-3" class="pilcrow">¶</a></p>
-<ol start="1" type="a" class="normal" id="section-5-4">
+<ol start="1" type="a" class="normal type-a" id="section-5-4">
         <li id="section-5-4.1">First, a short item.<a href="#section-5-4.1" class="pilcrow">¶</a>
 </li>
 <li id="section-5-4.2">
@@ -396,7 +396,7 @@
         </h3>
 <p id="section-5.3-1">Simulating more than one paragraph in a list item using
    &lt;vspace&gt;:<a href="#section-5.3-1" class="pilcrow">¶</a></p>
-<ol start="1" type="a" class="normal" id="section-5.3-2">
+<ol start="1" type="a" class="normal type-a" id="section-5.3-2">
           <li id="section-5.3-2.1">First, a short item.<a href="#section-5.3-2.1" class="pilcrow">¶</a>
 </li>
 <li id="section-5.3-2.2">
@@ -406,14 +406,14 @@
 </li>
 <li id="section-5.3-2.3">
             <p id="section-5.3-2.3.1">and a sublist, also with letters<a href="#section-5.3-2.3.1" class="pilcrow">¶</a></p>
-<ol start="1" type="A" class="normal" id="section-5.3-2.3.2">
+<ol start="1" type="A" class="normal type-A" id="section-5.3-2.3.2">
               <li id="section-5.3-2.3.2.1">first subitem<a href="#section-5.3-2.3.2.1" class="pilcrow">¶</a>
 </li>
 <li id="section-5.3-2.3.2.2">second subitem<a href="#section-5.3-2.3.2.2" class="pilcrow">¶</a>
 </li>
 <li id="section-5.3-2.3.2.3">
                 <p id="section-5.3-2.3.2.3.1">and a sub-sublist, also with letters<a href="#section-5.3-2.3.2.3.1" class="pilcrow">¶</a></p>
-<ol start="1" type="a" class="normal" id="section-5.3-2.3.2.3.2">
+<ol start="1" type="a" class="normal type-a" id="section-5.3-2.3.2.3.2">
                   <li id="section-5.3-2.3.2.3.2.1">first sub-subitem<a href="#section-5.3-2.3.2.3.2.1" class="pilcrow">¶</a>
 </li>
 <li id="section-5.3-2.3.2.3.2.2">second sub-subitem<a href="#section-5.3-2.3.2.3.2.2" class="pilcrow">¶</a>
diff -Nru xml2rfc-2.39.0/tests/valid/draft-template.v3.py35.html xml2rfc-2.40.0/tests/valid/draft-template.v3.py35.html
--- xml2rfc-2.39.0/tests/valid/draft-template.v3.py35.html	2019-12-22 18:00:56.000000000 +0000
+++ xml2rfc-2.40.0/tests/valid/draft-template.v3.py35.html	2020-02-18 20:15:35.000000000 +0000
@@ -11,7 +11,7 @@
        Insert an abstract: MANDATORY. This template is for creating an
       Internet Draft. 
     " name="description">
-<meta content="xml2rfc 2.37.0" name="generator">
+<meta content="xml2rfc 2.39.0" name="generator">
 <meta content="template" name="keyword">
 <meta content="draft-ietf-xml2rfc-template-05" name="ietf.draft">
 <link href="tests/input/draft-template.xml" type="application/rfc+xml" rel="alternate">
@@ -319,7 +319,7 @@
 </dl>
 <p id="section-5-3">Simulating more than one paragraph in a list item using
       &lt;vspace&gt;:<a href="#section-5-3" class="pilcrow">¶</a></p>
-<ol start="1" type="a" class="normal" id="section-5-4">
+<ol start="1" type="a" class="normal type-a" id="section-5-4">
         <li id="section-5-4.1">First, a short item.<a href="#section-5-4.1" class="pilcrow">¶</a>
 </li>
 <li id="section-5-4.2">
@@ -396,7 +396,7 @@
         </h3>
 <p id="section-5.3-1">Simulating more than one paragraph in a list item using
    &lt;vspace&gt;:<a href="#section-5.3-1" class="pilcrow">¶</a></p>
-<ol start="1" type="a" class="normal" id="section-5.3-2">
+<ol start="1" type="a" class="normal type-a" id="section-5.3-2">
           <li id="section-5.3-2.1">First, a short item.<a href="#section-5.3-2.1" class="pilcrow">¶</a>
 </li>
 <li id="section-5.3-2.2">
@@ -406,14 +406,14 @@
 </li>
 <li id="section-5.3-2.3">
             <p id="section-5.3-2.3.1">and a sublist, also with letters<a href="#section-5.3-2.3.1" class="pilcrow">¶</a></p>
-<ol start="1" type="A" class="normal" id="section-5.3-2.3.2">
+<ol start="1" type="A" class="normal type-A" id="section-5.3-2.3.2">
               <li id="section-5.3-2.3.2.1">first subitem<a href="#section-5.3-2.3.2.1" class="pilcrow">¶</a>
 </li>
 <li id="section-5.3-2.3.2.2">second subitem<a href="#section-5.3-2.3.2.2" class="pilcrow">¶</a>
 </li>
 <li id="section-5.3-2.3.2.3">
                 <p id="section-5.3-2.3.2.3.1">and a sub-sublist, also with letters<a href="#section-5.3-2.3.2.3.1" class="pilcrow">¶</a></p>
-<ol start="1" type="a" class="normal" id="section-5.3-2.3.2.3.2">
+<ol start="1" type="a" class="normal type-a" id="section-5.3-2.3.2.3.2">
                   <li id="section-5.3-2.3.2.3.2.1">first sub-subitem<a href="#section-5.3-2.3.2.3.2.1" class="pilcrow">¶</a>
 </li>
 <li id="section-5.3-2.3.2.3.2.2">second sub-subitem<a href="#section-5.3-2.3.2.3.2.2" class="pilcrow">¶</a>
diff -Nru xml2rfc-2.39.0/tests/valid/draft-template.v3.py36.html xml2rfc-2.40.0/tests/valid/draft-template.v3.py36.html
--- xml2rfc-2.39.0/tests/valid/draft-template.v3.py36.html	2019-12-22 18:00:56.000000000 +0000
+++ xml2rfc-2.40.0/tests/valid/draft-template.v3.py36.html	2020-02-18 20:15:35.000000000 +0000
@@ -11,7 +11,7 @@
        Insert an abstract: MANDATORY. This template is for creating an
       Internet Draft. 
     " name="description">
-<meta content="xml2rfc 2.37.0" name="generator">
+<meta content="xml2rfc 2.39.0" name="generator">
 <meta content="template" name="keyword">
 <meta content="draft-ietf-xml2rfc-template-05" name="ietf.draft">
 <link href="tests/input/draft-template.xml" rel="alternate" type="application/rfc+xml">
@@ -319,7 +319,7 @@
 </dl>
 <p id="section-5-3">Simulating more than one paragraph in a list item using
       &lt;vspace&gt;:<a href="#section-5-3" class="pilcrow">¶</a></p>
-<ol start="1" type="a" class="normal" id="section-5-4">
+<ol start="1" type="a" class="normal type-a" id="section-5-4">
         <li id="section-5-4.1">First, a short item.<a href="#section-5-4.1" class="pilcrow">¶</a>
 </li>
 <li id="section-5-4.2">
@@ -396,7 +396,7 @@
         </h3>
 <p id="section-5.3-1">Simulating more than one paragraph in a list item using
    &lt;vspace&gt;:<a href="#section-5.3-1" class="pilcrow">¶</a></p>
-<ol start="1" type="a" class="normal" id="section-5.3-2">
+<ol start="1" type="a" class="normal type-a" id="section-5.3-2">
           <li id="section-5.3-2.1">First, a short item.<a href="#section-5.3-2.1" class="pilcrow">¶</a>
 </li>
 <li id="section-5.3-2.2">
@@ -406,14 +406,14 @@
 </li>
 <li id="section-5.3-2.3">
             <p id="section-5.3-2.3.1">and a sublist, also with letters<a href="#section-5.3-2.3.1" class="pilcrow">¶</a></p>
-<ol start="1" type="A" class="normal" id="section-5.3-2.3.2">
+<ol start="1" type="A" class="normal type-A" id="section-5.3-2.3.2">
               <li id="section-5.3-2.3.2.1">first subitem<a href="#section-5.3-2.3.2.1" class="pilcrow">¶</a>
 </li>
 <li id="section-5.3-2.3.2.2">second subitem<a href="#section-5.3-2.3.2.2" class="pilcrow">¶</a>
 </li>
 <li id="section-5.3-2.3.2.3">
                 <p id="section-5.3-2.3.2.3.1">and a sub-sublist, also with letters<a href="#section-5.3-2.3.2.3.1" class="pilcrow">¶</a></p>
-<ol start="1" type="a" class="normal" id="section-5.3-2.3.2.3.2">
+<ol start="1" type="a" class="normal type-a" id="section-5.3-2.3.2.3.2">
                   <li id="section-5.3-2.3.2.3.2.1">first sub-subitem<a href="#section-5.3-2.3.2.3.2.1" class="pilcrow">¶</a>
 </li>
 <li id="section-5.3-2.3.2.3.2.2">second sub-subitem<a href="#section-5.3-2.3.2.3.2.2" class="pilcrow">¶</a>
diff -Nru xml2rfc-2.39.0/tests/valid/draft-template.v3.py37.html xml2rfc-2.40.0/tests/valid/draft-template.v3.py37.html
--- xml2rfc-2.39.0/tests/valid/draft-template.v3.py37.html	2019-12-22 18:00:56.000000000 +0000
+++ xml2rfc-2.40.0/tests/valid/draft-template.v3.py37.html	2020-02-18 20:15:35.000000000 +0000
@@ -11,7 +11,7 @@
        Insert an abstract: MANDATORY. This template is for creating an
       Internet Draft. 
     " name="description">
-<meta content="xml2rfc 2.37.0" name="generator">
+<meta content="xml2rfc 2.39.0" name="generator">
 <meta content="template" name="keyword">
 <meta content="draft-ietf-xml2rfc-template-05" name="ietf.draft">
 <link href="tests/input/draft-template.xml" rel="alternate" type="application/rfc+xml">
@@ -319,7 +319,7 @@
 </dl>
 <p id="section-5-3">Simulating more than one paragraph in a list item using
       &lt;vspace&gt;:<a href="#section-5-3" class="pilcrow">¶</a></p>
-<ol start="1" type="a" class="normal" id="section-5-4">
+<ol start="1" type="a" class="normal type-a" id="section-5-4">
         <li id="section-5-4.1">First, a short item.<a href="#section-5-4.1" class="pilcrow">¶</a>
 </li>
 <li id="section-5-4.2">
@@ -396,7 +396,7 @@
         </h3>
 <p id="section-5.3-1">Simulating more than one paragraph in a list item using
    &lt;vspace&gt;:<a href="#section-5.3-1" class="pilcrow">¶</a></p>
-<ol start="1" type="a" class="normal" id="section-5.3-2">
+<ol start="1" type="a" class="normal type-a" id="section-5.3-2">
           <li id="section-5.3-2.1">First, a short item.<a href="#section-5.3-2.1" class="pilcrow">¶</a>
 </li>
 <li id="section-5.3-2.2">
@@ -406,14 +406,14 @@
 </li>
 <li id="section-5.3-2.3">
             <p id="section-5.3-2.3.1">and a sublist, also with letters<a href="#section-5.3-2.3.1" class="pilcrow">¶</a></p>
-<ol start="1" type="A" class="normal" id="section-5.3-2.3.2">
+<ol start="1" type="A" class="normal type-A" id="section-5.3-2.3.2">
               <li id="section-5.3-2.3.2.1">first subitem<a href="#section-5.3-2.3.2.1" class="pilcrow">¶</a>
 </li>
 <li id="section-5.3-2.3.2.2">second subitem<a href="#section-5.3-2.3.2.2" class="pilcrow">¶</a>
 </li>
 <li id="section-5.3-2.3.2.3">
                 <p id="section-5.3-2.3.2.3.1">and a sub-sublist, also with letters<a href="#section-5.3-2.3.2.3.1" class="pilcrow">¶</a></p>
-<ol start="1" type="a" class="normal" id="section-5.3-2.3.2.3.2">
+<ol start="1" type="a" class="normal type-a" id="section-5.3-2.3.2.3.2">
                   <li id="section-5.3-2.3.2.3.2.1">first sub-subitem<a href="#section-5.3-2.3.2.3.2.1" class="pilcrow">¶</a>
 </li>
 <li id="section-5.3-2.3.2.3.2.2">second sub-subitem<a href="#section-5.3-2.3.2.3.2.2" class="pilcrow">¶</a>
diff -Nru xml2rfc-2.39.0/tests/valid/draft-v3-features.prepped.xml xml2rfc-2.40.0/tests/valid/draft-v3-features.prepped.xml
--- xml2rfc-2.39.0/tests/valid/draft-v3-features.prepped.xml	2020-01-10 23:04:16.000000000 +0000
+++ xml2rfc-2.40.0/tests/valid/draft-v3-features.prepped.xml	2020-02-13 15:46:29.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<rfc version="3" category="exp" docName="draft-v3-features" indexInclude="true" ipr="trust200902" prepTime="2020-01-10T18:51:15" scripts="Cherokee,Common,Cyrillic,Greek,Latin" sortRefs="true" submissionType="independent" symRefs="true" tocDepth="3" tocInclude="true">
-  <!-- xml2rfc v2v3 conversion 2.37.2 -->
+<rfc version="3" category="exp" docName="draft-v3-features" indexInclude="true" ipr="trust200902" prepTime="2020-02-06T15:01:18" scripts="Cherokee,Common,Cyrillic,Greek,Latin" sortRefs="true" submissionType="independent" symRefs="true" tocDepth="3" tocInclude="true">
+  <!-- xml2rfc v2v3 conversion 2.39.0 -->
   
   
   
@@ -76,7 +76,7 @@
         <t pn="section-boilerplate.2-2">
             This document is subject to BCP 78 and the IETF Trust's Legal
             Provisions Relating to IETF Documents
-            (http://trustee.ietf.org/license-info) in effect on the date of
+            (<eref target="http://trustee.ietf.org/license-info" brackets="none"/>) in effect on the date of
             publication of this document. Please review these documents
             carefully, as they describe your rights and restrictions with
             respect to this document.
@@ -649,7 +649,7 @@
       <t pn="section-7-6">ABNF</t>
       <sourcecode type="abnf" markers="false" pn="section-7-7">
 foo = bar
-      </sourcecode>
+</sourcecode>
     </section>
     <section numbered="true" removeInRFC="false" toc="include" pn="section-8">
       <name slugifiedName="name-svg"><tt>SVG</tt></name>
diff -Nru xml2rfc-2.39.0/tests/valid/draft-v3-features.text xml2rfc-2.40.0/tests/valid/draft-v3-features.text
--- xml2rfc-2.39.0/tests/valid/draft-v3-features.text	2020-01-10 23:04:16.000000000 +0000
+++ xml2rfc-2.40.0/tests/valid/draft-v3-features.text	2020-02-05 22:05:25.000000000 +0000
@@ -619,14 +619,11 @@
    | The_quick_brown_fox_jumps_over_the_lazy_dog |                     |
    | // comment                                  |    Source code      |
    |                                             |                     |
-   |                                             |    1.  Ordered      |
-   |                                             |        List         |
+   |                                             | 1.  Ordered List    |
    |                                             |                     |
-   |                                             |    *  Unordered     |
-   |                                             |       List          |
+   |                                             | *  Unordered List   |
    |                                             |                     |
-   |                                             |    Definition       |
-   |                                             |       List          |
+   |                                             | Definition  List    |
    +---------------------------------------------+---------------------+
 
                                   Table 9
diff -Nru xml2rfc-2.39.0/tests/valid/draft-v3-features.v3.py27.html xml2rfc-2.40.0/tests/valid/draft-v3-features.v3.py27.html
--- xml2rfc-2.39.0/tests/valid/draft-v3-features.v3.py27.html	2020-01-10 23:04:16.000000000 +0000
+++ xml2rfc-2.40.0/tests/valid/draft-v3-features.v3.py27.html	2020-02-18 20:15:35.000000000 +0000
@@ -12,7 +12,7 @@
         This document tests features introduced in xml2rfc v3 vocabulary.
        
     " name="description">
-<meta content="xml2rfc 2.37.2" name="generator">
+<meta content="xml2rfc 2.39.0" name="generator">
 <meta content="draft-v3-features" name="ietf.draft">
 <link href="tests/input/draft-v3-features.xml" type="application/rfc+xml" rel="alternate">
 <link href="#copyright" rel="license">
@@ -110,7 +110,7 @@
 <p id="section-boilerplate.2-2">
             This document is subject to BCP 78 and the IETF Trust's Legal
             Provisions Relating to IETF Documents
-            (http://trustee.ietf.org/license-info) in effect on the date of
+            (<span><a href="http://trustee.ietf.org/license-info">http://trustee.ietf.org/license-info</a></span>) in effect on the date of
             publication of this document. Please review these documents
             carefully, as they describe your rights and restrictions with
             respect to this document.<a href="#section-boilerplate.2-2" class="pilcrow">¶</a></p>
@@ -525,7 +525,7 @@
         <h3 id="name-ordered-lists">
 <a href="#section-4.2" class="section-number selfRef">4.2. </a><a href="#name-ordered-lists" class="section-name selfRef">Ordered Lists</a>
         </h3>
-<ol start="1" type="1" class="normal" id="section-4.2-1">
+<ol start="1" type="1" class="normal type-1" id="section-4.2-1">
           <div id="ol1">
 <li id="section-4.2-1.1">One<a href="#section-4.2-1.1" class="pilcrow">¶</a>
 </li>
@@ -537,7 +537,7 @@
 </ol>
 <p id="section-4.2-2">
           List item <a href="#ol1" class="xref">1</a> is "One".<a href="#section-4.2-2" class="pilcrow">¶</a></p>
-<ol start="4" type="1" class="normal" id="section-4.2-3">
+<ol start="4" type="1" class="normal type-1" id="section-4.2-3">
           <div id="ol4">
 <li id="section-4.2-3.1">
             <p id="section-4.2-3.1.1">The quick brown fox jumps over the lazy dog.<a href="#section-4.2-3.1.1" class="pilcrow">¶</a></p>
@@ -548,7 +548,7 @@
 <p id="section-4.2-4">
           List item <a href="#ol4" class="xref">4</a> is the list above.<a href="#section-4.2-4" class="pilcrow">¶</a></p>
 <div id="olt1">
-<ol start="1" type="1" class="normal" id="section-4.2-5">
+<ol start="1" type="1" class="normal type-1" id="section-4.2-5">
           <li id="section-4.2-5.1">list 1 / item 1<a href="#section-4.2-5.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2-5.2">list 1 / item 2<a href="#section-4.2-5.2" class="pilcrow">¶</a>
@@ -557,7 +557,7 @@
 </div>
 <p id="section-4.2-6">The items below should continue ordering from above.<a href="#section-4.2-6" class="pilcrow">¶</a></p>
 <div id="olt2">
-<ol start="3" type="1" class="normal" id="section-4.2-7">
+<ol start="3" type="1" class="normal type-1" id="section-4.2-7">
           <li id="section-4.2-7.1">list 1 / item 3<a href="#section-4.2-7.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2-7.2">list 1 / item 4<a href="#section-4.2-7.2" class="pilcrow">¶</a>
@@ -566,7 +566,7 @@
 </div>
 <p id="section-4.2-8">The items below should be numbered starting with 17.<a href="#section-4.2-8" class="pilcrow">¶</a></p>
 <div id="olt3">
-<ol start="17" type="1" class="normal" id="section-4.2-9">
+<ol start="17" type="1" class="normal type-1" id="section-4.2-9">
           <li id="section-4.2-9.1">list 1 / item 17<a href="#section-4.2-9.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2-9.2">list 1 / item 18<a href="#section-4.2-9.2" class="pilcrow">¶</a>
@@ -575,7 +575,7 @@
 </div>
 <p id="section-4.2-10">The items below should be numbered starting with 19.<a href="#section-4.2-10" class="pilcrow">¶</a></p>
 <div id="olt4">
-<ol start="19" type="1" class="normal" id="section-4.2-11">
+<ol start="19" type="1" class="normal type-1" id="section-4.2-11">
           <li id="section-4.2-11.1">list 1 / item 19<a href="#section-4.2-11.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2-11.2">list 1 / item 20<a href="#section-4.2-11.2" class="pilcrow">¶</a>
@@ -587,7 +587,7 @@
 <a href="#section-4.2.1" class="section-number selfRef">4.2.1. </a><a href="#name-styles" class="section-name selfRef">Styles</a>
           </h4>
 <p id="section-4.2.1-1">1<a href="#section-4.2.1-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-4.2.1-2">
+<ol start="1" type="1" class="normal type-1" id="section-4.2.1-2">
             <li id="section-4.2.1-2.1">1<a href="#section-4.2.1-2.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2.1-2.2">2<a href="#section-4.2.1-2.2" class="pilcrow">¶</a>
@@ -598,7 +598,7 @@
 </div>
 </ol>
 <p id="section-4.2.1-3">a<a href="#section-4.2.1-3" class="pilcrow">¶</a></p>
-<ol start="1" type="a" class="normal" id="section-4.2.1-4">
+<ol start="1" type="a" class="normal type-a" id="section-4.2.1-4">
             <li id="section-4.2.1-4.1">a<a href="#section-4.2.1-4.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2.1-4.2">b<a href="#section-4.2.1-4.2" class="pilcrow">¶</a>
@@ -609,7 +609,7 @@
 </div>
 </ol>
 <p id="section-4.2.1-5">A<a href="#section-4.2.1-5" class="pilcrow">¶</a></p>
-<ol start="1" type="A" class="normal" id="section-4.2.1-6">
+<ol start="1" type="A" class="normal type-A" id="section-4.2.1-6">
             <li id="section-4.2.1-6.1">A<a href="#section-4.2.1-6.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2.1-6.2">B<a href="#section-4.2.1-6.2" class="pilcrow">¶</a>
@@ -620,7 +620,7 @@
 </div>
 </ol>
 <p id="section-4.2.1-7">i<a href="#section-4.2.1-7" class="pilcrow">¶</a></p>
-<ol start="1" type="i" class="normal" id="section-4.2.1-8">
+<ol start="1" type="i" class="normal type-i" id="section-4.2.1-8">
             <li id="section-4.2.1-8.1">i<a href="#section-4.2.1-8.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2.1-8.2">ii<a href="#section-4.2.1-8.2" class="pilcrow">¶</a>
@@ -631,7 +631,7 @@
 </div>
 </ol>
 <p id="section-4.2.1-9">I<a href="#section-4.2.1-9" class="pilcrow">¶</a></p>
-<ol start="1" type="I" class="normal" id="section-4.2.1-10">
+<ol start="1" type="I" class="normal type-I" id="section-4.2.1-10">
             <li id="section-4.2.1-10.1">I<a href="#section-4.2.1-10.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2.1-10.2">II<a href="#section-4.2.1-10.2" class="pilcrow">¶</a>
@@ -768,7 +768,7 @@
           "The quick brown fox jumps over the lazy dog" is an English-language pangram - a phrase that contains all of the letters of the alphabet. It is used to show fonts and to test typewriters and computer keyboards, and in other applications involving all of the letters in the English alphabet. Owing to its brevity and coherence, it has become widely known.<a href="#section-5-2.1" class="pilcrow">¶</a></p>
 </div>
 <div id="blockquotelist">
-<ol start="1" type="1" class="normal" id="section-5-2.2">
+<ol start="1" type="1" class="normal type-1" id="section-5-2.2">
           <li id="section-5-2.2.1">one<a href="#section-5-2.2.1" class="pilcrow">¶</a>
 </li>
 <li id="section-5-2.2.2">two<a href="#section-5-2.2.2" class="pilcrow">¶</a>
@@ -829,7 +829,7 @@
 <div id="section-7-7">
 <pre class="sourcecode lang-abnf">
 foo = bar
-      </pre><a href="#section-7-7" class="pilcrow">¶</a>
+</pre><a href="#section-7-7" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-8">
@@ -1145,7 +1145,7 @@
 <div id="section-10.9-1.2.1.2.3">
 <pre class="sourcecode">Source code</pre><a href="#section-10.9-1.2.1.2.3" class="pilcrow">¶</a>
 </div>
-<ol start="1" type="1" class="normal" id="section-10.9-1.2.1.2.4">
+<ol start="1" type="1" class="normal type-1" id="section-10.9-1.2.1.2.4">
                   <li id="section-10.9-1.2.1.2.4.1">Ordered List<a href="#section-10.9-1.2.1.2.4.1" class="pilcrow">¶</a>
 </li>
 </ol>
diff -Nru xml2rfc-2.39.0/tests/valid/draft-v3-features.v3.py35.html xml2rfc-2.40.0/tests/valid/draft-v3-features.v3.py35.html
--- xml2rfc-2.39.0/tests/valid/draft-v3-features.v3.py35.html	2020-01-13 13:02:03.000000000 +0000
+++ xml2rfc-2.40.0/tests/valid/draft-v3-features.v3.py35.html	2020-02-18 20:15:35.000000000 +0000
@@ -12,7 +12,7 @@
         This document tests features introduced in xml2rfc v3 vocabulary.
        
     " name="description">
-<meta content="xml2rfc 2.37.3" name="generator">
+<meta content="xml2rfc 2.39.0" name="generator">
 <meta content="draft-v3-features" name="ietf.draft">
 <link href="tests/input/draft-v3-features.xml" type="application/rfc+xml" rel="alternate">
 <link href="#copyright" rel="license">
@@ -110,7 +110,7 @@
 <p id="section-boilerplate.2-2">
             This document is subject to BCP 78 and the IETF Trust's Legal
             Provisions Relating to IETF Documents
-            (http://trustee.ietf.org/license-info) in effect on the date of
+            (<span><a href="http://trustee.ietf.org/license-info">http://trustee.ietf.org/license-info</a></span>) in effect on the date of
             publication of this document. Please review these documents
             carefully, as they describe your rights and restrictions with
             respect to this document.<a href="#section-boilerplate.2-2" class="pilcrow">¶</a></p>
@@ -525,7 +525,7 @@
         <h3 id="name-ordered-lists">
 <a href="#section-4.2" class="section-number selfRef">4.2. </a><a href="#name-ordered-lists" class="section-name selfRef">Ordered Lists</a>
         </h3>
-<ol start="1" type="1" class="normal" id="section-4.2-1">
+<ol start="1" type="1" class="normal type-1" id="section-4.2-1">
           <div id="ol1">
 <li id="section-4.2-1.1">One<a href="#section-4.2-1.1" class="pilcrow">¶</a>
 </li>
@@ -537,7 +537,7 @@
 </ol>
 <p id="section-4.2-2">
           List item <a href="#ol1" class="xref">1</a> is "One".<a href="#section-4.2-2" class="pilcrow">¶</a></p>
-<ol start="4" type="1" class="normal" id="section-4.2-3">
+<ol start="4" type="1" class="normal type-1" id="section-4.2-3">
           <div id="ol4">
 <li id="section-4.2-3.1">
             <p id="section-4.2-3.1.1">The quick brown fox jumps over the lazy dog.<a href="#section-4.2-3.1.1" class="pilcrow">¶</a></p>
@@ -548,7 +548,7 @@
 <p id="section-4.2-4">
           List item <a href="#ol4" class="xref">4</a> is the list above.<a href="#section-4.2-4" class="pilcrow">¶</a></p>
 <div id="olt1">
-<ol start="1" type="1" class="normal" id="section-4.2-5">
+<ol start="1" type="1" class="normal type-1" id="section-4.2-5">
           <li id="section-4.2-5.1">list 1 / item 1<a href="#section-4.2-5.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2-5.2">list 1 / item 2<a href="#section-4.2-5.2" class="pilcrow">¶</a>
@@ -557,7 +557,7 @@
 </div>
 <p id="section-4.2-6">The items below should continue ordering from above.<a href="#section-4.2-6" class="pilcrow">¶</a></p>
 <div id="olt2">
-<ol start="3" type="1" class="normal" id="section-4.2-7">
+<ol start="3" type="1" class="normal type-1" id="section-4.2-7">
           <li id="section-4.2-7.1">list 1 / item 3<a href="#section-4.2-7.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2-7.2">list 1 / item 4<a href="#section-4.2-7.2" class="pilcrow">¶</a>
@@ -566,7 +566,7 @@
 </div>
 <p id="section-4.2-8">The items below should be numbered starting with 17.<a href="#section-4.2-8" class="pilcrow">¶</a></p>
 <div id="olt3">
-<ol start="17" type="1" class="normal" id="section-4.2-9">
+<ol start="17" type="1" class="normal type-1" id="section-4.2-9">
           <li id="section-4.2-9.1">list 1 / item 17<a href="#section-4.2-9.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2-9.2">list 1 / item 18<a href="#section-4.2-9.2" class="pilcrow">¶</a>
@@ -575,7 +575,7 @@
 </div>
 <p id="section-4.2-10">The items below should be numbered starting with 19.<a href="#section-4.2-10" class="pilcrow">¶</a></p>
 <div id="olt4">
-<ol start="19" type="1" class="normal" id="section-4.2-11">
+<ol start="19" type="1" class="normal type-1" id="section-4.2-11">
           <li id="section-4.2-11.1">list 1 / item 19<a href="#section-4.2-11.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2-11.2">list 1 / item 20<a href="#section-4.2-11.2" class="pilcrow">¶</a>
@@ -587,7 +587,7 @@
 <a href="#section-4.2.1" class="section-number selfRef">4.2.1. </a><a href="#name-styles" class="section-name selfRef">Styles</a>
           </h4>
 <p id="section-4.2.1-1">1<a href="#section-4.2.1-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-4.2.1-2">
+<ol start="1" type="1" class="normal type-1" id="section-4.2.1-2">
             <li id="section-4.2.1-2.1">1<a href="#section-4.2.1-2.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2.1-2.2">2<a href="#section-4.2.1-2.2" class="pilcrow">¶</a>
@@ -598,7 +598,7 @@
 </div>
 </ol>
 <p id="section-4.2.1-3">a<a href="#section-4.2.1-3" class="pilcrow">¶</a></p>
-<ol start="1" type="a" class="normal" id="section-4.2.1-4">
+<ol start="1" type="a" class="normal type-a" id="section-4.2.1-4">
             <li id="section-4.2.1-4.1">a<a href="#section-4.2.1-4.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2.1-4.2">b<a href="#section-4.2.1-4.2" class="pilcrow">¶</a>
@@ -609,7 +609,7 @@
 </div>
 </ol>
 <p id="section-4.2.1-5">A<a href="#section-4.2.1-5" class="pilcrow">¶</a></p>
-<ol start="1" type="A" class="normal" id="section-4.2.1-6">
+<ol start="1" type="A" class="normal type-A" id="section-4.2.1-6">
             <li id="section-4.2.1-6.1">A<a href="#section-4.2.1-6.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2.1-6.2">B<a href="#section-4.2.1-6.2" class="pilcrow">¶</a>
@@ -620,7 +620,7 @@
 </div>
 </ol>
 <p id="section-4.2.1-7">i<a href="#section-4.2.1-7" class="pilcrow">¶</a></p>
-<ol start="1" type="i" class="normal" id="section-4.2.1-8">
+<ol start="1" type="i" class="normal type-i" id="section-4.2.1-8">
             <li id="section-4.2.1-8.1">i<a href="#section-4.2.1-8.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2.1-8.2">ii<a href="#section-4.2.1-8.2" class="pilcrow">¶</a>
@@ -631,7 +631,7 @@
 </div>
 </ol>
 <p id="section-4.2.1-9">I<a href="#section-4.2.1-9" class="pilcrow">¶</a></p>
-<ol start="1" type="I" class="normal" id="section-4.2.1-10">
+<ol start="1" type="I" class="normal type-I" id="section-4.2.1-10">
             <li id="section-4.2.1-10.1">I<a href="#section-4.2.1-10.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2.1-10.2">II<a href="#section-4.2.1-10.2" class="pilcrow">¶</a>
@@ -768,7 +768,7 @@
           "The quick brown fox jumps over the lazy dog" is an English-language pangram - a phrase that contains all of the letters of the alphabet. It is used to show fonts and to test typewriters and computer keyboards, and in other applications involving all of the letters in the English alphabet. Owing to its brevity and coherence, it has become widely known.<a href="#section-5-2.1" class="pilcrow">¶</a></p>
 </div>
 <div id="blockquotelist">
-<ol start="1" type="1" class="normal" id="section-5-2.2">
+<ol start="1" type="1" class="normal type-1" id="section-5-2.2">
           <li id="section-5-2.2.1">one<a href="#section-5-2.2.1" class="pilcrow">¶</a>
 </li>
 <li id="section-5-2.2.2">two<a href="#section-5-2.2.2" class="pilcrow">¶</a>
@@ -829,7 +829,7 @@
 <div id="section-7-7">
 <pre class="sourcecode lang-abnf">
 foo = bar
-      </pre><a href="#section-7-7" class="pilcrow">¶</a>
+</pre><a href="#section-7-7" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-8">
@@ -1145,7 +1145,7 @@
 <div id="section-10.9-1.2.1.2.3">
 <pre class="sourcecode">Source code</pre><a href="#section-10.9-1.2.1.2.3" class="pilcrow">¶</a>
 </div>
-<ol start="1" type="1" class="normal" id="section-10.9-1.2.1.2.4">
+<ol start="1" type="1" class="normal type-1" id="section-10.9-1.2.1.2.4">
                   <li id="section-10.9-1.2.1.2.4.1">Ordered List<a href="#section-10.9-1.2.1.2.4.1" class="pilcrow">¶</a>
 </li>
 </ol>
diff -Nru xml2rfc-2.39.0/tests/valid/draft-v3-features.v3.py36.html xml2rfc-2.40.0/tests/valid/draft-v3-features.v3.py36.html
--- xml2rfc-2.39.0/tests/valid/draft-v3-features.v3.py36.html	2020-01-13 13:02:03.000000000 +0000
+++ xml2rfc-2.40.0/tests/valid/draft-v3-features.v3.py36.html	2020-02-18 20:15:35.000000000 +0000
@@ -12,7 +12,7 @@
         This document tests features introduced in xml2rfc v3 vocabulary.
        
     " name="description">
-<meta content="xml2rfc 2.37.3" name="generator">
+<meta content="xml2rfc 2.39.0" name="generator">
 <meta content="draft-v3-features" name="ietf.draft">
 <link href="tests/input/draft-v3-features.xml" rel="alternate" type="application/rfc+xml">
 <link href="#copyright" rel="license">
@@ -110,7 +110,7 @@
 <p id="section-boilerplate.2-2">
             This document is subject to BCP 78 and the IETF Trust's Legal
             Provisions Relating to IETF Documents
-            (http://trustee.ietf.org/license-info) in effect on the date of
+            (<span><a href="http://trustee.ietf.org/license-info">http://trustee.ietf.org/license-info</a></span>) in effect on the date of
             publication of this document. Please review these documents
             carefully, as they describe your rights and restrictions with
             respect to this document.<a href="#section-boilerplate.2-2" class="pilcrow">¶</a></p>
@@ -525,7 +525,7 @@
         <h3 id="name-ordered-lists">
 <a href="#section-4.2" class="section-number selfRef">4.2. </a><a href="#name-ordered-lists" class="section-name selfRef">Ordered Lists</a>
         </h3>
-<ol start="1" type="1" class="normal" id="section-4.2-1">
+<ol start="1" type="1" class="normal type-1" id="section-4.2-1">
           <div id="ol1">
 <li id="section-4.2-1.1">One<a href="#section-4.2-1.1" class="pilcrow">¶</a>
 </li>
@@ -537,7 +537,7 @@
 </ol>
 <p id="section-4.2-2">
           List item <a href="#ol1" class="xref">1</a> is "One".<a href="#section-4.2-2" class="pilcrow">¶</a></p>
-<ol start="4" type="1" class="normal" id="section-4.2-3">
+<ol start="4" type="1" class="normal type-1" id="section-4.2-3">
           <div id="ol4">
 <li id="section-4.2-3.1">
             <p id="section-4.2-3.1.1">The quick brown fox jumps over the lazy dog.<a href="#section-4.2-3.1.1" class="pilcrow">¶</a></p>
@@ -548,7 +548,7 @@
 <p id="section-4.2-4">
           List item <a href="#ol4" class="xref">4</a> is the list above.<a href="#section-4.2-4" class="pilcrow">¶</a></p>
 <div id="olt1">
-<ol start="1" type="1" class="normal" id="section-4.2-5">
+<ol start="1" type="1" class="normal type-1" id="section-4.2-5">
           <li id="section-4.2-5.1">list 1 / item 1<a href="#section-4.2-5.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2-5.2">list 1 / item 2<a href="#section-4.2-5.2" class="pilcrow">¶</a>
@@ -557,7 +557,7 @@
 </div>
 <p id="section-4.2-6">The items below should continue ordering from above.<a href="#section-4.2-6" class="pilcrow">¶</a></p>
 <div id="olt2">
-<ol start="3" type="1" class="normal" id="section-4.2-7">
+<ol start="3" type="1" class="normal type-1" id="section-4.2-7">
           <li id="section-4.2-7.1">list 1 / item 3<a href="#section-4.2-7.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2-7.2">list 1 / item 4<a href="#section-4.2-7.2" class="pilcrow">¶</a>
@@ -566,7 +566,7 @@
 </div>
 <p id="section-4.2-8">The items below should be numbered starting with 17.<a href="#section-4.2-8" class="pilcrow">¶</a></p>
 <div id="olt3">
-<ol start="17" type="1" class="normal" id="section-4.2-9">
+<ol start="17" type="1" class="normal type-1" id="section-4.2-9">
           <li id="section-4.2-9.1">list 1 / item 17<a href="#section-4.2-9.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2-9.2">list 1 / item 18<a href="#section-4.2-9.2" class="pilcrow">¶</a>
@@ -575,7 +575,7 @@
 </div>
 <p id="section-4.2-10">The items below should be numbered starting with 19.<a href="#section-4.2-10" class="pilcrow">¶</a></p>
 <div id="olt4">
-<ol start="19" type="1" class="normal" id="section-4.2-11">
+<ol start="19" type="1" class="normal type-1" id="section-4.2-11">
           <li id="section-4.2-11.1">list 1 / item 19<a href="#section-4.2-11.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2-11.2">list 1 / item 20<a href="#section-4.2-11.2" class="pilcrow">¶</a>
@@ -587,7 +587,7 @@
 <a href="#section-4.2.1" class="section-number selfRef">4.2.1. </a><a href="#name-styles" class="section-name selfRef">Styles</a>
           </h4>
 <p id="section-4.2.1-1">1<a href="#section-4.2.1-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-4.2.1-2">
+<ol start="1" type="1" class="normal type-1" id="section-4.2.1-2">
             <li id="section-4.2.1-2.1">1<a href="#section-4.2.1-2.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2.1-2.2">2<a href="#section-4.2.1-2.2" class="pilcrow">¶</a>
@@ -598,7 +598,7 @@
 </div>
 </ol>
 <p id="section-4.2.1-3">a<a href="#section-4.2.1-3" class="pilcrow">¶</a></p>
-<ol start="1" type="a" class="normal" id="section-4.2.1-4">
+<ol start="1" type="a" class="normal type-a" id="section-4.2.1-4">
             <li id="section-4.2.1-4.1">a<a href="#section-4.2.1-4.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2.1-4.2">b<a href="#section-4.2.1-4.2" class="pilcrow">¶</a>
@@ -609,7 +609,7 @@
 </div>
 </ol>
 <p id="section-4.2.1-5">A<a href="#section-4.2.1-5" class="pilcrow">¶</a></p>
-<ol start="1" type="A" class="normal" id="section-4.2.1-6">
+<ol start="1" type="A" class="normal type-A" id="section-4.2.1-6">
             <li id="section-4.2.1-6.1">A<a href="#section-4.2.1-6.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2.1-6.2">B<a href="#section-4.2.1-6.2" class="pilcrow">¶</a>
@@ -620,7 +620,7 @@
 </div>
 </ol>
 <p id="section-4.2.1-7">i<a href="#section-4.2.1-7" class="pilcrow">¶</a></p>
-<ol start="1" type="i" class="normal" id="section-4.2.1-8">
+<ol start="1" type="i" class="normal type-i" id="section-4.2.1-8">
             <li id="section-4.2.1-8.1">i<a href="#section-4.2.1-8.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2.1-8.2">ii<a href="#section-4.2.1-8.2" class="pilcrow">¶</a>
@@ -631,7 +631,7 @@
 </div>
 </ol>
 <p id="section-4.2.1-9">I<a href="#section-4.2.1-9" class="pilcrow">¶</a></p>
-<ol start="1" type="I" class="normal" id="section-4.2.1-10">
+<ol start="1" type="I" class="normal type-I" id="section-4.2.1-10">
             <li id="section-4.2.1-10.1">I<a href="#section-4.2.1-10.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2.1-10.2">II<a href="#section-4.2.1-10.2" class="pilcrow">¶</a>
@@ -768,7 +768,7 @@
           "The quick brown fox jumps over the lazy dog" is an English-language pangram - a phrase that contains all of the letters of the alphabet. It is used to show fonts and to test typewriters and computer keyboards, and in other applications involving all of the letters in the English alphabet. Owing to its brevity and coherence, it has become widely known.<a href="#section-5-2.1" class="pilcrow">¶</a></p>
 </div>
 <div id="blockquotelist">
-<ol start="1" type="1" class="normal" id="section-5-2.2">
+<ol start="1" type="1" class="normal type-1" id="section-5-2.2">
           <li id="section-5-2.2.1">one<a href="#section-5-2.2.1" class="pilcrow">¶</a>
 </li>
 <li id="section-5-2.2.2">two<a href="#section-5-2.2.2" class="pilcrow">¶</a>
@@ -829,7 +829,7 @@
 <div id="section-7-7">
 <pre class="sourcecode lang-abnf">
 foo = bar
-      </pre><a href="#section-7-7" class="pilcrow">¶</a>
+</pre><a href="#section-7-7" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-8">
@@ -1145,7 +1145,7 @@
 <div id="section-10.9-1.2.1.2.3">
 <pre class="sourcecode">Source code</pre><a href="#section-10.9-1.2.1.2.3" class="pilcrow">¶</a>
 </div>
-<ol start="1" type="1" class="normal" id="section-10.9-1.2.1.2.4">
+<ol start="1" type="1" class="normal type-1" id="section-10.9-1.2.1.2.4">
                   <li id="section-10.9-1.2.1.2.4.1">Ordered List<a href="#section-10.9-1.2.1.2.4.1" class="pilcrow">¶</a>
 </li>
 </ol>
diff -Nru xml2rfc-2.39.0/tests/valid/draft-v3-features.v3.py37.html xml2rfc-2.40.0/tests/valid/draft-v3-features.v3.py37.html
--- xml2rfc-2.39.0/tests/valid/draft-v3-features.v3.py37.html	2020-01-13 13:02:03.000000000 +0000
+++ xml2rfc-2.40.0/tests/valid/draft-v3-features.v3.py37.html	2020-02-18 20:15:35.000000000 +0000
@@ -12,7 +12,7 @@
         This document tests features introduced in xml2rfc v3 vocabulary.
        
     " name="description">
-<meta content="xml2rfc 2.37.3" name="generator">
+<meta content="xml2rfc 2.39.0" name="generator">
 <meta content="draft-v3-features" name="ietf.draft">
 <link href="tests/input/draft-v3-features.xml" rel="alternate" type="application/rfc+xml">
 <link href="#copyright" rel="license">
@@ -110,7 +110,7 @@
 <p id="section-boilerplate.2-2">
             This document is subject to BCP 78 and the IETF Trust's Legal
             Provisions Relating to IETF Documents
-            (http://trustee.ietf.org/license-info) in effect on the date of
+            (<span><a href="http://trustee.ietf.org/license-info">http://trustee.ietf.org/license-info</a></span>) in effect on the date of
             publication of this document. Please review these documents
             carefully, as they describe your rights and restrictions with
             respect to this document.<a href="#section-boilerplate.2-2" class="pilcrow">¶</a></p>
@@ -525,7 +525,7 @@
         <h3 id="name-ordered-lists">
 <a href="#section-4.2" class="section-number selfRef">4.2. </a><a href="#name-ordered-lists" class="section-name selfRef">Ordered Lists</a>
         </h3>
-<ol start="1" type="1" class="normal" id="section-4.2-1">
+<ol start="1" type="1" class="normal type-1" id="section-4.2-1">
           <div id="ol1">
 <li id="section-4.2-1.1">One<a href="#section-4.2-1.1" class="pilcrow">¶</a>
 </li>
@@ -537,7 +537,7 @@
 </ol>
 <p id="section-4.2-2">
           List item <a href="#ol1" class="xref">1</a> is "One".<a href="#section-4.2-2" class="pilcrow">¶</a></p>
-<ol start="4" type="1" class="normal" id="section-4.2-3">
+<ol start="4" type="1" class="normal type-1" id="section-4.2-3">
           <div id="ol4">
 <li id="section-4.2-3.1">
             <p id="section-4.2-3.1.1">The quick brown fox jumps over the lazy dog.<a href="#section-4.2-3.1.1" class="pilcrow">¶</a></p>
@@ -548,7 +548,7 @@
 <p id="section-4.2-4">
           List item <a href="#ol4" class="xref">4</a> is the list above.<a href="#section-4.2-4" class="pilcrow">¶</a></p>
 <div id="olt1">
-<ol start="1" type="1" class="normal" id="section-4.2-5">
+<ol start="1" type="1" class="normal type-1" id="section-4.2-5">
           <li id="section-4.2-5.1">list 1 / item 1<a href="#section-4.2-5.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2-5.2">list 1 / item 2<a href="#section-4.2-5.2" class="pilcrow">¶</a>
@@ -557,7 +557,7 @@
 </div>
 <p id="section-4.2-6">The items below should continue ordering from above.<a href="#section-4.2-6" class="pilcrow">¶</a></p>
 <div id="olt2">
-<ol start="3" type="1" class="normal" id="section-4.2-7">
+<ol start="3" type="1" class="normal type-1" id="section-4.2-7">
           <li id="section-4.2-7.1">list 1 / item 3<a href="#section-4.2-7.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2-7.2">list 1 / item 4<a href="#section-4.2-7.2" class="pilcrow">¶</a>
@@ -566,7 +566,7 @@
 </div>
 <p id="section-4.2-8">The items below should be numbered starting with 17.<a href="#section-4.2-8" class="pilcrow">¶</a></p>
 <div id="olt3">
-<ol start="17" type="1" class="normal" id="section-4.2-9">
+<ol start="17" type="1" class="normal type-1" id="section-4.2-9">
           <li id="section-4.2-9.1">list 1 / item 17<a href="#section-4.2-9.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2-9.2">list 1 / item 18<a href="#section-4.2-9.2" class="pilcrow">¶</a>
@@ -575,7 +575,7 @@
 </div>
 <p id="section-4.2-10">The items below should be numbered starting with 19.<a href="#section-4.2-10" class="pilcrow">¶</a></p>
 <div id="olt4">
-<ol start="19" type="1" class="normal" id="section-4.2-11">
+<ol start="19" type="1" class="normal type-1" id="section-4.2-11">
           <li id="section-4.2-11.1">list 1 / item 19<a href="#section-4.2-11.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2-11.2">list 1 / item 20<a href="#section-4.2-11.2" class="pilcrow">¶</a>
@@ -587,7 +587,7 @@
 <a href="#section-4.2.1" class="section-number selfRef">4.2.1. </a><a href="#name-styles" class="section-name selfRef">Styles</a>
           </h4>
 <p id="section-4.2.1-1">1<a href="#section-4.2.1-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-4.2.1-2">
+<ol start="1" type="1" class="normal type-1" id="section-4.2.1-2">
             <li id="section-4.2.1-2.1">1<a href="#section-4.2.1-2.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2.1-2.2">2<a href="#section-4.2.1-2.2" class="pilcrow">¶</a>
@@ -598,7 +598,7 @@
 </div>
 </ol>
 <p id="section-4.2.1-3">a<a href="#section-4.2.1-3" class="pilcrow">¶</a></p>
-<ol start="1" type="a" class="normal" id="section-4.2.1-4">
+<ol start="1" type="a" class="normal type-a" id="section-4.2.1-4">
             <li id="section-4.2.1-4.1">a<a href="#section-4.2.1-4.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2.1-4.2">b<a href="#section-4.2.1-4.2" class="pilcrow">¶</a>
@@ -609,7 +609,7 @@
 </div>
 </ol>
 <p id="section-4.2.1-5">A<a href="#section-4.2.1-5" class="pilcrow">¶</a></p>
-<ol start="1" type="A" class="normal" id="section-4.2.1-6">
+<ol start="1" type="A" class="normal type-A" id="section-4.2.1-6">
             <li id="section-4.2.1-6.1">A<a href="#section-4.2.1-6.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2.1-6.2">B<a href="#section-4.2.1-6.2" class="pilcrow">¶</a>
@@ -620,7 +620,7 @@
 </div>
 </ol>
 <p id="section-4.2.1-7">i<a href="#section-4.2.1-7" class="pilcrow">¶</a></p>
-<ol start="1" type="i" class="normal" id="section-4.2.1-8">
+<ol start="1" type="i" class="normal type-i" id="section-4.2.1-8">
             <li id="section-4.2.1-8.1">i<a href="#section-4.2.1-8.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2.1-8.2">ii<a href="#section-4.2.1-8.2" class="pilcrow">¶</a>
@@ -631,7 +631,7 @@
 </div>
 </ol>
 <p id="section-4.2.1-9">I<a href="#section-4.2.1-9" class="pilcrow">¶</a></p>
-<ol start="1" type="I" class="normal" id="section-4.2.1-10">
+<ol start="1" type="I" class="normal type-I" id="section-4.2.1-10">
             <li id="section-4.2.1-10.1">I<a href="#section-4.2.1-10.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4.2.1-10.2">II<a href="#section-4.2.1-10.2" class="pilcrow">¶</a>
@@ -768,7 +768,7 @@
           "The quick brown fox jumps over the lazy dog" is an English-language pangram - a phrase that contains all of the letters of the alphabet. It is used to show fonts and to test typewriters and computer keyboards, and in other applications involving all of the letters in the English alphabet. Owing to its brevity and coherence, it has become widely known.<a href="#section-5-2.1" class="pilcrow">¶</a></p>
 </div>
 <div id="blockquotelist">
-<ol start="1" type="1" class="normal" id="section-5-2.2">
+<ol start="1" type="1" class="normal type-1" id="section-5-2.2">
           <li id="section-5-2.2.1">one<a href="#section-5-2.2.1" class="pilcrow">¶</a>
 </li>
 <li id="section-5-2.2.2">two<a href="#section-5-2.2.2" class="pilcrow">¶</a>
@@ -829,7 +829,7 @@
 <div id="section-7-7">
 <pre class="sourcecode lang-abnf">
 foo = bar
-      </pre><a href="#section-7-7" class="pilcrow">¶</a>
+</pre><a href="#section-7-7" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-8">
@@ -1145,7 +1145,7 @@
 <div id="section-10.9-1.2.1.2.3">
 <pre class="sourcecode">Source code</pre><a href="#section-10.9-1.2.1.2.3" class="pilcrow">¶</a>
 </div>
-<ol start="1" type="1" class="normal" id="section-10.9-1.2.1.2.4">
+<ol start="1" type="1" class="normal type-1" id="section-10.9-1.2.1.2.4">
                   <li id="section-10.9-1.2.1.2.4.1">Ordered List<a href="#section-10.9-1.2.1.2.4.1" class="pilcrow">¶</a>
 </li>
 </ol>
diff -Nru xml2rfc-2.39.0/tests/valid/elements.prepped.xml xml2rfc-2.40.0/tests/valid/elements.prepped.xml
--- xml2rfc-2.39.0/tests/valid/elements.prepped.xml	2020-01-18 15:12:19.000000000 +0000
+++ xml2rfc-2.40.0/tests/valid/elements.prepped.xml	2020-02-18 20:15:35.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" category="info" docName="elements-00" indexInclude="false" ipr="trust200902" obsoletes="1234,5678,9012,3456,7890" prepTime="2020-01-16T15:46:21" scripts="Cherokee,Common,Greek,Han,Hebrew,Latin" sortRefs="true" submissionType="independent" symRefs="true" tocDepth="3" tocInclude="true">
+<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" category="info" docName="elements-00" indexInclude="false" ipr="trust200902" obsoletes="1234,5678,9012,3456,7890" prepTime="2020-02-16T21:54:00" scripts="Cherokee,Common,Greek,Han,Hebrew,Latin" sortRefs="true" submissionType="independent" symRefs="true" tocDepth="3" tocInclude="true">
   
    
    
@@ -7,7 +7,7 @@
    
    
    <front>
-    <title abbrev="Xml2rfc Vocabulary V3 Elements">Xml2rfc Vocabulary V3 Elements
Combined Test File</title>
+    <title abbrev="Xml2rfc Vocabulary V3 Elements">Xml2rfc Vocabulary V3 Elements<br/>Combined Test File</title>
     <author fullname="An Author">
       <organization showOnFrontPage="false">ElfTools</organization>
       <address>
@@ -103,7 +103,7 @@
         <t pn="section-boilerplate.2-2">
             This document is subject to BCP 78 and the IETF Trust's Legal
             Provisions Relating to IETF Documents
-            (https://trustee.ietf.org/license-info) in effect on the date of
+            (<eref target="https://trustee.ietf.org/license-info" brackets="none"/>) in effect on the date of
             publication of this document. Please review these documents
             carefully, as they describe your rights and restrictions with
             respect to this document.
@@ -392,7 +392,7 @@
                   Unordered list, third bullet, element t.  Quid? si nos non interpretum fungimur munere, sed tuemur ea, quae audiebamus, conferebamus, neque erat umquam controversia, quid ego intellegerem, sed quid probarem.  Extremum autem esse bonorum eum voluptate vivere.  Sic faciam igitur, inquit: unam rem explicabo, eamque maximam, de physicis alias, et quidem locis pluribus. 
           </t>
           <artwork align="left" pn="section-3-1.3.2">
-        Unordered list, third bullet, second element:
+        Unordered list, third bullet, second element:  <!-- Comment inside artwork -->
         +-------------------------------------------+
         |                                           |       
         |                  Artwork                  |       
@@ -425,7 +425,7 @@
           <sourcecode name="sample.py" markers="true" pn="section-3-1.3.6">
                   # Unordered list, third bullet, sixth element
                   A = 1;
-               </sourcecode>
+</sourcecode>
           <ul bare="false" empty="false" spacing="normal" pn="section-3-1.3.7">
             <li pn="section-3-1.3.7.1">Unordered list, third bullet, seventh element: Unordered list, element li. Text only.</li>
             <li pn="section-3-1.3.7.2">
@@ -524,7 +524,7 @@
           <sourcecode markers="false" pn="section-4-2.1.6">
                   # Ordered list, third bullet, sixth element
                   A = 1;
-               </sourcecode>
+</sourcecode>
           <ul bare="false" empty="false" spacing="normal" pn="section-4-2.1.7">
             <li pn="section-4-2.1.7.1">Ordered list, third bullet, seventh element: Unordered list, element li. Text only.</li>
             <li pn="section-4-2.1.7.2">
@@ -602,7 +602,7 @@
           <sourcecode markers="false" pn="section-5-1.6.6">
                   # Definition list, third bullet, sixth element
                   A = 1;
-               </sourcecode>
+</sourcecode>
           <ul bare="false" empty="false" spacing="normal" pn="section-5-1.6.7">
             <li pn="section-5-1.6.7.1">Definition list, third bullet, seventh element: Unordered list, element li. Text only.</li>
             <li pn="section-5-1.6.7.2">
@@ -1021,7 +1021,7 @@
       </aside>
       <aside pn="section-9-6">
         <t pn="section-9-6.1">
-               This sentence |
 has <strong>three</strong> forced breaks |
 in order to be displayed |
 on multiple lines.
+               This sentence |<br/> has <strong>three</strong> forced breaks |<br/> in order to be displayed |<br/> on multiple lines.
                This second sentence does not have a forced break, and should end up being wrapped.
         </t>
       </aside>
@@ -1076,7 +1076,7 @@
     esac
     shift
 done
-         </sourcecode>
+</sourcecode>
       <t pn="section-13-3">Source code within a figure:</t>
       <figure align="left" suppress-title="false" pn="figure-4">
         <name slugifiedName="name-sourcecode-within-figure">Sourcecode within figure</name>
@@ -1090,7 +1090,7 @@
         sys.exit(0)
     elif opt in ["-V", "--verbose"]: # Output version information
         opt_verbose = True
-            </sourcecode>
+</sourcecode>
       </figure>
     </section>
     <section numbered="true" removeInRFC="false" toc="include" pn="section-14">
diff -Nru xml2rfc-2.39.0/tests/valid/elements.v3.py27.html xml2rfc-2.40.0/tests/valid/elements.v3.py27.html
--- xml2rfc-2.39.0/tests/valid/elements.v3.py27.html	2020-01-18 15:12:19.000000000 +0000
+++ xml2rfc-2.40.0/tests/valid/elements.v3.py27.html	2020-02-18 20:15:35.000000000 +0000
@@ -11,7 +11,7 @@
 <meta content="No Org" name="author">
 <meta content="Bon Aventure" name="author">
 <meta content="International Association for Cryptologic Research" name="author">
-<meta content="xml2rfc 2.37.2" name="generator">
+<meta content="xml2rfc 2.39.0" name="generator">
 <meta content="elements-00" name="ietf.draft">
 <link href="tests/input/elements.xml" type="application/rfc+xml" rel="alternate">
 <link href="#copyright" rel="license">
@@ -110,7 +110,7 @@
 <p id="section-boilerplate.2-2">
             This document is subject to BCP 78 and the IETF Trust's Legal
             Provisions Relating to IETF Documents
-            (https://trustee.ietf.org/license-info) in effect on the date of
+            (<span><a href="https://trustee.ietf.org/license-info">https://trustee.ietf.org/license-info</a></span>) in effect on the date of
             publication of this document. Please review these documents
             carefully, as they describe your rights and restrictions with
             respect to this document.<a href="#section-boilerplate.2-2" class="pilcrow">¶</a></p>
@@ -402,11 +402,11 @@
 <pre>
         Unordered list, third bullet, second element:
         +-------------------------------------------+
-        |                                           |       
-        |                  Artwork                  |       
-        |                                           |       
+        |                                           |
+        |                  Artwork                  |
+        |                                           |
         +-------------------------------------------+
-               </pre><a href="#section-3-1.3.2" class="pilcrow">¶</a>
+</pre><a href="#section-3-1.3.2" class="pilcrow">¶</a>
 </div>
 <dl class="dlParallel" id="section-3-1.3.3">
             <dt id="section-3-1.3.3.1">Unordered list, third bullet, third element: Definition list, element dt.</dt>
@@ -421,7 +421,7 @@
                     Figure
                         Figure
                            Figure
-                  </pre>
+</pre>
 </div>
 <figcaption><a href="#figure-1" class="selfRef">Figure 1</a>:
 <a href="#name-some-figure-name" class="selfRef">Some figure name</a>
@@ -443,7 +443,7 @@
 
                   # Unordered list, third bullet, sixth element
                   A = 1;
-               
+
 &lt;CODE ENDS&gt;</pre><a href="#section-3-1.3.6" class="pilcrow">¶</a>
 </div>
 <ul>
@@ -483,7 +483,7 @@
       <h2 id="name-ordered-list-with-sub-eleme">
 <a href="#section-4" class="section-number selfRef">4. </a><a href="#name-ordered-list-with-sub-eleme" class="section-name selfRef">Ordered list with sub-elements</a>
       </h2>
-<ol start="1" type="1" class="normal" id="section-4-1">
+<ol start="1" type="1" class="normal type-1" id="section-4-1">
         <li id="section-4-1.1">
                Ordered list, first bullet.<a href="#section-4-1.1" class="pilcrow">¶</a>
 </li>
@@ -491,7 +491,7 @@
                Ordered list, second bullet. Text only. Octavio fuit, cum illam severitatem in eo non arbitrantur. erunt etiam, et ii quidem eruditi Graecis litteris, contemnentes Latinas, qui se plane Graecum dici velit, ut a Scaevola est praetore salutatus Athenis Albucius.  In physicis plurimum posuit. ea scientia et verborum vis et natura orationis et consequentium repugnantiumve ratio potest perspici.<a href="#section-4-1.2" class="pilcrow">¶</a>
 </li>
 </ol>
-<ol start="3" type="1" class="normal" id="section-4-2">
+<ol start="3" type="1" class="normal type-1" id="section-4-2">
         <li id="section-4-2.1">
           <p id="section-4-2.1.1">
                   Ordered list, third bullet, element t.  Quid? si nos non interpretum fungimur munere, sed tuemur ea, quae audiebamus, conferebamus, neque erat umquam controversia, quid ego intellegerem, sed quid probarem.  Extremum autem esse bonorum eum voluptate vivere.  Sic faciam igitur, inquit: unam rem explicabo, eamque maximam, de physicis alias, et quidem locis pluribus.<a href="#section-4-2.1.1" class="pilcrow">¶</a></p>
@@ -499,11 +499,11 @@
 <pre>
         Ordered list, third bullet, second element:
         +-------------------------------------------+
-        |                                           |       
-        |                  Artwork                  |       
-        |                                           |       
+        |                                           |
+        |                  Artwork                  |
+        |                                           |
         +-------------------------------------------+
-               </pre><a href="#section-4-2.1.2" class="pilcrow">¶</a>
+</pre><a href="#section-4-2.1.2" class="pilcrow">¶</a>
 </div>
 <dl class="dlParallel" id="section-4-2.1.3">
             <dt id="section-4-2.1.3.1">Ordered list, third bullet, third element: Definition list, element dt.</dt>
@@ -518,12 +518,12 @@
                     Figure
                         Figure
                            Figure
-                  </pre>
+</pre>
 </div>
 <figcaption><a href="#figure-2" class="selfRef">Figure 2</a>:
 <a href="#name-some-figure-name-2" class="selfRef">Some figure name</a>
             </figcaption></figure>
-<ol start="1" type="1" class="normal" id="section-4-2.1.5">
+<ol start="1" type="1" class="normal type-1" id="section-4-2.1.5">
             <li id="section-4-2.1.5.1">Ordered list, third bullet, fifth element: Ordered list, element li.  Text only.<a href="#section-4-2.1.5.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4-2.1.5.2">
@@ -535,7 +535,7 @@
 <pre class="sourcecode">
                   # Ordered list, third bullet, sixth element
                   A = 1;
-               </pre><a href="#section-4-2.1.6" class="pilcrow">¶</a>
+</pre><a href="#section-4-2.1.6" class="pilcrow">¶</a>
 </div>
 <ul>
 <li id="section-4-2.1.7.1">Ordered list, third bullet, seventh element: Unordered list, element li. Text only.<a href="#section-4-2.1.7.1" class="pilcrow">¶</a>
@@ -577,11 +577,11 @@
 <pre>
         Definition list, third bullet, second element:
         +-------------------------------------------+
-        |                                           |       
-        |                  Artwork                  |       
-        |                                           |       
+        |                                           |
+        |                  Artwork                  |
+        |                                           |
         +-------------------------------------------+
-               </pre><a href="#section-5-1.6.2" class="pilcrow">¶</a>
+</pre><a href="#section-5-1.6.2" class="pilcrow">¶</a>
 </div>
 <dl class="dlParallel" id="section-5-1.6.3">
             <dt id="section-5-1.6.3.1">Definition list, third bullet, third element: Definition list, element dt.</dt>
@@ -596,12 +596,12 @@
                     Figure
                         Figure
                            Figure
-                  </pre>
+</pre>
 </div>
 <figcaption><a href="#figure-3" class="selfRef">Figure 3</a>:
 <a href="#name-some-figure-name-3" class="selfRef">Some figure name</a>
             </figcaption></figure>
-<ol start="1" type="1" class="normal" id="section-5-1.6.5">
+<ol start="1" type="1" class="normal type-1" id="section-5-1.6.5">
             <li id="section-5-1.6.5.1">Definition list, third bullet, fifth element: Ordered list, element li.  Text only.<a href="#section-5-1.6.5.1" class="pilcrow">¶</a>
 </li>
 <li id="section-5-1.6.5.2">
@@ -631,7 +631,7 @@
 <pre class="sourcecode">
                   # Definition list, third bullet, sixth element
                   A = 1;
-               </pre><a href="#section-5-1.6.6" class="pilcrow">¶</a>
+</pre><a href="#section-5-1.6.6" class="pilcrow">¶</a>
 </div>
 <ul>
 <li id="section-5-1.6.7.1">Definition list, third bullet, seventh element: Unordered list, element li. Text only.<a href="#section-5-1.6.7.1" class="pilcrow">¶</a>
@@ -665,11 +665,11 @@
       +     +     +-----+-----+
       |     |     |           |
       +-----+     +-----+-----+
-      |     |     |     |     |     
+      |     |     |     |     |
       +=====+=====+=====+=====+
       |     |     |     |     |
       +-----+-----+-----+-----+
-         </pre><a href="#section-6-1" class="pilcrow">¶</a>
+</pre><a href="#section-6-1" class="pilcrow">¶</a>
 </div>
 <span id="name-header-footer-colspan-and-r"></span><table class="center" id="table-1">
         <caption>
@@ -1163,7 +1163,7 @@
     esac
     shift
 done
-         </pre><a href="#section-13-2" class="pilcrow">¶</a>
+</pre><a href="#section-13-2" class="pilcrow">¶</a>
 </div>
 <p id="section-13-3">Source code within a figure:<a href="#section-13-3" class="pilcrow">¶</a></p>
 <span id="name-sourcecode-within-figure"></span><figure id="figure-4">
@@ -1178,7 +1178,7 @@
         sys.exit(0)
     elif opt in ["-V", "--verbose"]: # Output version information
         opt_verbose = True
-            </pre>
+</pre>
 </div>
 <figcaption><a href="#figure-4" class="selfRef">Figure 4</a>:
 <a href="#name-sourcecode-within-figure" class="selfRef">Sourcecode within figure</a>
diff -Nru xml2rfc-2.39.0/tests/valid/elements.v3.py35.html xml2rfc-2.40.0/tests/valid/elements.v3.py35.html
--- xml2rfc-2.39.0/tests/valid/elements.v3.py35.html	2020-01-18 15:12:19.000000000 +0000
+++ xml2rfc-2.40.0/tests/valid/elements.v3.py35.html	2020-02-18 20:15:35.000000000 +0000
@@ -11,7 +11,7 @@
 <meta content="No Org" name="author">
 <meta content="Bon Aventure" name="author">
 <meta content="International Association for Cryptologic Research" name="author">
-<meta content="xml2rfc 2.37.3" name="generator">
+<meta content="xml2rfc 2.39.0" name="generator">
 <meta content="elements-00" name="ietf.draft">
 <link href="tests/input/elements.xml" type="application/rfc+xml" rel="alternate">
 <link href="#copyright" rel="license">
@@ -110,7 +110,7 @@
 <p id="section-boilerplate.2-2">
             This document is subject to BCP 78 and the IETF Trust's Legal
             Provisions Relating to IETF Documents
-            (https://trustee.ietf.org/license-info) in effect on the date of
+            (<span><a href="https://trustee.ietf.org/license-info">https://trustee.ietf.org/license-info</a></span>) in effect on the date of
             publication of this document. Please review these documents
             carefully, as they describe your rights and restrictions with
             respect to this document.<a href="#section-boilerplate.2-2" class="pilcrow">¶</a></p>
@@ -402,11 +402,11 @@
 <pre>
         Unordered list, third bullet, second element:
         +-------------------------------------------+
-        |                                           |       
-        |                  Artwork                  |       
-        |                                           |       
+        |                                           |
+        |                  Artwork                  |
+        |                                           |
         +-------------------------------------------+
-               </pre><a href="#section-3-1.3.2" class="pilcrow">¶</a>
+</pre><a href="#section-3-1.3.2" class="pilcrow">¶</a>
 </div>
 <dl class="dlParallel" id="section-3-1.3.3">
             <dt id="section-3-1.3.3.1">Unordered list, third bullet, third element: Definition list, element dt.</dt>
@@ -421,7 +421,7 @@
                     Figure
                         Figure
                            Figure
-                  </pre>
+</pre>
 </div>
 <figcaption><a href="#figure-1" class="selfRef">Figure 1</a>:
 <a href="#name-some-figure-name" class="selfRef">Some figure name</a>
@@ -443,7 +443,7 @@
 
                   # Unordered list, third bullet, sixth element
                   A = 1;
-               
+
 &lt;CODE ENDS&gt;</pre><a href="#section-3-1.3.6" class="pilcrow">¶</a>
 </div>
 <ul>
@@ -483,7 +483,7 @@
       <h2 id="name-ordered-list-with-sub-eleme">
 <a href="#section-4" class="section-number selfRef">4. </a><a href="#name-ordered-list-with-sub-eleme" class="section-name selfRef">Ordered list with sub-elements</a>
       </h2>
-<ol start="1" type="1" class="normal" id="section-4-1">
+<ol start="1" type="1" class="normal type-1" id="section-4-1">
         <li id="section-4-1.1">
                Ordered list, first bullet.<a href="#section-4-1.1" class="pilcrow">¶</a>
 </li>
@@ -491,7 +491,7 @@
                Ordered list, second bullet. Text only. Octavio fuit, cum illam severitatem in eo non arbitrantur. erunt etiam, et ii quidem eruditi Graecis litteris, contemnentes Latinas, qui se plane Graecum dici velit, ut a Scaevola est praetore salutatus Athenis Albucius.  In physicis plurimum posuit. ea scientia et verborum vis et natura orationis et consequentium repugnantiumve ratio potest perspici.<a href="#section-4-1.2" class="pilcrow">¶</a>
 </li>
 </ol>
-<ol start="3" type="1" class="normal" id="section-4-2">
+<ol start="3" type="1" class="normal type-1" id="section-4-2">
         <li id="section-4-2.1">
           <p id="section-4-2.1.1">
                   Ordered list, third bullet, element t.  Quid? si nos non interpretum fungimur munere, sed tuemur ea, quae audiebamus, conferebamus, neque erat umquam controversia, quid ego intellegerem, sed quid probarem.  Extremum autem esse bonorum eum voluptate vivere.  Sic faciam igitur, inquit: unam rem explicabo, eamque maximam, de physicis alias, et quidem locis pluribus.<a href="#section-4-2.1.1" class="pilcrow">¶</a></p>
@@ -499,11 +499,11 @@
 <pre>
         Ordered list, third bullet, second element:
         +-------------------------------------------+
-        |                                           |       
-        |                  Artwork                  |       
-        |                                           |       
+        |                                           |
+        |                  Artwork                  |
+        |                                           |
         +-------------------------------------------+
-               </pre><a href="#section-4-2.1.2" class="pilcrow">¶</a>
+</pre><a href="#section-4-2.1.2" class="pilcrow">¶</a>
 </div>
 <dl class="dlParallel" id="section-4-2.1.3">
             <dt id="section-4-2.1.3.1">Ordered list, third bullet, third element: Definition list, element dt.</dt>
@@ -518,12 +518,12 @@
                     Figure
                         Figure
                            Figure
-                  </pre>
+</pre>
 </div>
 <figcaption><a href="#figure-2" class="selfRef">Figure 2</a>:
 <a href="#name-some-figure-name-2" class="selfRef">Some figure name</a>
             </figcaption></figure>
-<ol start="1" type="1" class="normal" id="section-4-2.1.5">
+<ol start="1" type="1" class="normal type-1" id="section-4-2.1.5">
             <li id="section-4-2.1.5.1">Ordered list, third bullet, fifth element: Ordered list, element li.  Text only.<a href="#section-4-2.1.5.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4-2.1.5.2">
@@ -535,7 +535,7 @@
 <pre class="sourcecode">
                   # Ordered list, third bullet, sixth element
                   A = 1;
-               </pre><a href="#section-4-2.1.6" class="pilcrow">¶</a>
+</pre><a href="#section-4-2.1.6" class="pilcrow">¶</a>
 </div>
 <ul>
 <li id="section-4-2.1.7.1">Ordered list, third bullet, seventh element: Unordered list, element li. Text only.<a href="#section-4-2.1.7.1" class="pilcrow">¶</a>
@@ -577,11 +577,11 @@
 <pre>
         Definition list, third bullet, second element:
         +-------------------------------------------+
-        |                                           |       
-        |                  Artwork                  |       
-        |                                           |       
+        |                                           |
+        |                  Artwork                  |
+        |                                           |
         +-------------------------------------------+
-               </pre><a href="#section-5-1.6.2" class="pilcrow">¶</a>
+</pre><a href="#section-5-1.6.2" class="pilcrow">¶</a>
 </div>
 <dl class="dlParallel" id="section-5-1.6.3">
             <dt id="section-5-1.6.3.1">Definition list, third bullet, third element: Definition list, element dt.</dt>
@@ -596,12 +596,12 @@
                     Figure
                         Figure
                            Figure
-                  </pre>
+</pre>
 </div>
 <figcaption><a href="#figure-3" class="selfRef">Figure 3</a>:
 <a href="#name-some-figure-name-3" class="selfRef">Some figure name</a>
             </figcaption></figure>
-<ol start="1" type="1" class="normal" id="section-5-1.6.5">
+<ol start="1" type="1" class="normal type-1" id="section-5-1.6.5">
             <li id="section-5-1.6.5.1">Definition list, third bullet, fifth element: Ordered list, element li.  Text only.<a href="#section-5-1.6.5.1" class="pilcrow">¶</a>
 </li>
 <li id="section-5-1.6.5.2">
@@ -631,7 +631,7 @@
 <pre class="sourcecode">
                   # Definition list, third bullet, sixth element
                   A = 1;
-               </pre><a href="#section-5-1.6.6" class="pilcrow">¶</a>
+</pre><a href="#section-5-1.6.6" class="pilcrow">¶</a>
 </div>
 <ul>
 <li id="section-5-1.6.7.1">Definition list, third bullet, seventh element: Unordered list, element li. Text only.<a href="#section-5-1.6.7.1" class="pilcrow">¶</a>
@@ -665,11 +665,11 @@
       +     +     +-----+-----+
       |     |     |           |
       +-----+     +-----+-----+
-      |     |     |     |     |     
+      |     |     |     |     |
       +=====+=====+=====+=====+
       |     |     |     |     |
       +-----+-----+-----+-----+
-         </pre><a href="#section-6-1" class="pilcrow">¶</a>
+</pre><a href="#section-6-1" class="pilcrow">¶</a>
 </div>
 <span id="name-header-footer-colspan-and-r"></span><table class="center" id="table-1">
         <caption>
@@ -1163,7 +1163,7 @@
     esac
     shift
 done
-         </pre><a href="#section-13-2" class="pilcrow">¶</a>
+</pre><a href="#section-13-2" class="pilcrow">¶</a>
 </div>
 <p id="section-13-3">Source code within a figure:<a href="#section-13-3" class="pilcrow">¶</a></p>
 <span id="name-sourcecode-within-figure"></span><figure id="figure-4">
@@ -1178,7 +1178,7 @@
         sys.exit(0)
     elif opt in ["-V", "--verbose"]: # Output version information
         opt_verbose = True
-            </pre>
+</pre>
 </div>
 <figcaption><a href="#figure-4" class="selfRef">Figure 4</a>:
 <a href="#name-sourcecode-within-figure" class="selfRef">Sourcecode within figure</a>
diff -Nru xml2rfc-2.39.0/tests/valid/elements.v3.py36.html xml2rfc-2.40.0/tests/valid/elements.v3.py36.html
--- xml2rfc-2.39.0/tests/valid/elements.v3.py36.html	2020-01-18 15:12:19.000000000 +0000
+++ xml2rfc-2.40.0/tests/valid/elements.v3.py36.html	2020-02-18 20:15:35.000000000 +0000
@@ -11,7 +11,7 @@
 <meta content="No Org" name="author">
 <meta content="Bon Aventure" name="author">
 <meta content="International Association for Cryptologic Research" name="author">
-<meta content="xml2rfc 2.37.3" name="generator">
+<meta content="xml2rfc 2.39.0" name="generator">
 <meta content="elements-00" name="ietf.draft">
 <link href="tests/input/elements.xml" rel="alternate" type="application/rfc+xml">
 <link href="#copyright" rel="license">
@@ -110,7 +110,7 @@
 <p id="section-boilerplate.2-2">
             This document is subject to BCP 78 and the IETF Trust's Legal
             Provisions Relating to IETF Documents
-            (https://trustee.ietf.org/license-info) in effect on the date of
+            (<span><a href="https://trustee.ietf.org/license-info">https://trustee.ietf.org/license-info</a></span>) in effect on the date of
             publication of this document. Please review these documents
             carefully, as they describe your rights and restrictions with
             respect to this document.<a href="#section-boilerplate.2-2" class="pilcrow">¶</a></p>
@@ -402,11 +402,11 @@
 <pre>
         Unordered list, third bullet, second element:
         +-------------------------------------------+
-        |                                           |       
-        |                  Artwork                  |       
-        |                                           |       
+        |                                           |
+        |                  Artwork                  |
+        |                                           |
         +-------------------------------------------+
-               </pre><a href="#section-3-1.3.2" class="pilcrow">¶</a>
+</pre><a href="#section-3-1.3.2" class="pilcrow">¶</a>
 </div>
 <dl class="dlParallel" id="section-3-1.3.3">
             <dt id="section-3-1.3.3.1">Unordered list, third bullet, third element: Definition list, element dt.</dt>
@@ -421,7 +421,7 @@
                     Figure
                         Figure
                            Figure
-                  </pre>
+</pre>
 </div>
 <figcaption><a href="#figure-1" class="selfRef">Figure 1</a>:
 <a href="#name-some-figure-name" class="selfRef">Some figure name</a>
@@ -443,7 +443,7 @@
 
                   # Unordered list, third bullet, sixth element
                   A = 1;
-               
+
 &lt;CODE ENDS&gt;</pre><a href="#section-3-1.3.6" class="pilcrow">¶</a>
 </div>
 <ul>
@@ -483,7 +483,7 @@
       <h2 id="name-ordered-list-with-sub-eleme">
 <a href="#section-4" class="section-number selfRef">4. </a><a href="#name-ordered-list-with-sub-eleme" class="section-name selfRef">Ordered list with sub-elements</a>
       </h2>
-<ol start="1" type="1" class="normal" id="section-4-1">
+<ol start="1" type="1" class="normal type-1" id="section-4-1">
         <li id="section-4-1.1">
                Ordered list, first bullet.<a href="#section-4-1.1" class="pilcrow">¶</a>
 </li>
@@ -491,7 +491,7 @@
                Ordered list, second bullet. Text only. Octavio fuit, cum illam severitatem in eo non arbitrantur. erunt etiam, et ii quidem eruditi Graecis litteris, contemnentes Latinas, qui se plane Graecum dici velit, ut a Scaevola est praetore salutatus Athenis Albucius.  In physicis plurimum posuit. ea scientia et verborum vis et natura orationis et consequentium repugnantiumve ratio potest perspici.<a href="#section-4-1.2" class="pilcrow">¶</a>
 </li>
 </ol>
-<ol start="3" type="1" class="normal" id="section-4-2">
+<ol start="3" type="1" class="normal type-1" id="section-4-2">
         <li id="section-4-2.1">
           <p id="section-4-2.1.1">
                   Ordered list, third bullet, element t.  Quid? si nos non interpretum fungimur munere, sed tuemur ea, quae audiebamus, conferebamus, neque erat umquam controversia, quid ego intellegerem, sed quid probarem.  Extremum autem esse bonorum eum voluptate vivere.  Sic faciam igitur, inquit: unam rem explicabo, eamque maximam, de physicis alias, et quidem locis pluribus.<a href="#section-4-2.1.1" class="pilcrow">¶</a></p>
@@ -499,11 +499,11 @@
 <pre>
         Ordered list, third bullet, second element:
         +-------------------------------------------+
-        |                                           |       
-        |                  Artwork                  |       
-        |                                           |       
+        |                                           |
+        |                  Artwork                  |
+        |                                           |
         +-------------------------------------------+
-               </pre><a href="#section-4-2.1.2" class="pilcrow">¶</a>
+</pre><a href="#section-4-2.1.2" class="pilcrow">¶</a>
 </div>
 <dl class="dlParallel" id="section-4-2.1.3">
             <dt id="section-4-2.1.3.1">Ordered list, third bullet, third element: Definition list, element dt.</dt>
@@ -518,12 +518,12 @@
                     Figure
                         Figure
                            Figure
-                  </pre>
+</pre>
 </div>
 <figcaption><a href="#figure-2" class="selfRef">Figure 2</a>:
 <a href="#name-some-figure-name-2" class="selfRef">Some figure name</a>
             </figcaption></figure>
-<ol start="1" type="1" class="normal" id="section-4-2.1.5">
+<ol start="1" type="1" class="normal type-1" id="section-4-2.1.5">
             <li id="section-4-2.1.5.1">Ordered list, third bullet, fifth element: Ordered list, element li.  Text only.<a href="#section-4-2.1.5.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4-2.1.5.2">
@@ -535,7 +535,7 @@
 <pre class="sourcecode">
                   # Ordered list, third bullet, sixth element
                   A = 1;
-               </pre><a href="#section-4-2.1.6" class="pilcrow">¶</a>
+</pre><a href="#section-4-2.1.6" class="pilcrow">¶</a>
 </div>
 <ul>
 <li id="section-4-2.1.7.1">Ordered list, third bullet, seventh element: Unordered list, element li. Text only.<a href="#section-4-2.1.7.1" class="pilcrow">¶</a>
@@ -577,11 +577,11 @@
 <pre>
         Definition list, third bullet, second element:
         +-------------------------------------------+
-        |                                           |       
-        |                  Artwork                  |       
-        |                                           |       
+        |                                           |
+        |                  Artwork                  |
+        |                                           |
         +-------------------------------------------+
-               </pre><a href="#section-5-1.6.2" class="pilcrow">¶</a>
+</pre><a href="#section-5-1.6.2" class="pilcrow">¶</a>
 </div>
 <dl class="dlParallel" id="section-5-1.6.3">
             <dt id="section-5-1.6.3.1">Definition list, third bullet, third element: Definition list, element dt.</dt>
@@ -596,12 +596,12 @@
                     Figure
                         Figure
                            Figure
-                  </pre>
+</pre>
 </div>
 <figcaption><a href="#figure-3" class="selfRef">Figure 3</a>:
 <a href="#name-some-figure-name-3" class="selfRef">Some figure name</a>
             </figcaption></figure>
-<ol start="1" type="1" class="normal" id="section-5-1.6.5">
+<ol start="1" type="1" class="normal type-1" id="section-5-1.6.5">
             <li id="section-5-1.6.5.1">Definition list, third bullet, fifth element: Ordered list, element li.  Text only.<a href="#section-5-1.6.5.1" class="pilcrow">¶</a>
 </li>
 <li id="section-5-1.6.5.2">
@@ -631,7 +631,7 @@
 <pre class="sourcecode">
                   # Definition list, third bullet, sixth element
                   A = 1;
-               </pre><a href="#section-5-1.6.6" class="pilcrow">¶</a>
+</pre><a href="#section-5-1.6.6" class="pilcrow">¶</a>
 </div>
 <ul>
 <li id="section-5-1.6.7.1">Definition list, third bullet, seventh element: Unordered list, element li. Text only.<a href="#section-5-1.6.7.1" class="pilcrow">¶</a>
@@ -665,11 +665,11 @@
       +     +     +-----+-----+
       |     |     |           |
       +-----+     +-----+-----+
-      |     |     |     |     |     
+      |     |     |     |     |
       +=====+=====+=====+=====+
       |     |     |     |     |
       +-----+-----+-----+-----+
-         </pre><a href="#section-6-1" class="pilcrow">¶</a>
+</pre><a href="#section-6-1" class="pilcrow">¶</a>
 </div>
 <span id="name-header-footer-colspan-and-r"></span><table class="center" id="table-1">
         <caption>
@@ -1163,7 +1163,7 @@
     esac
     shift
 done
-         </pre><a href="#section-13-2" class="pilcrow">¶</a>
+</pre><a href="#section-13-2" class="pilcrow">¶</a>
 </div>
 <p id="section-13-3">Source code within a figure:<a href="#section-13-3" class="pilcrow">¶</a></p>
 <span id="name-sourcecode-within-figure"></span><figure id="figure-4">
@@ -1178,7 +1178,7 @@
         sys.exit(0)
     elif opt in ["-V", "--verbose"]: # Output version information
         opt_verbose = True
-            </pre>
+</pre>
 </div>
 <figcaption><a href="#figure-4" class="selfRef">Figure 4</a>:
 <a href="#name-sourcecode-within-figure" class="selfRef">Sourcecode within figure</a>
diff -Nru xml2rfc-2.39.0/tests/valid/elements.v3.py37.html xml2rfc-2.40.0/tests/valid/elements.v3.py37.html
--- xml2rfc-2.39.0/tests/valid/elements.v3.py37.html	2020-01-18 15:12:19.000000000 +0000
+++ xml2rfc-2.40.0/tests/valid/elements.v3.py37.html	2020-02-18 20:15:35.000000000 +0000
@@ -11,7 +11,7 @@
 <meta content="No Org" name="author">
 <meta content="Bon Aventure" name="author">
 <meta content="International Association for Cryptologic Research" name="author">
-<meta content="xml2rfc 2.37.3" name="generator">
+<meta content="xml2rfc 2.39.0" name="generator">
 <meta content="elements-00" name="ietf.draft">
 <link href="tests/input/elements.xml" rel="alternate" type="application/rfc+xml">
 <link href="#copyright" rel="license">
@@ -110,7 +110,7 @@
 <p id="section-boilerplate.2-2">
             This document is subject to BCP 78 and the IETF Trust's Legal
             Provisions Relating to IETF Documents
-            (https://trustee.ietf.org/license-info) in effect on the date of
+            (<span><a href="https://trustee.ietf.org/license-info">https://trustee.ietf.org/license-info</a></span>) in effect on the date of
             publication of this document. Please review these documents
             carefully, as they describe your rights and restrictions with
             respect to this document.<a href="#section-boilerplate.2-2" class="pilcrow">¶</a></p>
@@ -402,11 +402,11 @@
 <pre>
         Unordered list, third bullet, second element:
         +-------------------------------------------+
-        |                                           |       
-        |                  Artwork                  |       
-        |                                           |       
+        |                                           |
+        |                  Artwork                  |
+        |                                           |
         +-------------------------------------------+
-               </pre><a href="#section-3-1.3.2" class="pilcrow">¶</a>
+</pre><a href="#section-3-1.3.2" class="pilcrow">¶</a>
 </div>
 <dl class="dlParallel" id="section-3-1.3.3">
             <dt id="section-3-1.3.3.1">Unordered list, third bullet, third element: Definition list, element dt.</dt>
@@ -421,7 +421,7 @@
                     Figure
                         Figure
                            Figure
-                  </pre>
+</pre>
 </div>
 <figcaption><a href="#figure-1" class="selfRef">Figure 1</a>:
 <a href="#name-some-figure-name" class="selfRef">Some figure name</a>
@@ -443,7 +443,7 @@
 
                   # Unordered list, third bullet, sixth element
                   A = 1;
-               
+
 &lt;CODE ENDS&gt;</pre><a href="#section-3-1.3.6" class="pilcrow">¶</a>
 </div>
 <ul>
@@ -483,7 +483,7 @@
       <h2 id="name-ordered-list-with-sub-eleme">
 <a href="#section-4" class="section-number selfRef">4. </a><a href="#name-ordered-list-with-sub-eleme" class="section-name selfRef">Ordered list with sub-elements</a>
       </h2>
-<ol start="1" type="1" class="normal" id="section-4-1">
+<ol start="1" type="1" class="normal type-1" id="section-4-1">
         <li id="section-4-1.1">
                Ordered list, first bullet.<a href="#section-4-1.1" class="pilcrow">¶</a>
 </li>
@@ -491,7 +491,7 @@
                Ordered list, second bullet. Text only. Octavio fuit, cum illam severitatem in eo non arbitrantur. erunt etiam, et ii quidem eruditi Graecis litteris, contemnentes Latinas, qui se plane Graecum dici velit, ut a Scaevola est praetore salutatus Athenis Albucius.  In physicis plurimum posuit. ea scientia et verborum vis et natura orationis et consequentium repugnantiumve ratio potest perspici.<a href="#section-4-1.2" class="pilcrow">¶</a>
 </li>
 </ol>
-<ol start="3" type="1" class="normal" id="section-4-2">
+<ol start="3" type="1" class="normal type-1" id="section-4-2">
         <li id="section-4-2.1">
           <p id="section-4-2.1.1">
                   Ordered list, third bullet, element t.  Quid? si nos non interpretum fungimur munere, sed tuemur ea, quae audiebamus, conferebamus, neque erat umquam controversia, quid ego intellegerem, sed quid probarem.  Extremum autem esse bonorum eum voluptate vivere.  Sic faciam igitur, inquit: unam rem explicabo, eamque maximam, de physicis alias, et quidem locis pluribus.<a href="#section-4-2.1.1" class="pilcrow">¶</a></p>
@@ -499,11 +499,11 @@
 <pre>
         Ordered list, third bullet, second element:
         +-------------------------------------------+
-        |                                           |       
-        |                  Artwork                  |       
-        |                                           |       
+        |                                           |
+        |                  Artwork                  |
+        |                                           |
         +-------------------------------------------+
-               </pre><a href="#section-4-2.1.2" class="pilcrow">¶</a>
+</pre><a href="#section-4-2.1.2" class="pilcrow">¶</a>
 </div>
 <dl class="dlParallel" id="section-4-2.1.3">
             <dt id="section-4-2.1.3.1">Ordered list, third bullet, third element: Definition list, element dt.</dt>
@@ -518,12 +518,12 @@
                     Figure
                         Figure
                            Figure
-                  </pre>
+</pre>
 </div>
 <figcaption><a href="#figure-2" class="selfRef">Figure 2</a>:
 <a href="#name-some-figure-name-2" class="selfRef">Some figure name</a>
             </figcaption></figure>
-<ol start="1" type="1" class="normal" id="section-4-2.1.5">
+<ol start="1" type="1" class="normal type-1" id="section-4-2.1.5">
             <li id="section-4-2.1.5.1">Ordered list, third bullet, fifth element: Ordered list, element li.  Text only.<a href="#section-4-2.1.5.1" class="pilcrow">¶</a>
 </li>
 <li id="section-4-2.1.5.2">
@@ -535,7 +535,7 @@
 <pre class="sourcecode">
                   # Ordered list, third bullet, sixth element
                   A = 1;
-               </pre><a href="#section-4-2.1.6" class="pilcrow">¶</a>
+</pre><a href="#section-4-2.1.6" class="pilcrow">¶</a>
 </div>
 <ul>
 <li id="section-4-2.1.7.1">Ordered list, third bullet, seventh element: Unordered list, element li. Text only.<a href="#section-4-2.1.7.1" class="pilcrow">¶</a>
@@ -577,11 +577,11 @@
 <pre>
         Definition list, third bullet, second element:
         +-------------------------------------------+
-        |                                           |       
-        |                  Artwork                  |       
-        |                                           |       
+        |                                           |
+        |                  Artwork                  |
+        |                                           |
         +-------------------------------------------+
-               </pre><a href="#section-5-1.6.2" class="pilcrow">¶</a>
+</pre><a href="#section-5-1.6.2" class="pilcrow">¶</a>
 </div>
 <dl class="dlParallel" id="section-5-1.6.3">
             <dt id="section-5-1.6.3.1">Definition list, third bullet, third element: Definition list, element dt.</dt>
@@ -596,12 +596,12 @@
                     Figure
                         Figure
                            Figure
-                  </pre>
+</pre>
 </div>
 <figcaption><a href="#figure-3" class="selfRef">Figure 3</a>:
 <a href="#name-some-figure-name-3" class="selfRef">Some figure name</a>
             </figcaption></figure>
-<ol start="1" type="1" class="normal" id="section-5-1.6.5">
+<ol start="1" type="1" class="normal type-1" id="section-5-1.6.5">
             <li id="section-5-1.6.5.1">Definition list, third bullet, fifth element: Ordered list, element li.  Text only.<a href="#section-5-1.6.5.1" class="pilcrow">¶</a>
 </li>
 <li id="section-5-1.6.5.2">
@@ -631,7 +631,7 @@
 <pre class="sourcecode">
                   # Definition list, third bullet, sixth element
                   A = 1;
-               </pre><a href="#section-5-1.6.6" class="pilcrow">¶</a>
+</pre><a href="#section-5-1.6.6" class="pilcrow">¶</a>
 </div>
 <ul>
 <li id="section-5-1.6.7.1">Definition list, third bullet, seventh element: Unordered list, element li. Text only.<a href="#section-5-1.6.7.1" class="pilcrow">¶</a>
@@ -665,11 +665,11 @@
       +     +     +-----+-----+
       |     |     |           |
       +-----+     +-----+-----+
-      |     |     |     |     |     
+      |     |     |     |     |
       +=====+=====+=====+=====+
       |     |     |     |     |
       +-----+-----+-----+-----+
-         </pre><a href="#section-6-1" class="pilcrow">¶</a>
+</pre><a href="#section-6-1" class="pilcrow">¶</a>
 </div>
 <span id="name-header-footer-colspan-and-r"></span><table class="center" id="table-1">
         <caption>
@@ -1163,7 +1163,7 @@
     esac
     shift
 done
-         </pre><a href="#section-13-2" class="pilcrow">¶</a>
+</pre><a href="#section-13-2" class="pilcrow">¶</a>
 </div>
 <p id="section-13-3">Source code within a figure:<a href="#section-13-3" class="pilcrow">¶</a></p>
 <span id="name-sourcecode-within-figure"></span><figure id="figure-4">
@@ -1178,7 +1178,7 @@
         sys.exit(0)
     elif opt in ["-V", "--verbose"]: # Output version information
         opt_verbose = True
-            </pre>
+</pre>
 </div>
 <figcaption><a href="#figure-4" class="selfRef">Figure 4</a>:
 <a href="#name-sourcecode-within-figure" class="selfRef">Sourcecode within figure</a>
diff -Nru xml2rfc-2.39.0/tests/valid/rfc6787.v3.py27.html xml2rfc-2.40.0/tests/valid/rfc6787.v3.py27.html
--- xml2rfc-2.39.0/tests/valid/rfc6787.v3.py27.html	2020-01-10 23:04:16.000000000 +0000
+++ xml2rfc-2.40.0/tests/valid/rfc6787.v3.py27.html	2020-02-18 20:15:35.000000000 +0000
@@ -21,7 +21,7 @@
       established above, allowing the client to control the media processing
       resources on the speech resource server. 
     ' name="description">
-<meta content="xml2rfc 2.37.2" name="generator">
+<meta content="xml2rfc 2.39.0" name="generator">
 <meta content="mrcp, speechsc, asr, tts, speech services, speech recognition, speech synthesis, nlsml, speaker authentication, speaker verification, speaker identification" name="keyword">
 <meta content="6787" name="rfc.number">
 <link href="tests/input/rfc6787.xml" type="application/rfc+xml" rel="alternate">
@@ -1260,7 +1260,7 @@
 |--------------------|         ||                                  ||
          |                     ||----------------------------------||
         SIP                    |------------------------------------|
-         |                       /           
+         |                       /
 |-------------------|          RTP
 |                   |          /
 | Media Source/Sink |---------/
@@ -1345,7 +1345,7 @@
 <pre>
      sip:mrcpv2@example.net   or
      sips:mrcpv2@example.net
-          </pre><a href="#section-3.2-3" class="pilcrow">¶</a>
+</pre><a href="#section-3.2-3" class="pilcrow">¶</a>
 </div>
 </section>
 </section>
@@ -1564,69 +1564,69 @@
 <span id="name-example-add-synthesizer-con"></span><figure id="figure-2">
           <div class="artwork art-text alignLeft" id="section-4.3-3.1">
 <pre>
-C-&gt;S:  INVITE sip:mresources@example.com SIP/2.0 
-       Via:SIP/2.0/TCP client.atlanta.example.com:5060; 
-        branch=z9hG4bK74bf1 
-       Max-Forwards:6 
-       To:MediaServer &lt;sip:mresources@example.com&gt; 
-       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314161 INVITE 
-       Contact:&lt;sip:sarvi@client.example.com&gt; 
-       Content-Type:application/sdp 
+C-&gt;S:  INVITE sip:mresources@example.com SIP/2.0
+       Via:SIP/2.0/TCP client.atlanta.example.com:5060;
+        branch=z9hG4bK74bf1
+       Max-Forwards:6
+       To:MediaServer &lt;sip:mresources@example.com&gt;
+       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314161 INVITE
+       Contact:&lt;sip:sarvi@client.example.com&gt;
+       Content-Type:application/sdp
        Content-Length:...
-       
-       v=0 
-       o=sarvi 2890844526 2890844526 IN IP4 192.0.2.12 
-       s=- 
+
+       v=0
+       o=sarvi 2890844526 2890844526 IN IP4 192.0.2.12
+       s=-
        c=IN IP4 192.0.2.12
        t=0 0
-       m=application 9 TCP/MRCPv2 1 
+       m=application 9 TCP/MRCPv2 1
        a=setup:active
        a=connection:new
        a=resource:speechsynth
        a=cmid:1
-       m=audio 49170 RTP/AVP 0 
-       a=rtpmap:0 pcmu/8000 
-       a=recvonly 
+       m=audio 49170 RTP/AVP 0
+       a=rtpmap:0 pcmu/8000
+       a=recvonly
        a=mid:1
-     
 
-S-&gt;C:  SIP/2.0 200 OK 
+
+S-&gt;C:  SIP/2.0 200 OK
        Via:SIP/2.0/TCP client.atlanta.example.com:5060;
         branch=z9hG4bK74bf1;received=192.0.32.10
-       To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784 
-       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314161 INVITE 
-       Contact:&lt;sip:mresources@server.example.com&gt; 
-       Content-Type:application/sdp 
-       Content-Length:... 
-       
-       v=0 
-       o=- 2890842808 2890842808 IN IP4 192.0.2.11 
-       s=- 
+       To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784
+       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314161 INVITE
+       Contact:&lt;sip:mresources@server.example.com&gt;
+       Content-Type:application/sdp
+       Content-Length:...
+
+       v=0
+       o=- 2890842808 2890842808 IN IP4 192.0.2.11
+       s=-
        c=IN IP4 192.0.2.11
        t=0 0
-       m=application 32416 TCP/MRCPv2 1 
+       m=application 32416 TCP/MRCPv2 1
        a=setup:passive
        a=connection:new
-       a=channel:32AECB234338@speechsynth 
+       a=channel:32AECB234338@speechsynth
        a=cmid:1
-       m=audio 48260 RTP/AVP 0 
-       a=rtpmap:0 pcmu/8000 
-       a=sendonly 
-       a=mid:1 
-     
+       m=audio 48260 RTP/AVP 0
+       a=rtpmap:0 pcmu/8000
+       a=sendonly
+       a=mid:1
+
 
-C-&gt;S:  ACK sip:mresources@server.example.com SIP/2.0 
+C-&gt;S:  ACK sip:mresources@server.example.com SIP/2.0
        Via:SIP/2.0/TCP client.atlanta.example.com:5060;
         branch=z9hG4bK74bf2
-       Max-Forwards:6 
+       Max-Forwards:6
        To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784
-       From:Sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314161 ACK 
+       From:Sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314161 ACK
        Content-Length:0
 </pre>
 </div>
@@ -1641,83 +1641,83 @@
 <span id="name-example-add-recognizer"></span><figure id="figure-3">
           <div class="artwork art-text alignLeft" id="section-4.3-5.1">
 <pre>
-C-&gt;S:  INVITE sip:mresources@server.example.com SIP/2.0 
+C-&gt;S:  INVITE sip:mresources@server.example.com SIP/2.0
        Via:SIP/2.0/TCP client.atlanta.example.com:5060;
         branch=z9hG4bK74bf3
-       Max-Forwards:6 
+       Max-Forwards:6
        To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784
-       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314162 INVITE 
-       Contact:&lt;sip:sarvi@client.example.com&gt; 
-       Content-Type:application/sdp 
+       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314162 INVITE
+       Contact:&lt;sip:sarvi@client.example.com&gt;
+       Content-Type:application/sdp
        Content-Length:...
-       
-       v=0 
-       o=sarvi 2890844526 2890844527 IN IP4 192.0.2.12 
+
+       v=0
+       o=sarvi 2890844526 2890844527 IN IP4 192.0.2.12
        s=-
        c=IN IP4 192.0.2.12
        t=0 0
-       m=application 9 TCP/MRCPv2 1 
+       m=application 9 TCP/MRCPv2 1
        a=setup:active
        a=connection:existing
        a=resource:speechsynth
        a=cmid:1
-       m=audio 49170 RTP/AVP 0 96 
-       a=rtpmap:0 pcmu/8000 
-       a=rtpmap:96 telephone-event/8000 
-       a=fmtp:96 0-15 
-       a=sendrecv 
+       m=audio 49170 RTP/AVP 0 96
+       a=rtpmap:0 pcmu/8000
+       a=rtpmap:96 telephone-event/8000
+       a=fmtp:96 0-15
+       a=sendrecv
        a=mid:1
-       m=application 9 TCP/MRCPv2 1 
+       m=application 9 TCP/MRCPv2 1
        a=setup:active
        a=connection:existing
        a=resource:speechrecog
        a=cmid:1
-     
 
-S-&gt;C:  SIP/2.0 200 OK 
+
+S-&gt;C:  SIP/2.0 200 OK
        Via:SIP/2.0/TCP client.atlanta.example.com:5060;
         branch=z9hG4bK74bf3;received=192.0.32.10
        To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784
-       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314162 INVITE 
-       Contact:&lt;sip:mresources@server.example.com&gt; 
-       Content-Type:application/sdp 
+       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314162 INVITE
+       Contact:&lt;sip:mresources@server.example.com&gt;
+       Content-Type:application/sdp
        Content-Length:...
-            
-       v=0 
-       o=- 2890842808 2890842809 IN IP4 192.0.2.11 
+
+       v=0
+       o=- 2890842808 2890842809 IN IP4 192.0.2.11
        s=-
        c=IN IP4 192.0.2.11
        t=0 0
-       m=application 32416 TCP/MRCPv2 1 
+       m=application 32416 TCP/MRCPv2 1
        a=setup:passive
        a=connection:existing
        a=channel:32AECB234338@speechsynth
        a=cmid:1
-       m=audio 48260 RTP/AVP 0 96 
-       a=rtpmap:0 pcmu/8000 
-       a=rtpmap:96 telephone-event/8000 
-       a=fmtp:96 0-15 
-       a=sendrecv 
+       m=audio 48260 RTP/AVP 0 96
+       a=rtpmap:0 pcmu/8000
+       a=rtpmap:96 telephone-event/8000
+       a=fmtp:96 0-15
+       a=sendrecv
        a=mid:1
-       m=application 32416 TCP/MRCPv2 1 
+       m=application 32416 TCP/MRCPv2 1
        a=setup:passive
        a=connection:existing
        a=channel:32AECB234338@speechrecog
        a=cmid:1
-     
 
-C-&gt;S:  ACK sip:mresources@server.example.com SIP/2.0 
+
+C-&gt;S:  ACK sip:mresources@server.example.com SIP/2.0
        Via:SIP/2.0/TCP client.atlanta.example.com:5060;
         branch=z9hG4bK74bf4
-       Max-Forwards:6 
+       Max-Forwards:6
        To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784
-       From:Sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314162 ACK 
+       From:Sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314162 ACK
        Content-Length:0
 </pre>
 </div>
@@ -1731,71 +1731,71 @@
 <span id="name-example-deallocate-recogniz"></span><figure id="figure-4">
           <div class="artwork art-text alignLeft" id="section-4.3-7.1">
 <pre>
-C-&gt;S:  INVITE sip:mresources@server.example.com SIP/2.0 
+C-&gt;S:  INVITE sip:mresources@server.example.com SIP/2.0
        Via:SIP/2.0/TCP client.atlanta.example.com:5060;
         branch=z9hG4bK74bf5
-       Max-Forwards:6 
+       Max-Forwards:6
        To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784
-       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314163 INVITE 
-       Contact:&lt;sip:sarvi@client.example.com&gt; 
-       Content-Type:application/sdp 
+       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314163 INVITE
+       Contact:&lt;sip:sarvi@client.example.com&gt;
+       Content-Type:application/sdp
        Content-Length:...
-            
-       v=0 
-       o=sarvi 2890844526 2890844528 IN IP4 192.0.2.12 
+
+       v=0
+       o=sarvi 2890844526 2890844528 IN IP4 192.0.2.12
        s=-
        c=IN IP4 192.0.2.12
        t=0 0
-       m=application 9 TCP/MRCPv2 1 
-       a=resource:speechsynth 
+       m=application 9 TCP/MRCPv2 1
+       a=resource:speechsynth
        a=cmid:1
-       m=audio 49170 RTP/AVP 0 
-       a=rtpmap:0 pcmu/8000 
-       a=recvonly 
+       m=audio 49170 RTP/AVP 0
+       a=rtpmap:0 pcmu/8000
+       a=recvonly
        a=mid:1
-       m=application 0 TCP/MRCPv2 1 
-       a=resource:speechrecog 
+       m=application 0 TCP/MRCPv2 1
+       a=resource:speechrecog
        a=cmid:1
-     
 
-S-&gt;C:  SIP/2.0 200 OK 
+
+S-&gt;C:  SIP/2.0 200 OK
        Via:SIP/2.0/TCP client.atlanta.example.com:5060;
         branch=z9hG4bK74bf5;received=192.0.32.10
        To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784
-       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314163 INVITE 
+       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314163 INVITE
        Contact:&lt;sip:mresources@server.example.com&gt;
-       Content-Type:application/sdp 
+       Content-Type:application/sdp
        Content-Length:...
-     
-       v=0 
-       o=- 2890842808 2890842810 IN IP4 192.0.2.11 
+
+       v=0
+       o=- 2890842808 2890842810 IN IP4 192.0.2.11
        s=-
        c=IN IP4 192.0.2.11
        t=0 0
-       m=application 32416 TCP/MRCPv2 1 
-       a=channel:32AECB234338@speechsynth 
+       m=application 32416 TCP/MRCPv2 1
+       a=channel:32AECB234338@speechsynth
        a=cmid:1
-       m=audio 48260 RTP/AVP 0 
-       a=rtpmap:0 pcmu/8000 
-       a=sendonly 
+       m=audio 48260 RTP/AVP 0
+       a=rtpmap:0 pcmu/8000
+       a=sendonly
        a=mid:1
-       m=application 0 TCP/MRCPv2 1 
-       a=channel:32AECB234338@speechrecog 
+       m=application 0 TCP/MRCPv2 1
+       a=channel:32AECB234338@speechrecog
        a=cmid:1
-     
 
-C-&gt;S:  ACK sip:mresources@server.example.com SIP/2.0 
+
+C-&gt;S:  ACK sip:mresources@server.example.com SIP/2.0
        Via:SIP/2.0/TCP client.atlanta.example.com:5060;
         branch=z9hG4bK74bf6
-       Max-Forwards:6 
+       Max-Forwards:6
        To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784
-       From:Sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314163 ACK 
+       From:Sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314163 ACK
        Content-Length:0
 </pre>
 </div>
@@ -1997,7 +1997,7 @@
 <div class="artwork art-text alignLeft art-abnf" id="section-5.1-6">
 <pre>
 mrcp-version   =    "MRCP" "/" 1*2DIGIT "." 1*2DIGIT
-          </pre><a href="#section-5.1-6" class="pilcrow">¶</a>
+</pre><a href="#section-5.1-6" class="pilcrow">¶</a>
 </div>
 <p id="section-5.1-7"><a href="#section-5.1-7" class="pilcrow">¶</a></p>
 <p id="section-5.1-8">The message-length field specifies the length of the message in
@@ -2015,7 +2015,7 @@
 <div class="artwork art-text alignLeft art-abnf" id="section-5.1-9">
 <pre>
 message-length =    1*19DIGIT
-          </pre><a href="#section-5.1-9" class="pilcrow">¶</a>
+</pre><a href="#section-5.1-9" class="pilcrow">¶</a>
 </div>
 <p id="section-5.1-10">The following sample MRCP exchange demonstrates proper
         message-length values. The values for message-length have been removed
@@ -2025,12 +2025,12 @@
 <div class="artwork art-text alignLeft" id="section-5.1-11">
 <pre>
 C-&gt;S:   MRCP/2.0 877 INTERPRET 543266
-        Channel-Identifier:32AECB23433801@speechrecog 
-        Interpret-Text:may I speak to Andre Roy 
-        Content-Type:application/srgs+xml  
-        Content-ID:&lt;request1@form-level.store&gt;  
+        Channel-Identifier:32AECB23433801@speechrecog
+        Interpret-Text:may I speak to Andre Roy
+        Content-Type:application/srgs+xml
+        Content-ID:&lt;request1@form-level.store&gt;
         Content-Length:661
-        
+
         &lt;?xml version="1.0"?&gt;
         &lt;!-- the default grammar language is US English --&gt;
         &lt;grammar xmlns="http://www.w3.org/2001/06/grammar"
@@ -2042,7 +2042,7 @@
                     &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
                 &lt;/one-of&gt;
             &lt;/rule&gt;
-        
+
         &lt;!-- single language attachment to a rule expansion --&gt;
             &lt;rule id="request"&gt;
                 may I speak to
@@ -2052,16 +2052,16 @@
                 &lt;/one-of&gt;
             &lt;/rule&gt;
         &lt;/grammar&gt;
-              
+
 S-&gt;C:   MRCP/2.0 82 543266 200 IN-PROGRESS
         Channel-Identifier:32AECB23433801@speechrecog
-                   
+
 S-&gt;C:   MRCP/2.0 634 INTERPRETATION-COMPLETE 543266 200 COMPLETE
         Channel-Identifier:32AECB23433801@speechrecog
         Completion-Cause:000 success
         Content-Type:application/nlsml+xml
         Content-Length:441
-        
+
         &lt;?xml version="1.0"?&gt;
         &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                 xmlns:ex="http://www.example.com/example"
@@ -2104,7 +2104,7 @@
 <pre>
 request-line   =    mrcp-version SP message-length SP method-name
                     SP request-id CRLF
-          </pre><a href="#section-5.2-3" class="pilcrow">¶</a>
+</pre><a href="#section-5.2-3" class="pilcrow">¶</a>
 </div>
 <p id="section-5.2-4">The mrcp-version field is the MRCP protocol version that is being
         used by the client.<a href="#section-5.2-4" class="pilcrow">¶</a></p>
@@ -2123,7 +2123,7 @@
                /    recognizer-method
                /    recorder-method
                /    verifier-method
-          </pre><a href="#section-5.2-8" class="pilcrow">¶</a>
+</pre><a href="#section-5.2-8" class="pilcrow">¶</a>
 </div>
 <p id="section-5.2-9">The request-id field is a unique identifier representable as an
         unsigned 32-bit integer created by the client and sent to the server.
@@ -2144,7 +2144,7 @@
 <div class="artwork art-text alignLeft art-abnf" id="section-5.2-11">
 <pre>
 request-id     =    1*10DIGIT
-          </pre><a href="#section-5.2-11" class="pilcrow">¶</a>
+</pre><a href="#section-5.2-11" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -2162,7 +2162,7 @@
 <pre>
 response-line  =    mrcp-version SP message-length SP request-id
                     SP status-code SP request-state CRLF
-          </pre><a href="#section-5.3-2" class="pilcrow">¶</a>
+</pre><a href="#section-5.3-2" class="pilcrow">¶</a>
 </div>
 <p id="section-5.3-3">The mrcp-version field MUST contain the version of the request if
         supported; otherwise, it MUST contain the highest version of
@@ -2178,7 +2178,7 @@
 <div class="artwork art-text alignLeft art-abnf" id="section-5.3-8">
 <pre>
 status-code     =    3DIGIT
-          </pre><a href="#section-5.3-8" class="pilcrow">¶</a>
+</pre><a href="#section-5.3-8" class="pilcrow">¶</a>
 </div>
 <p id="section-5.3-9">The request-state field indicates if the action initiated by the
         Request is PENDING, IN-PROGRESS, or COMPLETE. The COMPLETE status means
@@ -2194,7 +2194,7 @@
 request-state    =  "COMPLETE"
                  /  "IN-PROGRESS"
                  /  "PENDING"
-          </pre><a href="#section-5.3-10" class="pilcrow">¶</a>
+</pre><a href="#section-5.3-10" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -2440,7 +2440,7 @@
 
 S-&gt;C:  MRCP/2.0 ... 543256 200 COMPLETE
        Channel-Identifier:32AECB23433802@speechsynth
-   </pre><a href="#section-6.1.1-6" class="pilcrow">¶</a>
+</pre><a href="#section-6.1.1-6" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-6.1.2">
@@ -2555,7 +2555,7 @@
                     /    content-length
                     /    fetch-timeout
                     /    cache-control
-                    /    logging-tag 
+                    /    logging-tag
                     /    set-cookie
                     /    vendor-specific
 </pre><a href="#section-6.2-7" class="pilcrow">¶</a>
@@ -2626,7 +2626,7 @@
           RECOGNITION-COMPLETE events for the terminated requests.<a href="#section-6.2.3-4" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft art-abnf" id="section-6.2.3-5">
 <pre>
-active-request-id-list  =  "Active-Request-Id-List" ":" 
+active-request-id-list  =  "Active-Request-Id-List" ":"
                            request-id *("," request-id) CRLF
 </pre><a href="#section-6.2.3-5" class="pilcrow">¶</a>
 </div>
@@ -2652,7 +2652,7 @@
 <div class="artwork art-text alignLeft art-abnf" id="section-6.2.4-2">
 <pre>
 proxy-sync-id    =  "Proxy-Sync-Id" ":" 1*VCHAR CRLF
-            </pre><a href="#section-6.2.4-2" class="pilcrow">¶</a>
+</pre><a href="#section-6.2.4-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-6.2.5">
@@ -2694,7 +2694,7 @@
 attribute        =    token
 
 value            =    token / quoted-string
-            </pre><a href="#section-6.2.6-2" class="pilcrow">¶</a>
+</pre><a href="#section-6.2.6-2" class="pilcrow">¶</a>
 </div>
 </section>
 <div id="sec.Content-ID">
@@ -2722,7 +2722,7 @@
 <div class="artwork art-text alignLeft art-abnf" id="section-6.2.8-2">
 <pre>
 content-base      = "Content-Base" ":" absoluteURI CRLF
-            </pre><a href="#section-6.2.8-2" class="pilcrow">¶</a>
+</pre><a href="#section-6.2.8-2" class="pilcrow">¶</a>
 </div>
 <p id="section-6.2.8-3">Note, however, that the base URI of the contents within the
           entity-body may be redefined within that entity-body. An example of
@@ -2744,8 +2744,8 @@
           on all messages.<a href="#section-6.2.9-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft art-abnf" id="section-6.2.9-2">
 <pre>
-content-encoding  = "Content-Encoding" ":" 
-                    *WSP content-coding 
+content-encoding  = "Content-Encoding" ":"
+                    *WSP content-coding
                     *(*WSP "," *WSP content-coding *WSP )
                     CRLF
 </pre><a href="#section-6.2.9-2" class="pilcrow">¶</a>
@@ -2826,7 +2826,7 @@
 <div class="artwork art-text alignLeft" id="section-6.2.12-2">
 <pre>
 fetch-timeout       =   "Fetch-Timeout" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-6.2.12-2" class="pilcrow">¶</a>
+</pre><a href="#section-6.2.12-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -2854,16 +2854,16 @@
           on requests.<a href="#section-6.2.13-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-6.2.13-2">
 <pre>
-cache-control    =    "Cache-Control" ":" 
+cache-control    =    "Cache-Control" ":"
                       [*WSP cache-directive
                       *( *WSP "," *WSP cache-directive *WSP )]
                       CRLF
 
-cache-directive     = "max-age" "=" delta-seconds    
+cache-directive     = "max-age" "=" delta-seconds
                     / "max-stale" [ "=" delta-seconds ]
-                    / "min-fresh" "=" delta-seconds 
+                    / "min-fresh" "=" delta-seconds
 
-delta-seconds       = 1*19DIGIT    
+delta-seconds       = 1*19DIGIT
 </pre><a href="#section-6.2.13-2" class="pilcrow">¶</a>
 </div>
 <p id="section-6.2.13-3">Here, delta-seconds is a decimal time value specifying the number
@@ -2929,7 +2929,7 @@
 <div class="artwork art-text alignLeft" id="section-6.2.14-3">
 <pre>
 logging-tag    = "Logging-Tag" ":" 1*UTFCHAR CRLF
-            </pre><a href="#section-6.2.14-3" class="pilcrow">¶</a>
+</pre><a href="#section-6.2.14-3" class="pilcrow">¶</a>
 </div>
 </section>
 <div id="sec.SetCookie">
@@ -3041,10 +3041,10 @@
 <div class="artwork art-text alignLeft" id="section-6.2.16-2">
 <pre>
 vendor-specific          =    "Vendor-Specific-Parameters" ":"
-                              [vendor-specific-av-pair 
-                              *(";" vendor-specific-av-pair)] CRLF 
+                              [vendor-specific-av-pair
+                              *(";" vendor-specific-av-pair)] CRLF
 
-vendor-specific-av-pair  = vendor-av-pair-name "=" 
+vendor-specific-av-pair  = vendor-av-pair-name "="
                            value
 
 vendor-av-pair-name     = 1*UTFCHAR
@@ -3199,14 +3199,14 @@
      Supported:foo
      Content-Type:application/sdp
      Content-Length:...
-     
+
      v=0
      o=sarvi 2890844536 2890842811 IN IP4 192.0.2.12
      s=-
      i=MRCPv2 server capabilities
      c=IN IP4 192.0.2.12/127
      t=0 0
-     m=application 0 TCP/TLS/MRCPv2 1 
+     m=application 0 TCP/TLS/MRCPv2 1
      a=resource:speechsynth
      a=resource:speechrecog
      a=resource:speakverify
@@ -3327,21 +3327,21 @@
         is associated with.<a href="#section-8.4-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-8.4-2">
 <pre>
-synthesizer-header  =  jump-size       
-                    /  kill-on-barge-in  
-                    /  speaker-profile   
+synthesizer-header  =  jump-size
+                    /  kill-on-barge-in
+                    /  speaker-profile
                     /  completion-cause
-                    /  completion-reason  
-                    /  voice-parameter   
+                    /  completion-reason
+                    /  voice-parameter
                     /  prosody-parameter
-                    /  speech-marker     
-                    /  speech-language 
-                    /  fetch-hint        
-                    /  audio-fetch-hint  
-                    /  failed-uri        
-                    /  failed-uri-cause  
-                    /  speak-restart     
-                    /  speak-length 
+                    /  speech-marker
+                    /  speech-language
+                    /  fetch-hint
+                    /  audio-fetch-hint
+                    /  failed-uri
+                    /  failed-uri-cause
+                    /  speak-restart
+                    /  speak-length
                     /  load-lexicon
                     /  lexicon-search-order
 </pre><a href="#section-8.4-2" class="pilcrow">¶</a>
@@ -3516,7 +3516,7 @@
           as an error in parsing the speech markup text.<a href="#section-8.4.5-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-8.4.5-2">
 <pre>
-completion-reason   =   "Completion-Reason" ":" 
+completion-reason   =   "Completion-Reason" ":"
                         quoted-string CRLF
 
 </pre><a href="#section-8.4.5-2" class="pilcrow">¶</a>
@@ -3648,7 +3648,7 @@
 <div class="artwork art-text alignLeft" id="section-8.4.9-2">
 <pre>
 speech-language     =   "Speech-Language" ":" 1*VCHAR CRLF
-            </pre><a href="#section-8.4.9-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.4.9-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-8.4.10">
@@ -3668,7 +3668,7 @@
 <pre>
 fetch-hint          =   "Fetch-Hint" ":"
                          ("prefetch" / "safe") CRLF
-            </pre><a href="#section-8.4.10-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.4.10-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-8.4.11">
@@ -3689,7 +3689,7 @@
 <pre>
 audio-fetch-hint    =   "Audio-Fetch-Hint" ":"
                         ("prefetch" / "safe" / "stream") CRLF
-            </pre><a href="#section-8.4.11-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.4.11-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-8.4.12">
@@ -3704,7 +3704,7 @@
 <div class="artwork art-text alignLeft" id="section-8.4.12-2">
 <pre>
 failed-uri          =   "Failed-URI" ":" absoluteURI CRLF
-            </pre><a href="#section-8.4.12-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.4.12-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-8.4.13">
@@ -3735,7 +3735,7 @@
 <div class="artwork art-text alignLeft" id="section-8.4.14-2">
 <pre>
 speak-restart       =   "Speak-Restart" ":" BOOLEAN CRLF
-            </pre><a href="#section-8.4.14-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.4.14-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-8.4.15">
@@ -3787,7 +3787,7 @@
 <div class="artwork art-text alignLeft" id="section-8.4.16-2">
 <pre>
 load-lexicon       =   "Load-Lexicon" ":" BOOLEAN CRLF
-            </pre><a href="#section-8.4.16-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.4.16-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -3806,7 +3806,7 @@
 <pre>
 lexicon-search-order =   "Lexicon-Search-Order" ":"
           "&lt;" absoluteURI "&gt;" *(" " "&lt;" absoluteURI "&gt;") CRLF
-            </pre><a href="#section-8.4.17-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.4.17-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -3876,7 +3876,7 @@
 Content-Length:...
 
 &lt;?xml version="1.0"?&gt;
-     &lt;speak version="1.0"                
+     &lt;speak version="1.0"
             xmlns="http://www.w3.org/2001/10/synthesis"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -3910,13 +3910,13 @@
 http://www.example.com/ASR-Document-Part1.ssml
 http://www.example.com/ASR-Document-Part2.ssml
 http://www.example.com/ASR-Conclusion.ssml
-    
+
 --break
 Content-Type:application/ssml+xml
 Content-Length:...
 
 &lt;?xml version="1.0"?&gt;
-    &lt;speak version="1.0"                
+    &lt;speak version="1.0"
            xmlns="http://www.w3.org/2001/10/synthesis"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4012,16 +4012,16 @@
 <span id="name-speak-example"></span><figure id="figure-11">
           <div class="artwork art-text alignLeft" id="section-8.6-7.1">
 <pre>
-C-&gt;S: MRCP/2.0 ... SPEAK 543257 
+C-&gt;S: MRCP/2.0 ... SPEAK 543257
       Channel-Identifier:32AECB23433802@speechsynth
       Voice-gender:neutral
       Voice-Age:25
       Prosody-volume:medium
       Content-Type:application/ssml+xml
       Content-Length:...
-      
+
       &lt;?xml version="1.0"?&gt;
-         &lt;speak version="1.0"                
+         &lt;speak version="1.0"
              xmlns="http://www.w3.org/2001/10/synthesis"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4033,7 +4033,7 @@
              &lt;break/&gt;
              &lt;say-as interpret-as="vxml:time"&gt;0342p&lt;/say-as&gt;.
              &lt;/s&gt;
-          &lt;s&gt;The subject is 
+          &lt;s&gt;The subject is
                  &lt;prosody rate="-20%"&gt;ski trip&lt;/prosody&gt;
           &lt;/s&gt;
          &lt;/p&gt;
@@ -4086,7 +4086,7 @@
       Content-Length:...
 
       &lt;?xml version="1.0"?&gt;
-        &lt;speak version="1.0"                
+        &lt;speak version="1.0"
              xmlns="http://www.w3.org/2001/10/synthesis"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4094,10 +4094,10 @@
              xml:lang="en-US"&gt;
          &lt;p&gt;
           &lt;s&gt;You have 4 new messages.&lt;/s&gt;
-          &lt;s&gt;The first is from Stephanie Williams and arrived at 
+          &lt;s&gt;The first is from Stephanie Williams and arrived at
              &lt;break/&gt;
              &lt;say-as interpret-as="vxml:time"&gt;0342p&lt;/say-as&gt;.&lt;/s&gt;
-          &lt;s&gt;The subject is 
+          &lt;s&gt;The subject is
               &lt;prosody rate="-20%"&gt;ski trip&lt;/prosody&gt;&lt;/s&gt;
          &lt;/p&gt;
         &lt;/speak&gt;
@@ -4128,7 +4128,7 @@
         means to communicate the occurrence of the event to the synthesizer
         resource.<a href="#section-8.8-1" class="pilcrow">¶</a></p>
 <p id="section-8.8-2">This method is useful in two scenarios:<a href="#section-8.8-2" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-8.8-3">
+<ol start="1" type="1" class="normal type-1" id="section-8.8-3">
           <li id="section-8.8-3.1">The client has detected DTMF digits in the input media or some
             other barge-in-able event and wants to communicate that to the
             synthesizer resource.<a href="#section-8.8-3.1" class="pilcrow">¶</a>
@@ -4178,7 +4178,7 @@
       Content-Length:...
 
       &lt;?xml version="1.0"?&gt;
-        &lt;speak version="1.0"                
+        &lt;speak version="1.0"
              xmlns="http://www.w3.org/2001/10/synthesis"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4186,10 +4186,10 @@
              xml:lang="en-US"&gt;
          &lt;p&gt;
           &lt;s&gt;You have 4 new messages.&lt;/s&gt;
-          &lt;s&gt;The first is from Stephanie Williams and arrived at 
+          &lt;s&gt;The first is from Stephanie Williams and arrived at
              &lt;break/&gt;
              &lt;say-as interpret-as="vxml:time"&gt;0342p&lt;/say-as&gt;.&lt;/s&gt;
-          &lt;s&gt;The subject is 
+          &lt;s&gt;The subject is
              &lt;prosody rate="-20%"&gt;ski trip&lt;/prosody&gt;&lt;/s&gt;
          &lt;/p&gt;
         &lt;/speak&gt;
@@ -4237,7 +4237,7 @@
       Content-Length:...
 
       &lt;?xml version="1.0"?&gt;
-        &lt;speak version="1.0"                
+        &lt;speak version="1.0"
              xmlns="http://www.w3.org/2001/10/synthesis"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4245,11 +4245,11 @@
              xml:lang="en-US"&gt;
          &lt;p&gt;
           &lt;s&gt;You have 4 new messages.&lt;/s&gt;
-          &lt;s&gt;The first is from Stephanie Williams and arrived at 
+          &lt;s&gt;The first is from Stephanie Williams and arrived at
              &lt;break/&gt;
              &lt;say-as interpret-as="vxml:time"&gt;0342p&lt;/say-as&gt;.&lt;/s&gt;
 
-          &lt;s&gt;The subject is 
+          &lt;s&gt;The subject is
              &lt;prosody rate="-20%"&gt;ski trip&lt;/prosody&gt;&lt;/s&gt;
          &lt;/p&gt;
         &lt;/speak&gt;
@@ -4293,9 +4293,9 @@
       Prosody-volume:medium
       Content-Type:application/ssml+xml
       Content-Length:...
-      
+
       &lt;?xml version="1.0"?&gt;
-        &lt;speak version="1.0"                
+        &lt;speak version="1.0"
              xmlns="http://www.w3.org/2001/10/synthesis"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4303,10 +4303,10 @@
              xml:lang="en-US"&gt;
          &lt;p&gt;
           &lt;s&gt;You have 4 new messages.&lt;/s&gt;
-          &lt;s&gt;The first is from Stephanie Williams and arrived at 
+          &lt;s&gt;The first is from Stephanie Williams and arrived at
              &lt;break/&gt;
              &lt;say-as interpret-as="vxml:time"&gt;0342p&lt;/say-as&gt;.&lt;/s&gt;
-          &lt;s&gt;The subject is 
+          &lt;s&gt;The subject is
              &lt;prosody rate="-20%"&gt;ski trip&lt;/prosody&gt;&lt;/s&gt;
          &lt;/p&gt;
         &lt;/speak&gt;
@@ -4375,9 +4375,9 @@
       Prosody-volume:medium
       Content-Type:application/ssml+xml
       Content-Length:...
-      
+
       &lt;?xml version="1.0"?&gt;
-        &lt;speak version="1.0"                
+        &lt;speak version="1.0"
              xmlns="http://www.w3.org/2001/10/synthesis"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4446,7 +4446,7 @@
       Content-Length:...
 
       &lt;?xml version="1.0"?&gt;
-        &lt;speak version="1.0"                
+        &lt;speak version="1.0"
              xmlns="http://www.w3.org/2001/10/synthesis"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4457,7 +4457,7 @@
           &lt;s&gt;The first is from Stephanie Williams
              and arrived at &lt;break/&gt;
              &lt;say-as interpret-as="vxml:time"&gt;0342p&lt;/say-as&gt;.&lt;/s&gt;
-          &lt;s&gt;The subject is 
+          &lt;s&gt;The subject is
              &lt;prosody rate="-20%"&gt;ski trip&lt;/prosody&gt;&lt;/s&gt;
          &lt;/p&gt;
         &lt;/speak&gt;
@@ -4504,9 +4504,9 @@
       Prosody-volume:medium
       Content-Type:application/ssml+xml
       Content-Length:...
-      
+
       &lt;?xml version="1.0"?&gt;
-        &lt;speak version="1.0"                
+        &lt;speak version="1.0"
              xmlns="http://www.w3.org/2001/10/synthesis"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4518,7 +4518,7 @@
              and arrived at &lt;break/&gt;
              &lt;say-as interpret-as="vxml:time"&gt;0342p&lt;/say-as&gt;.&lt;/s&gt;
              &lt;mark name="here"/&gt;
-          &lt;s&gt;The subject is 
+          &lt;s&gt;The subject is
              &lt;prosody rate="-20%"&gt;ski trip&lt;/prosody&gt;
           &lt;/s&gt;
           &lt;mark name="ANSWER"/&gt;
@@ -4588,7 +4588,7 @@
       generate asynchronous events to the client to indicate conditions of
       interest during the processing of the method.<a href="#section-9-2" class="pilcrow">¶</a></p>
 <p id="section-9-3">This section applies to the following resource types.<a href="#section-9-3" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9-4">
+<ol start="1" type="1" class="normal type-1" id="section-9-4">
         <li id="section-9-4.1">speechrecog<a href="#section-9-4.1" class="pilcrow">¶</a>
 </li>
 <li id="section-9-4.2">dtmfrecog<a href="#section-9-4.2" class="pilcrow">¶</a>
@@ -4688,7 +4688,7 @@
  |      STOP                                        |
  |&lt;------|                                          |
  |&lt;-------------------STOP--------------------------|
- |&lt;-------------------DEFINE-GRAMMAR----------------|      
+ |&lt;-------------------DEFINE-GRAMMAR----------------|
 </pre>
 </div>
 <figcaption><a href="#figure-19" class="selfRef">Figure 19</a>:
@@ -4862,7 +4862,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.2-2">
 <pre>
 sensitivity-level        =  "Sensitivity-Level" ":" FLOAT CRLF
-            </pre><a href="#section-9.4.2-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.2-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.3">
@@ -4883,7 +4883,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.3-2">
 <pre>
 speed-vs-accuracy        =  "Speed-Vs-Accuracy" ":" FLOAT CRLF
-            </pre><a href="#section-9.4.3-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.3-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.4">
@@ -4905,7 +4905,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.4-2">
 <pre>
 n-best-list-length       =  "N-Best-List-Length" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-9.4.4-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.4-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.5">
@@ -4920,7 +4920,7 @@
 <pre>
 input-type         =  "Input-Type" ":"  inputs CRLF
 inputs             =  "speech" / "dtmf"
-            </pre><a href="#section-9.4.5-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.5-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.6">
@@ -4939,7 +4939,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.6-2">
 <pre>
 no-input-timeout         =  "No-Input-Timeout" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-9.4.6-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.6-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.7">
@@ -4957,7 +4957,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.7-2">
 <pre>
 recognition-timeout      =  "Recognition-Timeout" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-9.4.7-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.7-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.8">
@@ -4991,10 +4991,10 @@
           associated with the header field.<a href="#section-9.4.8-3" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.4.8-4">
 <pre>
-waveform-uri             =  "Waveform-URI" ":" ["&lt;" uri "&gt;" 
-                            ";" "size" "=" 1*19DIGIT 
+waveform-uri             =  "Waveform-URI" ":" ["&lt;" uri "&gt;"
+                            ";" "size" "=" 1*19DIGIT
                             ";" "duration" "=" 1*19DIGIT] CRLF
-            </pre><a href="#section-9.4.8-4" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.8-4" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.9">
@@ -5007,9 +5007,9 @@
           captured and returned by the Waveform-URI header field.<a href="#section-9.4.9-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.4.9-2">
 <pre>
-media-type               =  "Media-Type" ":" media-type-value 
+media-type               =  "Media-Type" ":" media-type-value
                             CRLF
-            </pre><a href="#section-9.4.9-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.9-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.10">
@@ -5023,7 +5023,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.10-2">
 <pre>
 input-waveform-uri       =  "Input-Waveform-URI" ":" uri CRLF
-            </pre><a href="#section-9.4.10-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.10-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.11">
@@ -5044,7 +5044,7 @@
                             cause-name CRLF
 cause-code               =  3DIGIT
 cause-name               =  *VCHAR
-            </pre><a href="#section-9.4.11-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.11-2" class="pilcrow">¶</a>
 </div>
 <table class="center" id="table-6">
             <caption><a href="#table-6" class="selfRef">Table 6</a></caption>
@@ -5178,9 +5178,9 @@
           interpret the completion reason text.<a href="#section-9.4.12-2" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.4.12-3">
 <pre>
-completion-reason        =  "Completion-Reason" ":" 
+completion-reason        =  "Completion-Reason" ":"
                             quoted-string CRLF
-            </pre><a href="#section-9.4.12-3" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.12-3" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.13">
@@ -5208,7 +5208,7 @@
 <pre>
 recognizer-context-block  =  "Recognizer-Context-Block" ":"
                              [1*VCHAR] CRLF
-            </pre><a href="#section-9.4.13-4" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.13-4" class="pilcrow">¶</a>
 </div>
 </section>
 <div id="sec.startInputTimers">
@@ -5231,7 +5231,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.14-2">
 <pre>
 start-input-timers  =  "Start-Input-Timers" ":" BOOLEAN CRLF
-            </pre><a href="#section-9.4.14-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.14-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -5253,7 +5253,7 @@
 <pre>
 speech-complete-timeout = "Speech-Complete-Timeout" ":"
                           1*19DIGIT CRLF
-            </pre><a href="#section-9.4.15-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.15-2" class="pilcrow">¶</a>
 </div>
 <p id="section-9.4.15-3">A long Speech-Complete-Timeout value delays the result to the
           client and therefore makes the application's response to a user
@@ -5280,9 +5280,9 @@
           implementation specific.<a href="#section-9.4.16-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.4.16-2">
 <pre>
-speech-incomplete-timeout = "Speech-Incomplete-Timeout" ":" 1*19DIGIT 
+speech-incomplete-timeout = "Speech-Incomplete-Timeout" ":" 1*19DIGIT
                              CRLF
-            </pre><a href="#section-9.4.16-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.16-2" class="pilcrow">¶</a>
 </div>
 <p id="section-9.4.16-3">The Speech-Incomplete-Timeout also applies when the speech prior
           to the silence is a complete match of an active grammar, but where
@@ -5312,7 +5312,7 @@
 <pre>
 dtmf-interdigit-timeout = "DTMF-Interdigit-Timeout" ":"
                            1*19DIGIT CRLF
-            </pre><a href="#section-9.4.17-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.17-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.18">
@@ -5328,7 +5328,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.18-2">
 <pre>
 dtmf-term-timeout        =  "DTMF-Term-Timeout" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-9.4.18-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.18-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.19">
@@ -5342,7 +5342,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.19-2">
 <pre>
 dtmf-term-char           =  "DTMF-Term-Char" ":" VCHAR CRLF
-            </pre><a href="#section-9.4.19-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.19-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.20">
@@ -5357,7 +5357,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.20-2">
 <pre>
 failed-uri               =  "Failed-URI" ":" absoluteURI CRLF
-            </pre><a href="#section-9.4.20-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.20-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.21">
@@ -5374,7 +5374,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.21-2">
 <pre>
 failed-uri-cause         =  "Failed-URI-Cause" ":" 1*UTFCHAR CRLF
-            </pre><a href="#section-9.4.21-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.21-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.22">
@@ -5395,7 +5395,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.22-2">
 <pre>
 save-waveform            =  "Save-Waveform" ":" BOOLEAN CRLF
-            </pre><a href="#section-9.4.22-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.22-2" class="pilcrow">¶</a>
 </div>
 </section>
 <div id="sec.newAudioChannel">
@@ -5420,9 +5420,9 @@
           session for multiple telephone calls.<a href="#section-9.4.23-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.4.23-2">
 <pre>
-new-audio-channel        =  "New-Audio-Channel" ":" BOOLEAN 
+new-audio-channel        =  "New-Audio-Channel" ":" BOOLEAN
                             CRLF
-            </pre><a href="#section-9.4.23-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.23-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -5437,7 +5437,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.24-2">
 <pre>
 speech-language          =  "Speech-Language" ":" 1*VCHAR CRLF
-            </pre><a href="#section-9.4.24-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.24-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.25">
@@ -5523,7 +5523,7 @@
 <pre>
 hotword-max-duration     =  "Hotword-Max-Duration" ":" 1*19DIGIT
                             CRLF
-            </pre><a href="#section-9.4.28-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.28-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.29">
@@ -5543,7 +5543,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.29-2">
 <pre>
 hotword-min-duration     =  "Hotword-Min-Duration" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-9.4.29-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.29-2" class="pilcrow">¶</a>
 </div>
 </section>
 <div id="sec.interpretText">
@@ -5560,8 +5560,8 @@
           the INTERPRET method.<a href="#section-9.4.30-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.4.30-2">
 <pre>
-interpret-text           =  "Interpret-Text" ":" 1*VCHAR CRLF          
-            </pre><a href="#section-9.4.30-2" class="pilcrow">¶</a>
+interpret-text           =  "Interpret-Text" ":" 1*VCHAR CRLF
+</pre><a href="#section-9.4.30-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -5581,7 +5581,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.31-2">
 <pre>
 dtmf-buffer-time  =  "DTMF-Buffer-Time" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-9.4.31-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.31-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.32">
@@ -5599,7 +5599,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.32-2">
 <pre>
 clear-dtmf-buffer  = "Clear-DTMF-Buffer" ":" BOOLEAN CRLF
-            </pre><a href="#section-9.4.32-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.32-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.33">
@@ -5617,7 +5617,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.33-2">
 <pre>
 early-no-match  = "Early-No-Match" ":" BOOLEAN CRLF
-            </pre><a href="#section-9.4.33-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.33-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.34">
@@ -5631,9 +5631,9 @@
           implementation specific and MAY be greater than 1.<a href="#section-9.4.34-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.4.34-2">
 <pre>
-num-min-consistent-pronunciations  = 
+num-min-consistent-pronunciations  =
               "Num-Min-Consistent-Pronunciations" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-9.4.34-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.34-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.35">
@@ -5653,7 +5653,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.35-2">
 <pre>
 consistency-threshold    =  "Consistency-Threshold" ":" FLOAT CRLF
-            </pre><a href="#section-9.4.35-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.35-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.36">
@@ -5676,7 +5676,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.36-2">
 <pre>
 clash-threshold          =  "Clash-Threshold" ":" FLOAT CRLF
-            </pre><a href="#section-9.4.36-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.36-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.37">
@@ -5695,7 +5695,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.37-2">
 <pre>
 personal-grammar-uri     =  "Personal-Grammar-URI" ":" uri CRLF
-            </pre><a href="#section-9.4.37-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.37-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.38">
@@ -5711,7 +5711,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.38-2">
 <pre>
 enroll-utterance     =  "Enroll-Utterance" ":" BOOLEAN CRLF
-            </pre><a href="#section-9.4.38-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.38-2" class="pilcrow">¶</a>
 </div>
 </section>
 <div id="sec.phraseID">
@@ -5728,7 +5728,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.39-2">
 <pre>
 phrase-id                =  "Phrase-ID" ":" 1*VCHAR CRLF
-            </pre><a href="#section-9.4.39-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.39-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -5743,7 +5743,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.40-2">
 <pre>
 phrase-nl                =  "Phrase-NL" ":" 1*UTFCHAR CRLF
-            </pre><a href="#section-9.4.40-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.40-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.41">
@@ -5769,7 +5769,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.41-2">
 <pre>
 weight                   =  "Weight" ":" FLOAT CRLF
-            </pre><a href="#section-9.4.41-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.41-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.42">
@@ -5789,7 +5789,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.42-2">
 <pre>
 save-best-waveform  =  "Save-Best-Waveform" ":" BOOLEAN CRLF
-            </pre><a href="#section-9.4.42-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.42-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.43">
@@ -5803,7 +5803,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.43-2">
 <pre>
 new-phrase-id            =  "New-Phrase-ID" ":" 1*VCHAR CRLF
-            </pre><a href="#section-9.4.43-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.43-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.44">
@@ -5818,7 +5818,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.44-2">
 <pre>
 confusable-phrases-uri   =  "Confusable-Phrases-URI" ":" uri CRLF
-            </pre><a href="#section-9.4.44-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.44-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.45">
@@ -5830,9 +5830,9 @@
           phrase to the personal grammar.<a href="#section-9.4.45-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.4.45-2">
 <pre>
-abort-phrase-enrollment  =  "Abort-Phrase-Enrollment" ":" 
+abort-phrase-enrollment  =  "Abort-Phrase-Enrollment" ":"
                             BOOLEAN CRLF
-            </pre><a href="#section-9.4.45-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.45-2" class="pilcrow">¶</a>
 </div>
 </section>
 </section>
@@ -5936,8 +5936,8 @@
             &lt;one-of&gt;
                   &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;
                   &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
-            &lt;/one-of&gt; 
-      &lt;/rule&gt; 
+            &lt;/one-of&gt;
+      &lt;/rule&gt;
 
 &lt;!-- single language attachment to a rule expansion --&gt;
       &lt;rule id="request"&gt;
@@ -6012,8 +6012,8 @@
             &lt;one-of&gt;
                   &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;
                   &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
-            &lt;/one-of&gt; 
-      &lt;/rule&gt; 
+            &lt;/one-of&gt;
+      &lt;/rule&gt;
 
 &lt;!-- single language attachment to a rule expansion --&gt;
       &lt;rule id="request"&gt;
@@ -6159,7 +6159,7 @@
             uncertainty in speech recognition or natural language
             understanding. There are at least two reasons for providing
             multiple interpretations:<a href="#section-9.6.1.1-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.6.1.1-2">
+<ol start="1" type="1" class="normal type-1" id="section-9.6.1.1-2">
               <li id="section-9.6.1.1-2.1">The client application might have additional information,
                 for example, information from a database, that would allow it
                 to select a preferred interpretation from among the possible
@@ -6181,7 +6181,7 @@
 <p id="section-9.6.1.2-1">These are elements and attributes representing additional
             information about the interpretation, over and above the
             interpretation itself. Side information includes:<a href="#section-9.6.1.2-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.6.1.2-2">
+<ol start="1" type="1" class="normal type-1" id="section-9.6.1.2-2">
               <li id="section-9.6.1.2-2.1">Whether an interpretation was achieved (the &lt;nomatch&gt;
                 element) and the system's confidence in an interpretation (the
                 "confidence" attribute of &lt;interpretation&gt;).<a href="#section-9.6.1.2-2.1" class="pilcrow">¶</a>
@@ -6213,7 +6213,7 @@
 <a href="#section-9.6.2" class="section-number selfRef">9.6.2. </a><a href="#name-overview-of-recognizer-resu" class="section-name selfRef">Overview of Recognizer Result Elements and Their Relationships</a>
           </h4>
 <p id="section-9.6.2-1">The recognizer elements in NLSML fall into two categories:<a href="#section-9.6.2-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.6.2-2">
+<ol start="1" type="1" class="normal type-1" id="section-9.6.2-2">
             <li id="section-9.6.2-2.1">description of the input that was processed, and<a href="#section-9.6.2-2.1" class="pilcrow">¶</a>
 </li>
 <li id="section-9.6.2-2.2">description of the meaning which was extracted from the
@@ -6267,7 +6267,7 @@
             result, it can be overridden for individual interpretations at the
             &lt;interpretation&gt; level.<a href="#section-9.6.3.1-1" class="pilcrow">¶</a></p>
 <p id="section-9.6.3.1-2">Attributes:<a href="#section-9.6.3.1-2" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.6.3.1-3">
+<ol start="1" type="1" class="normal type-1" id="section-9.6.3.1-3">
               <li id="section-9.6.3.1-3.1">grammar: The grammar or recognition rule matched by this
                 result. The format of the grammar attribute will match the
                 rule reference semantics defined in the grammar specification.
@@ -6288,7 +6288,7 @@
 <pre>
 &lt;?xml version="1.0"?&gt;
 &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
-        grammar="http://www.example.com/grammar"&gt; 
+        grammar="http://www.example.com/grammar"&gt;
   &lt;interpretation&gt;
    ....
   &lt;/interpretation&gt;
@@ -6303,7 +6303,7 @@
 <p id="section-9.6.3.2-1">An &lt;interpretation&gt; element contains a single semantic
             interpretation.<a href="#section-9.6.3.2-1" class="pilcrow">¶</a></p>
 <p id="section-9.6.3.2-2">Attributes:<a href="#section-9.6.3.2-2" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.6.3.2-3">
+<ol start="1" type="1" class="normal type-1" id="section-9.6.3.2-3">
               <li id="section-9.6.3.2-3.1">confidence: A float value from 0.0-1.0 indicating the
                 semantic analyzer's confidence in this interpretation. A value
                 of 1.0 indicates maximum confidence. The values are
@@ -6359,7 +6359,7 @@
             objects created, nor any semantic translation, the instance value
             is the same as the input value.<a href="#section-9.6.3.3-1" class="pilcrow">¶</a></p>
 <p id="section-9.6.3.3-2">Attributes:<a href="#section-9.6.3.3-2" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.6.3.3-3">
+<ol start="1" type="1" class="normal type-1" id="section-9.6.3.3-3">
               <li id="section-9.6.3.3-3.1">confidence: Each element of the instance MAY have a
                 confidence attribute, defined in the NLSML namespace. The
                 confidence attribute contains a float value in the range from
@@ -6380,7 +6380,7 @@
       &lt;state&gt;CA&lt;/state&gt;
       &lt;zip&gt;90952&lt;/zip&gt;
   &lt;/nameAddress&gt;
-&lt;/instance&gt; 
+&lt;/instance&gt;
 &lt;input&gt;
   My address is 123 Maple Street,
   Mill Valley, California, 90952
@@ -6393,7 +6393,7 @@
 <pre>
 &lt;instance&gt;
     I would like to buy a coca-cola
-&lt;/instance&gt; 
+&lt;/instance&gt;
 &lt;input&gt;
   I would like to buy a coke
 &lt;/input&gt;
@@ -6418,7 +6418,7 @@
             spoken utterance, in <span><a href="#ISO.8601.1988" class="xref">ISO 8601
             format</a> [<a href="#ISO.8601.1988" class="xref">ISO.8601.1988</a>]</span>.<a href="#section-9.6.3.4-1" class="pilcrow">¶</a></p>
 <p id="section-9.6.3.4-2">Attributes:<a href="#section-9.6.3.4-2" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.6.3.4-3">
+<ol start="1" type="1" class="normal type-1" id="section-9.6.3.4-3">
               <li id="section-9.6.3.4-3.1">timestamp-start: The time at which the input began.
                 (optional)<a href="#section-9.6.3.4-3.1" class="pilcrow">¶</a>
 </li>
@@ -6441,7 +6441,7 @@
 <p id="section-9.6.3.4-5">When there is no time zone designator, ISO 8601 time
             representations default to local time.<a href="#section-9.6.3.4-5" class="pilcrow">¶</a></p>
 <p id="section-9.6.3.4-6">There are three possible formats for the &lt;input&gt; element.<a href="#section-9.6.3.4-6" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.6.3.4-7">
+<ol start="1" type="1" class="normal type-1" id="section-9.6.3.4-7">
               <li id="section-9.6.3.4-7.1">
                 <p id="section-9.6.3.4-7.1.1">The &lt;input&gt; element can contain simple text:<a href="#section-9.6.3.4-7.1.1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.6.3.4-7.1.2">
@@ -6465,12 +6465,12 @@
                 for individual words and word-level confidences.<a href="#section-9.6.3.4-7.2.1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.6.3.4-7.2.2">
 <pre>
-    &lt;input&gt; 
+    &lt;input&gt;
          &lt;input mode="speech" confidence="0.5"
-             timestamp-start="2000-04-03T0:00:00" 
+             timestamp-start="2000-04-03T0:00:00"
              timestamp-end="2000-04-03T0:00:00.2"&gt;fried&lt;/input&gt;
          &lt;input mode="speech" confidence="1.0"
-             timestamp-start="2000-04-03T0:00:00.25" 
+             timestamp-start="2000-04-03T0:00:00.25"
              timestamp-end="2000-04-03T0:00:00.6"&gt;onions&lt;/input&gt;
     &lt;/input&gt;
 </pre><a href="#section-9.6.3.4-7.2.2" class="pilcrow">¶</a>
@@ -6497,14 +6497,14 @@
 <pre>
 &lt;interpretation&gt;
    &lt;instance/&gt;
-      &lt;input confidence="0.1"&gt; 
+      &lt;input confidence="0.1"&gt;
          &lt;nomatch/&gt;
       &lt;/input&gt;
 &lt;/interpretation&gt;
-&lt;interpretation&gt;  
-   &lt;instance/&gt;       
-   &lt;input mode="speech" confidence="0.1"&gt;           
-     &lt;nomatch&gt;I want to go to New York&lt;/nomatch&gt;       
+&lt;interpretation&gt;
+   &lt;instance/&gt;
+   &lt;input mode="speech" confidence="0.1"&gt;
+     &lt;nomatch&gt;I want to go to New York&lt;/nomatch&gt;
    &lt;/input&gt;
 &lt;/interpretation&gt;
 </pre><a href="#section-9.6.3.5-2" class="pilcrow">¶</a>
@@ -6533,7 +6533,7 @@
             in DTMF modality". For example, to represent garbled speech
             combined with DTMF "1 2 3 4", the markup would be:<a href="#section-9.6.3.6-3" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.6.3.6-4">
-<pre>&lt;input&gt; 
+<pre>&lt;input&gt;
    &lt;input mode="speech"&gt;&lt;nomatch/&gt;&lt;/input&gt;
    &lt;input mode="dtmf"&gt;1 2 3 4&lt;/input&gt;
 &lt;/input&gt;</pre><a href="#section-9.6.3.6-4" class="pilcrow">¶</a>
@@ -6555,7 +6555,7 @@
         &lt;enrollment‑result&gt; element under &lt;result&gt;. The elements
         are described below and have the schema defined in <a href="#sec.enrollmentResultsSchema" class="xref">Section 16.2</a>. The following elements
         are defined:<a href="#section-9.7-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.7-2">
+<ol start="1" type="1" class="normal type-1" id="section-9.7-2">
           <li id="section-9.7-2.1">num-clashes<a href="#section-9.7-2.1" class="pilcrow">¶</a>
 </li>
 <li id="section-9.7-2.2">num-good-repetitions<a href="#section-9.7-2.2" class="pilcrow">¶</a>
@@ -6686,8 +6686,8 @@
             &lt;one-of&gt;
                   &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;
                   &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
-            &lt;/one-of&gt; 
-      &lt;/rule&gt; 
+            &lt;/one-of&gt;
+      &lt;/rule&gt;
 
 &lt;!-- single language attachment to a rule expansion --&gt;
       &lt;rule id="request"&gt;
@@ -6737,8 +6737,8 @@
                   "http://www.w3.org/TR/speech-grammar/grammar.dtd"&gt;
 
 &lt;grammar xmlns="http://www.w3.org/2001/06/grammar" xml:lang="en"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-       xsi:schemaLocation="http://www.w3.org/2001/06/grammar 
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.w3.org/2001/06/grammar
            http://www.w3.org/TR/speech-grammar/grammar.xsd"
            version="1.0" mode="voice" root="basicCmd"&gt;
 
@@ -6748,7 +6748,7 @@
   &lt;example&gt; please move the window &lt;/example&gt;
   &lt;example&gt; open a file &lt;/example&gt;
 
-  &lt;ruleref 
+  &lt;ruleref
     uri="http://grammar.example.com/politeness.grxml#startPolite"/&gt;
 
   &lt;ruleref uri="#command"/&gt;
@@ -6806,7 +6806,7 @@
 
 S-&gt;C:MRCP/2.0 ... START-OF-INPUT 543260 IN-PROGRESS
 Channel-Identifier:32AECB23433801@speechrecog
-        
+
 S-&gt;C:MRCP/2.0 ... RECOGNITION-COMPLETE 543260 COMPLETE
 Channel-Identifier:32AECB23433801@speechrecog
 Completion-Cause:000 success
@@ -6864,7 +6864,7 @@
         useful in applications like VoiceXML browsers to order grammars
         specified at the dialog, document, and root level of a VoiceXML
         application.<a href="#section-9.9-3" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.9-4">
+<ol start="1" type="1" class="normal type-1" id="section-9.9-4">
           <li id="section-9.9-4.1">The grammar MAY be placed directly in the message body as typed
             content. If more than one grammar is included in the body, the
             order of inclusion controls the corresponding precedence for the
@@ -6961,7 +6961,7 @@
         the Speech-Complete-Timer is started. If it matches partially with one
         or more of the active grammars, with more speech needed before a full
         match is achieved, then the Speech-Incomplete-Timer is started.<a href="#section-9.9-15" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.9-16">
+<ol start="1" type="1" class="normal type-1" id="section-9.9-16">
           <li id="section-9.9-16.1">When the No-Input-Timer expires, the recognizer MUST complete
         with a Completion-Cause code of "no-input-timeout".<a href="#section-9.9-16.1" class="pilcrow">¶</a>
 </li>
@@ -7006,7 +7006,7 @@
 <p id="section-9.9-17">For recognition in hotword mode:<a href="#section-9.9-17" class="pilcrow">¶</a></p>
 <p id="section-9.9-18">Note that for recognition in hotword mode the START-OF-INPUT event is
         not generated when speech or a DTMF digit is detected.<a href="#section-9.9-18" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.9-19">
+<ol start="1" type="1" class="normal type-1" id="section-9.9-19">
           <li id="section-9.9-19.1">When the No-Input-Timer expires, the recognizer MUST complete
         with a Completion-Cause code of "no-input-timeout".<a href="#section-9.9-19.1" class="pilcrow">¶</a>
 </li>
@@ -7043,7 +7043,7 @@
 &lt;?xml version="1.0"?&gt;
 
 &lt;!-- the default grammar language is US English --&gt;
-&lt;grammar xmlns="http://www.w3.org/2001/06/grammar" 
+&lt;grammar xmlns="http://www.w3.org/2001/06/grammar"
          xml:lang="en-US" version="1.0" root="request"&gt;
 
 &lt;!-- single language attachment to tokens --&gt;
@@ -7051,8 +7051,8 @@
             &lt;one-of&gt;
                   &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;
                   &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
-            &lt;/one-of&gt; 
-      &lt;/rule&gt; 
+            &lt;/one-of&gt;
+      &lt;/rule&gt;
 
 &lt;!-- single language attachment to a rule expansion --&gt;
       &lt;rule id="request"&gt;
@@ -7070,7 +7070,7 @@
 
 S-&gt;C:MRCP/2.0 ... START-OF-INPUT 543257 IN-PROGRESS
 Channel-Identifier:32AECB23433801@speechrecog
-        
+
 S-&gt;C:MRCP/2.0 ... RECOGNITION-COMPLETE 543257 COMPLETE
 Channel-Identifier:32AECB23433801@speechrecog
 Completion-Cause:000 success
@@ -7100,14 +7100,14 @@
 occur in normal usage.<a href="#section-9.9-22" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.9-23">
 <pre>
-C-&gt;S:   MRCP/2.0 ... RECOGNIZE 543257 
-        Channel-Identifier:32AECB23433801@speechrecog 
-        Confidence-Threshold:0.9 
+C-&gt;S:   MRCP/2.0 ... RECOGNIZE 543257
+        Channel-Identifier:32AECB23433801@speechrecog
+        Confidence-Threshold:0.9
         Fetch-Timeout:20
-        Content-Type:application/srgs+xml 
+        Content-Type:application/srgs+xml
         Content-Length:...
-        
-        &lt;?xml version="1.0"? Version="1.0" mode="voice" 
+
+        &lt;?xml version="1.0"? Version="1.0" mode="voice"
               root="Basic md"&gt;
          &lt;rule id="rule_list" scope="public"&gt;
              &lt;one-of&gt;
@@ -7151,7 +7151,7 @@
         Content-Type:application/srgs+xml
         Content-ID:&lt;request1@form-level.store&gt;
         Content-Length:...
-        
+
         &lt;?xml version="1.0"?&gt;
 
         &lt;!-- the default grammar language is US English --&gt;
@@ -7163,8 +7163,8 @@
                 &lt;one-of&gt;
                       &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;
                       &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
-                &lt;/one-of&gt; 
-            &lt;/rule&gt; 
+                &lt;/one-of&gt;
+            &lt;/rule&gt;
 
         &lt;!-- single language attachment to a rule expansion --&gt;
             &lt;rule id="request"&gt;
@@ -7209,13 +7209,13 @@
 C-&gt;S:   MRCP/2.0 ... GET-RESULT 543257
         Channel-Identifier:32AECB23433801@speechrecog
         Confidence-Threshold:0.9
-        
+
 
 S-&gt;C:   MRCP/2.0 ... 543257 200 COMPLETE
         Channel-Identifier:32AECB23433801@speechrecog
         Content-Type:application/nlsml+xml
         Content-Length:...
-        
+
         &lt;?xml version="1.0"?&gt;
         &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                 xmlns:ex="http://www.example.com/example"
@@ -7297,7 +7297,7 @@
         Content-Type:application/srgs+xml
         Content-ID:&lt;request1@form-level.store&gt;
         Content-Length:...
-        
+
         &lt;?xml version="1.0"?&gt;
 
         &lt;!-- the default grammar language is US English --&gt;
@@ -7309,8 +7309,8 @@
                    &lt;one-of&gt;
                        &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;
                        &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
-                   &lt;/one-of&gt; 
-              &lt;/rule&gt; 
+                   &lt;/one-of&gt;
+              &lt;/rule&gt;
 
         &lt;!-- single language attachment to a rule expansion --&gt;
               &lt;rule id="request"&gt;
@@ -7327,7 +7327,7 @@
 
 S-&gt;C:   MRCP/2.0 ... START-OF-INPUT 543257 IN-PROGRESS
         Channel-Identifier:32AECB23433801@speechrecog
-        
+
 S-&gt;C:   MRCP/2.0 ... RECOGNITION-COMPLETE 543257 COMPLETE
         Channel-Identifier:32AECB23433801@speechrecog
         Completion-Cause:000 success
@@ -7335,7 +7335,7 @@
                      size=342456;duration=25435
         Content-Type:application/nlsml+xml
         Content-Length:...
-        
+
         &lt;?xml version="1.0"?&gt;
         &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                 xmlns:ex="http://www.example.com/example"
@@ -7360,22 +7360,22 @@
         Completion-Cause:000 success
         Content-Type:application/nlsml+xml
         Content-Length:...
-        
+
         &lt;?xml version= "1.0"?&gt;
         &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                 grammar="Personal-Grammar-URI"&gt;
             &lt;enrollment-result&gt;
                 &lt;num-clashes&gt; 2 &lt;/num-clashes&gt;
                 &lt;num-good-repetitions&gt; 1 &lt;/num-good-repetitions&gt;
-                &lt;num-repetitions-still-needed&gt; 
-                   1 
+                &lt;num-repetitions-still-needed&gt;
+                   1
                 &lt;/num-repetitions-still-needed&gt;
                 &lt;consistency-status&gt; consistent &lt;/consistency-status&gt;
-                &lt;clash-phrase-ids&gt; 
-                    &lt;item&gt; Jeff &lt;/item&gt; &lt;item&gt; Andre &lt;/item&gt; 
+                &lt;clash-phrase-ids&gt;
+                    &lt;item&gt; Jeff &lt;/item&gt; &lt;item&gt; Andre &lt;/item&gt;
                 &lt;/clash-phrase-ids&gt;
                 &lt;transcriptions&gt;
-                     &lt;item&gt; m ay b r ow k er &lt;/item&gt; 
+                     &lt;item&gt; m ay b r ow k er &lt;/item&gt;
                      &lt;item&gt; m ax r aa k ah &lt;/item&gt;
                 &lt;/transcriptions&gt;
                 &lt;confusable-phrases&gt;
@@ -7483,7 +7483,7 @@
 <pre>
 C-&gt;S:   MRCP/2.0 ... END-PHRASE-ENROLLMENT 543262
         Channel-Identifier:32AECB23433801@speechrecog
-    
+
 
 S-&gt;C:   MRCP/2.0 ... 543262 200 COMPLETE
         Channel-Identifier:32AECB23433801@speechrecog
@@ -7503,7 +7503,7 @@
         effect.<a href="#section-9.18-2" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.18-3">
 <pre>
-C-&gt;S:   MRCP/2.0 ... MODIFY-PHRASE 543265    
+C-&gt;S:   MRCP/2.0 ... MODIFY-PHRASE 543265
         Channel-Identifier:32AECB23433801@speechrecog
         Personal-Grammar-URI:&lt;personal grammar uri&gt;
         Phrase-Id:&lt;phrase id&gt;
@@ -7511,7 +7511,7 @@
         Phrase-NL:&lt;NL phrase&gt;
         Weight:1
 
-S-&gt;C:   MRCP/2.0 ... 543265 200 COMPLETE 
+S-&gt;C:   MRCP/2.0 ... 543265 200 COMPLETE
         Channel-Identifier:32AECB23433801@speechrecog</pre><a href="#section-9.18-3" class="pilcrow">¶</a>
 </div>
 </section>
@@ -7557,56 +7557,56 @@
 <div class="artwork art-text alignLeft" id="section-9.20-4">
 <pre>
 C-&gt;S:   MRCP/2.0 ... INTERPRET 543266
-        Channel-Identifier:32AECB23433801@speechrecog 
-        Interpret-Text:may I speak to Andre Roy 
-        Content-Type:application/srgs+xml  
-        Content-ID:&lt;request1@form-level.store&gt;  
+        Channel-Identifier:32AECB23433801@speechrecog
+        Interpret-Text:may I speak to Andre Roy
+        Content-Type:application/srgs+xml
+        Content-ID:&lt;request1@form-level.store&gt;
         Content-Length:...
-        
-        &lt;?xml version="1.0"?&gt;  
-        &lt;!-- the default grammar language is US English --&gt;  
+
+        &lt;?xml version="1.0"?&gt;
+        &lt;!-- the default grammar language is US English --&gt;
         &lt;grammar xmlns="http://www.w3.org/2001/06/grammar"
-                 xml:lang="en-US" version="1.0" root="request"&gt;  
-        &lt;!-- single language attachment to tokens --&gt;  
-            &lt;rule id="yes"&gt;  
-                &lt;one-of&gt;  
-                    &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;  
-                    &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;  
-                &lt;/one-of&gt;   
-            &lt;/rule&gt;   
-        
-        &lt;!-- single language attachment to a rule expansion --&gt;  
-            &lt;rule id="request"&gt;  
-                may I speak to  
-                &lt;one-of xml:lang="fr-CA"&gt;  
-                    &lt;item&gt;Michel Tremblay&lt;/item&gt;  
-                    &lt;item&gt;Andre Roy&lt;/item&gt;  
-                &lt;/one-of&gt;  
-            &lt;/rule&gt;  
-        &lt;/grammar&gt;  
-              
+                 xml:lang="en-US" version="1.0" root="request"&gt;
+        &lt;!-- single language attachment to tokens --&gt;
+            &lt;rule id="yes"&gt;
+                &lt;one-of&gt;
+                    &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;
+                    &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
+                &lt;/one-of&gt;
+            &lt;/rule&gt;
+
+        &lt;!-- single language attachment to a rule expansion --&gt;
+            &lt;rule id="request"&gt;
+                may I speak to
+                &lt;one-of xml:lang="fr-CA"&gt;
+                    &lt;item&gt;Michel Tremblay&lt;/item&gt;
+                    &lt;item&gt;Andre Roy&lt;/item&gt;
+                &lt;/one-of&gt;
+            &lt;/rule&gt;
+        &lt;/grammar&gt;
+
 S-&gt;C:   MRCP/2.0 ... 543266 200 IN-PROGRESS
         Channel-Identifier:32AECB23433801@speechrecog
-                   
+
 S-&gt;C:   MRCP/2.0 ... INTERPRETATION-COMPLETE 543266 200 COMPLETE
         Channel-Identifier:32AECB23433801@speechrecog
-        Completion-Cause:000 success  
-        Content-Type:application/nlsml+xml  
+        Completion-Cause:000 success
+        Content-Type:application/nlsml+xml
         Content-Length:...
-        
-        &lt;?xml version="1.0"?&gt;  
+
+        &lt;?xml version="1.0"?&gt;
         &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                 xmlns:ex="http://www.example.com/example"
-                grammar="session:request1@form-level.store"&gt;  
-            &lt;interpretation&gt;  
-                &lt;instance name="Person"&gt;  
-                    &lt;ex:Person&gt;  
-                        &lt;ex:Name&gt; Andre Roy &lt;/ex:Name&gt;  
-                    &lt;/ex:Person&gt;  
-                &lt;/instance&gt;  
-                &lt;input&gt;   may I speak to Andre Roy &lt;/input&gt;  
-            &lt;/interpretation&gt;  
-        &lt;/result&gt; 
+                grammar="session:request1@form-level.store"&gt;
+            &lt;interpretation&gt;
+                &lt;instance name="Person"&gt;
+                    &lt;ex:Person&gt;
+                        &lt;ex:Name&gt; Andre Roy &lt;/ex:Name&gt;
+                    &lt;/ex:Person&gt;
+                &lt;/instance&gt;
+                &lt;input&gt;   may I speak to Andre Roy &lt;/input&gt;
+            &lt;/interpretation&gt;
+        &lt;/result&gt;
 </pre><a href="#section-9.20-4" class="pilcrow">¶</a>
 </div>
 </section>
@@ -7625,55 +7625,55 @@
 <div class="artwork art-text alignLeft" id="section-9.21-3">
 <pre>
 C-&gt;S:    MRCP/2.0 ... INTERPRET 543266
-        Channel-Identifier:32AECB23433801@speechrecog 
-        Interpret-Text:may I speak to Andre Roy 
-        Content-Type:application/srgs+xml  
-        Content-ID:&lt;request1@form-level.store&gt;  
+        Channel-Identifier:32AECB23433801@speechrecog
+        Interpret-Text:may I speak to Andre Roy
+        Content-Type:application/srgs+xml
+        Content-ID:&lt;request1@form-level.store&gt;
         Content-Length:...
-        
-        &lt;?xml version="1.0"?&gt;  
-        &lt;!-- the default grammar language is US English --&gt;  
+
+        &lt;?xml version="1.0"?&gt;
+        &lt;!-- the default grammar language is US English --&gt;
         &lt;grammar xmlns="http://www.w3.org/2001/06/grammar"
-                 xml:lang="en-US" version="1.0" root="request"&gt;  
-        &lt;!-- single language attachment to tokens --&gt;  
-            &lt;rule id="yes"&gt;  
-                &lt;one-of&gt;  
+                 xml:lang="en-US" version="1.0" root="request"&gt;
+        &lt;!-- single language attachment to tokens --&gt;
+            &lt;rule id="yes"&gt;
+                &lt;one-of&gt;
                     &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;
                     &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
                 &lt;/one-of&gt;
             &lt;/rule&gt;
-        
-        &lt;!-- single language attachment to a rule expansion --&gt;  
-            &lt;rule id="request"&gt;  
-                may I speak to  
-                &lt;one-of xml:lang="fr-CA"&gt;  
-                    &lt;item&gt;Michel Tremblay&lt;/item&gt;  
-                    &lt;item&gt;Andre Roy&lt;/item&gt;  
-                &lt;/one-of&gt;  
-            &lt;/rule&gt;      
-        &lt;/grammar&gt;  
-              
+
+        &lt;!-- single language attachment to a rule expansion --&gt;
+            &lt;rule id="request"&gt;
+                may I speak to
+                &lt;one-of xml:lang="fr-CA"&gt;
+                    &lt;item&gt;Michel Tremblay&lt;/item&gt;
+                    &lt;item&gt;Andre Roy&lt;/item&gt;
+                &lt;/one-of&gt;
+            &lt;/rule&gt;
+        &lt;/grammar&gt;
+
 S-&gt;C:    MRCP/2.0 ... 543266 200 IN-PROGRESS
         Channel-Identifier:32AECB23433801@speechrecog
-                   
+
 S-&gt;C:    MRCP/2.0 ... INTERPRETATION-COMPLETE 543266 200 COMPLETE
         Channel-Identifier:32AECB23433801@speechrecog
-        Completion-Cause:000 success  
-        Content-Type:application/nlsml+xml  
+        Completion-Cause:000 success
+        Content-Type:application/nlsml+xml
         Content-Length:...
-        
-        &lt;?xml version="1.0"?&gt;  
+
+        &lt;?xml version="1.0"?&gt;
         &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                 xmlns:ex="http://www.example.com/example"
-                grammar="session:request1@form-level.store"&gt;  
-            &lt;interpretation&gt;  
-                &lt;instance name="Person"&gt;  
-                    &lt;ex:Person&gt;  
-                        &lt;ex:Name&gt; Andre Roy &lt;/ex:Name&gt;  
-                    &lt;/ex:Person&gt;  
-                &lt;/instance&gt;  
-                &lt;input&gt;   may I speak to Andre Roy &lt;/input&gt;  
-            &lt;/interpretation&gt;  
+                grammar="session:request1@form-level.store"&gt;
+            &lt;interpretation&gt;
+                &lt;instance name="Person"&gt;
+                    &lt;ex:Person&gt;
+                        &lt;ex:Name&gt; Andre Roy &lt;/ex:Name&gt;
+                    &lt;/ex:Person&gt;
+                &lt;/instance&gt;
+                &lt;input&gt;   may I speak to Andre Roy &lt;/input&gt;
+            &lt;/interpretation&gt;
         &lt;/result&gt;
 </pre><a href="#section-9.21-3" class="pilcrow">¶</a>
 </div>
@@ -7696,7 +7696,7 @@
       </h2>
 <p id="section-10-1">This resource captures received audio and video and stores it as
       content pointed to by a URI. The main usages of recorders are<a href="#section-10-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-10-2">
+<ol start="1" type="1" class="normal type-1" id="section-10-2">
         <li id="section-10-2.1">to capture speech audio that may be submitted for recognition at
           a later time, and<a href="#section-10-2.1" class="pilcrow">¶</a>
 </li>
@@ -7756,7 +7756,7 @@
 recorder-method      =  "RECORD"
                      /  "STOP"
                      /  "START-INPUT-TIMERS"
-                    </pre><a href="#section-10.2-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.2-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.3">
@@ -7768,7 +7768,7 @@
 <pre>
 recorder-event       =  "START-OF-INPUT"
                      /  "RECORD-COMPLETE"
-                    </pre><a href="#section-10.3-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.3-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4">
@@ -7781,7 +7781,7 @@
         associated with.<a href="#section-10.4-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-10.4-2">
 <pre>
-recorder-header      =  sensitivity-level        
+recorder-header      =  sensitivity-level
                      /  no-input-timeout
                      /  completion-cause
                      /  completion-reason
@@ -7796,7 +7796,7 @@
                      /  ver-buffer-utterance
                      /  start-input-timers
                      /  new-audio-channel
-                    </pre><a href="#section-10.4-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4-2" class="pilcrow">¶</a>
 </div>
 <section id="section-10.4.1">
           <h4 id="name-sensitivity-level-2">
@@ -7812,7 +7812,7 @@
 <div class="artwork art-text alignLeft" id="section-10.4.1-2">
 <pre>
 sensitivity-level    =     "Sensitivity-Level" ":" FLOAT CRLF
-            </pre><a href="#section-10.4.1-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.1-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.2">
@@ -7830,7 +7830,7 @@
 <div class="artwork art-text alignLeft" id="section-10.4.2-2">
 <pre>
 no-input-timeout    =     "No-Input-Timeout" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-10.4.2-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.2-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.3">
@@ -7851,7 +7851,7 @@
                             cause-name CRLF
 cause-code               =  3DIGIT
 cause-name               =  *VCHAR
-            </pre><a href="#section-10.4.3-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.3-2" class="pilcrow">¶</a>
 </div>
 <table class="center" id="table-7">
             <caption><a href="#table-7" class="selfRef">Table 7</a></caption>
@@ -7908,7 +7908,7 @@
 <pre>
 completion-reason        =  "Completion-Reason" ":"
                             quoted-string CRLF
-                        </pre><a href="#section-10.4.4-3" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.4-3" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.5">
@@ -7921,7 +7921,7 @@
 <div class="artwork art-text alignLeft" id="section-10.4.5-2">
 <pre>
 failed-uri               =  "Failed-URI" ":" absoluteURI CRLF
-            </pre><a href="#section-10.4.5-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.5-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.6">
@@ -7937,9 +7937,9 @@
           response code.<a href="#section-10.4.6-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-10.4.6-2">
 <pre>
-failed-uri-cause         =  "Failed-URI-Cause" ":" 1*UTFCHAR 
+failed-uri-cause         =  "Failed-URI-Cause" ":" 1*UTFCHAR
                             CRLF
-            </pre><a href="#section-10.4.6-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.6-2" class="pilcrow">¶</a>
 </div>
 </section>
 <div id="sec.recordURI">
@@ -7966,10 +7966,10 @@
           implementations already exist that support other schemes.<a href="#section-10.4.7-3" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-10.4.7-4">
 <pre>
-record-uri               =  "Record-URI" ":" ["&lt;" uri "&gt;" 
-                            ";" "size" "=" 1*19DIGIT 
+record-uri               =  "Record-URI" ":" ["&lt;" uri "&gt;"
+                            ";" "size" "=" 1*19DIGIT
                             ";" "duration" "=" 1*19DIGIT] CRLF
-            </pre><a href="#section-10.4.7-4" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.7-4" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -7981,9 +7981,9 @@
           to the server the media type of the captured audio or video.<a href="#section-10.4.8-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-10.4.8-2">
 <pre>
-media-type               =  "Media-Type" ":" media-type-value 
+media-type               =  "Media-Type" ":" media-type-value
                             CRLF
-            </pre><a href="#section-10.4.8-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.8-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.9">
@@ -8006,7 +8006,7 @@
 <div class="artwork art-text alignLeft" id="section-10.4.9-2">
 <pre>
 max-time                 =  "Max-Time" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-10.4.9-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.9-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.10">
@@ -8020,7 +8020,7 @@
 <div class="artwork art-text alignLeft" id="section-10.4.10-2">
 <pre>
 trim-length                 =  "Trim-Length" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-10.4.10-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.10-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.11">
@@ -8039,7 +8039,7 @@
 <div class="artwork art-text alignLeft" id="section-10.4.11-2">
 <pre>
 final-silence            =  "Final-Silence" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-10.4.11-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.11-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.12">
@@ -8055,7 +8055,7 @@
 <div class="artwork art-text alignLeft" id="section-10.4.12-2">
 <pre>
 capture-on-speech        =  "Capture-On-Speech " ":" BOOLEAN CRLF
-            </pre><a href="#section-10.4.12-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.12-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.13">
@@ -8091,7 +8091,7 @@
 <pre>
 start-input-timers       =  "Start-Input-Timers" ":"
                             BOOLEAN CRLF
-                        </pre><a href="#section-10.4.14-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.14-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.15">
@@ -8148,20 +8148,20 @@
 <pre>
 C-&gt;S:  MRCP/2.0 ... RECORD 543257
        Channel-Identifier:32AECB23433802@recorder
-       Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;  
+       Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;
        Media-Type:audio/wav
        Capture-On-Speech:true
        Final-Silence:300
        Max-Time:6000
-           
-S-&gt;C:  MRCP/2.0 ... 543257 200 IN-PROGRESS 
-       Channel-Identifier:32AECB23433802@recorder           
-
-S-&gt;C:  MRCP/2.0 ... START-OF-INPUT 543257 IN-PROGRESS 
-       Channel-Identifier:32AECB23433802@recorder           
-            
-S-&gt;C:  MRCP/2.0 ... RECORD-COMPLETE 543257 COMPLETE 
-       Channel-Identifier:32AECB23433802@recorder          
+
+S-&gt;C:  MRCP/2.0 ... 543257 200 IN-PROGRESS
+       Channel-Identifier:32AECB23433802@recorder
+
+S-&gt;C:  MRCP/2.0 ... START-OF-INPUT 543257 IN-PROGRESS
+       Channel-Identifier:32AECB23433802@recorder
+
+S-&gt;C:  MRCP/2.0 ... RECORD-COMPLETE 543257 COMPLETE
+       Channel-Identifier:32AECB23433802@recorder
        Completion-Cause:000 success-silence
        Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;;
                   size=242552;duration=25645
@@ -8194,23 +8194,23 @@
 <pre>
 C-&gt;S:  MRCP/2.0 ... RECORD 543257
        Channel-Identifier:32AECB23433802@recorder
-       Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;  
+       Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;
        Capture-On-Speech:true
        Final-Silence:300
        Max-Time:6000
-           
-S-&gt;C:  MRCP/2.0 ... 543257 200 IN-PROGRESS 
-       Channel-Identifier:32AECB23433802@recorder           
-
-S-&gt;C:  MRCP/2.0 ... START-OF-INPUT 543257 IN-PROGRESS 
-       Channel-Identifier:32AECB23433802@recorder           
-            
+
+S-&gt;C:  MRCP/2.0 ... 543257 200 IN-PROGRESS
+       Channel-Identifier:32AECB23433802@recorder
+
+S-&gt;C:  MRCP/2.0 ... START-OF-INPUT 543257 IN-PROGRESS
+       Channel-Identifier:32AECB23433802@recorder
+
 C-&gt;S:  MRCP/2.0 ... STOP 543257
-       Channel-Identifier:32AECB23433802@recorder           
+       Channel-Identifier:32AECB23433802@recorder
        Trim-Length:200
-           
-S-&gt;C:  MRCP/2.0 ... 543257 200 COMPLETE 
-       Channel-Identifier:32AECB23433802@recorder           
+
+S-&gt;C:  MRCP/2.0 ... 543257 200 COMPLETE
+       Channel-Identifier:32AECB23433802@recorder
        Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;;
                   size=324253;duration=24561
        Active-Request-Id-List:543257
@@ -8235,19 +8235,19 @@
 <pre>
 C-&gt;S:  MRCP/2.0 ... RECORD 543257
        Channel-Identifier:32AECB23433802@recorder
-       Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;  
+       Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;
        Capture-On-Speech:true
        Final-Silence:300
        Max-Time:6000
-           
-S-&gt;C:  MRCP/2.0 ... 543257 200 IN-PROGRESS 
-       Channel-Identifier:32AECB23433802@recorder           
-
-S-&gt;C:  MRCP/2.0 ... START-OF-INPUT 543257 IN-PROGRESS 
-       Channel-Identifier:32AECB23433802@recorder           
-            
-S-&gt;C:  MRCP/2.0 ... RECORD-COMPLETE 543257 COMPLETE 
-       Channel-Identifier:32AECB23433802@recorder           
+
+S-&gt;C:  MRCP/2.0 ... 543257 200 IN-PROGRESS
+       Channel-Identifier:32AECB23433802@recorder
+
+S-&gt;C:  MRCP/2.0 ... START-OF-INPUT 543257 IN-PROGRESS
+       Channel-Identifier:32AECB23433802@recorder
+
+S-&gt;C:  MRCP/2.0 ... RECORD-COMPLETE 543257 COMPLETE
+       Channel-Identifier:32AECB23433802@recorder
        Completion-Cause:000 success
        Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;;
                   size=325325;duration=24652
@@ -8430,14 +8430,14 @@
    |                   |&lt;---------|              |
    |                   |                         |
    |----------|        |                         |
-   |         STOP      |                         |    
+   |         STOP      |                         |
    |&lt;---------|        |                         |
    |                   |----------|              |
    |                   |    CLEAR-BUFFER         |
    |                   |&lt;---------|              |
    |                   |                         |
    |----------|        |                         |
-   |   CLEAR-BUFFER    |                         |    
+   |   CLEAR-BUFFER    |                         |
    |&lt;---------|        |                         |
    |                   |                         |
    |                   |----------|              |
@@ -8479,7 +8479,7 @@
                          / "CLEAR-BUFFER"
                          / "START-INPUT-TIMERS"
                          / "GET-INTERMEDIATE-RESULT"
-                        </pre><a href="#section-11.2-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.2-2" class="pilcrow">¶</a>
 </div>
 <p id="section-11.2-3">These methods allow the client to control the mode and target of
         verification or identification operations within the context of a
@@ -8497,13 +8497,13 @@
         appropriate for the resource, with the header field
         Ver‑Buffer‑Utterance. Then, when the following method is called,
         verification is performed using the set of buffered audio.<a href="#section-11.2-5" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-11.2-6">
+<ol start="1" type="1" class="normal type-1" id="section-11.2-6">
           <li id="section-11.2-6.1">VERIFY-FROM-BUFFER<a href="#section-11.2-6.1" class="pilcrow">¶</a>
 </li>
 </ol>
 <p id="section-11.2-7">The following methods are used for verification of live audio
         utterances:<a href="#section-11.2-7" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-11.2-8">
+<ol start="1" type="1" class="normal type-1" id="section-11.2-8">
           <li id="section-11.2-8.1">VERIFY<a href="#section-11.2-8.1" class="pilcrow">¶</a>
 </li>
 <li id="section-11.2-8.2">START-INPUT-TIMERS<a href="#section-11.2-8.2" class="pilcrow">¶</a>
@@ -8511,7 +8511,7 @@
 </ol>
 <p id="section-11.2-9">The following methods are used for configuring the verifier
         resource and for establishing resource states:<a href="#section-11.2-9" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-11.2-10">
+<ol start="1" type="1" class="normal type-1" id="section-11.2-10">
           <li id="section-11.2-10.1">START-SESSION<a href="#section-11.2-10.1" class="pilcrow">¶</a>
 </li>
 <li id="section-11.2-10.2">END-SESSION<a href="#section-11.2-10.2" class="pilcrow">¶</a>
@@ -8529,7 +8529,7 @@
 </ol>
 <p id="section-11.2-11">The following method allows the polling of a verification in progress
         for intermediate results.<a href="#section-11.2-11" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-11.2-12">
+<ol start="1" type="1" class="normal type-1" id="section-11.2-12">
           <li id="section-11.2-12.1">GET-INTERMEDIATE-RESULT<a href="#section-11.2-12.1" class="pilcrow">¶</a>
 </li>
 </ol>
@@ -8543,7 +8543,7 @@
 <pre>
 verifier-event       =  "VERIFICATION-COMPLETE"
                      /  "START-OF-INPUT"
-                        </pre><a href="#section-11.3-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.3-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4">
@@ -8576,7 +8576,7 @@
                          /  new-audio-channel
                          /  abort-verification
                          /  start-input-timers
-          </pre><a href="#section-11.4-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4-2" class="pilcrow">¶</a>
 </div>
 <div id="sec.repositoryURI">
 <section id="section-11.4.1">
@@ -8590,7 +8590,7 @@
 <div class="artwork art-text alignLeft" id="section-11.4.1-2">
 <pre>
 repository-uri           =  "Repository-URI" ":" uri CRLF
-           </pre><a href="#section-11.4.1-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.1-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -8610,10 +8610,10 @@
           group identifier instead of a list of voiceprint identifiers.<a href="#section-11.4.2-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-11.4.2-2">
 <pre>
-voiceprint-identifier        =  "Voiceprint-Identifier" ":" 
+voiceprint-identifier        =  "Voiceprint-Identifier" ":"
                                 vid *[";" vid] CRLF
 vid                          =  1*VCHAR ["." 1*VCHAR]
-                            </pre><a href="#section-11.4.2-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.2-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.3">
@@ -8644,7 +8644,7 @@
           caller's response without any participation by the verifier
           resource.<a href="#section-11.4.3-3" class="pilcrow">¶</a></p>
 <p id="section-11.4.3-4">Once the following conditions have been met:<a href="#section-11.4.3-4" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-11.4.3-5">
+<ol start="1" type="1" class="normal type-1" id="section-11.4.3-5">
             <li id="section-11.4.3-5.1">the voiceprint identity has been successfully established through
               the Voiceprint-Identifier header fields of the START-SESSION
               method, and<a href="#section-11.4.3-5.1" class="pilcrow">¶</a>
@@ -8665,12 +8665,12 @@
           error and the mode retains its current value.<a href="#section-11.4.3-7" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-11.4.3-8">
 <pre>
-verification-mode            =  "Verification-Mode" ":" 
+verification-mode            =  "Verification-Mode" ":"
                                 verification-mode-string
 
 verification-mode-string     =  "train"
                              /  "verify"
-            </pre><a href="#section-11.4.3-8" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.3-8" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.4">
@@ -8688,7 +8688,7 @@
 <div class="artwork art-text alignLeft" id="section-11.4.4-2">
 <pre>
 adapt-model              = "Adapt-Model" ":" BOOLEAN CRLF
-            </pre><a href="#section-11.4.4-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.4-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.5">
@@ -8708,7 +8708,7 @@
 <div class="artwork art-text alignLeft" id="section-11.4.5-2">
 <pre>
 abort-model             = "Abort-Model" ":" BOOLEAN CRLF
-            </pre><a href="#section-11.4.5-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.5-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.6">
@@ -8723,9 +8723,9 @@
           this header field is implementation specific.<a href="#section-11.4.6-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-11.4.6-2">
 <pre>
-min-verification-score  = "Min-Verification-Score" ":" 
+min-verification-score  = "Min-Verification-Score" ":"
                           [ %x2D ] FLOAT CRLF
-            </pre><a href="#section-11.4.6-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.6-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.7">
@@ -8742,9 +8742,9 @@
           START-SESSION, SET-PARAMS, or GET-PARAMS.<a href="#section-11.4.7-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-11.4.7-2">
 <pre>
-num-min-verification-phrases =  "Num-Min-Verification-Phrases" ":" 
+num-min-verification-phrases =  "Num-Min-Verification-Phrases" ":"
                                 1*19DIGIT CRLF
-            </pre><a href="#section-11.4.7-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.7-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.8">
@@ -8761,9 +8761,9 @@
           START-SESSION, SET-PARAMS, or GET-PARAMS.<a href="#section-11.4.8-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-11.4.8-2">
 <pre>
-num-max-verification-phrases =  "Num-Max-Verification-Phrases" ":" 
+num-max-verification-phrases =  "Num-Max-Verification-Phrases" ":"
                                  1*19DIGIT CRLF
-            </pre><a href="#section-11.4.8-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.8-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.9">
@@ -8784,7 +8784,7 @@
 <div class="artwork art-text alignLeft" id="section-11.4.9-2">
 <pre>
 no-input-timeout         = "No-Input-Timeout" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-11.4.9-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.9-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.10">
@@ -8807,7 +8807,7 @@
 <div class="artwork art-text alignLeft" id="section-11.4.10-2">
 <pre>
 save-waveform            =  "Save-Waveform" ":" BOOLEAN CRLF
-           </pre><a href="#section-11.4.10-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.10-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.11">
@@ -8820,9 +8820,9 @@
           by the Waveform-URI header field.<a href="#section-11.4.11-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-11.4.11-2">
 <pre>
-media-type               =  "Media-Type" ":" media-type-value 
+media-type               =  "Media-Type" ":" media-type-value
                             CRLF
-            </pre><a href="#section-11.4.11-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.11-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.12">
@@ -8848,10 +8848,10 @@
           associated with the header field.<a href="#section-11.4.12-2" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-11.4.12-3">
 <pre>
-waveform-uri             =  "Waveform-URI" ":" ["&lt;" uri "&gt;" 
-                            ";" "size" "=" 1*19DIGIT 
+waveform-uri             =  "Waveform-URI" ":" ["&lt;" uri "&gt;"
+                            ";" "size" "=" 1*19DIGIT
                             ";" "duration" "=" 1*19DIGIT] CRLF
-            </pre><a href="#section-11.4.12-3" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.12-3" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.13">
@@ -8866,7 +8866,7 @@
 <div class="artwork art-text alignLeft" id="section-11.4.13-2">
 <pre>
 voiceprint-exists    =  "Voiceprint-Exists" ":" BOOLEAN CRLF
-            </pre><a href="#section-11.4.13-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.13-2" class="pilcrow">¶</a>
 </div>
 </section>
 <div id="sec.verBufferUtterance">
@@ -8885,7 +8885,7 @@
 <pre>
 ver-buffer-utterance     = "Ver-Buffer-Utterance" ":" BOOLEAN
                            CRLF
-            </pre><a href="#section-11.4.14-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.14-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -8903,7 +8903,7 @@
 <div class="artwork art-text alignLeft" id="section-11.4.15-2">
 <pre>
 input-waveform-uri           =  "Input-Waveform-URI" ":" uri CRLF
-            </pre><a href="#section-11.4.15-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.15-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.16">
@@ -8925,7 +8925,7 @@
                             cause-name CRLF
 cause-code               =  3DIGIT
 cause-name               =  *VCHAR
-            </pre><a href="#section-11.4.16-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.16-2" class="pilcrow">¶</a>
 </div>
 <table class="center" id="table-8">
             <caption><a href="#table-8" class="selfRef">Table 8</a></caption>
@@ -9024,9 +9024,9 @@
           interpret the completion reason text.<a href="#section-11.4.17-2" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-11.4.17-3">
 <pre>
-completion-reason        =  "Completion-Reason" ":" 
+completion-reason        =  "Completion-Reason" ":"
                             quoted-string CRLF
-            </pre><a href="#section-11.4.17-3" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.17-3" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.18">
@@ -9058,7 +9058,7 @@
 <div class="artwork art-text alignLeft" id="section-11.4.20-2">
 <pre>
 abort-verification   =  "Abort-Verification " ":" BOOLEAN CRLF
-            </pre><a href="#section-11.4.20-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.20-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.21">
@@ -9082,7 +9082,7 @@
 <pre>
 start-input-timers       =  "Start-Input-Timers" ":"
                             BOOLEAN CRLF
-            </pre><a href="#section-11.4.21-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.21-2" class="pilcrow">¶</a>
 </div>
 </section>
 </section>
@@ -9111,7 +9111,7 @@
           &lt;verification-result&gt; element under &lt;result&gt;. The
           elements are described below and have the schema defined in <a href="#sec.enrollmentResultsSchema" class="xref">Section 16.2</a>. The following elements
           are defined:<a href="#section-11.5.2-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-11.5.2-2">
+<ol start="1" type="1" class="normal type-1" id="section-11.5.2-2">
             <li id="section-11.5.2-2.1">&lt;voiceprint&gt;<a href="#section-11.5.2-2.1" class="pilcrow">¶</a>
 </li>
 <li id="section-11.5.2-2.2">&lt;incremental&gt;<a href="#section-11.5.2-2.2" class="pilcrow">¶</a>
@@ -9386,7 +9386,7 @@
 <p id="section-11.7-1">The END-SESSION method terminates an ongoing verification session
         and releases the verification voiceprint resources. The session may
         terminate in one of three ways:<a href="#section-11.7-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-11.7-2">
+<ol start="1" type="1" class="normal type-1" id="section-11.7-2">
           <li id="section-11.7-2.1">abort - the voiceprint adaptation or creation may be aborted so
             that the voiceprint remains unchanged (or is not created).<a href="#section-11.7-2.1" class="pilcrow">¶</a>
 </li>
@@ -9415,7 +9415,7 @@
 
 S-&gt;C:  MRCP/2.0 ... 314174 200 COMPLETE
        Channel-Identifier:32AECB23433801@speakverify
-          </pre><a href="#section-11.7-6" class="pilcrow">¶</a>
+</pre><a href="#section-11.7-6" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.8">
@@ -9451,7 +9451,7 @@
        Repository-URI:http://www.example.com/voiceprints/
        Voiceprint-Identifier:johnsmith.voiceprint
        Voiceprint-Exists:true
-          </pre><a href="#section-11.8-5" class="pilcrow">¶</a>
+</pre><a href="#section-11.8-5" class="pilcrow">¶</a>
 </div>
 <p id="section-11.8-6">The following example assumes that the URI provided in the
         Repository-URI header field is a bad URI.<a href="#section-11.8-6" class="pilcrow">¶</a></p>
@@ -9580,7 +9580,7 @@
        Completion-Cause:000 success
        Content-Type:application/nlsml+xml
        Content-Length:...
-       
+
        &lt;?xml version="1.0"?&gt;
        &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                grammar="What-Grammar-URI"&gt;
@@ -9636,7 +9636,7 @@
        Completion-Cause:000 success
        Content-Type:application/nlsml+xml
        Content-Length:...
-       
+
        &lt;?xml version="1.0"?&gt;
        &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                grammar="What-Grammar-URI"&gt;
@@ -9735,9 +9735,9 @@
 C-&gt;S:  MRCP/2.0 ... VERIFY 314177
        Channel-Identifier:32AECB23433801@speakverify
 
-S-&gt;C:  MRCP/2.0 ... 314177 200 IN-PROGRESS 
+S-&gt;C:  MRCP/2.0 ... 314177 200 IN-PROGRESS
        Channel-Identifier:32AECB23433801@speakverify
-     
+
 C-&gt;S:  MRCP/2.0 ... STOP 314178
        Channel-Identifier:32AECB23433801@speakverify
 
@@ -9781,7 +9781,7 @@
        Completion-Cause:000 success
        Content-Type:application/nlsml+xml
        Content-Length:...
-       
+
        &lt;?xml version="1.0"?&gt;
        &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                grammar="What-Grammar-URI"&gt;
@@ -9869,8 +9869,8 @@
        Channel-Identifier:32AECB23433801@speakverify
        Content-Type:application/nlsml+xml
        Content-Length:...
-       
-       &lt;?xml version="1.0"?&gt;  
+
+       &lt;?xml version="1.0"?&gt;
        &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                grammar="What-Grammar-URI"&gt;
          &lt;verification-result&gt;
@@ -9924,7 +9924,7 @@
         by SDP within the context of a SIP dialog. In order to ensure secure
         rendezvous between MRCPv2 clients and servers, the following are
         required:<a href="#section-12.1-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-12.1-2">
+<ol start="1" type="1" class="normal type-1" id="section-12.1-2">
           <li id="section-12.1-2.1">The SIP implementation in MRCPv2 clients and servers MUST
             support SIP digest authentication <span>[<a href="#RFC3261" class="xref">RFC3261</a>]</span>
             and SHOULD employ it.<a href="#section-12.1-2.1" class="pilcrow">¶</a>
@@ -10203,7 +10203,7 @@
 Proxy-Sync-Id                      Generic          [RFC6787]
 Accept-Charset                     Generic          [RFC2616]
 Content-Type                       Generic          [RFC6787]
-Content-ID                         Generic 
+Content-ID                         Generic
                           [RFC2392], [RFC2046], and [RFC5322]
 Content-Base                       Generic          [RFC6787]
 Content-Encoding                   Generic          [RFC6787]
@@ -10285,10 +10285,10 @@
 Record-URI                         Recorder         [RFC6787]
 Media-Type                         Recorder         [RFC6787]
 Max-Time                           Recorder         [RFC6787]
-Trim-Length                        Recorder         [RFC6787] 
+Trim-Length                        Recorder         [RFC6787]
 Final-Silence                      Recorder         [RFC6787]
-Capture-On-Speech                  Recorder         [RFC6787] 
-Ver-Buffer-Utterance               Recorder         [RFC6787] 
+Capture-On-Speech                  Recorder         [RFC6787]
+Ver-Buffer-Utterance               Recorder         [RFC6787]
 Start-Input-Timers                 Recorder         [RFC6787]
 New-Audio-Channel                  Recorder         [RFC6787]
 Repository-URI                     Verifier         [RFC6787]
@@ -10864,7 +10864,7 @@
        Contact:&lt;sip:sarvi@client.example.com&gt;
        Content-Type:application/sdp
        Content-Length:...
-       
+
        v=0
        o=sarvi 2614933546 2614933546 IN IP4 192.0.2.12
        s=Set up MRCPv2 control and audio
@@ -10923,23 +10923,23 @@
        Contact:&lt;sip:sarvi@client.example.com&gt;
        Content-Type:application/sdp
        Content-Length:...
-       
+
        v=0
        o=sarvi 2614933546 2614933547 IN IP4 192.0.2.12
        s=Set up MRCPv2 control and audio
        i=Add TCP channel, synthesizer and one-way audio
        c=IN IP4 192.0.2.12
        t=0 0
-       m=application 9  TCP/MRCPv2 1 
+       m=application 9  TCP/MRCPv2 1
        a=setup:active
        a=connection:new
-       a=resource:speechsynth 
+       a=resource:speechsynth
        a=cmid:1
        m=audio 49170 RTP/AVP 0 96
        a=rtpmap:0 pcmu/8000
-       a=rtpmap:96 telephone-event/8000 
-       a=fmtp:96 0-15 
-       a=recvonly 
+       a=rtpmap:96 telephone-event/8000
+       a=fmtp:96 0-15
+       a=recvonly
        a=mid:1
 
 
@@ -10954,21 +10954,21 @@
        Contact:&lt;sip:mresources@server.example.com&gt;
        Content-Type:application/sdp
        Content-Length:...
-       
+
        v=0
        o=- 3000000001 3000000002 IN IP4 192.0.2.11
        s=Set up MRCPv2 control and audio
        i=Add TCP channel, synthesizer and one-way audio
        c=IN IP4 192.0.2.11
        t=0 0
-       m=application 32416  TCP/MRCPv2 1 
+       m=application 32416  TCP/MRCPv2 1
        a=setup:passive
        a=connection:new
-       a=channel:32AECB23433801@speechsynth 
+       a=channel:32AECB23433801@speechsynth
        a=cmid:1
        m=audio 48260 RTP/AVP 0
        a=rtpmap:0 pcmu/8000
-       a=sendonly 
+       a=sendonly
        a=mid:1
 
 
@@ -11002,34 +11002,34 @@
        Contact:&lt;sip:sarvi@client.example.com&gt;
        Content-Type:application/sdp
        Content-Length:...
-       
+
        v=0
        o=sarvi 2614933546 2614933548 IN IP4 192.0.2.12
        s=Set up MRCPv2 control and audio
        i=Add recognizer and duplex the audio
        c=IN IP4 192.0.2.12
        t=0 0
-       m=application 9  TCP/MRCPv2 1 
+       m=application 9  TCP/MRCPv2 1
        a=setup:active
        a=connection:existing
-       a=resource:speechsynth 
+       a=resource:speechsynth
        a=cmid:1
        m=audio 49170 RTP/AVP 0 96
        a=rtpmap:0 pcmu/8000
-       a=rtpmap:96 telephone-event/8000 
-       a=fmtp:96 0-15 
-       a=recvonly 
+       a=rtpmap:96 telephone-event/8000
+       a=fmtp:96 0-15
+       a=recvonly
        a=mid:1
-       m=application 9  TCP/MRCPv2 1 
+       m=application 9  TCP/MRCPv2 1
        a=setup:active
        a=connection:existing
-       a=resource:speechrecog 
+       a=resource:speechrecog
        a=cmid:2
        m=audio 49180 RTP/AVP 0 96
        a=rtpmap:0 pcmu/8000
        a=rtpmap:96 telephone-event/8000
        a=fmtp:96 0-15
-       a=sendonly 
+       a=sendonly
        a=mid:2
 
 
@@ -11044,28 +11044,28 @@
        Contact:&lt;sip:mresources@server.example.com&gt;
        Content-Type:application/sdp
        Content-Length:...
-       
+
        v=0
        o=- 3000000001 3000000003 IN IP4 192.0.2.11
        s=Set up MRCPv2 control and audio
        i=Add recognizer and duplex the audio
        c=IN IP4 192.0.2.11
        t=0 0
-       m=application 32416  TCP/MRCPv2 1 
-       a=channel:32AECB23433801@speechsynth 
+       m=application 32416  TCP/MRCPv2 1
+       a=channel:32AECB23433801@speechsynth
        a=cmid:1
        m=audio 48260 RTP/AVP 0
        a=rtpmap:0 pcmu/8000
-       a=sendonly 
+       a=sendonly
        a=mid:1
-       m=application 32416  TCP/MRCPv2 1 
-       a=channel:32AECB23433801@speechrecog 
+       m=application 32416  TCP/MRCPv2 1
+       a=channel:32AECB23433801@speechrecog
        a=cmid:2
        m=audio 48260 RTP/AVP 0
        a=rtpmap:0 pcmu/8000
        a=rtpmap:96 telephone-event/8000
        a=fmtp:96 0-15
-       a=recvonly 
+       a=recvonly
        a=mid:2
 
 
@@ -11093,9 +11093,9 @@
        Prosody-volume:medium
        Content-Type:application/ssml+xml
        Content-Length:...
-       
+
        &lt;?xml version="1.0"?&gt;
-       &lt;speak version="1.0"                
+       &lt;speak version="1.0"
               xmlns="http://www.w3.org/2001/10/synthesis"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -11103,7 +11103,7 @@
               xml:lang="en-US"&gt;
          &lt;p&gt;
            &lt;s&gt;You have 4 new messages.&lt;/s&gt;
-           &lt;s&gt;The first is from Stephanie Williams 
+           &lt;s&gt;The first is from Stephanie Williams
              &lt;mark name="Stephanie"/&gt;
              and arrived at &lt;break/&gt;
              &lt;say-as interpret-as="vxml:time"&gt;0345p&lt;/say-as&gt;.&lt;/s&gt;
@@ -11113,7 +11113,7 @@
        &lt;/speak&gt;
 
 S-&gt;C:
-       MRCP/2.0 ... 543257 200 IN-PROGRESS 
+       MRCP/2.0 ... 543257 200 IN-PROGRESS
        Channel-Identifier:32AECB23433801@speechsynth
        Speech-Marker:timestamp=857205015059
 
@@ -11123,7 +11123,7 @@
         and faithfully informs the client of the event.<a href="#section-14.1-10" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-14.1-11">
 <pre>
-S-&gt;C:  MRCP/2.0 ... SPEECH-MARKER 543257 IN-PROGRESS 
+S-&gt;C:  MRCP/2.0 ... SPEECH-MARKER 543257 IN-PROGRESS
        Channel-Identifier:32AECB23433801@speechsynth
        Speech-Marker:timestamp=857206027059;Stephanie
 </pre><a href="#section-14.1-11" class="pilcrow">¶</a>
@@ -11145,7 +11145,7 @@
        Channel-Identifier:32AECB23433801@speechrecog
        Content-Type:application/srgs+xml
        Content-Length:...
-       
+
        &lt;?xml version="1.0"?&gt;
        &lt;!-- the default grammar language is US English --&gt;
        &lt;grammar xmlns="http://www.w3.org/2001/06/grammar"
@@ -11173,9 +11173,9 @@
        Kill-On-Barge-In:true
        Content-Type:application/ssml+xml
        Content-Length:...
-       
+
        &lt;?xml version="1.0"?&gt;
-       &lt;speak version="1.0"                
+       &lt;speak version="1.0"
               xmlns="http://www.w3.org/2001/10/synthesis"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -11238,12 +11238,12 @@
 <pre>
 S-&gt;C:  MRCP/2.0 ... RECOGNITION-COMPLETE 543258 COMPLETE
        Channel-Identifier:32AECB23433801@speechrecog
-       Completion-Cause:000 success    
+       Completion-Cause:000 success
        Waveform-URI:&lt;http://web.media.com/session123/audio.wav&gt;;
                     size=423523;duration=25432
        Content-Type:application/nlsml+xml
        Content-Length:...
-       
+
        &lt;?xml version="1.0"?&gt;
        &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                xmlns:ex="http://www.example.com/example"
@@ -11290,7 +11290,7 @@
 System: To which city will you be traveling?
 User:   I want to go to Pittsburgh.
 
-&lt;?xml version="1.0"?&gt;  
+&lt;?xml version="1.0"?&gt;
 &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
         xmlns:ex="http://www.example.com/example"
         grammar="http://www.example.com/flight"&gt;
@@ -11323,7 +11323,7 @@
 <div class="artwork art-text alignLeft" id="section-14.2.2-1">
 <pre>
 System: What would you like?
-User:   I would like 2 pizzas, one with pepperoni and cheese, 
+User:   I would like 2 pizzas, one with pepperoni and cheese,
         one with sausage and a bottle of coke, to go.
 </pre><a href="#section-14.2.2-1" class="pilcrow">¶</a>
 </div>
@@ -11335,7 +11335,7 @@
           resolve the two "one"s as "pizza".<a href="#section-14.2.2-2" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-14.2.2-3">
 <pre>
-&lt;?xml version="1.0"?&gt;  
+&lt;?xml version="1.0"?&gt;
 &lt;nl:result xmlns:nl="urn:ietf:params:xml:ns:mrcpv2"
            xmlns="http://www.example.com/example"
            grammar="http://www.example.com/foodorder"&gt;
@@ -11383,11 +11383,11 @@
 <pre>
 &lt;input&gt;
   &lt;input mode="speech" confidence ="1.0"
-     timestamp-start="2000-04-03T0:00:00" 
+     timestamp-start="2000-04-03T0:00:00"
      timestamp-end="2000-04-03T0:00:01.5"&gt;My pin is
   &lt;/input&gt;
   &lt;input mode="dtmf" confidence ="1.0"
-     timestamp-start="2000-04-03T0:00:01.5" 
+     timestamp-start="2000-04-03T0:00:01.5"
      timestamp-end="2000-04-03T0:00:02.0"&gt;1 2 3 4
   &lt;/input&gt;
 &lt;/input&gt;
@@ -11463,18 +11463,18 @@
           for actually resolving the reference).<a href="#section-14.2.5-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-14.2.5-2">
 <pre>
-Example: (ignoring the issue of representing the input from the 
+Example: (ignoring the issue of representing the input from the
           pointing gesture.)
 
 System: What do you want to drink?
 User:   I want this. (clicks on picture of large root beer.)
 
-&lt;?xml version="1.0"?&gt;  
+&lt;?xml version="1.0"?&gt;
 &lt;nl:result xmlns:nl="urn:ietf:params:xml:ns:mrcpv2"
         xmlns="http://www.example.com/example"
-        grammar="http://www.example.com/beverages.grxml"&gt;  
+        grammar="http://www.example.com/beverages.grxml"&gt;
    &lt;nl:interpretation&gt;
-      &lt;nl:instance&gt; 
+      &lt;nl:instance&gt;
        &lt;doer&gt;I&lt;/doer&gt;
        &lt;action&gt;want&lt;/action&gt;
        &lt;object&gt;this&lt;/object&gt;
@@ -11545,7 +11545,7 @@
 
 SWS    =    [LWS] ; sep whitespace
 
-UTF8-NONASCII    =    %xC0-DF 1UTF8-CONT 
+UTF8-NONASCII    =    %xC0-DF 1UTF8-CONT
                  /    %xE0-EF 2UTF8-CONT
                  /    %xF0-F7 3UTF8-CONT
                  /    %xF8-FB 4UTF8-CONT
@@ -11556,7 +11556,7 @@
                  /    UTF8-NONASCII
 param            =    *pchar
 
-quoted-string    =    SWS DQUOTE *(qdtext / quoted-pair ) 
+quoted-string    =    SWS DQUOTE *(qdtext / quoted-pair )
                       DQUOTE
 
 qdtext           =    LWS / %x21 / %x23-5B / %x5D-7E
@@ -11567,7 +11567,7 @@
 token            =    1*(alphanum / "-" / "." / "!" / "%" / "*"
                       / "_" / "+" / "`" / "'" / "~" )
 
-reserved         =    ";" / "/" / "?" / ":" / "@" / "&amp;" / "=" 
+reserved         =    ";" / "/" / "?" / ":" / "@" / "&amp;" / "="
                       / "+" / "$" / ","
 
 mark             =    "-" / "_" / "." / "!" / "~" / "*" / "'"
@@ -11580,7 +11580,7 @@
 
 alphanum         =    ALPHA / DIGIT
 
-BOOLEAN          =    "true" / "false" 
+BOOLEAN          =    "true" / "false"
 
 FLOAT            =    *DIGIT ["." *DIGIT]
 
@@ -11588,12 +11588,12 @@
 
 fragment         =    *uric
 
-uri              =    [ absoluteURI / relativeURI ] 
+uri              =    [ absoluteURI / relativeURI ]
                       [ "#" fragment ]
 
 absoluteURI      =    scheme ":" ( hier-part / opaque-part )
 
-relativeURI      =    ( net-path / abs-path / rel-path ) 
+relativeURI      =    ( net-path / abs-path / rel-path )
                       [ "?" query ]
 
 hier-part        =    ( net-path / abs-path ) [ "?" query ]
@@ -11604,14 +11604,14 @@
 
 rel-path         =    rel-segment [ abs-path ]
 
-rel-segment      =    1*( unreserved / escaped / ";" / "@" 
-                 /    "&amp;" / "=" / "+" / "$" / "," )    
+rel-segment      =    1*( unreserved / escaped / ";" / "@"
+                 /    "&amp;" / "=" / "+" / "$" / "," )
 
 opaque-part      =    uric-no-slash *uric
 
 uric             =    reserved / unreserved / escaped
 
-uric-no-slash    =    unreserved / escaped / ";" / "?" / ":" 
+uric-no-slash    =    unreserved / escaped / ";" / "?" / ":"
                       / "@" / "&amp;" / "=" / "+" / "$" / ","
 
 path-segments    =    segment *( "/" segment )
@@ -11631,13 +11631,13 @@
 
 userinfo         =    ( user ) [ ":" password ] "@"
 
-user             =    1*( unreserved / escaped 
+user             =    1*( unreserved / escaped
                  /    user-unreserved )
 
-user-unreserved  =    "&amp;" / "=" / "+" / "$" / "," / ";" 
+user-unreserved  =    "&amp;" / "=" / "+" / "$" / "," / ";"
                  /    "?" / "/"
 
-password         =    *( unreserved / escaped 
+password         =    *( unreserved / escaped
                  /    "&amp;" / "=" / "+" / "$" / "," )
 
 hostport         =    host [ ":" port ]
@@ -11652,14 +11652,14 @@
 toplabel         =    ALPHA / ALPHA *( alphanum / "-" )
                       alphanum
 
-IPv4address      =    1*3DIGIT "." 1*3DIGIT "." 1*3DIGIT "." 
+IPv4address      =    1*3DIGIT "." 1*3DIGIT "." 1*3DIGIT "."
                       1*3DIGIT
 
 IPv6reference    =    "[" IPv6address "]"
 
 IPv6address      =    hexpart [ ":" IPv4address ]
 
-hexpart          =    hexseq / hexseq "::" [ hexseq ] / "::" 
+hexpart          =    hexseq / hexseq "::" [ hexseq ] / "::"
                       [ hexseq ]
 
 hexseq           =    hex4 *( ":" hex4)
@@ -11670,23 +11670,23 @@
 
 
 ; generic-message is the top-level rule
-generic-message  =    start-line message-header CRLF 
-                      [ message-body ] 
+generic-message  =    start-line message-header CRLF
+                      [ message-body ]
 
 message-body     =    *OCTET
-         
-start-line       =    request-line / response-line / event-line 
+
+start-line       =    request-line / response-line / event-line
 
 request-line     =    mrcp-version SP message-length SP method-name
-                      SP request-id CRLF 
+                      SP request-id CRLF
 
-response-line    =    mrcp-version SP message-length SP request-id 
-                      SP status-code SP request-state CRLF 
+response-line    =    mrcp-version SP message-length SP request-id
+                      SP status-code SP request-state CRLF
 
 event-line       =    mrcp-version SP message-length SP event-name
-                      SP request-id SP request-state CRLF 
+                      SP request-id SP request-state CRLF
 
-method-name      =    generic-method    
+method-name      =    generic-method
                  /    synthesizer-method
                  /    recognizer-method
                  /    recorder-method
@@ -11695,15 +11695,15 @@
 generic-method   =    "SET-PARAMS"
                  /    "GET-PARAMS"
 
-request-state    =    "COMPLETE" 
-                 /    "IN-PROGRESS"        
-                 /    "PENDING" 
+request-state    =    "COMPLETE"
+                 /    "IN-PROGRESS"
+                 /    "PENDING"
 
 event-name       =    synthesizer-event
                  /    recognizer-event
                  /    recorder-event
                  /    verifier-event
-      
+
 message-header   =  1*(generic-header / resource-header /
                        generic-field)
 
@@ -11717,7 +11717,7 @@
 resource-header  =    synthesizer-header
                  /    recognizer-header
                  /    recorder-header
-                 /    verifier-header    
+                 /    verifier-header
 
 generic-header   =    channel-identifier
                  /    accept
@@ -11732,30 +11732,30 @@
                  /    content-length
                  /    fetch-timeout
                  /    cache-control
-                 /    logging-tag 
+                 /    logging-tag
                  /    set-cookie
                  /    vendor-specific
-          
+
 ; -- content-id is as defined in RFC 2392, RFC 2046 and RFC 5322
 ; -- accept and accept-charset are as defined in RFC 2616
 
-mrcp-version     =    "MRCP" "/" 1*2DIGIT "." 1*2DIGIT 
+mrcp-version     =    "MRCP" "/" 1*2DIGIT "." 1*2DIGIT
 
 message-length   =    1*19DIGIT
 
-request-id       =    1*10DIGIT 
+request-id       =    1*10DIGIT
 
 status-code      =    3DIGIT
 
-channel-identifier =  "Channel-Identifier" ":" 
+channel-identifier =  "Channel-Identifier" ":"
                       channel-id CRLF
 
 channel-id       =    1*alphanum "@" 1*alphanum
 
-active-request-id-list = "Active-Request-Id-List" ":"  
-                         request-id *("," request-id) CRLF 
+active-request-id-list = "Active-Request-Id-List" ":"
+                         request-id *("," request-id) CRLF
 
-proxy-sync-id    =    "Proxy-Sync-Id" ":" 1*VCHAR CRLF    
+proxy-sync-id    =    "Proxy-Sync-Id" ":" 1*VCHAR CRLF
 
 content-base     =    "Content-Base" ":" absoluteURI CRLF
 
@@ -11774,8 +11774,8 @@
 attribute        =    token
 
 value            =    token / quoted-string
-         
-content-encoding =    "Content-Encoding" ":" 
+
+content-encoding =    "Content-Encoding" ":"
                       *WSP content-coding
                       *(*WSP "," *WSP content-coding *WSP )
                       CRLF
@@ -11783,30 +11783,30 @@
 content-coding   =    token
 
 
-content-location =    "Content-Location" ":" 
+content-location =    "Content-Location" ":"
                       ( absoluteURI / relativeURI )  CRLF
 
-cache-control    =    "Cache-Control" ":" 
+cache-control    =    "Cache-Control" ":"
                       [*WSP cache-directive
                       *( *WSP "," *WSP cache-directive *WSP )]
                       CRLF
 
-fetch-timeout    =    "Fetch-Timeout" ":" 1*19DIGIT CRLF 
+fetch-timeout    =    "Fetch-Timeout" ":" 1*19DIGIT CRLF
 
-cache-directive  =    "max-age" "=" delta-seconds     
-                 /    "max-stale" ["=" delta-seconds ] 
-                 /    "min-fresh" "=" delta-seconds  
+cache-directive  =    "max-age" "=" delta-seconds
+                 /    "max-stale" ["=" delta-seconds ]
+                 /    "min-fresh" "=" delta-seconds
 
-delta-seconds         =    1*19DIGIT     
+delta-seconds         =    1*19DIGIT
 
-logging-tag      =    "Logging-Tag" ":" 1*UTFCHAR CRLF 
+logging-tag      =    "Logging-Tag" ":" 1*UTFCHAR CRLF
 
-vendor-specific  =    "Vendor-Specific-Parameters" ":" 
-                      [vendor-specific-av-pair  
-                      *(";" vendor-specific-av-pair)] CRLF  
+vendor-specific  =    "Vendor-Specific-Parameters" ":"
+                      [vendor-specific-av-pair
+                      *(";" vendor-specific-av-pair)] CRLF
 
-vendor-specific-av-pair = vendor-av-pair-name "="  
-                          value 
+vendor-specific-av-pair = vendor-av-pair-name "="
+                          value
 
 vendor-av-pair-name     = 1*UTFCHAR
 
@@ -11833,66 +11833,66 @@
 httponly-av       = "HttpOnly"
 extension-av      = &lt;any CHAR except CTLs or ";"&gt;
 age-av            = "Age=" delta-seconds
-                          
+
 ; Synthesizer ABNF
 
-synthesizer-method    =    "SPEAK" 
-                      /    "STOP" 
-                      /    "PAUSE" 
-                      /    "RESUME" 
-                      /    "BARGE-IN-OCCURRED" 
+synthesizer-method    =    "SPEAK"
+                      /    "STOP"
+                      /    "PAUSE"
+                      /    "RESUME"
+                      /    "BARGE-IN-OCCURRED"
                       /    "CONTROL"
-                      /    "DEFINE-LEXICON" 
+                      /    "DEFINE-LEXICON"
 
-synthesizer-event     =    "SPEECH-MARKER" 
-                      /    "SPEAK-COMPLETE" 
+synthesizer-event     =    "SPEECH-MARKER"
+                      /    "SPEAK-COMPLETE"
 
-synthesizer-header    =    jump-size       
-                      /    kill-on-barge-in  
-                      /    speaker-profile   
+synthesizer-header    =    jump-size
+                      /    kill-on-barge-in
+                      /    speaker-profile
                       /    completion-cause
-                      /    completion-reason  
-                      /    voice-parameter   
-                      /    prosody-parameter   
-                      /    speech-marker     
-                      /    speech-language   
-                      /    fetch-hint        
-                      /    audio-fetch-hint  
-                      /    failed-uri        
-                      /    failed-uri-cause  
-                      /    speak-restart     
+                      /    completion-reason
+                      /    voice-parameter
+                      /    prosody-parameter
+                      /    speech-marker
+                      /    speech-language
+                      /    fetch-hint
+                      /    audio-fetch-hint
+                      /    failed-uri
+                      /    failed-uri-cause
+                      /    speak-restart
                       /    speak-length
                       /    load-lexicon
-                      /    lexicon-search-order      
+                      /    lexicon-search-order
+
 
+jump-size             =    "Jump-Size" ":" speech-length-value CRLF
 
-jump-size             =    "Jump-Size" ":" speech-length-value CRLF 
+speech-length-value   =    numeric-speech-length
+                      /    text-speech-length
 
-speech-length-value   =    numeric-speech-length 
-                      /    text-speech-length 
+text-speech-length    =    1*UTFCHAR SP "Tag"
 
-text-speech-length    =    1*UTFCHAR SP "Tag" 
-                               
 numeric-speech-length =    ("+" / "-") positive-speech-length
 
 positive-speech-length =   1*19DIGIT SP numeric-speech-unit
- 
-numeric-speech-unit   =    "Second" 
-                      /    "Word" 
-                      /    "Sentence" 
-                      /    "Paragraph" 
 
-kill-on-barge-in      =    "Kill-On-Barge-In" ":" BOOLEAN 
-                           CRLF 
+numeric-speech-unit   =    "Second"
+                      /    "Word"
+                      /    "Sentence"
+                      /    "Paragraph"
+
+kill-on-barge-in      =    "Kill-On-Barge-In" ":" BOOLEAN
+                           CRLF
 
-speaker-profile       =    "Speaker-Profile" ":" uri CRLF 
+speaker-profile       =    "Speaker-Profile" ":" uri CRLF
 
 completion-cause         =  "Completion-Cause" ":" cause-code SP
                             cause-name CRLF
 cause-code               =  3DIGIT
 cause-name               =  *VCHAR
 
-completion-reason     =    "Completion-Reason" ":" 
+completion-reason     =    "Completion-Reason" ":"
                            quoted-string CRLF
 
 voice-parameter       =    voice-gender
@@ -11913,8 +11913,8 @@
 voice-name            =    "Voice-Name:"
                            1*UTFCHAR *(1*WSP 1*UTFCHAR) CRLF
 
-prosody-parameter     =    "Prosody-" prosody-param-name ":" 
-                           prosody-param-value CRLF 
+prosody-parameter     =    "Prosody-" prosody-param-name ":"
+                           prosody-param-value CRLF
 
 prosody-param-name    =    1*VCHAR
 
@@ -11929,44 +11929,44 @@
                            [";" 1*(UTFCHAR / %x20)] CRLF
 
 speech-language       =    "Speech-Language" ":"
-                           1*VCHAR CRLF 
+                           1*VCHAR CRLF
 
 fetch-hint            =    "Fetch-Hint" ":"
-                           ("prefetch" / "safe") CRLF 
+                           ("prefetch" / "safe") CRLF
 
-audio-fetch-hint      =    "Audio-Fetch-Hint" ":" 
-                          ("prefetch" / "safe" / "stream") CRLF 
+audio-fetch-hint      =    "Audio-Fetch-Hint" ":"
+                          ("prefetch" / "safe" / "stream") CRLF
 
-failed-uri            =    "Failed-URI" ":" absoluteURI CRLF 
+failed-uri            =    "Failed-URI" ":" absoluteURI CRLF
 
-failed-uri-cause      =    "Failed-URI-Cause" ":" 1*UTFCHAR CRLF 
+failed-uri-cause      =    "Failed-URI-Cause" ":" 1*UTFCHAR CRLF
 
-speak-restart         =    "Speak-Restart" ":" BOOLEAN CRLF 
+speak-restart         =    "Speak-Restart" ":" BOOLEAN CRLF
 
-speak-length          =    "Speak-Length" ":" positive-length-value 
-                           CRLF 
+speak-length          =    "Speak-Length" ":" positive-length-value
+                           CRLF
 
-positive-length-value   =  positive-speech-length 
-                        /  text-speech-length 
+positive-length-value   =  positive-speech-length
+                        /  text-speech-length
 
 load-lexicon          =    "Load-Lexicon" ":" BOOLEAN CRLF
 
-lexicon-search-order  =    "Lexicon-Search-Order" ":" 
+lexicon-search-order  =    "Lexicon-Search-Order" ":"
           "&lt;" absoluteURI "&gt;" *(" " "&lt;" absoluteURI "&gt;") CRLF
 
-; Recognizer ABNF 
+; Recognizer ABNF
 
 recognizer-method     =    recog-only-method
                       /    enrollment-method
 
-recog-only-method     =    "DEFINE-GRAMMAR" 
-                      /    "RECOGNIZE" 
+recog-only-method     =    "DEFINE-GRAMMAR"
+                      /    "RECOGNIZE"
                       /    "INTERPRET"
-                      /    "GET-RESULT" 
-                      /    "START-INPUT-TIMERS" 
+                      /    "GET-RESULT"
+                      /    "START-INPUT-TIMERS"
                       /    "STOP"
 
-enrollment-method     =    "START-PHRASE-ENROLLMENT" 
+enrollment-method     =    "START-PHRASE-ENROLLMENT"
                       /    "ENROLLMENT-ROLLBACK"
                       /    "END-PHRASE-ENROLLMENT"
                       /    "MODIFY-PHRASE"
@@ -11980,30 +11980,30 @@
                       /    enrollment-header
 
 
-recog-only-header     =    confidence-threshold     
-                      /    sensitivity-level        
-                      /    speed-vs-accuracy        
-                      /    n-best-list-length  
-                      /    input-type     
-                      /    no-input-timeout         
-                      /    recognition-timeout      
-                      /    waveform-uri  
-                      /    input-waveform-uri           
-                      /    completion-cause         
+recog-only-header     =    confidence-threshold
+                      /    sensitivity-level
+                      /    speed-vs-accuracy
+                      /    n-best-list-length
+                      /    input-type
+                      /    no-input-timeout
+                      /    recognition-timeout
+                      /    waveform-uri
+                      /    input-waveform-uri
+                      /    completion-cause
                       /    completion-reason
-                      /    recognizer-context-block 
-                      /    start-input-timers 
-                      /    speech-complete-timeout  
-                      /    speech-incomplete-timeout 
-                      /    dtmf-interdigit-timeout  
-                      /    dtmf-term-timeout        
-                      /    dtmf-term-char           
-                      /    failed-uri               
-                      /    failed-uri-cause         
-                      /    save-waveform            
+                      /    recognizer-context-block
+                      /    start-input-timers
+                      /    speech-complete-timeout
+                      /    speech-incomplete-timeout
+                      /    dtmf-interdigit-timeout
+                      /    dtmf-term-timeout
+                      /    dtmf-term-char
+                      /    failed-uri
+                      /    failed-uri-cause
+                      /    save-waveform
                       /    media-type
                       /    new-audio-channel
-                      /    speech-language        
+                      /    speech-language
                       /    ver-buffer-utterance
                       /    recognition-mode
                       /    cancel-if-queue
@@ -12016,66 +12016,66 @@
 
 
 enrollment-header     =    num-min-consistent-pronunciations
-                      /    consistency-threshold  
-                      /    clash-threshold        
-                      /    personal-grammar-uri 
+                      /    consistency-threshold
+                      /    clash-threshold
+                      /    personal-grammar-uri
                       /    enroll-utterance
-                      /    phrase-id              
-                      /    phrase-nl              
-                      /    weight                 
-                      /    save-best-waveform     
-                      /    new-phrase-id          
-                      /    confusable-phrases-uri 
+                      /    phrase-id
+                      /    phrase-nl
+                      /    weight
+                      /    save-best-waveform
+                      /    new-phrase-id
+                      /    confusable-phrases-uri
                       /    abort-phrase-enrollment
 
-confidence-threshold  =    "Confidence-Threshold" ":" 
-                           FLOAT CRLF 
+confidence-threshold  =    "Confidence-Threshold" ":"
+                           FLOAT CRLF
 
 sensitivity-level     =    "Sensitivity-Level" ":" FLOAT
-                           CRLF 
+                           CRLF
 
-speed-vs-accuracy     =    "Speed-Vs-Accuracy" ":" FLOAT 
-                           CRLF 
+speed-vs-accuracy     =    "Speed-Vs-Accuracy" ":" FLOAT
+                           CRLF
 
-n-best-list-length    =    "N-Best-List-Length" ":" 1*19DIGIT 
-                           CRLF 
+n-best-list-length    =    "N-Best-List-Length" ":" 1*19DIGIT
+                           CRLF
 
 input-type            =    "Input-Type" ":"  inputs CRLF
 inputs                =    "speech" / "dtmf"
 
-no-input-timeout      =    "No-Input-Timeout" ":" 1*19DIGIT 
-                           CRLF 
+no-input-timeout      =    "No-Input-Timeout" ":" 1*19DIGIT
+                           CRLF
 
 recognition-timeout   =    "Recognition-Timeout" ":" 1*19DIGIT
-                           CRLF 
+                           CRLF
 
-waveform-uri          =    "Waveform-URI" ":" ["&lt;" uri "&gt;" 
-                           ";" "size" "=" 1*19DIGIT 
-                           ";" "duration" "=" 1*19DIGIT] CRLF 
+waveform-uri          =    "Waveform-URI" ":" ["&lt;" uri "&gt;"
+                           ";" "size" "=" 1*19DIGIT
+                           ";" "duration" "=" 1*19DIGIT] CRLF
 
-recognizer-context-block = "Recognizer-Context-Block" ":" 
-                           [1*VCHAR] CRLF 
+recognizer-context-block = "Recognizer-Context-Block" ":"
+                           [1*VCHAR] CRLF
 
-start-input-timers    =    "Start-Input-Timers" ":"  
-                           BOOLEAN CRLF 
- 
-speech-complete-timeout =  "Speech-Complete-Timeout" ":"  
-                           1*19DIGIT CRLF 
+start-input-timers    =    "Start-Input-Timers" ":"
+                           BOOLEAN CRLF
 
-speech-incomplete-timeout = "Speech-Incomplete-Timeout" ":"  
-                            1*19DIGIT CRLF 
+speech-complete-timeout =  "Speech-Complete-Timeout" ":"
+                           1*19DIGIT CRLF
+
+speech-incomplete-timeout = "Speech-Incomplete-Timeout" ":"
+                            1*19DIGIT CRLF
 
-dtmf-interdigit-timeout = "DTMF-Interdigit-Timeout" ":"  
-                          1*19DIGIT CRLF 
+dtmf-interdigit-timeout = "DTMF-Interdigit-Timeout" ":"
+                          1*19DIGIT CRLF
 
-dtmf-term-timeout     =    "DTMF-Term-Timeout" ":" 1*19DIGIT 
-                           CRLF 
+dtmf-term-timeout     =    "DTMF-Term-Timeout" ":" 1*19DIGIT
+                           CRLF
 
-dtmf-term-char        =    "DTMF-Term-Char" ":" VCHAR CRLF 
+dtmf-term-char        =    "DTMF-Term-Char" ":" VCHAR CRLF
 
-save-waveform         =    "Save-Waveform" ":" BOOLEAN CRLF 
+save-waveform         =    "Save-Waveform" ":" BOOLEAN CRLF
 
-new-audio-channel     =    "New-Audio-Channel" ":" 
+new-audio-channel     =    "New-Audio-Channel" ":"
                            BOOLEAN CRLF
 
 recognition-mode      =    "Recognition-Mode" ":"
@@ -12083,13 +12083,13 @@
 
 cancel-if-queue       =    "Cancel-If-Queue" ":" BOOLEAN CRLF
 
-hotword-max-duration  =    "Hotword-Max-Duration" ":" 
+hotword-max-duration  =    "Hotword-Max-Duration" ":"
                            1*19DIGIT CRLF
 
-hotword-min-duration  =    "Hotword-Min-Duration" ":" 
+hotword-min-duration  =    "Hotword-Min-Duration" ":"
                            1*19DIGIT CRLF
 
-interpret-text        =    "Interpret-Text" ":" 1*VCHAR CRLF          
+interpret-text        =    "Interpret-Text" ":" 1*VCHAR CRLF
 
 dtmf-buffer-time      =    "DTMF-Buffer-Time" ":" 1*19DIGIT CRLF
 
@@ -12097,13 +12097,13 @@
 
 early-no-match        =    "Early-No-Match" ":" BOOLEAN CRLF
 
-num-min-consistent-pronunciations    = 
-    "Num-Min-Consistent-Pronunciations" ":" 1*19DIGIT CRLF 
+num-min-consistent-pronunciations    =
+    "Num-Min-Consistent-Pronunciations" ":" 1*19DIGIT CRLF
 
 
-consistency-threshold =    "Consistency-Threshold" ":" FLOAT 
+consistency-threshold =    "Consistency-Threshold" ":" FLOAT
                            CRLF
- 
+
 clash-threshold       =    "Clash-Threshold" ":" FLOAT CRLF
 
 personal-grammar-uri  =    "Personal-Grammar-URI" ":" uri CRLF
@@ -12116,15 +12116,15 @@
 
 weight                =    "Weight" ":" FLOAT CRLF
 
-save-best-waveform    =    "Save-Best-Waveform" ":" 
+save-best-waveform    =    "Save-Best-Waveform" ":"
                            BOOLEAN CRLF
 
 new-phrase-id         =    "New-Phrase-ID" ":" 1*VCHAR CRLF
 
-confusable-phrases-uri =   "Confusable-Phrases-URI" ":" 
+confusable-phrases-uri =   "Confusable-Phrases-URI" ":"
                            uri CRLF
 
-abort-phrase-enrollment =  "Abort-Phrase-Enrollment" ":" 
+abort-phrase-enrollment =  "Abort-Phrase-Enrollment" ":"
                            BOOLEAN CRLF
 
 
@@ -12150,11 +12150,11 @@
                       /    final-silence
                       /    capture-on-speech
                       /    ver-buffer-utterance
-                      /    start-input-timers 
+                      /    start-input-timers
                       /    new-audio-channel
 
-record-uri            =    "Record-URI" ":" [ "&lt;" uri "&gt;" 
-                           ";" "size" "=" 1*19DIGIT 
+record-uri            =    "Record-URI" ":" [ "&lt;" uri "&gt;"
+                           ";" "size" "=" 1*19DIGIT
                            ";" "duration" "=" 1*19DIGIT] CRLF
 
 media-type            =    "Media-Type" ":" media-type-value CRLF
@@ -12165,7 +12165,7 @@
 
 final-silence         =    "Final-Silence" ":" 1*19DIGIT CRLF
 
-capture-on-speech     =    "Capture-On-Speech " ":" 
+capture-on-speech     =    "Capture-On-Speech " ":"
                            BOOLEAN CRLF
 
 
@@ -12188,38 +12188,38 @@
                       /    "START-OF-INPUT"
 
 
-verifier-header       =    repository-uri 
+verifier-header       =    repository-uri
                       /    voiceprint-identifier
-                      /    verification-mode 
-                      /    adapt-model 
-                      /    abort-model 
-                      /    min-verification-score         
+                      /    verification-mode
+                      /    adapt-model
+                      /    abort-model
+                      /    min-verification-score
                       /    num-min-verification-phrases
                       /    num-max-verification-phrases
-                      /    no-input-timeout           
-                      /    save-waveform              
+                      /    no-input-timeout
+                      /    save-waveform
                       /    media-type
-                      /    waveform-uri               
-                      /    voiceprint-exists          
-                      /    ver-buffer-utterance    
-                      /    input-waveform-uri        
-                      /    completion-cause           
+                      /    waveform-uri
+                      /    voiceprint-exists
+                      /    ver-buffer-utterance
+                      /    input-waveform-uri
+                      /    completion-cause
                       /    completion-reason
-                      /    speech-complete-timeout          
+                      /    speech-complete-timeout
                       /    new-audio-channel
                       /    abort-verification
-                      /    start-input-timers 
+                      /    start-input-timers
                       /    input-type
 
 
 
 repository-uri        =    "Repository-URI" ":" uri CRLF
 
-voiceprint-identifier        =  "Voiceprint-Identifier" ":" 
+voiceprint-identifier        =  "Voiceprint-Identifier" ":"
                                 vid *[";" vid] CRLF
 vid                          =  1*VCHAR ["." 1*VCHAR]
 
-verification-mode     =    "Verification-Mode" ":" 
+verification-mode     =    "Verification-Mode" ":"
                            verification-mode-string
 
 verification-mode-string = "train" / "verify"
@@ -12228,25 +12228,25 @@
 
 abort-model           =    "Abort-Model" ":" BOOLEAN CRLF
 
-min-verification-score  =  "Min-Verification-Score" ":" 
+min-verification-score  =  "Min-Verification-Score" ":"
                            [ %x2D ] FLOAT CRLF
 
-num-min-verification-phrases = "Num-Min-Verification-Phrases" 
+num-min-verification-phrases = "Num-Min-Verification-Phrases"
                                ":" 1*19DIGIT CRLF
 
-num-max-verification-phrases = "Num-Max-Verification-Phrases" 
+num-max-verification-phrases = "Num-Max-Verification-Phrases"
                                ":" 1*19DIGIT CRLF
-     
-voiceprint-exists     =    "Voiceprint-Exists" ":" 
+
+voiceprint-exists     =    "Voiceprint-Exists" ":"
                            BOOLEAN CRLF
 
-ver-buffer-utterance  =    "Ver-Buffer-Utterance" ":" 
-                           BOOLEAN CRLF 
+ver-buffer-utterance  =    "Ver-Buffer-Utterance" ":"
+                           BOOLEAN CRLF
 
 input-waveform-uri    =    "Input-Waveform-URI" ":" uri CRLF
 
-abort-verification    =    "Abort-Verification " ":" 
-                           BOOLEAN CRLF </pre><a href="#section-15-2" class="pilcrow">¶</a>
+abort-verification    =    "Abort-Verification " ":"
+                           BOOLEAN CRLF</pre><a href="#section-15-2" class="pilcrow">¶</a>
 </div>
 <p id="section-15-3">The following productions add a new SDP session-level attribute. See
       <a href="#cmid" class="xref">Section 13.7.2, Paragraph 7</a>.<a href="#section-15-3" class="pilcrow">¶</a></p>
@@ -12271,13 +12271,13 @@
 <div class="artwork art-text alignLeft" id="section-16.1-1">
 <pre>
 &lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+&lt;xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
             targetNamespace="urn:ietf:params:xml:ns:mrcpv2"
             xmlns="urn:ietf:params:xml:ns:mrcpv2"
-            elementFormDefault="qualified" 
+            elementFormDefault="qualified"
             attributeFormDefault="unqualified" &gt;
   &lt;xs:annotation&gt;
-    &lt;xs:documentation&gt; Natural Language Semantic Markup Schema 
+    &lt;xs:documentation&gt; Natural Language Semantic Markup Schema
     &lt;/xs:documentation&gt;
   &lt;/xs:annotation&gt;
   &lt;xs:include schemaLocation="enrollment-schema.rng"/&gt;
@@ -12306,12 +12306,12 @@
                   &lt;xs:attribute name="mode"
                                 type="xs:string"
                                 default="speech"/&gt;
-                  &lt;xs:attribute name="confidence" 
-                                type="confidenceinfo" 
+                  &lt;xs:attribute name="confidence"
+                                type="confidenceinfo"
                                 default="1.0"/&gt;
-                  &lt;xs:attribute name="timestamp-start" 
+                  &lt;xs:attribute name="timestamp-start"
                                 type="xs:string"/&gt;
-                  &lt;xs:attribute name="timestamp-end" 
+                  &lt;xs:attribute name="timestamp-end"
                                 type="xs:string"/&gt;
                 &lt;/xs:complexType&gt;
               &lt;/xs:element&gt;
@@ -12327,7 +12327,7 @@
         &lt;xs:element name="verification-result"
                     type="verification-contents"/&gt;
       &lt;/xs:sequence&gt;
-      &lt;xs:attribute name="grammar" type="xs:anyURI" 
+      &lt;xs:attribute name="grammar" type="xs:anyURI"
                     use="optional"/&gt;
     &lt;/xs:complexType&gt;
   &lt;/xs:element&gt;
@@ -12426,7 +12426,7 @@
 <div class="artwork art-text alignLeft" id="section-16.3-1">
 <pre>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
 
-&lt;!--    MRCP Verification Results Schema 
+&lt;!--    MRCP Verification Results Schema
         (See http://www.oasis-open.org/committees/relax-ng/spec.html)
    --&gt;
 
@@ -12766,23 +12766,23 @@
       </h2>
 <div class="artwork art-text alignLeft" id="section-appendix.a-1">
 <pre>
-Pierre Forgues 
-Nuance Communications Ltd. 
+Pierre Forgues
+Nuance Communications Ltd.
 1500 University Street
 Suite 935
-Montreal, Quebec 
-Canada H3A 3S7 
-         
-EMail:  forgues@nuance.com 
+Montreal, Quebec
+Canada H3A 3S7
+
+EMail:  forgues@nuance.com
+
 
+Charles Galles
+Intervoice, Inc.
+17811 Waterview Parkway
+Dallas, Texas 75252
+USA
 
-Charles Galles 
-Intervoice, Inc. 
-17811 Waterview Parkway 
-Dallas, Texas 75252 
-USA        
- 
-EMail:  charles.galles@intervoice.com 
+EMail:  charles.galles@intervoice.com
 
 
 Klaus Reifenrath
@@ -12792,8 +12792,8 @@
 9820 Merelbeke
 Belgium
 
-EMail: klaus.reifenrath@scansoft.com 
-                </pre><a href="#section-appendix.a-1" class="pilcrow">¶</a>
+EMail: klaus.reifenrath@scansoft.com
+</pre><a href="#section-appendix.a-1" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-appendix.b">
@@ -12822,7 +12822,7 @@
 Suresh Kaliannan (Cisco Systems, Inc.)
 Skip Cave (Intervoice, Inc.)
 Thomas Gal (LumenVox)
-         </pre><a href="#section-appendix.b-1" class="pilcrow">¶</a>
+</pre><a href="#section-appendix.b-1" class="pilcrow">¶</a>
 </div>
 <p id="section-appendix.b-2">The chairs of the SPEECHSC work group are Eric Burger (Georgetown
       University) and Dave Oran (Cisco Systems, Inc.).<a href="#section-appendix.b-2" class="pilcrow">¶</a></p>
diff -Nru xml2rfc-2.39.0/tests/valid/rfc6787.v3.py35.html xml2rfc-2.40.0/tests/valid/rfc6787.v3.py35.html
--- xml2rfc-2.39.0/tests/valid/rfc6787.v3.py35.html	2019-12-22 18:00:56.000000000 +0000
+++ xml2rfc-2.40.0/tests/valid/rfc6787.v3.py35.html	2020-02-18 20:15:35.000000000 +0000
@@ -21,7 +21,7 @@
       established above, allowing the client to control the media processing
       resources on the speech resource server. 
     ' name="description">
-<meta content="xml2rfc 2.37.0" name="generator">
+<meta content="xml2rfc 2.39.0" name="generator">
 <meta content="mrcp, speechsc, asr, tts, speech services, speech recognition, speech synthesis, nlsml, speaker authentication, speaker verification, speaker identification" name="keyword">
 <meta content="6787" name="rfc.number">
 <link href="tests/input/rfc6787.xml" type="application/rfc+xml" rel="alternate">
@@ -1260,7 +1260,7 @@
 |--------------------|         ||                                  ||
          |                     ||----------------------------------||
         SIP                    |------------------------------------|
-         |                       /           
+         |                       /
 |-------------------|          RTP
 |                   |          /
 | Media Source/Sink |---------/
@@ -1345,7 +1345,7 @@
 <pre>
      sip:mrcpv2@example.net   or
      sips:mrcpv2@example.net
-          </pre><a href="#section-3.2-3" class="pilcrow">¶</a>
+</pre><a href="#section-3.2-3" class="pilcrow">¶</a>
 </div>
 </section>
 </section>
@@ -1564,69 +1564,69 @@
 <span id="name-example-add-synthesizer-con"></span><figure id="figure-2">
           <div class="artwork art-text alignLeft" id="section-4.3-3.1">
 <pre>
-C-&gt;S:  INVITE sip:mresources@example.com SIP/2.0 
-       Via:SIP/2.0/TCP client.atlanta.example.com:5060; 
-        branch=z9hG4bK74bf1 
-       Max-Forwards:6 
-       To:MediaServer &lt;sip:mresources@example.com&gt; 
-       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314161 INVITE 
-       Contact:&lt;sip:sarvi@client.example.com&gt; 
-       Content-Type:application/sdp 
+C-&gt;S:  INVITE sip:mresources@example.com SIP/2.0
+       Via:SIP/2.0/TCP client.atlanta.example.com:5060;
+        branch=z9hG4bK74bf1
+       Max-Forwards:6
+       To:MediaServer &lt;sip:mresources@example.com&gt;
+       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314161 INVITE
+       Contact:&lt;sip:sarvi@client.example.com&gt;
+       Content-Type:application/sdp
        Content-Length:...
-       
-       v=0 
-       o=sarvi 2890844526 2890844526 IN IP4 192.0.2.12 
-       s=- 
+
+       v=0
+       o=sarvi 2890844526 2890844526 IN IP4 192.0.2.12
+       s=-
        c=IN IP4 192.0.2.12
        t=0 0
-       m=application 9 TCP/MRCPv2 1 
+       m=application 9 TCP/MRCPv2 1
        a=setup:active
        a=connection:new
        a=resource:speechsynth
        a=cmid:1
-       m=audio 49170 RTP/AVP 0 
-       a=rtpmap:0 pcmu/8000 
-       a=recvonly 
+       m=audio 49170 RTP/AVP 0
+       a=rtpmap:0 pcmu/8000
+       a=recvonly
        a=mid:1
-     
 
-S-&gt;C:  SIP/2.0 200 OK 
+
+S-&gt;C:  SIP/2.0 200 OK
        Via:SIP/2.0/TCP client.atlanta.example.com:5060;
         branch=z9hG4bK74bf1;received=192.0.32.10
-       To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784 
-       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314161 INVITE 
-       Contact:&lt;sip:mresources@server.example.com&gt; 
-       Content-Type:application/sdp 
-       Content-Length:... 
-       
-       v=0 
-       o=- 2890842808 2890842808 IN IP4 192.0.2.11 
-       s=- 
+       To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784
+       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314161 INVITE
+       Contact:&lt;sip:mresources@server.example.com&gt;
+       Content-Type:application/sdp
+       Content-Length:...
+
+       v=0
+       o=- 2890842808 2890842808 IN IP4 192.0.2.11
+       s=-
        c=IN IP4 192.0.2.11
        t=0 0
-       m=application 32416 TCP/MRCPv2 1 
+       m=application 32416 TCP/MRCPv2 1
        a=setup:passive
        a=connection:new
-       a=channel:32AECB234338@speechsynth 
+       a=channel:32AECB234338@speechsynth
        a=cmid:1
-       m=audio 48260 RTP/AVP 0 
-       a=rtpmap:0 pcmu/8000 
-       a=sendonly 
-       a=mid:1 
-     
+       m=audio 48260 RTP/AVP 0
+       a=rtpmap:0 pcmu/8000
+       a=sendonly
+       a=mid:1
+
 
-C-&gt;S:  ACK sip:mresources@server.example.com SIP/2.0 
+C-&gt;S:  ACK sip:mresources@server.example.com SIP/2.0
        Via:SIP/2.0/TCP client.atlanta.example.com:5060;
         branch=z9hG4bK74bf2
-       Max-Forwards:6 
+       Max-Forwards:6
        To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784
-       From:Sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314161 ACK 
+       From:Sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314161 ACK
        Content-Length:0
 </pre>
 </div>
@@ -1641,83 +1641,83 @@
 <span id="name-example-add-recognizer"></span><figure id="figure-3">
           <div class="artwork art-text alignLeft" id="section-4.3-5.1">
 <pre>
-C-&gt;S:  INVITE sip:mresources@server.example.com SIP/2.0 
+C-&gt;S:  INVITE sip:mresources@server.example.com SIP/2.0
        Via:SIP/2.0/TCP client.atlanta.example.com:5060;
         branch=z9hG4bK74bf3
-       Max-Forwards:6 
+       Max-Forwards:6
        To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784
-       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314162 INVITE 
-       Contact:&lt;sip:sarvi@client.example.com&gt; 
-       Content-Type:application/sdp 
+       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314162 INVITE
+       Contact:&lt;sip:sarvi@client.example.com&gt;
+       Content-Type:application/sdp
        Content-Length:...
-       
-       v=0 
-       o=sarvi 2890844526 2890844527 IN IP4 192.0.2.12 
+
+       v=0
+       o=sarvi 2890844526 2890844527 IN IP4 192.0.2.12
        s=-
        c=IN IP4 192.0.2.12
        t=0 0
-       m=application 9 TCP/MRCPv2 1 
+       m=application 9 TCP/MRCPv2 1
        a=setup:active
        a=connection:existing
        a=resource:speechsynth
        a=cmid:1
-       m=audio 49170 RTP/AVP 0 96 
-       a=rtpmap:0 pcmu/8000 
-       a=rtpmap:96 telephone-event/8000 
-       a=fmtp:96 0-15 
-       a=sendrecv 
+       m=audio 49170 RTP/AVP 0 96
+       a=rtpmap:0 pcmu/8000
+       a=rtpmap:96 telephone-event/8000
+       a=fmtp:96 0-15
+       a=sendrecv
        a=mid:1
-       m=application 9 TCP/MRCPv2 1 
+       m=application 9 TCP/MRCPv2 1
        a=setup:active
        a=connection:existing
        a=resource:speechrecog
        a=cmid:1
-     
 
-S-&gt;C:  SIP/2.0 200 OK 
+
+S-&gt;C:  SIP/2.0 200 OK
        Via:SIP/2.0/TCP client.atlanta.example.com:5060;
         branch=z9hG4bK74bf3;received=192.0.32.10
        To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784
-       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314162 INVITE 
-       Contact:&lt;sip:mresources@server.example.com&gt; 
-       Content-Type:application/sdp 
+       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314162 INVITE
+       Contact:&lt;sip:mresources@server.example.com&gt;
+       Content-Type:application/sdp
        Content-Length:...
-            
-       v=0 
-       o=- 2890842808 2890842809 IN IP4 192.0.2.11 
+
+       v=0
+       o=- 2890842808 2890842809 IN IP4 192.0.2.11
        s=-
        c=IN IP4 192.0.2.11
        t=0 0
-       m=application 32416 TCP/MRCPv2 1 
+       m=application 32416 TCP/MRCPv2 1
        a=setup:passive
        a=connection:existing
        a=channel:32AECB234338@speechsynth
        a=cmid:1
-       m=audio 48260 RTP/AVP 0 96 
-       a=rtpmap:0 pcmu/8000 
-       a=rtpmap:96 telephone-event/8000 
-       a=fmtp:96 0-15 
-       a=sendrecv 
+       m=audio 48260 RTP/AVP 0 96
+       a=rtpmap:0 pcmu/8000
+       a=rtpmap:96 telephone-event/8000
+       a=fmtp:96 0-15
+       a=sendrecv
        a=mid:1
-       m=application 32416 TCP/MRCPv2 1 
+       m=application 32416 TCP/MRCPv2 1
        a=setup:passive
        a=connection:existing
        a=channel:32AECB234338@speechrecog
        a=cmid:1
-     
 
-C-&gt;S:  ACK sip:mresources@server.example.com SIP/2.0 
+
+C-&gt;S:  ACK sip:mresources@server.example.com SIP/2.0
        Via:SIP/2.0/TCP client.atlanta.example.com:5060;
         branch=z9hG4bK74bf4
-       Max-Forwards:6 
+       Max-Forwards:6
        To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784
-       From:Sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314162 ACK 
+       From:Sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314162 ACK
        Content-Length:0
 </pre>
 </div>
@@ -1731,71 +1731,71 @@
 <span id="name-example-deallocate-recogniz"></span><figure id="figure-4">
           <div class="artwork art-text alignLeft" id="section-4.3-7.1">
 <pre>
-C-&gt;S:  INVITE sip:mresources@server.example.com SIP/2.0 
+C-&gt;S:  INVITE sip:mresources@server.example.com SIP/2.0
        Via:SIP/2.0/TCP client.atlanta.example.com:5060;
         branch=z9hG4bK74bf5
-       Max-Forwards:6 
+       Max-Forwards:6
        To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784
-       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314163 INVITE 
-       Contact:&lt;sip:sarvi@client.example.com&gt; 
-       Content-Type:application/sdp 
+       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314163 INVITE
+       Contact:&lt;sip:sarvi@client.example.com&gt;
+       Content-Type:application/sdp
        Content-Length:...
-            
-       v=0 
-       o=sarvi 2890844526 2890844528 IN IP4 192.0.2.12 
+
+       v=0
+       o=sarvi 2890844526 2890844528 IN IP4 192.0.2.12
        s=-
        c=IN IP4 192.0.2.12
        t=0 0
-       m=application 9 TCP/MRCPv2 1 
-       a=resource:speechsynth 
+       m=application 9 TCP/MRCPv2 1
+       a=resource:speechsynth
        a=cmid:1
-       m=audio 49170 RTP/AVP 0 
-       a=rtpmap:0 pcmu/8000 
-       a=recvonly 
+       m=audio 49170 RTP/AVP 0
+       a=rtpmap:0 pcmu/8000
+       a=recvonly
        a=mid:1
-       m=application 0 TCP/MRCPv2 1 
-       a=resource:speechrecog 
+       m=application 0 TCP/MRCPv2 1
+       a=resource:speechrecog
        a=cmid:1
-     
 
-S-&gt;C:  SIP/2.0 200 OK 
+
+S-&gt;C:  SIP/2.0 200 OK
        Via:SIP/2.0/TCP client.atlanta.example.com:5060;
         branch=z9hG4bK74bf5;received=192.0.32.10
        To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784
-       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314163 INVITE 
+       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314163 INVITE
        Contact:&lt;sip:mresources@server.example.com&gt;
-       Content-Type:application/sdp 
+       Content-Type:application/sdp
        Content-Length:...
-     
-       v=0 
-       o=- 2890842808 2890842810 IN IP4 192.0.2.11 
+
+       v=0
+       o=- 2890842808 2890842810 IN IP4 192.0.2.11
        s=-
        c=IN IP4 192.0.2.11
        t=0 0
-       m=application 32416 TCP/MRCPv2 1 
-       a=channel:32AECB234338@speechsynth 
+       m=application 32416 TCP/MRCPv2 1
+       a=channel:32AECB234338@speechsynth
        a=cmid:1
-       m=audio 48260 RTP/AVP 0 
-       a=rtpmap:0 pcmu/8000 
-       a=sendonly 
+       m=audio 48260 RTP/AVP 0
+       a=rtpmap:0 pcmu/8000
+       a=sendonly
        a=mid:1
-       m=application 0 TCP/MRCPv2 1 
-       a=channel:32AECB234338@speechrecog 
+       m=application 0 TCP/MRCPv2 1
+       a=channel:32AECB234338@speechrecog
        a=cmid:1
-     
 
-C-&gt;S:  ACK sip:mresources@server.example.com SIP/2.0 
+
+C-&gt;S:  ACK sip:mresources@server.example.com SIP/2.0
        Via:SIP/2.0/TCP client.atlanta.example.com:5060;
         branch=z9hG4bK74bf6
-       Max-Forwards:6 
+       Max-Forwards:6
        To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784
-       From:Sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314163 ACK 
+       From:Sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314163 ACK
        Content-Length:0
 </pre>
 </div>
@@ -1997,7 +1997,7 @@
 <div class="artwork art-text alignLeft art-abnf" id="section-5.1-6">
 <pre>
 mrcp-version   =    "MRCP" "/" 1*2DIGIT "." 1*2DIGIT
-          </pre><a href="#section-5.1-6" class="pilcrow">¶</a>
+</pre><a href="#section-5.1-6" class="pilcrow">¶</a>
 </div>
 <p id="section-5.1-7"><a href="#section-5.1-7" class="pilcrow">¶</a></p>
 <p id="section-5.1-8">The message-length field specifies the length of the message in
@@ -2015,7 +2015,7 @@
 <div class="artwork art-text alignLeft art-abnf" id="section-5.1-9">
 <pre>
 message-length =    1*19DIGIT
-          </pre><a href="#section-5.1-9" class="pilcrow">¶</a>
+</pre><a href="#section-5.1-9" class="pilcrow">¶</a>
 </div>
 <p id="section-5.1-10">The following sample MRCP exchange demonstrates proper
         message-length values. The values for message-length have been removed
@@ -2025,12 +2025,12 @@
 <div class="artwork art-text alignLeft" id="section-5.1-11">
 <pre>
 C-&gt;S:   MRCP/2.0 877 INTERPRET 543266
-        Channel-Identifier:32AECB23433801@speechrecog 
-        Interpret-Text:may I speak to Andre Roy 
-        Content-Type:application/srgs+xml  
-        Content-ID:&lt;request1@form-level.store&gt;  
+        Channel-Identifier:32AECB23433801@speechrecog
+        Interpret-Text:may I speak to Andre Roy
+        Content-Type:application/srgs+xml
+        Content-ID:&lt;request1@form-level.store&gt;
         Content-Length:661
-        
+
         &lt;?xml version="1.0"?&gt;
         &lt;!-- the default grammar language is US English --&gt;
         &lt;grammar xmlns="http://www.w3.org/2001/06/grammar"
@@ -2042,7 +2042,7 @@
                     &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
                 &lt;/one-of&gt;
             &lt;/rule&gt;
-        
+
         &lt;!-- single language attachment to a rule expansion --&gt;
             &lt;rule id="request"&gt;
                 may I speak to
@@ -2052,16 +2052,16 @@
                 &lt;/one-of&gt;
             &lt;/rule&gt;
         &lt;/grammar&gt;
-              
+
 S-&gt;C:   MRCP/2.0 82 543266 200 IN-PROGRESS
         Channel-Identifier:32AECB23433801@speechrecog
-                   
+
 S-&gt;C:   MRCP/2.0 634 INTERPRETATION-COMPLETE 543266 200 COMPLETE
         Channel-Identifier:32AECB23433801@speechrecog
         Completion-Cause:000 success
         Content-Type:application/nlsml+xml
         Content-Length:441
-        
+
         &lt;?xml version="1.0"?&gt;
         &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                 xmlns:ex="http://www.example.com/example"
@@ -2104,7 +2104,7 @@
 <pre>
 request-line   =    mrcp-version SP message-length SP method-name
                     SP request-id CRLF
-          </pre><a href="#section-5.2-3" class="pilcrow">¶</a>
+</pre><a href="#section-5.2-3" class="pilcrow">¶</a>
 </div>
 <p id="section-5.2-4">The mrcp-version field is the MRCP protocol version that is being
         used by the client.<a href="#section-5.2-4" class="pilcrow">¶</a></p>
@@ -2123,7 +2123,7 @@
                /    recognizer-method
                /    recorder-method
                /    verifier-method
-          </pre><a href="#section-5.2-8" class="pilcrow">¶</a>
+</pre><a href="#section-5.2-8" class="pilcrow">¶</a>
 </div>
 <p id="section-5.2-9">The request-id field is a unique identifier representable as an
         unsigned 32-bit integer created by the client and sent to the server.
@@ -2144,7 +2144,7 @@
 <div class="artwork art-text alignLeft art-abnf" id="section-5.2-11">
 <pre>
 request-id     =    1*10DIGIT
-          </pre><a href="#section-5.2-11" class="pilcrow">¶</a>
+</pre><a href="#section-5.2-11" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -2162,7 +2162,7 @@
 <pre>
 response-line  =    mrcp-version SP message-length SP request-id
                     SP status-code SP request-state CRLF
-          </pre><a href="#section-5.3-2" class="pilcrow">¶</a>
+</pre><a href="#section-5.3-2" class="pilcrow">¶</a>
 </div>
 <p id="section-5.3-3">The mrcp-version field MUST contain the version of the request if
         supported; otherwise, it MUST contain the highest version of
@@ -2178,7 +2178,7 @@
 <div class="artwork art-text alignLeft art-abnf" id="section-5.3-8">
 <pre>
 status-code     =    3DIGIT
-          </pre><a href="#section-5.3-8" class="pilcrow">¶</a>
+</pre><a href="#section-5.3-8" class="pilcrow">¶</a>
 </div>
 <p id="section-5.3-9">The request-state field indicates if the action initiated by the
         Request is PENDING, IN-PROGRESS, or COMPLETE. The COMPLETE status means
@@ -2194,7 +2194,7 @@
 request-state    =  "COMPLETE"
                  /  "IN-PROGRESS"
                  /  "PENDING"
-          </pre><a href="#section-5.3-10" class="pilcrow">¶</a>
+</pre><a href="#section-5.3-10" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -2440,7 +2440,7 @@
 
 S-&gt;C:  MRCP/2.0 ... 543256 200 COMPLETE
        Channel-Identifier:32AECB23433802@speechsynth
-   </pre><a href="#section-6.1.1-6" class="pilcrow">¶</a>
+</pre><a href="#section-6.1.1-6" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-6.1.2">
@@ -2555,7 +2555,7 @@
                     /    content-length
                     /    fetch-timeout
                     /    cache-control
-                    /    logging-tag 
+                    /    logging-tag
                     /    set-cookie
                     /    vendor-specific
 </pre><a href="#section-6.2-7" class="pilcrow">¶</a>
@@ -2626,7 +2626,7 @@
           RECOGNITION-COMPLETE events for the terminated requests.<a href="#section-6.2.3-4" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft art-abnf" id="section-6.2.3-5">
 <pre>
-active-request-id-list  =  "Active-Request-Id-List" ":" 
+active-request-id-list  =  "Active-Request-Id-List" ":"
                            request-id *("," request-id) CRLF
 </pre><a href="#section-6.2.3-5" class="pilcrow">¶</a>
 </div>
@@ -2652,7 +2652,7 @@
 <div class="artwork art-text alignLeft art-abnf" id="section-6.2.4-2">
 <pre>
 proxy-sync-id    =  "Proxy-Sync-Id" ":" 1*VCHAR CRLF
-            </pre><a href="#section-6.2.4-2" class="pilcrow">¶</a>
+</pre><a href="#section-6.2.4-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-6.2.5">
@@ -2694,7 +2694,7 @@
 attribute        =    token
 
 value            =    token / quoted-string
-            </pre><a href="#section-6.2.6-2" class="pilcrow">¶</a>
+</pre><a href="#section-6.2.6-2" class="pilcrow">¶</a>
 </div>
 </section>
 <div id="sec.Content-ID">
@@ -2722,7 +2722,7 @@
 <div class="artwork art-text alignLeft art-abnf" id="section-6.2.8-2">
 <pre>
 content-base      = "Content-Base" ":" absoluteURI CRLF
-            </pre><a href="#section-6.2.8-2" class="pilcrow">¶</a>
+</pre><a href="#section-6.2.8-2" class="pilcrow">¶</a>
 </div>
 <p id="section-6.2.8-3">Note, however, that the base URI of the contents within the
           entity-body may be redefined within that entity-body. An example of
@@ -2744,8 +2744,8 @@
           on all messages.<a href="#section-6.2.9-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft art-abnf" id="section-6.2.9-2">
 <pre>
-content-encoding  = "Content-Encoding" ":" 
-                    *WSP content-coding 
+content-encoding  = "Content-Encoding" ":"
+                    *WSP content-coding
                     *(*WSP "," *WSP content-coding *WSP )
                     CRLF
 </pre><a href="#section-6.2.9-2" class="pilcrow">¶</a>
@@ -2826,7 +2826,7 @@
 <div class="artwork art-text alignLeft" id="section-6.2.12-2">
 <pre>
 fetch-timeout       =   "Fetch-Timeout" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-6.2.12-2" class="pilcrow">¶</a>
+</pre><a href="#section-6.2.12-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -2854,16 +2854,16 @@
           on requests.<a href="#section-6.2.13-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-6.2.13-2">
 <pre>
-cache-control    =    "Cache-Control" ":" 
+cache-control    =    "Cache-Control" ":"
                       [*WSP cache-directive
                       *( *WSP "," *WSP cache-directive *WSP )]
                       CRLF
 
-cache-directive     = "max-age" "=" delta-seconds    
+cache-directive     = "max-age" "=" delta-seconds
                     / "max-stale" [ "=" delta-seconds ]
-                    / "min-fresh" "=" delta-seconds 
+                    / "min-fresh" "=" delta-seconds
 
-delta-seconds       = 1*19DIGIT    
+delta-seconds       = 1*19DIGIT
 </pre><a href="#section-6.2.13-2" class="pilcrow">¶</a>
 </div>
 <p id="section-6.2.13-3">Here, delta-seconds is a decimal time value specifying the number
@@ -2929,7 +2929,7 @@
 <div class="artwork art-text alignLeft" id="section-6.2.14-3">
 <pre>
 logging-tag    = "Logging-Tag" ":" 1*UTFCHAR CRLF
-            </pre><a href="#section-6.2.14-3" class="pilcrow">¶</a>
+</pre><a href="#section-6.2.14-3" class="pilcrow">¶</a>
 </div>
 </section>
 <div id="sec.SetCookie">
@@ -3041,10 +3041,10 @@
 <div class="artwork art-text alignLeft" id="section-6.2.16-2">
 <pre>
 vendor-specific          =    "Vendor-Specific-Parameters" ":"
-                              [vendor-specific-av-pair 
-                              *(";" vendor-specific-av-pair)] CRLF 
+                              [vendor-specific-av-pair
+                              *(";" vendor-specific-av-pair)] CRLF
 
-vendor-specific-av-pair  = vendor-av-pair-name "=" 
+vendor-specific-av-pair  = vendor-av-pair-name "="
                            value
 
 vendor-av-pair-name     = 1*UTFCHAR
@@ -3199,14 +3199,14 @@
      Supported:foo
      Content-Type:application/sdp
      Content-Length:...
-     
+
      v=0
      o=sarvi 2890844536 2890842811 IN IP4 192.0.2.12
      s=-
      i=MRCPv2 server capabilities
      c=IN IP4 192.0.2.12/127
      t=0 0
-     m=application 0 TCP/TLS/MRCPv2 1 
+     m=application 0 TCP/TLS/MRCPv2 1
      a=resource:speechsynth
      a=resource:speechrecog
      a=resource:speakverify
@@ -3327,21 +3327,21 @@
         is associated with.<a href="#section-8.4-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-8.4-2">
 <pre>
-synthesizer-header  =  jump-size       
-                    /  kill-on-barge-in  
-                    /  speaker-profile   
+synthesizer-header  =  jump-size
+                    /  kill-on-barge-in
+                    /  speaker-profile
                     /  completion-cause
-                    /  completion-reason  
-                    /  voice-parameter   
+                    /  completion-reason
+                    /  voice-parameter
                     /  prosody-parameter
-                    /  speech-marker     
-                    /  speech-language 
-                    /  fetch-hint        
-                    /  audio-fetch-hint  
-                    /  failed-uri        
-                    /  failed-uri-cause  
-                    /  speak-restart     
-                    /  speak-length 
+                    /  speech-marker
+                    /  speech-language
+                    /  fetch-hint
+                    /  audio-fetch-hint
+                    /  failed-uri
+                    /  failed-uri-cause
+                    /  speak-restart
+                    /  speak-length
                     /  load-lexicon
                     /  lexicon-search-order
 </pre><a href="#section-8.4-2" class="pilcrow">¶</a>
@@ -3516,7 +3516,7 @@
           as an error in parsing the speech markup text.<a href="#section-8.4.5-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-8.4.5-2">
 <pre>
-completion-reason   =   "Completion-Reason" ":" 
+completion-reason   =   "Completion-Reason" ":"
                         quoted-string CRLF
 
 </pre><a href="#section-8.4.5-2" class="pilcrow">¶</a>
@@ -3648,7 +3648,7 @@
 <div class="artwork art-text alignLeft" id="section-8.4.9-2">
 <pre>
 speech-language     =   "Speech-Language" ":" 1*VCHAR CRLF
-            </pre><a href="#section-8.4.9-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.4.9-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-8.4.10">
@@ -3668,7 +3668,7 @@
 <pre>
 fetch-hint          =   "Fetch-Hint" ":"
                          ("prefetch" / "safe") CRLF
-            </pre><a href="#section-8.4.10-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.4.10-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-8.4.11">
@@ -3689,7 +3689,7 @@
 <pre>
 audio-fetch-hint    =   "Audio-Fetch-Hint" ":"
                         ("prefetch" / "safe" / "stream") CRLF
-            </pre><a href="#section-8.4.11-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.4.11-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-8.4.12">
@@ -3704,7 +3704,7 @@
 <div class="artwork art-text alignLeft" id="section-8.4.12-2">
 <pre>
 failed-uri          =   "Failed-URI" ":" absoluteURI CRLF
-            </pre><a href="#section-8.4.12-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.4.12-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-8.4.13">
@@ -3735,7 +3735,7 @@
 <div class="artwork art-text alignLeft" id="section-8.4.14-2">
 <pre>
 speak-restart       =   "Speak-Restart" ":" BOOLEAN CRLF
-            </pre><a href="#section-8.4.14-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.4.14-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-8.4.15">
@@ -3787,7 +3787,7 @@
 <div class="artwork art-text alignLeft" id="section-8.4.16-2">
 <pre>
 load-lexicon       =   "Load-Lexicon" ":" BOOLEAN CRLF
-            </pre><a href="#section-8.4.16-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.4.16-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -3806,7 +3806,7 @@
 <pre>
 lexicon-search-order =   "Lexicon-Search-Order" ":"
           "&lt;" absoluteURI "&gt;" *(" " "&lt;" absoluteURI "&gt;") CRLF
-            </pre><a href="#section-8.4.17-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.4.17-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -3876,7 +3876,7 @@
 Content-Length:...
 
 &lt;?xml version="1.0"?&gt;
-     &lt;speak version="1.0"                
+     &lt;speak version="1.0"
             xmlns="http://www.w3.org/2001/10/synthesis"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -3910,13 +3910,13 @@
 http://www.example.com/ASR-Document-Part1.ssml
 http://www.example.com/ASR-Document-Part2.ssml
 http://www.example.com/ASR-Conclusion.ssml
-    
+
 --break
 Content-Type:application/ssml+xml
 Content-Length:...
 
 &lt;?xml version="1.0"?&gt;
-    &lt;speak version="1.0"                
+    &lt;speak version="1.0"
            xmlns="http://www.w3.org/2001/10/synthesis"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4012,16 +4012,16 @@
 <span id="name-speak-example"></span><figure id="figure-11">
           <div class="artwork art-text alignLeft" id="section-8.6-7.1">
 <pre>
-C-&gt;S: MRCP/2.0 ... SPEAK 543257 
+C-&gt;S: MRCP/2.0 ... SPEAK 543257
       Channel-Identifier:32AECB23433802@speechsynth
       Voice-gender:neutral
       Voice-Age:25
       Prosody-volume:medium
       Content-Type:application/ssml+xml
       Content-Length:...
-      
+
       &lt;?xml version="1.0"?&gt;
-         &lt;speak version="1.0"                
+         &lt;speak version="1.0"
              xmlns="http://www.w3.org/2001/10/synthesis"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4033,7 +4033,7 @@
              &lt;break/&gt;
              &lt;say-as interpret-as="vxml:time"&gt;0342p&lt;/say-as&gt;.
              &lt;/s&gt;
-          &lt;s&gt;The subject is 
+          &lt;s&gt;The subject is
                  &lt;prosody rate="-20%"&gt;ski trip&lt;/prosody&gt;
           &lt;/s&gt;
          &lt;/p&gt;
@@ -4086,7 +4086,7 @@
       Content-Length:...
 
       &lt;?xml version="1.0"?&gt;
-        &lt;speak version="1.0"                
+        &lt;speak version="1.0"
              xmlns="http://www.w3.org/2001/10/synthesis"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4094,10 +4094,10 @@
              xml:lang="en-US"&gt;
          &lt;p&gt;
           &lt;s&gt;You have 4 new messages.&lt;/s&gt;
-          &lt;s&gt;The first is from Stephanie Williams and arrived at 
+          &lt;s&gt;The first is from Stephanie Williams and arrived at
              &lt;break/&gt;
              &lt;say-as interpret-as="vxml:time"&gt;0342p&lt;/say-as&gt;.&lt;/s&gt;
-          &lt;s&gt;The subject is 
+          &lt;s&gt;The subject is
               &lt;prosody rate="-20%"&gt;ski trip&lt;/prosody&gt;&lt;/s&gt;
          &lt;/p&gt;
         &lt;/speak&gt;
@@ -4128,7 +4128,7 @@
         means to communicate the occurrence of the event to the synthesizer
         resource.<a href="#section-8.8-1" class="pilcrow">¶</a></p>
 <p id="section-8.8-2">This method is useful in two scenarios:<a href="#section-8.8-2" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-8.8-3">
+<ol start="1" type="1" class="normal type-1" id="section-8.8-3">
           <li id="section-8.8-3.1">The client has detected DTMF digits in the input media or some
             other barge-in-able event and wants to communicate that to the
             synthesizer resource.<a href="#section-8.8-3.1" class="pilcrow">¶</a>
@@ -4178,7 +4178,7 @@
       Content-Length:...
 
       &lt;?xml version="1.0"?&gt;
-        &lt;speak version="1.0"                
+        &lt;speak version="1.0"
              xmlns="http://www.w3.org/2001/10/synthesis"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4186,10 +4186,10 @@
              xml:lang="en-US"&gt;
          &lt;p&gt;
           &lt;s&gt;You have 4 new messages.&lt;/s&gt;
-          &lt;s&gt;The first is from Stephanie Williams and arrived at 
+          &lt;s&gt;The first is from Stephanie Williams and arrived at
              &lt;break/&gt;
              &lt;say-as interpret-as="vxml:time"&gt;0342p&lt;/say-as&gt;.&lt;/s&gt;
-          &lt;s&gt;The subject is 
+          &lt;s&gt;The subject is
              &lt;prosody rate="-20%"&gt;ski trip&lt;/prosody&gt;&lt;/s&gt;
          &lt;/p&gt;
         &lt;/speak&gt;
@@ -4237,7 +4237,7 @@
       Content-Length:...
 
       &lt;?xml version="1.0"?&gt;
-        &lt;speak version="1.0"                
+        &lt;speak version="1.0"
              xmlns="http://www.w3.org/2001/10/synthesis"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4245,11 +4245,11 @@
              xml:lang="en-US"&gt;
          &lt;p&gt;
           &lt;s&gt;You have 4 new messages.&lt;/s&gt;
-          &lt;s&gt;The first is from Stephanie Williams and arrived at 
+          &lt;s&gt;The first is from Stephanie Williams and arrived at
              &lt;break/&gt;
              &lt;say-as interpret-as="vxml:time"&gt;0342p&lt;/say-as&gt;.&lt;/s&gt;
 
-          &lt;s&gt;The subject is 
+          &lt;s&gt;The subject is
              &lt;prosody rate="-20%"&gt;ski trip&lt;/prosody&gt;&lt;/s&gt;
          &lt;/p&gt;
         &lt;/speak&gt;
@@ -4293,9 +4293,9 @@
       Prosody-volume:medium
       Content-Type:application/ssml+xml
       Content-Length:...
-      
+
       &lt;?xml version="1.0"?&gt;
-        &lt;speak version="1.0"                
+        &lt;speak version="1.0"
              xmlns="http://www.w3.org/2001/10/synthesis"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4303,10 +4303,10 @@
              xml:lang="en-US"&gt;
          &lt;p&gt;
           &lt;s&gt;You have 4 new messages.&lt;/s&gt;
-          &lt;s&gt;The first is from Stephanie Williams and arrived at 
+          &lt;s&gt;The first is from Stephanie Williams and arrived at
              &lt;break/&gt;
              &lt;say-as interpret-as="vxml:time"&gt;0342p&lt;/say-as&gt;.&lt;/s&gt;
-          &lt;s&gt;The subject is 
+          &lt;s&gt;The subject is
              &lt;prosody rate="-20%"&gt;ski trip&lt;/prosody&gt;&lt;/s&gt;
          &lt;/p&gt;
         &lt;/speak&gt;
@@ -4375,9 +4375,9 @@
       Prosody-volume:medium
       Content-Type:application/ssml+xml
       Content-Length:...
-      
+
       &lt;?xml version="1.0"?&gt;
-        &lt;speak version="1.0"                
+        &lt;speak version="1.0"
              xmlns="http://www.w3.org/2001/10/synthesis"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4446,7 +4446,7 @@
       Content-Length:...
 
       &lt;?xml version="1.0"?&gt;
-        &lt;speak version="1.0"                
+        &lt;speak version="1.0"
              xmlns="http://www.w3.org/2001/10/synthesis"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4457,7 +4457,7 @@
           &lt;s&gt;The first is from Stephanie Williams
              and arrived at &lt;break/&gt;
              &lt;say-as interpret-as="vxml:time"&gt;0342p&lt;/say-as&gt;.&lt;/s&gt;
-          &lt;s&gt;The subject is 
+          &lt;s&gt;The subject is
              &lt;prosody rate="-20%"&gt;ski trip&lt;/prosody&gt;&lt;/s&gt;
          &lt;/p&gt;
         &lt;/speak&gt;
@@ -4504,9 +4504,9 @@
       Prosody-volume:medium
       Content-Type:application/ssml+xml
       Content-Length:...
-      
+
       &lt;?xml version="1.0"?&gt;
-        &lt;speak version="1.0"                
+        &lt;speak version="1.0"
              xmlns="http://www.w3.org/2001/10/synthesis"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4518,7 +4518,7 @@
              and arrived at &lt;break/&gt;
              &lt;say-as interpret-as="vxml:time"&gt;0342p&lt;/say-as&gt;.&lt;/s&gt;
              &lt;mark name="here"/&gt;
-          &lt;s&gt;The subject is 
+          &lt;s&gt;The subject is
              &lt;prosody rate="-20%"&gt;ski trip&lt;/prosody&gt;
           &lt;/s&gt;
           &lt;mark name="ANSWER"/&gt;
@@ -4588,7 +4588,7 @@
       generate asynchronous events to the client to indicate conditions of
       interest during the processing of the method.<a href="#section-9-2" class="pilcrow">¶</a></p>
 <p id="section-9-3">This section applies to the following resource types.<a href="#section-9-3" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9-4">
+<ol start="1" type="1" class="normal type-1" id="section-9-4">
         <li id="section-9-4.1">speechrecog<a href="#section-9-4.1" class="pilcrow">¶</a>
 </li>
 <li id="section-9-4.2">dtmfrecog<a href="#section-9-4.2" class="pilcrow">¶</a>
@@ -4688,7 +4688,7 @@
  |      STOP                                        |
  |&lt;------|                                          |
  |&lt;-------------------STOP--------------------------|
- |&lt;-------------------DEFINE-GRAMMAR----------------|      
+ |&lt;-------------------DEFINE-GRAMMAR----------------|
 </pre>
 </div>
 <figcaption><a href="#figure-19" class="selfRef">Figure 19</a>:
@@ -4862,7 +4862,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.2-2">
 <pre>
 sensitivity-level        =  "Sensitivity-Level" ":" FLOAT CRLF
-            </pre><a href="#section-9.4.2-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.2-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.3">
@@ -4883,7 +4883,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.3-2">
 <pre>
 speed-vs-accuracy        =  "Speed-Vs-Accuracy" ":" FLOAT CRLF
-            </pre><a href="#section-9.4.3-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.3-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.4">
@@ -4905,7 +4905,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.4-2">
 <pre>
 n-best-list-length       =  "N-Best-List-Length" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-9.4.4-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.4-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.5">
@@ -4920,7 +4920,7 @@
 <pre>
 input-type         =  "Input-Type" ":"  inputs CRLF
 inputs             =  "speech" / "dtmf"
-            </pre><a href="#section-9.4.5-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.5-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.6">
@@ -4939,7 +4939,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.6-2">
 <pre>
 no-input-timeout         =  "No-Input-Timeout" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-9.4.6-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.6-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.7">
@@ -4957,7 +4957,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.7-2">
 <pre>
 recognition-timeout      =  "Recognition-Timeout" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-9.4.7-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.7-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.8">
@@ -4991,10 +4991,10 @@
           associated with the header field.<a href="#section-9.4.8-3" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.4.8-4">
 <pre>
-waveform-uri             =  "Waveform-URI" ":" ["&lt;" uri "&gt;" 
-                            ";" "size" "=" 1*19DIGIT 
+waveform-uri             =  "Waveform-URI" ":" ["&lt;" uri "&gt;"
+                            ";" "size" "=" 1*19DIGIT
                             ";" "duration" "=" 1*19DIGIT] CRLF
-            </pre><a href="#section-9.4.8-4" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.8-4" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.9">
@@ -5007,9 +5007,9 @@
           captured and returned by the Waveform-URI header field.<a href="#section-9.4.9-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.4.9-2">
 <pre>
-media-type               =  "Media-Type" ":" media-type-value 
+media-type               =  "Media-Type" ":" media-type-value
                             CRLF
-            </pre><a href="#section-9.4.9-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.9-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.10">
@@ -5023,7 +5023,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.10-2">
 <pre>
 input-waveform-uri       =  "Input-Waveform-URI" ":" uri CRLF
-            </pre><a href="#section-9.4.10-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.10-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.11">
@@ -5044,7 +5044,7 @@
                             cause-name CRLF
 cause-code               =  3DIGIT
 cause-name               =  *VCHAR
-            </pre><a href="#section-9.4.11-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.11-2" class="pilcrow">¶</a>
 </div>
 <table class="center" id="table-6">
             <caption><a href="#table-6" class="selfRef">Table 6</a></caption>
@@ -5178,9 +5178,9 @@
           interpret the completion reason text.<a href="#section-9.4.12-2" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.4.12-3">
 <pre>
-completion-reason        =  "Completion-Reason" ":" 
+completion-reason        =  "Completion-Reason" ":"
                             quoted-string CRLF
-            </pre><a href="#section-9.4.12-3" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.12-3" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.13">
@@ -5208,7 +5208,7 @@
 <pre>
 recognizer-context-block  =  "Recognizer-Context-Block" ":"
                              [1*VCHAR] CRLF
-            </pre><a href="#section-9.4.13-4" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.13-4" class="pilcrow">¶</a>
 </div>
 </section>
 <div id="sec.startInputTimers">
@@ -5231,7 +5231,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.14-2">
 <pre>
 start-input-timers  =  "Start-Input-Timers" ":" BOOLEAN CRLF
-            </pre><a href="#section-9.4.14-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.14-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -5253,7 +5253,7 @@
 <pre>
 speech-complete-timeout = "Speech-Complete-Timeout" ":"
                           1*19DIGIT CRLF
-            </pre><a href="#section-9.4.15-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.15-2" class="pilcrow">¶</a>
 </div>
 <p id="section-9.4.15-3">A long Speech-Complete-Timeout value delays the result to the
           client and therefore makes the application's response to a user
@@ -5280,9 +5280,9 @@
           implementation specific.<a href="#section-9.4.16-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.4.16-2">
 <pre>
-speech-incomplete-timeout = "Speech-Incomplete-Timeout" ":" 1*19DIGIT 
+speech-incomplete-timeout = "Speech-Incomplete-Timeout" ":" 1*19DIGIT
                              CRLF
-            </pre><a href="#section-9.4.16-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.16-2" class="pilcrow">¶</a>
 </div>
 <p id="section-9.4.16-3">The Speech-Incomplete-Timeout also applies when the speech prior
           to the silence is a complete match of an active grammar, but where
@@ -5312,7 +5312,7 @@
 <pre>
 dtmf-interdigit-timeout = "DTMF-Interdigit-Timeout" ":"
                            1*19DIGIT CRLF
-            </pre><a href="#section-9.4.17-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.17-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.18">
@@ -5328,7 +5328,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.18-2">
 <pre>
 dtmf-term-timeout        =  "DTMF-Term-Timeout" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-9.4.18-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.18-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.19">
@@ -5342,7 +5342,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.19-2">
 <pre>
 dtmf-term-char           =  "DTMF-Term-Char" ":" VCHAR CRLF
-            </pre><a href="#section-9.4.19-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.19-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.20">
@@ -5357,7 +5357,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.20-2">
 <pre>
 failed-uri               =  "Failed-URI" ":" absoluteURI CRLF
-            </pre><a href="#section-9.4.20-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.20-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.21">
@@ -5374,7 +5374,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.21-2">
 <pre>
 failed-uri-cause         =  "Failed-URI-Cause" ":" 1*UTFCHAR CRLF
-            </pre><a href="#section-9.4.21-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.21-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.22">
@@ -5395,7 +5395,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.22-2">
 <pre>
 save-waveform            =  "Save-Waveform" ":" BOOLEAN CRLF
-            </pre><a href="#section-9.4.22-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.22-2" class="pilcrow">¶</a>
 </div>
 </section>
 <div id="sec.newAudioChannel">
@@ -5420,9 +5420,9 @@
           session for multiple telephone calls.<a href="#section-9.4.23-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.4.23-2">
 <pre>
-new-audio-channel        =  "New-Audio-Channel" ":" BOOLEAN 
+new-audio-channel        =  "New-Audio-Channel" ":" BOOLEAN
                             CRLF
-            </pre><a href="#section-9.4.23-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.23-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -5437,7 +5437,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.24-2">
 <pre>
 speech-language          =  "Speech-Language" ":" 1*VCHAR CRLF
-            </pre><a href="#section-9.4.24-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.24-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.25">
@@ -5523,7 +5523,7 @@
 <pre>
 hotword-max-duration     =  "Hotword-Max-Duration" ":" 1*19DIGIT
                             CRLF
-            </pre><a href="#section-9.4.28-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.28-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.29">
@@ -5543,7 +5543,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.29-2">
 <pre>
 hotword-min-duration     =  "Hotword-Min-Duration" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-9.4.29-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.29-2" class="pilcrow">¶</a>
 </div>
 </section>
 <div id="sec.interpretText">
@@ -5560,8 +5560,8 @@
           the INTERPRET method.<a href="#section-9.4.30-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.4.30-2">
 <pre>
-interpret-text           =  "Interpret-Text" ":" 1*VCHAR CRLF          
-            </pre><a href="#section-9.4.30-2" class="pilcrow">¶</a>
+interpret-text           =  "Interpret-Text" ":" 1*VCHAR CRLF
+</pre><a href="#section-9.4.30-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -5581,7 +5581,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.31-2">
 <pre>
 dtmf-buffer-time  =  "DTMF-Buffer-Time" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-9.4.31-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.31-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.32">
@@ -5599,7 +5599,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.32-2">
 <pre>
 clear-dtmf-buffer  = "Clear-DTMF-Buffer" ":" BOOLEAN CRLF
-            </pre><a href="#section-9.4.32-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.32-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.33">
@@ -5617,7 +5617,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.33-2">
 <pre>
 early-no-match  = "Early-No-Match" ":" BOOLEAN CRLF
-            </pre><a href="#section-9.4.33-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.33-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.34">
@@ -5631,9 +5631,9 @@
           implementation specific and MAY be greater than 1.<a href="#section-9.4.34-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.4.34-2">
 <pre>
-num-min-consistent-pronunciations  = 
+num-min-consistent-pronunciations  =
               "Num-Min-Consistent-Pronunciations" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-9.4.34-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.34-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.35">
@@ -5653,7 +5653,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.35-2">
 <pre>
 consistency-threshold    =  "Consistency-Threshold" ":" FLOAT CRLF
-            </pre><a href="#section-9.4.35-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.35-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.36">
@@ -5676,7 +5676,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.36-2">
 <pre>
 clash-threshold          =  "Clash-Threshold" ":" FLOAT CRLF
-            </pre><a href="#section-9.4.36-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.36-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.37">
@@ -5695,7 +5695,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.37-2">
 <pre>
 personal-grammar-uri     =  "Personal-Grammar-URI" ":" uri CRLF
-            </pre><a href="#section-9.4.37-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.37-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.38">
@@ -5711,7 +5711,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.38-2">
 <pre>
 enroll-utterance     =  "Enroll-Utterance" ":" BOOLEAN CRLF
-            </pre><a href="#section-9.4.38-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.38-2" class="pilcrow">¶</a>
 </div>
 </section>
 <div id="sec.phraseID">
@@ -5728,7 +5728,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.39-2">
 <pre>
 phrase-id                =  "Phrase-ID" ":" 1*VCHAR CRLF
-            </pre><a href="#section-9.4.39-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.39-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -5743,7 +5743,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.40-2">
 <pre>
 phrase-nl                =  "Phrase-NL" ":" 1*UTFCHAR CRLF
-            </pre><a href="#section-9.4.40-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.40-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.41">
@@ -5769,7 +5769,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.41-2">
 <pre>
 weight                   =  "Weight" ":" FLOAT CRLF
-            </pre><a href="#section-9.4.41-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.41-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.42">
@@ -5789,7 +5789,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.42-2">
 <pre>
 save-best-waveform  =  "Save-Best-Waveform" ":" BOOLEAN CRLF
-            </pre><a href="#section-9.4.42-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.42-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.43">
@@ -5803,7 +5803,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.43-2">
 <pre>
 new-phrase-id            =  "New-Phrase-ID" ":" 1*VCHAR CRLF
-            </pre><a href="#section-9.4.43-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.43-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.44">
@@ -5818,7 +5818,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.44-2">
 <pre>
 confusable-phrases-uri   =  "Confusable-Phrases-URI" ":" uri CRLF
-            </pre><a href="#section-9.4.44-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.44-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.45">
@@ -5830,9 +5830,9 @@
           phrase to the personal grammar.<a href="#section-9.4.45-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.4.45-2">
 <pre>
-abort-phrase-enrollment  =  "Abort-Phrase-Enrollment" ":" 
+abort-phrase-enrollment  =  "Abort-Phrase-Enrollment" ":"
                             BOOLEAN CRLF
-            </pre><a href="#section-9.4.45-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.45-2" class="pilcrow">¶</a>
 </div>
 </section>
 </section>
@@ -5936,8 +5936,8 @@
             &lt;one-of&gt;
                   &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;
                   &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
-            &lt;/one-of&gt; 
-      &lt;/rule&gt; 
+            &lt;/one-of&gt;
+      &lt;/rule&gt;
 
 &lt;!-- single language attachment to a rule expansion --&gt;
       &lt;rule id="request"&gt;
@@ -6012,8 +6012,8 @@
             &lt;one-of&gt;
                   &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;
                   &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
-            &lt;/one-of&gt; 
-      &lt;/rule&gt; 
+            &lt;/one-of&gt;
+      &lt;/rule&gt;
 
 &lt;!-- single language attachment to a rule expansion --&gt;
       &lt;rule id="request"&gt;
@@ -6159,7 +6159,7 @@
             uncertainty in speech recognition or natural language
             understanding. There are at least two reasons for providing
             multiple interpretations:<a href="#section-9.6.1.1-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.6.1.1-2">
+<ol start="1" type="1" class="normal type-1" id="section-9.6.1.1-2">
               <li id="section-9.6.1.1-2.1">The client application might have additional information,
                 for example, information from a database, that would allow it
                 to select a preferred interpretation from among the possible
@@ -6181,7 +6181,7 @@
 <p id="section-9.6.1.2-1">These are elements and attributes representing additional
             information about the interpretation, over and above the
             interpretation itself. Side information includes:<a href="#section-9.6.1.2-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.6.1.2-2">
+<ol start="1" type="1" class="normal type-1" id="section-9.6.1.2-2">
               <li id="section-9.6.1.2-2.1">Whether an interpretation was achieved (the &lt;nomatch&gt;
                 element) and the system's confidence in an interpretation (the
                 "confidence" attribute of &lt;interpretation&gt;).<a href="#section-9.6.1.2-2.1" class="pilcrow">¶</a>
@@ -6213,7 +6213,7 @@
 <a href="#section-9.6.2" class="section-number selfRef">9.6.2. </a><a href="#name-overview-of-recognizer-resu" class="section-name selfRef">Overview of Recognizer Result Elements and Their Relationships</a>
           </h4>
 <p id="section-9.6.2-1">The recognizer elements in NLSML fall into two categories:<a href="#section-9.6.2-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.6.2-2">
+<ol start="1" type="1" class="normal type-1" id="section-9.6.2-2">
             <li id="section-9.6.2-2.1">description of the input that was processed, and<a href="#section-9.6.2-2.1" class="pilcrow">¶</a>
 </li>
 <li id="section-9.6.2-2.2">description of the meaning which was extracted from the
@@ -6267,7 +6267,7 @@
             result, it can be overridden for individual interpretations at the
             &lt;interpretation&gt; level.<a href="#section-9.6.3.1-1" class="pilcrow">¶</a></p>
 <p id="section-9.6.3.1-2">Attributes:<a href="#section-9.6.3.1-2" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.6.3.1-3">
+<ol start="1" type="1" class="normal type-1" id="section-9.6.3.1-3">
               <li id="section-9.6.3.1-3.1">grammar: The grammar or recognition rule matched by this
                 result. The format of the grammar attribute will match the
                 rule reference semantics defined in the grammar specification.
@@ -6288,7 +6288,7 @@
 <pre>
 &lt;?xml version="1.0"?&gt;
 &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
-        grammar="http://www.example.com/grammar"&gt; 
+        grammar="http://www.example.com/grammar"&gt;
   &lt;interpretation&gt;
    ....
   &lt;/interpretation&gt;
@@ -6303,7 +6303,7 @@
 <p id="section-9.6.3.2-1">An &lt;interpretation&gt; element contains a single semantic
             interpretation.<a href="#section-9.6.3.2-1" class="pilcrow">¶</a></p>
 <p id="section-9.6.3.2-2">Attributes:<a href="#section-9.6.3.2-2" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.6.3.2-3">
+<ol start="1" type="1" class="normal type-1" id="section-9.6.3.2-3">
               <li id="section-9.6.3.2-3.1">confidence: A float value from 0.0-1.0 indicating the
                 semantic analyzer's confidence in this interpretation. A value
                 of 1.0 indicates maximum confidence. The values are
@@ -6359,7 +6359,7 @@
             objects created, nor any semantic translation, the instance value
             is the same as the input value.<a href="#section-9.6.3.3-1" class="pilcrow">¶</a></p>
 <p id="section-9.6.3.3-2">Attributes:<a href="#section-9.6.3.3-2" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.6.3.3-3">
+<ol start="1" type="1" class="normal type-1" id="section-9.6.3.3-3">
               <li id="section-9.6.3.3-3.1">confidence: Each element of the instance MAY have a
                 confidence attribute, defined in the NLSML namespace. The
                 confidence attribute contains a float value in the range from
@@ -6380,7 +6380,7 @@
       &lt;state&gt;CA&lt;/state&gt;
       &lt;zip&gt;90952&lt;/zip&gt;
   &lt;/nameAddress&gt;
-&lt;/instance&gt; 
+&lt;/instance&gt;
 &lt;input&gt;
   My address is 123 Maple Street,
   Mill Valley, California, 90952
@@ -6393,7 +6393,7 @@
 <pre>
 &lt;instance&gt;
     I would like to buy a coca-cola
-&lt;/instance&gt; 
+&lt;/instance&gt;
 &lt;input&gt;
   I would like to buy a coke
 &lt;/input&gt;
@@ -6418,7 +6418,7 @@
             spoken utterance, in <span><a href="#ISO.8601.1988" class="xref">ISO 8601
             format</a> [<a href="#ISO.8601.1988" class="xref">ISO.8601.1988</a>]</span>.<a href="#section-9.6.3.4-1" class="pilcrow">¶</a></p>
 <p id="section-9.6.3.4-2">Attributes:<a href="#section-9.6.3.4-2" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.6.3.4-3">
+<ol start="1" type="1" class="normal type-1" id="section-9.6.3.4-3">
               <li id="section-9.6.3.4-3.1">timestamp-start: The time at which the input began.
                 (optional)<a href="#section-9.6.3.4-3.1" class="pilcrow">¶</a>
 </li>
@@ -6441,7 +6441,7 @@
 <p id="section-9.6.3.4-5">When there is no time zone designator, ISO 8601 time
             representations default to local time.<a href="#section-9.6.3.4-5" class="pilcrow">¶</a></p>
 <p id="section-9.6.3.4-6">There are three possible formats for the &lt;input&gt; element.<a href="#section-9.6.3.4-6" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.6.3.4-7">
+<ol start="1" type="1" class="normal type-1" id="section-9.6.3.4-7">
               <li id="section-9.6.3.4-7.1">
                 <p id="section-9.6.3.4-7.1.1">The &lt;input&gt; element can contain simple text:<a href="#section-9.6.3.4-7.1.1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.6.3.4-7.1.2">
@@ -6465,12 +6465,12 @@
                 for individual words and word-level confidences.<a href="#section-9.6.3.4-7.2.1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.6.3.4-7.2.2">
 <pre>
-    &lt;input&gt; 
+    &lt;input&gt;
          &lt;input mode="speech" confidence="0.5"
-             timestamp-start="2000-04-03T0:00:00" 
+             timestamp-start="2000-04-03T0:00:00"
              timestamp-end="2000-04-03T0:00:00.2"&gt;fried&lt;/input&gt;
          &lt;input mode="speech" confidence="1.0"
-             timestamp-start="2000-04-03T0:00:00.25" 
+             timestamp-start="2000-04-03T0:00:00.25"
              timestamp-end="2000-04-03T0:00:00.6"&gt;onions&lt;/input&gt;
     &lt;/input&gt;
 </pre><a href="#section-9.6.3.4-7.2.2" class="pilcrow">¶</a>
@@ -6497,14 +6497,14 @@
 <pre>
 &lt;interpretation&gt;
    &lt;instance/&gt;
-      &lt;input confidence="0.1"&gt; 
+      &lt;input confidence="0.1"&gt;
          &lt;nomatch/&gt;
       &lt;/input&gt;
 &lt;/interpretation&gt;
-&lt;interpretation&gt;  
-   &lt;instance/&gt;       
-   &lt;input mode="speech" confidence="0.1"&gt;           
-     &lt;nomatch&gt;I want to go to New York&lt;/nomatch&gt;       
+&lt;interpretation&gt;
+   &lt;instance/&gt;
+   &lt;input mode="speech" confidence="0.1"&gt;
+     &lt;nomatch&gt;I want to go to New York&lt;/nomatch&gt;
    &lt;/input&gt;
 &lt;/interpretation&gt;
 </pre><a href="#section-9.6.3.5-2" class="pilcrow">¶</a>
@@ -6533,7 +6533,7 @@
             in DTMF modality". For example, to represent garbled speech
             combined with DTMF "1 2 3 4", the markup would be:<a href="#section-9.6.3.6-3" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.6.3.6-4">
-<pre>&lt;input&gt; 
+<pre>&lt;input&gt;
    &lt;input mode="speech"&gt;&lt;nomatch/&gt;&lt;/input&gt;
    &lt;input mode="dtmf"&gt;1 2 3 4&lt;/input&gt;
 &lt;/input&gt;</pre><a href="#section-9.6.3.6-4" class="pilcrow">¶</a>
@@ -6555,7 +6555,7 @@
         &lt;enrollment‑result&gt; element under &lt;result&gt;. The elements
         are described below and have the schema defined in <a href="#sec.enrollmentResultsSchema" class="xref">Section 16.2</a>. The following elements
         are defined:<a href="#section-9.7-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.7-2">
+<ol start="1" type="1" class="normal type-1" id="section-9.7-2">
           <li id="section-9.7-2.1">num-clashes<a href="#section-9.7-2.1" class="pilcrow">¶</a>
 </li>
 <li id="section-9.7-2.2">num-good-repetitions<a href="#section-9.7-2.2" class="pilcrow">¶</a>
@@ -6686,8 +6686,8 @@
             &lt;one-of&gt;
                   &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;
                   &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
-            &lt;/one-of&gt; 
-      &lt;/rule&gt; 
+            &lt;/one-of&gt;
+      &lt;/rule&gt;
 
 &lt;!-- single language attachment to a rule expansion --&gt;
       &lt;rule id="request"&gt;
@@ -6737,8 +6737,8 @@
                   "http://www.w3.org/TR/speech-grammar/grammar.dtd"&gt;
 
 &lt;grammar xmlns="http://www.w3.org/2001/06/grammar" xml:lang="en"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-       xsi:schemaLocation="http://www.w3.org/2001/06/grammar 
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.w3.org/2001/06/grammar
            http://www.w3.org/TR/speech-grammar/grammar.xsd"
            version="1.0" mode="voice" root="basicCmd"&gt;
 
@@ -6748,7 +6748,7 @@
   &lt;example&gt; please move the window &lt;/example&gt;
   &lt;example&gt; open a file &lt;/example&gt;
 
-  &lt;ruleref 
+  &lt;ruleref
     uri="http://grammar.example.com/politeness.grxml#startPolite"/&gt;
 
   &lt;ruleref uri="#command"/&gt;
@@ -6806,7 +6806,7 @@
 
 S-&gt;C:MRCP/2.0 ... START-OF-INPUT 543260 IN-PROGRESS
 Channel-Identifier:32AECB23433801@speechrecog
-        
+
 S-&gt;C:MRCP/2.0 ... RECOGNITION-COMPLETE 543260 COMPLETE
 Channel-Identifier:32AECB23433801@speechrecog
 Completion-Cause:000 success
@@ -6864,7 +6864,7 @@
         useful in applications like VoiceXML browsers to order grammars
         specified at the dialog, document, and root level of a VoiceXML
         application.<a href="#section-9.9-3" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.9-4">
+<ol start="1" type="1" class="normal type-1" id="section-9.9-4">
           <li id="section-9.9-4.1">The grammar MAY be placed directly in the message body as typed
             content. If more than one grammar is included in the body, the
             order of inclusion controls the corresponding precedence for the
@@ -6961,7 +6961,7 @@
         the Speech-Complete-Timer is started. If it matches partially with one
         or more of the active grammars, with more speech needed before a full
         match is achieved, then the Speech-Incomplete-Timer is started.<a href="#section-9.9-15" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.9-16">
+<ol start="1" type="1" class="normal type-1" id="section-9.9-16">
           <li id="section-9.9-16.1">When the No-Input-Timer expires, the recognizer MUST complete
         with a Completion-Cause code of "no-input-timeout".<a href="#section-9.9-16.1" class="pilcrow">¶</a>
 </li>
@@ -7006,7 +7006,7 @@
 <p id="section-9.9-17">For recognition in hotword mode:<a href="#section-9.9-17" class="pilcrow">¶</a></p>
 <p id="section-9.9-18">Note that for recognition in hotword mode the START-OF-INPUT event is
         not generated when speech or a DTMF digit is detected.<a href="#section-9.9-18" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.9-19">
+<ol start="1" type="1" class="normal type-1" id="section-9.9-19">
           <li id="section-9.9-19.1">When the No-Input-Timer expires, the recognizer MUST complete
         with a Completion-Cause code of "no-input-timeout".<a href="#section-9.9-19.1" class="pilcrow">¶</a>
 </li>
@@ -7043,7 +7043,7 @@
 &lt;?xml version="1.0"?&gt;
 
 &lt;!-- the default grammar language is US English --&gt;
-&lt;grammar xmlns="http://www.w3.org/2001/06/grammar" 
+&lt;grammar xmlns="http://www.w3.org/2001/06/grammar"
          xml:lang="en-US" version="1.0" root="request"&gt;
 
 &lt;!-- single language attachment to tokens --&gt;
@@ -7051,8 +7051,8 @@
             &lt;one-of&gt;
                   &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;
                   &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
-            &lt;/one-of&gt; 
-      &lt;/rule&gt; 
+            &lt;/one-of&gt;
+      &lt;/rule&gt;
 
 &lt;!-- single language attachment to a rule expansion --&gt;
       &lt;rule id="request"&gt;
@@ -7070,7 +7070,7 @@
 
 S-&gt;C:MRCP/2.0 ... START-OF-INPUT 543257 IN-PROGRESS
 Channel-Identifier:32AECB23433801@speechrecog
-        
+
 S-&gt;C:MRCP/2.0 ... RECOGNITION-COMPLETE 543257 COMPLETE
 Channel-Identifier:32AECB23433801@speechrecog
 Completion-Cause:000 success
@@ -7100,14 +7100,14 @@
 occur in normal usage.<a href="#section-9.9-22" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.9-23">
 <pre>
-C-&gt;S:   MRCP/2.0 ... RECOGNIZE 543257 
-        Channel-Identifier:32AECB23433801@speechrecog 
-        Confidence-Threshold:0.9 
+C-&gt;S:   MRCP/2.0 ... RECOGNIZE 543257
+        Channel-Identifier:32AECB23433801@speechrecog
+        Confidence-Threshold:0.9
         Fetch-Timeout:20
-        Content-Type:application/srgs+xml 
+        Content-Type:application/srgs+xml
         Content-Length:...
-        
-        &lt;?xml version="1.0"? Version="1.0" mode="voice" 
+
+        &lt;?xml version="1.0"? Version="1.0" mode="voice"
               root="Basic md"&gt;
          &lt;rule id="rule_list" scope="public"&gt;
              &lt;one-of&gt;
@@ -7151,7 +7151,7 @@
         Content-Type:application/srgs+xml
         Content-ID:&lt;request1@form-level.store&gt;
         Content-Length:...
-        
+
         &lt;?xml version="1.0"?&gt;
 
         &lt;!-- the default grammar language is US English --&gt;
@@ -7163,8 +7163,8 @@
                 &lt;one-of&gt;
                       &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;
                       &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
-                &lt;/one-of&gt; 
-            &lt;/rule&gt; 
+                &lt;/one-of&gt;
+            &lt;/rule&gt;
 
         &lt;!-- single language attachment to a rule expansion --&gt;
             &lt;rule id="request"&gt;
@@ -7209,13 +7209,13 @@
 C-&gt;S:   MRCP/2.0 ... GET-RESULT 543257
         Channel-Identifier:32AECB23433801@speechrecog
         Confidence-Threshold:0.9
-        
+
 
 S-&gt;C:   MRCP/2.0 ... 543257 200 COMPLETE
         Channel-Identifier:32AECB23433801@speechrecog
         Content-Type:application/nlsml+xml
         Content-Length:...
-        
+
         &lt;?xml version="1.0"?&gt;
         &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                 xmlns:ex="http://www.example.com/example"
@@ -7297,7 +7297,7 @@
         Content-Type:application/srgs+xml
         Content-ID:&lt;request1@form-level.store&gt;
         Content-Length:...
-        
+
         &lt;?xml version="1.0"?&gt;
 
         &lt;!-- the default grammar language is US English --&gt;
@@ -7309,8 +7309,8 @@
                    &lt;one-of&gt;
                        &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;
                        &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
-                   &lt;/one-of&gt; 
-              &lt;/rule&gt; 
+                   &lt;/one-of&gt;
+              &lt;/rule&gt;
 
         &lt;!-- single language attachment to a rule expansion --&gt;
               &lt;rule id="request"&gt;
@@ -7327,7 +7327,7 @@
 
 S-&gt;C:   MRCP/2.0 ... START-OF-INPUT 543257 IN-PROGRESS
         Channel-Identifier:32AECB23433801@speechrecog
-        
+
 S-&gt;C:   MRCP/2.0 ... RECOGNITION-COMPLETE 543257 COMPLETE
         Channel-Identifier:32AECB23433801@speechrecog
         Completion-Cause:000 success
@@ -7335,7 +7335,7 @@
                      size=342456;duration=25435
         Content-Type:application/nlsml+xml
         Content-Length:...
-        
+
         &lt;?xml version="1.0"?&gt;
         &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                 xmlns:ex="http://www.example.com/example"
@@ -7360,22 +7360,22 @@
         Completion-Cause:000 success
         Content-Type:application/nlsml+xml
         Content-Length:...
-        
+
         &lt;?xml version= "1.0"?&gt;
         &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                 grammar="Personal-Grammar-URI"&gt;
             &lt;enrollment-result&gt;
                 &lt;num-clashes&gt; 2 &lt;/num-clashes&gt;
                 &lt;num-good-repetitions&gt; 1 &lt;/num-good-repetitions&gt;
-                &lt;num-repetitions-still-needed&gt; 
-                   1 
+                &lt;num-repetitions-still-needed&gt;
+                   1
                 &lt;/num-repetitions-still-needed&gt;
                 &lt;consistency-status&gt; consistent &lt;/consistency-status&gt;
-                &lt;clash-phrase-ids&gt; 
-                    &lt;item&gt; Jeff &lt;/item&gt; &lt;item&gt; Andre &lt;/item&gt; 
+                &lt;clash-phrase-ids&gt;
+                    &lt;item&gt; Jeff &lt;/item&gt; &lt;item&gt; Andre &lt;/item&gt;
                 &lt;/clash-phrase-ids&gt;
                 &lt;transcriptions&gt;
-                     &lt;item&gt; m ay b r ow k er &lt;/item&gt; 
+                     &lt;item&gt; m ay b r ow k er &lt;/item&gt;
                      &lt;item&gt; m ax r aa k ah &lt;/item&gt;
                 &lt;/transcriptions&gt;
                 &lt;confusable-phrases&gt;
@@ -7483,7 +7483,7 @@
 <pre>
 C-&gt;S:   MRCP/2.0 ... END-PHRASE-ENROLLMENT 543262
         Channel-Identifier:32AECB23433801@speechrecog
-    
+
 
 S-&gt;C:   MRCP/2.0 ... 543262 200 COMPLETE
         Channel-Identifier:32AECB23433801@speechrecog
@@ -7503,7 +7503,7 @@
         effect.<a href="#section-9.18-2" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.18-3">
 <pre>
-C-&gt;S:   MRCP/2.0 ... MODIFY-PHRASE 543265    
+C-&gt;S:   MRCP/2.0 ... MODIFY-PHRASE 543265
         Channel-Identifier:32AECB23433801@speechrecog
         Personal-Grammar-URI:&lt;personal grammar uri&gt;
         Phrase-Id:&lt;phrase id&gt;
@@ -7511,7 +7511,7 @@
         Phrase-NL:&lt;NL phrase&gt;
         Weight:1
 
-S-&gt;C:   MRCP/2.0 ... 543265 200 COMPLETE 
+S-&gt;C:   MRCP/2.0 ... 543265 200 COMPLETE
         Channel-Identifier:32AECB23433801@speechrecog</pre><a href="#section-9.18-3" class="pilcrow">¶</a>
 </div>
 </section>
@@ -7557,56 +7557,56 @@
 <div class="artwork art-text alignLeft" id="section-9.20-4">
 <pre>
 C-&gt;S:   MRCP/2.0 ... INTERPRET 543266
-        Channel-Identifier:32AECB23433801@speechrecog 
-        Interpret-Text:may I speak to Andre Roy 
-        Content-Type:application/srgs+xml  
-        Content-ID:&lt;request1@form-level.store&gt;  
+        Channel-Identifier:32AECB23433801@speechrecog
+        Interpret-Text:may I speak to Andre Roy
+        Content-Type:application/srgs+xml
+        Content-ID:&lt;request1@form-level.store&gt;
         Content-Length:...
-        
-        &lt;?xml version="1.0"?&gt;  
-        &lt;!-- the default grammar language is US English --&gt;  
+
+        &lt;?xml version="1.0"?&gt;
+        &lt;!-- the default grammar language is US English --&gt;
         &lt;grammar xmlns="http://www.w3.org/2001/06/grammar"
-                 xml:lang="en-US" version="1.0" root="request"&gt;  
-        &lt;!-- single language attachment to tokens --&gt;  
-            &lt;rule id="yes"&gt;  
-                &lt;one-of&gt;  
-                    &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;  
-                    &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;  
-                &lt;/one-of&gt;   
-            &lt;/rule&gt;   
-        
-        &lt;!-- single language attachment to a rule expansion --&gt;  
-            &lt;rule id="request"&gt;  
-                may I speak to  
-                &lt;one-of xml:lang="fr-CA"&gt;  
-                    &lt;item&gt;Michel Tremblay&lt;/item&gt;  
-                    &lt;item&gt;Andre Roy&lt;/item&gt;  
-                &lt;/one-of&gt;  
-            &lt;/rule&gt;  
-        &lt;/grammar&gt;  
-              
+                 xml:lang="en-US" version="1.0" root="request"&gt;
+        &lt;!-- single language attachment to tokens --&gt;
+            &lt;rule id="yes"&gt;
+                &lt;one-of&gt;
+                    &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;
+                    &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
+                &lt;/one-of&gt;
+            &lt;/rule&gt;
+
+        &lt;!-- single language attachment to a rule expansion --&gt;
+            &lt;rule id="request"&gt;
+                may I speak to
+                &lt;one-of xml:lang="fr-CA"&gt;
+                    &lt;item&gt;Michel Tremblay&lt;/item&gt;
+                    &lt;item&gt;Andre Roy&lt;/item&gt;
+                &lt;/one-of&gt;
+            &lt;/rule&gt;
+        &lt;/grammar&gt;
+
 S-&gt;C:   MRCP/2.0 ... 543266 200 IN-PROGRESS
         Channel-Identifier:32AECB23433801@speechrecog
-                   
+
 S-&gt;C:   MRCP/2.0 ... INTERPRETATION-COMPLETE 543266 200 COMPLETE
         Channel-Identifier:32AECB23433801@speechrecog
-        Completion-Cause:000 success  
-        Content-Type:application/nlsml+xml  
+        Completion-Cause:000 success
+        Content-Type:application/nlsml+xml
         Content-Length:...
-        
-        &lt;?xml version="1.0"?&gt;  
+
+        &lt;?xml version="1.0"?&gt;
         &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                 xmlns:ex="http://www.example.com/example"
-                grammar="session:request1@form-level.store"&gt;  
-            &lt;interpretation&gt;  
-                &lt;instance name="Person"&gt;  
-                    &lt;ex:Person&gt;  
-                        &lt;ex:Name&gt; Andre Roy &lt;/ex:Name&gt;  
-                    &lt;/ex:Person&gt;  
-                &lt;/instance&gt;  
-                &lt;input&gt;   may I speak to Andre Roy &lt;/input&gt;  
-            &lt;/interpretation&gt;  
-        &lt;/result&gt; 
+                grammar="session:request1@form-level.store"&gt;
+            &lt;interpretation&gt;
+                &lt;instance name="Person"&gt;
+                    &lt;ex:Person&gt;
+                        &lt;ex:Name&gt; Andre Roy &lt;/ex:Name&gt;
+                    &lt;/ex:Person&gt;
+                &lt;/instance&gt;
+                &lt;input&gt;   may I speak to Andre Roy &lt;/input&gt;
+            &lt;/interpretation&gt;
+        &lt;/result&gt;
 </pre><a href="#section-9.20-4" class="pilcrow">¶</a>
 </div>
 </section>
@@ -7625,55 +7625,55 @@
 <div class="artwork art-text alignLeft" id="section-9.21-3">
 <pre>
 C-&gt;S:    MRCP/2.0 ... INTERPRET 543266
-        Channel-Identifier:32AECB23433801@speechrecog 
-        Interpret-Text:may I speak to Andre Roy 
-        Content-Type:application/srgs+xml  
-        Content-ID:&lt;request1@form-level.store&gt;  
+        Channel-Identifier:32AECB23433801@speechrecog
+        Interpret-Text:may I speak to Andre Roy
+        Content-Type:application/srgs+xml
+        Content-ID:&lt;request1@form-level.store&gt;
         Content-Length:...
-        
-        &lt;?xml version="1.0"?&gt;  
-        &lt;!-- the default grammar language is US English --&gt;  
+
+        &lt;?xml version="1.0"?&gt;
+        &lt;!-- the default grammar language is US English --&gt;
         &lt;grammar xmlns="http://www.w3.org/2001/06/grammar"
-                 xml:lang="en-US" version="1.0" root="request"&gt;  
-        &lt;!-- single language attachment to tokens --&gt;  
-            &lt;rule id="yes"&gt;  
-                &lt;one-of&gt;  
+                 xml:lang="en-US" version="1.0" root="request"&gt;
+        &lt;!-- single language attachment to tokens --&gt;
+            &lt;rule id="yes"&gt;
+                &lt;one-of&gt;
                     &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;
                     &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
                 &lt;/one-of&gt;
             &lt;/rule&gt;
-        
-        &lt;!-- single language attachment to a rule expansion --&gt;  
-            &lt;rule id="request"&gt;  
-                may I speak to  
-                &lt;one-of xml:lang="fr-CA"&gt;  
-                    &lt;item&gt;Michel Tremblay&lt;/item&gt;  
-                    &lt;item&gt;Andre Roy&lt;/item&gt;  
-                &lt;/one-of&gt;  
-            &lt;/rule&gt;      
-        &lt;/grammar&gt;  
-              
+
+        &lt;!-- single language attachment to a rule expansion --&gt;
+            &lt;rule id="request"&gt;
+                may I speak to
+                &lt;one-of xml:lang="fr-CA"&gt;
+                    &lt;item&gt;Michel Tremblay&lt;/item&gt;
+                    &lt;item&gt;Andre Roy&lt;/item&gt;
+                &lt;/one-of&gt;
+            &lt;/rule&gt;
+        &lt;/grammar&gt;
+
 S-&gt;C:    MRCP/2.0 ... 543266 200 IN-PROGRESS
         Channel-Identifier:32AECB23433801@speechrecog
-                   
+
 S-&gt;C:    MRCP/2.0 ... INTERPRETATION-COMPLETE 543266 200 COMPLETE
         Channel-Identifier:32AECB23433801@speechrecog
-        Completion-Cause:000 success  
-        Content-Type:application/nlsml+xml  
+        Completion-Cause:000 success
+        Content-Type:application/nlsml+xml
         Content-Length:...
-        
-        &lt;?xml version="1.0"?&gt;  
+
+        &lt;?xml version="1.0"?&gt;
         &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                 xmlns:ex="http://www.example.com/example"
-                grammar="session:request1@form-level.store"&gt;  
-            &lt;interpretation&gt;  
-                &lt;instance name="Person"&gt;  
-                    &lt;ex:Person&gt;  
-                        &lt;ex:Name&gt; Andre Roy &lt;/ex:Name&gt;  
-                    &lt;/ex:Person&gt;  
-                &lt;/instance&gt;  
-                &lt;input&gt;   may I speak to Andre Roy &lt;/input&gt;  
-            &lt;/interpretation&gt;  
+                grammar="session:request1@form-level.store"&gt;
+            &lt;interpretation&gt;
+                &lt;instance name="Person"&gt;
+                    &lt;ex:Person&gt;
+                        &lt;ex:Name&gt; Andre Roy &lt;/ex:Name&gt;
+                    &lt;/ex:Person&gt;
+                &lt;/instance&gt;
+                &lt;input&gt;   may I speak to Andre Roy &lt;/input&gt;
+            &lt;/interpretation&gt;
         &lt;/result&gt;
 </pre><a href="#section-9.21-3" class="pilcrow">¶</a>
 </div>
@@ -7696,7 +7696,7 @@
       </h2>
 <p id="section-10-1">This resource captures received audio and video and stores it as
       content pointed to by a URI. The main usages of recorders are<a href="#section-10-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-10-2">
+<ol start="1" type="1" class="normal type-1" id="section-10-2">
         <li id="section-10-2.1">to capture speech audio that may be submitted for recognition at
           a later time, and<a href="#section-10-2.1" class="pilcrow">¶</a>
 </li>
@@ -7756,7 +7756,7 @@
 recorder-method      =  "RECORD"
                      /  "STOP"
                      /  "START-INPUT-TIMERS"
-                    </pre><a href="#section-10.2-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.2-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.3">
@@ -7768,7 +7768,7 @@
 <pre>
 recorder-event       =  "START-OF-INPUT"
                      /  "RECORD-COMPLETE"
-                    </pre><a href="#section-10.3-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.3-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4">
@@ -7781,7 +7781,7 @@
         associated with.<a href="#section-10.4-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-10.4-2">
 <pre>
-recorder-header      =  sensitivity-level        
+recorder-header      =  sensitivity-level
                      /  no-input-timeout
                      /  completion-cause
                      /  completion-reason
@@ -7796,7 +7796,7 @@
                      /  ver-buffer-utterance
                      /  start-input-timers
                      /  new-audio-channel
-                    </pre><a href="#section-10.4-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4-2" class="pilcrow">¶</a>
 </div>
 <section id="section-10.4.1">
           <h4 id="name-sensitivity-level-2">
@@ -7812,7 +7812,7 @@
 <div class="artwork art-text alignLeft" id="section-10.4.1-2">
 <pre>
 sensitivity-level    =     "Sensitivity-Level" ":" FLOAT CRLF
-            </pre><a href="#section-10.4.1-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.1-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.2">
@@ -7830,7 +7830,7 @@
 <div class="artwork art-text alignLeft" id="section-10.4.2-2">
 <pre>
 no-input-timeout    =     "No-Input-Timeout" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-10.4.2-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.2-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.3">
@@ -7851,7 +7851,7 @@
                             cause-name CRLF
 cause-code               =  3DIGIT
 cause-name               =  *VCHAR
-            </pre><a href="#section-10.4.3-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.3-2" class="pilcrow">¶</a>
 </div>
 <table class="center" id="table-7">
             <caption><a href="#table-7" class="selfRef">Table 7</a></caption>
@@ -7908,7 +7908,7 @@
 <pre>
 completion-reason        =  "Completion-Reason" ":"
                             quoted-string CRLF
-                        </pre><a href="#section-10.4.4-3" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.4-3" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.5">
@@ -7921,7 +7921,7 @@
 <div class="artwork art-text alignLeft" id="section-10.4.5-2">
 <pre>
 failed-uri               =  "Failed-URI" ":" absoluteURI CRLF
-            </pre><a href="#section-10.4.5-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.5-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.6">
@@ -7937,9 +7937,9 @@
           response code.<a href="#section-10.4.6-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-10.4.6-2">
 <pre>
-failed-uri-cause         =  "Failed-URI-Cause" ":" 1*UTFCHAR 
+failed-uri-cause         =  "Failed-URI-Cause" ":" 1*UTFCHAR
                             CRLF
-            </pre><a href="#section-10.4.6-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.6-2" class="pilcrow">¶</a>
 </div>
 </section>
 <div id="sec.recordURI">
@@ -7966,10 +7966,10 @@
           implementations already exist that support other schemes.<a href="#section-10.4.7-3" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-10.4.7-4">
 <pre>
-record-uri               =  "Record-URI" ":" ["&lt;" uri "&gt;" 
-                            ";" "size" "=" 1*19DIGIT 
+record-uri               =  "Record-URI" ":" ["&lt;" uri "&gt;"
+                            ";" "size" "=" 1*19DIGIT
                             ";" "duration" "=" 1*19DIGIT] CRLF
-            </pre><a href="#section-10.4.7-4" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.7-4" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -7981,9 +7981,9 @@
           to the server the media type of the captured audio or video.<a href="#section-10.4.8-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-10.4.8-2">
 <pre>
-media-type               =  "Media-Type" ":" media-type-value 
+media-type               =  "Media-Type" ":" media-type-value
                             CRLF
-            </pre><a href="#section-10.4.8-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.8-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.9">
@@ -8006,7 +8006,7 @@
 <div class="artwork art-text alignLeft" id="section-10.4.9-2">
 <pre>
 max-time                 =  "Max-Time" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-10.4.9-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.9-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.10">
@@ -8020,7 +8020,7 @@
 <div class="artwork art-text alignLeft" id="section-10.4.10-2">
 <pre>
 trim-length                 =  "Trim-Length" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-10.4.10-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.10-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.11">
@@ -8039,7 +8039,7 @@
 <div class="artwork art-text alignLeft" id="section-10.4.11-2">
 <pre>
 final-silence            =  "Final-Silence" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-10.4.11-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.11-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.12">
@@ -8055,7 +8055,7 @@
 <div class="artwork art-text alignLeft" id="section-10.4.12-2">
 <pre>
 capture-on-speech        =  "Capture-On-Speech " ":" BOOLEAN CRLF
-            </pre><a href="#section-10.4.12-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.12-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.13">
@@ -8091,7 +8091,7 @@
 <pre>
 start-input-timers       =  "Start-Input-Timers" ":"
                             BOOLEAN CRLF
-                        </pre><a href="#section-10.4.14-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.14-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.15">
@@ -8148,20 +8148,20 @@
 <pre>
 C-&gt;S:  MRCP/2.0 ... RECORD 543257
        Channel-Identifier:32AECB23433802@recorder
-       Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;  
+       Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;
        Media-Type:audio/wav
        Capture-On-Speech:true
        Final-Silence:300
        Max-Time:6000
-           
-S-&gt;C:  MRCP/2.0 ... 543257 200 IN-PROGRESS 
-       Channel-Identifier:32AECB23433802@recorder           
-
-S-&gt;C:  MRCP/2.0 ... START-OF-INPUT 543257 IN-PROGRESS 
-       Channel-Identifier:32AECB23433802@recorder           
-            
-S-&gt;C:  MRCP/2.0 ... RECORD-COMPLETE 543257 COMPLETE 
-       Channel-Identifier:32AECB23433802@recorder          
+
+S-&gt;C:  MRCP/2.0 ... 543257 200 IN-PROGRESS
+       Channel-Identifier:32AECB23433802@recorder
+
+S-&gt;C:  MRCP/2.0 ... START-OF-INPUT 543257 IN-PROGRESS
+       Channel-Identifier:32AECB23433802@recorder
+
+S-&gt;C:  MRCP/2.0 ... RECORD-COMPLETE 543257 COMPLETE
+       Channel-Identifier:32AECB23433802@recorder
        Completion-Cause:000 success-silence
        Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;;
                   size=242552;duration=25645
@@ -8194,23 +8194,23 @@
 <pre>
 C-&gt;S:  MRCP/2.0 ... RECORD 543257
        Channel-Identifier:32AECB23433802@recorder
-       Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;  
+       Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;
        Capture-On-Speech:true
        Final-Silence:300
        Max-Time:6000
-           
-S-&gt;C:  MRCP/2.0 ... 543257 200 IN-PROGRESS 
-       Channel-Identifier:32AECB23433802@recorder           
-
-S-&gt;C:  MRCP/2.0 ... START-OF-INPUT 543257 IN-PROGRESS 
-       Channel-Identifier:32AECB23433802@recorder           
-            
+
+S-&gt;C:  MRCP/2.0 ... 543257 200 IN-PROGRESS
+       Channel-Identifier:32AECB23433802@recorder
+
+S-&gt;C:  MRCP/2.0 ... START-OF-INPUT 543257 IN-PROGRESS
+       Channel-Identifier:32AECB23433802@recorder
+
 C-&gt;S:  MRCP/2.0 ... STOP 543257
-       Channel-Identifier:32AECB23433802@recorder           
+       Channel-Identifier:32AECB23433802@recorder
        Trim-Length:200
-           
-S-&gt;C:  MRCP/2.0 ... 543257 200 COMPLETE 
-       Channel-Identifier:32AECB23433802@recorder           
+
+S-&gt;C:  MRCP/2.0 ... 543257 200 COMPLETE
+       Channel-Identifier:32AECB23433802@recorder
        Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;;
                   size=324253;duration=24561
        Active-Request-Id-List:543257
@@ -8235,19 +8235,19 @@
 <pre>
 C-&gt;S:  MRCP/2.0 ... RECORD 543257
        Channel-Identifier:32AECB23433802@recorder
-       Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;  
+       Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;
        Capture-On-Speech:true
        Final-Silence:300
        Max-Time:6000
-           
-S-&gt;C:  MRCP/2.0 ... 543257 200 IN-PROGRESS 
-       Channel-Identifier:32AECB23433802@recorder           
-
-S-&gt;C:  MRCP/2.0 ... START-OF-INPUT 543257 IN-PROGRESS 
-       Channel-Identifier:32AECB23433802@recorder           
-            
-S-&gt;C:  MRCP/2.0 ... RECORD-COMPLETE 543257 COMPLETE 
-       Channel-Identifier:32AECB23433802@recorder           
+
+S-&gt;C:  MRCP/2.0 ... 543257 200 IN-PROGRESS
+       Channel-Identifier:32AECB23433802@recorder
+
+S-&gt;C:  MRCP/2.0 ... START-OF-INPUT 543257 IN-PROGRESS
+       Channel-Identifier:32AECB23433802@recorder
+
+S-&gt;C:  MRCP/2.0 ... RECORD-COMPLETE 543257 COMPLETE
+       Channel-Identifier:32AECB23433802@recorder
        Completion-Cause:000 success
        Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;;
                   size=325325;duration=24652
@@ -8430,14 +8430,14 @@
    |                   |&lt;---------|              |
    |                   |                         |
    |----------|        |                         |
-   |         STOP      |                         |    
+   |         STOP      |                         |
    |&lt;---------|        |                         |
    |                   |----------|              |
    |                   |    CLEAR-BUFFER         |
    |                   |&lt;---------|              |
    |                   |                         |
    |----------|        |                         |
-   |   CLEAR-BUFFER    |                         |    
+   |   CLEAR-BUFFER    |                         |
    |&lt;---------|        |                         |
    |                   |                         |
    |                   |----------|              |
@@ -8479,7 +8479,7 @@
                          / "CLEAR-BUFFER"
                          / "START-INPUT-TIMERS"
                          / "GET-INTERMEDIATE-RESULT"
-                        </pre><a href="#section-11.2-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.2-2" class="pilcrow">¶</a>
 </div>
 <p id="section-11.2-3">These methods allow the client to control the mode and target of
         verification or identification operations within the context of a
@@ -8497,13 +8497,13 @@
         appropriate for the resource, with the header field
         Ver‑Buffer‑Utterance. Then, when the following method is called,
         verification is performed using the set of buffered audio.<a href="#section-11.2-5" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-11.2-6">
+<ol start="1" type="1" class="normal type-1" id="section-11.2-6">
           <li id="section-11.2-6.1">VERIFY-FROM-BUFFER<a href="#section-11.2-6.1" class="pilcrow">¶</a>
 </li>
 </ol>
 <p id="section-11.2-7">The following methods are used for verification of live audio
         utterances:<a href="#section-11.2-7" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-11.2-8">
+<ol start="1" type="1" class="normal type-1" id="section-11.2-8">
           <li id="section-11.2-8.1">VERIFY<a href="#section-11.2-8.1" class="pilcrow">¶</a>
 </li>
 <li id="section-11.2-8.2">START-INPUT-TIMERS<a href="#section-11.2-8.2" class="pilcrow">¶</a>
@@ -8511,7 +8511,7 @@
 </ol>
 <p id="section-11.2-9">The following methods are used for configuring the verifier
         resource and for establishing resource states:<a href="#section-11.2-9" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-11.2-10">
+<ol start="1" type="1" class="normal type-1" id="section-11.2-10">
           <li id="section-11.2-10.1">START-SESSION<a href="#section-11.2-10.1" class="pilcrow">¶</a>
 </li>
 <li id="section-11.2-10.2">END-SESSION<a href="#section-11.2-10.2" class="pilcrow">¶</a>
@@ -8529,7 +8529,7 @@
 </ol>
 <p id="section-11.2-11">The following method allows the polling of a verification in progress
         for intermediate results.<a href="#section-11.2-11" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-11.2-12">
+<ol start="1" type="1" class="normal type-1" id="section-11.2-12">
           <li id="section-11.2-12.1">GET-INTERMEDIATE-RESULT<a href="#section-11.2-12.1" class="pilcrow">¶</a>
 </li>
 </ol>
@@ -8543,7 +8543,7 @@
 <pre>
 verifier-event       =  "VERIFICATION-COMPLETE"
                      /  "START-OF-INPUT"
-                        </pre><a href="#section-11.3-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.3-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4">
@@ -8576,7 +8576,7 @@
                          /  new-audio-channel
                          /  abort-verification
                          /  start-input-timers
-          </pre><a href="#section-11.4-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4-2" class="pilcrow">¶</a>
 </div>
 <div id="sec.repositoryURI">
 <section id="section-11.4.1">
@@ -8590,7 +8590,7 @@
 <div class="artwork art-text alignLeft" id="section-11.4.1-2">
 <pre>
 repository-uri           =  "Repository-URI" ":" uri CRLF
-           </pre><a href="#section-11.4.1-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.1-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -8610,10 +8610,10 @@
           group identifier instead of a list of voiceprint identifiers.<a href="#section-11.4.2-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-11.4.2-2">
 <pre>
-voiceprint-identifier        =  "Voiceprint-Identifier" ":" 
+voiceprint-identifier        =  "Voiceprint-Identifier" ":"
                                 vid *[";" vid] CRLF
 vid                          =  1*VCHAR ["." 1*VCHAR]
-                            </pre><a href="#section-11.4.2-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.2-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.3">
@@ -8644,7 +8644,7 @@
           caller's response without any participation by the verifier
           resource.<a href="#section-11.4.3-3" class="pilcrow">¶</a></p>
 <p id="section-11.4.3-4">Once the following conditions have been met:<a href="#section-11.4.3-4" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-11.4.3-5">
+<ol start="1" type="1" class="normal type-1" id="section-11.4.3-5">
             <li id="section-11.4.3-5.1">the voiceprint identity has been successfully established through
               the Voiceprint-Identifier header fields of the START-SESSION
               method, and<a href="#section-11.4.3-5.1" class="pilcrow">¶</a>
@@ -8665,12 +8665,12 @@
           error and the mode retains its current value.<a href="#section-11.4.3-7" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-11.4.3-8">
 <pre>
-verification-mode            =  "Verification-Mode" ":" 
+verification-mode            =  "Verification-Mode" ":"
                                 verification-mode-string
 
 verification-mode-string     =  "train"
                              /  "verify"
-            </pre><a href="#section-11.4.3-8" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.3-8" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.4">
@@ -8688,7 +8688,7 @@
 <div class="artwork art-text alignLeft" id="section-11.4.4-2">
 <pre>
 adapt-model              = "Adapt-Model" ":" BOOLEAN CRLF
-            </pre><a href="#section-11.4.4-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.4-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.5">
@@ -8708,7 +8708,7 @@
 <div class="artwork art-text alignLeft" id="section-11.4.5-2">
 <pre>
 abort-model             = "Abort-Model" ":" BOOLEAN CRLF
-            </pre><a href="#section-11.4.5-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.5-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.6">
@@ -8723,9 +8723,9 @@
           this header field is implementation specific.<a href="#section-11.4.6-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-11.4.6-2">
 <pre>
-min-verification-score  = "Min-Verification-Score" ":" 
+min-verification-score  = "Min-Verification-Score" ":"
                           [ %x2D ] FLOAT CRLF
-            </pre><a href="#section-11.4.6-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.6-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.7">
@@ -8742,9 +8742,9 @@
           START-SESSION, SET-PARAMS, or GET-PARAMS.<a href="#section-11.4.7-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-11.4.7-2">
 <pre>
-num-min-verification-phrases =  "Num-Min-Verification-Phrases" ":" 
+num-min-verification-phrases =  "Num-Min-Verification-Phrases" ":"
                                 1*19DIGIT CRLF
-            </pre><a href="#section-11.4.7-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.7-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.8">
@@ -8761,9 +8761,9 @@
           START-SESSION, SET-PARAMS, or GET-PARAMS.<a href="#section-11.4.8-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-11.4.8-2">
 <pre>
-num-max-verification-phrases =  "Num-Max-Verification-Phrases" ":" 
+num-max-verification-phrases =  "Num-Max-Verification-Phrases" ":"
                                  1*19DIGIT CRLF
-            </pre><a href="#section-11.4.8-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.8-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.9">
@@ -8784,7 +8784,7 @@
 <div class="artwork art-text alignLeft" id="section-11.4.9-2">
 <pre>
 no-input-timeout         = "No-Input-Timeout" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-11.4.9-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.9-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.10">
@@ -8807,7 +8807,7 @@
 <div class="artwork art-text alignLeft" id="section-11.4.10-2">
 <pre>
 save-waveform            =  "Save-Waveform" ":" BOOLEAN CRLF
-           </pre><a href="#section-11.4.10-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.10-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.11">
@@ -8820,9 +8820,9 @@
           by the Waveform-URI header field.<a href="#section-11.4.11-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-11.4.11-2">
 <pre>
-media-type               =  "Media-Type" ":" media-type-value 
+media-type               =  "Media-Type" ":" media-type-value
                             CRLF
-            </pre><a href="#section-11.4.11-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.11-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.12">
@@ -8848,10 +8848,10 @@
           associated with the header field.<a href="#section-11.4.12-2" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-11.4.12-3">
 <pre>
-waveform-uri             =  "Waveform-URI" ":" ["&lt;" uri "&gt;" 
-                            ";" "size" "=" 1*19DIGIT 
+waveform-uri             =  "Waveform-URI" ":" ["&lt;" uri "&gt;"
+                            ";" "size" "=" 1*19DIGIT
                             ";" "duration" "=" 1*19DIGIT] CRLF
-            </pre><a href="#section-11.4.12-3" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.12-3" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.13">
@@ -8866,7 +8866,7 @@
 <div class="artwork art-text alignLeft" id="section-11.4.13-2">
 <pre>
 voiceprint-exists    =  "Voiceprint-Exists" ":" BOOLEAN CRLF
-            </pre><a href="#section-11.4.13-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.13-2" class="pilcrow">¶</a>
 </div>
 </section>
 <div id="sec.verBufferUtterance">
@@ -8885,7 +8885,7 @@
 <pre>
 ver-buffer-utterance     = "Ver-Buffer-Utterance" ":" BOOLEAN
                            CRLF
-            </pre><a href="#section-11.4.14-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.14-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -8903,7 +8903,7 @@
 <div class="artwork art-text alignLeft" id="section-11.4.15-2">
 <pre>
 input-waveform-uri           =  "Input-Waveform-URI" ":" uri CRLF
-            </pre><a href="#section-11.4.15-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.15-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.16">
@@ -8925,7 +8925,7 @@
                             cause-name CRLF
 cause-code               =  3DIGIT
 cause-name               =  *VCHAR
-            </pre><a href="#section-11.4.16-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.16-2" class="pilcrow">¶</a>
 </div>
 <table class="center" id="table-8">
             <caption><a href="#table-8" class="selfRef">Table 8</a></caption>
@@ -9024,9 +9024,9 @@
           interpret the completion reason text.<a href="#section-11.4.17-2" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-11.4.17-3">
 <pre>
-completion-reason        =  "Completion-Reason" ":" 
+completion-reason        =  "Completion-Reason" ":"
                             quoted-string CRLF
-            </pre><a href="#section-11.4.17-3" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.17-3" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.18">
@@ -9058,7 +9058,7 @@
 <div class="artwork art-text alignLeft" id="section-11.4.20-2">
 <pre>
 abort-verification   =  "Abort-Verification " ":" BOOLEAN CRLF
-            </pre><a href="#section-11.4.20-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.20-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.21">
@@ -9082,7 +9082,7 @@
 <pre>
 start-input-timers       =  "Start-Input-Timers" ":"
                             BOOLEAN CRLF
-            </pre><a href="#section-11.4.21-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.21-2" class="pilcrow">¶</a>
 </div>
 </section>
 </section>
@@ -9111,7 +9111,7 @@
           &lt;verification-result&gt; element under &lt;result&gt;. The
           elements are described below and have the schema defined in <a href="#sec.enrollmentResultsSchema" class="xref">Section 16.2</a>. The following elements
           are defined:<a href="#section-11.5.2-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-11.5.2-2">
+<ol start="1" type="1" class="normal type-1" id="section-11.5.2-2">
             <li id="section-11.5.2-2.1">&lt;voiceprint&gt;<a href="#section-11.5.2-2.1" class="pilcrow">¶</a>
 </li>
 <li id="section-11.5.2-2.2">&lt;incremental&gt;<a href="#section-11.5.2-2.2" class="pilcrow">¶</a>
@@ -9386,7 +9386,7 @@
 <p id="section-11.7-1">The END-SESSION method terminates an ongoing verification session
         and releases the verification voiceprint resources. The session may
         terminate in one of three ways:<a href="#section-11.7-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-11.7-2">
+<ol start="1" type="1" class="normal type-1" id="section-11.7-2">
           <li id="section-11.7-2.1">abort - the voiceprint adaptation or creation may be aborted so
             that the voiceprint remains unchanged (or is not created).<a href="#section-11.7-2.1" class="pilcrow">¶</a>
 </li>
@@ -9415,7 +9415,7 @@
 
 S-&gt;C:  MRCP/2.0 ... 314174 200 COMPLETE
        Channel-Identifier:32AECB23433801@speakverify
-          </pre><a href="#section-11.7-6" class="pilcrow">¶</a>
+</pre><a href="#section-11.7-6" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.8">
@@ -9451,7 +9451,7 @@
        Repository-URI:http://www.example.com/voiceprints/
        Voiceprint-Identifier:johnsmith.voiceprint
        Voiceprint-Exists:true
-          </pre><a href="#section-11.8-5" class="pilcrow">¶</a>
+</pre><a href="#section-11.8-5" class="pilcrow">¶</a>
 </div>
 <p id="section-11.8-6">The following example assumes that the URI provided in the
         Repository-URI header field is a bad URI.<a href="#section-11.8-6" class="pilcrow">¶</a></p>
@@ -9580,7 +9580,7 @@
        Completion-Cause:000 success
        Content-Type:application/nlsml+xml
        Content-Length:...
-       
+
        &lt;?xml version="1.0"?&gt;
        &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                grammar="What-Grammar-URI"&gt;
@@ -9636,7 +9636,7 @@
        Completion-Cause:000 success
        Content-Type:application/nlsml+xml
        Content-Length:...
-       
+
        &lt;?xml version="1.0"?&gt;
        &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                grammar="What-Grammar-URI"&gt;
@@ -9735,9 +9735,9 @@
 C-&gt;S:  MRCP/2.0 ... VERIFY 314177
        Channel-Identifier:32AECB23433801@speakverify
 
-S-&gt;C:  MRCP/2.0 ... 314177 200 IN-PROGRESS 
+S-&gt;C:  MRCP/2.0 ... 314177 200 IN-PROGRESS
        Channel-Identifier:32AECB23433801@speakverify
-     
+
 C-&gt;S:  MRCP/2.0 ... STOP 314178
        Channel-Identifier:32AECB23433801@speakverify
 
@@ -9781,7 +9781,7 @@
        Completion-Cause:000 success
        Content-Type:application/nlsml+xml
        Content-Length:...
-       
+
        &lt;?xml version="1.0"?&gt;
        &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                grammar="What-Grammar-URI"&gt;
@@ -9869,8 +9869,8 @@
        Channel-Identifier:32AECB23433801@speakverify
        Content-Type:application/nlsml+xml
        Content-Length:...
-       
-       &lt;?xml version="1.0"?&gt;  
+
+       &lt;?xml version="1.0"?&gt;
        &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                grammar="What-Grammar-URI"&gt;
          &lt;verification-result&gt;
@@ -9924,7 +9924,7 @@
         by SDP within the context of a SIP dialog. In order to ensure secure
         rendezvous between MRCPv2 clients and servers, the following are
         required:<a href="#section-12.1-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-12.1-2">
+<ol start="1" type="1" class="normal type-1" id="section-12.1-2">
           <li id="section-12.1-2.1">The SIP implementation in MRCPv2 clients and servers MUST
             support SIP digest authentication <span>[<a href="#RFC3261" class="xref">RFC3261</a>]</span>
             and SHOULD employ it.<a href="#section-12.1-2.1" class="pilcrow">¶</a>
@@ -10203,7 +10203,7 @@
 Proxy-Sync-Id                      Generic          [RFC6787]
 Accept-Charset                     Generic          [RFC2616]
 Content-Type                       Generic          [RFC6787]
-Content-ID                         Generic 
+Content-ID                         Generic
                           [RFC2392], [RFC2046], and [RFC5322]
 Content-Base                       Generic          [RFC6787]
 Content-Encoding                   Generic          [RFC6787]
@@ -10285,10 +10285,10 @@
 Record-URI                         Recorder         [RFC6787]
 Media-Type                         Recorder         [RFC6787]
 Max-Time                           Recorder         [RFC6787]
-Trim-Length                        Recorder         [RFC6787] 
+Trim-Length                        Recorder         [RFC6787]
 Final-Silence                      Recorder         [RFC6787]
-Capture-On-Speech                  Recorder         [RFC6787] 
-Ver-Buffer-Utterance               Recorder         [RFC6787] 
+Capture-On-Speech                  Recorder         [RFC6787]
+Ver-Buffer-Utterance               Recorder         [RFC6787]
 Start-Input-Timers                 Recorder         [RFC6787]
 New-Audio-Channel                  Recorder         [RFC6787]
 Repository-URI                     Verifier         [RFC6787]
@@ -10864,7 +10864,7 @@
        Contact:&lt;sip:sarvi@client.example.com&gt;
        Content-Type:application/sdp
        Content-Length:...
-       
+
        v=0
        o=sarvi 2614933546 2614933546 IN IP4 192.0.2.12
        s=Set up MRCPv2 control and audio
@@ -10923,23 +10923,23 @@
        Contact:&lt;sip:sarvi@client.example.com&gt;
        Content-Type:application/sdp
        Content-Length:...
-       
+
        v=0
        o=sarvi 2614933546 2614933547 IN IP4 192.0.2.12
        s=Set up MRCPv2 control and audio
        i=Add TCP channel, synthesizer and one-way audio
        c=IN IP4 192.0.2.12
        t=0 0
-       m=application 9  TCP/MRCPv2 1 
+       m=application 9  TCP/MRCPv2 1
        a=setup:active
        a=connection:new
-       a=resource:speechsynth 
+       a=resource:speechsynth
        a=cmid:1
        m=audio 49170 RTP/AVP 0 96
        a=rtpmap:0 pcmu/8000
-       a=rtpmap:96 telephone-event/8000 
-       a=fmtp:96 0-15 
-       a=recvonly 
+       a=rtpmap:96 telephone-event/8000
+       a=fmtp:96 0-15
+       a=recvonly
        a=mid:1
 
 
@@ -10954,21 +10954,21 @@
        Contact:&lt;sip:mresources@server.example.com&gt;
        Content-Type:application/sdp
        Content-Length:...
-       
+
        v=0
        o=- 3000000001 3000000002 IN IP4 192.0.2.11
        s=Set up MRCPv2 control and audio
        i=Add TCP channel, synthesizer and one-way audio
        c=IN IP4 192.0.2.11
        t=0 0
-       m=application 32416  TCP/MRCPv2 1 
+       m=application 32416  TCP/MRCPv2 1
        a=setup:passive
        a=connection:new
-       a=channel:32AECB23433801@speechsynth 
+       a=channel:32AECB23433801@speechsynth
        a=cmid:1
        m=audio 48260 RTP/AVP 0
        a=rtpmap:0 pcmu/8000
-       a=sendonly 
+       a=sendonly
        a=mid:1
 
 
@@ -11002,34 +11002,34 @@
        Contact:&lt;sip:sarvi@client.example.com&gt;
        Content-Type:application/sdp
        Content-Length:...
-       
+
        v=0
        o=sarvi 2614933546 2614933548 IN IP4 192.0.2.12
        s=Set up MRCPv2 control and audio
        i=Add recognizer and duplex the audio
        c=IN IP4 192.0.2.12
        t=0 0
-       m=application 9  TCP/MRCPv2 1 
+       m=application 9  TCP/MRCPv2 1
        a=setup:active
        a=connection:existing
-       a=resource:speechsynth 
+       a=resource:speechsynth
        a=cmid:1
        m=audio 49170 RTP/AVP 0 96
        a=rtpmap:0 pcmu/8000
-       a=rtpmap:96 telephone-event/8000 
-       a=fmtp:96 0-15 
-       a=recvonly 
+       a=rtpmap:96 telephone-event/8000
+       a=fmtp:96 0-15
+       a=recvonly
        a=mid:1
-       m=application 9  TCP/MRCPv2 1 
+       m=application 9  TCP/MRCPv2 1
        a=setup:active
        a=connection:existing
-       a=resource:speechrecog 
+       a=resource:speechrecog
        a=cmid:2
        m=audio 49180 RTP/AVP 0 96
        a=rtpmap:0 pcmu/8000
        a=rtpmap:96 telephone-event/8000
        a=fmtp:96 0-15
-       a=sendonly 
+       a=sendonly
        a=mid:2
 
 
@@ -11044,28 +11044,28 @@
        Contact:&lt;sip:mresources@server.example.com&gt;
        Content-Type:application/sdp
        Content-Length:...
-       
+
        v=0
        o=- 3000000001 3000000003 IN IP4 192.0.2.11
        s=Set up MRCPv2 control and audio
        i=Add recognizer and duplex the audio
        c=IN IP4 192.0.2.11
        t=0 0
-       m=application 32416  TCP/MRCPv2 1 
-       a=channel:32AECB23433801@speechsynth 
+       m=application 32416  TCP/MRCPv2 1
+       a=channel:32AECB23433801@speechsynth
        a=cmid:1
        m=audio 48260 RTP/AVP 0
        a=rtpmap:0 pcmu/8000
-       a=sendonly 
+       a=sendonly
        a=mid:1
-       m=application 32416  TCP/MRCPv2 1 
-       a=channel:32AECB23433801@speechrecog 
+       m=application 32416  TCP/MRCPv2 1
+       a=channel:32AECB23433801@speechrecog
        a=cmid:2
        m=audio 48260 RTP/AVP 0
        a=rtpmap:0 pcmu/8000
        a=rtpmap:96 telephone-event/8000
        a=fmtp:96 0-15
-       a=recvonly 
+       a=recvonly
        a=mid:2
 
 
@@ -11093,9 +11093,9 @@
        Prosody-volume:medium
        Content-Type:application/ssml+xml
        Content-Length:...
-       
+
        &lt;?xml version="1.0"?&gt;
-       &lt;speak version="1.0"                
+       &lt;speak version="1.0"
               xmlns="http://www.w3.org/2001/10/synthesis"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -11103,7 +11103,7 @@
               xml:lang="en-US"&gt;
          &lt;p&gt;
            &lt;s&gt;You have 4 new messages.&lt;/s&gt;
-           &lt;s&gt;The first is from Stephanie Williams 
+           &lt;s&gt;The first is from Stephanie Williams
              &lt;mark name="Stephanie"/&gt;
              and arrived at &lt;break/&gt;
              &lt;say-as interpret-as="vxml:time"&gt;0345p&lt;/say-as&gt;.&lt;/s&gt;
@@ -11113,7 +11113,7 @@
        &lt;/speak&gt;
 
 S-&gt;C:
-       MRCP/2.0 ... 543257 200 IN-PROGRESS 
+       MRCP/2.0 ... 543257 200 IN-PROGRESS
        Channel-Identifier:32AECB23433801@speechsynth
        Speech-Marker:timestamp=857205015059
 
@@ -11123,7 +11123,7 @@
         and faithfully informs the client of the event.<a href="#section-14.1-10" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-14.1-11">
 <pre>
-S-&gt;C:  MRCP/2.0 ... SPEECH-MARKER 543257 IN-PROGRESS 
+S-&gt;C:  MRCP/2.0 ... SPEECH-MARKER 543257 IN-PROGRESS
        Channel-Identifier:32AECB23433801@speechsynth
        Speech-Marker:timestamp=857206027059;Stephanie
 </pre><a href="#section-14.1-11" class="pilcrow">¶</a>
@@ -11145,7 +11145,7 @@
        Channel-Identifier:32AECB23433801@speechrecog
        Content-Type:application/srgs+xml
        Content-Length:...
-       
+
        &lt;?xml version="1.0"?&gt;
        &lt;!-- the default grammar language is US English --&gt;
        &lt;grammar xmlns="http://www.w3.org/2001/06/grammar"
@@ -11173,9 +11173,9 @@
        Kill-On-Barge-In:true
        Content-Type:application/ssml+xml
        Content-Length:...
-       
+
        &lt;?xml version="1.0"?&gt;
-       &lt;speak version="1.0"                
+       &lt;speak version="1.0"
               xmlns="http://www.w3.org/2001/10/synthesis"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -11238,12 +11238,12 @@
 <pre>
 S-&gt;C:  MRCP/2.0 ... RECOGNITION-COMPLETE 543258 COMPLETE
        Channel-Identifier:32AECB23433801@speechrecog
-       Completion-Cause:000 success    
+       Completion-Cause:000 success
        Waveform-URI:&lt;http://web.media.com/session123/audio.wav&gt;;
                     size=423523;duration=25432
        Content-Type:application/nlsml+xml
        Content-Length:...
-       
+
        &lt;?xml version="1.0"?&gt;
        &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                xmlns:ex="http://www.example.com/example"
@@ -11290,7 +11290,7 @@
 System: To which city will you be traveling?
 User:   I want to go to Pittsburgh.
 
-&lt;?xml version="1.0"?&gt;  
+&lt;?xml version="1.0"?&gt;
 &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
         xmlns:ex="http://www.example.com/example"
         grammar="http://www.example.com/flight"&gt;
@@ -11323,7 +11323,7 @@
 <div class="artwork art-text alignLeft" id="section-14.2.2-1">
 <pre>
 System: What would you like?
-User:   I would like 2 pizzas, one with pepperoni and cheese, 
+User:   I would like 2 pizzas, one with pepperoni and cheese,
         one with sausage and a bottle of coke, to go.
 </pre><a href="#section-14.2.2-1" class="pilcrow">¶</a>
 </div>
@@ -11335,7 +11335,7 @@
           resolve the two "one"s as "pizza".<a href="#section-14.2.2-2" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-14.2.2-3">
 <pre>
-&lt;?xml version="1.0"?&gt;  
+&lt;?xml version="1.0"?&gt;
 &lt;nl:result xmlns:nl="urn:ietf:params:xml:ns:mrcpv2"
            xmlns="http://www.example.com/example"
            grammar="http://www.example.com/foodorder"&gt;
@@ -11383,11 +11383,11 @@
 <pre>
 &lt;input&gt;
   &lt;input mode="speech" confidence ="1.0"
-     timestamp-start="2000-04-03T0:00:00" 
+     timestamp-start="2000-04-03T0:00:00"
      timestamp-end="2000-04-03T0:00:01.5"&gt;My pin is
   &lt;/input&gt;
   &lt;input mode="dtmf" confidence ="1.0"
-     timestamp-start="2000-04-03T0:00:01.5" 
+     timestamp-start="2000-04-03T0:00:01.5"
      timestamp-end="2000-04-03T0:00:02.0"&gt;1 2 3 4
   &lt;/input&gt;
 &lt;/input&gt;
@@ -11463,18 +11463,18 @@
           for actually resolving the reference).<a href="#section-14.2.5-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-14.2.5-2">
 <pre>
-Example: (ignoring the issue of representing the input from the 
+Example: (ignoring the issue of representing the input from the
           pointing gesture.)
 
 System: What do you want to drink?
 User:   I want this. (clicks on picture of large root beer.)
 
-&lt;?xml version="1.0"?&gt;  
+&lt;?xml version="1.0"?&gt;
 &lt;nl:result xmlns:nl="urn:ietf:params:xml:ns:mrcpv2"
         xmlns="http://www.example.com/example"
-        grammar="http://www.example.com/beverages.grxml"&gt;  
+        grammar="http://www.example.com/beverages.grxml"&gt;
    &lt;nl:interpretation&gt;
-      &lt;nl:instance&gt; 
+      &lt;nl:instance&gt;
        &lt;doer&gt;I&lt;/doer&gt;
        &lt;action&gt;want&lt;/action&gt;
        &lt;object&gt;this&lt;/object&gt;
@@ -11545,7 +11545,7 @@
 
 SWS    =    [LWS] ; sep whitespace
 
-UTF8-NONASCII    =    %xC0-DF 1UTF8-CONT 
+UTF8-NONASCII    =    %xC0-DF 1UTF8-CONT
                  /    %xE0-EF 2UTF8-CONT
                  /    %xF0-F7 3UTF8-CONT
                  /    %xF8-FB 4UTF8-CONT
@@ -11556,7 +11556,7 @@
                  /    UTF8-NONASCII
 param            =    *pchar
 
-quoted-string    =    SWS DQUOTE *(qdtext / quoted-pair ) 
+quoted-string    =    SWS DQUOTE *(qdtext / quoted-pair )
                       DQUOTE
 
 qdtext           =    LWS / %x21 / %x23-5B / %x5D-7E
@@ -11567,7 +11567,7 @@
 token            =    1*(alphanum / "-" / "." / "!" / "%" / "*"
                       / "_" / "+" / "`" / "'" / "~" )
 
-reserved         =    ";" / "/" / "?" / ":" / "@" / "&amp;" / "=" 
+reserved         =    ";" / "/" / "?" / ":" / "@" / "&amp;" / "="
                       / "+" / "$" / ","
 
 mark             =    "-" / "_" / "." / "!" / "~" / "*" / "'"
@@ -11580,7 +11580,7 @@
 
 alphanum         =    ALPHA / DIGIT
 
-BOOLEAN          =    "true" / "false" 
+BOOLEAN          =    "true" / "false"
 
 FLOAT            =    *DIGIT ["." *DIGIT]
 
@@ -11588,12 +11588,12 @@
 
 fragment         =    *uric
 
-uri              =    [ absoluteURI / relativeURI ] 
+uri              =    [ absoluteURI / relativeURI ]
                       [ "#" fragment ]
 
 absoluteURI      =    scheme ":" ( hier-part / opaque-part )
 
-relativeURI      =    ( net-path / abs-path / rel-path ) 
+relativeURI      =    ( net-path / abs-path / rel-path )
                       [ "?" query ]
 
 hier-part        =    ( net-path / abs-path ) [ "?" query ]
@@ -11604,14 +11604,14 @@
 
 rel-path         =    rel-segment [ abs-path ]
 
-rel-segment      =    1*( unreserved / escaped / ";" / "@" 
-                 /    "&amp;" / "=" / "+" / "$" / "," )    
+rel-segment      =    1*( unreserved / escaped / ";" / "@"
+                 /    "&amp;" / "=" / "+" / "$" / "," )
 
 opaque-part      =    uric-no-slash *uric
 
 uric             =    reserved / unreserved / escaped
 
-uric-no-slash    =    unreserved / escaped / ";" / "?" / ":" 
+uric-no-slash    =    unreserved / escaped / ";" / "?" / ":"
                       / "@" / "&amp;" / "=" / "+" / "$" / ","
 
 path-segments    =    segment *( "/" segment )
@@ -11631,13 +11631,13 @@
 
 userinfo         =    ( user ) [ ":" password ] "@"
 
-user             =    1*( unreserved / escaped 
+user             =    1*( unreserved / escaped
                  /    user-unreserved )
 
-user-unreserved  =    "&amp;" / "=" / "+" / "$" / "," / ";" 
+user-unreserved  =    "&amp;" / "=" / "+" / "$" / "," / ";"
                  /    "?" / "/"
 
-password         =    *( unreserved / escaped 
+password         =    *( unreserved / escaped
                  /    "&amp;" / "=" / "+" / "$" / "," )
 
 hostport         =    host [ ":" port ]
@@ -11652,14 +11652,14 @@
 toplabel         =    ALPHA / ALPHA *( alphanum / "-" )
                       alphanum
 
-IPv4address      =    1*3DIGIT "." 1*3DIGIT "." 1*3DIGIT "." 
+IPv4address      =    1*3DIGIT "." 1*3DIGIT "." 1*3DIGIT "."
                       1*3DIGIT
 
 IPv6reference    =    "[" IPv6address "]"
 
 IPv6address      =    hexpart [ ":" IPv4address ]
 
-hexpart          =    hexseq / hexseq "::" [ hexseq ] / "::" 
+hexpart          =    hexseq / hexseq "::" [ hexseq ] / "::"
                       [ hexseq ]
 
 hexseq           =    hex4 *( ":" hex4)
@@ -11670,23 +11670,23 @@
 
 
 ; generic-message is the top-level rule
-generic-message  =    start-line message-header CRLF 
-                      [ message-body ] 
+generic-message  =    start-line message-header CRLF
+                      [ message-body ]
 
 message-body     =    *OCTET
-         
-start-line       =    request-line / response-line / event-line 
+
+start-line       =    request-line / response-line / event-line
 
 request-line     =    mrcp-version SP message-length SP method-name
-                      SP request-id CRLF 
+                      SP request-id CRLF
 
-response-line    =    mrcp-version SP message-length SP request-id 
-                      SP status-code SP request-state CRLF 
+response-line    =    mrcp-version SP message-length SP request-id
+                      SP status-code SP request-state CRLF
 
 event-line       =    mrcp-version SP message-length SP event-name
-                      SP request-id SP request-state CRLF 
+                      SP request-id SP request-state CRLF
 
-method-name      =    generic-method    
+method-name      =    generic-method
                  /    synthesizer-method
                  /    recognizer-method
                  /    recorder-method
@@ -11695,15 +11695,15 @@
 generic-method   =    "SET-PARAMS"
                  /    "GET-PARAMS"
 
-request-state    =    "COMPLETE" 
-                 /    "IN-PROGRESS"        
-                 /    "PENDING" 
+request-state    =    "COMPLETE"
+                 /    "IN-PROGRESS"
+                 /    "PENDING"
 
 event-name       =    synthesizer-event
                  /    recognizer-event
                  /    recorder-event
                  /    verifier-event
-      
+
 message-header   =  1*(generic-header / resource-header /
                        generic-field)
 
@@ -11717,7 +11717,7 @@
 resource-header  =    synthesizer-header
                  /    recognizer-header
                  /    recorder-header
-                 /    verifier-header    
+                 /    verifier-header
 
 generic-header   =    channel-identifier
                  /    accept
@@ -11732,30 +11732,30 @@
                  /    content-length
                  /    fetch-timeout
                  /    cache-control
-                 /    logging-tag 
+                 /    logging-tag
                  /    set-cookie
                  /    vendor-specific
-          
+
 ; -- content-id is as defined in RFC 2392, RFC 2046 and RFC 5322
 ; -- accept and accept-charset are as defined in RFC 2616
 
-mrcp-version     =    "MRCP" "/" 1*2DIGIT "." 1*2DIGIT 
+mrcp-version     =    "MRCP" "/" 1*2DIGIT "." 1*2DIGIT
 
 message-length   =    1*19DIGIT
 
-request-id       =    1*10DIGIT 
+request-id       =    1*10DIGIT
 
 status-code      =    3DIGIT
 
-channel-identifier =  "Channel-Identifier" ":" 
+channel-identifier =  "Channel-Identifier" ":"
                       channel-id CRLF
 
 channel-id       =    1*alphanum "@" 1*alphanum
 
-active-request-id-list = "Active-Request-Id-List" ":"  
-                         request-id *("," request-id) CRLF 
+active-request-id-list = "Active-Request-Id-List" ":"
+                         request-id *("," request-id) CRLF
 
-proxy-sync-id    =    "Proxy-Sync-Id" ":" 1*VCHAR CRLF    
+proxy-sync-id    =    "Proxy-Sync-Id" ":" 1*VCHAR CRLF
 
 content-base     =    "Content-Base" ":" absoluteURI CRLF
 
@@ -11774,8 +11774,8 @@
 attribute        =    token
 
 value            =    token / quoted-string
-         
-content-encoding =    "Content-Encoding" ":" 
+
+content-encoding =    "Content-Encoding" ":"
                       *WSP content-coding
                       *(*WSP "," *WSP content-coding *WSP )
                       CRLF
@@ -11783,30 +11783,30 @@
 content-coding   =    token
 
 
-content-location =    "Content-Location" ":" 
+content-location =    "Content-Location" ":"
                       ( absoluteURI / relativeURI )  CRLF
 
-cache-control    =    "Cache-Control" ":" 
+cache-control    =    "Cache-Control" ":"
                       [*WSP cache-directive
                       *( *WSP "," *WSP cache-directive *WSP )]
                       CRLF
 
-fetch-timeout    =    "Fetch-Timeout" ":" 1*19DIGIT CRLF 
+fetch-timeout    =    "Fetch-Timeout" ":" 1*19DIGIT CRLF
 
-cache-directive  =    "max-age" "=" delta-seconds     
-                 /    "max-stale" ["=" delta-seconds ] 
-                 /    "min-fresh" "=" delta-seconds  
+cache-directive  =    "max-age" "=" delta-seconds
+                 /    "max-stale" ["=" delta-seconds ]
+                 /    "min-fresh" "=" delta-seconds
 
-delta-seconds         =    1*19DIGIT     
+delta-seconds         =    1*19DIGIT
 
-logging-tag      =    "Logging-Tag" ":" 1*UTFCHAR CRLF 
+logging-tag      =    "Logging-Tag" ":" 1*UTFCHAR CRLF
 
-vendor-specific  =    "Vendor-Specific-Parameters" ":" 
-                      [vendor-specific-av-pair  
-                      *(";" vendor-specific-av-pair)] CRLF  
+vendor-specific  =    "Vendor-Specific-Parameters" ":"
+                      [vendor-specific-av-pair
+                      *(";" vendor-specific-av-pair)] CRLF
 
-vendor-specific-av-pair = vendor-av-pair-name "="  
-                          value 
+vendor-specific-av-pair = vendor-av-pair-name "="
+                          value
 
 vendor-av-pair-name     = 1*UTFCHAR
 
@@ -11833,66 +11833,66 @@
 httponly-av       = "HttpOnly"
 extension-av      = &lt;any CHAR except CTLs or ";"&gt;
 age-av            = "Age=" delta-seconds
-                          
+
 ; Synthesizer ABNF
 
-synthesizer-method    =    "SPEAK" 
-                      /    "STOP" 
-                      /    "PAUSE" 
-                      /    "RESUME" 
-                      /    "BARGE-IN-OCCURRED" 
+synthesizer-method    =    "SPEAK"
+                      /    "STOP"
+                      /    "PAUSE"
+                      /    "RESUME"
+                      /    "BARGE-IN-OCCURRED"
                       /    "CONTROL"
-                      /    "DEFINE-LEXICON" 
+                      /    "DEFINE-LEXICON"
 
-synthesizer-event     =    "SPEECH-MARKER" 
-                      /    "SPEAK-COMPLETE" 
+synthesizer-event     =    "SPEECH-MARKER"
+                      /    "SPEAK-COMPLETE"
 
-synthesizer-header    =    jump-size       
-                      /    kill-on-barge-in  
-                      /    speaker-profile   
+synthesizer-header    =    jump-size
+                      /    kill-on-barge-in
+                      /    speaker-profile
                       /    completion-cause
-                      /    completion-reason  
-                      /    voice-parameter   
-                      /    prosody-parameter   
-                      /    speech-marker     
-                      /    speech-language   
-                      /    fetch-hint        
-                      /    audio-fetch-hint  
-                      /    failed-uri        
-                      /    failed-uri-cause  
-                      /    speak-restart     
+                      /    completion-reason
+                      /    voice-parameter
+                      /    prosody-parameter
+                      /    speech-marker
+                      /    speech-language
+                      /    fetch-hint
+                      /    audio-fetch-hint
+                      /    failed-uri
+                      /    failed-uri-cause
+                      /    speak-restart
                       /    speak-length
                       /    load-lexicon
-                      /    lexicon-search-order      
+                      /    lexicon-search-order
+
 
+jump-size             =    "Jump-Size" ":" speech-length-value CRLF
 
-jump-size             =    "Jump-Size" ":" speech-length-value CRLF 
+speech-length-value   =    numeric-speech-length
+                      /    text-speech-length
 
-speech-length-value   =    numeric-speech-length 
-                      /    text-speech-length 
+text-speech-length    =    1*UTFCHAR SP "Tag"
 
-text-speech-length    =    1*UTFCHAR SP "Tag" 
-                               
 numeric-speech-length =    ("+" / "-") positive-speech-length
 
 positive-speech-length =   1*19DIGIT SP numeric-speech-unit
- 
-numeric-speech-unit   =    "Second" 
-                      /    "Word" 
-                      /    "Sentence" 
-                      /    "Paragraph" 
 
-kill-on-barge-in      =    "Kill-On-Barge-In" ":" BOOLEAN 
-                           CRLF 
+numeric-speech-unit   =    "Second"
+                      /    "Word"
+                      /    "Sentence"
+                      /    "Paragraph"
+
+kill-on-barge-in      =    "Kill-On-Barge-In" ":" BOOLEAN
+                           CRLF
 
-speaker-profile       =    "Speaker-Profile" ":" uri CRLF 
+speaker-profile       =    "Speaker-Profile" ":" uri CRLF
 
 completion-cause         =  "Completion-Cause" ":" cause-code SP
                             cause-name CRLF
 cause-code               =  3DIGIT
 cause-name               =  *VCHAR
 
-completion-reason     =    "Completion-Reason" ":" 
+completion-reason     =    "Completion-Reason" ":"
                            quoted-string CRLF
 
 voice-parameter       =    voice-gender
@@ -11913,8 +11913,8 @@
 voice-name            =    "Voice-Name:"
                            1*UTFCHAR *(1*WSP 1*UTFCHAR) CRLF
 
-prosody-parameter     =    "Prosody-" prosody-param-name ":" 
-                           prosody-param-value CRLF 
+prosody-parameter     =    "Prosody-" prosody-param-name ":"
+                           prosody-param-value CRLF
 
 prosody-param-name    =    1*VCHAR
 
@@ -11929,44 +11929,44 @@
                            [";" 1*(UTFCHAR / %x20)] CRLF
 
 speech-language       =    "Speech-Language" ":"
-                           1*VCHAR CRLF 
+                           1*VCHAR CRLF
 
 fetch-hint            =    "Fetch-Hint" ":"
-                           ("prefetch" / "safe") CRLF 
+                           ("prefetch" / "safe") CRLF
 
-audio-fetch-hint      =    "Audio-Fetch-Hint" ":" 
-                          ("prefetch" / "safe" / "stream") CRLF 
+audio-fetch-hint      =    "Audio-Fetch-Hint" ":"
+                          ("prefetch" / "safe" / "stream") CRLF
 
-failed-uri            =    "Failed-URI" ":" absoluteURI CRLF 
+failed-uri            =    "Failed-URI" ":" absoluteURI CRLF
 
-failed-uri-cause      =    "Failed-URI-Cause" ":" 1*UTFCHAR CRLF 
+failed-uri-cause      =    "Failed-URI-Cause" ":" 1*UTFCHAR CRLF
 
-speak-restart         =    "Speak-Restart" ":" BOOLEAN CRLF 
+speak-restart         =    "Speak-Restart" ":" BOOLEAN CRLF
 
-speak-length          =    "Speak-Length" ":" positive-length-value 
-                           CRLF 
+speak-length          =    "Speak-Length" ":" positive-length-value
+                           CRLF
 
-positive-length-value   =  positive-speech-length 
-                        /  text-speech-length 
+positive-length-value   =  positive-speech-length
+                        /  text-speech-length
 
 load-lexicon          =    "Load-Lexicon" ":" BOOLEAN CRLF
 
-lexicon-search-order  =    "Lexicon-Search-Order" ":" 
+lexicon-search-order  =    "Lexicon-Search-Order" ":"
           "&lt;" absoluteURI "&gt;" *(" " "&lt;" absoluteURI "&gt;") CRLF
 
-; Recognizer ABNF 
+; Recognizer ABNF
 
 recognizer-method     =    recog-only-method
                       /    enrollment-method
 
-recog-only-method     =    "DEFINE-GRAMMAR" 
-                      /    "RECOGNIZE" 
+recog-only-method     =    "DEFINE-GRAMMAR"
+                      /    "RECOGNIZE"
                       /    "INTERPRET"
-                      /    "GET-RESULT" 
-                      /    "START-INPUT-TIMERS" 
+                      /    "GET-RESULT"
+                      /    "START-INPUT-TIMERS"
                       /    "STOP"
 
-enrollment-method     =    "START-PHRASE-ENROLLMENT" 
+enrollment-method     =    "START-PHRASE-ENROLLMENT"
                       /    "ENROLLMENT-ROLLBACK"
                       /    "END-PHRASE-ENROLLMENT"
                       /    "MODIFY-PHRASE"
@@ -11980,30 +11980,30 @@
                       /    enrollment-header
 
 
-recog-only-header     =    confidence-threshold     
-                      /    sensitivity-level        
-                      /    speed-vs-accuracy        
-                      /    n-best-list-length  
-                      /    input-type     
-                      /    no-input-timeout         
-                      /    recognition-timeout      
-                      /    waveform-uri  
-                      /    input-waveform-uri           
-                      /    completion-cause         
+recog-only-header     =    confidence-threshold
+                      /    sensitivity-level
+                      /    speed-vs-accuracy
+                      /    n-best-list-length
+                      /    input-type
+                      /    no-input-timeout
+                      /    recognition-timeout
+                      /    waveform-uri
+                      /    input-waveform-uri
+                      /    completion-cause
                       /    completion-reason
-                      /    recognizer-context-block 
-                      /    start-input-timers 
-                      /    speech-complete-timeout  
-                      /    speech-incomplete-timeout 
-                      /    dtmf-interdigit-timeout  
-                      /    dtmf-term-timeout        
-                      /    dtmf-term-char           
-                      /    failed-uri               
-                      /    failed-uri-cause         
-                      /    save-waveform            
+                      /    recognizer-context-block
+                      /    start-input-timers
+                      /    speech-complete-timeout
+                      /    speech-incomplete-timeout
+                      /    dtmf-interdigit-timeout
+                      /    dtmf-term-timeout
+                      /    dtmf-term-char
+                      /    failed-uri
+                      /    failed-uri-cause
+                      /    save-waveform
                       /    media-type
                       /    new-audio-channel
-                      /    speech-language        
+                      /    speech-language
                       /    ver-buffer-utterance
                       /    recognition-mode
                       /    cancel-if-queue
@@ -12016,66 +12016,66 @@
 
 
 enrollment-header     =    num-min-consistent-pronunciations
-                      /    consistency-threshold  
-                      /    clash-threshold        
-                      /    personal-grammar-uri 
+                      /    consistency-threshold
+                      /    clash-threshold
+                      /    personal-grammar-uri
                       /    enroll-utterance
-                      /    phrase-id              
-                      /    phrase-nl              
-                      /    weight                 
-                      /    save-best-waveform     
-                      /    new-phrase-id          
-                      /    confusable-phrases-uri 
+                      /    phrase-id
+                      /    phrase-nl
+                      /    weight
+                      /    save-best-waveform
+                      /    new-phrase-id
+                      /    confusable-phrases-uri
                       /    abort-phrase-enrollment
 
-confidence-threshold  =    "Confidence-Threshold" ":" 
-                           FLOAT CRLF 
+confidence-threshold  =    "Confidence-Threshold" ":"
+                           FLOAT CRLF
 
 sensitivity-level     =    "Sensitivity-Level" ":" FLOAT
-                           CRLF 
+                           CRLF
 
-speed-vs-accuracy     =    "Speed-Vs-Accuracy" ":" FLOAT 
-                           CRLF 
+speed-vs-accuracy     =    "Speed-Vs-Accuracy" ":" FLOAT
+                           CRLF
 
-n-best-list-length    =    "N-Best-List-Length" ":" 1*19DIGIT 
-                           CRLF 
+n-best-list-length    =    "N-Best-List-Length" ":" 1*19DIGIT
+                           CRLF
 
 input-type            =    "Input-Type" ":"  inputs CRLF
 inputs                =    "speech" / "dtmf"
 
-no-input-timeout      =    "No-Input-Timeout" ":" 1*19DIGIT 
-                           CRLF 
+no-input-timeout      =    "No-Input-Timeout" ":" 1*19DIGIT
+                           CRLF
 
 recognition-timeout   =    "Recognition-Timeout" ":" 1*19DIGIT
-                           CRLF 
+                           CRLF
 
-waveform-uri          =    "Waveform-URI" ":" ["&lt;" uri "&gt;" 
-                           ";" "size" "=" 1*19DIGIT 
-                           ";" "duration" "=" 1*19DIGIT] CRLF 
+waveform-uri          =    "Waveform-URI" ":" ["&lt;" uri "&gt;"
+                           ";" "size" "=" 1*19DIGIT
+                           ";" "duration" "=" 1*19DIGIT] CRLF
 
-recognizer-context-block = "Recognizer-Context-Block" ":" 
-                           [1*VCHAR] CRLF 
+recognizer-context-block = "Recognizer-Context-Block" ":"
+                           [1*VCHAR] CRLF
 
-start-input-timers    =    "Start-Input-Timers" ":"  
-                           BOOLEAN CRLF 
- 
-speech-complete-timeout =  "Speech-Complete-Timeout" ":"  
-                           1*19DIGIT CRLF 
+start-input-timers    =    "Start-Input-Timers" ":"
+                           BOOLEAN CRLF
 
-speech-incomplete-timeout = "Speech-Incomplete-Timeout" ":"  
-                            1*19DIGIT CRLF 
+speech-complete-timeout =  "Speech-Complete-Timeout" ":"
+                           1*19DIGIT CRLF
+
+speech-incomplete-timeout = "Speech-Incomplete-Timeout" ":"
+                            1*19DIGIT CRLF
 
-dtmf-interdigit-timeout = "DTMF-Interdigit-Timeout" ":"  
-                          1*19DIGIT CRLF 
+dtmf-interdigit-timeout = "DTMF-Interdigit-Timeout" ":"
+                          1*19DIGIT CRLF
 
-dtmf-term-timeout     =    "DTMF-Term-Timeout" ":" 1*19DIGIT 
-                           CRLF 
+dtmf-term-timeout     =    "DTMF-Term-Timeout" ":" 1*19DIGIT
+                           CRLF
 
-dtmf-term-char        =    "DTMF-Term-Char" ":" VCHAR CRLF 
+dtmf-term-char        =    "DTMF-Term-Char" ":" VCHAR CRLF
 
-save-waveform         =    "Save-Waveform" ":" BOOLEAN CRLF 
+save-waveform         =    "Save-Waveform" ":" BOOLEAN CRLF
 
-new-audio-channel     =    "New-Audio-Channel" ":" 
+new-audio-channel     =    "New-Audio-Channel" ":"
                            BOOLEAN CRLF
 
 recognition-mode      =    "Recognition-Mode" ":"
@@ -12083,13 +12083,13 @@
 
 cancel-if-queue       =    "Cancel-If-Queue" ":" BOOLEAN CRLF
 
-hotword-max-duration  =    "Hotword-Max-Duration" ":" 
+hotword-max-duration  =    "Hotword-Max-Duration" ":"
                            1*19DIGIT CRLF
 
-hotword-min-duration  =    "Hotword-Min-Duration" ":" 
+hotword-min-duration  =    "Hotword-Min-Duration" ":"
                            1*19DIGIT CRLF
 
-interpret-text        =    "Interpret-Text" ":" 1*VCHAR CRLF          
+interpret-text        =    "Interpret-Text" ":" 1*VCHAR CRLF
 
 dtmf-buffer-time      =    "DTMF-Buffer-Time" ":" 1*19DIGIT CRLF
 
@@ -12097,13 +12097,13 @@
 
 early-no-match        =    "Early-No-Match" ":" BOOLEAN CRLF
 
-num-min-consistent-pronunciations    = 
-    "Num-Min-Consistent-Pronunciations" ":" 1*19DIGIT CRLF 
+num-min-consistent-pronunciations    =
+    "Num-Min-Consistent-Pronunciations" ":" 1*19DIGIT CRLF
 
 
-consistency-threshold =    "Consistency-Threshold" ":" FLOAT 
+consistency-threshold =    "Consistency-Threshold" ":" FLOAT
                            CRLF
- 
+
 clash-threshold       =    "Clash-Threshold" ":" FLOAT CRLF
 
 personal-grammar-uri  =    "Personal-Grammar-URI" ":" uri CRLF
@@ -12116,15 +12116,15 @@
 
 weight                =    "Weight" ":" FLOAT CRLF
 
-save-best-waveform    =    "Save-Best-Waveform" ":" 
+save-best-waveform    =    "Save-Best-Waveform" ":"
                            BOOLEAN CRLF
 
 new-phrase-id         =    "New-Phrase-ID" ":" 1*VCHAR CRLF
 
-confusable-phrases-uri =   "Confusable-Phrases-URI" ":" 
+confusable-phrases-uri =   "Confusable-Phrases-URI" ":"
                            uri CRLF
 
-abort-phrase-enrollment =  "Abort-Phrase-Enrollment" ":" 
+abort-phrase-enrollment =  "Abort-Phrase-Enrollment" ":"
                            BOOLEAN CRLF
 
 
@@ -12150,11 +12150,11 @@
                       /    final-silence
                       /    capture-on-speech
                       /    ver-buffer-utterance
-                      /    start-input-timers 
+                      /    start-input-timers
                       /    new-audio-channel
 
-record-uri            =    "Record-URI" ":" [ "&lt;" uri "&gt;" 
-                           ";" "size" "=" 1*19DIGIT 
+record-uri            =    "Record-URI" ":" [ "&lt;" uri "&gt;"
+                           ";" "size" "=" 1*19DIGIT
                            ";" "duration" "=" 1*19DIGIT] CRLF
 
 media-type            =    "Media-Type" ":" media-type-value CRLF
@@ -12165,7 +12165,7 @@
 
 final-silence         =    "Final-Silence" ":" 1*19DIGIT CRLF
 
-capture-on-speech     =    "Capture-On-Speech " ":" 
+capture-on-speech     =    "Capture-On-Speech " ":"
                            BOOLEAN CRLF
 
 
@@ -12188,38 +12188,38 @@
                       /    "START-OF-INPUT"
 
 
-verifier-header       =    repository-uri 
+verifier-header       =    repository-uri
                       /    voiceprint-identifier
-                      /    verification-mode 
-                      /    adapt-model 
-                      /    abort-model 
-                      /    min-verification-score         
+                      /    verification-mode
+                      /    adapt-model
+                      /    abort-model
+                      /    min-verification-score
                       /    num-min-verification-phrases
                       /    num-max-verification-phrases
-                      /    no-input-timeout           
-                      /    save-waveform              
+                      /    no-input-timeout
+                      /    save-waveform
                       /    media-type
-                      /    waveform-uri               
-                      /    voiceprint-exists          
-                      /    ver-buffer-utterance    
-                      /    input-waveform-uri        
-                      /    completion-cause           
+                      /    waveform-uri
+                      /    voiceprint-exists
+                      /    ver-buffer-utterance
+                      /    input-waveform-uri
+                      /    completion-cause
                       /    completion-reason
-                      /    speech-complete-timeout          
+                      /    speech-complete-timeout
                       /    new-audio-channel
                       /    abort-verification
-                      /    start-input-timers 
+                      /    start-input-timers
                       /    input-type
 
 
 
 repository-uri        =    "Repository-URI" ":" uri CRLF
 
-voiceprint-identifier        =  "Voiceprint-Identifier" ":" 
+voiceprint-identifier        =  "Voiceprint-Identifier" ":"
                                 vid *[";" vid] CRLF
 vid                          =  1*VCHAR ["." 1*VCHAR]
 
-verification-mode     =    "Verification-Mode" ":" 
+verification-mode     =    "Verification-Mode" ":"
                            verification-mode-string
 
 verification-mode-string = "train" / "verify"
@@ -12228,25 +12228,25 @@
 
 abort-model           =    "Abort-Model" ":" BOOLEAN CRLF
 
-min-verification-score  =  "Min-Verification-Score" ":" 
+min-verification-score  =  "Min-Verification-Score" ":"
                            [ %x2D ] FLOAT CRLF
 
-num-min-verification-phrases = "Num-Min-Verification-Phrases" 
+num-min-verification-phrases = "Num-Min-Verification-Phrases"
                                ":" 1*19DIGIT CRLF
 
-num-max-verification-phrases = "Num-Max-Verification-Phrases" 
+num-max-verification-phrases = "Num-Max-Verification-Phrases"
                                ":" 1*19DIGIT CRLF
-     
-voiceprint-exists     =    "Voiceprint-Exists" ":" 
+
+voiceprint-exists     =    "Voiceprint-Exists" ":"
                            BOOLEAN CRLF
 
-ver-buffer-utterance  =    "Ver-Buffer-Utterance" ":" 
-                           BOOLEAN CRLF 
+ver-buffer-utterance  =    "Ver-Buffer-Utterance" ":"
+                           BOOLEAN CRLF
 
 input-waveform-uri    =    "Input-Waveform-URI" ":" uri CRLF
 
-abort-verification    =    "Abort-Verification " ":" 
-                           BOOLEAN CRLF </pre><a href="#section-15-2" class="pilcrow">¶</a>
+abort-verification    =    "Abort-Verification " ":"
+                           BOOLEAN CRLF</pre><a href="#section-15-2" class="pilcrow">¶</a>
 </div>
 <p id="section-15-3">The following productions add a new SDP session-level attribute. See
       <a href="#cmid" class="xref">Section 13.7.2, Paragraph 7</a>.<a href="#section-15-3" class="pilcrow">¶</a></p>
@@ -12271,13 +12271,13 @@
 <div class="artwork art-text alignLeft" id="section-16.1-1">
 <pre>
 &lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+&lt;xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
             targetNamespace="urn:ietf:params:xml:ns:mrcpv2"
             xmlns="urn:ietf:params:xml:ns:mrcpv2"
-            elementFormDefault="qualified" 
+            elementFormDefault="qualified"
             attributeFormDefault="unqualified" &gt;
   &lt;xs:annotation&gt;
-    &lt;xs:documentation&gt; Natural Language Semantic Markup Schema 
+    &lt;xs:documentation&gt; Natural Language Semantic Markup Schema
     &lt;/xs:documentation&gt;
   &lt;/xs:annotation&gt;
   &lt;xs:include schemaLocation="enrollment-schema.rng"/&gt;
@@ -12306,12 +12306,12 @@
                   &lt;xs:attribute name="mode"
                                 type="xs:string"
                                 default="speech"/&gt;
-                  &lt;xs:attribute name="confidence" 
-                                type="confidenceinfo" 
+                  &lt;xs:attribute name="confidence"
+                                type="confidenceinfo"
                                 default="1.0"/&gt;
-                  &lt;xs:attribute name="timestamp-start" 
+                  &lt;xs:attribute name="timestamp-start"
                                 type="xs:string"/&gt;
-                  &lt;xs:attribute name="timestamp-end" 
+                  &lt;xs:attribute name="timestamp-end"
                                 type="xs:string"/&gt;
                 &lt;/xs:complexType&gt;
               &lt;/xs:element&gt;
@@ -12327,7 +12327,7 @@
         &lt;xs:element name="verification-result"
                     type="verification-contents"/&gt;
       &lt;/xs:sequence&gt;
-      &lt;xs:attribute name="grammar" type="xs:anyURI" 
+      &lt;xs:attribute name="grammar" type="xs:anyURI"
                     use="optional"/&gt;
     &lt;/xs:complexType&gt;
   &lt;/xs:element&gt;
@@ -12426,7 +12426,7 @@
 <div class="artwork art-text alignLeft" id="section-16.3-1">
 <pre>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
 
-&lt;!--    MRCP Verification Results Schema 
+&lt;!--    MRCP Verification Results Schema
         (See http://www.oasis-open.org/committees/relax-ng/spec.html)
    --&gt;
 
@@ -12766,23 +12766,23 @@
       </h2>
 <div class="artwork art-text alignLeft" id="section-appendix.a-1">
 <pre>
-Pierre Forgues 
-Nuance Communications Ltd. 
+Pierre Forgues
+Nuance Communications Ltd.
 1500 University Street
 Suite 935
-Montreal, Quebec 
-Canada H3A 3S7 
-         
-EMail:  forgues@nuance.com 
+Montreal, Quebec
+Canada H3A 3S7
+
+EMail:  forgues@nuance.com
+
 
+Charles Galles
+Intervoice, Inc.
+17811 Waterview Parkway
+Dallas, Texas 75252
+USA
 
-Charles Galles 
-Intervoice, Inc. 
-17811 Waterview Parkway 
-Dallas, Texas 75252 
-USA        
- 
-EMail:  charles.galles@intervoice.com 
+EMail:  charles.galles@intervoice.com
 
 
 Klaus Reifenrath
@@ -12792,8 +12792,8 @@
 9820 Merelbeke
 Belgium
 
-EMail: klaus.reifenrath@scansoft.com 
-                </pre><a href="#section-appendix.a-1" class="pilcrow">¶</a>
+EMail: klaus.reifenrath@scansoft.com
+</pre><a href="#section-appendix.a-1" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-appendix.b">
@@ -12822,7 +12822,7 @@
 Suresh Kaliannan (Cisco Systems, Inc.)
 Skip Cave (Intervoice, Inc.)
 Thomas Gal (LumenVox)
-         </pre><a href="#section-appendix.b-1" class="pilcrow">¶</a>
+</pre><a href="#section-appendix.b-1" class="pilcrow">¶</a>
 </div>
 <p id="section-appendix.b-2">The chairs of the SPEECHSC work group are Eric Burger (Georgetown
       University) and Dave Oran (Cisco Systems, Inc.).<a href="#section-appendix.b-2" class="pilcrow">¶</a></p>
diff -Nru xml2rfc-2.39.0/tests/valid/rfc6787.v3.py36.html xml2rfc-2.40.0/tests/valid/rfc6787.v3.py36.html
--- xml2rfc-2.39.0/tests/valid/rfc6787.v3.py36.html	2019-12-22 18:00:56.000000000 +0000
+++ xml2rfc-2.40.0/tests/valid/rfc6787.v3.py36.html	2020-02-18 20:15:35.000000000 +0000
@@ -21,7 +21,7 @@
       established above, allowing the client to control the media processing
       resources on the speech resource server. 
     ' name="description">
-<meta content="xml2rfc 2.37.0" name="generator">
+<meta content="xml2rfc 2.39.0" name="generator">
 <meta content="mrcp, speechsc, asr, tts, speech services, speech recognition, speech synthesis, nlsml, speaker authentication, speaker verification, speaker identification" name="keyword">
 <meta content="6787" name="rfc.number">
 <link href="tests/input/rfc6787.xml" rel="alternate" type="application/rfc+xml">
@@ -1260,7 +1260,7 @@
 |--------------------|         ||                                  ||
          |                     ||----------------------------------||
         SIP                    |------------------------------------|
-         |                       /           
+         |                       /
 |-------------------|          RTP
 |                   |          /
 | Media Source/Sink |---------/
@@ -1345,7 +1345,7 @@
 <pre>
      sip:mrcpv2@example.net   or
      sips:mrcpv2@example.net
-          </pre><a href="#section-3.2-3" class="pilcrow">¶</a>
+</pre><a href="#section-3.2-3" class="pilcrow">¶</a>
 </div>
 </section>
 </section>
@@ -1564,69 +1564,69 @@
 <span id="name-example-add-synthesizer-con"></span><figure id="figure-2">
           <div class="artwork art-text alignLeft" id="section-4.3-3.1">
 <pre>
-C-&gt;S:  INVITE sip:mresources@example.com SIP/2.0 
-       Via:SIP/2.0/TCP client.atlanta.example.com:5060; 
-        branch=z9hG4bK74bf1 
-       Max-Forwards:6 
-       To:MediaServer &lt;sip:mresources@example.com&gt; 
-       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314161 INVITE 
-       Contact:&lt;sip:sarvi@client.example.com&gt; 
-       Content-Type:application/sdp 
+C-&gt;S:  INVITE sip:mresources@example.com SIP/2.0
+       Via:SIP/2.0/TCP client.atlanta.example.com:5060;
+        branch=z9hG4bK74bf1
+       Max-Forwards:6
+       To:MediaServer &lt;sip:mresources@example.com&gt;
+       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314161 INVITE
+       Contact:&lt;sip:sarvi@client.example.com&gt;
+       Content-Type:application/sdp
        Content-Length:...
-       
-       v=0 
-       o=sarvi 2890844526 2890844526 IN IP4 192.0.2.12 
-       s=- 
+
+       v=0
+       o=sarvi 2890844526 2890844526 IN IP4 192.0.2.12
+       s=-
        c=IN IP4 192.0.2.12
        t=0 0
-       m=application 9 TCP/MRCPv2 1 
+       m=application 9 TCP/MRCPv2 1
        a=setup:active
        a=connection:new
        a=resource:speechsynth
        a=cmid:1
-       m=audio 49170 RTP/AVP 0 
-       a=rtpmap:0 pcmu/8000 
-       a=recvonly 
+       m=audio 49170 RTP/AVP 0
+       a=rtpmap:0 pcmu/8000
+       a=recvonly
        a=mid:1
-     
 
-S-&gt;C:  SIP/2.0 200 OK 
+
+S-&gt;C:  SIP/2.0 200 OK
        Via:SIP/2.0/TCP client.atlanta.example.com:5060;
         branch=z9hG4bK74bf1;received=192.0.32.10
-       To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784 
-       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314161 INVITE 
-       Contact:&lt;sip:mresources@server.example.com&gt; 
-       Content-Type:application/sdp 
-       Content-Length:... 
-       
-       v=0 
-       o=- 2890842808 2890842808 IN IP4 192.0.2.11 
-       s=- 
+       To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784
+       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314161 INVITE
+       Contact:&lt;sip:mresources@server.example.com&gt;
+       Content-Type:application/sdp
+       Content-Length:...
+
+       v=0
+       o=- 2890842808 2890842808 IN IP4 192.0.2.11
+       s=-
        c=IN IP4 192.0.2.11
        t=0 0
-       m=application 32416 TCP/MRCPv2 1 
+       m=application 32416 TCP/MRCPv2 1
        a=setup:passive
        a=connection:new
-       a=channel:32AECB234338@speechsynth 
+       a=channel:32AECB234338@speechsynth
        a=cmid:1
-       m=audio 48260 RTP/AVP 0 
-       a=rtpmap:0 pcmu/8000 
-       a=sendonly 
-       a=mid:1 
-     
+       m=audio 48260 RTP/AVP 0
+       a=rtpmap:0 pcmu/8000
+       a=sendonly
+       a=mid:1
+
 
-C-&gt;S:  ACK sip:mresources@server.example.com SIP/2.0 
+C-&gt;S:  ACK sip:mresources@server.example.com SIP/2.0
        Via:SIP/2.0/TCP client.atlanta.example.com:5060;
         branch=z9hG4bK74bf2
-       Max-Forwards:6 
+       Max-Forwards:6
        To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784
-       From:Sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314161 ACK 
+       From:Sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314161 ACK
        Content-Length:0
 </pre>
 </div>
@@ -1641,83 +1641,83 @@
 <span id="name-example-add-recognizer"></span><figure id="figure-3">
           <div class="artwork art-text alignLeft" id="section-4.3-5.1">
 <pre>
-C-&gt;S:  INVITE sip:mresources@server.example.com SIP/2.0 
+C-&gt;S:  INVITE sip:mresources@server.example.com SIP/2.0
        Via:SIP/2.0/TCP client.atlanta.example.com:5060;
         branch=z9hG4bK74bf3
-       Max-Forwards:6 
+       Max-Forwards:6
        To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784
-       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314162 INVITE 
-       Contact:&lt;sip:sarvi@client.example.com&gt; 
-       Content-Type:application/sdp 
+       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314162 INVITE
+       Contact:&lt;sip:sarvi@client.example.com&gt;
+       Content-Type:application/sdp
        Content-Length:...
-       
-       v=0 
-       o=sarvi 2890844526 2890844527 IN IP4 192.0.2.12 
+
+       v=0
+       o=sarvi 2890844526 2890844527 IN IP4 192.0.2.12
        s=-
        c=IN IP4 192.0.2.12
        t=0 0
-       m=application 9 TCP/MRCPv2 1 
+       m=application 9 TCP/MRCPv2 1
        a=setup:active
        a=connection:existing
        a=resource:speechsynth
        a=cmid:1
-       m=audio 49170 RTP/AVP 0 96 
-       a=rtpmap:0 pcmu/8000 
-       a=rtpmap:96 telephone-event/8000 
-       a=fmtp:96 0-15 
-       a=sendrecv 
+       m=audio 49170 RTP/AVP 0 96
+       a=rtpmap:0 pcmu/8000
+       a=rtpmap:96 telephone-event/8000
+       a=fmtp:96 0-15
+       a=sendrecv
        a=mid:1
-       m=application 9 TCP/MRCPv2 1 
+       m=application 9 TCP/MRCPv2 1
        a=setup:active
        a=connection:existing
        a=resource:speechrecog
        a=cmid:1
-     
 
-S-&gt;C:  SIP/2.0 200 OK 
+
+S-&gt;C:  SIP/2.0 200 OK
        Via:SIP/2.0/TCP client.atlanta.example.com:5060;
         branch=z9hG4bK74bf3;received=192.0.32.10
        To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784
-       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314162 INVITE 
-       Contact:&lt;sip:mresources@server.example.com&gt; 
-       Content-Type:application/sdp 
+       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314162 INVITE
+       Contact:&lt;sip:mresources@server.example.com&gt;
+       Content-Type:application/sdp
        Content-Length:...
-            
-       v=0 
-       o=- 2890842808 2890842809 IN IP4 192.0.2.11 
+
+       v=0
+       o=- 2890842808 2890842809 IN IP4 192.0.2.11
        s=-
        c=IN IP4 192.0.2.11
        t=0 0
-       m=application 32416 TCP/MRCPv2 1 
+       m=application 32416 TCP/MRCPv2 1
        a=setup:passive
        a=connection:existing
        a=channel:32AECB234338@speechsynth
        a=cmid:1
-       m=audio 48260 RTP/AVP 0 96 
-       a=rtpmap:0 pcmu/8000 
-       a=rtpmap:96 telephone-event/8000 
-       a=fmtp:96 0-15 
-       a=sendrecv 
+       m=audio 48260 RTP/AVP 0 96
+       a=rtpmap:0 pcmu/8000
+       a=rtpmap:96 telephone-event/8000
+       a=fmtp:96 0-15
+       a=sendrecv
        a=mid:1
-       m=application 32416 TCP/MRCPv2 1 
+       m=application 32416 TCP/MRCPv2 1
        a=setup:passive
        a=connection:existing
        a=channel:32AECB234338@speechrecog
        a=cmid:1
-     
 
-C-&gt;S:  ACK sip:mresources@server.example.com SIP/2.0 
+
+C-&gt;S:  ACK sip:mresources@server.example.com SIP/2.0
        Via:SIP/2.0/TCP client.atlanta.example.com:5060;
         branch=z9hG4bK74bf4
-       Max-Forwards:6 
+       Max-Forwards:6
        To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784
-       From:Sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314162 ACK 
+       From:Sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314162 ACK
        Content-Length:0
 </pre>
 </div>
@@ -1731,71 +1731,71 @@
 <span id="name-example-deallocate-recogniz"></span><figure id="figure-4">
           <div class="artwork art-text alignLeft" id="section-4.3-7.1">
 <pre>
-C-&gt;S:  INVITE sip:mresources@server.example.com SIP/2.0 
+C-&gt;S:  INVITE sip:mresources@server.example.com SIP/2.0
        Via:SIP/2.0/TCP client.atlanta.example.com:5060;
         branch=z9hG4bK74bf5
-       Max-Forwards:6 
+       Max-Forwards:6
        To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784
-       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314163 INVITE 
-       Contact:&lt;sip:sarvi@client.example.com&gt; 
-       Content-Type:application/sdp 
+       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314163 INVITE
+       Contact:&lt;sip:sarvi@client.example.com&gt;
+       Content-Type:application/sdp
        Content-Length:...
-            
-       v=0 
-       o=sarvi 2890844526 2890844528 IN IP4 192.0.2.12 
+
+       v=0
+       o=sarvi 2890844526 2890844528 IN IP4 192.0.2.12
        s=-
        c=IN IP4 192.0.2.12
        t=0 0
-       m=application 9 TCP/MRCPv2 1 
-       a=resource:speechsynth 
+       m=application 9 TCP/MRCPv2 1
+       a=resource:speechsynth
        a=cmid:1
-       m=audio 49170 RTP/AVP 0 
-       a=rtpmap:0 pcmu/8000 
-       a=recvonly 
+       m=audio 49170 RTP/AVP 0
+       a=rtpmap:0 pcmu/8000
+       a=recvonly
        a=mid:1
-       m=application 0 TCP/MRCPv2 1 
-       a=resource:speechrecog 
+       m=application 0 TCP/MRCPv2 1
+       a=resource:speechrecog
        a=cmid:1
-     
 
-S-&gt;C:  SIP/2.0 200 OK 
+
+S-&gt;C:  SIP/2.0 200 OK
        Via:SIP/2.0/TCP client.atlanta.example.com:5060;
         branch=z9hG4bK74bf5;received=192.0.32.10
        To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784
-       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314163 INVITE 
+       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314163 INVITE
        Contact:&lt;sip:mresources@server.example.com&gt;
-       Content-Type:application/sdp 
+       Content-Type:application/sdp
        Content-Length:...
-     
-       v=0 
-       o=- 2890842808 2890842810 IN IP4 192.0.2.11 
+
+       v=0
+       o=- 2890842808 2890842810 IN IP4 192.0.2.11
        s=-
        c=IN IP4 192.0.2.11
        t=0 0
-       m=application 32416 TCP/MRCPv2 1 
-       a=channel:32AECB234338@speechsynth 
+       m=application 32416 TCP/MRCPv2 1
+       a=channel:32AECB234338@speechsynth
        a=cmid:1
-       m=audio 48260 RTP/AVP 0 
-       a=rtpmap:0 pcmu/8000 
-       a=sendonly 
+       m=audio 48260 RTP/AVP 0
+       a=rtpmap:0 pcmu/8000
+       a=sendonly
        a=mid:1
-       m=application 0 TCP/MRCPv2 1 
-       a=channel:32AECB234338@speechrecog 
+       m=application 0 TCP/MRCPv2 1
+       a=channel:32AECB234338@speechrecog
        a=cmid:1
-     
 
-C-&gt;S:  ACK sip:mresources@server.example.com SIP/2.0 
+
+C-&gt;S:  ACK sip:mresources@server.example.com SIP/2.0
        Via:SIP/2.0/TCP client.atlanta.example.com:5060;
         branch=z9hG4bK74bf6
-       Max-Forwards:6 
+       Max-Forwards:6
        To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784
-       From:Sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314163 ACK 
+       From:Sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314163 ACK
        Content-Length:0
 </pre>
 </div>
@@ -1997,7 +1997,7 @@
 <div class="artwork art-text alignLeft art-abnf" id="section-5.1-6">
 <pre>
 mrcp-version   =    "MRCP" "/" 1*2DIGIT "." 1*2DIGIT
-          </pre><a href="#section-5.1-6" class="pilcrow">¶</a>
+</pre><a href="#section-5.1-6" class="pilcrow">¶</a>
 </div>
 <p id="section-5.1-7"><a href="#section-5.1-7" class="pilcrow">¶</a></p>
 <p id="section-5.1-8">The message-length field specifies the length of the message in
@@ -2015,7 +2015,7 @@
 <div class="artwork art-text alignLeft art-abnf" id="section-5.1-9">
 <pre>
 message-length =    1*19DIGIT
-          </pre><a href="#section-5.1-9" class="pilcrow">¶</a>
+</pre><a href="#section-5.1-9" class="pilcrow">¶</a>
 </div>
 <p id="section-5.1-10">The following sample MRCP exchange demonstrates proper
         message-length values. The values for message-length have been removed
@@ -2025,12 +2025,12 @@
 <div class="artwork art-text alignLeft" id="section-5.1-11">
 <pre>
 C-&gt;S:   MRCP/2.0 877 INTERPRET 543266
-        Channel-Identifier:32AECB23433801@speechrecog 
-        Interpret-Text:may I speak to Andre Roy 
-        Content-Type:application/srgs+xml  
-        Content-ID:&lt;request1@form-level.store&gt;  
+        Channel-Identifier:32AECB23433801@speechrecog
+        Interpret-Text:may I speak to Andre Roy
+        Content-Type:application/srgs+xml
+        Content-ID:&lt;request1@form-level.store&gt;
         Content-Length:661
-        
+
         &lt;?xml version="1.0"?&gt;
         &lt;!-- the default grammar language is US English --&gt;
         &lt;grammar xmlns="http://www.w3.org/2001/06/grammar"
@@ -2042,7 +2042,7 @@
                     &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
                 &lt;/one-of&gt;
             &lt;/rule&gt;
-        
+
         &lt;!-- single language attachment to a rule expansion --&gt;
             &lt;rule id="request"&gt;
                 may I speak to
@@ -2052,16 +2052,16 @@
                 &lt;/one-of&gt;
             &lt;/rule&gt;
         &lt;/grammar&gt;
-              
+
 S-&gt;C:   MRCP/2.0 82 543266 200 IN-PROGRESS
         Channel-Identifier:32AECB23433801@speechrecog
-                   
+
 S-&gt;C:   MRCP/2.0 634 INTERPRETATION-COMPLETE 543266 200 COMPLETE
         Channel-Identifier:32AECB23433801@speechrecog
         Completion-Cause:000 success
         Content-Type:application/nlsml+xml
         Content-Length:441
-        
+
         &lt;?xml version="1.0"?&gt;
         &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                 xmlns:ex="http://www.example.com/example"
@@ -2104,7 +2104,7 @@
 <pre>
 request-line   =    mrcp-version SP message-length SP method-name
                     SP request-id CRLF
-          </pre><a href="#section-5.2-3" class="pilcrow">¶</a>
+</pre><a href="#section-5.2-3" class="pilcrow">¶</a>
 </div>
 <p id="section-5.2-4">The mrcp-version field is the MRCP protocol version that is being
         used by the client.<a href="#section-5.2-4" class="pilcrow">¶</a></p>
@@ -2123,7 +2123,7 @@
                /    recognizer-method
                /    recorder-method
                /    verifier-method
-          </pre><a href="#section-5.2-8" class="pilcrow">¶</a>
+</pre><a href="#section-5.2-8" class="pilcrow">¶</a>
 </div>
 <p id="section-5.2-9">The request-id field is a unique identifier representable as an
         unsigned 32-bit integer created by the client and sent to the server.
@@ -2144,7 +2144,7 @@
 <div class="artwork art-text alignLeft art-abnf" id="section-5.2-11">
 <pre>
 request-id     =    1*10DIGIT
-          </pre><a href="#section-5.2-11" class="pilcrow">¶</a>
+</pre><a href="#section-5.2-11" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -2162,7 +2162,7 @@
 <pre>
 response-line  =    mrcp-version SP message-length SP request-id
                     SP status-code SP request-state CRLF
-          </pre><a href="#section-5.3-2" class="pilcrow">¶</a>
+</pre><a href="#section-5.3-2" class="pilcrow">¶</a>
 </div>
 <p id="section-5.3-3">The mrcp-version field MUST contain the version of the request if
         supported; otherwise, it MUST contain the highest version of
@@ -2178,7 +2178,7 @@
 <div class="artwork art-text alignLeft art-abnf" id="section-5.3-8">
 <pre>
 status-code     =    3DIGIT
-          </pre><a href="#section-5.3-8" class="pilcrow">¶</a>
+</pre><a href="#section-5.3-8" class="pilcrow">¶</a>
 </div>
 <p id="section-5.3-9">The request-state field indicates if the action initiated by the
         Request is PENDING, IN-PROGRESS, or COMPLETE. The COMPLETE status means
@@ -2194,7 +2194,7 @@
 request-state    =  "COMPLETE"
                  /  "IN-PROGRESS"
                  /  "PENDING"
-          </pre><a href="#section-5.3-10" class="pilcrow">¶</a>
+</pre><a href="#section-5.3-10" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -2440,7 +2440,7 @@
 
 S-&gt;C:  MRCP/2.0 ... 543256 200 COMPLETE
        Channel-Identifier:32AECB23433802@speechsynth
-   </pre><a href="#section-6.1.1-6" class="pilcrow">¶</a>
+</pre><a href="#section-6.1.1-6" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-6.1.2">
@@ -2555,7 +2555,7 @@
                     /    content-length
                     /    fetch-timeout
                     /    cache-control
-                    /    logging-tag 
+                    /    logging-tag
                     /    set-cookie
                     /    vendor-specific
 </pre><a href="#section-6.2-7" class="pilcrow">¶</a>
@@ -2626,7 +2626,7 @@
           RECOGNITION-COMPLETE events for the terminated requests.<a href="#section-6.2.3-4" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft art-abnf" id="section-6.2.3-5">
 <pre>
-active-request-id-list  =  "Active-Request-Id-List" ":" 
+active-request-id-list  =  "Active-Request-Id-List" ":"
                            request-id *("," request-id) CRLF
 </pre><a href="#section-6.2.3-5" class="pilcrow">¶</a>
 </div>
@@ -2652,7 +2652,7 @@
 <div class="artwork art-text alignLeft art-abnf" id="section-6.2.4-2">
 <pre>
 proxy-sync-id    =  "Proxy-Sync-Id" ":" 1*VCHAR CRLF
-            </pre><a href="#section-6.2.4-2" class="pilcrow">¶</a>
+</pre><a href="#section-6.2.4-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-6.2.5">
@@ -2694,7 +2694,7 @@
 attribute        =    token
 
 value            =    token / quoted-string
-            </pre><a href="#section-6.2.6-2" class="pilcrow">¶</a>
+</pre><a href="#section-6.2.6-2" class="pilcrow">¶</a>
 </div>
 </section>
 <div id="sec.Content-ID">
@@ -2722,7 +2722,7 @@
 <div class="artwork art-text alignLeft art-abnf" id="section-6.2.8-2">
 <pre>
 content-base      = "Content-Base" ":" absoluteURI CRLF
-            </pre><a href="#section-6.2.8-2" class="pilcrow">¶</a>
+</pre><a href="#section-6.2.8-2" class="pilcrow">¶</a>
 </div>
 <p id="section-6.2.8-3">Note, however, that the base URI of the contents within the
           entity-body may be redefined within that entity-body. An example of
@@ -2744,8 +2744,8 @@
           on all messages.<a href="#section-6.2.9-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft art-abnf" id="section-6.2.9-2">
 <pre>
-content-encoding  = "Content-Encoding" ":" 
-                    *WSP content-coding 
+content-encoding  = "Content-Encoding" ":"
+                    *WSP content-coding
                     *(*WSP "," *WSP content-coding *WSP )
                     CRLF
 </pre><a href="#section-6.2.9-2" class="pilcrow">¶</a>
@@ -2826,7 +2826,7 @@
 <div class="artwork art-text alignLeft" id="section-6.2.12-2">
 <pre>
 fetch-timeout       =   "Fetch-Timeout" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-6.2.12-2" class="pilcrow">¶</a>
+</pre><a href="#section-6.2.12-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -2854,16 +2854,16 @@
           on requests.<a href="#section-6.2.13-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-6.2.13-2">
 <pre>
-cache-control    =    "Cache-Control" ":" 
+cache-control    =    "Cache-Control" ":"
                       [*WSP cache-directive
                       *( *WSP "," *WSP cache-directive *WSP )]
                       CRLF
 
-cache-directive     = "max-age" "=" delta-seconds    
+cache-directive     = "max-age" "=" delta-seconds
                     / "max-stale" [ "=" delta-seconds ]
-                    / "min-fresh" "=" delta-seconds 
+                    / "min-fresh" "=" delta-seconds
 
-delta-seconds       = 1*19DIGIT    
+delta-seconds       = 1*19DIGIT
 </pre><a href="#section-6.2.13-2" class="pilcrow">¶</a>
 </div>
 <p id="section-6.2.13-3">Here, delta-seconds is a decimal time value specifying the number
@@ -2929,7 +2929,7 @@
 <div class="artwork art-text alignLeft" id="section-6.2.14-3">
 <pre>
 logging-tag    = "Logging-Tag" ":" 1*UTFCHAR CRLF
-            </pre><a href="#section-6.2.14-3" class="pilcrow">¶</a>
+</pre><a href="#section-6.2.14-3" class="pilcrow">¶</a>
 </div>
 </section>
 <div id="sec.SetCookie">
@@ -3041,10 +3041,10 @@
 <div class="artwork art-text alignLeft" id="section-6.2.16-2">
 <pre>
 vendor-specific          =    "Vendor-Specific-Parameters" ":"
-                              [vendor-specific-av-pair 
-                              *(";" vendor-specific-av-pair)] CRLF 
+                              [vendor-specific-av-pair
+                              *(";" vendor-specific-av-pair)] CRLF
 
-vendor-specific-av-pair  = vendor-av-pair-name "=" 
+vendor-specific-av-pair  = vendor-av-pair-name "="
                            value
 
 vendor-av-pair-name     = 1*UTFCHAR
@@ -3199,14 +3199,14 @@
      Supported:foo
      Content-Type:application/sdp
      Content-Length:...
-     
+
      v=0
      o=sarvi 2890844536 2890842811 IN IP4 192.0.2.12
      s=-
      i=MRCPv2 server capabilities
      c=IN IP4 192.0.2.12/127
      t=0 0
-     m=application 0 TCP/TLS/MRCPv2 1 
+     m=application 0 TCP/TLS/MRCPv2 1
      a=resource:speechsynth
      a=resource:speechrecog
      a=resource:speakverify
@@ -3327,21 +3327,21 @@
         is associated with.<a href="#section-8.4-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-8.4-2">
 <pre>
-synthesizer-header  =  jump-size       
-                    /  kill-on-barge-in  
-                    /  speaker-profile   
+synthesizer-header  =  jump-size
+                    /  kill-on-barge-in
+                    /  speaker-profile
                     /  completion-cause
-                    /  completion-reason  
-                    /  voice-parameter   
+                    /  completion-reason
+                    /  voice-parameter
                     /  prosody-parameter
-                    /  speech-marker     
-                    /  speech-language 
-                    /  fetch-hint        
-                    /  audio-fetch-hint  
-                    /  failed-uri        
-                    /  failed-uri-cause  
-                    /  speak-restart     
-                    /  speak-length 
+                    /  speech-marker
+                    /  speech-language
+                    /  fetch-hint
+                    /  audio-fetch-hint
+                    /  failed-uri
+                    /  failed-uri-cause
+                    /  speak-restart
+                    /  speak-length
                     /  load-lexicon
                     /  lexicon-search-order
 </pre><a href="#section-8.4-2" class="pilcrow">¶</a>
@@ -3516,7 +3516,7 @@
           as an error in parsing the speech markup text.<a href="#section-8.4.5-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-8.4.5-2">
 <pre>
-completion-reason   =   "Completion-Reason" ":" 
+completion-reason   =   "Completion-Reason" ":"
                         quoted-string CRLF
 
 </pre><a href="#section-8.4.5-2" class="pilcrow">¶</a>
@@ -3648,7 +3648,7 @@
 <div class="artwork art-text alignLeft" id="section-8.4.9-2">
 <pre>
 speech-language     =   "Speech-Language" ":" 1*VCHAR CRLF
-            </pre><a href="#section-8.4.9-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.4.9-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-8.4.10">
@@ -3668,7 +3668,7 @@
 <pre>
 fetch-hint          =   "Fetch-Hint" ":"
                          ("prefetch" / "safe") CRLF
-            </pre><a href="#section-8.4.10-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.4.10-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-8.4.11">
@@ -3689,7 +3689,7 @@
 <pre>
 audio-fetch-hint    =   "Audio-Fetch-Hint" ":"
                         ("prefetch" / "safe" / "stream") CRLF
-            </pre><a href="#section-8.4.11-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.4.11-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-8.4.12">
@@ -3704,7 +3704,7 @@
 <div class="artwork art-text alignLeft" id="section-8.4.12-2">
 <pre>
 failed-uri          =   "Failed-URI" ":" absoluteURI CRLF
-            </pre><a href="#section-8.4.12-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.4.12-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-8.4.13">
@@ -3735,7 +3735,7 @@
 <div class="artwork art-text alignLeft" id="section-8.4.14-2">
 <pre>
 speak-restart       =   "Speak-Restart" ":" BOOLEAN CRLF
-            </pre><a href="#section-8.4.14-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.4.14-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-8.4.15">
@@ -3787,7 +3787,7 @@
 <div class="artwork art-text alignLeft" id="section-8.4.16-2">
 <pre>
 load-lexicon       =   "Load-Lexicon" ":" BOOLEAN CRLF
-            </pre><a href="#section-8.4.16-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.4.16-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -3806,7 +3806,7 @@
 <pre>
 lexicon-search-order =   "Lexicon-Search-Order" ":"
           "&lt;" absoluteURI "&gt;" *(" " "&lt;" absoluteURI "&gt;") CRLF
-            </pre><a href="#section-8.4.17-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.4.17-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -3876,7 +3876,7 @@
 Content-Length:...
 
 &lt;?xml version="1.0"?&gt;
-     &lt;speak version="1.0"                
+     &lt;speak version="1.0"
             xmlns="http://www.w3.org/2001/10/synthesis"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -3910,13 +3910,13 @@
 http://www.example.com/ASR-Document-Part1.ssml
 http://www.example.com/ASR-Document-Part2.ssml
 http://www.example.com/ASR-Conclusion.ssml
-    
+
 --break
 Content-Type:application/ssml+xml
 Content-Length:...
 
 &lt;?xml version="1.0"?&gt;
-    &lt;speak version="1.0"                
+    &lt;speak version="1.0"
            xmlns="http://www.w3.org/2001/10/synthesis"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4012,16 +4012,16 @@
 <span id="name-speak-example"></span><figure id="figure-11">
           <div class="artwork art-text alignLeft" id="section-8.6-7.1">
 <pre>
-C-&gt;S: MRCP/2.0 ... SPEAK 543257 
+C-&gt;S: MRCP/2.0 ... SPEAK 543257
       Channel-Identifier:32AECB23433802@speechsynth
       Voice-gender:neutral
       Voice-Age:25
       Prosody-volume:medium
       Content-Type:application/ssml+xml
       Content-Length:...
-      
+
       &lt;?xml version="1.0"?&gt;
-         &lt;speak version="1.0"                
+         &lt;speak version="1.0"
              xmlns="http://www.w3.org/2001/10/synthesis"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4033,7 +4033,7 @@
              &lt;break/&gt;
              &lt;say-as interpret-as="vxml:time"&gt;0342p&lt;/say-as&gt;.
              &lt;/s&gt;
-          &lt;s&gt;The subject is 
+          &lt;s&gt;The subject is
                  &lt;prosody rate="-20%"&gt;ski trip&lt;/prosody&gt;
           &lt;/s&gt;
          &lt;/p&gt;
@@ -4086,7 +4086,7 @@
       Content-Length:...
 
       &lt;?xml version="1.0"?&gt;
-        &lt;speak version="1.0"                
+        &lt;speak version="1.0"
              xmlns="http://www.w3.org/2001/10/synthesis"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4094,10 +4094,10 @@
              xml:lang="en-US"&gt;
          &lt;p&gt;
           &lt;s&gt;You have 4 new messages.&lt;/s&gt;
-          &lt;s&gt;The first is from Stephanie Williams and arrived at 
+          &lt;s&gt;The first is from Stephanie Williams and arrived at
              &lt;break/&gt;
              &lt;say-as interpret-as="vxml:time"&gt;0342p&lt;/say-as&gt;.&lt;/s&gt;
-          &lt;s&gt;The subject is 
+          &lt;s&gt;The subject is
               &lt;prosody rate="-20%"&gt;ski trip&lt;/prosody&gt;&lt;/s&gt;
          &lt;/p&gt;
         &lt;/speak&gt;
@@ -4128,7 +4128,7 @@
         means to communicate the occurrence of the event to the synthesizer
         resource.<a href="#section-8.8-1" class="pilcrow">¶</a></p>
 <p id="section-8.8-2">This method is useful in two scenarios:<a href="#section-8.8-2" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-8.8-3">
+<ol start="1" type="1" class="normal type-1" id="section-8.8-3">
           <li id="section-8.8-3.1">The client has detected DTMF digits in the input media or some
             other barge-in-able event and wants to communicate that to the
             synthesizer resource.<a href="#section-8.8-3.1" class="pilcrow">¶</a>
@@ -4178,7 +4178,7 @@
       Content-Length:...
 
       &lt;?xml version="1.0"?&gt;
-        &lt;speak version="1.0"                
+        &lt;speak version="1.0"
              xmlns="http://www.w3.org/2001/10/synthesis"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4186,10 +4186,10 @@
              xml:lang="en-US"&gt;
          &lt;p&gt;
           &lt;s&gt;You have 4 new messages.&lt;/s&gt;
-          &lt;s&gt;The first is from Stephanie Williams and arrived at 
+          &lt;s&gt;The first is from Stephanie Williams and arrived at
              &lt;break/&gt;
              &lt;say-as interpret-as="vxml:time"&gt;0342p&lt;/say-as&gt;.&lt;/s&gt;
-          &lt;s&gt;The subject is 
+          &lt;s&gt;The subject is
              &lt;prosody rate="-20%"&gt;ski trip&lt;/prosody&gt;&lt;/s&gt;
          &lt;/p&gt;
         &lt;/speak&gt;
@@ -4237,7 +4237,7 @@
       Content-Length:...
 
       &lt;?xml version="1.0"?&gt;
-        &lt;speak version="1.0"                
+        &lt;speak version="1.0"
              xmlns="http://www.w3.org/2001/10/synthesis"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4245,11 +4245,11 @@
              xml:lang="en-US"&gt;
          &lt;p&gt;
           &lt;s&gt;You have 4 new messages.&lt;/s&gt;
-          &lt;s&gt;The first is from Stephanie Williams and arrived at 
+          &lt;s&gt;The first is from Stephanie Williams and arrived at
              &lt;break/&gt;
              &lt;say-as interpret-as="vxml:time"&gt;0342p&lt;/say-as&gt;.&lt;/s&gt;
 
-          &lt;s&gt;The subject is 
+          &lt;s&gt;The subject is
              &lt;prosody rate="-20%"&gt;ski trip&lt;/prosody&gt;&lt;/s&gt;
          &lt;/p&gt;
         &lt;/speak&gt;
@@ -4293,9 +4293,9 @@
       Prosody-volume:medium
       Content-Type:application/ssml+xml
       Content-Length:...
-      
+
       &lt;?xml version="1.0"?&gt;
-        &lt;speak version="1.0"                
+        &lt;speak version="1.0"
              xmlns="http://www.w3.org/2001/10/synthesis"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4303,10 +4303,10 @@
              xml:lang="en-US"&gt;
          &lt;p&gt;
           &lt;s&gt;You have 4 new messages.&lt;/s&gt;
-          &lt;s&gt;The first is from Stephanie Williams and arrived at 
+          &lt;s&gt;The first is from Stephanie Williams and arrived at
              &lt;break/&gt;
              &lt;say-as interpret-as="vxml:time"&gt;0342p&lt;/say-as&gt;.&lt;/s&gt;
-          &lt;s&gt;The subject is 
+          &lt;s&gt;The subject is
              &lt;prosody rate="-20%"&gt;ski trip&lt;/prosody&gt;&lt;/s&gt;
          &lt;/p&gt;
         &lt;/speak&gt;
@@ -4375,9 +4375,9 @@
       Prosody-volume:medium
       Content-Type:application/ssml+xml
       Content-Length:...
-      
+
       &lt;?xml version="1.0"?&gt;
-        &lt;speak version="1.0"                
+        &lt;speak version="1.0"
              xmlns="http://www.w3.org/2001/10/synthesis"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4446,7 +4446,7 @@
       Content-Length:...
 
       &lt;?xml version="1.0"?&gt;
-        &lt;speak version="1.0"                
+        &lt;speak version="1.0"
              xmlns="http://www.w3.org/2001/10/synthesis"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4457,7 +4457,7 @@
           &lt;s&gt;The first is from Stephanie Williams
              and arrived at &lt;break/&gt;
              &lt;say-as interpret-as="vxml:time"&gt;0342p&lt;/say-as&gt;.&lt;/s&gt;
-          &lt;s&gt;The subject is 
+          &lt;s&gt;The subject is
              &lt;prosody rate="-20%"&gt;ski trip&lt;/prosody&gt;&lt;/s&gt;
          &lt;/p&gt;
         &lt;/speak&gt;
@@ -4504,9 +4504,9 @@
       Prosody-volume:medium
       Content-Type:application/ssml+xml
       Content-Length:...
-      
+
       &lt;?xml version="1.0"?&gt;
-        &lt;speak version="1.0"                
+        &lt;speak version="1.0"
              xmlns="http://www.w3.org/2001/10/synthesis"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4518,7 +4518,7 @@
              and arrived at &lt;break/&gt;
              &lt;say-as interpret-as="vxml:time"&gt;0342p&lt;/say-as&gt;.&lt;/s&gt;
              &lt;mark name="here"/&gt;
-          &lt;s&gt;The subject is 
+          &lt;s&gt;The subject is
              &lt;prosody rate="-20%"&gt;ski trip&lt;/prosody&gt;
           &lt;/s&gt;
           &lt;mark name="ANSWER"/&gt;
@@ -4588,7 +4588,7 @@
       generate asynchronous events to the client to indicate conditions of
       interest during the processing of the method.<a href="#section-9-2" class="pilcrow">¶</a></p>
 <p id="section-9-3">This section applies to the following resource types.<a href="#section-9-3" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9-4">
+<ol start="1" type="1" class="normal type-1" id="section-9-4">
         <li id="section-9-4.1">speechrecog<a href="#section-9-4.1" class="pilcrow">¶</a>
 </li>
 <li id="section-9-4.2">dtmfrecog<a href="#section-9-4.2" class="pilcrow">¶</a>
@@ -4688,7 +4688,7 @@
  |      STOP                                        |
  |&lt;------|                                          |
  |&lt;-------------------STOP--------------------------|
- |&lt;-------------------DEFINE-GRAMMAR----------------|      
+ |&lt;-------------------DEFINE-GRAMMAR----------------|
 </pre>
 </div>
 <figcaption><a href="#figure-19" class="selfRef">Figure 19</a>:
@@ -4862,7 +4862,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.2-2">
 <pre>
 sensitivity-level        =  "Sensitivity-Level" ":" FLOAT CRLF
-            </pre><a href="#section-9.4.2-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.2-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.3">
@@ -4883,7 +4883,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.3-2">
 <pre>
 speed-vs-accuracy        =  "Speed-Vs-Accuracy" ":" FLOAT CRLF
-            </pre><a href="#section-9.4.3-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.3-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.4">
@@ -4905,7 +4905,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.4-2">
 <pre>
 n-best-list-length       =  "N-Best-List-Length" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-9.4.4-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.4-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.5">
@@ -4920,7 +4920,7 @@
 <pre>
 input-type         =  "Input-Type" ":"  inputs CRLF
 inputs             =  "speech" / "dtmf"
-            </pre><a href="#section-9.4.5-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.5-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.6">
@@ -4939,7 +4939,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.6-2">
 <pre>
 no-input-timeout         =  "No-Input-Timeout" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-9.4.6-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.6-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.7">
@@ -4957,7 +4957,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.7-2">
 <pre>
 recognition-timeout      =  "Recognition-Timeout" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-9.4.7-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.7-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.8">
@@ -4991,10 +4991,10 @@
           associated with the header field.<a href="#section-9.4.8-3" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.4.8-4">
 <pre>
-waveform-uri             =  "Waveform-URI" ":" ["&lt;" uri "&gt;" 
-                            ";" "size" "=" 1*19DIGIT 
+waveform-uri             =  "Waveform-URI" ":" ["&lt;" uri "&gt;"
+                            ";" "size" "=" 1*19DIGIT
                             ";" "duration" "=" 1*19DIGIT] CRLF
-            </pre><a href="#section-9.4.8-4" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.8-4" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.9">
@@ -5007,9 +5007,9 @@
           captured and returned by the Waveform-URI header field.<a href="#section-9.4.9-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.4.9-2">
 <pre>
-media-type               =  "Media-Type" ":" media-type-value 
+media-type               =  "Media-Type" ":" media-type-value
                             CRLF
-            </pre><a href="#section-9.4.9-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.9-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.10">
@@ -5023,7 +5023,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.10-2">
 <pre>
 input-waveform-uri       =  "Input-Waveform-URI" ":" uri CRLF
-            </pre><a href="#section-9.4.10-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.10-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.11">
@@ -5044,7 +5044,7 @@
                             cause-name CRLF
 cause-code               =  3DIGIT
 cause-name               =  *VCHAR
-            </pre><a href="#section-9.4.11-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.11-2" class="pilcrow">¶</a>
 </div>
 <table class="center" id="table-6">
             <caption><a href="#table-6" class="selfRef">Table 6</a></caption>
@@ -5178,9 +5178,9 @@
           interpret the completion reason text.<a href="#section-9.4.12-2" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.4.12-3">
 <pre>
-completion-reason        =  "Completion-Reason" ":" 
+completion-reason        =  "Completion-Reason" ":"
                             quoted-string CRLF
-            </pre><a href="#section-9.4.12-3" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.12-3" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.13">
@@ -5208,7 +5208,7 @@
 <pre>
 recognizer-context-block  =  "Recognizer-Context-Block" ":"
                              [1*VCHAR] CRLF
-            </pre><a href="#section-9.4.13-4" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.13-4" class="pilcrow">¶</a>
 </div>
 </section>
 <div id="sec.startInputTimers">
@@ -5231,7 +5231,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.14-2">
 <pre>
 start-input-timers  =  "Start-Input-Timers" ":" BOOLEAN CRLF
-            </pre><a href="#section-9.4.14-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.14-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -5253,7 +5253,7 @@
 <pre>
 speech-complete-timeout = "Speech-Complete-Timeout" ":"
                           1*19DIGIT CRLF
-            </pre><a href="#section-9.4.15-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.15-2" class="pilcrow">¶</a>
 </div>
 <p id="section-9.4.15-3">A long Speech-Complete-Timeout value delays the result to the
           client and therefore makes the application's response to a user
@@ -5280,9 +5280,9 @@
           implementation specific.<a href="#section-9.4.16-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.4.16-2">
 <pre>
-speech-incomplete-timeout = "Speech-Incomplete-Timeout" ":" 1*19DIGIT 
+speech-incomplete-timeout = "Speech-Incomplete-Timeout" ":" 1*19DIGIT
                              CRLF
-            </pre><a href="#section-9.4.16-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.16-2" class="pilcrow">¶</a>
 </div>
 <p id="section-9.4.16-3">The Speech-Incomplete-Timeout also applies when the speech prior
           to the silence is a complete match of an active grammar, but where
@@ -5312,7 +5312,7 @@
 <pre>
 dtmf-interdigit-timeout = "DTMF-Interdigit-Timeout" ":"
                            1*19DIGIT CRLF
-            </pre><a href="#section-9.4.17-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.17-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.18">
@@ -5328,7 +5328,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.18-2">
 <pre>
 dtmf-term-timeout        =  "DTMF-Term-Timeout" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-9.4.18-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.18-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.19">
@@ -5342,7 +5342,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.19-2">
 <pre>
 dtmf-term-char           =  "DTMF-Term-Char" ":" VCHAR CRLF
-            </pre><a href="#section-9.4.19-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.19-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.20">
@@ -5357,7 +5357,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.20-2">
 <pre>
 failed-uri               =  "Failed-URI" ":" absoluteURI CRLF
-            </pre><a href="#section-9.4.20-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.20-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.21">
@@ -5374,7 +5374,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.21-2">
 <pre>
 failed-uri-cause         =  "Failed-URI-Cause" ":" 1*UTFCHAR CRLF
-            </pre><a href="#section-9.4.21-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.21-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.22">
@@ -5395,7 +5395,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.22-2">
 <pre>
 save-waveform            =  "Save-Waveform" ":" BOOLEAN CRLF
-            </pre><a href="#section-9.4.22-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.22-2" class="pilcrow">¶</a>
 </div>
 </section>
 <div id="sec.newAudioChannel">
@@ -5420,9 +5420,9 @@
           session for multiple telephone calls.<a href="#section-9.4.23-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.4.23-2">
 <pre>
-new-audio-channel        =  "New-Audio-Channel" ":" BOOLEAN 
+new-audio-channel        =  "New-Audio-Channel" ":" BOOLEAN
                             CRLF
-            </pre><a href="#section-9.4.23-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.23-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -5437,7 +5437,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.24-2">
 <pre>
 speech-language          =  "Speech-Language" ":" 1*VCHAR CRLF
-            </pre><a href="#section-9.4.24-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.24-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.25">
@@ -5523,7 +5523,7 @@
 <pre>
 hotword-max-duration     =  "Hotword-Max-Duration" ":" 1*19DIGIT
                             CRLF
-            </pre><a href="#section-9.4.28-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.28-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.29">
@@ -5543,7 +5543,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.29-2">
 <pre>
 hotword-min-duration     =  "Hotword-Min-Duration" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-9.4.29-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.29-2" class="pilcrow">¶</a>
 </div>
 </section>
 <div id="sec.interpretText">
@@ -5560,8 +5560,8 @@
           the INTERPRET method.<a href="#section-9.4.30-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.4.30-2">
 <pre>
-interpret-text           =  "Interpret-Text" ":" 1*VCHAR CRLF          
-            </pre><a href="#section-9.4.30-2" class="pilcrow">¶</a>
+interpret-text           =  "Interpret-Text" ":" 1*VCHAR CRLF
+</pre><a href="#section-9.4.30-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -5581,7 +5581,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.31-2">
 <pre>
 dtmf-buffer-time  =  "DTMF-Buffer-Time" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-9.4.31-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.31-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.32">
@@ -5599,7 +5599,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.32-2">
 <pre>
 clear-dtmf-buffer  = "Clear-DTMF-Buffer" ":" BOOLEAN CRLF
-            </pre><a href="#section-9.4.32-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.32-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.33">
@@ -5617,7 +5617,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.33-2">
 <pre>
 early-no-match  = "Early-No-Match" ":" BOOLEAN CRLF
-            </pre><a href="#section-9.4.33-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.33-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.34">
@@ -5631,9 +5631,9 @@
           implementation specific and MAY be greater than 1.<a href="#section-9.4.34-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.4.34-2">
 <pre>
-num-min-consistent-pronunciations  = 
+num-min-consistent-pronunciations  =
               "Num-Min-Consistent-Pronunciations" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-9.4.34-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.34-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.35">
@@ -5653,7 +5653,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.35-2">
 <pre>
 consistency-threshold    =  "Consistency-Threshold" ":" FLOAT CRLF
-            </pre><a href="#section-9.4.35-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.35-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.36">
@@ -5676,7 +5676,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.36-2">
 <pre>
 clash-threshold          =  "Clash-Threshold" ":" FLOAT CRLF
-            </pre><a href="#section-9.4.36-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.36-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.37">
@@ -5695,7 +5695,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.37-2">
 <pre>
 personal-grammar-uri     =  "Personal-Grammar-URI" ":" uri CRLF
-            </pre><a href="#section-9.4.37-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.37-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.38">
@@ -5711,7 +5711,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.38-2">
 <pre>
 enroll-utterance     =  "Enroll-Utterance" ":" BOOLEAN CRLF
-            </pre><a href="#section-9.4.38-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.38-2" class="pilcrow">¶</a>
 </div>
 </section>
 <div id="sec.phraseID">
@@ -5728,7 +5728,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.39-2">
 <pre>
 phrase-id                =  "Phrase-ID" ":" 1*VCHAR CRLF
-            </pre><a href="#section-9.4.39-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.39-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -5743,7 +5743,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.40-2">
 <pre>
 phrase-nl                =  "Phrase-NL" ":" 1*UTFCHAR CRLF
-            </pre><a href="#section-9.4.40-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.40-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.41">
@@ -5769,7 +5769,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.41-2">
 <pre>
 weight                   =  "Weight" ":" FLOAT CRLF
-            </pre><a href="#section-9.4.41-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.41-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.42">
@@ -5789,7 +5789,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.42-2">
 <pre>
 save-best-waveform  =  "Save-Best-Waveform" ":" BOOLEAN CRLF
-            </pre><a href="#section-9.4.42-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.42-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.43">
@@ -5803,7 +5803,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.43-2">
 <pre>
 new-phrase-id            =  "New-Phrase-ID" ":" 1*VCHAR CRLF
-            </pre><a href="#section-9.4.43-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.43-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.44">
@@ -5818,7 +5818,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.44-2">
 <pre>
 confusable-phrases-uri   =  "Confusable-Phrases-URI" ":" uri CRLF
-            </pre><a href="#section-9.4.44-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.44-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.45">
@@ -5830,9 +5830,9 @@
           phrase to the personal grammar.<a href="#section-9.4.45-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.4.45-2">
 <pre>
-abort-phrase-enrollment  =  "Abort-Phrase-Enrollment" ":" 
+abort-phrase-enrollment  =  "Abort-Phrase-Enrollment" ":"
                             BOOLEAN CRLF
-            </pre><a href="#section-9.4.45-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.45-2" class="pilcrow">¶</a>
 </div>
 </section>
 </section>
@@ -5936,8 +5936,8 @@
             &lt;one-of&gt;
                   &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;
                   &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
-            &lt;/one-of&gt; 
-      &lt;/rule&gt; 
+            &lt;/one-of&gt;
+      &lt;/rule&gt;
 
 &lt;!-- single language attachment to a rule expansion --&gt;
       &lt;rule id="request"&gt;
@@ -6012,8 +6012,8 @@
             &lt;one-of&gt;
                   &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;
                   &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
-            &lt;/one-of&gt; 
-      &lt;/rule&gt; 
+            &lt;/one-of&gt;
+      &lt;/rule&gt;
 
 &lt;!-- single language attachment to a rule expansion --&gt;
       &lt;rule id="request"&gt;
@@ -6159,7 +6159,7 @@
             uncertainty in speech recognition or natural language
             understanding. There are at least two reasons for providing
             multiple interpretations:<a href="#section-9.6.1.1-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.6.1.1-2">
+<ol start="1" type="1" class="normal type-1" id="section-9.6.1.1-2">
               <li id="section-9.6.1.1-2.1">The client application might have additional information,
                 for example, information from a database, that would allow it
                 to select a preferred interpretation from among the possible
@@ -6181,7 +6181,7 @@
 <p id="section-9.6.1.2-1">These are elements and attributes representing additional
             information about the interpretation, over and above the
             interpretation itself. Side information includes:<a href="#section-9.6.1.2-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.6.1.2-2">
+<ol start="1" type="1" class="normal type-1" id="section-9.6.1.2-2">
               <li id="section-9.6.1.2-2.1">Whether an interpretation was achieved (the &lt;nomatch&gt;
                 element) and the system's confidence in an interpretation (the
                 "confidence" attribute of &lt;interpretation&gt;).<a href="#section-9.6.1.2-2.1" class="pilcrow">¶</a>
@@ -6213,7 +6213,7 @@
 <a href="#section-9.6.2" class="section-number selfRef">9.6.2. </a><a href="#name-overview-of-recognizer-resu" class="section-name selfRef">Overview of Recognizer Result Elements and Their Relationships</a>
           </h4>
 <p id="section-9.6.2-1">The recognizer elements in NLSML fall into two categories:<a href="#section-9.6.2-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.6.2-2">
+<ol start="1" type="1" class="normal type-1" id="section-9.6.2-2">
             <li id="section-9.6.2-2.1">description of the input that was processed, and<a href="#section-9.6.2-2.1" class="pilcrow">¶</a>
 </li>
 <li id="section-9.6.2-2.2">description of the meaning which was extracted from the
@@ -6267,7 +6267,7 @@
             result, it can be overridden for individual interpretations at the
             &lt;interpretation&gt; level.<a href="#section-9.6.3.1-1" class="pilcrow">¶</a></p>
 <p id="section-9.6.3.1-2">Attributes:<a href="#section-9.6.3.1-2" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.6.3.1-3">
+<ol start="1" type="1" class="normal type-1" id="section-9.6.3.1-3">
               <li id="section-9.6.3.1-3.1">grammar: The grammar or recognition rule matched by this
                 result. The format of the grammar attribute will match the
                 rule reference semantics defined in the grammar specification.
@@ -6288,7 +6288,7 @@
 <pre>
 &lt;?xml version="1.0"?&gt;
 &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
-        grammar="http://www.example.com/grammar"&gt; 
+        grammar="http://www.example.com/grammar"&gt;
   &lt;interpretation&gt;
    ....
   &lt;/interpretation&gt;
@@ -6303,7 +6303,7 @@
 <p id="section-9.6.3.2-1">An &lt;interpretation&gt; element contains a single semantic
             interpretation.<a href="#section-9.6.3.2-1" class="pilcrow">¶</a></p>
 <p id="section-9.6.3.2-2">Attributes:<a href="#section-9.6.3.2-2" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.6.3.2-3">
+<ol start="1" type="1" class="normal type-1" id="section-9.6.3.2-3">
               <li id="section-9.6.3.2-3.1">confidence: A float value from 0.0-1.0 indicating the
                 semantic analyzer's confidence in this interpretation. A value
                 of 1.0 indicates maximum confidence. The values are
@@ -6359,7 +6359,7 @@
             objects created, nor any semantic translation, the instance value
             is the same as the input value.<a href="#section-9.6.3.3-1" class="pilcrow">¶</a></p>
 <p id="section-9.6.3.3-2">Attributes:<a href="#section-9.6.3.3-2" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.6.3.3-3">
+<ol start="1" type="1" class="normal type-1" id="section-9.6.3.3-3">
               <li id="section-9.6.3.3-3.1">confidence: Each element of the instance MAY have a
                 confidence attribute, defined in the NLSML namespace. The
                 confidence attribute contains a float value in the range from
@@ -6380,7 +6380,7 @@
       &lt;state&gt;CA&lt;/state&gt;
       &lt;zip&gt;90952&lt;/zip&gt;
   &lt;/nameAddress&gt;
-&lt;/instance&gt; 
+&lt;/instance&gt;
 &lt;input&gt;
   My address is 123 Maple Street,
   Mill Valley, California, 90952
@@ -6393,7 +6393,7 @@
 <pre>
 &lt;instance&gt;
     I would like to buy a coca-cola
-&lt;/instance&gt; 
+&lt;/instance&gt;
 &lt;input&gt;
   I would like to buy a coke
 &lt;/input&gt;
@@ -6418,7 +6418,7 @@
             spoken utterance, in <span><a href="#ISO.8601.1988" class="xref">ISO 8601
             format</a> [<a href="#ISO.8601.1988" class="xref">ISO.8601.1988</a>]</span>.<a href="#section-9.6.3.4-1" class="pilcrow">¶</a></p>
 <p id="section-9.6.3.4-2">Attributes:<a href="#section-9.6.3.4-2" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.6.3.4-3">
+<ol start="1" type="1" class="normal type-1" id="section-9.6.3.4-3">
               <li id="section-9.6.3.4-3.1">timestamp-start: The time at which the input began.
                 (optional)<a href="#section-9.6.3.4-3.1" class="pilcrow">¶</a>
 </li>
@@ -6441,7 +6441,7 @@
 <p id="section-9.6.3.4-5">When there is no time zone designator, ISO 8601 time
             representations default to local time.<a href="#section-9.6.3.4-5" class="pilcrow">¶</a></p>
 <p id="section-9.6.3.4-6">There are three possible formats for the &lt;input&gt; element.<a href="#section-9.6.3.4-6" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.6.3.4-7">
+<ol start="1" type="1" class="normal type-1" id="section-9.6.3.4-7">
               <li id="section-9.6.3.4-7.1">
                 <p id="section-9.6.3.4-7.1.1">The &lt;input&gt; element can contain simple text:<a href="#section-9.6.3.4-7.1.1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.6.3.4-7.1.2">
@@ -6465,12 +6465,12 @@
                 for individual words and word-level confidences.<a href="#section-9.6.3.4-7.2.1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.6.3.4-7.2.2">
 <pre>
-    &lt;input&gt; 
+    &lt;input&gt;
          &lt;input mode="speech" confidence="0.5"
-             timestamp-start="2000-04-03T0:00:00" 
+             timestamp-start="2000-04-03T0:00:00"
              timestamp-end="2000-04-03T0:00:00.2"&gt;fried&lt;/input&gt;
          &lt;input mode="speech" confidence="1.0"
-             timestamp-start="2000-04-03T0:00:00.25" 
+             timestamp-start="2000-04-03T0:00:00.25"
              timestamp-end="2000-04-03T0:00:00.6"&gt;onions&lt;/input&gt;
     &lt;/input&gt;
 </pre><a href="#section-9.6.3.4-7.2.2" class="pilcrow">¶</a>
@@ -6497,14 +6497,14 @@
 <pre>
 &lt;interpretation&gt;
    &lt;instance/&gt;
-      &lt;input confidence="0.1"&gt; 
+      &lt;input confidence="0.1"&gt;
          &lt;nomatch/&gt;
       &lt;/input&gt;
 &lt;/interpretation&gt;
-&lt;interpretation&gt;  
-   &lt;instance/&gt;       
-   &lt;input mode="speech" confidence="0.1"&gt;           
-     &lt;nomatch&gt;I want to go to New York&lt;/nomatch&gt;       
+&lt;interpretation&gt;
+   &lt;instance/&gt;
+   &lt;input mode="speech" confidence="0.1"&gt;
+     &lt;nomatch&gt;I want to go to New York&lt;/nomatch&gt;
    &lt;/input&gt;
 &lt;/interpretation&gt;
 </pre><a href="#section-9.6.3.5-2" class="pilcrow">¶</a>
@@ -6533,7 +6533,7 @@
             in DTMF modality". For example, to represent garbled speech
             combined with DTMF "1 2 3 4", the markup would be:<a href="#section-9.6.3.6-3" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.6.3.6-4">
-<pre>&lt;input&gt; 
+<pre>&lt;input&gt;
    &lt;input mode="speech"&gt;&lt;nomatch/&gt;&lt;/input&gt;
    &lt;input mode="dtmf"&gt;1 2 3 4&lt;/input&gt;
 &lt;/input&gt;</pre><a href="#section-9.6.3.6-4" class="pilcrow">¶</a>
@@ -6555,7 +6555,7 @@
         &lt;enrollment‑result&gt; element under &lt;result&gt;. The elements
         are described below and have the schema defined in <a href="#sec.enrollmentResultsSchema" class="xref">Section 16.2</a>. The following elements
         are defined:<a href="#section-9.7-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.7-2">
+<ol start="1" type="1" class="normal type-1" id="section-9.7-2">
           <li id="section-9.7-2.1">num-clashes<a href="#section-9.7-2.1" class="pilcrow">¶</a>
 </li>
 <li id="section-9.7-2.2">num-good-repetitions<a href="#section-9.7-2.2" class="pilcrow">¶</a>
@@ -6686,8 +6686,8 @@
             &lt;one-of&gt;
                   &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;
                   &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
-            &lt;/one-of&gt; 
-      &lt;/rule&gt; 
+            &lt;/one-of&gt;
+      &lt;/rule&gt;
 
 &lt;!-- single language attachment to a rule expansion --&gt;
       &lt;rule id="request"&gt;
@@ -6737,8 +6737,8 @@
                   "http://www.w3.org/TR/speech-grammar/grammar.dtd"&gt;
 
 &lt;grammar xmlns="http://www.w3.org/2001/06/grammar" xml:lang="en"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-       xsi:schemaLocation="http://www.w3.org/2001/06/grammar 
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.w3.org/2001/06/grammar
            http://www.w3.org/TR/speech-grammar/grammar.xsd"
            version="1.0" mode="voice" root="basicCmd"&gt;
 
@@ -6748,7 +6748,7 @@
   &lt;example&gt; please move the window &lt;/example&gt;
   &lt;example&gt; open a file &lt;/example&gt;
 
-  &lt;ruleref 
+  &lt;ruleref
     uri="http://grammar.example.com/politeness.grxml#startPolite"/&gt;
 
   &lt;ruleref uri="#command"/&gt;
@@ -6806,7 +6806,7 @@
 
 S-&gt;C:MRCP/2.0 ... START-OF-INPUT 543260 IN-PROGRESS
 Channel-Identifier:32AECB23433801@speechrecog
-        
+
 S-&gt;C:MRCP/2.0 ... RECOGNITION-COMPLETE 543260 COMPLETE
 Channel-Identifier:32AECB23433801@speechrecog
 Completion-Cause:000 success
@@ -6864,7 +6864,7 @@
         useful in applications like VoiceXML browsers to order grammars
         specified at the dialog, document, and root level of a VoiceXML
         application.<a href="#section-9.9-3" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.9-4">
+<ol start="1" type="1" class="normal type-1" id="section-9.9-4">
           <li id="section-9.9-4.1">The grammar MAY be placed directly in the message body as typed
             content. If more than one grammar is included in the body, the
             order of inclusion controls the corresponding precedence for the
@@ -6961,7 +6961,7 @@
         the Speech-Complete-Timer is started. If it matches partially with one
         or more of the active grammars, with more speech needed before a full
         match is achieved, then the Speech-Incomplete-Timer is started.<a href="#section-9.9-15" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.9-16">
+<ol start="1" type="1" class="normal type-1" id="section-9.9-16">
           <li id="section-9.9-16.1">When the No-Input-Timer expires, the recognizer MUST complete
         with a Completion-Cause code of "no-input-timeout".<a href="#section-9.9-16.1" class="pilcrow">¶</a>
 </li>
@@ -7006,7 +7006,7 @@
 <p id="section-9.9-17">For recognition in hotword mode:<a href="#section-9.9-17" class="pilcrow">¶</a></p>
 <p id="section-9.9-18">Note that for recognition in hotword mode the START-OF-INPUT event is
         not generated when speech or a DTMF digit is detected.<a href="#section-9.9-18" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.9-19">
+<ol start="1" type="1" class="normal type-1" id="section-9.9-19">
           <li id="section-9.9-19.1">When the No-Input-Timer expires, the recognizer MUST complete
         with a Completion-Cause code of "no-input-timeout".<a href="#section-9.9-19.1" class="pilcrow">¶</a>
 </li>
@@ -7043,7 +7043,7 @@
 &lt;?xml version="1.0"?&gt;
 
 &lt;!-- the default grammar language is US English --&gt;
-&lt;grammar xmlns="http://www.w3.org/2001/06/grammar" 
+&lt;grammar xmlns="http://www.w3.org/2001/06/grammar"
          xml:lang="en-US" version="1.0" root="request"&gt;
 
 &lt;!-- single language attachment to tokens --&gt;
@@ -7051,8 +7051,8 @@
             &lt;one-of&gt;
                   &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;
                   &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
-            &lt;/one-of&gt; 
-      &lt;/rule&gt; 
+            &lt;/one-of&gt;
+      &lt;/rule&gt;
 
 &lt;!-- single language attachment to a rule expansion --&gt;
       &lt;rule id="request"&gt;
@@ -7070,7 +7070,7 @@
 
 S-&gt;C:MRCP/2.0 ... START-OF-INPUT 543257 IN-PROGRESS
 Channel-Identifier:32AECB23433801@speechrecog
-        
+
 S-&gt;C:MRCP/2.0 ... RECOGNITION-COMPLETE 543257 COMPLETE
 Channel-Identifier:32AECB23433801@speechrecog
 Completion-Cause:000 success
@@ -7100,14 +7100,14 @@
 occur in normal usage.<a href="#section-9.9-22" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.9-23">
 <pre>
-C-&gt;S:   MRCP/2.0 ... RECOGNIZE 543257 
-        Channel-Identifier:32AECB23433801@speechrecog 
-        Confidence-Threshold:0.9 
+C-&gt;S:   MRCP/2.0 ... RECOGNIZE 543257
+        Channel-Identifier:32AECB23433801@speechrecog
+        Confidence-Threshold:0.9
         Fetch-Timeout:20
-        Content-Type:application/srgs+xml 
+        Content-Type:application/srgs+xml
         Content-Length:...
-        
-        &lt;?xml version="1.0"? Version="1.0" mode="voice" 
+
+        &lt;?xml version="1.0"? Version="1.0" mode="voice"
               root="Basic md"&gt;
          &lt;rule id="rule_list" scope="public"&gt;
              &lt;one-of&gt;
@@ -7151,7 +7151,7 @@
         Content-Type:application/srgs+xml
         Content-ID:&lt;request1@form-level.store&gt;
         Content-Length:...
-        
+
         &lt;?xml version="1.0"?&gt;
 
         &lt;!-- the default grammar language is US English --&gt;
@@ -7163,8 +7163,8 @@
                 &lt;one-of&gt;
                       &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;
                       &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
-                &lt;/one-of&gt; 
-            &lt;/rule&gt; 
+                &lt;/one-of&gt;
+            &lt;/rule&gt;
 
         &lt;!-- single language attachment to a rule expansion --&gt;
             &lt;rule id="request"&gt;
@@ -7209,13 +7209,13 @@
 C-&gt;S:   MRCP/2.0 ... GET-RESULT 543257
         Channel-Identifier:32AECB23433801@speechrecog
         Confidence-Threshold:0.9
-        
+
 
 S-&gt;C:   MRCP/2.0 ... 543257 200 COMPLETE
         Channel-Identifier:32AECB23433801@speechrecog
         Content-Type:application/nlsml+xml
         Content-Length:...
-        
+
         &lt;?xml version="1.0"?&gt;
         &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                 xmlns:ex="http://www.example.com/example"
@@ -7297,7 +7297,7 @@
         Content-Type:application/srgs+xml
         Content-ID:&lt;request1@form-level.store&gt;
         Content-Length:...
-        
+
         &lt;?xml version="1.0"?&gt;
 
         &lt;!-- the default grammar language is US English --&gt;
@@ -7309,8 +7309,8 @@
                    &lt;one-of&gt;
                        &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;
                        &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
-                   &lt;/one-of&gt; 
-              &lt;/rule&gt; 
+                   &lt;/one-of&gt;
+              &lt;/rule&gt;
 
         &lt;!-- single language attachment to a rule expansion --&gt;
               &lt;rule id="request"&gt;
@@ -7327,7 +7327,7 @@
 
 S-&gt;C:   MRCP/2.0 ... START-OF-INPUT 543257 IN-PROGRESS
         Channel-Identifier:32AECB23433801@speechrecog
-        
+
 S-&gt;C:   MRCP/2.0 ... RECOGNITION-COMPLETE 543257 COMPLETE
         Channel-Identifier:32AECB23433801@speechrecog
         Completion-Cause:000 success
@@ -7335,7 +7335,7 @@
                      size=342456;duration=25435
         Content-Type:application/nlsml+xml
         Content-Length:...
-        
+
         &lt;?xml version="1.0"?&gt;
         &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                 xmlns:ex="http://www.example.com/example"
@@ -7360,22 +7360,22 @@
         Completion-Cause:000 success
         Content-Type:application/nlsml+xml
         Content-Length:...
-        
+
         &lt;?xml version= "1.0"?&gt;
         &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                 grammar="Personal-Grammar-URI"&gt;
             &lt;enrollment-result&gt;
                 &lt;num-clashes&gt; 2 &lt;/num-clashes&gt;
                 &lt;num-good-repetitions&gt; 1 &lt;/num-good-repetitions&gt;
-                &lt;num-repetitions-still-needed&gt; 
-                   1 
+                &lt;num-repetitions-still-needed&gt;
+                   1
                 &lt;/num-repetitions-still-needed&gt;
                 &lt;consistency-status&gt; consistent &lt;/consistency-status&gt;
-                &lt;clash-phrase-ids&gt; 
-                    &lt;item&gt; Jeff &lt;/item&gt; &lt;item&gt; Andre &lt;/item&gt; 
+                &lt;clash-phrase-ids&gt;
+                    &lt;item&gt; Jeff &lt;/item&gt; &lt;item&gt; Andre &lt;/item&gt;
                 &lt;/clash-phrase-ids&gt;
                 &lt;transcriptions&gt;
-                     &lt;item&gt; m ay b r ow k er &lt;/item&gt; 
+                     &lt;item&gt; m ay b r ow k er &lt;/item&gt;
                      &lt;item&gt; m ax r aa k ah &lt;/item&gt;
                 &lt;/transcriptions&gt;
                 &lt;confusable-phrases&gt;
@@ -7483,7 +7483,7 @@
 <pre>
 C-&gt;S:   MRCP/2.0 ... END-PHRASE-ENROLLMENT 543262
         Channel-Identifier:32AECB23433801@speechrecog
-    
+
 
 S-&gt;C:   MRCP/2.0 ... 543262 200 COMPLETE
         Channel-Identifier:32AECB23433801@speechrecog
@@ -7503,7 +7503,7 @@
         effect.<a href="#section-9.18-2" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.18-3">
 <pre>
-C-&gt;S:   MRCP/2.0 ... MODIFY-PHRASE 543265    
+C-&gt;S:   MRCP/2.0 ... MODIFY-PHRASE 543265
         Channel-Identifier:32AECB23433801@speechrecog
         Personal-Grammar-URI:&lt;personal grammar uri&gt;
         Phrase-Id:&lt;phrase id&gt;
@@ -7511,7 +7511,7 @@
         Phrase-NL:&lt;NL phrase&gt;
         Weight:1
 
-S-&gt;C:   MRCP/2.0 ... 543265 200 COMPLETE 
+S-&gt;C:   MRCP/2.0 ... 543265 200 COMPLETE
         Channel-Identifier:32AECB23433801@speechrecog</pre><a href="#section-9.18-3" class="pilcrow">¶</a>
 </div>
 </section>
@@ -7557,56 +7557,56 @@
 <div class="artwork art-text alignLeft" id="section-9.20-4">
 <pre>
 C-&gt;S:   MRCP/2.0 ... INTERPRET 543266
-        Channel-Identifier:32AECB23433801@speechrecog 
-        Interpret-Text:may I speak to Andre Roy 
-        Content-Type:application/srgs+xml  
-        Content-ID:&lt;request1@form-level.store&gt;  
+        Channel-Identifier:32AECB23433801@speechrecog
+        Interpret-Text:may I speak to Andre Roy
+        Content-Type:application/srgs+xml
+        Content-ID:&lt;request1@form-level.store&gt;
         Content-Length:...
-        
-        &lt;?xml version="1.0"?&gt;  
-        &lt;!-- the default grammar language is US English --&gt;  
+
+        &lt;?xml version="1.0"?&gt;
+        &lt;!-- the default grammar language is US English --&gt;
         &lt;grammar xmlns="http://www.w3.org/2001/06/grammar"
-                 xml:lang="en-US" version="1.0" root="request"&gt;  
-        &lt;!-- single language attachment to tokens --&gt;  
-            &lt;rule id="yes"&gt;  
-                &lt;one-of&gt;  
-                    &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;  
-                    &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;  
-                &lt;/one-of&gt;   
-            &lt;/rule&gt;   
-        
-        &lt;!-- single language attachment to a rule expansion --&gt;  
-            &lt;rule id="request"&gt;  
-                may I speak to  
-                &lt;one-of xml:lang="fr-CA"&gt;  
-                    &lt;item&gt;Michel Tremblay&lt;/item&gt;  
-                    &lt;item&gt;Andre Roy&lt;/item&gt;  
-                &lt;/one-of&gt;  
-            &lt;/rule&gt;  
-        &lt;/grammar&gt;  
-              
+                 xml:lang="en-US" version="1.0" root="request"&gt;
+        &lt;!-- single language attachment to tokens --&gt;
+            &lt;rule id="yes"&gt;
+                &lt;one-of&gt;
+                    &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;
+                    &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
+                &lt;/one-of&gt;
+            &lt;/rule&gt;
+
+        &lt;!-- single language attachment to a rule expansion --&gt;
+            &lt;rule id="request"&gt;
+                may I speak to
+                &lt;one-of xml:lang="fr-CA"&gt;
+                    &lt;item&gt;Michel Tremblay&lt;/item&gt;
+                    &lt;item&gt;Andre Roy&lt;/item&gt;
+                &lt;/one-of&gt;
+            &lt;/rule&gt;
+        &lt;/grammar&gt;
+
 S-&gt;C:   MRCP/2.0 ... 543266 200 IN-PROGRESS
         Channel-Identifier:32AECB23433801@speechrecog
-                   
+
 S-&gt;C:   MRCP/2.0 ... INTERPRETATION-COMPLETE 543266 200 COMPLETE
         Channel-Identifier:32AECB23433801@speechrecog
-        Completion-Cause:000 success  
-        Content-Type:application/nlsml+xml  
+        Completion-Cause:000 success
+        Content-Type:application/nlsml+xml
         Content-Length:...
-        
-        &lt;?xml version="1.0"?&gt;  
+
+        &lt;?xml version="1.0"?&gt;
         &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                 xmlns:ex="http://www.example.com/example"
-                grammar="session:request1@form-level.store"&gt;  
-            &lt;interpretation&gt;  
-                &lt;instance name="Person"&gt;  
-                    &lt;ex:Person&gt;  
-                        &lt;ex:Name&gt; Andre Roy &lt;/ex:Name&gt;  
-                    &lt;/ex:Person&gt;  
-                &lt;/instance&gt;  
-                &lt;input&gt;   may I speak to Andre Roy &lt;/input&gt;  
-            &lt;/interpretation&gt;  
-        &lt;/result&gt; 
+                grammar="session:request1@form-level.store"&gt;
+            &lt;interpretation&gt;
+                &lt;instance name="Person"&gt;
+                    &lt;ex:Person&gt;
+                        &lt;ex:Name&gt; Andre Roy &lt;/ex:Name&gt;
+                    &lt;/ex:Person&gt;
+                &lt;/instance&gt;
+                &lt;input&gt;   may I speak to Andre Roy &lt;/input&gt;
+            &lt;/interpretation&gt;
+        &lt;/result&gt;
 </pre><a href="#section-9.20-4" class="pilcrow">¶</a>
 </div>
 </section>
@@ -7625,55 +7625,55 @@
 <div class="artwork art-text alignLeft" id="section-9.21-3">
 <pre>
 C-&gt;S:    MRCP/2.0 ... INTERPRET 543266
-        Channel-Identifier:32AECB23433801@speechrecog 
-        Interpret-Text:may I speak to Andre Roy 
-        Content-Type:application/srgs+xml  
-        Content-ID:&lt;request1@form-level.store&gt;  
+        Channel-Identifier:32AECB23433801@speechrecog
+        Interpret-Text:may I speak to Andre Roy
+        Content-Type:application/srgs+xml
+        Content-ID:&lt;request1@form-level.store&gt;
         Content-Length:...
-        
-        &lt;?xml version="1.0"?&gt;  
-        &lt;!-- the default grammar language is US English --&gt;  
+
+        &lt;?xml version="1.0"?&gt;
+        &lt;!-- the default grammar language is US English --&gt;
         &lt;grammar xmlns="http://www.w3.org/2001/06/grammar"
-                 xml:lang="en-US" version="1.0" root="request"&gt;  
-        &lt;!-- single language attachment to tokens --&gt;  
-            &lt;rule id="yes"&gt;  
-                &lt;one-of&gt;  
+                 xml:lang="en-US" version="1.0" root="request"&gt;
+        &lt;!-- single language attachment to tokens --&gt;
+            &lt;rule id="yes"&gt;
+                &lt;one-of&gt;
                     &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;
                     &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
                 &lt;/one-of&gt;
             &lt;/rule&gt;
-        
-        &lt;!-- single language attachment to a rule expansion --&gt;  
-            &lt;rule id="request"&gt;  
-                may I speak to  
-                &lt;one-of xml:lang="fr-CA"&gt;  
-                    &lt;item&gt;Michel Tremblay&lt;/item&gt;  
-                    &lt;item&gt;Andre Roy&lt;/item&gt;  
-                &lt;/one-of&gt;  
-            &lt;/rule&gt;      
-        &lt;/grammar&gt;  
-              
+
+        &lt;!-- single language attachment to a rule expansion --&gt;
+            &lt;rule id="request"&gt;
+                may I speak to
+                &lt;one-of xml:lang="fr-CA"&gt;
+                    &lt;item&gt;Michel Tremblay&lt;/item&gt;
+                    &lt;item&gt;Andre Roy&lt;/item&gt;
+                &lt;/one-of&gt;
+            &lt;/rule&gt;
+        &lt;/grammar&gt;
+
 S-&gt;C:    MRCP/2.0 ... 543266 200 IN-PROGRESS
         Channel-Identifier:32AECB23433801@speechrecog
-                   
+
 S-&gt;C:    MRCP/2.0 ... INTERPRETATION-COMPLETE 543266 200 COMPLETE
         Channel-Identifier:32AECB23433801@speechrecog
-        Completion-Cause:000 success  
-        Content-Type:application/nlsml+xml  
+        Completion-Cause:000 success
+        Content-Type:application/nlsml+xml
         Content-Length:...
-        
-        &lt;?xml version="1.0"?&gt;  
+
+        &lt;?xml version="1.0"?&gt;
         &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                 xmlns:ex="http://www.example.com/example"
-                grammar="session:request1@form-level.store"&gt;  
-            &lt;interpretation&gt;  
-                &lt;instance name="Person"&gt;  
-                    &lt;ex:Person&gt;  
-                        &lt;ex:Name&gt; Andre Roy &lt;/ex:Name&gt;  
-                    &lt;/ex:Person&gt;  
-                &lt;/instance&gt;  
-                &lt;input&gt;   may I speak to Andre Roy &lt;/input&gt;  
-            &lt;/interpretation&gt;  
+                grammar="session:request1@form-level.store"&gt;
+            &lt;interpretation&gt;
+                &lt;instance name="Person"&gt;
+                    &lt;ex:Person&gt;
+                        &lt;ex:Name&gt; Andre Roy &lt;/ex:Name&gt;
+                    &lt;/ex:Person&gt;
+                &lt;/instance&gt;
+                &lt;input&gt;   may I speak to Andre Roy &lt;/input&gt;
+            &lt;/interpretation&gt;
         &lt;/result&gt;
 </pre><a href="#section-9.21-3" class="pilcrow">¶</a>
 </div>
@@ -7696,7 +7696,7 @@
       </h2>
 <p id="section-10-1">This resource captures received audio and video and stores it as
       content pointed to by a URI. The main usages of recorders are<a href="#section-10-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-10-2">
+<ol start="1" type="1" class="normal type-1" id="section-10-2">
         <li id="section-10-2.1">to capture speech audio that may be submitted for recognition at
           a later time, and<a href="#section-10-2.1" class="pilcrow">¶</a>
 </li>
@@ -7756,7 +7756,7 @@
 recorder-method      =  "RECORD"
                      /  "STOP"
                      /  "START-INPUT-TIMERS"
-                    </pre><a href="#section-10.2-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.2-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.3">
@@ -7768,7 +7768,7 @@
 <pre>
 recorder-event       =  "START-OF-INPUT"
                      /  "RECORD-COMPLETE"
-                    </pre><a href="#section-10.3-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.3-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4">
@@ -7781,7 +7781,7 @@
         associated with.<a href="#section-10.4-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-10.4-2">
 <pre>
-recorder-header      =  sensitivity-level        
+recorder-header      =  sensitivity-level
                      /  no-input-timeout
                      /  completion-cause
                      /  completion-reason
@@ -7796,7 +7796,7 @@
                      /  ver-buffer-utterance
                      /  start-input-timers
                      /  new-audio-channel
-                    </pre><a href="#section-10.4-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4-2" class="pilcrow">¶</a>
 </div>
 <section id="section-10.4.1">
           <h4 id="name-sensitivity-level-2">
@@ -7812,7 +7812,7 @@
 <div class="artwork art-text alignLeft" id="section-10.4.1-2">
 <pre>
 sensitivity-level    =     "Sensitivity-Level" ":" FLOAT CRLF
-            </pre><a href="#section-10.4.1-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.1-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.2">
@@ -7830,7 +7830,7 @@
 <div class="artwork art-text alignLeft" id="section-10.4.2-2">
 <pre>
 no-input-timeout    =     "No-Input-Timeout" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-10.4.2-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.2-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.3">
@@ -7851,7 +7851,7 @@
                             cause-name CRLF
 cause-code               =  3DIGIT
 cause-name               =  *VCHAR
-            </pre><a href="#section-10.4.3-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.3-2" class="pilcrow">¶</a>
 </div>
 <table class="center" id="table-7">
             <caption><a href="#table-7" class="selfRef">Table 7</a></caption>
@@ -7908,7 +7908,7 @@
 <pre>
 completion-reason        =  "Completion-Reason" ":"
                             quoted-string CRLF
-                        </pre><a href="#section-10.4.4-3" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.4-3" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.5">
@@ -7921,7 +7921,7 @@
 <div class="artwork art-text alignLeft" id="section-10.4.5-2">
 <pre>
 failed-uri               =  "Failed-URI" ":" absoluteURI CRLF
-            </pre><a href="#section-10.4.5-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.5-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.6">
@@ -7937,9 +7937,9 @@
           response code.<a href="#section-10.4.6-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-10.4.6-2">
 <pre>
-failed-uri-cause         =  "Failed-URI-Cause" ":" 1*UTFCHAR 
+failed-uri-cause         =  "Failed-URI-Cause" ":" 1*UTFCHAR
                             CRLF
-            </pre><a href="#section-10.4.6-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.6-2" class="pilcrow">¶</a>
 </div>
 </section>
 <div id="sec.recordURI">
@@ -7966,10 +7966,10 @@
           implementations already exist that support other schemes.<a href="#section-10.4.7-3" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-10.4.7-4">
 <pre>
-record-uri               =  "Record-URI" ":" ["&lt;" uri "&gt;" 
-                            ";" "size" "=" 1*19DIGIT 
+record-uri               =  "Record-URI" ":" ["&lt;" uri "&gt;"
+                            ";" "size" "=" 1*19DIGIT
                             ";" "duration" "=" 1*19DIGIT] CRLF
-            </pre><a href="#section-10.4.7-4" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.7-4" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -7981,9 +7981,9 @@
           to the server the media type of the captured audio or video.<a href="#section-10.4.8-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-10.4.8-2">
 <pre>
-media-type               =  "Media-Type" ":" media-type-value 
+media-type               =  "Media-Type" ":" media-type-value
                             CRLF
-            </pre><a href="#section-10.4.8-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.8-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.9">
@@ -8006,7 +8006,7 @@
 <div class="artwork art-text alignLeft" id="section-10.4.9-2">
 <pre>
 max-time                 =  "Max-Time" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-10.4.9-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.9-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.10">
@@ -8020,7 +8020,7 @@
 <div class="artwork art-text alignLeft" id="section-10.4.10-2">
 <pre>
 trim-length                 =  "Trim-Length" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-10.4.10-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.10-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.11">
@@ -8039,7 +8039,7 @@
 <div class="artwork art-text alignLeft" id="section-10.4.11-2">
 <pre>
 final-silence            =  "Final-Silence" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-10.4.11-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.11-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.12">
@@ -8055,7 +8055,7 @@
 <div class="artwork art-text alignLeft" id="section-10.4.12-2">
 <pre>
 capture-on-speech        =  "Capture-On-Speech " ":" BOOLEAN CRLF
-            </pre><a href="#section-10.4.12-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.12-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.13">
@@ -8091,7 +8091,7 @@
 <pre>
 start-input-timers       =  "Start-Input-Timers" ":"
                             BOOLEAN CRLF
-                        </pre><a href="#section-10.4.14-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.14-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.15">
@@ -8148,20 +8148,20 @@
 <pre>
 C-&gt;S:  MRCP/2.0 ... RECORD 543257
        Channel-Identifier:32AECB23433802@recorder
-       Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;  
+       Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;
        Media-Type:audio/wav
        Capture-On-Speech:true
        Final-Silence:300
        Max-Time:6000
-           
-S-&gt;C:  MRCP/2.0 ... 543257 200 IN-PROGRESS 
-       Channel-Identifier:32AECB23433802@recorder           
-
-S-&gt;C:  MRCP/2.0 ... START-OF-INPUT 543257 IN-PROGRESS 
-       Channel-Identifier:32AECB23433802@recorder           
-            
-S-&gt;C:  MRCP/2.0 ... RECORD-COMPLETE 543257 COMPLETE 
-       Channel-Identifier:32AECB23433802@recorder          
+
+S-&gt;C:  MRCP/2.0 ... 543257 200 IN-PROGRESS
+       Channel-Identifier:32AECB23433802@recorder
+
+S-&gt;C:  MRCP/2.0 ... START-OF-INPUT 543257 IN-PROGRESS
+       Channel-Identifier:32AECB23433802@recorder
+
+S-&gt;C:  MRCP/2.0 ... RECORD-COMPLETE 543257 COMPLETE
+       Channel-Identifier:32AECB23433802@recorder
        Completion-Cause:000 success-silence
        Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;;
                   size=242552;duration=25645
@@ -8194,23 +8194,23 @@
 <pre>
 C-&gt;S:  MRCP/2.0 ... RECORD 543257
        Channel-Identifier:32AECB23433802@recorder
-       Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;  
+       Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;
        Capture-On-Speech:true
        Final-Silence:300
        Max-Time:6000
-           
-S-&gt;C:  MRCP/2.0 ... 543257 200 IN-PROGRESS 
-       Channel-Identifier:32AECB23433802@recorder           
-
-S-&gt;C:  MRCP/2.0 ... START-OF-INPUT 543257 IN-PROGRESS 
-       Channel-Identifier:32AECB23433802@recorder           
-            
+
+S-&gt;C:  MRCP/2.0 ... 543257 200 IN-PROGRESS
+       Channel-Identifier:32AECB23433802@recorder
+
+S-&gt;C:  MRCP/2.0 ... START-OF-INPUT 543257 IN-PROGRESS
+       Channel-Identifier:32AECB23433802@recorder
+
 C-&gt;S:  MRCP/2.0 ... STOP 543257
-       Channel-Identifier:32AECB23433802@recorder           
+       Channel-Identifier:32AECB23433802@recorder
        Trim-Length:200
-           
-S-&gt;C:  MRCP/2.0 ... 543257 200 COMPLETE 
-       Channel-Identifier:32AECB23433802@recorder           
+
+S-&gt;C:  MRCP/2.0 ... 543257 200 COMPLETE
+       Channel-Identifier:32AECB23433802@recorder
        Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;;
                   size=324253;duration=24561
        Active-Request-Id-List:543257
@@ -8235,19 +8235,19 @@
 <pre>
 C-&gt;S:  MRCP/2.0 ... RECORD 543257
        Channel-Identifier:32AECB23433802@recorder
-       Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;  
+       Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;
        Capture-On-Speech:true
        Final-Silence:300
        Max-Time:6000
-           
-S-&gt;C:  MRCP/2.0 ... 543257 200 IN-PROGRESS 
-       Channel-Identifier:32AECB23433802@recorder           
-
-S-&gt;C:  MRCP/2.0 ... START-OF-INPUT 543257 IN-PROGRESS 
-       Channel-Identifier:32AECB23433802@recorder           
-            
-S-&gt;C:  MRCP/2.0 ... RECORD-COMPLETE 543257 COMPLETE 
-       Channel-Identifier:32AECB23433802@recorder           
+
+S-&gt;C:  MRCP/2.0 ... 543257 200 IN-PROGRESS
+       Channel-Identifier:32AECB23433802@recorder
+
+S-&gt;C:  MRCP/2.0 ... START-OF-INPUT 543257 IN-PROGRESS
+       Channel-Identifier:32AECB23433802@recorder
+
+S-&gt;C:  MRCP/2.0 ... RECORD-COMPLETE 543257 COMPLETE
+       Channel-Identifier:32AECB23433802@recorder
        Completion-Cause:000 success
        Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;;
                   size=325325;duration=24652
@@ -8430,14 +8430,14 @@
    |                   |&lt;---------|              |
    |                   |                         |
    |----------|        |                         |
-   |         STOP      |                         |    
+   |         STOP      |                         |
    |&lt;---------|        |                         |
    |                   |----------|              |
    |                   |    CLEAR-BUFFER         |
    |                   |&lt;---------|              |
    |                   |                         |
    |----------|        |                         |
-   |   CLEAR-BUFFER    |                         |    
+   |   CLEAR-BUFFER    |                         |
    |&lt;---------|        |                         |
    |                   |                         |
    |                   |----------|              |
@@ -8479,7 +8479,7 @@
                          / "CLEAR-BUFFER"
                          / "START-INPUT-TIMERS"
                          / "GET-INTERMEDIATE-RESULT"
-                        </pre><a href="#section-11.2-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.2-2" class="pilcrow">¶</a>
 </div>
 <p id="section-11.2-3">These methods allow the client to control the mode and target of
         verification or identification operations within the context of a
@@ -8497,13 +8497,13 @@
         appropriate for the resource, with the header field
         Ver‑Buffer‑Utterance. Then, when the following method is called,
         verification is performed using the set of buffered audio.<a href="#section-11.2-5" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-11.2-6">
+<ol start="1" type="1" class="normal type-1" id="section-11.2-6">
           <li id="section-11.2-6.1">VERIFY-FROM-BUFFER<a href="#section-11.2-6.1" class="pilcrow">¶</a>
 </li>
 </ol>
 <p id="section-11.2-7">The following methods are used for verification of live audio
         utterances:<a href="#section-11.2-7" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-11.2-8">
+<ol start="1" type="1" class="normal type-1" id="section-11.2-8">
           <li id="section-11.2-8.1">VERIFY<a href="#section-11.2-8.1" class="pilcrow">¶</a>
 </li>
 <li id="section-11.2-8.2">START-INPUT-TIMERS<a href="#section-11.2-8.2" class="pilcrow">¶</a>
@@ -8511,7 +8511,7 @@
 </ol>
 <p id="section-11.2-9">The following methods are used for configuring the verifier
         resource and for establishing resource states:<a href="#section-11.2-9" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-11.2-10">
+<ol start="1" type="1" class="normal type-1" id="section-11.2-10">
           <li id="section-11.2-10.1">START-SESSION<a href="#section-11.2-10.1" class="pilcrow">¶</a>
 </li>
 <li id="section-11.2-10.2">END-SESSION<a href="#section-11.2-10.2" class="pilcrow">¶</a>
@@ -8529,7 +8529,7 @@
 </ol>
 <p id="section-11.2-11">The following method allows the polling of a verification in progress
         for intermediate results.<a href="#section-11.2-11" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-11.2-12">
+<ol start="1" type="1" class="normal type-1" id="section-11.2-12">
           <li id="section-11.2-12.1">GET-INTERMEDIATE-RESULT<a href="#section-11.2-12.1" class="pilcrow">¶</a>
 </li>
 </ol>
@@ -8543,7 +8543,7 @@
 <pre>
 verifier-event       =  "VERIFICATION-COMPLETE"
                      /  "START-OF-INPUT"
-                        </pre><a href="#section-11.3-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.3-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4">
@@ -8576,7 +8576,7 @@
                          /  new-audio-channel
                          /  abort-verification
                          /  start-input-timers
-          </pre><a href="#section-11.4-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4-2" class="pilcrow">¶</a>
 </div>
 <div id="sec.repositoryURI">
 <section id="section-11.4.1">
@@ -8590,7 +8590,7 @@
 <div class="artwork art-text alignLeft" id="section-11.4.1-2">
 <pre>
 repository-uri           =  "Repository-URI" ":" uri CRLF
-           </pre><a href="#section-11.4.1-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.1-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -8610,10 +8610,10 @@
           group identifier instead of a list of voiceprint identifiers.<a href="#section-11.4.2-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-11.4.2-2">
 <pre>
-voiceprint-identifier        =  "Voiceprint-Identifier" ":" 
+voiceprint-identifier        =  "Voiceprint-Identifier" ":"
                                 vid *[";" vid] CRLF
 vid                          =  1*VCHAR ["." 1*VCHAR]
-                            </pre><a href="#section-11.4.2-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.2-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.3">
@@ -8644,7 +8644,7 @@
           caller's response without any participation by the verifier
           resource.<a href="#section-11.4.3-3" class="pilcrow">¶</a></p>
 <p id="section-11.4.3-4">Once the following conditions have been met:<a href="#section-11.4.3-4" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-11.4.3-5">
+<ol start="1" type="1" class="normal type-1" id="section-11.4.3-5">
             <li id="section-11.4.3-5.1">the voiceprint identity has been successfully established through
               the Voiceprint-Identifier header fields of the START-SESSION
               method, and<a href="#section-11.4.3-5.1" class="pilcrow">¶</a>
@@ -8665,12 +8665,12 @@
           error and the mode retains its current value.<a href="#section-11.4.3-7" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-11.4.3-8">
 <pre>
-verification-mode            =  "Verification-Mode" ":" 
+verification-mode            =  "Verification-Mode" ":"
                                 verification-mode-string
 
 verification-mode-string     =  "train"
                              /  "verify"
-            </pre><a href="#section-11.4.3-8" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.3-8" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.4">
@@ -8688,7 +8688,7 @@
 <div class="artwork art-text alignLeft" id="section-11.4.4-2">
 <pre>
 adapt-model              = "Adapt-Model" ":" BOOLEAN CRLF
-            </pre><a href="#section-11.4.4-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.4-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.5">
@@ -8708,7 +8708,7 @@
 <div class="artwork art-text alignLeft" id="section-11.4.5-2">
 <pre>
 abort-model             = "Abort-Model" ":" BOOLEAN CRLF
-            </pre><a href="#section-11.4.5-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.5-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.6">
@@ -8723,9 +8723,9 @@
           this header field is implementation specific.<a href="#section-11.4.6-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-11.4.6-2">
 <pre>
-min-verification-score  = "Min-Verification-Score" ":" 
+min-verification-score  = "Min-Verification-Score" ":"
                           [ %x2D ] FLOAT CRLF
-            </pre><a href="#section-11.4.6-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.6-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.7">
@@ -8742,9 +8742,9 @@
           START-SESSION, SET-PARAMS, or GET-PARAMS.<a href="#section-11.4.7-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-11.4.7-2">
 <pre>
-num-min-verification-phrases =  "Num-Min-Verification-Phrases" ":" 
+num-min-verification-phrases =  "Num-Min-Verification-Phrases" ":"
                                 1*19DIGIT CRLF
-            </pre><a href="#section-11.4.7-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.7-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.8">
@@ -8761,9 +8761,9 @@
           START-SESSION, SET-PARAMS, or GET-PARAMS.<a href="#section-11.4.8-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-11.4.8-2">
 <pre>
-num-max-verification-phrases =  "Num-Max-Verification-Phrases" ":" 
+num-max-verification-phrases =  "Num-Max-Verification-Phrases" ":"
                                  1*19DIGIT CRLF
-            </pre><a href="#section-11.4.8-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.8-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.9">
@@ -8784,7 +8784,7 @@
 <div class="artwork art-text alignLeft" id="section-11.4.9-2">
 <pre>
 no-input-timeout         = "No-Input-Timeout" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-11.4.9-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.9-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.10">
@@ -8807,7 +8807,7 @@
 <div class="artwork art-text alignLeft" id="section-11.4.10-2">
 <pre>
 save-waveform            =  "Save-Waveform" ":" BOOLEAN CRLF
-           </pre><a href="#section-11.4.10-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.10-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.11">
@@ -8820,9 +8820,9 @@
           by the Waveform-URI header field.<a href="#section-11.4.11-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-11.4.11-2">
 <pre>
-media-type               =  "Media-Type" ":" media-type-value 
+media-type               =  "Media-Type" ":" media-type-value
                             CRLF
-            </pre><a href="#section-11.4.11-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.11-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.12">
@@ -8848,10 +8848,10 @@
           associated with the header field.<a href="#section-11.4.12-2" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-11.4.12-3">
 <pre>
-waveform-uri             =  "Waveform-URI" ":" ["&lt;" uri "&gt;" 
-                            ";" "size" "=" 1*19DIGIT 
+waveform-uri             =  "Waveform-URI" ":" ["&lt;" uri "&gt;"
+                            ";" "size" "=" 1*19DIGIT
                             ";" "duration" "=" 1*19DIGIT] CRLF
-            </pre><a href="#section-11.4.12-3" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.12-3" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.13">
@@ -8866,7 +8866,7 @@
 <div class="artwork art-text alignLeft" id="section-11.4.13-2">
 <pre>
 voiceprint-exists    =  "Voiceprint-Exists" ":" BOOLEAN CRLF
-            </pre><a href="#section-11.4.13-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.13-2" class="pilcrow">¶</a>
 </div>
 </section>
 <div id="sec.verBufferUtterance">
@@ -8885,7 +8885,7 @@
 <pre>
 ver-buffer-utterance     = "Ver-Buffer-Utterance" ":" BOOLEAN
                            CRLF
-            </pre><a href="#section-11.4.14-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.14-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -8903,7 +8903,7 @@
 <div class="artwork art-text alignLeft" id="section-11.4.15-2">
 <pre>
 input-waveform-uri           =  "Input-Waveform-URI" ":" uri CRLF
-            </pre><a href="#section-11.4.15-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.15-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.16">
@@ -8925,7 +8925,7 @@
                             cause-name CRLF
 cause-code               =  3DIGIT
 cause-name               =  *VCHAR
-            </pre><a href="#section-11.4.16-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.16-2" class="pilcrow">¶</a>
 </div>
 <table class="center" id="table-8">
             <caption><a href="#table-8" class="selfRef">Table 8</a></caption>
@@ -9024,9 +9024,9 @@
           interpret the completion reason text.<a href="#section-11.4.17-2" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-11.4.17-3">
 <pre>
-completion-reason        =  "Completion-Reason" ":" 
+completion-reason        =  "Completion-Reason" ":"
                             quoted-string CRLF
-            </pre><a href="#section-11.4.17-3" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.17-3" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.18">
@@ -9058,7 +9058,7 @@
 <div class="artwork art-text alignLeft" id="section-11.4.20-2">
 <pre>
 abort-verification   =  "Abort-Verification " ":" BOOLEAN CRLF
-            </pre><a href="#section-11.4.20-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.20-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.21">
@@ -9082,7 +9082,7 @@
 <pre>
 start-input-timers       =  "Start-Input-Timers" ":"
                             BOOLEAN CRLF
-            </pre><a href="#section-11.4.21-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.21-2" class="pilcrow">¶</a>
 </div>
 </section>
 </section>
@@ -9111,7 +9111,7 @@
           &lt;verification-result&gt; element under &lt;result&gt;. The
           elements are described below and have the schema defined in <a href="#sec.enrollmentResultsSchema" class="xref">Section 16.2</a>. The following elements
           are defined:<a href="#section-11.5.2-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-11.5.2-2">
+<ol start="1" type="1" class="normal type-1" id="section-11.5.2-2">
             <li id="section-11.5.2-2.1">&lt;voiceprint&gt;<a href="#section-11.5.2-2.1" class="pilcrow">¶</a>
 </li>
 <li id="section-11.5.2-2.2">&lt;incremental&gt;<a href="#section-11.5.2-2.2" class="pilcrow">¶</a>
@@ -9386,7 +9386,7 @@
 <p id="section-11.7-1">The END-SESSION method terminates an ongoing verification session
         and releases the verification voiceprint resources. The session may
         terminate in one of three ways:<a href="#section-11.7-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-11.7-2">
+<ol start="1" type="1" class="normal type-1" id="section-11.7-2">
           <li id="section-11.7-2.1">abort - the voiceprint adaptation or creation may be aborted so
             that the voiceprint remains unchanged (or is not created).<a href="#section-11.7-2.1" class="pilcrow">¶</a>
 </li>
@@ -9415,7 +9415,7 @@
 
 S-&gt;C:  MRCP/2.0 ... 314174 200 COMPLETE
        Channel-Identifier:32AECB23433801@speakverify
-          </pre><a href="#section-11.7-6" class="pilcrow">¶</a>
+</pre><a href="#section-11.7-6" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.8">
@@ -9451,7 +9451,7 @@
        Repository-URI:http://www.example.com/voiceprints/
        Voiceprint-Identifier:johnsmith.voiceprint
        Voiceprint-Exists:true
-          </pre><a href="#section-11.8-5" class="pilcrow">¶</a>
+</pre><a href="#section-11.8-5" class="pilcrow">¶</a>
 </div>
 <p id="section-11.8-6">The following example assumes that the URI provided in the
         Repository-URI header field is a bad URI.<a href="#section-11.8-6" class="pilcrow">¶</a></p>
@@ -9580,7 +9580,7 @@
        Completion-Cause:000 success
        Content-Type:application/nlsml+xml
        Content-Length:...
-       
+
        &lt;?xml version="1.0"?&gt;
        &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                grammar="What-Grammar-URI"&gt;
@@ -9636,7 +9636,7 @@
        Completion-Cause:000 success
        Content-Type:application/nlsml+xml
        Content-Length:...
-       
+
        &lt;?xml version="1.0"?&gt;
        &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                grammar="What-Grammar-URI"&gt;
@@ -9735,9 +9735,9 @@
 C-&gt;S:  MRCP/2.0 ... VERIFY 314177
        Channel-Identifier:32AECB23433801@speakverify
 
-S-&gt;C:  MRCP/2.0 ... 314177 200 IN-PROGRESS 
+S-&gt;C:  MRCP/2.0 ... 314177 200 IN-PROGRESS
        Channel-Identifier:32AECB23433801@speakverify
-     
+
 C-&gt;S:  MRCP/2.0 ... STOP 314178
        Channel-Identifier:32AECB23433801@speakverify
 
@@ -9781,7 +9781,7 @@
        Completion-Cause:000 success
        Content-Type:application/nlsml+xml
        Content-Length:...
-       
+
        &lt;?xml version="1.0"?&gt;
        &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                grammar="What-Grammar-URI"&gt;
@@ -9869,8 +9869,8 @@
        Channel-Identifier:32AECB23433801@speakverify
        Content-Type:application/nlsml+xml
        Content-Length:...
-       
-       &lt;?xml version="1.0"?&gt;  
+
+       &lt;?xml version="1.0"?&gt;
        &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                grammar="What-Grammar-URI"&gt;
          &lt;verification-result&gt;
@@ -9924,7 +9924,7 @@
         by SDP within the context of a SIP dialog. In order to ensure secure
         rendezvous between MRCPv2 clients and servers, the following are
         required:<a href="#section-12.1-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-12.1-2">
+<ol start="1" type="1" class="normal type-1" id="section-12.1-2">
           <li id="section-12.1-2.1">The SIP implementation in MRCPv2 clients and servers MUST
             support SIP digest authentication <span>[<a href="#RFC3261" class="xref">RFC3261</a>]</span>
             and SHOULD employ it.<a href="#section-12.1-2.1" class="pilcrow">¶</a>
@@ -10203,7 +10203,7 @@
 Proxy-Sync-Id                      Generic          [RFC6787]
 Accept-Charset                     Generic          [RFC2616]
 Content-Type                       Generic          [RFC6787]
-Content-ID                         Generic 
+Content-ID                         Generic
                           [RFC2392], [RFC2046], and [RFC5322]
 Content-Base                       Generic          [RFC6787]
 Content-Encoding                   Generic          [RFC6787]
@@ -10285,10 +10285,10 @@
 Record-URI                         Recorder         [RFC6787]
 Media-Type                         Recorder         [RFC6787]
 Max-Time                           Recorder         [RFC6787]
-Trim-Length                        Recorder         [RFC6787] 
+Trim-Length                        Recorder         [RFC6787]
 Final-Silence                      Recorder         [RFC6787]
-Capture-On-Speech                  Recorder         [RFC6787] 
-Ver-Buffer-Utterance               Recorder         [RFC6787] 
+Capture-On-Speech                  Recorder         [RFC6787]
+Ver-Buffer-Utterance               Recorder         [RFC6787]
 Start-Input-Timers                 Recorder         [RFC6787]
 New-Audio-Channel                  Recorder         [RFC6787]
 Repository-URI                     Verifier         [RFC6787]
@@ -10864,7 +10864,7 @@
        Contact:&lt;sip:sarvi@client.example.com&gt;
        Content-Type:application/sdp
        Content-Length:...
-       
+
        v=0
        o=sarvi 2614933546 2614933546 IN IP4 192.0.2.12
        s=Set up MRCPv2 control and audio
@@ -10923,23 +10923,23 @@
        Contact:&lt;sip:sarvi@client.example.com&gt;
        Content-Type:application/sdp
        Content-Length:...
-       
+
        v=0
        o=sarvi 2614933546 2614933547 IN IP4 192.0.2.12
        s=Set up MRCPv2 control and audio
        i=Add TCP channel, synthesizer and one-way audio
        c=IN IP4 192.0.2.12
        t=0 0
-       m=application 9  TCP/MRCPv2 1 
+       m=application 9  TCP/MRCPv2 1
        a=setup:active
        a=connection:new
-       a=resource:speechsynth 
+       a=resource:speechsynth
        a=cmid:1
        m=audio 49170 RTP/AVP 0 96
        a=rtpmap:0 pcmu/8000
-       a=rtpmap:96 telephone-event/8000 
-       a=fmtp:96 0-15 
-       a=recvonly 
+       a=rtpmap:96 telephone-event/8000
+       a=fmtp:96 0-15
+       a=recvonly
        a=mid:1
 
 
@@ -10954,21 +10954,21 @@
        Contact:&lt;sip:mresources@server.example.com&gt;
        Content-Type:application/sdp
        Content-Length:...
-       
+
        v=0
        o=- 3000000001 3000000002 IN IP4 192.0.2.11
        s=Set up MRCPv2 control and audio
        i=Add TCP channel, synthesizer and one-way audio
        c=IN IP4 192.0.2.11
        t=0 0
-       m=application 32416  TCP/MRCPv2 1 
+       m=application 32416  TCP/MRCPv2 1
        a=setup:passive
        a=connection:new
-       a=channel:32AECB23433801@speechsynth 
+       a=channel:32AECB23433801@speechsynth
        a=cmid:1
        m=audio 48260 RTP/AVP 0
        a=rtpmap:0 pcmu/8000
-       a=sendonly 
+       a=sendonly
        a=mid:1
 
 
@@ -11002,34 +11002,34 @@
        Contact:&lt;sip:sarvi@client.example.com&gt;
        Content-Type:application/sdp
        Content-Length:...
-       
+
        v=0
        o=sarvi 2614933546 2614933548 IN IP4 192.0.2.12
        s=Set up MRCPv2 control and audio
        i=Add recognizer and duplex the audio
        c=IN IP4 192.0.2.12
        t=0 0
-       m=application 9  TCP/MRCPv2 1 
+       m=application 9  TCP/MRCPv2 1
        a=setup:active
        a=connection:existing
-       a=resource:speechsynth 
+       a=resource:speechsynth
        a=cmid:1
        m=audio 49170 RTP/AVP 0 96
        a=rtpmap:0 pcmu/8000
-       a=rtpmap:96 telephone-event/8000 
-       a=fmtp:96 0-15 
-       a=recvonly 
+       a=rtpmap:96 telephone-event/8000
+       a=fmtp:96 0-15
+       a=recvonly
        a=mid:1
-       m=application 9  TCP/MRCPv2 1 
+       m=application 9  TCP/MRCPv2 1
        a=setup:active
        a=connection:existing
-       a=resource:speechrecog 
+       a=resource:speechrecog
        a=cmid:2
        m=audio 49180 RTP/AVP 0 96
        a=rtpmap:0 pcmu/8000
        a=rtpmap:96 telephone-event/8000
        a=fmtp:96 0-15
-       a=sendonly 
+       a=sendonly
        a=mid:2
 
 
@@ -11044,28 +11044,28 @@
        Contact:&lt;sip:mresources@server.example.com&gt;
        Content-Type:application/sdp
        Content-Length:...
-       
+
        v=0
        o=- 3000000001 3000000003 IN IP4 192.0.2.11
        s=Set up MRCPv2 control and audio
        i=Add recognizer and duplex the audio
        c=IN IP4 192.0.2.11
        t=0 0
-       m=application 32416  TCP/MRCPv2 1 
-       a=channel:32AECB23433801@speechsynth 
+       m=application 32416  TCP/MRCPv2 1
+       a=channel:32AECB23433801@speechsynth
        a=cmid:1
        m=audio 48260 RTP/AVP 0
        a=rtpmap:0 pcmu/8000
-       a=sendonly 
+       a=sendonly
        a=mid:1
-       m=application 32416  TCP/MRCPv2 1 
-       a=channel:32AECB23433801@speechrecog 
+       m=application 32416  TCP/MRCPv2 1
+       a=channel:32AECB23433801@speechrecog
        a=cmid:2
        m=audio 48260 RTP/AVP 0
        a=rtpmap:0 pcmu/8000
        a=rtpmap:96 telephone-event/8000
        a=fmtp:96 0-15
-       a=recvonly 
+       a=recvonly
        a=mid:2
 
 
@@ -11093,9 +11093,9 @@
        Prosody-volume:medium
        Content-Type:application/ssml+xml
        Content-Length:...
-       
+
        &lt;?xml version="1.0"?&gt;
-       &lt;speak version="1.0"                
+       &lt;speak version="1.0"
               xmlns="http://www.w3.org/2001/10/synthesis"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -11103,7 +11103,7 @@
               xml:lang="en-US"&gt;
          &lt;p&gt;
            &lt;s&gt;You have 4 new messages.&lt;/s&gt;
-           &lt;s&gt;The first is from Stephanie Williams 
+           &lt;s&gt;The first is from Stephanie Williams
              &lt;mark name="Stephanie"/&gt;
              and arrived at &lt;break/&gt;
              &lt;say-as interpret-as="vxml:time"&gt;0345p&lt;/say-as&gt;.&lt;/s&gt;
@@ -11113,7 +11113,7 @@
        &lt;/speak&gt;
 
 S-&gt;C:
-       MRCP/2.0 ... 543257 200 IN-PROGRESS 
+       MRCP/2.0 ... 543257 200 IN-PROGRESS
        Channel-Identifier:32AECB23433801@speechsynth
        Speech-Marker:timestamp=857205015059
 
@@ -11123,7 +11123,7 @@
         and faithfully informs the client of the event.<a href="#section-14.1-10" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-14.1-11">
 <pre>
-S-&gt;C:  MRCP/2.0 ... SPEECH-MARKER 543257 IN-PROGRESS 
+S-&gt;C:  MRCP/2.0 ... SPEECH-MARKER 543257 IN-PROGRESS
        Channel-Identifier:32AECB23433801@speechsynth
        Speech-Marker:timestamp=857206027059;Stephanie
 </pre><a href="#section-14.1-11" class="pilcrow">¶</a>
@@ -11145,7 +11145,7 @@
        Channel-Identifier:32AECB23433801@speechrecog
        Content-Type:application/srgs+xml
        Content-Length:...
-       
+
        &lt;?xml version="1.0"?&gt;
        &lt;!-- the default grammar language is US English --&gt;
        &lt;grammar xmlns="http://www.w3.org/2001/06/grammar"
@@ -11173,9 +11173,9 @@
        Kill-On-Barge-In:true
        Content-Type:application/ssml+xml
        Content-Length:...
-       
+
        &lt;?xml version="1.0"?&gt;
-       &lt;speak version="1.0"                
+       &lt;speak version="1.0"
               xmlns="http://www.w3.org/2001/10/synthesis"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -11238,12 +11238,12 @@
 <pre>
 S-&gt;C:  MRCP/2.0 ... RECOGNITION-COMPLETE 543258 COMPLETE
        Channel-Identifier:32AECB23433801@speechrecog
-       Completion-Cause:000 success    
+       Completion-Cause:000 success
        Waveform-URI:&lt;http://web.media.com/session123/audio.wav&gt;;
                     size=423523;duration=25432
        Content-Type:application/nlsml+xml
        Content-Length:...
-       
+
        &lt;?xml version="1.0"?&gt;
        &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                xmlns:ex="http://www.example.com/example"
@@ -11290,7 +11290,7 @@
 System: To which city will you be traveling?
 User:   I want to go to Pittsburgh.
 
-&lt;?xml version="1.0"?&gt;  
+&lt;?xml version="1.0"?&gt;
 &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
         xmlns:ex="http://www.example.com/example"
         grammar="http://www.example.com/flight"&gt;
@@ -11323,7 +11323,7 @@
 <div class="artwork art-text alignLeft" id="section-14.2.2-1">
 <pre>
 System: What would you like?
-User:   I would like 2 pizzas, one with pepperoni and cheese, 
+User:   I would like 2 pizzas, one with pepperoni and cheese,
         one with sausage and a bottle of coke, to go.
 </pre><a href="#section-14.2.2-1" class="pilcrow">¶</a>
 </div>
@@ -11335,7 +11335,7 @@
           resolve the two "one"s as "pizza".<a href="#section-14.2.2-2" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-14.2.2-3">
 <pre>
-&lt;?xml version="1.0"?&gt;  
+&lt;?xml version="1.0"?&gt;
 &lt;nl:result xmlns:nl="urn:ietf:params:xml:ns:mrcpv2"
            xmlns="http://www.example.com/example"
            grammar="http://www.example.com/foodorder"&gt;
@@ -11383,11 +11383,11 @@
 <pre>
 &lt;input&gt;
   &lt;input mode="speech" confidence ="1.0"
-     timestamp-start="2000-04-03T0:00:00" 
+     timestamp-start="2000-04-03T0:00:00"
      timestamp-end="2000-04-03T0:00:01.5"&gt;My pin is
   &lt;/input&gt;
   &lt;input mode="dtmf" confidence ="1.0"
-     timestamp-start="2000-04-03T0:00:01.5" 
+     timestamp-start="2000-04-03T0:00:01.5"
      timestamp-end="2000-04-03T0:00:02.0"&gt;1 2 3 4
   &lt;/input&gt;
 &lt;/input&gt;
@@ -11463,18 +11463,18 @@
           for actually resolving the reference).<a href="#section-14.2.5-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-14.2.5-2">
 <pre>
-Example: (ignoring the issue of representing the input from the 
+Example: (ignoring the issue of representing the input from the
           pointing gesture.)
 
 System: What do you want to drink?
 User:   I want this. (clicks on picture of large root beer.)
 
-&lt;?xml version="1.0"?&gt;  
+&lt;?xml version="1.0"?&gt;
 &lt;nl:result xmlns:nl="urn:ietf:params:xml:ns:mrcpv2"
         xmlns="http://www.example.com/example"
-        grammar="http://www.example.com/beverages.grxml"&gt;  
+        grammar="http://www.example.com/beverages.grxml"&gt;
    &lt;nl:interpretation&gt;
-      &lt;nl:instance&gt; 
+      &lt;nl:instance&gt;
        &lt;doer&gt;I&lt;/doer&gt;
        &lt;action&gt;want&lt;/action&gt;
        &lt;object&gt;this&lt;/object&gt;
@@ -11545,7 +11545,7 @@
 
 SWS    =    [LWS] ; sep whitespace
 
-UTF8-NONASCII    =    %xC0-DF 1UTF8-CONT 
+UTF8-NONASCII    =    %xC0-DF 1UTF8-CONT
                  /    %xE0-EF 2UTF8-CONT
                  /    %xF0-F7 3UTF8-CONT
                  /    %xF8-FB 4UTF8-CONT
@@ -11556,7 +11556,7 @@
                  /    UTF8-NONASCII
 param            =    *pchar
 
-quoted-string    =    SWS DQUOTE *(qdtext / quoted-pair ) 
+quoted-string    =    SWS DQUOTE *(qdtext / quoted-pair )
                       DQUOTE
 
 qdtext           =    LWS / %x21 / %x23-5B / %x5D-7E
@@ -11567,7 +11567,7 @@
 token            =    1*(alphanum / "-" / "." / "!" / "%" / "*"
                       / "_" / "+" / "`" / "'" / "~" )
 
-reserved         =    ";" / "/" / "?" / ":" / "@" / "&amp;" / "=" 
+reserved         =    ";" / "/" / "?" / ":" / "@" / "&amp;" / "="
                       / "+" / "$" / ","
 
 mark             =    "-" / "_" / "." / "!" / "~" / "*" / "'"
@@ -11580,7 +11580,7 @@
 
 alphanum         =    ALPHA / DIGIT
 
-BOOLEAN          =    "true" / "false" 
+BOOLEAN          =    "true" / "false"
 
 FLOAT            =    *DIGIT ["." *DIGIT]
 
@@ -11588,12 +11588,12 @@
 
 fragment         =    *uric
 
-uri              =    [ absoluteURI / relativeURI ] 
+uri              =    [ absoluteURI / relativeURI ]
                       [ "#" fragment ]
 
 absoluteURI      =    scheme ":" ( hier-part / opaque-part )
 
-relativeURI      =    ( net-path / abs-path / rel-path ) 
+relativeURI      =    ( net-path / abs-path / rel-path )
                       [ "?" query ]
 
 hier-part        =    ( net-path / abs-path ) [ "?" query ]
@@ -11604,14 +11604,14 @@
 
 rel-path         =    rel-segment [ abs-path ]
 
-rel-segment      =    1*( unreserved / escaped / ";" / "@" 
-                 /    "&amp;" / "=" / "+" / "$" / "," )    
+rel-segment      =    1*( unreserved / escaped / ";" / "@"
+                 /    "&amp;" / "=" / "+" / "$" / "," )
 
 opaque-part      =    uric-no-slash *uric
 
 uric             =    reserved / unreserved / escaped
 
-uric-no-slash    =    unreserved / escaped / ";" / "?" / ":" 
+uric-no-slash    =    unreserved / escaped / ";" / "?" / ":"
                       / "@" / "&amp;" / "=" / "+" / "$" / ","
 
 path-segments    =    segment *( "/" segment )
@@ -11631,13 +11631,13 @@
 
 userinfo         =    ( user ) [ ":" password ] "@"
 
-user             =    1*( unreserved / escaped 
+user             =    1*( unreserved / escaped
                  /    user-unreserved )
 
-user-unreserved  =    "&amp;" / "=" / "+" / "$" / "," / ";" 
+user-unreserved  =    "&amp;" / "=" / "+" / "$" / "," / ";"
                  /    "?" / "/"
 
-password         =    *( unreserved / escaped 
+password         =    *( unreserved / escaped
                  /    "&amp;" / "=" / "+" / "$" / "," )
 
 hostport         =    host [ ":" port ]
@@ -11652,14 +11652,14 @@
 toplabel         =    ALPHA / ALPHA *( alphanum / "-" )
                       alphanum
 
-IPv4address      =    1*3DIGIT "." 1*3DIGIT "." 1*3DIGIT "." 
+IPv4address      =    1*3DIGIT "." 1*3DIGIT "." 1*3DIGIT "."
                       1*3DIGIT
 
 IPv6reference    =    "[" IPv6address "]"
 
 IPv6address      =    hexpart [ ":" IPv4address ]
 
-hexpart          =    hexseq / hexseq "::" [ hexseq ] / "::" 
+hexpart          =    hexseq / hexseq "::" [ hexseq ] / "::"
                       [ hexseq ]
 
 hexseq           =    hex4 *( ":" hex4)
@@ -11670,23 +11670,23 @@
 
 
 ; generic-message is the top-level rule
-generic-message  =    start-line message-header CRLF 
-                      [ message-body ] 
+generic-message  =    start-line message-header CRLF
+                      [ message-body ]
 
 message-body     =    *OCTET
-         
-start-line       =    request-line / response-line / event-line 
+
+start-line       =    request-line / response-line / event-line
 
 request-line     =    mrcp-version SP message-length SP method-name
-                      SP request-id CRLF 
+                      SP request-id CRLF
 
-response-line    =    mrcp-version SP message-length SP request-id 
-                      SP status-code SP request-state CRLF 
+response-line    =    mrcp-version SP message-length SP request-id
+                      SP status-code SP request-state CRLF
 
 event-line       =    mrcp-version SP message-length SP event-name
-                      SP request-id SP request-state CRLF 
+                      SP request-id SP request-state CRLF
 
-method-name      =    generic-method    
+method-name      =    generic-method
                  /    synthesizer-method
                  /    recognizer-method
                  /    recorder-method
@@ -11695,15 +11695,15 @@
 generic-method   =    "SET-PARAMS"
                  /    "GET-PARAMS"
 
-request-state    =    "COMPLETE" 
-                 /    "IN-PROGRESS"        
-                 /    "PENDING" 
+request-state    =    "COMPLETE"
+                 /    "IN-PROGRESS"
+                 /    "PENDING"
 
 event-name       =    synthesizer-event
                  /    recognizer-event
                  /    recorder-event
                  /    verifier-event
-      
+
 message-header   =  1*(generic-header / resource-header /
                        generic-field)
 
@@ -11717,7 +11717,7 @@
 resource-header  =    synthesizer-header
                  /    recognizer-header
                  /    recorder-header
-                 /    verifier-header    
+                 /    verifier-header
 
 generic-header   =    channel-identifier
                  /    accept
@@ -11732,30 +11732,30 @@
                  /    content-length
                  /    fetch-timeout
                  /    cache-control
-                 /    logging-tag 
+                 /    logging-tag
                  /    set-cookie
                  /    vendor-specific
-          
+
 ; -- content-id is as defined in RFC 2392, RFC 2046 and RFC 5322
 ; -- accept and accept-charset are as defined in RFC 2616
 
-mrcp-version     =    "MRCP" "/" 1*2DIGIT "." 1*2DIGIT 
+mrcp-version     =    "MRCP" "/" 1*2DIGIT "." 1*2DIGIT
 
 message-length   =    1*19DIGIT
 
-request-id       =    1*10DIGIT 
+request-id       =    1*10DIGIT
 
 status-code      =    3DIGIT
 
-channel-identifier =  "Channel-Identifier" ":" 
+channel-identifier =  "Channel-Identifier" ":"
                       channel-id CRLF
 
 channel-id       =    1*alphanum "@" 1*alphanum
 
-active-request-id-list = "Active-Request-Id-List" ":"  
-                         request-id *("," request-id) CRLF 
+active-request-id-list = "Active-Request-Id-List" ":"
+                         request-id *("," request-id) CRLF
 
-proxy-sync-id    =    "Proxy-Sync-Id" ":" 1*VCHAR CRLF    
+proxy-sync-id    =    "Proxy-Sync-Id" ":" 1*VCHAR CRLF
 
 content-base     =    "Content-Base" ":" absoluteURI CRLF
 
@@ -11774,8 +11774,8 @@
 attribute        =    token
 
 value            =    token / quoted-string
-         
-content-encoding =    "Content-Encoding" ":" 
+
+content-encoding =    "Content-Encoding" ":"
                       *WSP content-coding
                       *(*WSP "," *WSP content-coding *WSP )
                       CRLF
@@ -11783,30 +11783,30 @@
 content-coding   =    token
 
 
-content-location =    "Content-Location" ":" 
+content-location =    "Content-Location" ":"
                       ( absoluteURI / relativeURI )  CRLF
 
-cache-control    =    "Cache-Control" ":" 
+cache-control    =    "Cache-Control" ":"
                       [*WSP cache-directive
                       *( *WSP "," *WSP cache-directive *WSP )]
                       CRLF
 
-fetch-timeout    =    "Fetch-Timeout" ":" 1*19DIGIT CRLF 
+fetch-timeout    =    "Fetch-Timeout" ":" 1*19DIGIT CRLF
 
-cache-directive  =    "max-age" "=" delta-seconds     
-                 /    "max-stale" ["=" delta-seconds ] 
-                 /    "min-fresh" "=" delta-seconds  
+cache-directive  =    "max-age" "=" delta-seconds
+                 /    "max-stale" ["=" delta-seconds ]
+                 /    "min-fresh" "=" delta-seconds
 
-delta-seconds         =    1*19DIGIT     
+delta-seconds         =    1*19DIGIT
 
-logging-tag      =    "Logging-Tag" ":" 1*UTFCHAR CRLF 
+logging-tag      =    "Logging-Tag" ":" 1*UTFCHAR CRLF
 
-vendor-specific  =    "Vendor-Specific-Parameters" ":" 
-                      [vendor-specific-av-pair  
-                      *(";" vendor-specific-av-pair)] CRLF  
+vendor-specific  =    "Vendor-Specific-Parameters" ":"
+                      [vendor-specific-av-pair
+                      *(";" vendor-specific-av-pair)] CRLF
 
-vendor-specific-av-pair = vendor-av-pair-name "="  
-                          value 
+vendor-specific-av-pair = vendor-av-pair-name "="
+                          value
 
 vendor-av-pair-name     = 1*UTFCHAR
 
@@ -11833,66 +11833,66 @@
 httponly-av       = "HttpOnly"
 extension-av      = &lt;any CHAR except CTLs or ";"&gt;
 age-av            = "Age=" delta-seconds
-                          
+
 ; Synthesizer ABNF
 
-synthesizer-method    =    "SPEAK" 
-                      /    "STOP" 
-                      /    "PAUSE" 
-                      /    "RESUME" 
-                      /    "BARGE-IN-OCCURRED" 
+synthesizer-method    =    "SPEAK"
+                      /    "STOP"
+                      /    "PAUSE"
+                      /    "RESUME"
+                      /    "BARGE-IN-OCCURRED"
                       /    "CONTROL"
-                      /    "DEFINE-LEXICON" 
+                      /    "DEFINE-LEXICON"
 
-synthesizer-event     =    "SPEECH-MARKER" 
-                      /    "SPEAK-COMPLETE" 
+synthesizer-event     =    "SPEECH-MARKER"
+                      /    "SPEAK-COMPLETE"
 
-synthesizer-header    =    jump-size       
-                      /    kill-on-barge-in  
-                      /    speaker-profile   
+synthesizer-header    =    jump-size
+                      /    kill-on-barge-in
+                      /    speaker-profile
                       /    completion-cause
-                      /    completion-reason  
-                      /    voice-parameter   
-                      /    prosody-parameter   
-                      /    speech-marker     
-                      /    speech-language   
-                      /    fetch-hint        
-                      /    audio-fetch-hint  
-                      /    failed-uri        
-                      /    failed-uri-cause  
-                      /    speak-restart     
+                      /    completion-reason
+                      /    voice-parameter
+                      /    prosody-parameter
+                      /    speech-marker
+                      /    speech-language
+                      /    fetch-hint
+                      /    audio-fetch-hint
+                      /    failed-uri
+                      /    failed-uri-cause
+                      /    speak-restart
                       /    speak-length
                       /    load-lexicon
-                      /    lexicon-search-order      
+                      /    lexicon-search-order
+
 
+jump-size             =    "Jump-Size" ":" speech-length-value CRLF
 
-jump-size             =    "Jump-Size" ":" speech-length-value CRLF 
+speech-length-value   =    numeric-speech-length
+                      /    text-speech-length
 
-speech-length-value   =    numeric-speech-length 
-                      /    text-speech-length 
+text-speech-length    =    1*UTFCHAR SP "Tag"
 
-text-speech-length    =    1*UTFCHAR SP "Tag" 
-                               
 numeric-speech-length =    ("+" / "-") positive-speech-length
 
 positive-speech-length =   1*19DIGIT SP numeric-speech-unit
- 
-numeric-speech-unit   =    "Second" 
-                      /    "Word" 
-                      /    "Sentence" 
-                      /    "Paragraph" 
 
-kill-on-barge-in      =    "Kill-On-Barge-In" ":" BOOLEAN 
-                           CRLF 
+numeric-speech-unit   =    "Second"
+                      /    "Word"
+                      /    "Sentence"
+                      /    "Paragraph"
+
+kill-on-barge-in      =    "Kill-On-Barge-In" ":" BOOLEAN
+                           CRLF
 
-speaker-profile       =    "Speaker-Profile" ":" uri CRLF 
+speaker-profile       =    "Speaker-Profile" ":" uri CRLF
 
 completion-cause         =  "Completion-Cause" ":" cause-code SP
                             cause-name CRLF
 cause-code               =  3DIGIT
 cause-name               =  *VCHAR
 
-completion-reason     =    "Completion-Reason" ":" 
+completion-reason     =    "Completion-Reason" ":"
                            quoted-string CRLF
 
 voice-parameter       =    voice-gender
@@ -11913,8 +11913,8 @@
 voice-name            =    "Voice-Name:"
                            1*UTFCHAR *(1*WSP 1*UTFCHAR) CRLF
 
-prosody-parameter     =    "Prosody-" prosody-param-name ":" 
-                           prosody-param-value CRLF 
+prosody-parameter     =    "Prosody-" prosody-param-name ":"
+                           prosody-param-value CRLF
 
 prosody-param-name    =    1*VCHAR
 
@@ -11929,44 +11929,44 @@
                            [";" 1*(UTFCHAR / %x20)] CRLF
 
 speech-language       =    "Speech-Language" ":"
-                           1*VCHAR CRLF 
+                           1*VCHAR CRLF
 
 fetch-hint            =    "Fetch-Hint" ":"
-                           ("prefetch" / "safe") CRLF 
+                           ("prefetch" / "safe") CRLF
 
-audio-fetch-hint      =    "Audio-Fetch-Hint" ":" 
-                          ("prefetch" / "safe" / "stream") CRLF 
+audio-fetch-hint      =    "Audio-Fetch-Hint" ":"
+                          ("prefetch" / "safe" / "stream") CRLF
 
-failed-uri            =    "Failed-URI" ":" absoluteURI CRLF 
+failed-uri            =    "Failed-URI" ":" absoluteURI CRLF
 
-failed-uri-cause      =    "Failed-URI-Cause" ":" 1*UTFCHAR CRLF 
+failed-uri-cause      =    "Failed-URI-Cause" ":" 1*UTFCHAR CRLF
 
-speak-restart         =    "Speak-Restart" ":" BOOLEAN CRLF 
+speak-restart         =    "Speak-Restart" ":" BOOLEAN CRLF
 
-speak-length          =    "Speak-Length" ":" positive-length-value 
-                           CRLF 
+speak-length          =    "Speak-Length" ":" positive-length-value
+                           CRLF
 
-positive-length-value   =  positive-speech-length 
-                        /  text-speech-length 
+positive-length-value   =  positive-speech-length
+                        /  text-speech-length
 
 load-lexicon          =    "Load-Lexicon" ":" BOOLEAN CRLF
 
-lexicon-search-order  =    "Lexicon-Search-Order" ":" 
+lexicon-search-order  =    "Lexicon-Search-Order" ":"
           "&lt;" absoluteURI "&gt;" *(" " "&lt;" absoluteURI "&gt;") CRLF
 
-; Recognizer ABNF 
+; Recognizer ABNF
 
 recognizer-method     =    recog-only-method
                       /    enrollment-method
 
-recog-only-method     =    "DEFINE-GRAMMAR" 
-                      /    "RECOGNIZE" 
+recog-only-method     =    "DEFINE-GRAMMAR"
+                      /    "RECOGNIZE"
                       /    "INTERPRET"
-                      /    "GET-RESULT" 
-                      /    "START-INPUT-TIMERS" 
+                      /    "GET-RESULT"
+                      /    "START-INPUT-TIMERS"
                       /    "STOP"
 
-enrollment-method     =    "START-PHRASE-ENROLLMENT" 
+enrollment-method     =    "START-PHRASE-ENROLLMENT"
                       /    "ENROLLMENT-ROLLBACK"
                       /    "END-PHRASE-ENROLLMENT"
                       /    "MODIFY-PHRASE"
@@ -11980,30 +11980,30 @@
                       /    enrollment-header
 
 
-recog-only-header     =    confidence-threshold     
-                      /    sensitivity-level        
-                      /    speed-vs-accuracy        
-                      /    n-best-list-length  
-                      /    input-type     
-                      /    no-input-timeout         
-                      /    recognition-timeout      
-                      /    waveform-uri  
-                      /    input-waveform-uri           
-                      /    completion-cause         
+recog-only-header     =    confidence-threshold
+                      /    sensitivity-level
+                      /    speed-vs-accuracy
+                      /    n-best-list-length
+                      /    input-type
+                      /    no-input-timeout
+                      /    recognition-timeout
+                      /    waveform-uri
+                      /    input-waveform-uri
+                      /    completion-cause
                       /    completion-reason
-                      /    recognizer-context-block 
-                      /    start-input-timers 
-                      /    speech-complete-timeout  
-                      /    speech-incomplete-timeout 
-                      /    dtmf-interdigit-timeout  
-                      /    dtmf-term-timeout        
-                      /    dtmf-term-char           
-                      /    failed-uri               
-                      /    failed-uri-cause         
-                      /    save-waveform            
+                      /    recognizer-context-block
+                      /    start-input-timers
+                      /    speech-complete-timeout
+                      /    speech-incomplete-timeout
+                      /    dtmf-interdigit-timeout
+                      /    dtmf-term-timeout
+                      /    dtmf-term-char
+                      /    failed-uri
+                      /    failed-uri-cause
+                      /    save-waveform
                       /    media-type
                       /    new-audio-channel
-                      /    speech-language        
+                      /    speech-language
                       /    ver-buffer-utterance
                       /    recognition-mode
                       /    cancel-if-queue
@@ -12016,66 +12016,66 @@
 
 
 enrollment-header     =    num-min-consistent-pronunciations
-                      /    consistency-threshold  
-                      /    clash-threshold        
-                      /    personal-grammar-uri 
+                      /    consistency-threshold
+                      /    clash-threshold
+                      /    personal-grammar-uri
                       /    enroll-utterance
-                      /    phrase-id              
-                      /    phrase-nl              
-                      /    weight                 
-                      /    save-best-waveform     
-                      /    new-phrase-id          
-                      /    confusable-phrases-uri 
+                      /    phrase-id
+                      /    phrase-nl
+                      /    weight
+                      /    save-best-waveform
+                      /    new-phrase-id
+                      /    confusable-phrases-uri
                       /    abort-phrase-enrollment
 
-confidence-threshold  =    "Confidence-Threshold" ":" 
-                           FLOAT CRLF 
+confidence-threshold  =    "Confidence-Threshold" ":"
+                           FLOAT CRLF
 
 sensitivity-level     =    "Sensitivity-Level" ":" FLOAT
-                           CRLF 
+                           CRLF
 
-speed-vs-accuracy     =    "Speed-Vs-Accuracy" ":" FLOAT 
-                           CRLF 
+speed-vs-accuracy     =    "Speed-Vs-Accuracy" ":" FLOAT
+                           CRLF
 
-n-best-list-length    =    "N-Best-List-Length" ":" 1*19DIGIT 
-                           CRLF 
+n-best-list-length    =    "N-Best-List-Length" ":" 1*19DIGIT
+                           CRLF
 
 input-type            =    "Input-Type" ":"  inputs CRLF
 inputs                =    "speech" / "dtmf"
 
-no-input-timeout      =    "No-Input-Timeout" ":" 1*19DIGIT 
-                           CRLF 
+no-input-timeout      =    "No-Input-Timeout" ":" 1*19DIGIT
+                           CRLF
 
 recognition-timeout   =    "Recognition-Timeout" ":" 1*19DIGIT
-                           CRLF 
+                           CRLF
 
-waveform-uri          =    "Waveform-URI" ":" ["&lt;" uri "&gt;" 
-                           ";" "size" "=" 1*19DIGIT 
-                           ";" "duration" "=" 1*19DIGIT] CRLF 
+waveform-uri          =    "Waveform-URI" ":" ["&lt;" uri "&gt;"
+                           ";" "size" "=" 1*19DIGIT
+                           ";" "duration" "=" 1*19DIGIT] CRLF
 
-recognizer-context-block = "Recognizer-Context-Block" ":" 
-                           [1*VCHAR] CRLF 
+recognizer-context-block = "Recognizer-Context-Block" ":"
+                           [1*VCHAR] CRLF
 
-start-input-timers    =    "Start-Input-Timers" ":"  
-                           BOOLEAN CRLF 
- 
-speech-complete-timeout =  "Speech-Complete-Timeout" ":"  
-                           1*19DIGIT CRLF 
+start-input-timers    =    "Start-Input-Timers" ":"
+                           BOOLEAN CRLF
 
-speech-incomplete-timeout = "Speech-Incomplete-Timeout" ":"  
-                            1*19DIGIT CRLF 
+speech-complete-timeout =  "Speech-Complete-Timeout" ":"
+                           1*19DIGIT CRLF
+
+speech-incomplete-timeout = "Speech-Incomplete-Timeout" ":"
+                            1*19DIGIT CRLF
 
-dtmf-interdigit-timeout = "DTMF-Interdigit-Timeout" ":"  
-                          1*19DIGIT CRLF 
+dtmf-interdigit-timeout = "DTMF-Interdigit-Timeout" ":"
+                          1*19DIGIT CRLF
 
-dtmf-term-timeout     =    "DTMF-Term-Timeout" ":" 1*19DIGIT 
-                           CRLF 
+dtmf-term-timeout     =    "DTMF-Term-Timeout" ":" 1*19DIGIT
+                           CRLF
 
-dtmf-term-char        =    "DTMF-Term-Char" ":" VCHAR CRLF 
+dtmf-term-char        =    "DTMF-Term-Char" ":" VCHAR CRLF
 
-save-waveform         =    "Save-Waveform" ":" BOOLEAN CRLF 
+save-waveform         =    "Save-Waveform" ":" BOOLEAN CRLF
 
-new-audio-channel     =    "New-Audio-Channel" ":" 
+new-audio-channel     =    "New-Audio-Channel" ":"
                            BOOLEAN CRLF
 
 recognition-mode      =    "Recognition-Mode" ":"
@@ -12083,13 +12083,13 @@
 
 cancel-if-queue       =    "Cancel-If-Queue" ":" BOOLEAN CRLF
 
-hotword-max-duration  =    "Hotword-Max-Duration" ":" 
+hotword-max-duration  =    "Hotword-Max-Duration" ":"
                            1*19DIGIT CRLF
 
-hotword-min-duration  =    "Hotword-Min-Duration" ":" 
+hotword-min-duration  =    "Hotword-Min-Duration" ":"
                            1*19DIGIT CRLF
 
-interpret-text        =    "Interpret-Text" ":" 1*VCHAR CRLF          
+interpret-text        =    "Interpret-Text" ":" 1*VCHAR CRLF
 
 dtmf-buffer-time      =    "DTMF-Buffer-Time" ":" 1*19DIGIT CRLF
 
@@ -12097,13 +12097,13 @@
 
 early-no-match        =    "Early-No-Match" ":" BOOLEAN CRLF
 
-num-min-consistent-pronunciations    = 
-    "Num-Min-Consistent-Pronunciations" ":" 1*19DIGIT CRLF 
+num-min-consistent-pronunciations    =
+    "Num-Min-Consistent-Pronunciations" ":" 1*19DIGIT CRLF
 
 
-consistency-threshold =    "Consistency-Threshold" ":" FLOAT 
+consistency-threshold =    "Consistency-Threshold" ":" FLOAT
                            CRLF
- 
+
 clash-threshold       =    "Clash-Threshold" ":" FLOAT CRLF
 
 personal-grammar-uri  =    "Personal-Grammar-URI" ":" uri CRLF
@@ -12116,15 +12116,15 @@
 
 weight                =    "Weight" ":" FLOAT CRLF
 
-save-best-waveform    =    "Save-Best-Waveform" ":" 
+save-best-waveform    =    "Save-Best-Waveform" ":"
                            BOOLEAN CRLF
 
 new-phrase-id         =    "New-Phrase-ID" ":" 1*VCHAR CRLF
 
-confusable-phrases-uri =   "Confusable-Phrases-URI" ":" 
+confusable-phrases-uri =   "Confusable-Phrases-URI" ":"
                            uri CRLF
 
-abort-phrase-enrollment =  "Abort-Phrase-Enrollment" ":" 
+abort-phrase-enrollment =  "Abort-Phrase-Enrollment" ":"
                            BOOLEAN CRLF
 
 
@@ -12150,11 +12150,11 @@
                       /    final-silence
                       /    capture-on-speech
                       /    ver-buffer-utterance
-                      /    start-input-timers 
+                      /    start-input-timers
                       /    new-audio-channel
 
-record-uri            =    "Record-URI" ":" [ "&lt;" uri "&gt;" 
-                           ";" "size" "=" 1*19DIGIT 
+record-uri            =    "Record-URI" ":" [ "&lt;" uri "&gt;"
+                           ";" "size" "=" 1*19DIGIT
                            ";" "duration" "=" 1*19DIGIT] CRLF
 
 media-type            =    "Media-Type" ":" media-type-value CRLF
@@ -12165,7 +12165,7 @@
 
 final-silence         =    "Final-Silence" ":" 1*19DIGIT CRLF
 
-capture-on-speech     =    "Capture-On-Speech " ":" 
+capture-on-speech     =    "Capture-On-Speech " ":"
                            BOOLEAN CRLF
 
 
@@ -12188,38 +12188,38 @@
                       /    "START-OF-INPUT"
 
 
-verifier-header       =    repository-uri 
+verifier-header       =    repository-uri
                       /    voiceprint-identifier
-                      /    verification-mode 
-                      /    adapt-model 
-                      /    abort-model 
-                      /    min-verification-score         
+                      /    verification-mode
+                      /    adapt-model
+                      /    abort-model
+                      /    min-verification-score
                       /    num-min-verification-phrases
                       /    num-max-verification-phrases
-                      /    no-input-timeout           
-                      /    save-waveform              
+                      /    no-input-timeout
+                      /    save-waveform
                       /    media-type
-                      /    waveform-uri               
-                      /    voiceprint-exists          
-                      /    ver-buffer-utterance    
-                      /    input-waveform-uri        
-                      /    completion-cause           
+                      /    waveform-uri
+                      /    voiceprint-exists
+                      /    ver-buffer-utterance
+                      /    input-waveform-uri
+                      /    completion-cause
                       /    completion-reason
-                      /    speech-complete-timeout          
+                      /    speech-complete-timeout
                       /    new-audio-channel
                       /    abort-verification
-                      /    start-input-timers 
+                      /    start-input-timers
                       /    input-type
 
 
 
 repository-uri        =    "Repository-URI" ":" uri CRLF
 
-voiceprint-identifier        =  "Voiceprint-Identifier" ":" 
+voiceprint-identifier        =  "Voiceprint-Identifier" ":"
                                 vid *[";" vid] CRLF
 vid                          =  1*VCHAR ["." 1*VCHAR]
 
-verification-mode     =    "Verification-Mode" ":" 
+verification-mode     =    "Verification-Mode" ":"
                            verification-mode-string
 
 verification-mode-string = "train" / "verify"
@@ -12228,25 +12228,25 @@
 
 abort-model           =    "Abort-Model" ":" BOOLEAN CRLF
 
-min-verification-score  =  "Min-Verification-Score" ":" 
+min-verification-score  =  "Min-Verification-Score" ":"
                            [ %x2D ] FLOAT CRLF
 
-num-min-verification-phrases = "Num-Min-Verification-Phrases" 
+num-min-verification-phrases = "Num-Min-Verification-Phrases"
                                ":" 1*19DIGIT CRLF
 
-num-max-verification-phrases = "Num-Max-Verification-Phrases" 
+num-max-verification-phrases = "Num-Max-Verification-Phrases"
                                ":" 1*19DIGIT CRLF
-     
-voiceprint-exists     =    "Voiceprint-Exists" ":" 
+
+voiceprint-exists     =    "Voiceprint-Exists" ":"
                            BOOLEAN CRLF
 
-ver-buffer-utterance  =    "Ver-Buffer-Utterance" ":" 
-                           BOOLEAN CRLF 
+ver-buffer-utterance  =    "Ver-Buffer-Utterance" ":"
+                           BOOLEAN CRLF
 
 input-waveform-uri    =    "Input-Waveform-URI" ":" uri CRLF
 
-abort-verification    =    "Abort-Verification " ":" 
-                           BOOLEAN CRLF </pre><a href="#section-15-2" class="pilcrow">¶</a>
+abort-verification    =    "Abort-Verification " ":"
+                           BOOLEAN CRLF</pre><a href="#section-15-2" class="pilcrow">¶</a>
 </div>
 <p id="section-15-3">The following productions add a new SDP session-level attribute. See
       <a href="#cmid" class="xref">Section 13.7.2, Paragraph 7</a>.<a href="#section-15-3" class="pilcrow">¶</a></p>
@@ -12271,13 +12271,13 @@
 <div class="artwork art-text alignLeft" id="section-16.1-1">
 <pre>
 &lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+&lt;xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
             targetNamespace="urn:ietf:params:xml:ns:mrcpv2"
             xmlns="urn:ietf:params:xml:ns:mrcpv2"
-            elementFormDefault="qualified" 
+            elementFormDefault="qualified"
             attributeFormDefault="unqualified" &gt;
   &lt;xs:annotation&gt;
-    &lt;xs:documentation&gt; Natural Language Semantic Markup Schema 
+    &lt;xs:documentation&gt; Natural Language Semantic Markup Schema
     &lt;/xs:documentation&gt;
   &lt;/xs:annotation&gt;
   &lt;xs:include schemaLocation="enrollment-schema.rng"/&gt;
@@ -12306,12 +12306,12 @@
                   &lt;xs:attribute name="mode"
                                 type="xs:string"
                                 default="speech"/&gt;
-                  &lt;xs:attribute name="confidence" 
-                                type="confidenceinfo" 
+                  &lt;xs:attribute name="confidence"
+                                type="confidenceinfo"
                                 default="1.0"/&gt;
-                  &lt;xs:attribute name="timestamp-start" 
+                  &lt;xs:attribute name="timestamp-start"
                                 type="xs:string"/&gt;
-                  &lt;xs:attribute name="timestamp-end" 
+                  &lt;xs:attribute name="timestamp-end"
                                 type="xs:string"/&gt;
                 &lt;/xs:complexType&gt;
               &lt;/xs:element&gt;
@@ -12327,7 +12327,7 @@
         &lt;xs:element name="verification-result"
                     type="verification-contents"/&gt;
       &lt;/xs:sequence&gt;
-      &lt;xs:attribute name="grammar" type="xs:anyURI" 
+      &lt;xs:attribute name="grammar" type="xs:anyURI"
                     use="optional"/&gt;
     &lt;/xs:complexType&gt;
   &lt;/xs:element&gt;
@@ -12426,7 +12426,7 @@
 <div class="artwork art-text alignLeft" id="section-16.3-1">
 <pre>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
 
-&lt;!--    MRCP Verification Results Schema 
+&lt;!--    MRCP Verification Results Schema
         (See http://www.oasis-open.org/committees/relax-ng/spec.html)
    --&gt;
 
@@ -12766,23 +12766,23 @@
       </h2>
 <div class="artwork art-text alignLeft" id="section-appendix.a-1">
 <pre>
-Pierre Forgues 
-Nuance Communications Ltd. 
+Pierre Forgues
+Nuance Communications Ltd.
 1500 University Street
 Suite 935
-Montreal, Quebec 
-Canada H3A 3S7 
-         
-EMail:  forgues@nuance.com 
+Montreal, Quebec
+Canada H3A 3S7
+
+EMail:  forgues@nuance.com
+
 
+Charles Galles
+Intervoice, Inc.
+17811 Waterview Parkway
+Dallas, Texas 75252
+USA
 
-Charles Galles 
-Intervoice, Inc. 
-17811 Waterview Parkway 
-Dallas, Texas 75252 
-USA        
- 
-EMail:  charles.galles@intervoice.com 
+EMail:  charles.galles@intervoice.com
 
 
 Klaus Reifenrath
@@ -12792,8 +12792,8 @@
 9820 Merelbeke
 Belgium
 
-EMail: klaus.reifenrath@scansoft.com 
-                </pre><a href="#section-appendix.a-1" class="pilcrow">¶</a>
+EMail: klaus.reifenrath@scansoft.com
+</pre><a href="#section-appendix.a-1" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-appendix.b">
@@ -12822,7 +12822,7 @@
 Suresh Kaliannan (Cisco Systems, Inc.)
 Skip Cave (Intervoice, Inc.)
 Thomas Gal (LumenVox)
-         </pre><a href="#section-appendix.b-1" class="pilcrow">¶</a>
+</pre><a href="#section-appendix.b-1" class="pilcrow">¶</a>
 </div>
 <p id="section-appendix.b-2">The chairs of the SPEECHSC work group are Eric Burger (Georgetown
       University) and Dave Oran (Cisco Systems, Inc.).<a href="#section-appendix.b-2" class="pilcrow">¶</a></p>
diff -Nru xml2rfc-2.39.0/tests/valid/rfc6787.v3.py37.html xml2rfc-2.40.0/tests/valid/rfc6787.v3.py37.html
--- xml2rfc-2.39.0/tests/valid/rfc6787.v3.py37.html	2019-12-22 18:00:56.000000000 +0000
+++ xml2rfc-2.40.0/tests/valid/rfc6787.v3.py37.html	2020-02-18 20:15:35.000000000 +0000
@@ -21,7 +21,7 @@
       established above, allowing the client to control the media processing
       resources on the speech resource server. 
     ' name="description">
-<meta content="xml2rfc 2.37.0" name="generator">
+<meta content="xml2rfc 2.39.0" name="generator">
 <meta content="mrcp, speechsc, asr, tts, speech services, speech recognition, speech synthesis, nlsml, speaker authentication, speaker verification, speaker identification" name="keyword">
 <meta content="6787" name="rfc.number">
 <link href="tests/input/rfc6787.xml" rel="alternate" type="application/rfc+xml">
@@ -1260,7 +1260,7 @@
 |--------------------|         ||                                  ||
          |                     ||----------------------------------||
         SIP                    |------------------------------------|
-         |                       /           
+         |                       /
 |-------------------|          RTP
 |                   |          /
 | Media Source/Sink |---------/
@@ -1345,7 +1345,7 @@
 <pre>
      sip:mrcpv2@example.net   or
      sips:mrcpv2@example.net
-          </pre><a href="#section-3.2-3" class="pilcrow">¶</a>
+</pre><a href="#section-3.2-3" class="pilcrow">¶</a>
 </div>
 </section>
 </section>
@@ -1564,69 +1564,69 @@
 <span id="name-example-add-synthesizer-con"></span><figure id="figure-2">
           <div class="artwork art-text alignLeft" id="section-4.3-3.1">
 <pre>
-C-&gt;S:  INVITE sip:mresources@example.com SIP/2.0 
-       Via:SIP/2.0/TCP client.atlanta.example.com:5060; 
-        branch=z9hG4bK74bf1 
-       Max-Forwards:6 
-       To:MediaServer &lt;sip:mresources@example.com&gt; 
-       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314161 INVITE 
-       Contact:&lt;sip:sarvi@client.example.com&gt; 
-       Content-Type:application/sdp 
+C-&gt;S:  INVITE sip:mresources@example.com SIP/2.0
+       Via:SIP/2.0/TCP client.atlanta.example.com:5060;
+        branch=z9hG4bK74bf1
+       Max-Forwards:6
+       To:MediaServer &lt;sip:mresources@example.com&gt;
+       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314161 INVITE
+       Contact:&lt;sip:sarvi@client.example.com&gt;
+       Content-Type:application/sdp
        Content-Length:...
-       
-       v=0 
-       o=sarvi 2890844526 2890844526 IN IP4 192.0.2.12 
-       s=- 
+
+       v=0
+       o=sarvi 2890844526 2890844526 IN IP4 192.0.2.12
+       s=-
        c=IN IP4 192.0.2.12
        t=0 0
-       m=application 9 TCP/MRCPv2 1 
+       m=application 9 TCP/MRCPv2 1
        a=setup:active
        a=connection:new
        a=resource:speechsynth
        a=cmid:1
-       m=audio 49170 RTP/AVP 0 
-       a=rtpmap:0 pcmu/8000 
-       a=recvonly 
+       m=audio 49170 RTP/AVP 0
+       a=rtpmap:0 pcmu/8000
+       a=recvonly
        a=mid:1
-     
 
-S-&gt;C:  SIP/2.0 200 OK 
+
+S-&gt;C:  SIP/2.0 200 OK
        Via:SIP/2.0/TCP client.atlanta.example.com:5060;
         branch=z9hG4bK74bf1;received=192.0.32.10
-       To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784 
-       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314161 INVITE 
-       Contact:&lt;sip:mresources@server.example.com&gt; 
-       Content-Type:application/sdp 
-       Content-Length:... 
-       
-       v=0 
-       o=- 2890842808 2890842808 IN IP4 192.0.2.11 
-       s=- 
+       To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784
+       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314161 INVITE
+       Contact:&lt;sip:mresources@server.example.com&gt;
+       Content-Type:application/sdp
+       Content-Length:...
+
+       v=0
+       o=- 2890842808 2890842808 IN IP4 192.0.2.11
+       s=-
        c=IN IP4 192.0.2.11
        t=0 0
-       m=application 32416 TCP/MRCPv2 1 
+       m=application 32416 TCP/MRCPv2 1
        a=setup:passive
        a=connection:new
-       a=channel:32AECB234338@speechsynth 
+       a=channel:32AECB234338@speechsynth
        a=cmid:1
-       m=audio 48260 RTP/AVP 0 
-       a=rtpmap:0 pcmu/8000 
-       a=sendonly 
-       a=mid:1 
-     
+       m=audio 48260 RTP/AVP 0
+       a=rtpmap:0 pcmu/8000
+       a=sendonly
+       a=mid:1
+
 
-C-&gt;S:  ACK sip:mresources@server.example.com SIP/2.0 
+C-&gt;S:  ACK sip:mresources@server.example.com SIP/2.0
        Via:SIP/2.0/TCP client.atlanta.example.com:5060;
         branch=z9hG4bK74bf2
-       Max-Forwards:6 
+       Max-Forwards:6
        To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784
-       From:Sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314161 ACK 
+       From:Sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314161 ACK
        Content-Length:0
 </pre>
 </div>
@@ -1641,83 +1641,83 @@
 <span id="name-example-add-recognizer"></span><figure id="figure-3">
           <div class="artwork art-text alignLeft" id="section-4.3-5.1">
 <pre>
-C-&gt;S:  INVITE sip:mresources@server.example.com SIP/2.0 
+C-&gt;S:  INVITE sip:mresources@server.example.com SIP/2.0
        Via:SIP/2.0/TCP client.atlanta.example.com:5060;
         branch=z9hG4bK74bf3
-       Max-Forwards:6 
+       Max-Forwards:6
        To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784
-       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314162 INVITE 
-       Contact:&lt;sip:sarvi@client.example.com&gt; 
-       Content-Type:application/sdp 
+       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314162 INVITE
+       Contact:&lt;sip:sarvi@client.example.com&gt;
+       Content-Type:application/sdp
        Content-Length:...
-       
-       v=0 
-       o=sarvi 2890844526 2890844527 IN IP4 192.0.2.12 
+
+       v=0
+       o=sarvi 2890844526 2890844527 IN IP4 192.0.2.12
        s=-
        c=IN IP4 192.0.2.12
        t=0 0
-       m=application 9 TCP/MRCPv2 1 
+       m=application 9 TCP/MRCPv2 1
        a=setup:active
        a=connection:existing
        a=resource:speechsynth
        a=cmid:1
-       m=audio 49170 RTP/AVP 0 96 
-       a=rtpmap:0 pcmu/8000 
-       a=rtpmap:96 telephone-event/8000 
-       a=fmtp:96 0-15 
-       a=sendrecv 
+       m=audio 49170 RTP/AVP 0 96
+       a=rtpmap:0 pcmu/8000
+       a=rtpmap:96 telephone-event/8000
+       a=fmtp:96 0-15
+       a=sendrecv
        a=mid:1
-       m=application 9 TCP/MRCPv2 1 
+       m=application 9 TCP/MRCPv2 1
        a=setup:active
        a=connection:existing
        a=resource:speechrecog
        a=cmid:1
-     
 
-S-&gt;C:  SIP/2.0 200 OK 
+
+S-&gt;C:  SIP/2.0 200 OK
        Via:SIP/2.0/TCP client.atlanta.example.com:5060;
         branch=z9hG4bK74bf3;received=192.0.32.10
        To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784
-       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314162 INVITE 
-       Contact:&lt;sip:mresources@server.example.com&gt; 
-       Content-Type:application/sdp 
+       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314162 INVITE
+       Contact:&lt;sip:mresources@server.example.com&gt;
+       Content-Type:application/sdp
        Content-Length:...
-            
-       v=0 
-       o=- 2890842808 2890842809 IN IP4 192.0.2.11 
+
+       v=0
+       o=- 2890842808 2890842809 IN IP4 192.0.2.11
        s=-
        c=IN IP4 192.0.2.11
        t=0 0
-       m=application 32416 TCP/MRCPv2 1 
+       m=application 32416 TCP/MRCPv2 1
        a=setup:passive
        a=connection:existing
        a=channel:32AECB234338@speechsynth
        a=cmid:1
-       m=audio 48260 RTP/AVP 0 96 
-       a=rtpmap:0 pcmu/8000 
-       a=rtpmap:96 telephone-event/8000 
-       a=fmtp:96 0-15 
-       a=sendrecv 
+       m=audio 48260 RTP/AVP 0 96
+       a=rtpmap:0 pcmu/8000
+       a=rtpmap:96 telephone-event/8000
+       a=fmtp:96 0-15
+       a=sendrecv
        a=mid:1
-       m=application 32416 TCP/MRCPv2 1 
+       m=application 32416 TCP/MRCPv2 1
        a=setup:passive
        a=connection:existing
        a=channel:32AECB234338@speechrecog
        a=cmid:1
-     
 
-C-&gt;S:  ACK sip:mresources@server.example.com SIP/2.0 
+
+C-&gt;S:  ACK sip:mresources@server.example.com SIP/2.0
        Via:SIP/2.0/TCP client.atlanta.example.com:5060;
         branch=z9hG4bK74bf4
-       Max-Forwards:6 
+       Max-Forwards:6
        To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784
-       From:Sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314162 ACK 
+       From:Sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314162 ACK
        Content-Length:0
 </pre>
 </div>
@@ -1731,71 +1731,71 @@
 <span id="name-example-deallocate-recogniz"></span><figure id="figure-4">
           <div class="artwork art-text alignLeft" id="section-4.3-7.1">
 <pre>
-C-&gt;S:  INVITE sip:mresources@server.example.com SIP/2.0 
+C-&gt;S:  INVITE sip:mresources@server.example.com SIP/2.0
        Via:SIP/2.0/TCP client.atlanta.example.com:5060;
         branch=z9hG4bK74bf5
-       Max-Forwards:6 
+       Max-Forwards:6
        To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784
-       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314163 INVITE 
-       Contact:&lt;sip:sarvi@client.example.com&gt; 
-       Content-Type:application/sdp 
+       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314163 INVITE
+       Contact:&lt;sip:sarvi@client.example.com&gt;
+       Content-Type:application/sdp
        Content-Length:...
-            
-       v=0 
-       o=sarvi 2890844526 2890844528 IN IP4 192.0.2.12 
+
+       v=0
+       o=sarvi 2890844526 2890844528 IN IP4 192.0.2.12
        s=-
        c=IN IP4 192.0.2.12
        t=0 0
-       m=application 9 TCP/MRCPv2 1 
-       a=resource:speechsynth 
+       m=application 9 TCP/MRCPv2 1
+       a=resource:speechsynth
        a=cmid:1
-       m=audio 49170 RTP/AVP 0 
-       a=rtpmap:0 pcmu/8000 
-       a=recvonly 
+       m=audio 49170 RTP/AVP 0
+       a=rtpmap:0 pcmu/8000
+       a=recvonly
        a=mid:1
-       m=application 0 TCP/MRCPv2 1 
-       a=resource:speechrecog 
+       m=application 0 TCP/MRCPv2 1
+       a=resource:speechrecog
        a=cmid:1
-     
 
-S-&gt;C:  SIP/2.0 200 OK 
+
+S-&gt;C:  SIP/2.0 200 OK
        Via:SIP/2.0/TCP client.atlanta.example.com:5060;
         branch=z9hG4bK74bf5;received=192.0.32.10
        To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784
-       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314163 INVITE 
+       From:sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314163 INVITE
        Contact:&lt;sip:mresources@server.example.com&gt;
-       Content-Type:application/sdp 
+       Content-Type:application/sdp
        Content-Length:...
-     
-       v=0 
-       o=- 2890842808 2890842810 IN IP4 192.0.2.11 
+
+       v=0
+       o=- 2890842808 2890842810 IN IP4 192.0.2.11
        s=-
        c=IN IP4 192.0.2.11
        t=0 0
-       m=application 32416 TCP/MRCPv2 1 
-       a=channel:32AECB234338@speechsynth 
+       m=application 32416 TCP/MRCPv2 1
+       a=channel:32AECB234338@speechsynth
        a=cmid:1
-       m=audio 48260 RTP/AVP 0 
-       a=rtpmap:0 pcmu/8000 
-       a=sendonly 
+       m=audio 48260 RTP/AVP 0
+       a=rtpmap:0 pcmu/8000
+       a=sendonly
        a=mid:1
-       m=application 0 TCP/MRCPv2 1 
-       a=channel:32AECB234338@speechrecog 
+       m=application 0 TCP/MRCPv2 1
+       a=channel:32AECB234338@speechrecog
        a=cmid:1
-     
 
-C-&gt;S:  ACK sip:mresources@server.example.com SIP/2.0 
+
+C-&gt;S:  ACK sip:mresources@server.example.com SIP/2.0
        Via:SIP/2.0/TCP client.atlanta.example.com:5060;
         branch=z9hG4bK74bf6
-       Max-Forwards:6 
+       Max-Forwards:6
        To:MediaServer &lt;sip:mresources@example.com&gt;;tag=62784
-       From:Sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774 
-       Call-ID:a84b4c76e66710 
-       CSeq:314163 ACK 
+       From:Sarvi &lt;sip:sarvi@example.com&gt;;tag=1928301774
+       Call-ID:a84b4c76e66710
+       CSeq:314163 ACK
        Content-Length:0
 </pre>
 </div>
@@ -1997,7 +1997,7 @@
 <div class="artwork art-text alignLeft art-abnf" id="section-5.1-6">
 <pre>
 mrcp-version   =    "MRCP" "/" 1*2DIGIT "." 1*2DIGIT
-          </pre><a href="#section-5.1-6" class="pilcrow">¶</a>
+</pre><a href="#section-5.1-6" class="pilcrow">¶</a>
 </div>
 <p id="section-5.1-7"><a href="#section-5.1-7" class="pilcrow">¶</a></p>
 <p id="section-5.1-8">The message-length field specifies the length of the message in
@@ -2015,7 +2015,7 @@
 <div class="artwork art-text alignLeft art-abnf" id="section-5.1-9">
 <pre>
 message-length =    1*19DIGIT
-          </pre><a href="#section-5.1-9" class="pilcrow">¶</a>
+</pre><a href="#section-5.1-9" class="pilcrow">¶</a>
 </div>
 <p id="section-5.1-10">The following sample MRCP exchange demonstrates proper
         message-length values. The values for message-length have been removed
@@ -2025,12 +2025,12 @@
 <div class="artwork art-text alignLeft" id="section-5.1-11">
 <pre>
 C-&gt;S:   MRCP/2.0 877 INTERPRET 543266
-        Channel-Identifier:32AECB23433801@speechrecog 
-        Interpret-Text:may I speak to Andre Roy 
-        Content-Type:application/srgs+xml  
-        Content-ID:&lt;request1@form-level.store&gt;  
+        Channel-Identifier:32AECB23433801@speechrecog
+        Interpret-Text:may I speak to Andre Roy
+        Content-Type:application/srgs+xml
+        Content-ID:&lt;request1@form-level.store&gt;
         Content-Length:661
-        
+
         &lt;?xml version="1.0"?&gt;
         &lt;!-- the default grammar language is US English --&gt;
         &lt;grammar xmlns="http://www.w3.org/2001/06/grammar"
@@ -2042,7 +2042,7 @@
                     &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
                 &lt;/one-of&gt;
             &lt;/rule&gt;
-        
+
         &lt;!-- single language attachment to a rule expansion --&gt;
             &lt;rule id="request"&gt;
                 may I speak to
@@ -2052,16 +2052,16 @@
                 &lt;/one-of&gt;
             &lt;/rule&gt;
         &lt;/grammar&gt;
-              
+
 S-&gt;C:   MRCP/2.0 82 543266 200 IN-PROGRESS
         Channel-Identifier:32AECB23433801@speechrecog
-                   
+
 S-&gt;C:   MRCP/2.0 634 INTERPRETATION-COMPLETE 543266 200 COMPLETE
         Channel-Identifier:32AECB23433801@speechrecog
         Completion-Cause:000 success
         Content-Type:application/nlsml+xml
         Content-Length:441
-        
+
         &lt;?xml version="1.0"?&gt;
         &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                 xmlns:ex="http://www.example.com/example"
@@ -2104,7 +2104,7 @@
 <pre>
 request-line   =    mrcp-version SP message-length SP method-name
                     SP request-id CRLF
-          </pre><a href="#section-5.2-3" class="pilcrow">¶</a>
+</pre><a href="#section-5.2-3" class="pilcrow">¶</a>
 </div>
 <p id="section-5.2-4">The mrcp-version field is the MRCP protocol version that is being
         used by the client.<a href="#section-5.2-4" class="pilcrow">¶</a></p>
@@ -2123,7 +2123,7 @@
                /    recognizer-method
                /    recorder-method
                /    verifier-method
-          </pre><a href="#section-5.2-8" class="pilcrow">¶</a>
+</pre><a href="#section-5.2-8" class="pilcrow">¶</a>
 </div>
 <p id="section-5.2-9">The request-id field is a unique identifier representable as an
         unsigned 32-bit integer created by the client and sent to the server.
@@ -2144,7 +2144,7 @@
 <div class="artwork art-text alignLeft art-abnf" id="section-5.2-11">
 <pre>
 request-id     =    1*10DIGIT
-          </pre><a href="#section-5.2-11" class="pilcrow">¶</a>
+</pre><a href="#section-5.2-11" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -2162,7 +2162,7 @@
 <pre>
 response-line  =    mrcp-version SP message-length SP request-id
                     SP status-code SP request-state CRLF
-          </pre><a href="#section-5.3-2" class="pilcrow">¶</a>
+</pre><a href="#section-5.3-2" class="pilcrow">¶</a>
 </div>
 <p id="section-5.3-3">The mrcp-version field MUST contain the version of the request if
         supported; otherwise, it MUST contain the highest version of
@@ -2178,7 +2178,7 @@
 <div class="artwork art-text alignLeft art-abnf" id="section-5.3-8">
 <pre>
 status-code     =    3DIGIT
-          </pre><a href="#section-5.3-8" class="pilcrow">¶</a>
+</pre><a href="#section-5.3-8" class="pilcrow">¶</a>
 </div>
 <p id="section-5.3-9">The request-state field indicates if the action initiated by the
         Request is PENDING, IN-PROGRESS, or COMPLETE. The COMPLETE status means
@@ -2194,7 +2194,7 @@
 request-state    =  "COMPLETE"
                  /  "IN-PROGRESS"
                  /  "PENDING"
-          </pre><a href="#section-5.3-10" class="pilcrow">¶</a>
+</pre><a href="#section-5.3-10" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -2440,7 +2440,7 @@
 
 S-&gt;C:  MRCP/2.0 ... 543256 200 COMPLETE
        Channel-Identifier:32AECB23433802@speechsynth
-   </pre><a href="#section-6.1.1-6" class="pilcrow">¶</a>
+</pre><a href="#section-6.1.1-6" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-6.1.2">
@@ -2555,7 +2555,7 @@
                     /    content-length
                     /    fetch-timeout
                     /    cache-control
-                    /    logging-tag 
+                    /    logging-tag
                     /    set-cookie
                     /    vendor-specific
 </pre><a href="#section-6.2-7" class="pilcrow">¶</a>
@@ -2626,7 +2626,7 @@
           RECOGNITION-COMPLETE events for the terminated requests.<a href="#section-6.2.3-4" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft art-abnf" id="section-6.2.3-5">
 <pre>
-active-request-id-list  =  "Active-Request-Id-List" ":" 
+active-request-id-list  =  "Active-Request-Id-List" ":"
                            request-id *("," request-id) CRLF
 </pre><a href="#section-6.2.3-5" class="pilcrow">¶</a>
 </div>
@@ -2652,7 +2652,7 @@
 <div class="artwork art-text alignLeft art-abnf" id="section-6.2.4-2">
 <pre>
 proxy-sync-id    =  "Proxy-Sync-Id" ":" 1*VCHAR CRLF
-            </pre><a href="#section-6.2.4-2" class="pilcrow">¶</a>
+</pre><a href="#section-6.2.4-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-6.2.5">
@@ -2694,7 +2694,7 @@
 attribute        =    token
 
 value            =    token / quoted-string
-            </pre><a href="#section-6.2.6-2" class="pilcrow">¶</a>
+</pre><a href="#section-6.2.6-2" class="pilcrow">¶</a>
 </div>
 </section>
 <div id="sec.Content-ID">
@@ -2722,7 +2722,7 @@
 <div class="artwork art-text alignLeft art-abnf" id="section-6.2.8-2">
 <pre>
 content-base      = "Content-Base" ":" absoluteURI CRLF
-            </pre><a href="#section-6.2.8-2" class="pilcrow">¶</a>
+</pre><a href="#section-6.2.8-2" class="pilcrow">¶</a>
 </div>
 <p id="section-6.2.8-3">Note, however, that the base URI of the contents within the
           entity-body may be redefined within that entity-body. An example of
@@ -2744,8 +2744,8 @@
           on all messages.<a href="#section-6.2.9-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft art-abnf" id="section-6.2.9-2">
 <pre>
-content-encoding  = "Content-Encoding" ":" 
-                    *WSP content-coding 
+content-encoding  = "Content-Encoding" ":"
+                    *WSP content-coding
                     *(*WSP "," *WSP content-coding *WSP )
                     CRLF
 </pre><a href="#section-6.2.9-2" class="pilcrow">¶</a>
@@ -2826,7 +2826,7 @@
 <div class="artwork art-text alignLeft" id="section-6.2.12-2">
 <pre>
 fetch-timeout       =   "Fetch-Timeout" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-6.2.12-2" class="pilcrow">¶</a>
+</pre><a href="#section-6.2.12-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -2854,16 +2854,16 @@
           on requests.<a href="#section-6.2.13-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-6.2.13-2">
 <pre>
-cache-control    =    "Cache-Control" ":" 
+cache-control    =    "Cache-Control" ":"
                       [*WSP cache-directive
                       *( *WSP "," *WSP cache-directive *WSP )]
                       CRLF
 
-cache-directive     = "max-age" "=" delta-seconds    
+cache-directive     = "max-age" "=" delta-seconds
                     / "max-stale" [ "=" delta-seconds ]
-                    / "min-fresh" "=" delta-seconds 
+                    / "min-fresh" "=" delta-seconds
 
-delta-seconds       = 1*19DIGIT    
+delta-seconds       = 1*19DIGIT
 </pre><a href="#section-6.2.13-2" class="pilcrow">¶</a>
 </div>
 <p id="section-6.2.13-3">Here, delta-seconds is a decimal time value specifying the number
@@ -2929,7 +2929,7 @@
 <div class="artwork art-text alignLeft" id="section-6.2.14-3">
 <pre>
 logging-tag    = "Logging-Tag" ":" 1*UTFCHAR CRLF
-            </pre><a href="#section-6.2.14-3" class="pilcrow">¶</a>
+</pre><a href="#section-6.2.14-3" class="pilcrow">¶</a>
 </div>
 </section>
 <div id="sec.SetCookie">
@@ -3041,10 +3041,10 @@
 <div class="artwork art-text alignLeft" id="section-6.2.16-2">
 <pre>
 vendor-specific          =    "Vendor-Specific-Parameters" ":"
-                              [vendor-specific-av-pair 
-                              *(";" vendor-specific-av-pair)] CRLF 
+                              [vendor-specific-av-pair
+                              *(";" vendor-specific-av-pair)] CRLF
 
-vendor-specific-av-pair  = vendor-av-pair-name "=" 
+vendor-specific-av-pair  = vendor-av-pair-name "="
                            value
 
 vendor-av-pair-name     = 1*UTFCHAR
@@ -3199,14 +3199,14 @@
      Supported:foo
      Content-Type:application/sdp
      Content-Length:...
-     
+
      v=0
      o=sarvi 2890844536 2890842811 IN IP4 192.0.2.12
      s=-
      i=MRCPv2 server capabilities
      c=IN IP4 192.0.2.12/127
      t=0 0
-     m=application 0 TCP/TLS/MRCPv2 1 
+     m=application 0 TCP/TLS/MRCPv2 1
      a=resource:speechsynth
      a=resource:speechrecog
      a=resource:speakverify
@@ -3327,21 +3327,21 @@
         is associated with.<a href="#section-8.4-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-8.4-2">
 <pre>
-synthesizer-header  =  jump-size       
-                    /  kill-on-barge-in  
-                    /  speaker-profile   
+synthesizer-header  =  jump-size
+                    /  kill-on-barge-in
+                    /  speaker-profile
                     /  completion-cause
-                    /  completion-reason  
-                    /  voice-parameter   
+                    /  completion-reason
+                    /  voice-parameter
                     /  prosody-parameter
-                    /  speech-marker     
-                    /  speech-language 
-                    /  fetch-hint        
-                    /  audio-fetch-hint  
-                    /  failed-uri        
-                    /  failed-uri-cause  
-                    /  speak-restart     
-                    /  speak-length 
+                    /  speech-marker
+                    /  speech-language
+                    /  fetch-hint
+                    /  audio-fetch-hint
+                    /  failed-uri
+                    /  failed-uri-cause
+                    /  speak-restart
+                    /  speak-length
                     /  load-lexicon
                     /  lexicon-search-order
 </pre><a href="#section-8.4-2" class="pilcrow">¶</a>
@@ -3516,7 +3516,7 @@
           as an error in parsing the speech markup text.<a href="#section-8.4.5-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-8.4.5-2">
 <pre>
-completion-reason   =   "Completion-Reason" ":" 
+completion-reason   =   "Completion-Reason" ":"
                         quoted-string CRLF
 
 </pre><a href="#section-8.4.5-2" class="pilcrow">¶</a>
@@ -3648,7 +3648,7 @@
 <div class="artwork art-text alignLeft" id="section-8.4.9-2">
 <pre>
 speech-language     =   "Speech-Language" ":" 1*VCHAR CRLF
-            </pre><a href="#section-8.4.9-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.4.9-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-8.4.10">
@@ -3668,7 +3668,7 @@
 <pre>
 fetch-hint          =   "Fetch-Hint" ":"
                          ("prefetch" / "safe") CRLF
-            </pre><a href="#section-8.4.10-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.4.10-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-8.4.11">
@@ -3689,7 +3689,7 @@
 <pre>
 audio-fetch-hint    =   "Audio-Fetch-Hint" ":"
                         ("prefetch" / "safe" / "stream") CRLF
-            </pre><a href="#section-8.4.11-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.4.11-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-8.4.12">
@@ -3704,7 +3704,7 @@
 <div class="artwork art-text alignLeft" id="section-8.4.12-2">
 <pre>
 failed-uri          =   "Failed-URI" ":" absoluteURI CRLF
-            </pre><a href="#section-8.4.12-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.4.12-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-8.4.13">
@@ -3735,7 +3735,7 @@
 <div class="artwork art-text alignLeft" id="section-8.4.14-2">
 <pre>
 speak-restart       =   "Speak-Restart" ":" BOOLEAN CRLF
-            </pre><a href="#section-8.4.14-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.4.14-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-8.4.15">
@@ -3787,7 +3787,7 @@
 <div class="artwork art-text alignLeft" id="section-8.4.16-2">
 <pre>
 load-lexicon       =   "Load-Lexicon" ":" BOOLEAN CRLF
-            </pre><a href="#section-8.4.16-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.4.16-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -3806,7 +3806,7 @@
 <pre>
 lexicon-search-order =   "Lexicon-Search-Order" ":"
           "&lt;" absoluteURI "&gt;" *(" " "&lt;" absoluteURI "&gt;") CRLF
-            </pre><a href="#section-8.4.17-2" class="pilcrow">¶</a>
+</pre><a href="#section-8.4.17-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -3876,7 +3876,7 @@
 Content-Length:...
 
 &lt;?xml version="1.0"?&gt;
-     &lt;speak version="1.0"                
+     &lt;speak version="1.0"
             xmlns="http://www.w3.org/2001/10/synthesis"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -3910,13 +3910,13 @@
 http://www.example.com/ASR-Document-Part1.ssml
 http://www.example.com/ASR-Document-Part2.ssml
 http://www.example.com/ASR-Conclusion.ssml
-    
+
 --break
 Content-Type:application/ssml+xml
 Content-Length:...
 
 &lt;?xml version="1.0"?&gt;
-    &lt;speak version="1.0"                
+    &lt;speak version="1.0"
            xmlns="http://www.w3.org/2001/10/synthesis"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4012,16 +4012,16 @@
 <span id="name-speak-example"></span><figure id="figure-11">
           <div class="artwork art-text alignLeft" id="section-8.6-7.1">
 <pre>
-C-&gt;S: MRCP/2.0 ... SPEAK 543257 
+C-&gt;S: MRCP/2.0 ... SPEAK 543257
       Channel-Identifier:32AECB23433802@speechsynth
       Voice-gender:neutral
       Voice-Age:25
       Prosody-volume:medium
       Content-Type:application/ssml+xml
       Content-Length:...
-      
+
       &lt;?xml version="1.0"?&gt;
-         &lt;speak version="1.0"                
+         &lt;speak version="1.0"
              xmlns="http://www.w3.org/2001/10/synthesis"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4033,7 +4033,7 @@
              &lt;break/&gt;
              &lt;say-as interpret-as="vxml:time"&gt;0342p&lt;/say-as&gt;.
              &lt;/s&gt;
-          &lt;s&gt;The subject is 
+          &lt;s&gt;The subject is
                  &lt;prosody rate="-20%"&gt;ski trip&lt;/prosody&gt;
           &lt;/s&gt;
          &lt;/p&gt;
@@ -4086,7 +4086,7 @@
       Content-Length:...
 
       &lt;?xml version="1.0"?&gt;
-        &lt;speak version="1.0"                
+        &lt;speak version="1.0"
              xmlns="http://www.w3.org/2001/10/synthesis"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4094,10 +4094,10 @@
              xml:lang="en-US"&gt;
          &lt;p&gt;
           &lt;s&gt;You have 4 new messages.&lt;/s&gt;
-          &lt;s&gt;The first is from Stephanie Williams and arrived at 
+          &lt;s&gt;The first is from Stephanie Williams and arrived at
              &lt;break/&gt;
              &lt;say-as interpret-as="vxml:time"&gt;0342p&lt;/say-as&gt;.&lt;/s&gt;
-          &lt;s&gt;The subject is 
+          &lt;s&gt;The subject is
               &lt;prosody rate="-20%"&gt;ski trip&lt;/prosody&gt;&lt;/s&gt;
          &lt;/p&gt;
         &lt;/speak&gt;
@@ -4128,7 +4128,7 @@
         means to communicate the occurrence of the event to the synthesizer
         resource.<a href="#section-8.8-1" class="pilcrow">¶</a></p>
 <p id="section-8.8-2">This method is useful in two scenarios:<a href="#section-8.8-2" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-8.8-3">
+<ol start="1" type="1" class="normal type-1" id="section-8.8-3">
           <li id="section-8.8-3.1">The client has detected DTMF digits in the input media or some
             other barge-in-able event and wants to communicate that to the
             synthesizer resource.<a href="#section-8.8-3.1" class="pilcrow">¶</a>
@@ -4178,7 +4178,7 @@
       Content-Length:...
 
       &lt;?xml version="1.0"?&gt;
-        &lt;speak version="1.0"                
+        &lt;speak version="1.0"
              xmlns="http://www.w3.org/2001/10/synthesis"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4186,10 +4186,10 @@
              xml:lang="en-US"&gt;
          &lt;p&gt;
           &lt;s&gt;You have 4 new messages.&lt;/s&gt;
-          &lt;s&gt;The first is from Stephanie Williams and arrived at 
+          &lt;s&gt;The first is from Stephanie Williams and arrived at
              &lt;break/&gt;
              &lt;say-as interpret-as="vxml:time"&gt;0342p&lt;/say-as&gt;.&lt;/s&gt;
-          &lt;s&gt;The subject is 
+          &lt;s&gt;The subject is
              &lt;prosody rate="-20%"&gt;ski trip&lt;/prosody&gt;&lt;/s&gt;
          &lt;/p&gt;
         &lt;/speak&gt;
@@ -4237,7 +4237,7 @@
       Content-Length:...
 
       &lt;?xml version="1.0"?&gt;
-        &lt;speak version="1.0"                
+        &lt;speak version="1.0"
              xmlns="http://www.w3.org/2001/10/synthesis"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4245,11 +4245,11 @@
              xml:lang="en-US"&gt;
          &lt;p&gt;
           &lt;s&gt;You have 4 new messages.&lt;/s&gt;
-          &lt;s&gt;The first is from Stephanie Williams and arrived at 
+          &lt;s&gt;The first is from Stephanie Williams and arrived at
              &lt;break/&gt;
              &lt;say-as interpret-as="vxml:time"&gt;0342p&lt;/say-as&gt;.&lt;/s&gt;
 
-          &lt;s&gt;The subject is 
+          &lt;s&gt;The subject is
              &lt;prosody rate="-20%"&gt;ski trip&lt;/prosody&gt;&lt;/s&gt;
          &lt;/p&gt;
         &lt;/speak&gt;
@@ -4293,9 +4293,9 @@
       Prosody-volume:medium
       Content-Type:application/ssml+xml
       Content-Length:...
-      
+
       &lt;?xml version="1.0"?&gt;
-        &lt;speak version="1.0"                
+        &lt;speak version="1.0"
              xmlns="http://www.w3.org/2001/10/synthesis"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4303,10 +4303,10 @@
              xml:lang="en-US"&gt;
          &lt;p&gt;
           &lt;s&gt;You have 4 new messages.&lt;/s&gt;
-          &lt;s&gt;The first is from Stephanie Williams and arrived at 
+          &lt;s&gt;The first is from Stephanie Williams and arrived at
              &lt;break/&gt;
              &lt;say-as interpret-as="vxml:time"&gt;0342p&lt;/say-as&gt;.&lt;/s&gt;
-          &lt;s&gt;The subject is 
+          &lt;s&gt;The subject is
              &lt;prosody rate="-20%"&gt;ski trip&lt;/prosody&gt;&lt;/s&gt;
          &lt;/p&gt;
         &lt;/speak&gt;
@@ -4375,9 +4375,9 @@
       Prosody-volume:medium
       Content-Type:application/ssml+xml
       Content-Length:...
-      
+
       &lt;?xml version="1.0"?&gt;
-        &lt;speak version="1.0"                
+        &lt;speak version="1.0"
              xmlns="http://www.w3.org/2001/10/synthesis"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4446,7 +4446,7 @@
       Content-Length:...
 
       &lt;?xml version="1.0"?&gt;
-        &lt;speak version="1.0"                
+        &lt;speak version="1.0"
              xmlns="http://www.w3.org/2001/10/synthesis"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4457,7 +4457,7 @@
           &lt;s&gt;The first is from Stephanie Williams
              and arrived at &lt;break/&gt;
              &lt;say-as interpret-as="vxml:time"&gt;0342p&lt;/say-as&gt;.&lt;/s&gt;
-          &lt;s&gt;The subject is 
+          &lt;s&gt;The subject is
              &lt;prosody rate="-20%"&gt;ski trip&lt;/prosody&gt;&lt;/s&gt;
          &lt;/p&gt;
         &lt;/speak&gt;
@@ -4504,9 +4504,9 @@
       Prosody-volume:medium
       Content-Type:application/ssml+xml
       Content-Length:...
-      
+
       &lt;?xml version="1.0"?&gt;
-        &lt;speak version="1.0"                
+        &lt;speak version="1.0"
              xmlns="http://www.w3.org/2001/10/synthesis"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -4518,7 +4518,7 @@
              and arrived at &lt;break/&gt;
              &lt;say-as interpret-as="vxml:time"&gt;0342p&lt;/say-as&gt;.&lt;/s&gt;
              &lt;mark name="here"/&gt;
-          &lt;s&gt;The subject is 
+          &lt;s&gt;The subject is
              &lt;prosody rate="-20%"&gt;ski trip&lt;/prosody&gt;
           &lt;/s&gt;
           &lt;mark name="ANSWER"/&gt;
@@ -4588,7 +4588,7 @@
       generate asynchronous events to the client to indicate conditions of
       interest during the processing of the method.<a href="#section-9-2" class="pilcrow">¶</a></p>
 <p id="section-9-3">This section applies to the following resource types.<a href="#section-9-3" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9-4">
+<ol start="1" type="1" class="normal type-1" id="section-9-4">
         <li id="section-9-4.1">speechrecog<a href="#section-9-4.1" class="pilcrow">¶</a>
 </li>
 <li id="section-9-4.2">dtmfrecog<a href="#section-9-4.2" class="pilcrow">¶</a>
@@ -4688,7 +4688,7 @@
  |      STOP                                        |
  |&lt;------|                                          |
  |&lt;-------------------STOP--------------------------|
- |&lt;-------------------DEFINE-GRAMMAR----------------|      
+ |&lt;-------------------DEFINE-GRAMMAR----------------|
 </pre>
 </div>
 <figcaption><a href="#figure-19" class="selfRef">Figure 19</a>:
@@ -4862,7 +4862,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.2-2">
 <pre>
 sensitivity-level        =  "Sensitivity-Level" ":" FLOAT CRLF
-            </pre><a href="#section-9.4.2-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.2-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.3">
@@ -4883,7 +4883,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.3-2">
 <pre>
 speed-vs-accuracy        =  "Speed-Vs-Accuracy" ":" FLOAT CRLF
-            </pre><a href="#section-9.4.3-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.3-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.4">
@@ -4905,7 +4905,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.4-2">
 <pre>
 n-best-list-length       =  "N-Best-List-Length" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-9.4.4-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.4-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.5">
@@ -4920,7 +4920,7 @@
 <pre>
 input-type         =  "Input-Type" ":"  inputs CRLF
 inputs             =  "speech" / "dtmf"
-            </pre><a href="#section-9.4.5-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.5-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.6">
@@ -4939,7 +4939,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.6-2">
 <pre>
 no-input-timeout         =  "No-Input-Timeout" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-9.4.6-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.6-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.7">
@@ -4957,7 +4957,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.7-2">
 <pre>
 recognition-timeout      =  "Recognition-Timeout" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-9.4.7-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.7-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.8">
@@ -4991,10 +4991,10 @@
           associated with the header field.<a href="#section-9.4.8-3" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.4.8-4">
 <pre>
-waveform-uri             =  "Waveform-URI" ":" ["&lt;" uri "&gt;" 
-                            ";" "size" "=" 1*19DIGIT 
+waveform-uri             =  "Waveform-URI" ":" ["&lt;" uri "&gt;"
+                            ";" "size" "=" 1*19DIGIT
                             ";" "duration" "=" 1*19DIGIT] CRLF
-            </pre><a href="#section-9.4.8-4" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.8-4" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.9">
@@ -5007,9 +5007,9 @@
           captured and returned by the Waveform-URI header field.<a href="#section-9.4.9-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.4.9-2">
 <pre>
-media-type               =  "Media-Type" ":" media-type-value 
+media-type               =  "Media-Type" ":" media-type-value
                             CRLF
-            </pre><a href="#section-9.4.9-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.9-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.10">
@@ -5023,7 +5023,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.10-2">
 <pre>
 input-waveform-uri       =  "Input-Waveform-URI" ":" uri CRLF
-            </pre><a href="#section-9.4.10-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.10-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.11">
@@ -5044,7 +5044,7 @@
                             cause-name CRLF
 cause-code               =  3DIGIT
 cause-name               =  *VCHAR
-            </pre><a href="#section-9.4.11-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.11-2" class="pilcrow">¶</a>
 </div>
 <table class="center" id="table-6">
             <caption><a href="#table-6" class="selfRef">Table 6</a></caption>
@@ -5178,9 +5178,9 @@
           interpret the completion reason text.<a href="#section-9.4.12-2" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.4.12-3">
 <pre>
-completion-reason        =  "Completion-Reason" ":" 
+completion-reason        =  "Completion-Reason" ":"
                             quoted-string CRLF
-            </pre><a href="#section-9.4.12-3" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.12-3" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.13">
@@ -5208,7 +5208,7 @@
 <pre>
 recognizer-context-block  =  "Recognizer-Context-Block" ":"
                              [1*VCHAR] CRLF
-            </pre><a href="#section-9.4.13-4" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.13-4" class="pilcrow">¶</a>
 </div>
 </section>
 <div id="sec.startInputTimers">
@@ -5231,7 +5231,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.14-2">
 <pre>
 start-input-timers  =  "Start-Input-Timers" ":" BOOLEAN CRLF
-            </pre><a href="#section-9.4.14-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.14-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -5253,7 +5253,7 @@
 <pre>
 speech-complete-timeout = "Speech-Complete-Timeout" ":"
                           1*19DIGIT CRLF
-            </pre><a href="#section-9.4.15-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.15-2" class="pilcrow">¶</a>
 </div>
 <p id="section-9.4.15-3">A long Speech-Complete-Timeout value delays the result to the
           client and therefore makes the application's response to a user
@@ -5280,9 +5280,9 @@
           implementation specific.<a href="#section-9.4.16-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.4.16-2">
 <pre>
-speech-incomplete-timeout = "Speech-Incomplete-Timeout" ":" 1*19DIGIT 
+speech-incomplete-timeout = "Speech-Incomplete-Timeout" ":" 1*19DIGIT
                              CRLF
-            </pre><a href="#section-9.4.16-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.16-2" class="pilcrow">¶</a>
 </div>
 <p id="section-9.4.16-3">The Speech-Incomplete-Timeout also applies when the speech prior
           to the silence is a complete match of an active grammar, but where
@@ -5312,7 +5312,7 @@
 <pre>
 dtmf-interdigit-timeout = "DTMF-Interdigit-Timeout" ":"
                            1*19DIGIT CRLF
-            </pre><a href="#section-9.4.17-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.17-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.18">
@@ -5328,7 +5328,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.18-2">
 <pre>
 dtmf-term-timeout        =  "DTMF-Term-Timeout" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-9.4.18-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.18-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.19">
@@ -5342,7 +5342,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.19-2">
 <pre>
 dtmf-term-char           =  "DTMF-Term-Char" ":" VCHAR CRLF
-            </pre><a href="#section-9.4.19-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.19-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.20">
@@ -5357,7 +5357,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.20-2">
 <pre>
 failed-uri               =  "Failed-URI" ":" absoluteURI CRLF
-            </pre><a href="#section-9.4.20-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.20-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.21">
@@ -5374,7 +5374,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.21-2">
 <pre>
 failed-uri-cause         =  "Failed-URI-Cause" ":" 1*UTFCHAR CRLF
-            </pre><a href="#section-9.4.21-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.21-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.22">
@@ -5395,7 +5395,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.22-2">
 <pre>
 save-waveform            =  "Save-Waveform" ":" BOOLEAN CRLF
-            </pre><a href="#section-9.4.22-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.22-2" class="pilcrow">¶</a>
 </div>
 </section>
 <div id="sec.newAudioChannel">
@@ -5420,9 +5420,9 @@
           session for multiple telephone calls.<a href="#section-9.4.23-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.4.23-2">
 <pre>
-new-audio-channel        =  "New-Audio-Channel" ":" BOOLEAN 
+new-audio-channel        =  "New-Audio-Channel" ":" BOOLEAN
                             CRLF
-            </pre><a href="#section-9.4.23-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.23-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -5437,7 +5437,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.24-2">
 <pre>
 speech-language          =  "Speech-Language" ":" 1*VCHAR CRLF
-            </pre><a href="#section-9.4.24-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.24-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.25">
@@ -5523,7 +5523,7 @@
 <pre>
 hotword-max-duration     =  "Hotword-Max-Duration" ":" 1*19DIGIT
                             CRLF
-            </pre><a href="#section-9.4.28-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.28-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.29">
@@ -5543,7 +5543,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.29-2">
 <pre>
 hotword-min-duration     =  "Hotword-Min-Duration" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-9.4.29-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.29-2" class="pilcrow">¶</a>
 </div>
 </section>
 <div id="sec.interpretText">
@@ -5560,8 +5560,8 @@
           the INTERPRET method.<a href="#section-9.4.30-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.4.30-2">
 <pre>
-interpret-text           =  "Interpret-Text" ":" 1*VCHAR CRLF          
-            </pre><a href="#section-9.4.30-2" class="pilcrow">¶</a>
+interpret-text           =  "Interpret-Text" ":" 1*VCHAR CRLF
+</pre><a href="#section-9.4.30-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -5581,7 +5581,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.31-2">
 <pre>
 dtmf-buffer-time  =  "DTMF-Buffer-Time" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-9.4.31-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.31-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.32">
@@ -5599,7 +5599,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.32-2">
 <pre>
 clear-dtmf-buffer  = "Clear-DTMF-Buffer" ":" BOOLEAN CRLF
-            </pre><a href="#section-9.4.32-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.32-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.33">
@@ -5617,7 +5617,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.33-2">
 <pre>
 early-no-match  = "Early-No-Match" ":" BOOLEAN CRLF
-            </pre><a href="#section-9.4.33-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.33-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.34">
@@ -5631,9 +5631,9 @@
           implementation specific and MAY be greater than 1.<a href="#section-9.4.34-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.4.34-2">
 <pre>
-num-min-consistent-pronunciations  = 
+num-min-consistent-pronunciations  =
               "Num-Min-Consistent-Pronunciations" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-9.4.34-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.34-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.35">
@@ -5653,7 +5653,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.35-2">
 <pre>
 consistency-threshold    =  "Consistency-Threshold" ":" FLOAT CRLF
-            </pre><a href="#section-9.4.35-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.35-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.36">
@@ -5676,7 +5676,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.36-2">
 <pre>
 clash-threshold          =  "Clash-Threshold" ":" FLOAT CRLF
-            </pre><a href="#section-9.4.36-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.36-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.37">
@@ -5695,7 +5695,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.37-2">
 <pre>
 personal-grammar-uri     =  "Personal-Grammar-URI" ":" uri CRLF
-            </pre><a href="#section-9.4.37-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.37-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.38">
@@ -5711,7 +5711,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.38-2">
 <pre>
 enroll-utterance     =  "Enroll-Utterance" ":" BOOLEAN CRLF
-            </pre><a href="#section-9.4.38-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.38-2" class="pilcrow">¶</a>
 </div>
 </section>
 <div id="sec.phraseID">
@@ -5728,7 +5728,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.39-2">
 <pre>
 phrase-id                =  "Phrase-ID" ":" 1*VCHAR CRLF
-            </pre><a href="#section-9.4.39-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.39-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -5743,7 +5743,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.40-2">
 <pre>
 phrase-nl                =  "Phrase-NL" ":" 1*UTFCHAR CRLF
-            </pre><a href="#section-9.4.40-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.40-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.41">
@@ -5769,7 +5769,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.41-2">
 <pre>
 weight                   =  "Weight" ":" FLOAT CRLF
-            </pre><a href="#section-9.4.41-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.41-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.42">
@@ -5789,7 +5789,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.42-2">
 <pre>
 save-best-waveform  =  "Save-Best-Waveform" ":" BOOLEAN CRLF
-            </pre><a href="#section-9.4.42-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.42-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.43">
@@ -5803,7 +5803,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.43-2">
 <pre>
 new-phrase-id            =  "New-Phrase-ID" ":" 1*VCHAR CRLF
-            </pre><a href="#section-9.4.43-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.43-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.44">
@@ -5818,7 +5818,7 @@
 <div class="artwork art-text alignLeft" id="section-9.4.44-2">
 <pre>
 confusable-phrases-uri   =  "Confusable-Phrases-URI" ":" uri CRLF
-            </pre><a href="#section-9.4.44-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.44-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-9.4.45">
@@ -5830,9 +5830,9 @@
           phrase to the personal grammar.<a href="#section-9.4.45-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.4.45-2">
 <pre>
-abort-phrase-enrollment  =  "Abort-Phrase-Enrollment" ":" 
+abort-phrase-enrollment  =  "Abort-Phrase-Enrollment" ":"
                             BOOLEAN CRLF
-            </pre><a href="#section-9.4.45-2" class="pilcrow">¶</a>
+</pre><a href="#section-9.4.45-2" class="pilcrow">¶</a>
 </div>
 </section>
 </section>
@@ -5936,8 +5936,8 @@
             &lt;one-of&gt;
                   &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;
                   &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
-            &lt;/one-of&gt; 
-      &lt;/rule&gt; 
+            &lt;/one-of&gt;
+      &lt;/rule&gt;
 
 &lt;!-- single language attachment to a rule expansion --&gt;
       &lt;rule id="request"&gt;
@@ -6012,8 +6012,8 @@
             &lt;one-of&gt;
                   &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;
                   &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
-            &lt;/one-of&gt; 
-      &lt;/rule&gt; 
+            &lt;/one-of&gt;
+      &lt;/rule&gt;
 
 &lt;!-- single language attachment to a rule expansion --&gt;
       &lt;rule id="request"&gt;
@@ -6159,7 +6159,7 @@
             uncertainty in speech recognition or natural language
             understanding. There are at least two reasons for providing
             multiple interpretations:<a href="#section-9.6.1.1-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.6.1.1-2">
+<ol start="1" type="1" class="normal type-1" id="section-9.6.1.1-2">
               <li id="section-9.6.1.1-2.1">The client application might have additional information,
                 for example, information from a database, that would allow it
                 to select a preferred interpretation from among the possible
@@ -6181,7 +6181,7 @@
 <p id="section-9.6.1.2-1">These are elements and attributes representing additional
             information about the interpretation, over and above the
             interpretation itself. Side information includes:<a href="#section-9.6.1.2-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.6.1.2-2">
+<ol start="1" type="1" class="normal type-1" id="section-9.6.1.2-2">
               <li id="section-9.6.1.2-2.1">Whether an interpretation was achieved (the &lt;nomatch&gt;
                 element) and the system's confidence in an interpretation (the
                 "confidence" attribute of &lt;interpretation&gt;).<a href="#section-9.6.1.2-2.1" class="pilcrow">¶</a>
@@ -6213,7 +6213,7 @@
 <a href="#section-9.6.2" class="section-number selfRef">9.6.2. </a><a href="#name-overview-of-recognizer-resu" class="section-name selfRef">Overview of Recognizer Result Elements and Their Relationships</a>
           </h4>
 <p id="section-9.6.2-1">The recognizer elements in NLSML fall into two categories:<a href="#section-9.6.2-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.6.2-2">
+<ol start="1" type="1" class="normal type-1" id="section-9.6.2-2">
             <li id="section-9.6.2-2.1">description of the input that was processed, and<a href="#section-9.6.2-2.1" class="pilcrow">¶</a>
 </li>
 <li id="section-9.6.2-2.2">description of the meaning which was extracted from the
@@ -6267,7 +6267,7 @@
             result, it can be overridden for individual interpretations at the
             &lt;interpretation&gt; level.<a href="#section-9.6.3.1-1" class="pilcrow">¶</a></p>
 <p id="section-9.6.3.1-2">Attributes:<a href="#section-9.6.3.1-2" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.6.3.1-3">
+<ol start="1" type="1" class="normal type-1" id="section-9.6.3.1-3">
               <li id="section-9.6.3.1-3.1">grammar: The grammar or recognition rule matched by this
                 result. The format of the grammar attribute will match the
                 rule reference semantics defined in the grammar specification.
@@ -6288,7 +6288,7 @@
 <pre>
 &lt;?xml version="1.0"?&gt;
 &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
-        grammar="http://www.example.com/grammar"&gt; 
+        grammar="http://www.example.com/grammar"&gt;
   &lt;interpretation&gt;
    ....
   &lt;/interpretation&gt;
@@ -6303,7 +6303,7 @@
 <p id="section-9.6.3.2-1">An &lt;interpretation&gt; element contains a single semantic
             interpretation.<a href="#section-9.6.3.2-1" class="pilcrow">¶</a></p>
 <p id="section-9.6.3.2-2">Attributes:<a href="#section-9.6.3.2-2" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.6.3.2-3">
+<ol start="1" type="1" class="normal type-1" id="section-9.6.3.2-3">
               <li id="section-9.6.3.2-3.1">confidence: A float value from 0.0-1.0 indicating the
                 semantic analyzer's confidence in this interpretation. A value
                 of 1.0 indicates maximum confidence. The values are
@@ -6359,7 +6359,7 @@
             objects created, nor any semantic translation, the instance value
             is the same as the input value.<a href="#section-9.6.3.3-1" class="pilcrow">¶</a></p>
 <p id="section-9.6.3.3-2">Attributes:<a href="#section-9.6.3.3-2" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.6.3.3-3">
+<ol start="1" type="1" class="normal type-1" id="section-9.6.3.3-3">
               <li id="section-9.6.3.3-3.1">confidence: Each element of the instance MAY have a
                 confidence attribute, defined in the NLSML namespace. The
                 confidence attribute contains a float value in the range from
@@ -6380,7 +6380,7 @@
       &lt;state&gt;CA&lt;/state&gt;
       &lt;zip&gt;90952&lt;/zip&gt;
   &lt;/nameAddress&gt;
-&lt;/instance&gt; 
+&lt;/instance&gt;
 &lt;input&gt;
   My address is 123 Maple Street,
   Mill Valley, California, 90952
@@ -6393,7 +6393,7 @@
 <pre>
 &lt;instance&gt;
     I would like to buy a coca-cola
-&lt;/instance&gt; 
+&lt;/instance&gt;
 &lt;input&gt;
   I would like to buy a coke
 &lt;/input&gt;
@@ -6418,7 +6418,7 @@
             spoken utterance, in <span><a href="#ISO.8601.1988" class="xref">ISO 8601
             format</a> [<a href="#ISO.8601.1988" class="xref">ISO.8601.1988</a>]</span>.<a href="#section-9.6.3.4-1" class="pilcrow">¶</a></p>
 <p id="section-9.6.3.4-2">Attributes:<a href="#section-9.6.3.4-2" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.6.3.4-3">
+<ol start="1" type="1" class="normal type-1" id="section-9.6.3.4-3">
               <li id="section-9.6.3.4-3.1">timestamp-start: The time at which the input began.
                 (optional)<a href="#section-9.6.3.4-3.1" class="pilcrow">¶</a>
 </li>
@@ -6441,7 +6441,7 @@
 <p id="section-9.6.3.4-5">When there is no time zone designator, ISO 8601 time
             representations default to local time.<a href="#section-9.6.3.4-5" class="pilcrow">¶</a></p>
 <p id="section-9.6.3.4-6">There are three possible formats for the &lt;input&gt; element.<a href="#section-9.6.3.4-6" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.6.3.4-7">
+<ol start="1" type="1" class="normal type-1" id="section-9.6.3.4-7">
               <li id="section-9.6.3.4-7.1">
                 <p id="section-9.6.3.4-7.1.1">The &lt;input&gt; element can contain simple text:<a href="#section-9.6.3.4-7.1.1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.6.3.4-7.1.2">
@@ -6465,12 +6465,12 @@
                 for individual words and word-level confidences.<a href="#section-9.6.3.4-7.2.1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.6.3.4-7.2.2">
 <pre>
-    &lt;input&gt; 
+    &lt;input&gt;
          &lt;input mode="speech" confidence="0.5"
-             timestamp-start="2000-04-03T0:00:00" 
+             timestamp-start="2000-04-03T0:00:00"
              timestamp-end="2000-04-03T0:00:00.2"&gt;fried&lt;/input&gt;
          &lt;input mode="speech" confidence="1.0"
-             timestamp-start="2000-04-03T0:00:00.25" 
+             timestamp-start="2000-04-03T0:00:00.25"
              timestamp-end="2000-04-03T0:00:00.6"&gt;onions&lt;/input&gt;
     &lt;/input&gt;
 </pre><a href="#section-9.6.3.4-7.2.2" class="pilcrow">¶</a>
@@ -6497,14 +6497,14 @@
 <pre>
 &lt;interpretation&gt;
    &lt;instance/&gt;
-      &lt;input confidence="0.1"&gt; 
+      &lt;input confidence="0.1"&gt;
          &lt;nomatch/&gt;
       &lt;/input&gt;
 &lt;/interpretation&gt;
-&lt;interpretation&gt;  
-   &lt;instance/&gt;       
-   &lt;input mode="speech" confidence="0.1"&gt;           
-     &lt;nomatch&gt;I want to go to New York&lt;/nomatch&gt;       
+&lt;interpretation&gt;
+   &lt;instance/&gt;
+   &lt;input mode="speech" confidence="0.1"&gt;
+     &lt;nomatch&gt;I want to go to New York&lt;/nomatch&gt;
    &lt;/input&gt;
 &lt;/interpretation&gt;
 </pre><a href="#section-9.6.3.5-2" class="pilcrow">¶</a>
@@ -6533,7 +6533,7 @@
             in DTMF modality". For example, to represent garbled speech
             combined with DTMF "1 2 3 4", the markup would be:<a href="#section-9.6.3.6-3" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.6.3.6-4">
-<pre>&lt;input&gt; 
+<pre>&lt;input&gt;
    &lt;input mode="speech"&gt;&lt;nomatch/&gt;&lt;/input&gt;
    &lt;input mode="dtmf"&gt;1 2 3 4&lt;/input&gt;
 &lt;/input&gt;</pre><a href="#section-9.6.3.6-4" class="pilcrow">¶</a>
@@ -6555,7 +6555,7 @@
         &lt;enrollment‑result&gt; element under &lt;result&gt;. The elements
         are described below and have the schema defined in <a href="#sec.enrollmentResultsSchema" class="xref">Section 16.2</a>. The following elements
         are defined:<a href="#section-9.7-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.7-2">
+<ol start="1" type="1" class="normal type-1" id="section-9.7-2">
           <li id="section-9.7-2.1">num-clashes<a href="#section-9.7-2.1" class="pilcrow">¶</a>
 </li>
 <li id="section-9.7-2.2">num-good-repetitions<a href="#section-9.7-2.2" class="pilcrow">¶</a>
@@ -6686,8 +6686,8 @@
             &lt;one-of&gt;
                   &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;
                   &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
-            &lt;/one-of&gt; 
-      &lt;/rule&gt; 
+            &lt;/one-of&gt;
+      &lt;/rule&gt;
 
 &lt;!-- single language attachment to a rule expansion --&gt;
       &lt;rule id="request"&gt;
@@ -6737,8 +6737,8 @@
                   "http://www.w3.org/TR/speech-grammar/grammar.dtd"&gt;
 
 &lt;grammar xmlns="http://www.w3.org/2001/06/grammar" xml:lang="en"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-       xsi:schemaLocation="http://www.w3.org/2001/06/grammar 
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.w3.org/2001/06/grammar
            http://www.w3.org/TR/speech-grammar/grammar.xsd"
            version="1.0" mode="voice" root="basicCmd"&gt;
 
@@ -6748,7 +6748,7 @@
   &lt;example&gt; please move the window &lt;/example&gt;
   &lt;example&gt; open a file &lt;/example&gt;
 
-  &lt;ruleref 
+  &lt;ruleref
     uri="http://grammar.example.com/politeness.grxml#startPolite"/&gt;
 
   &lt;ruleref uri="#command"/&gt;
@@ -6806,7 +6806,7 @@
 
 S-&gt;C:MRCP/2.0 ... START-OF-INPUT 543260 IN-PROGRESS
 Channel-Identifier:32AECB23433801@speechrecog
-        
+
 S-&gt;C:MRCP/2.0 ... RECOGNITION-COMPLETE 543260 COMPLETE
 Channel-Identifier:32AECB23433801@speechrecog
 Completion-Cause:000 success
@@ -6864,7 +6864,7 @@
         useful in applications like VoiceXML browsers to order grammars
         specified at the dialog, document, and root level of a VoiceXML
         application.<a href="#section-9.9-3" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.9-4">
+<ol start="1" type="1" class="normal type-1" id="section-9.9-4">
           <li id="section-9.9-4.1">The grammar MAY be placed directly in the message body as typed
             content. If more than one grammar is included in the body, the
             order of inclusion controls the corresponding precedence for the
@@ -6961,7 +6961,7 @@
         the Speech-Complete-Timer is started. If it matches partially with one
         or more of the active grammars, with more speech needed before a full
         match is achieved, then the Speech-Incomplete-Timer is started.<a href="#section-9.9-15" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.9-16">
+<ol start="1" type="1" class="normal type-1" id="section-9.9-16">
           <li id="section-9.9-16.1">When the No-Input-Timer expires, the recognizer MUST complete
         with a Completion-Cause code of "no-input-timeout".<a href="#section-9.9-16.1" class="pilcrow">¶</a>
 </li>
@@ -7006,7 +7006,7 @@
 <p id="section-9.9-17">For recognition in hotword mode:<a href="#section-9.9-17" class="pilcrow">¶</a></p>
 <p id="section-9.9-18">Note that for recognition in hotword mode the START-OF-INPUT event is
         not generated when speech or a DTMF digit is detected.<a href="#section-9.9-18" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-9.9-19">
+<ol start="1" type="1" class="normal type-1" id="section-9.9-19">
           <li id="section-9.9-19.1">When the No-Input-Timer expires, the recognizer MUST complete
         with a Completion-Cause code of "no-input-timeout".<a href="#section-9.9-19.1" class="pilcrow">¶</a>
 </li>
@@ -7043,7 +7043,7 @@
 &lt;?xml version="1.0"?&gt;
 
 &lt;!-- the default grammar language is US English --&gt;
-&lt;grammar xmlns="http://www.w3.org/2001/06/grammar" 
+&lt;grammar xmlns="http://www.w3.org/2001/06/grammar"
          xml:lang="en-US" version="1.0" root="request"&gt;
 
 &lt;!-- single language attachment to tokens --&gt;
@@ -7051,8 +7051,8 @@
             &lt;one-of&gt;
                   &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;
                   &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
-            &lt;/one-of&gt; 
-      &lt;/rule&gt; 
+            &lt;/one-of&gt;
+      &lt;/rule&gt;
 
 &lt;!-- single language attachment to a rule expansion --&gt;
       &lt;rule id="request"&gt;
@@ -7070,7 +7070,7 @@
 
 S-&gt;C:MRCP/2.0 ... START-OF-INPUT 543257 IN-PROGRESS
 Channel-Identifier:32AECB23433801@speechrecog
-        
+
 S-&gt;C:MRCP/2.0 ... RECOGNITION-COMPLETE 543257 COMPLETE
 Channel-Identifier:32AECB23433801@speechrecog
 Completion-Cause:000 success
@@ -7100,14 +7100,14 @@
 occur in normal usage.<a href="#section-9.9-22" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.9-23">
 <pre>
-C-&gt;S:   MRCP/2.0 ... RECOGNIZE 543257 
-        Channel-Identifier:32AECB23433801@speechrecog 
-        Confidence-Threshold:0.9 
+C-&gt;S:   MRCP/2.0 ... RECOGNIZE 543257
+        Channel-Identifier:32AECB23433801@speechrecog
+        Confidence-Threshold:0.9
         Fetch-Timeout:20
-        Content-Type:application/srgs+xml 
+        Content-Type:application/srgs+xml
         Content-Length:...
-        
-        &lt;?xml version="1.0"? Version="1.0" mode="voice" 
+
+        &lt;?xml version="1.0"? Version="1.0" mode="voice"
               root="Basic md"&gt;
          &lt;rule id="rule_list" scope="public"&gt;
              &lt;one-of&gt;
@@ -7151,7 +7151,7 @@
         Content-Type:application/srgs+xml
         Content-ID:&lt;request1@form-level.store&gt;
         Content-Length:...
-        
+
         &lt;?xml version="1.0"?&gt;
 
         &lt;!-- the default grammar language is US English --&gt;
@@ -7163,8 +7163,8 @@
                 &lt;one-of&gt;
                       &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;
                       &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
-                &lt;/one-of&gt; 
-            &lt;/rule&gt; 
+                &lt;/one-of&gt;
+            &lt;/rule&gt;
 
         &lt;!-- single language attachment to a rule expansion --&gt;
             &lt;rule id="request"&gt;
@@ -7209,13 +7209,13 @@
 C-&gt;S:   MRCP/2.0 ... GET-RESULT 543257
         Channel-Identifier:32AECB23433801@speechrecog
         Confidence-Threshold:0.9
-        
+
 
 S-&gt;C:   MRCP/2.0 ... 543257 200 COMPLETE
         Channel-Identifier:32AECB23433801@speechrecog
         Content-Type:application/nlsml+xml
         Content-Length:...
-        
+
         &lt;?xml version="1.0"?&gt;
         &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                 xmlns:ex="http://www.example.com/example"
@@ -7297,7 +7297,7 @@
         Content-Type:application/srgs+xml
         Content-ID:&lt;request1@form-level.store&gt;
         Content-Length:...
-        
+
         &lt;?xml version="1.0"?&gt;
 
         &lt;!-- the default grammar language is US English --&gt;
@@ -7309,8 +7309,8 @@
                    &lt;one-of&gt;
                        &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;
                        &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
-                   &lt;/one-of&gt; 
-              &lt;/rule&gt; 
+                   &lt;/one-of&gt;
+              &lt;/rule&gt;
 
         &lt;!-- single language attachment to a rule expansion --&gt;
               &lt;rule id="request"&gt;
@@ -7327,7 +7327,7 @@
 
 S-&gt;C:   MRCP/2.0 ... START-OF-INPUT 543257 IN-PROGRESS
         Channel-Identifier:32AECB23433801@speechrecog
-        
+
 S-&gt;C:   MRCP/2.0 ... RECOGNITION-COMPLETE 543257 COMPLETE
         Channel-Identifier:32AECB23433801@speechrecog
         Completion-Cause:000 success
@@ -7335,7 +7335,7 @@
                      size=342456;duration=25435
         Content-Type:application/nlsml+xml
         Content-Length:...
-        
+
         &lt;?xml version="1.0"?&gt;
         &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                 xmlns:ex="http://www.example.com/example"
@@ -7360,22 +7360,22 @@
         Completion-Cause:000 success
         Content-Type:application/nlsml+xml
         Content-Length:...
-        
+
         &lt;?xml version= "1.0"?&gt;
         &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                 grammar="Personal-Grammar-URI"&gt;
             &lt;enrollment-result&gt;
                 &lt;num-clashes&gt; 2 &lt;/num-clashes&gt;
                 &lt;num-good-repetitions&gt; 1 &lt;/num-good-repetitions&gt;
-                &lt;num-repetitions-still-needed&gt; 
-                   1 
+                &lt;num-repetitions-still-needed&gt;
+                   1
                 &lt;/num-repetitions-still-needed&gt;
                 &lt;consistency-status&gt; consistent &lt;/consistency-status&gt;
-                &lt;clash-phrase-ids&gt; 
-                    &lt;item&gt; Jeff &lt;/item&gt; &lt;item&gt; Andre &lt;/item&gt; 
+                &lt;clash-phrase-ids&gt;
+                    &lt;item&gt; Jeff &lt;/item&gt; &lt;item&gt; Andre &lt;/item&gt;
                 &lt;/clash-phrase-ids&gt;
                 &lt;transcriptions&gt;
-                     &lt;item&gt; m ay b r ow k er &lt;/item&gt; 
+                     &lt;item&gt; m ay b r ow k er &lt;/item&gt;
                      &lt;item&gt; m ax r aa k ah &lt;/item&gt;
                 &lt;/transcriptions&gt;
                 &lt;confusable-phrases&gt;
@@ -7483,7 +7483,7 @@
 <pre>
 C-&gt;S:   MRCP/2.0 ... END-PHRASE-ENROLLMENT 543262
         Channel-Identifier:32AECB23433801@speechrecog
-    
+
 
 S-&gt;C:   MRCP/2.0 ... 543262 200 COMPLETE
         Channel-Identifier:32AECB23433801@speechrecog
@@ -7503,7 +7503,7 @@
         effect.<a href="#section-9.18-2" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-9.18-3">
 <pre>
-C-&gt;S:   MRCP/2.0 ... MODIFY-PHRASE 543265    
+C-&gt;S:   MRCP/2.0 ... MODIFY-PHRASE 543265
         Channel-Identifier:32AECB23433801@speechrecog
         Personal-Grammar-URI:&lt;personal grammar uri&gt;
         Phrase-Id:&lt;phrase id&gt;
@@ -7511,7 +7511,7 @@
         Phrase-NL:&lt;NL phrase&gt;
         Weight:1
 
-S-&gt;C:   MRCP/2.0 ... 543265 200 COMPLETE 
+S-&gt;C:   MRCP/2.0 ... 543265 200 COMPLETE
         Channel-Identifier:32AECB23433801@speechrecog</pre><a href="#section-9.18-3" class="pilcrow">¶</a>
 </div>
 </section>
@@ -7557,56 +7557,56 @@
 <div class="artwork art-text alignLeft" id="section-9.20-4">
 <pre>
 C-&gt;S:   MRCP/2.0 ... INTERPRET 543266
-        Channel-Identifier:32AECB23433801@speechrecog 
-        Interpret-Text:may I speak to Andre Roy 
-        Content-Type:application/srgs+xml  
-        Content-ID:&lt;request1@form-level.store&gt;  
+        Channel-Identifier:32AECB23433801@speechrecog
+        Interpret-Text:may I speak to Andre Roy
+        Content-Type:application/srgs+xml
+        Content-ID:&lt;request1@form-level.store&gt;
         Content-Length:...
-        
-        &lt;?xml version="1.0"?&gt;  
-        &lt;!-- the default grammar language is US English --&gt;  
+
+        &lt;?xml version="1.0"?&gt;
+        &lt;!-- the default grammar language is US English --&gt;
         &lt;grammar xmlns="http://www.w3.org/2001/06/grammar"
-                 xml:lang="en-US" version="1.0" root="request"&gt;  
-        &lt;!-- single language attachment to tokens --&gt;  
-            &lt;rule id="yes"&gt;  
-                &lt;one-of&gt;  
-                    &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;  
-                    &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;  
-                &lt;/one-of&gt;   
-            &lt;/rule&gt;   
-        
-        &lt;!-- single language attachment to a rule expansion --&gt;  
-            &lt;rule id="request"&gt;  
-                may I speak to  
-                &lt;one-of xml:lang="fr-CA"&gt;  
-                    &lt;item&gt;Michel Tremblay&lt;/item&gt;  
-                    &lt;item&gt;Andre Roy&lt;/item&gt;  
-                &lt;/one-of&gt;  
-            &lt;/rule&gt;  
-        &lt;/grammar&gt;  
-              
+                 xml:lang="en-US" version="1.0" root="request"&gt;
+        &lt;!-- single language attachment to tokens --&gt;
+            &lt;rule id="yes"&gt;
+                &lt;one-of&gt;
+                    &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;
+                    &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
+                &lt;/one-of&gt;
+            &lt;/rule&gt;
+
+        &lt;!-- single language attachment to a rule expansion --&gt;
+            &lt;rule id="request"&gt;
+                may I speak to
+                &lt;one-of xml:lang="fr-CA"&gt;
+                    &lt;item&gt;Michel Tremblay&lt;/item&gt;
+                    &lt;item&gt;Andre Roy&lt;/item&gt;
+                &lt;/one-of&gt;
+            &lt;/rule&gt;
+        &lt;/grammar&gt;
+
 S-&gt;C:   MRCP/2.0 ... 543266 200 IN-PROGRESS
         Channel-Identifier:32AECB23433801@speechrecog
-                   
+
 S-&gt;C:   MRCP/2.0 ... INTERPRETATION-COMPLETE 543266 200 COMPLETE
         Channel-Identifier:32AECB23433801@speechrecog
-        Completion-Cause:000 success  
-        Content-Type:application/nlsml+xml  
+        Completion-Cause:000 success
+        Content-Type:application/nlsml+xml
         Content-Length:...
-        
-        &lt;?xml version="1.0"?&gt;  
+
+        &lt;?xml version="1.0"?&gt;
         &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                 xmlns:ex="http://www.example.com/example"
-                grammar="session:request1@form-level.store"&gt;  
-            &lt;interpretation&gt;  
-                &lt;instance name="Person"&gt;  
-                    &lt;ex:Person&gt;  
-                        &lt;ex:Name&gt; Andre Roy &lt;/ex:Name&gt;  
-                    &lt;/ex:Person&gt;  
-                &lt;/instance&gt;  
-                &lt;input&gt;   may I speak to Andre Roy &lt;/input&gt;  
-            &lt;/interpretation&gt;  
-        &lt;/result&gt; 
+                grammar="session:request1@form-level.store"&gt;
+            &lt;interpretation&gt;
+                &lt;instance name="Person"&gt;
+                    &lt;ex:Person&gt;
+                        &lt;ex:Name&gt; Andre Roy &lt;/ex:Name&gt;
+                    &lt;/ex:Person&gt;
+                &lt;/instance&gt;
+                &lt;input&gt;   may I speak to Andre Roy &lt;/input&gt;
+            &lt;/interpretation&gt;
+        &lt;/result&gt;
 </pre><a href="#section-9.20-4" class="pilcrow">¶</a>
 </div>
 </section>
@@ -7625,55 +7625,55 @@
 <div class="artwork art-text alignLeft" id="section-9.21-3">
 <pre>
 C-&gt;S:    MRCP/2.0 ... INTERPRET 543266
-        Channel-Identifier:32AECB23433801@speechrecog 
-        Interpret-Text:may I speak to Andre Roy 
-        Content-Type:application/srgs+xml  
-        Content-ID:&lt;request1@form-level.store&gt;  
+        Channel-Identifier:32AECB23433801@speechrecog
+        Interpret-Text:may I speak to Andre Roy
+        Content-Type:application/srgs+xml
+        Content-ID:&lt;request1@form-level.store&gt;
         Content-Length:...
-        
-        &lt;?xml version="1.0"?&gt;  
-        &lt;!-- the default grammar language is US English --&gt;  
+
+        &lt;?xml version="1.0"?&gt;
+        &lt;!-- the default grammar language is US English --&gt;
         &lt;grammar xmlns="http://www.w3.org/2001/06/grammar"
-                 xml:lang="en-US" version="1.0" root="request"&gt;  
-        &lt;!-- single language attachment to tokens --&gt;  
-            &lt;rule id="yes"&gt;  
-                &lt;one-of&gt;  
+                 xml:lang="en-US" version="1.0" root="request"&gt;
+        &lt;!-- single language attachment to tokens --&gt;
+            &lt;rule id="yes"&gt;
+                &lt;one-of&gt;
                     &lt;item xml:lang="fr-CA"&gt;oui&lt;/item&gt;
                     &lt;item xml:lang="en-US"&gt;yes&lt;/item&gt;
                 &lt;/one-of&gt;
             &lt;/rule&gt;
-        
-        &lt;!-- single language attachment to a rule expansion --&gt;  
-            &lt;rule id="request"&gt;  
-                may I speak to  
-                &lt;one-of xml:lang="fr-CA"&gt;  
-                    &lt;item&gt;Michel Tremblay&lt;/item&gt;  
-                    &lt;item&gt;Andre Roy&lt;/item&gt;  
-                &lt;/one-of&gt;  
-            &lt;/rule&gt;      
-        &lt;/grammar&gt;  
-              
+
+        &lt;!-- single language attachment to a rule expansion --&gt;
+            &lt;rule id="request"&gt;
+                may I speak to
+                &lt;one-of xml:lang="fr-CA"&gt;
+                    &lt;item&gt;Michel Tremblay&lt;/item&gt;
+                    &lt;item&gt;Andre Roy&lt;/item&gt;
+                &lt;/one-of&gt;
+            &lt;/rule&gt;
+        &lt;/grammar&gt;
+
 S-&gt;C:    MRCP/2.0 ... 543266 200 IN-PROGRESS
         Channel-Identifier:32AECB23433801@speechrecog
-                   
+
 S-&gt;C:    MRCP/2.0 ... INTERPRETATION-COMPLETE 543266 200 COMPLETE
         Channel-Identifier:32AECB23433801@speechrecog
-        Completion-Cause:000 success  
-        Content-Type:application/nlsml+xml  
+        Completion-Cause:000 success
+        Content-Type:application/nlsml+xml
         Content-Length:...
-        
-        &lt;?xml version="1.0"?&gt;  
+
+        &lt;?xml version="1.0"?&gt;
         &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                 xmlns:ex="http://www.example.com/example"
-                grammar="session:request1@form-level.store"&gt;  
-            &lt;interpretation&gt;  
-                &lt;instance name="Person"&gt;  
-                    &lt;ex:Person&gt;  
-                        &lt;ex:Name&gt; Andre Roy &lt;/ex:Name&gt;  
-                    &lt;/ex:Person&gt;  
-                &lt;/instance&gt;  
-                &lt;input&gt;   may I speak to Andre Roy &lt;/input&gt;  
-            &lt;/interpretation&gt;  
+                grammar="session:request1@form-level.store"&gt;
+            &lt;interpretation&gt;
+                &lt;instance name="Person"&gt;
+                    &lt;ex:Person&gt;
+                        &lt;ex:Name&gt; Andre Roy &lt;/ex:Name&gt;
+                    &lt;/ex:Person&gt;
+                &lt;/instance&gt;
+                &lt;input&gt;   may I speak to Andre Roy &lt;/input&gt;
+            &lt;/interpretation&gt;
         &lt;/result&gt;
 </pre><a href="#section-9.21-3" class="pilcrow">¶</a>
 </div>
@@ -7696,7 +7696,7 @@
       </h2>
 <p id="section-10-1">This resource captures received audio and video and stores it as
       content pointed to by a URI. The main usages of recorders are<a href="#section-10-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-10-2">
+<ol start="1" type="1" class="normal type-1" id="section-10-2">
         <li id="section-10-2.1">to capture speech audio that may be submitted for recognition at
           a later time, and<a href="#section-10-2.1" class="pilcrow">¶</a>
 </li>
@@ -7756,7 +7756,7 @@
 recorder-method      =  "RECORD"
                      /  "STOP"
                      /  "START-INPUT-TIMERS"
-                    </pre><a href="#section-10.2-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.2-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.3">
@@ -7768,7 +7768,7 @@
 <pre>
 recorder-event       =  "START-OF-INPUT"
                      /  "RECORD-COMPLETE"
-                    </pre><a href="#section-10.3-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.3-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4">
@@ -7781,7 +7781,7 @@
         associated with.<a href="#section-10.4-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-10.4-2">
 <pre>
-recorder-header      =  sensitivity-level        
+recorder-header      =  sensitivity-level
                      /  no-input-timeout
                      /  completion-cause
                      /  completion-reason
@@ -7796,7 +7796,7 @@
                      /  ver-buffer-utterance
                      /  start-input-timers
                      /  new-audio-channel
-                    </pre><a href="#section-10.4-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4-2" class="pilcrow">¶</a>
 </div>
 <section id="section-10.4.1">
           <h4 id="name-sensitivity-level-2">
@@ -7812,7 +7812,7 @@
 <div class="artwork art-text alignLeft" id="section-10.4.1-2">
 <pre>
 sensitivity-level    =     "Sensitivity-Level" ":" FLOAT CRLF
-            </pre><a href="#section-10.4.1-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.1-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.2">
@@ -7830,7 +7830,7 @@
 <div class="artwork art-text alignLeft" id="section-10.4.2-2">
 <pre>
 no-input-timeout    =     "No-Input-Timeout" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-10.4.2-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.2-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.3">
@@ -7851,7 +7851,7 @@
                             cause-name CRLF
 cause-code               =  3DIGIT
 cause-name               =  *VCHAR
-            </pre><a href="#section-10.4.3-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.3-2" class="pilcrow">¶</a>
 </div>
 <table class="center" id="table-7">
             <caption><a href="#table-7" class="selfRef">Table 7</a></caption>
@@ -7908,7 +7908,7 @@
 <pre>
 completion-reason        =  "Completion-Reason" ":"
                             quoted-string CRLF
-                        </pre><a href="#section-10.4.4-3" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.4-3" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.5">
@@ -7921,7 +7921,7 @@
 <div class="artwork art-text alignLeft" id="section-10.4.5-2">
 <pre>
 failed-uri               =  "Failed-URI" ":" absoluteURI CRLF
-            </pre><a href="#section-10.4.5-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.5-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.6">
@@ -7937,9 +7937,9 @@
           response code.<a href="#section-10.4.6-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-10.4.6-2">
 <pre>
-failed-uri-cause         =  "Failed-URI-Cause" ":" 1*UTFCHAR 
+failed-uri-cause         =  "Failed-URI-Cause" ":" 1*UTFCHAR
                             CRLF
-            </pre><a href="#section-10.4.6-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.6-2" class="pilcrow">¶</a>
 </div>
 </section>
 <div id="sec.recordURI">
@@ -7966,10 +7966,10 @@
           implementations already exist that support other schemes.<a href="#section-10.4.7-3" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-10.4.7-4">
 <pre>
-record-uri               =  "Record-URI" ":" ["&lt;" uri "&gt;" 
-                            ";" "size" "=" 1*19DIGIT 
+record-uri               =  "Record-URI" ":" ["&lt;" uri "&gt;"
+                            ";" "size" "=" 1*19DIGIT
                             ";" "duration" "=" 1*19DIGIT] CRLF
-            </pre><a href="#section-10.4.7-4" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.7-4" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -7981,9 +7981,9 @@
           to the server the media type of the captured audio or video.<a href="#section-10.4.8-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-10.4.8-2">
 <pre>
-media-type               =  "Media-Type" ":" media-type-value 
+media-type               =  "Media-Type" ":" media-type-value
                             CRLF
-            </pre><a href="#section-10.4.8-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.8-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.9">
@@ -8006,7 +8006,7 @@
 <div class="artwork art-text alignLeft" id="section-10.4.9-2">
 <pre>
 max-time                 =  "Max-Time" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-10.4.9-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.9-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.10">
@@ -8020,7 +8020,7 @@
 <div class="artwork art-text alignLeft" id="section-10.4.10-2">
 <pre>
 trim-length                 =  "Trim-Length" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-10.4.10-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.10-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.11">
@@ -8039,7 +8039,7 @@
 <div class="artwork art-text alignLeft" id="section-10.4.11-2">
 <pre>
 final-silence            =  "Final-Silence" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-10.4.11-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.11-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.12">
@@ -8055,7 +8055,7 @@
 <div class="artwork art-text alignLeft" id="section-10.4.12-2">
 <pre>
 capture-on-speech        =  "Capture-On-Speech " ":" BOOLEAN CRLF
-            </pre><a href="#section-10.4.12-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.12-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.13">
@@ -8091,7 +8091,7 @@
 <pre>
 start-input-timers       =  "Start-Input-Timers" ":"
                             BOOLEAN CRLF
-                        </pre><a href="#section-10.4.14-2" class="pilcrow">¶</a>
+</pre><a href="#section-10.4.14-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-10.4.15">
@@ -8148,20 +8148,20 @@
 <pre>
 C-&gt;S:  MRCP/2.0 ... RECORD 543257
        Channel-Identifier:32AECB23433802@recorder
-       Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;  
+       Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;
        Media-Type:audio/wav
        Capture-On-Speech:true
        Final-Silence:300
        Max-Time:6000
-           
-S-&gt;C:  MRCP/2.0 ... 543257 200 IN-PROGRESS 
-       Channel-Identifier:32AECB23433802@recorder           
-
-S-&gt;C:  MRCP/2.0 ... START-OF-INPUT 543257 IN-PROGRESS 
-       Channel-Identifier:32AECB23433802@recorder           
-            
-S-&gt;C:  MRCP/2.0 ... RECORD-COMPLETE 543257 COMPLETE 
-       Channel-Identifier:32AECB23433802@recorder          
+
+S-&gt;C:  MRCP/2.0 ... 543257 200 IN-PROGRESS
+       Channel-Identifier:32AECB23433802@recorder
+
+S-&gt;C:  MRCP/2.0 ... START-OF-INPUT 543257 IN-PROGRESS
+       Channel-Identifier:32AECB23433802@recorder
+
+S-&gt;C:  MRCP/2.0 ... RECORD-COMPLETE 543257 COMPLETE
+       Channel-Identifier:32AECB23433802@recorder
        Completion-Cause:000 success-silence
        Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;;
                   size=242552;duration=25645
@@ -8194,23 +8194,23 @@
 <pre>
 C-&gt;S:  MRCP/2.0 ... RECORD 543257
        Channel-Identifier:32AECB23433802@recorder
-       Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;  
+       Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;
        Capture-On-Speech:true
        Final-Silence:300
        Max-Time:6000
-           
-S-&gt;C:  MRCP/2.0 ... 543257 200 IN-PROGRESS 
-       Channel-Identifier:32AECB23433802@recorder           
-
-S-&gt;C:  MRCP/2.0 ... START-OF-INPUT 543257 IN-PROGRESS 
-       Channel-Identifier:32AECB23433802@recorder           
-            
+
+S-&gt;C:  MRCP/2.0 ... 543257 200 IN-PROGRESS
+       Channel-Identifier:32AECB23433802@recorder
+
+S-&gt;C:  MRCP/2.0 ... START-OF-INPUT 543257 IN-PROGRESS
+       Channel-Identifier:32AECB23433802@recorder
+
 C-&gt;S:  MRCP/2.0 ... STOP 543257
-       Channel-Identifier:32AECB23433802@recorder           
+       Channel-Identifier:32AECB23433802@recorder
        Trim-Length:200
-           
-S-&gt;C:  MRCP/2.0 ... 543257 200 COMPLETE 
-       Channel-Identifier:32AECB23433802@recorder           
+
+S-&gt;C:  MRCP/2.0 ... 543257 200 COMPLETE
+       Channel-Identifier:32AECB23433802@recorder
        Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;;
                   size=324253;duration=24561
        Active-Request-Id-List:543257
@@ -8235,19 +8235,19 @@
 <pre>
 C-&gt;S:  MRCP/2.0 ... RECORD 543257
        Channel-Identifier:32AECB23433802@recorder
-       Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;  
+       Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;
        Capture-On-Speech:true
        Final-Silence:300
        Max-Time:6000
-           
-S-&gt;C:  MRCP/2.0 ... 543257 200 IN-PROGRESS 
-       Channel-Identifier:32AECB23433802@recorder           
-
-S-&gt;C:  MRCP/2.0 ... START-OF-INPUT 543257 IN-PROGRESS 
-       Channel-Identifier:32AECB23433802@recorder           
-            
-S-&gt;C:  MRCP/2.0 ... RECORD-COMPLETE 543257 COMPLETE 
-       Channel-Identifier:32AECB23433802@recorder           
+
+S-&gt;C:  MRCP/2.0 ... 543257 200 IN-PROGRESS
+       Channel-Identifier:32AECB23433802@recorder
+
+S-&gt;C:  MRCP/2.0 ... START-OF-INPUT 543257 IN-PROGRESS
+       Channel-Identifier:32AECB23433802@recorder
+
+S-&gt;C:  MRCP/2.0 ... RECORD-COMPLETE 543257 COMPLETE
+       Channel-Identifier:32AECB23433802@recorder
        Completion-Cause:000 success
        Record-URI:&lt;file://mediaserver/recordings/myfile.wav&gt;;
                   size=325325;duration=24652
@@ -8430,14 +8430,14 @@
    |                   |&lt;---------|              |
    |                   |                         |
    |----------|        |                         |
-   |         STOP      |                         |    
+   |         STOP      |                         |
    |&lt;---------|        |                         |
    |                   |----------|              |
    |                   |    CLEAR-BUFFER         |
    |                   |&lt;---------|              |
    |                   |                         |
    |----------|        |                         |
-   |   CLEAR-BUFFER    |                         |    
+   |   CLEAR-BUFFER    |                         |
    |&lt;---------|        |                         |
    |                   |                         |
    |                   |----------|              |
@@ -8479,7 +8479,7 @@
                          / "CLEAR-BUFFER"
                          / "START-INPUT-TIMERS"
                          / "GET-INTERMEDIATE-RESULT"
-                        </pre><a href="#section-11.2-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.2-2" class="pilcrow">¶</a>
 </div>
 <p id="section-11.2-3">These methods allow the client to control the mode and target of
         verification or identification operations within the context of a
@@ -8497,13 +8497,13 @@
         appropriate for the resource, with the header field
         Ver‑Buffer‑Utterance. Then, when the following method is called,
         verification is performed using the set of buffered audio.<a href="#section-11.2-5" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-11.2-6">
+<ol start="1" type="1" class="normal type-1" id="section-11.2-6">
           <li id="section-11.2-6.1">VERIFY-FROM-BUFFER<a href="#section-11.2-6.1" class="pilcrow">¶</a>
 </li>
 </ol>
 <p id="section-11.2-7">The following methods are used for verification of live audio
         utterances:<a href="#section-11.2-7" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-11.2-8">
+<ol start="1" type="1" class="normal type-1" id="section-11.2-8">
           <li id="section-11.2-8.1">VERIFY<a href="#section-11.2-8.1" class="pilcrow">¶</a>
 </li>
 <li id="section-11.2-8.2">START-INPUT-TIMERS<a href="#section-11.2-8.2" class="pilcrow">¶</a>
@@ -8511,7 +8511,7 @@
 </ol>
 <p id="section-11.2-9">The following methods are used for configuring the verifier
         resource and for establishing resource states:<a href="#section-11.2-9" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-11.2-10">
+<ol start="1" type="1" class="normal type-1" id="section-11.2-10">
           <li id="section-11.2-10.1">START-SESSION<a href="#section-11.2-10.1" class="pilcrow">¶</a>
 </li>
 <li id="section-11.2-10.2">END-SESSION<a href="#section-11.2-10.2" class="pilcrow">¶</a>
@@ -8529,7 +8529,7 @@
 </ol>
 <p id="section-11.2-11">The following method allows the polling of a verification in progress
         for intermediate results.<a href="#section-11.2-11" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-11.2-12">
+<ol start="1" type="1" class="normal type-1" id="section-11.2-12">
           <li id="section-11.2-12.1">GET-INTERMEDIATE-RESULT<a href="#section-11.2-12.1" class="pilcrow">¶</a>
 </li>
 </ol>
@@ -8543,7 +8543,7 @@
 <pre>
 verifier-event       =  "VERIFICATION-COMPLETE"
                      /  "START-OF-INPUT"
-                        </pre><a href="#section-11.3-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.3-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4">
@@ -8576,7 +8576,7 @@
                          /  new-audio-channel
                          /  abort-verification
                          /  start-input-timers
-          </pre><a href="#section-11.4-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4-2" class="pilcrow">¶</a>
 </div>
 <div id="sec.repositoryURI">
 <section id="section-11.4.1">
@@ -8590,7 +8590,7 @@
 <div class="artwork art-text alignLeft" id="section-11.4.1-2">
 <pre>
 repository-uri           =  "Repository-URI" ":" uri CRLF
-           </pre><a href="#section-11.4.1-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.1-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -8610,10 +8610,10 @@
           group identifier instead of a list of voiceprint identifiers.<a href="#section-11.4.2-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-11.4.2-2">
 <pre>
-voiceprint-identifier        =  "Voiceprint-Identifier" ":" 
+voiceprint-identifier        =  "Voiceprint-Identifier" ":"
                                 vid *[";" vid] CRLF
 vid                          =  1*VCHAR ["." 1*VCHAR]
-                            </pre><a href="#section-11.4.2-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.2-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.3">
@@ -8644,7 +8644,7 @@
           caller's response without any participation by the verifier
           resource.<a href="#section-11.4.3-3" class="pilcrow">¶</a></p>
 <p id="section-11.4.3-4">Once the following conditions have been met:<a href="#section-11.4.3-4" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-11.4.3-5">
+<ol start="1" type="1" class="normal type-1" id="section-11.4.3-5">
             <li id="section-11.4.3-5.1">the voiceprint identity has been successfully established through
               the Voiceprint-Identifier header fields of the START-SESSION
               method, and<a href="#section-11.4.3-5.1" class="pilcrow">¶</a>
@@ -8665,12 +8665,12 @@
           error and the mode retains its current value.<a href="#section-11.4.3-7" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-11.4.3-8">
 <pre>
-verification-mode            =  "Verification-Mode" ":" 
+verification-mode            =  "Verification-Mode" ":"
                                 verification-mode-string
 
 verification-mode-string     =  "train"
                              /  "verify"
-            </pre><a href="#section-11.4.3-8" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.3-8" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.4">
@@ -8688,7 +8688,7 @@
 <div class="artwork art-text alignLeft" id="section-11.4.4-2">
 <pre>
 adapt-model              = "Adapt-Model" ":" BOOLEAN CRLF
-            </pre><a href="#section-11.4.4-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.4-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.5">
@@ -8708,7 +8708,7 @@
 <div class="artwork art-text alignLeft" id="section-11.4.5-2">
 <pre>
 abort-model             = "Abort-Model" ":" BOOLEAN CRLF
-            </pre><a href="#section-11.4.5-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.5-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.6">
@@ -8723,9 +8723,9 @@
           this header field is implementation specific.<a href="#section-11.4.6-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-11.4.6-2">
 <pre>
-min-verification-score  = "Min-Verification-Score" ":" 
+min-verification-score  = "Min-Verification-Score" ":"
                           [ %x2D ] FLOAT CRLF
-            </pre><a href="#section-11.4.6-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.6-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.7">
@@ -8742,9 +8742,9 @@
           START-SESSION, SET-PARAMS, or GET-PARAMS.<a href="#section-11.4.7-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-11.4.7-2">
 <pre>
-num-min-verification-phrases =  "Num-Min-Verification-Phrases" ":" 
+num-min-verification-phrases =  "Num-Min-Verification-Phrases" ":"
                                 1*19DIGIT CRLF
-            </pre><a href="#section-11.4.7-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.7-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.8">
@@ -8761,9 +8761,9 @@
           START-SESSION, SET-PARAMS, or GET-PARAMS.<a href="#section-11.4.8-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-11.4.8-2">
 <pre>
-num-max-verification-phrases =  "Num-Max-Verification-Phrases" ":" 
+num-max-verification-phrases =  "Num-Max-Verification-Phrases" ":"
                                  1*19DIGIT CRLF
-            </pre><a href="#section-11.4.8-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.8-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.9">
@@ -8784,7 +8784,7 @@
 <div class="artwork art-text alignLeft" id="section-11.4.9-2">
 <pre>
 no-input-timeout         = "No-Input-Timeout" ":" 1*19DIGIT CRLF
-            </pre><a href="#section-11.4.9-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.9-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.10">
@@ -8807,7 +8807,7 @@
 <div class="artwork art-text alignLeft" id="section-11.4.10-2">
 <pre>
 save-waveform            =  "Save-Waveform" ":" BOOLEAN CRLF
-           </pre><a href="#section-11.4.10-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.10-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.11">
@@ -8820,9 +8820,9 @@
           by the Waveform-URI header field.<a href="#section-11.4.11-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-11.4.11-2">
 <pre>
-media-type               =  "Media-Type" ":" media-type-value 
+media-type               =  "Media-Type" ":" media-type-value
                             CRLF
-            </pre><a href="#section-11.4.11-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.11-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.12">
@@ -8848,10 +8848,10 @@
           associated with the header field.<a href="#section-11.4.12-2" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-11.4.12-3">
 <pre>
-waveform-uri             =  "Waveform-URI" ":" ["&lt;" uri "&gt;" 
-                            ";" "size" "=" 1*19DIGIT 
+waveform-uri             =  "Waveform-URI" ":" ["&lt;" uri "&gt;"
+                            ";" "size" "=" 1*19DIGIT
                             ";" "duration" "=" 1*19DIGIT] CRLF
-            </pre><a href="#section-11.4.12-3" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.12-3" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.13">
@@ -8866,7 +8866,7 @@
 <div class="artwork art-text alignLeft" id="section-11.4.13-2">
 <pre>
 voiceprint-exists    =  "Voiceprint-Exists" ":" BOOLEAN CRLF
-            </pre><a href="#section-11.4.13-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.13-2" class="pilcrow">¶</a>
 </div>
 </section>
 <div id="sec.verBufferUtterance">
@@ -8885,7 +8885,7 @@
 <pre>
 ver-buffer-utterance     = "Ver-Buffer-Utterance" ":" BOOLEAN
                            CRLF
-            </pre><a href="#section-11.4.14-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.14-2" class="pilcrow">¶</a>
 </div>
 </section>
 </div>
@@ -8903,7 +8903,7 @@
 <div class="artwork art-text alignLeft" id="section-11.4.15-2">
 <pre>
 input-waveform-uri           =  "Input-Waveform-URI" ":" uri CRLF
-            </pre><a href="#section-11.4.15-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.15-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.16">
@@ -8925,7 +8925,7 @@
                             cause-name CRLF
 cause-code               =  3DIGIT
 cause-name               =  *VCHAR
-            </pre><a href="#section-11.4.16-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.16-2" class="pilcrow">¶</a>
 </div>
 <table class="center" id="table-8">
             <caption><a href="#table-8" class="selfRef">Table 8</a></caption>
@@ -9024,9 +9024,9 @@
           interpret the completion reason text.<a href="#section-11.4.17-2" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-11.4.17-3">
 <pre>
-completion-reason        =  "Completion-Reason" ":" 
+completion-reason        =  "Completion-Reason" ":"
                             quoted-string CRLF
-            </pre><a href="#section-11.4.17-3" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.17-3" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.18">
@@ -9058,7 +9058,7 @@
 <div class="artwork art-text alignLeft" id="section-11.4.20-2">
 <pre>
 abort-verification   =  "Abort-Verification " ":" BOOLEAN CRLF
-            </pre><a href="#section-11.4.20-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.20-2" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.4.21">
@@ -9082,7 +9082,7 @@
 <pre>
 start-input-timers       =  "Start-Input-Timers" ":"
                             BOOLEAN CRLF
-            </pre><a href="#section-11.4.21-2" class="pilcrow">¶</a>
+</pre><a href="#section-11.4.21-2" class="pilcrow">¶</a>
 </div>
 </section>
 </section>
@@ -9111,7 +9111,7 @@
           &lt;verification-result&gt; element under &lt;result&gt;. The
           elements are described below and have the schema defined in <a href="#sec.enrollmentResultsSchema" class="xref">Section 16.2</a>. The following elements
           are defined:<a href="#section-11.5.2-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-11.5.2-2">
+<ol start="1" type="1" class="normal type-1" id="section-11.5.2-2">
             <li id="section-11.5.2-2.1">&lt;voiceprint&gt;<a href="#section-11.5.2-2.1" class="pilcrow">¶</a>
 </li>
 <li id="section-11.5.2-2.2">&lt;incremental&gt;<a href="#section-11.5.2-2.2" class="pilcrow">¶</a>
@@ -9386,7 +9386,7 @@
 <p id="section-11.7-1">The END-SESSION method terminates an ongoing verification session
         and releases the verification voiceprint resources. The session may
         terminate in one of three ways:<a href="#section-11.7-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-11.7-2">
+<ol start="1" type="1" class="normal type-1" id="section-11.7-2">
           <li id="section-11.7-2.1">abort - the voiceprint adaptation or creation may be aborted so
             that the voiceprint remains unchanged (or is not created).<a href="#section-11.7-2.1" class="pilcrow">¶</a>
 </li>
@@ -9415,7 +9415,7 @@
 
 S-&gt;C:  MRCP/2.0 ... 314174 200 COMPLETE
        Channel-Identifier:32AECB23433801@speakverify
-          </pre><a href="#section-11.7-6" class="pilcrow">¶</a>
+</pre><a href="#section-11.7-6" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-11.8">
@@ -9451,7 +9451,7 @@
        Repository-URI:http://www.example.com/voiceprints/
        Voiceprint-Identifier:johnsmith.voiceprint
        Voiceprint-Exists:true
-          </pre><a href="#section-11.8-5" class="pilcrow">¶</a>
+</pre><a href="#section-11.8-5" class="pilcrow">¶</a>
 </div>
 <p id="section-11.8-6">The following example assumes that the URI provided in the
         Repository-URI header field is a bad URI.<a href="#section-11.8-6" class="pilcrow">¶</a></p>
@@ -9580,7 +9580,7 @@
        Completion-Cause:000 success
        Content-Type:application/nlsml+xml
        Content-Length:...
-       
+
        &lt;?xml version="1.0"?&gt;
        &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                grammar="What-Grammar-URI"&gt;
@@ -9636,7 +9636,7 @@
        Completion-Cause:000 success
        Content-Type:application/nlsml+xml
        Content-Length:...
-       
+
        &lt;?xml version="1.0"?&gt;
        &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                grammar="What-Grammar-URI"&gt;
@@ -9735,9 +9735,9 @@
 C-&gt;S:  MRCP/2.0 ... VERIFY 314177
        Channel-Identifier:32AECB23433801@speakverify
 
-S-&gt;C:  MRCP/2.0 ... 314177 200 IN-PROGRESS 
+S-&gt;C:  MRCP/2.0 ... 314177 200 IN-PROGRESS
        Channel-Identifier:32AECB23433801@speakverify
-     
+
 C-&gt;S:  MRCP/2.0 ... STOP 314178
        Channel-Identifier:32AECB23433801@speakverify
 
@@ -9781,7 +9781,7 @@
        Completion-Cause:000 success
        Content-Type:application/nlsml+xml
        Content-Length:...
-       
+
        &lt;?xml version="1.0"?&gt;
        &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                grammar="What-Grammar-URI"&gt;
@@ -9869,8 +9869,8 @@
        Channel-Identifier:32AECB23433801@speakverify
        Content-Type:application/nlsml+xml
        Content-Length:...
-       
-       &lt;?xml version="1.0"?&gt;  
+
+       &lt;?xml version="1.0"?&gt;
        &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                grammar="What-Grammar-URI"&gt;
          &lt;verification-result&gt;
@@ -9924,7 +9924,7 @@
         by SDP within the context of a SIP dialog. In order to ensure secure
         rendezvous between MRCPv2 clients and servers, the following are
         required:<a href="#section-12.1-1" class="pilcrow">¶</a></p>
-<ol start="1" type="1" class="normal" id="section-12.1-2">
+<ol start="1" type="1" class="normal type-1" id="section-12.1-2">
           <li id="section-12.1-2.1">The SIP implementation in MRCPv2 clients and servers MUST
             support SIP digest authentication <span>[<a href="#RFC3261" class="xref">RFC3261</a>]</span>
             and SHOULD employ it.<a href="#section-12.1-2.1" class="pilcrow">¶</a>
@@ -10203,7 +10203,7 @@
 Proxy-Sync-Id                      Generic          [RFC6787]
 Accept-Charset                     Generic          [RFC2616]
 Content-Type                       Generic          [RFC6787]
-Content-ID                         Generic 
+Content-ID                         Generic
                           [RFC2392], [RFC2046], and [RFC5322]
 Content-Base                       Generic          [RFC6787]
 Content-Encoding                   Generic          [RFC6787]
@@ -10285,10 +10285,10 @@
 Record-URI                         Recorder         [RFC6787]
 Media-Type                         Recorder         [RFC6787]
 Max-Time                           Recorder         [RFC6787]
-Trim-Length                        Recorder         [RFC6787] 
+Trim-Length                        Recorder         [RFC6787]
 Final-Silence                      Recorder         [RFC6787]
-Capture-On-Speech                  Recorder         [RFC6787] 
-Ver-Buffer-Utterance               Recorder         [RFC6787] 
+Capture-On-Speech                  Recorder         [RFC6787]
+Ver-Buffer-Utterance               Recorder         [RFC6787]
 Start-Input-Timers                 Recorder         [RFC6787]
 New-Audio-Channel                  Recorder         [RFC6787]
 Repository-URI                     Verifier         [RFC6787]
@@ -10864,7 +10864,7 @@
        Contact:&lt;sip:sarvi@client.example.com&gt;
        Content-Type:application/sdp
        Content-Length:...
-       
+
        v=0
        o=sarvi 2614933546 2614933546 IN IP4 192.0.2.12
        s=Set up MRCPv2 control and audio
@@ -10923,23 +10923,23 @@
        Contact:&lt;sip:sarvi@client.example.com&gt;
        Content-Type:application/sdp
        Content-Length:...
-       
+
        v=0
        o=sarvi 2614933546 2614933547 IN IP4 192.0.2.12
        s=Set up MRCPv2 control and audio
        i=Add TCP channel, synthesizer and one-way audio
        c=IN IP4 192.0.2.12
        t=0 0
-       m=application 9  TCP/MRCPv2 1 
+       m=application 9  TCP/MRCPv2 1
        a=setup:active
        a=connection:new
-       a=resource:speechsynth 
+       a=resource:speechsynth
        a=cmid:1
        m=audio 49170 RTP/AVP 0 96
        a=rtpmap:0 pcmu/8000
-       a=rtpmap:96 telephone-event/8000 
-       a=fmtp:96 0-15 
-       a=recvonly 
+       a=rtpmap:96 telephone-event/8000
+       a=fmtp:96 0-15
+       a=recvonly
        a=mid:1
 
 
@@ -10954,21 +10954,21 @@
        Contact:&lt;sip:mresources@server.example.com&gt;
        Content-Type:application/sdp
        Content-Length:...
-       
+
        v=0
        o=- 3000000001 3000000002 IN IP4 192.0.2.11
        s=Set up MRCPv2 control and audio
        i=Add TCP channel, synthesizer and one-way audio
        c=IN IP4 192.0.2.11
        t=0 0
-       m=application 32416  TCP/MRCPv2 1 
+       m=application 32416  TCP/MRCPv2 1
        a=setup:passive
        a=connection:new
-       a=channel:32AECB23433801@speechsynth 
+       a=channel:32AECB23433801@speechsynth
        a=cmid:1
        m=audio 48260 RTP/AVP 0
        a=rtpmap:0 pcmu/8000
-       a=sendonly 
+       a=sendonly
        a=mid:1
 
 
@@ -11002,34 +11002,34 @@
        Contact:&lt;sip:sarvi@client.example.com&gt;
        Content-Type:application/sdp
        Content-Length:...
-       
+
        v=0
        o=sarvi 2614933546 2614933548 IN IP4 192.0.2.12
        s=Set up MRCPv2 control and audio
        i=Add recognizer and duplex the audio
        c=IN IP4 192.0.2.12
        t=0 0
-       m=application 9  TCP/MRCPv2 1 
+       m=application 9  TCP/MRCPv2 1
        a=setup:active
        a=connection:existing
-       a=resource:speechsynth 
+       a=resource:speechsynth
        a=cmid:1
        m=audio 49170 RTP/AVP 0 96
        a=rtpmap:0 pcmu/8000
-       a=rtpmap:96 telephone-event/8000 
-       a=fmtp:96 0-15 
-       a=recvonly 
+       a=rtpmap:96 telephone-event/8000
+       a=fmtp:96 0-15
+       a=recvonly
        a=mid:1
-       m=application 9  TCP/MRCPv2 1 
+       m=application 9  TCP/MRCPv2 1
        a=setup:active
        a=connection:existing
-       a=resource:speechrecog 
+       a=resource:speechrecog
        a=cmid:2
        m=audio 49180 RTP/AVP 0 96
        a=rtpmap:0 pcmu/8000
        a=rtpmap:96 telephone-event/8000
        a=fmtp:96 0-15
-       a=sendonly 
+       a=sendonly
        a=mid:2
 
 
@@ -11044,28 +11044,28 @@
        Contact:&lt;sip:mresources@server.example.com&gt;
        Content-Type:application/sdp
        Content-Length:...
-       
+
        v=0
        o=- 3000000001 3000000003 IN IP4 192.0.2.11
        s=Set up MRCPv2 control and audio
        i=Add recognizer and duplex the audio
        c=IN IP4 192.0.2.11
        t=0 0
-       m=application 32416  TCP/MRCPv2 1 
-       a=channel:32AECB23433801@speechsynth 
+       m=application 32416  TCP/MRCPv2 1
+       a=channel:32AECB23433801@speechsynth
        a=cmid:1
        m=audio 48260 RTP/AVP 0
        a=rtpmap:0 pcmu/8000
-       a=sendonly 
+       a=sendonly
        a=mid:1
-       m=application 32416  TCP/MRCPv2 1 
-       a=channel:32AECB23433801@speechrecog 
+       m=application 32416  TCP/MRCPv2 1
+       a=channel:32AECB23433801@speechrecog
        a=cmid:2
        m=audio 48260 RTP/AVP 0
        a=rtpmap:0 pcmu/8000
        a=rtpmap:96 telephone-event/8000
        a=fmtp:96 0-15
-       a=recvonly 
+       a=recvonly
        a=mid:2
 
 
@@ -11093,9 +11093,9 @@
        Prosody-volume:medium
        Content-Type:application/ssml+xml
        Content-Length:...
-       
+
        &lt;?xml version="1.0"?&gt;
-       &lt;speak version="1.0"                
+       &lt;speak version="1.0"
               xmlns="http://www.w3.org/2001/10/synthesis"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -11103,7 +11103,7 @@
               xml:lang="en-US"&gt;
          &lt;p&gt;
            &lt;s&gt;You have 4 new messages.&lt;/s&gt;
-           &lt;s&gt;The first is from Stephanie Williams 
+           &lt;s&gt;The first is from Stephanie Williams
              &lt;mark name="Stephanie"/&gt;
              and arrived at &lt;break/&gt;
              &lt;say-as interpret-as="vxml:time"&gt;0345p&lt;/say-as&gt;.&lt;/s&gt;
@@ -11113,7 +11113,7 @@
        &lt;/speak&gt;
 
 S-&gt;C:
-       MRCP/2.0 ... 543257 200 IN-PROGRESS 
+       MRCP/2.0 ... 543257 200 IN-PROGRESS
        Channel-Identifier:32AECB23433801@speechsynth
        Speech-Marker:timestamp=857205015059
 
@@ -11123,7 +11123,7 @@
         and faithfully informs the client of the event.<a href="#section-14.1-10" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-14.1-11">
 <pre>
-S-&gt;C:  MRCP/2.0 ... SPEECH-MARKER 543257 IN-PROGRESS 
+S-&gt;C:  MRCP/2.0 ... SPEECH-MARKER 543257 IN-PROGRESS
        Channel-Identifier:32AECB23433801@speechsynth
        Speech-Marker:timestamp=857206027059;Stephanie
 </pre><a href="#section-14.1-11" class="pilcrow">¶</a>
@@ -11145,7 +11145,7 @@
        Channel-Identifier:32AECB23433801@speechrecog
        Content-Type:application/srgs+xml
        Content-Length:...
-       
+
        &lt;?xml version="1.0"?&gt;
        &lt;!-- the default grammar language is US English --&gt;
        &lt;grammar xmlns="http://www.w3.org/2001/06/grammar"
@@ -11173,9 +11173,9 @@
        Kill-On-Barge-In:true
        Content-Type:application/ssml+xml
        Content-Length:...
-       
+
        &lt;?xml version="1.0"?&gt;
-       &lt;speak version="1.0"                
+       &lt;speak version="1.0"
               xmlns="http://www.w3.org/2001/10/synthesis"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:schemaLocation="http://www.w3.org/2001/10/synthesis
@@ -11238,12 +11238,12 @@
 <pre>
 S-&gt;C:  MRCP/2.0 ... RECOGNITION-COMPLETE 543258 COMPLETE
        Channel-Identifier:32AECB23433801@speechrecog
-       Completion-Cause:000 success    
+       Completion-Cause:000 success
        Waveform-URI:&lt;http://web.media.com/session123/audio.wav&gt;;
                     size=423523;duration=25432
        Content-Type:application/nlsml+xml
        Content-Length:...
-       
+
        &lt;?xml version="1.0"?&gt;
        &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
                xmlns:ex="http://www.example.com/example"
@@ -11290,7 +11290,7 @@
 System: To which city will you be traveling?
 User:   I want to go to Pittsburgh.
 
-&lt;?xml version="1.0"?&gt;  
+&lt;?xml version="1.0"?&gt;
 &lt;result xmlns="urn:ietf:params:xml:ns:mrcpv2"
         xmlns:ex="http://www.example.com/example"
         grammar="http://www.example.com/flight"&gt;
@@ -11323,7 +11323,7 @@
 <div class="artwork art-text alignLeft" id="section-14.2.2-1">
 <pre>
 System: What would you like?
-User:   I would like 2 pizzas, one with pepperoni and cheese, 
+User:   I would like 2 pizzas, one with pepperoni and cheese,
         one with sausage and a bottle of coke, to go.
 </pre><a href="#section-14.2.2-1" class="pilcrow">¶</a>
 </div>
@@ -11335,7 +11335,7 @@
           resolve the two "one"s as "pizza".<a href="#section-14.2.2-2" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-14.2.2-3">
 <pre>
-&lt;?xml version="1.0"?&gt;  
+&lt;?xml version="1.0"?&gt;
 &lt;nl:result xmlns:nl="urn:ietf:params:xml:ns:mrcpv2"
            xmlns="http://www.example.com/example"
            grammar="http://www.example.com/foodorder"&gt;
@@ -11383,11 +11383,11 @@
 <pre>
 &lt;input&gt;
   &lt;input mode="speech" confidence ="1.0"
-     timestamp-start="2000-04-03T0:00:00" 
+     timestamp-start="2000-04-03T0:00:00"
      timestamp-end="2000-04-03T0:00:01.5"&gt;My pin is
   &lt;/input&gt;
   &lt;input mode="dtmf" confidence ="1.0"
-     timestamp-start="2000-04-03T0:00:01.5" 
+     timestamp-start="2000-04-03T0:00:01.5"
      timestamp-end="2000-04-03T0:00:02.0"&gt;1 2 3 4
   &lt;/input&gt;
 &lt;/input&gt;
@@ -11463,18 +11463,18 @@
           for actually resolving the reference).<a href="#section-14.2.5-1" class="pilcrow">¶</a></p>
 <div class="artwork art-text alignLeft" id="section-14.2.5-2">
 <pre>
-Example: (ignoring the issue of representing the input from the 
+Example: (ignoring the issue of representing the input from the
           pointing gesture.)
 
 System: What do you want to drink?
 User:   I want this. (clicks on picture of large root beer.)
 
-&lt;?xml version="1.0"?&gt;  
+&lt;?xml version="1.0"?&gt;
 &lt;nl:result xmlns:nl="urn:ietf:params:xml:ns:mrcpv2"
         xmlns="http://www.example.com/example"
-        grammar="http://www.example.com/beverages.grxml"&gt;  
+        grammar="http://www.example.com/beverages.grxml"&gt;
    &lt;nl:interpretation&gt;
-      &lt;nl:instance&gt; 
+      &lt;nl:instance&gt;
        &lt;doer&gt;I&lt;/doer&gt;
        &lt;action&gt;want&lt;/action&gt;
        &lt;object&gt;this&lt;/object&gt;
@@ -11545,7 +11545,7 @@
 
 SWS    =    [LWS] ; sep whitespace
 
-UTF8-NONASCII    =    %xC0-DF 1UTF8-CONT 
+UTF8-NONASCII    =    %xC0-DF 1UTF8-CONT
                  /    %xE0-EF 2UTF8-CONT
                  /    %xF0-F7 3UTF8-CONT
                  /    %xF8-FB 4UTF8-CONT
@@ -11556,7 +11556,7 @@
                  /    UTF8-NONASCII
 param            =    *pchar
 
-quoted-string    =    SWS DQUOTE *(qdtext / quoted-pair ) 
+quoted-string    =    SWS DQUOTE *(qdtext / quoted-pair )
                       DQUOTE
 
 qdtext           =    LWS / %x21 / %x23-5B / %x5D-7E
@@ -11567,7 +11567,7 @@
 token            =    1*(alphanum / "-" / "." / "!" / "%" / "*"
                       / "_" / "+" / "`" / "'" / "~" )
 
-reserved         =    ";" / "/" / "?" / ":" / "@" / "&amp;" / "=" 
+reserved         =    ";" / "/" / "?" / ":" / "@" / "&amp;" / "="
                       / "+" / "$" / ","
 
 mark             =    "-" / "_" / "." / "!" / "~" / "*" / "'"
@@ -11580,7 +11580,7 @@
 
 alphanum         =    ALPHA / DIGIT
 
-BOOLEAN          =    "true" / "false" 
+BOOLEAN          =    "true" / "false"
 
 FLOAT            =    *DIGIT ["." *DIGIT]
 
@@ -11588,12 +11588,12 @@
 
 fragment         =    *uric
 
-uri              =    [ absoluteURI / relativeURI ] 
+uri              =    [ absoluteURI / relativeURI ]
                       [ "#" fragment ]
 
 absoluteURI      =    scheme ":" ( hier-part / opaque-part )
 
-relativeURI      =    ( net-path / abs-path / rel-path ) 
+relativeURI      =    ( net-path / abs-path / rel-path )
                       [ "?" query ]
 
 hier-part        =    ( net-path / abs-path ) [ "?" query ]
@@ -11604,14 +11604,14 @@
 
 rel-path         =    rel-segment [ abs-path ]
 
-rel-segment      =    1*( unreserved / escaped / ";" / "@" 
-                 /    "&amp;" / "=" / "+" / "$" / "," )    
+rel-segment      =    1*( unreserved / escaped / ";" / "@"
+                 /    "&amp;" / "=" / "+" / "$" / "," )
 
 opaque-part      =    uric-no-slash *uric
 
 uric             =    reserved / unreserved / escaped
 
-uric-no-slash    =    unreserved / escaped / ";" / "?" / ":" 
+uric-no-slash    =    unreserved / escaped / ";" / "?" / ":"
                       / "@" / "&amp;" / "=" / "+" / "$" / ","
 
 path-segments    =    segment *( "/" segment )
@@ -11631,13 +11631,13 @@
 
 userinfo         =    ( user ) [ ":" password ] "@"
 
-user             =    1*( unreserved / escaped 
+user             =    1*( unreserved / escaped
                  /    user-unreserved )
 
-user-unreserved  =    "&amp;" / "=" / "+" / "$" / "," / ";" 
+user-unreserved  =    "&amp;" / "=" / "+" / "$" / "," / ";"
                  /    "?" / "/"
 
-password         =    *( unreserved / escaped 
+password         =    *( unreserved / escaped
                  /    "&amp;" / "=" / "+" / "$" / "," )
 
 hostport         =    host [ ":" port ]
@@ -11652,14 +11652,14 @@
 toplabel         =    ALPHA / ALPHA *( alphanum / "-" )
                       alphanum
 
-IPv4address      =    1*3DIGIT "." 1*3DIGIT "." 1*3DIGIT "." 
+IPv4address      =    1*3DIGIT "." 1*3DIGIT "." 1*3DIGIT "."
                       1*3DIGIT
 
 IPv6reference    =    "[" IPv6address "]"
 
 IPv6address      =    hexpart [ ":" IPv4address ]
 
-hexpart          =    hexseq / hexseq "::" [ hexseq ] / "::" 
+hexpart          =    hexseq / hexseq "::" [ hexseq ] / "::"
                       [ hexseq ]
 
 hexseq           =    hex4 *( ":" hex4)
@@ -11670,23 +11670,23 @@
 
 
 ; generic-message is the top-level rule
-generic-message  =    start-line message-header CRLF 
-                      [ message-body ] 
+generic-message  =    start-line message-header CRLF
+                      [ message-body ]
 
 message-body     =    *OCTET
-         
-start-line       =    request-line / response-line / event-line 
+
+start-line       =    request-line / response-line / event-line
 
 request-line     =    mrcp-version SP message-length SP method-name
-                      SP request-id CRLF 
+                      SP request-id CRLF
 
-response-line    =    mrcp-version SP message-length SP request-id 
-                      SP status-code SP request-state CRLF 
+response-line    =    mrcp-version SP message-length SP request-id
+                      SP status-code SP request-state CRLF
 
 event-line       =    mrcp-version SP message-length SP event-name
-                      SP request-id SP request-state CRLF 
+                      SP request-id SP request-state CRLF
 
-method-name      =    generic-method    
+method-name      =    generic-method
                  /    synthesizer-method
                  /    recognizer-method
                  /    recorder-method
@@ -11695,15 +11695,15 @@
 generic-method   =    "SET-PARAMS"
                  /    "GET-PARAMS"
 
-request-state    =    "COMPLETE" 
-                 /    "IN-PROGRESS"        
-                 /    "PENDING" 
+request-state    =    "COMPLETE"
+                 /    "IN-PROGRESS"
+                 /    "PENDING"
 
 event-name       =    synthesizer-event
                  /    recognizer-event
                  /    recorder-event
                  /    verifier-event
-      
+
 message-header   =  1*(generic-header / resource-header /
                        generic-field)
 
@@ -11717,7 +11717,7 @@
 resource-header  =    synthesizer-header
                  /    recognizer-header
                  /    recorder-header
-                 /    verifier-header    
+                 /    verifier-header
 
 generic-header   =    channel-identifier
                  /    accept
@@ -11732,30 +11732,30 @@
                  /    content-length
                  /    fetch-timeout
                  /    cache-control
-                 /    logging-tag 
+                 /    logging-tag
                  /    set-cookie
                  /    vendor-specific
-          
+
 ; -- content-id is as defined in RFC 2392, RFC 2046 and RFC 5322
 ; -- accept and accept-charset are as defined in RFC 2616
 
-mrcp-version     =    "MRCP" "/" 1*2DIGIT "." 1*2DIGIT 
+mrcp-version     =    "MRCP" "/" 1*2DIGIT "." 1*2DIGIT
 
 message-length   =    1*19DIGIT
 
-request-id       =    1*10DIGIT 
+request-id       =    1*10DIGIT
 
 status-code      =    3DIGIT
 
-channel-identifier =  "Channel-Identifier" ":" 
+channel-identifier =  "Channel-Identifier" ":"
                       channel-id CRLF
 
 channel-id       =    1*alphanum "@" 1*alphanum
 
-active-request-id-list = "Active-Request-Id-List" ":"  
-                         request-id *("," request-id) CRLF 
+active-request-id-list = "Active-Request-Id-List" ":"
+                         request-id *("," request-id) CRLF
 
-proxy-sync-id    =    "Proxy-Sync-Id" ":" 1*VCHAR CRLF    
+proxy-sync-id    =    "Proxy-Sync-Id" ":" 1*VCHAR CRLF
 
 content-base     =    "Content-Base" ":" absoluteURI CRLF
 
@@ -11774,8 +11774,8 @@
 attribute        =    token
 
 value            =    token / quoted-string
-         
-content-encoding =    "Content-Encoding" ":" 
+
+content-encoding =    "Content-Encoding" ":"
                       *WSP content-coding
                       *(*WSP "," *WSP content-coding *WSP )
                       CRLF
@@ -11783,30 +11783,30 @@
 content-coding   =    token
 
 
-content-location =    "Content-Location" ":" 
+content-location =    "Content-Location" ":"
                       ( absoluteURI / relativeURI )  CRLF
 
-cache-control    =    "Cache-Control" ":" 
+cache-control    =    "Cache-Control" ":"
                       [*WSP cache-directive
                       *( *WSP "," *WSP cache-directive *WSP )]
                       CRLF
 
-fetch-timeout    =    "Fetch-Timeout" ":" 1*19DIGIT CRLF 
+fetch-timeout    =    "Fetch-Timeout" ":" 1*19DIGIT CRLF
 
-cache-directive  =    "max-age" "=" delta-seconds     
-                 /    "max-stale" ["=" delta-seconds ] 
-                 /    "min-fresh" "=" delta-seconds  
+cache-directive  =    "max-age" "=" delta-seconds
+                 /    "max-stale" ["=" delta-seconds ]
+                 /    "min-fresh" "=" delta-seconds
 
-delta-seconds         =    1*19DIGIT     
+delta-seconds         =    1*19DIGIT
 
-logging-tag      =    "Logging-Tag" ":" 1*UTFCHAR CRLF 
+logging-tag      =    "Logging-Tag" ":" 1*UTFCHAR CRLF
 
-vendor-specific  =    "Vendor-Specific-Parameters" ":" 
-                      [vendor-specific-av-pair  
-                      *(";" vendor-specific-av-pair)] CRLF  
+vendor-specific  =    "Vendor-Specific-Parameters" ":"
+                      [vendor-specific-av-pair
+                      *(";" vendor-specific-av-pair)] CRLF
 
-vendor-specific-av-pair = vendor-av-pair-name "="  
-                          value 
+vendor-specific-av-pair = vendor-av-pair-name "="
+                          value
 
 vendor-av-pair-name     = 1*UTFCHAR
 
@@ -11833,66 +11833,66 @@
 httponly-av       = "HttpOnly"
 extension-av      = &lt;any CHAR except CTLs or ";"&gt;
 age-av            = "Age=" delta-seconds
-                          
+
 ; Synthesizer ABNF
 
-synthesizer-method    =    "SPEAK" 
-                      /    "STOP" 
-                      /    "PAUSE" 
-                      /    "RESUME" 
-                      /    "BARGE-IN-OCCURRED" 
+synthesizer-method    =    "SPEAK"
+                      /    "STOP"
+                      /    "PAUSE"
+                      /    "RESUME"
+                      /    "BARGE-IN-OCCURRED"
                       /    "CONTROL"
-                      /    "DEFINE-LEXICON" 
+                      /    "DEFINE-LEXICON"
 
-synthesizer-event     =    "SPEECH-MARKER" 
-                      /    "SPEAK-COMPLETE" 
+synthesizer-event     =    "SPEECH-MARKER"
+                      /    "SPEAK-COMPLETE"
 
-synthesizer-header    =    jump-size       
-                      /    kill-on-barge-in  
-                      /    speaker-profile   
+synthesizer-header    =    jump-size
+                      /    kill-on-barge-in
+                      /    speaker-profile
                       /    completion-cause
-                      /    completion-reason  
-                      /    voice-parameter   
-                      /    prosody-parameter   
-                      /    speech-marker     
-                      /    speech-language   
-                      /    fetch-hint        
-                      /    audio-fetch-hint  
-                      /    failed-uri        
-                      /    failed-uri-cause  
-                      /    speak-restart     
+                      /    completion-reason
+                      /    voice-parameter
+                      /    prosody-parameter
+                      /    speech-marker
+                      /    speech-language
+                      /    fetch-hint
+                      /    audio-fetch-hint
+                      /    failed-uri
+                      /    failed-uri-cause
+                      /    speak-restart
                       /    speak-length
                       /    load-lexicon
-                      /    lexicon-search-order      
+                      /    lexicon-search-order
+
 
+jump-size             =    "Jump-Size" ":" speech-length-value CRLF
 
-jump-size             =    "Jump-Size" ":" speech-length-value CRLF 
+speech-length-value   =    numeric-speech-length
+                      /    text-speech-length
 
-speech-length-value   =    numeric-speech-length 
-                      /    text-speech-length 
+text-speech-length    =    1*UTFCHAR SP "Tag"
 
-text-speech-length    =    1*UTFCHAR SP "Tag" 
-                               
 numeric-speech-length =    ("+" / "-") positive-speech-length
 
 positive-speech-length =   1*19DIGIT SP numeric-speech-unit
- 
-numeric-speech-unit   =    "Second" 
-                      /    "Word" 
-                      /    "Sentence" 
-                      /    "Paragraph" 
 
-kill-on-barge-in      =    "Kill-On-Barge-In" ":" BOOLEAN 
-                           CRLF 
+numeric-speech-unit   =    "Second"
+                      /    "Word"
+                      /    "Sentence"
+                      /    "Paragraph"
+
+kill-on-barge-in      =    "Kill-On-Barge-In" ":" BOOLEAN
+                           CRLF
 
-speaker-profile       =    "Speaker-Profile" ":" uri CRLF 
+speaker-profile       =    "Speaker-Profile" ":" uri CRLF
 
 completion-cause         =  "Completion-Cause" ":" cause-code SP
                             cause-name CRLF
 cause-code               =  3DIGIT
 cause-name               =  *VCHAR
 
-completion-reason     =    "Completion-Reason" ":" 
+completion-reason     =    "Completion-Reason" ":"
                            quoted-string CRLF
 
 voice-parameter       =    voice-gender
@@ -11913,8 +11913,8 @@
 voice-name            =    "Voice-Name:"
                            1*UTFCHAR *(1*WSP 1*UTFCHAR) CRLF
 
-prosody-parameter     =    "Prosody-" prosody-param-name ":" 
-                           prosody-param-value CRLF 
+prosody-parameter     =    "Prosody-" prosody-param-name ":"
+                           prosody-param-value CRLF
 
 prosody-param-name    =    1*VCHAR
 
@@ -11929,44 +11929,44 @@
                            [";" 1*(UTFCHAR / %x20)] CRLF
 
 speech-language       =    "Speech-Language" ":"
-                           1*VCHAR CRLF 
+                           1*VCHAR CRLF
 
 fetch-hint            =    "Fetch-Hint" ":"
-                           ("prefetch" / "safe") CRLF 
+                           ("prefetch" / "safe") CRLF
 
-audio-fetch-hint      =    "Audio-Fetch-Hint" ":" 
-                          ("prefetch" / "safe" / "stream") CRLF 
+audio-fetch-hint      =    "Audio-Fetch-Hint" ":"
+                          ("prefetch" / "safe" / "stream") CRLF
 
-failed-uri            =    "Failed-URI" ":" absoluteURI CRLF 
+failed-uri            =    "Failed-URI" ":" absoluteURI CRLF
 
-failed-uri-cause      =    "Failed-URI-Cause" ":" 1*UTFCHAR CRLF 
+failed-uri-cause      =    "Failed-URI-Cause" ":" 1*UTFCHAR CRLF
 
-speak-restart         =    "Speak-Restart" ":" BOOLEAN CRLF 
+speak-restart         =    "Speak-Restart" ":" BOOLEAN CRLF
 
-speak-length          =    "Speak-Length" ":" positive-length-value 
-                           CRLF 
+speak-length          =    "Speak-Length" ":" positive-length-value
+                           CRLF
 
-positive-length-value   =  positive-speech-length 
-                        /  text-speech-length 
+positive-length-value   =  positive-speech-length
+                        /  text-speech-length
 
 load-lexicon          =    "Load-Lexicon" ":" BOOLEAN CRLF
 
-lexicon-search-order  =    "Lexicon-Search-Order" ":" 
+lexicon-search-order  =    "Lexicon-Search-Order" ":"
           "&lt;" absoluteURI "&gt;" *(" " "&lt;" absoluteURI "&gt;") CRLF
 
-; Recognizer ABNF 
+; Recognizer ABNF
 
 recognizer-method     =    recog-only-method
                       /    enrollment-method
 
-recog-only-method     =    "DEFINE-GRAMMAR" 
-                      /    "RECOGNIZE" 
+recog-only-method     =    "DEFINE-GRAMMAR"
+                      /    "RECOGNIZE"
                       /    "INTERPRET"
-                      /    "GET-RESULT" 
-                      /    "START-INPUT-TIMERS" 
+                      /    "GET-RESULT"
+                      /    "START-INPUT-TIMERS"
                       /    "STOP"
 
-enrollment-method     =    "START-PHRASE-ENROLLMENT" 
+enrollment-method     =    "START-PHRASE-ENROLLMENT"
                       /    "ENROLLMENT-ROLLBACK"
                       /    "END-PHRASE-ENROLLMENT"
                       /    "MODIFY-PHRASE"
@@ -11980,30 +11980,30 @@
                       /    enrollment-header
 
 
-recog-only-header     =    confidence-threshold     
-                      /    sensitivity-level        
-                      /    speed-vs-accuracy        
-                      /    n-best-list-length  
-                      /    input-type     
-                      /    no-input-timeout         
-                      /    recognition-timeout      
-                      /    waveform-uri  
-                      /    input-waveform-uri           
-                      /    completion-cause         
+recog-only-header     =    confidence-threshold
+                      /    sensitivity-level
+                      /    speed-vs-accuracy
+                      /    n-best-list-length
+                      /    input-type
+                      /    no-input-timeout
+                      /    recognition-timeout
+                      /    waveform-uri
+                      /    input-waveform-uri
+                      /    completion-cause
                       /    completion-reason
-                      /    recognizer-context-block 
-                      /    start-input-timers 
-                      /    speech-complete-timeout  
-                      /    speech-incomplete-timeout 
-                      /    dtmf-interdigit-timeout  
-                      /    dtmf-term-timeout        
-                      /    dtmf-term-char           
-                      /    failed-uri               
-                      /    failed-uri-cause         
-                      /    save-waveform            
+                      /    recognizer-context-block
+                      /    start-input-timers
+                      /    speech-complete-timeout
+                      /    speech-incomplete-timeout
+                      /    dtmf-interdigit-timeout
+                      /    dtmf-term-timeout
+                      /    dtmf-term-char
+                      /    failed-uri
+                      /    failed-uri-cause
+                      /    save-waveform
                       /    media-type
                       /    new-audio-channel
-                      /    speech-language        
+                      /    speech-language
                       /    ver-buffer-utterance
                       /    recognition-mode
                       /    cancel-if-queue
@@ -12016,66 +12016,66 @@
 
 
 enrollment-header     =    num-min-consistent-pronunciations
-                      /    consistency-threshold  
-                      /    clash-threshold        
-                      /    personal-grammar-uri 
+                      /    consistency-threshold
+                      /    clash-threshold
+                      /    personal-grammar-uri
                       /    enroll-utterance
-                      /    phrase-id              
-                      /    phrase-nl              
-                      /    weight                 
-                      /    save-best-waveform     
-                      /    new-phrase-id          
-                      /    confusable-phrases-uri 
+                      /    phrase-id
+                      /    phrase-nl
+                      /    weight
+                      /    save-best-waveform
+                      /    new-phrase-id
+                      /    confusable-phrases-uri
                       /    abort-phrase-enrollment
 
-confidence-threshold  =    "Confidence-Threshold" ":" 
-                           FLOAT CRLF 
+confidence-threshold  =    "Confidence-Threshold" ":"
+                           FLOAT CRLF
 
 sensitivity-level     =    "Sensitivity-Level" ":" FLOAT
-                           CRLF 
+                           CRLF
 
-speed-vs-accuracy     =    "Speed-Vs-Accuracy" ":" FLOAT 
-                           CRLF 
+speed-vs-accuracy     =    "Speed-Vs-Accuracy" ":" FLOAT
+                           CRLF
 
-n-best-list-length    =    "N-Best-List-Length" ":" 1*19DIGIT 
-                           CRLF 
+n-best-list-length    =    "N-Best-List-Length" ":" 1*19DIGIT
+                           CRLF
 
 input-type            =    "Input-Type" ":"  inputs CRLF
 inputs                =    "speech" / "dtmf"
 
-no-input-timeout      =    "No-Input-Timeout" ":" 1*19DIGIT 
-                           CRLF 
+no-input-timeout      =    "No-Input-Timeout" ":" 1*19DIGIT
+                           CRLF
 
 recognition-timeout   =    "Recognition-Timeout" ":" 1*19DIGIT
-                           CRLF 
+                           CRLF
 
-waveform-uri          =    "Waveform-URI" ":" ["&lt;" uri "&gt;" 
-                           ";" "size" "=" 1*19DIGIT 
-                           ";" "duration" "=" 1*19DIGIT] CRLF 
+waveform-uri          =    "Waveform-URI" ":" ["&lt;" uri "&gt;"
+                           ";" "size" "=" 1*19DIGIT
+                           ";" "duration" "=" 1*19DIGIT] CRLF
 
-recognizer-context-block = "Recognizer-Context-Block" ":" 
-                           [1*VCHAR] CRLF 
+recognizer-context-block = "Recognizer-Context-Block" ":"
+                           [1*VCHAR] CRLF
 
-start-input-timers    =    "Start-Input-Timers" ":"  
-                           BOOLEAN CRLF 
- 
-speech-complete-timeout =  "Speech-Complete-Timeout" ":"  
-                           1*19DIGIT CRLF 
+start-input-timers    =    "Start-Input-Timers" ":"
+                           BOOLEAN CRLF
 
-speech-incomplete-timeout = "Speech-Incomplete-Timeout" ":"  
-                            1*19DIGIT CRLF 
+speech-complete-timeout =  "Speech-Complete-Timeout" ":"
+                           1*19DIGIT CRLF
+
+speech-incomplete-timeout = "Speech-Incomplete-Timeout" ":"
+                            1*19DIGIT CRLF
 
-dtmf-interdigit-timeout = "DTMF-Interdigit-Timeout" ":"  
-                          1*19DIGIT CRLF 
+dtmf-interdigit-timeout = "DTMF-Interdigit-Timeout" ":"
+                          1*19DIGIT CRLF
 
-dtmf-term-timeout     =    "DTMF-Term-Timeout" ":" 1*19DIGIT 
-                           CRLF 
+dtmf-term-timeout     =    "DTMF-Term-Timeout" ":" 1*19DIGIT
+                           CRLF
 
-dtmf-term-char        =    "DTMF-Term-Char" ":" VCHAR CRLF 
+dtmf-term-char        =    "DTMF-Term-Char" ":" VCHAR CRLF
 
-save-waveform         =    "Save-Waveform" ":" BOOLEAN CRLF 
+save-waveform         =    "Save-Waveform" ":" BOOLEAN CRLF
 
-new-audio-channel     =    "New-Audio-Channel" ":" 
+new-audio-channel     =    "New-Audio-Channel" ":"
                            BOOLEAN CRLF
 
 recognition-mode      =    "Recognition-Mode" ":"
@@ -12083,13 +12083,13 @@
 
 cancel-if-queue       =    "Cancel-If-Queue" ":" BOOLEAN CRLF
 
-hotword-max-duration  =    "Hotword-Max-Duration" ":" 
+hotword-max-duration  =    "Hotword-Max-Duration" ":"
                            1*19DIGIT CRLF
 
-hotword-min-duration  =    "Hotword-Min-Duration" ":" 
+hotword-min-duration  =    "Hotword-Min-Duration" ":"
                            1*19DIGIT CRLF
 
-interpret-text        =    "Interpret-Text" ":" 1*VCHAR CRLF          
+interpret-text        =    "Interpret-Text" ":" 1*VCHAR CRLF
 
 dtmf-buffer-time      =    "DTMF-Buffer-Time" ":" 1*19DIGIT CRLF
 
@@ -12097,13 +12097,13 @@
 
 early-no-match        =    "Early-No-Match" ":" BOOLEAN CRLF
 
-num-min-consistent-pronunciations    = 
-    "Num-Min-Consistent-Pronunciations" ":" 1*19DIGIT CRLF 
+num-min-consistent-pronunciations    =
+    "Num-Min-Consistent-Pronunciations" ":" 1*19DIGIT CRLF
 
 
-consistency-threshold =    "Consistency-Threshold" ":" FLOAT 
+consistency-threshold =    "Consistency-Threshold" ":" FLOAT
                            CRLF
- 
+
 clash-threshold       =    "Clash-Threshold" ":" FLOAT CRLF
 
 personal-grammar-uri  =    "Personal-Grammar-URI" ":" uri CRLF
@@ -12116,15 +12116,15 @@
 
 weight                =    "Weight" ":" FLOAT CRLF
 
-save-best-waveform    =    "Save-Best-Waveform" ":" 
+save-best-waveform    =    "Save-Best-Waveform" ":"
                            BOOLEAN CRLF
 
 new-phrase-id         =    "New-Phrase-ID" ":" 1*VCHAR CRLF
 
-confusable-phrases-uri =   "Confusable-Phrases-URI" ":" 
+confusable-phrases-uri =   "Confusable-Phrases-URI" ":"
                            uri CRLF
 
-abort-phrase-enrollment =  "Abort-Phrase-Enrollment" ":" 
+abort-phrase-enrollment =  "Abort-Phrase-Enrollment" ":"
                            BOOLEAN CRLF
 
 
@@ -12150,11 +12150,11 @@
                       /    final-silence
                       /    capture-on-speech
                       /    ver-buffer-utterance
-                      /    start-input-timers 
+                      /    start-input-timers
                       /    new-audio-channel
 
-record-uri            =    "Record-URI" ":" [ "&lt;" uri "&gt;" 
-                           ";" "size" "=" 1*19DIGIT 
+record-uri            =    "Record-URI" ":" [ "&lt;" uri "&gt;"
+                           ";" "size" "=" 1*19DIGIT
                            ";" "duration" "=" 1*19DIGIT] CRLF
 
 media-type            =    "Media-Type" ":" media-type-value CRLF
@@ -12165,7 +12165,7 @@
 
 final-silence         =    "Final-Silence" ":" 1*19DIGIT CRLF
 
-capture-on-speech     =    "Capture-On-Speech " ":" 
+capture-on-speech     =    "Capture-On-Speech " ":"
                            BOOLEAN CRLF
 
 
@@ -12188,38 +12188,38 @@
                       /    "START-OF-INPUT"
 
 
-verifier-header       =    repository-uri 
+verifier-header       =    repository-uri
                       /    voiceprint-identifier
-                      /    verification-mode 
-                      /    adapt-model 
-                      /    abort-model 
-                      /    min-verification-score         
+                      /    verification-mode
+                      /    adapt-model
+                      /    abort-model
+                      /    min-verification-score
                       /    num-min-verification-phrases
                       /    num-max-verification-phrases
-                      /    no-input-timeout           
-                      /    save-waveform              
+                      /    no-input-timeout
+                      /    save-waveform
                       /    media-type
-                      /    waveform-uri               
-                      /    voiceprint-exists          
-                      /    ver-buffer-utterance    
-                      /    input-waveform-uri        
-                      /    completion-cause           
+                      /    waveform-uri
+                      /    voiceprint-exists
+                      /    ver-buffer-utterance
+                      /    input-waveform-uri
+                      /    completion-cause
                       /    completion-reason
-                      /    speech-complete-timeout          
+                      /    speech-complete-timeout
                       /    new-audio-channel
                       /    abort-verification
-                      /    start-input-timers 
+                      /    start-input-timers
                       /    input-type
 
 
 
 repository-uri        =    "Repository-URI" ":" uri CRLF
 
-voiceprint-identifier        =  "Voiceprint-Identifier" ":" 
+voiceprint-identifier        =  "Voiceprint-Identifier" ":"
                                 vid *[";" vid] CRLF
 vid                          =  1*VCHAR ["." 1*VCHAR]
 
-verification-mode     =    "Verification-Mode" ":" 
+verification-mode     =    "Verification-Mode" ":"
                            verification-mode-string
 
 verification-mode-string = "train" / "verify"
@@ -12228,25 +12228,25 @@
 
 abort-model           =    "Abort-Model" ":" BOOLEAN CRLF
 
-min-verification-score  =  "Min-Verification-Score" ":" 
+min-verification-score  =  "Min-Verification-Score" ":"
                            [ %x2D ] FLOAT CRLF
 
-num-min-verification-phrases = "Num-Min-Verification-Phrases" 
+num-min-verification-phrases = "Num-Min-Verification-Phrases"
                                ":" 1*19DIGIT CRLF
 
-num-max-verification-phrases = "Num-Max-Verification-Phrases" 
+num-max-verification-phrases = "Num-Max-Verification-Phrases"
                                ":" 1*19DIGIT CRLF
-     
-voiceprint-exists     =    "Voiceprint-Exists" ":" 
+
+voiceprint-exists     =    "Voiceprint-Exists" ":"
                            BOOLEAN CRLF
 
-ver-buffer-utterance  =    "Ver-Buffer-Utterance" ":" 
-                           BOOLEAN CRLF 
+ver-buffer-utterance  =    "Ver-Buffer-Utterance" ":"
+                           BOOLEAN CRLF
 
 input-waveform-uri    =    "Input-Waveform-URI" ":" uri CRLF
 
-abort-verification    =    "Abort-Verification " ":" 
-                           BOOLEAN CRLF </pre><a href="#section-15-2" class="pilcrow">¶</a>
+abort-verification    =    "Abort-Verification " ":"
+                           BOOLEAN CRLF</pre><a href="#section-15-2" class="pilcrow">¶</a>
 </div>
 <p id="section-15-3">The following productions add a new SDP session-level attribute. See
       <a href="#cmid" class="xref">Section 13.7.2, Paragraph 7</a>.<a href="#section-15-3" class="pilcrow">¶</a></p>
@@ -12271,13 +12271,13 @@
 <div class="artwork art-text alignLeft" id="section-16.1-1">
 <pre>
 &lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+&lt;xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
             targetNamespace="urn:ietf:params:xml:ns:mrcpv2"
             xmlns="urn:ietf:params:xml:ns:mrcpv2"
-            elementFormDefault="qualified" 
+            elementFormDefault="qualified"
             attributeFormDefault="unqualified" &gt;
   &lt;xs:annotation&gt;
-    &lt;xs:documentation&gt; Natural Language Semantic Markup Schema 
+    &lt;xs:documentation&gt; Natural Language Semantic Markup Schema
     &lt;/xs:documentation&gt;
   &lt;/xs:annotation&gt;
   &lt;xs:include schemaLocation="enrollment-schema.rng"/&gt;
@@ -12306,12 +12306,12 @@
                   &lt;xs:attribute name="mode"
                                 type="xs:string"
                                 default="speech"/&gt;
-                  &lt;xs:attribute name="confidence" 
-                                type="confidenceinfo" 
+                  &lt;xs:attribute name="confidence"
+                                type="confidenceinfo"
                                 default="1.0"/&gt;
-                  &lt;xs:attribute name="timestamp-start" 
+                  &lt;xs:attribute name="timestamp-start"
                                 type="xs:string"/&gt;
-                  &lt;xs:attribute name="timestamp-end" 
+                  &lt;xs:attribute name="timestamp-end"
                                 type="xs:string"/&gt;
                 &lt;/xs:complexType&gt;
               &lt;/xs:element&gt;
@@ -12327,7 +12327,7 @@
         &lt;xs:element name="verification-result"
                     type="verification-contents"/&gt;
       &lt;/xs:sequence&gt;
-      &lt;xs:attribute name="grammar" type="xs:anyURI" 
+      &lt;xs:attribute name="grammar" type="xs:anyURI"
                     use="optional"/&gt;
     &lt;/xs:complexType&gt;
   &lt;/xs:element&gt;
@@ -12426,7 +12426,7 @@
 <div class="artwork art-text alignLeft" id="section-16.3-1">
 <pre>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
 
-&lt;!--    MRCP Verification Results Schema 
+&lt;!--    MRCP Verification Results Schema
         (See http://www.oasis-open.org/committees/relax-ng/spec.html)
    --&gt;
 
@@ -12766,23 +12766,23 @@
       </h2>
 <div class="artwork art-text alignLeft" id="section-appendix.a-1">
 <pre>
-Pierre Forgues 
-Nuance Communications Ltd. 
+Pierre Forgues
+Nuance Communications Ltd.
 1500 University Street
 Suite 935
-Montreal, Quebec 
-Canada H3A 3S7 
-         
-EMail:  forgues@nuance.com 
+Montreal, Quebec
+Canada H3A 3S7
+
+EMail:  forgues@nuance.com
+
 
+Charles Galles
+Intervoice, Inc.
+17811 Waterview Parkway
+Dallas, Texas 75252
+USA
 
-Charles Galles 
-Intervoice, Inc. 
-17811 Waterview Parkway 
-Dallas, Texas 75252 
-USA        
- 
-EMail:  charles.galles@intervoice.com 
+EMail:  charles.galles@intervoice.com
 
 
 Klaus Reifenrath
@@ -12792,8 +12792,8 @@
 9820 Merelbeke
 Belgium
 
-EMail: klaus.reifenrath@scansoft.com 
-                </pre><a href="#section-appendix.a-1" class="pilcrow">¶</a>
+EMail: klaus.reifenrath@scansoft.com
+</pre><a href="#section-appendix.a-1" class="pilcrow">¶</a>
 </div>
 </section>
 <section id="section-appendix.b">
@@ -12822,7 +12822,7 @@
 Suresh Kaliannan (Cisco Systems, Inc.)
 Skip Cave (Intervoice, Inc.)
 Thomas Gal (LumenVox)
-         </pre><a href="#section-appendix.b-1" class="pilcrow">¶</a>
+</pre><a href="#section-appendix.b-1" class="pilcrow">¶</a>
 </div>
 <p id="section-appendix.b-2">The chairs of the SPEECHSC work group are Eric Burger (Georgetown
       University) and Dave Oran (Cisco Systems, Inc.).<a href="#section-appendix.b-2" class="pilcrow">¶</a></p>
diff -Nru xml2rfc-2.39.0/xml2rfc/boilerplate_tlp.py xml2rfc-2.40.0/xml2rfc/boilerplate_tlp.py
--- xml2rfc-2.39.0/xml2rfc/boilerplate_tlp.py	2019-01-11 20:31:22.000000000 +0000
+++ xml2rfc-2.40.0/xml2rfc/boilerplate_tlp.py	2020-02-06 00:53:40.000000000 +0000
@@ -219,7 +219,7 @@
             """<t>
             This document is subject to BCP 78 and the IETF Trust's Legal
             Provisions Relating to IETF Documents
-            ({scheme}://trustee.ietf.org/license-info) in effect on the date of
+            (<eref target="{scheme}://trustee.ietf.org/license-info"/>) in effect on the date of
             publication of this document. Please review these documents
             carefully, as they describe your rights and restrictions with
             respect to this document.
diff -Nru xml2rfc-2.39.0/xml2rfc/data/v3.rnc xml2rfc-2.40.0/xml2rfc/data/v3.rnc
--- xml2rfc-2.39.0/xml2rfc/data/v3.rnc	2019-12-04 22:30:58.000000000 +0000
+++ xml2rfc-2.40.0/xml2rfc/data/v3.rnc	2020-02-17 20:30:26.000000000 +0000
@@ -71,7 +71,7 @@
        attribute xml:lang { text }?,
        attribute abbrev { text }?,
        attribute ascii { text }?,
-       text
+       (text | br)*
      }
 
    author =
@@ -357,6 +357,7 @@
        attribute slugifiedName { xsd:ID }?,
        (text
         | bcp14
+        | br
         | cref
         | em
         | eref
@@ -369,6 +370,13 @@
         | xref)*
      }
 
+   br =
+     element br {
+       attribute xml:base { text }?,
+       attribute xml:lang { text }?,
+       empty
+     }
+
    t =
      element t {
        attribute xml:base { text }?,
@@ -382,6 +390,7 @@
        attribute keepWithPrevious { "false" | "true" }?,
        (text
         | bcp14
+        | br
         | contact
         | cref
         | em
@@ -419,6 +428,7 @@
        ((artset | artwork | dl | figure | ol | sourcecode | t | ul)+
         | (text
            | bcp14
+           | br
            | cref
            | em
            | eref
@@ -468,9 +478,9 @@
        ([ a:defaultValue = "false" ]
         attribute empty { "false" | "true"},
 	[ a:defaultValue = "false" ]
-        attribute bare { "false" | "true"}?,
+        attribute bare { "false" | "true"}?)?,
         attribute indent { text }?,
-        attribute pn { xsd:ID }?)?,
+        attribute pn { xsd:ID }?,
        li+
      }
 
@@ -484,6 +494,7 @@
        ((artset | artwork | blockquote | dl | figure | ol | sourcecode | t | table | ul)+
         | (text
            | bcp14
+           | br
            | cref
            | em
            | eref
@@ -519,6 +530,7 @@
        attribute pn { xsd:ID }?,
        (text
         | bcp14
+        | br
         | cref
         | em
         | eref
@@ -540,6 +552,7 @@
        ((artset | artwork | dl | figure | ol | sourcecode | t | table | ul)+
         | (text
            | bcp14
+           | br
            | cref
            | em
            | eref
@@ -615,7 +628,7 @@
        attribute source { text }?,
        [ a:defaultValue = "true" ]
        attribute display { "true" | "false" }?,
-       (text | em | eref | relref | strong | sub | sup | tt | xref)*
+       (text | br | em | eref | relref | strong | sub | sup | tt | xref)*
      }
 
    tt =
@@ -624,6 +637,7 @@
        attribute xml:lang { text }?,
        (text
         | bcp14
+        | br
         | cref
         | em
         | eref
@@ -641,6 +655,7 @@
        attribute xml:lang { text }?,
        (text
         | bcp14
+        | br
         | cref
         | em
         | eref
@@ -658,6 +673,7 @@
        attribute xml:lang { text }?,
        (text
         | bcp14
+        | br
         | cref
         | eref
         | iref
@@ -866,6 +882,7 @@
        ((artset | artwork | dl | figure | ol | sourcecode | t | ul)+
         | (text
            | bcp14
+           | br
            | cref
            | em
            | eref
@@ -891,6 +908,7 @@
        ((artset | artwork | dl | figure | ol | sourcecode | t | ul)+
         | (text
            | bcp14
+           | br
            | cref
            | em
            | eref
diff -Nru xml2rfc-2.39.0/xml2rfc/data/v3.rng xml2rfc-2.40.0/xml2rfc/data/v3.rng
--- xml2rfc-2.39.0/xml2rfc/data/v3.rng	2019-12-06 15:18:57.000000000 +0000
+++ xml2rfc-2.40.0/xml2rfc/data/v3.rng	2020-02-17 20:30:26.000000000 +0000
@@ -192,7 +192,12 @@
       <optional>
         <attribute name="ascii"/>
       </optional>
-      <text/>
+      <zeroOrMore>
+        <choice>
+          <text/>
+          <ref name="br"/>
+        </choice>
+      </zeroOrMore>
     </element>
   </define>
   <define name="author">
@@ -793,6 +798,7 @@
         <choice>
           <text/>
           <ref name="bcp14"/>
+          <ref name="br"/>
           <ref name="cref"/>
           <ref name="em"/>
           <ref name="eref"/>
@@ -807,6 +813,17 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="br">
+    <element name="br">
+      <optional>
+        <attribute name="xml:base"/>
+      </optional>
+      <optional>
+        <attribute name="xml:lang"/>
+      </optional>
+      <empty/>
+    </element>
+  </define>
   <define name="t">
     <element name="t">
       <optional>
@@ -848,6 +865,7 @@
         <choice>
           <text/>
           <ref name="bcp14"/>
+          <ref name="br"/>
           <ref name="contact"/>
           <ref name="cref"/>
           <ref name="em"/>
@@ -941,6 +959,7 @@
           <choice>
             <text/>
             <ref name="bcp14"/>
+            <ref name="br"/>
             <ref name="cref"/>
             <ref name="em"/>
             <ref name="eref"/>
@@ -1063,14 +1082,14 @@
             </choice>
           </attribute>
         </optional>
-        <optional>
-          <attribute name="indent"/>
-        </optional>
-        <optional>
-          <attribute name="pn">
-            <data type="ID"/>
-          </attribute>
-        </optional>
+      </optional>
+      <optional>
+        <attribute name="indent"/>
+      </optional>
+      <optional>
+        <attribute name="pn">
+          <data type="ID"/>
+        </attribute>
       </optional>
       <oneOrMore>
         <ref name="li"/>
@@ -1117,6 +1136,7 @@
           <choice>
             <text/>
             <ref name="bcp14"/>
+            <ref name="br"/>
             <ref name="cref"/>
             <ref name="em"/>
             <ref name="eref"/>
@@ -1198,6 +1218,7 @@
         <choice>
           <text/>
           <ref name="bcp14"/>
+          <ref name="br"/>
           <ref name="cref"/>
           <ref name="em"/>
           <ref name="eref"/>
@@ -1248,6 +1269,7 @@
           <choice>
             <text/>
             <ref name="bcp14"/>
+            <ref name="br"/>
             <ref name="cref"/>
             <ref name="em"/>
             <ref name="eref"/>
@@ -1436,6 +1458,7 @@
       <zeroOrMore>
         <choice>
           <text/>
+          <ref name="br"/>
           <ref name="em"/>
           <ref name="eref"/>
           <ref name="relref"/>
@@ -1460,6 +1483,7 @@
         <choice>
           <text/>
           <ref name="bcp14"/>
+          <ref name="br"/>
           <ref name="cref"/>
           <ref name="em"/>
           <ref name="eref"/>
@@ -1485,6 +1509,7 @@
         <choice>
           <text/>
           <ref name="bcp14"/>
+          <ref name="br"/>
           <ref name="cref"/>
           <ref name="em"/>
           <ref name="eref"/>
@@ -1510,6 +1535,7 @@
         <choice>
           <text/>
           <ref name="bcp14"/>
+          <ref name="br"/>
           <ref name="cref"/>
           <ref name="eref"/>
           <ref name="iref"/>
@@ -1997,6 +2023,7 @@
           <choice>
             <text/>
             <ref name="bcp14"/>
+            <ref name="br"/>
             <ref name="cref"/>
             <ref name="em"/>
             <ref name="eref"/>
@@ -2058,6 +2085,7 @@
           <choice>
             <text/>
             <ref name="bcp14"/>
+            <ref name="br"/>
             <ref name="cref"/>
             <ref name="em"/>
             <ref name="eref"/>
diff -Nru xml2rfc-2.39.0/xml2rfc/data/xml2rfc.css xml2rfc-2.40.0/xml2rfc/data/xml2rfc.css
--- xml2rfc-2.39.0/xml2rfc/data/xml2rfc.css	2020-01-08 18:15:43.000000000 +0000
+++ xml2rfc-2.40.0/xml2rfc/data/xml2rfc.css	2020-02-17 20:30:26.000000000 +0000
@@ -1022,4 +1022,9 @@
 /* Avoid narrow tables forcing too narrow table captions, which may render badly */
 table {
   min-width: 20em;
-}
\ No newline at end of file
+}
+/* ol type a */
+ol.type-a { list-style-type: lower-alpha; }
+ol.type-A { list-style-type: upper-alpha; }
+ol.type-i { list-style-type: lower-roman; }
+ol.type-I { list-style-type: lower-roman; }
diff -Nru xml2rfc-2.39.0/xml2rfc/__init__.py xml2rfc-2.40.0/xml2rfc/__init__.py
--- xml2rfc-2.39.0/xml2rfc/__init__.py	2020-01-31 11:38:01.000000000 +0000
+++ xml2rfc-2.40.0/xml2rfc/__init__.py	2020-02-18 21:37:07.000000000 +0000
@@ -3,7 +3,7 @@
 from __future__ import unicode_literals, print_function, division
 
 # Static values
-__version__  = '2.39.0'
+__version__  = '2.40.0'
 NAME         = 'xml2rfc'
 VERSION      = [ int(i) if i.isdigit() else i for i in __version__.split('.') ]
 CACHES       = ['/var/cache/xml2rfc', '~/.cache/xml2rfc']  # Ordered by priority
diff -Nru xml2rfc-2.39.0/xml2rfc/util/unicode.py xml2rfc-2.40.0/xml2rfc/util/unicode.py
--- xml2rfc-2.39.0/xml2rfc/util/unicode.py	2019-12-17 18:56:01.000000000 +0000
+++ xml2rfc-2.40.0/xml2rfc/util/unicode.py	2020-02-12 21:37:34.000000000 +0000
@@ -55,6 +55,11 @@
     'u',
     ])
 
+bare_latin_tags = set([
+    'organization',
+    ])
+
+
 for t in bare_unicode_tags:
     assert t in unicode_content_tags
 
diff -Nru xml2rfc-2.39.0/xml2rfc/writers/base.py xml2rfc-2.40.0/xml2rfc/writers/base.py
--- xml2rfc-2.39.0/xml2rfc/writers/base.py	2020-01-18 15:12:19.000000000 +0000
+++ xml2rfc-2.40.0/xml2rfc/writers/base.py	2020-02-12 21:37:34.000000000 +0000
@@ -21,10 +21,11 @@
     pass
 
 from xml2rfc import strings, log
+from xml2rfc.uniscripts import is_script
 from xml2rfc.util.date import extract_date, augment_date, format_date, get_expiry_date
 from xml2rfc.util.name import short_author_ascii_name_parts, full_author_name_expansion, short_author_name_parts
 from xml2rfc.util.unicode import ( punctuation, unicode_replacements, unicode_content_tags, bare_unicode_tags,
-    unicode_attributes, downcode, downcode_punctuation)
+    bare_latin_tags, unicode_attributes, downcode, downcode_punctuation)
 from xml2rfc.utils import namespaces, find_duplicate_ids
 
 default_silenced_messages = [
@@ -1889,6 +1890,8 @@
                         e.text = downcode(e.text, replacements=replacements)
                 elif e.tag in bare_unicode_tags:
                     pass
+                elif e.tag in bare_latin_tags and is_script(e.text, 'Latin'):
+                    pass
                 elif not e.get('ascii'):
                     try:
                         e.text.encode('ascii')
@@ -2011,6 +2014,12 @@
                     path = getattr(error, 'path', '')
                     msg = "%s(%s): %s: %s, at %s" % (self.xmlrfc.source, error.line, error.level_name.title(), error.message, path)
                     self.log(msg)
+                    if error.message.startswith("Did not expect text"):
+                        items = self.tree.xpath(error.path + '/text()')
+                        for item in items:
+                            if item.strip():
+                                self.log("  Unexpected text:\n    %s" % item.strip())
+
             else:
                 log.warn('\nInvalid document: %s' % (e,))
             if warn:
diff -Nru xml2rfc-2.39.0/xml2rfc/writers/html.py xml2rfc-2.40.0/xml2rfc/writers/html.py
--- xml2rfc-2.39.0/xml2rfc/writers/html.py	2020-01-18 15:12:19.000000000 +0000
+++ xml2rfc-2.40.0/xml2rfc/writers/html.py	2020-02-17 20:55:39.000000000 +0000
@@ -813,7 +813,10 @@
                 self.err(x, 'Expected ascii-art artwork for <artwork type="%s">, but found %s...' % (x.get('type',''), lxml.etree.tostring(x)[:128]))
                 return None
             else:
-                pre = build.pre(x.text.expandtabs())
+                text = x.text + ''.join([ c.tail for c in x.getchildren() ])
+                text = text.expandtabs()
+                text = '\n'.join( [ l.rstrip() for l in text.split('\n') ] )
+                pre = build.pre(text)
                 classes = 'artwork art-text align%s' % align.capitalize()
                 if type and type != 'text':
                     classes += ' art-%s' % type
@@ -1802,7 +1805,8 @@
             ol = add.dl(h, x, classes='olPercent')
         else:
             attrib = sdict(dict( (k,v) for (k,v) in x.attrib.items() if k in ['start', 'type', ] ))
-            ol = add.ol(h, x, classes=x.get('spacing'), **attrib)
+            classes= ' '.join(filter(None, [ x.get('spacing'), 'type-%s' % attrib.get('type', '1') ]))
+            ol = add.ol(h, x, classes=classes, **attrib)
         for c in x.getchildren():
             self.render(ol, c)
         return ol
diff -Nru xml2rfc-2.39.0/xml2rfc/writers/preptool.py xml2rfc-2.40.0/xml2rfc/writers/preptool.py
--- xml2rfc-2.39.0/xml2rfc/writers/preptool.py	2020-01-27 16:28:31.000000000 +0000
+++ xml2rfc-2.40.0/xml2rfc/writers/preptool.py	2020-02-12 21:33:26.000000000 +0000
@@ -189,6 +189,19 @@
         if not self.options.quiet:
             self.log(' Created file %s' % filename)
 
+    def normalize_whitespace(self, e):
+        lines = e.text.split('\n')
+        for i, line in enumerate(lines):
+            # This strips unnecessary whitespace, and also works around an issue in
+            # WeasyPrint where trailing whitespace in artwork can trigger something
+            # akin to line wrapping even if rendered in <pre>: 
+            line = line.rstrip()
+            if '\t' in line:
+                self.warn(e, "Found tab on line %d of <%s>: \n   %s" % (e.tag, i+1, line))
+                line = line.expandtabs()                    
+            lines[i] = line
+        e.text = '\n'.join(lines)
+
     def prep(self):
 
         ## Selector notation: Some selectors below have a handler annotation,
@@ -1883,11 +1896,8 @@
                 if src and not data:
                     self.warn(e, "No image data found in source %s" % src)
 
-            if awtype == 'ascii-art' and '\t' in e.text:
-                for i, line in enumerate(e.text.splitlines()):
-                    if '\t' in line:
-                        self.warn(e, "Found tab on line %d of <artwork>: \n   %s" % (i+1, line))
-                e.text = e.text.expandtabs()
+            if awtype == 'ascii-art':
+                self.normalize_whitespace(e)
 
     # 5.5.2.  <sourcecode> Processing
 
@@ -1944,11 +1954,7 @@
                 e.text = data
                 del e.attrib['src']
 
-        if '\t' in e.text:
-            for i, line in enumerate(e.text.splitlines()):
-                if '\t' in line:
-                    self.warn(e, "Found tab on line %d of <sourcecode>: \n   %s" % (i+1, line))
-            e.text = e.text.expandtabs()
+        self.normalize_whitespace(e)
         
     #
     # 5.4.2.4  "Table of Contents" Insertion
diff -Nru xml2rfc-2.39.0/xml2rfc/writers/text.py xml2rfc-2.40.0/xml2rfc/writers/text.py
--- xml2rfc-2.39.0/xml2rfc/writers/text.py	2020-01-18 15:12:19.000000000 +0000
+++ xml2rfc-2.40.0/xml2rfc/writers/text.py	2020-02-16 21:47:30.000000000 +0000
@@ -85,7 +85,7 @@
 
 def indent(text, indent=3, hang=0):
     lines = []
-    for l in text.splitlines():
+    for l in text.split('\n'):
         if l.strip():
             if lines:
                 lines.append(' '*(indent+hang) + l)
@@ -123,7 +123,7 @@
     "Fold and center the given text"
     # avoid centered text extending all the way to the margins
     kwargs['width'] = width-4
-    lines = text.splitlines()
+    lines = text.split('\n')
     if max([ len(l) for l in lines ]+[0]) > width:
         # need to reflow
         lines = wrapper.wrap(text, **kwargs)
@@ -215,7 +215,7 @@
         head += ' '
         if tail != '0000':
             tail = '%4s' % tail.lstrip('0')     # strip leading zeros
-        last = head.splitlines()[-1]
+        last = head.split('\n')[-1]
         lack = width - (len(last) + len(tail))
         elip = (' .'*40)[-lack:]
         text = head + elip + tail
@@ -270,6 +270,7 @@
         if self.options.pagination:
             self.add_pageno_placeholders()
         lines = self.render(self.root, width=72, joiners=joiners)
+
         if self.options.pagination:
             lines = findblocks(lines)
             lines = self.paginate(lines)
@@ -288,6 +289,7 @@
                 self.warn(l.elem, "Too long line found (L%s), %s characters longer than 72 characters: \n%s" %(i+1, length-72, l.text))
                 
         text = ('\n'.join( l.text for l in lines )).rstrip() + '\n'
+
         # Replace some code points whose utility has ended
         text = text.replace(u'\u00A0', u' ')
         text = text.replace(u'\u2011', u'-')
@@ -744,9 +746,15 @@
                     % ( e.get('type', '(unknown type)'),
                         e.get('originalSrc') or e.get('src') or 'No external link available, see %s.html for artwork.'%self.root.get('docName')))
         msg  = fill(msg, width=width, **kwargs)
-        text = (e.text.strip() and e.text.expandtabs()) or msg
+#        text = (e.text.strip() and e.text.expandtabs()) or msg
+#         text = text.strip('\n')
+#         text = '\n'.join( [ l.rstrip() for l in text.split('\n') ] )
+        # We need this in order to deal with xml comments inside artwork:
+        text = e.text + ''.join([ c.tail for c in e.getchildren() ])
         text = text.strip('\n')
-        text = '\n'.join( [ l.rstrip() for l in text.splitlines() ] )
+        text = (text.strip() and text.expandtabs()) or msg
+        text = '\n'.join( [ l.rstrip() for l in text.split('\n') ] )
+        #
         lines = [ Line(t, e) for t in text.splitlines() ]
         lines = align(lines, e.get('align', 'left'), width)
         return lines 
@@ -1745,7 +1753,7 @@
             line = '%s%s%s' % (label, items, suffix)
             ll = len(left)
             lr = len(right)
-            width = 48 if ll > lr else min(48, 72-3-len(right[ll-1]))
+            width = 48 if ll >= lr else min(48, 72-3-len(right[ll]))
             wrapper = textwrap.TextWrapper(width=width, subsequent_indent=' '*len(label))
             return wrapper.wrap(line)
         #
@@ -2973,6 +2981,8 @@
         self.part = e.tag
         lines = []
         for c in e.getchildren():
+            if c.tag in (etree.PI, etree.Comment):
+                continue
             self.part = c.tag
             lines = self.ljoin(lines, c, width, **kwargs)
         return lines
@@ -4010,7 +4020,10 @@
     def render_table(self, e, width, **kwargs):
         kwargs['joiners'].update({
             'name':     Joiner('', ': ', '', 0, 0),
+            'dl':       Joiner('', '\n\n', '', 0, 0),
+            'ol':       Joiner('', '\n\n', '', 0, 0),
             't':        Joiner('', '\n\n', '', 0, 0),
+            'ul':       Joiner('', '\n\n', '', 0, 0),
         })
         #
         pn = e.get('pn')
diff -Nru xml2rfc-2.39.0/xml2rfc.egg-info/PKG-INFO xml2rfc-2.40.0/xml2rfc.egg-info/PKG-INFO
--- xml2rfc-2.39.0/xml2rfc.egg-info/PKG-INFO	2020-01-31 11:38:54.000000000 +0000
+++ xml2rfc-2.40.0/xml2rfc.egg-info/PKG-INFO	2020-02-18 21:37:32.000000000 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: xml2rfc
-Version: 2.39.0
+Version: 2.40.0
 Summary: Xml2rfc generates RFCs and IETF drafts from document source in XML according to the IETF xml2rfc v2 and v3 vocabularies.
 Home-page: https://tools.ietf.org/tools/xml2rfc/trac/
 Author: Henrik Levkowetz, Josh Bothun
@@ -103,6 +103,49 @@
         =========
         
         
+        Version 2.40.0 (18 Feb 2020)
+        ------------------------------------------------
+        
+        
+          * Worked around weasyprint's failure to honour <ol> type attributes by 
+            using the appropriate CSS list-style-type to control the list style.  Fixes 
+            issue #489.
+        
+          * Added <br/> to the v3 grammar.  Fixes issue #492.
+        
+          * Fixed an issue where comments inside ascii-art artwork would cause 
+            following artwork not to be rendered.
+        
+          * Fixed an issue where use of .splitlines() instead of .split('\n') 
+            caused unexpected removal of blank lines at the beginning or end of artwork.
+        
+          * Allowed Latin script content in <organization> without requiring an ascii 
+            attribute, to match the treatment of author and contact names.  Fixes issue 
+            #493
+        
+          * Added additional error information when text content is found where 
+            the schema does not allow it.
+        
+          * Fixed an issue where trailing whitespace in artwork can trigger bad
+            rendering, by removing whitespace at the end of lines in <artwork> and
+            <sourcecode>.  Fixes issue #490
+        
+          * Changed the plain text URL for the trust license-info in TLP 
+            boilerplate to an <eref> also for IAB documents.  Fixes issue #456.
+        
+          * Removed indentation from lists rendered in table cells.
+        
+          * Fixed an incorrect attribute grouping in the v3 schema
+        
+          * Fixed two off-by-one errors in the calculation of the length of 
+            Updates/Obsoletes lists.  Addresses issue #472
+        
+        
+        
+        
+        
+        
+        
         Version 2.39.0 (31 Jan 2020)
         ------------------------------------------------
         
@@ -153,37 +196,6 @@
         
         
         
-        
-        
-        
-        
-        Version 2.38.1 (20 Jan 2020)
-        ------------------------------------------------
-        
-        
-          * Added a preptool check for numbered sections occurring after or under
-            unnumbered sections, and changed the code for Reference sections to
-            not emit section numbers if the previous section was unnumbered.  
-            Fixes issue #433
-        
-          * Refactored the code for reference anchor to display string mapping,
-            locating it in a base class method.  Updated it to honour the symRefs
-            setting.  Fixes issue #476.
-        
-          * Added installation of Python 3.8 to Dockerfile, and updated the minor
-            version numbers for the other Python installation stanzas.
-        
-          * Fixed a problem rendering multiple authors with organization 
-            showOnFrontPage='false'.  Further addresses issue #483.
-        
-          * Added a switch --no-external-js, and some other --no-* switches to 
-            invert boolean settings.  Fixes issue #486.
-        
-          * Added an early return from cache() when repeated attempts to fetch an 
-            URL fails.
-        
-        
-