updated for multiple classifiers in definition list items

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@2803 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

4 files changed, 35 insertions, 4 deletions

diff --git a/docutils/test/functional/expected/standalone_rst_html4css1.html b/docutils/test/functional/expected/standalone_rst_html4css1.html
index ad6113d2c..2ed3dcf64 100644
--- a/docutils/test/functional/expected/standalone_rst_html4css1.html
+++ b/docutils/test/functional/expected/standalone_rst_html4css1.html
@@ -246,6 +246,8 @@ live link to PEP 258 here.</p>
 </dd>
 <dt>Term</dt>
 <dd>Definition</dd>
+<dt>Term <span class="classifier-delimiter">:</span> <span class="classifier">classifier one</span> <span class="classifier-delimiter">:</span> <span class="classifier">classifier two</span></dt>
+<dd>Definition</dd>
 </dl>
 </div>
 <div class="section" id="field-lists">
@@ -847,16 +849,16 @@ section, &quot;Docutils System Messages&quot;:</p>
 <p class="system-message-title">System Message: <a name="id19">ERROR/3</a> (<tt>functional/input/data/standard.txt</tt>, line 89); <em><a href="#id20">backlink</a></em></p>
 Undefined substitution referenced: &quot;problematic&quot;.</div>
 <div class="system-message" id="id66">
-<p class="system-message-title">System Message: <a name="id66">ERROR/3</a> (<tt>functional/input/standalone_rst_html4css1.txt</tt>, line 335); <em><a href="#id67">backlink</a></em></p>
+<p class="system-message-title">System Message: <a name="id66">ERROR/3</a> (<tt>functional/input/standalone_rst_html4css1.txt</tt>, line 337); <em><a href="#id67">backlink</a></em></p>
 Unknown target name: &quot;5&quot;.</div>
 <div class="system-message" id="id68">
-<p class="system-message-title">System Message: <a name="id68">ERROR/3</a> (<tt>functional/input/data/standard.txt</tt>, line 344); <em><a href="#id69">backlink</a></em></p>
+<p class="system-message-title">System Message: <a name="id68">ERROR/3</a> (<tt>functional/input/data/standard.txt</tt>, line 346); <em><a href="#id69">backlink</a></em></p>
 Unknown target name: &quot;nonexistent&quot;.</div>
 <div class="system-message" id="id70">
-<p class="system-message-title">System Message: <a name="id70">ERROR/3</a> (<tt>functional/input/data/standard.txt</tt>, line 369); <em><a href="#id71">backlink</a></em></p>
+<p class="system-message-title">System Message: <a name="id70">ERROR/3</a> (<tt>functional/input/data/standard.txt</tt>, line 371); <em><a href="#id71">backlink</a></em></p>
 Unknown target name: &quot;hyperlink reference without a target&quot;.</div>
 <div class="system-message" id="id72">
-<p class="system-message-title">System Message: <a name="id72">ERROR/3</a> (<tt>functional/input/data/standard.txt</tt>, line 382); <em><a href="#id73">backlink</a></em></p>
+<p class="system-message-title">System Message: <a name="id72">ERROR/3</a> (<tt>functional/input/data/standard.txt</tt>, line 384); <em><a href="#id73">backlink</a></em></p>
 Duplicate target name, cannot be used as a unique reference: &quot;duplicate target names&quot;.</div>
 </div>
 </div>
diff --git a/docutils/test/functional/expected/standalone_rst_latex.tex b/docutils/test/functional/expected/standalone_rst_latex.tex
index 8ce529c9d..69dfba65d 100644
--- a/docutils/test/functional/expected/standalone_rst_latex.tex
+++ b/docutils/test/functional/expected/standalone_rst_latex.tex
@@ -482,6 +482,15 @@ Definition
 
 %[depart_definition]
 %[depart_definition_list_item]
+%[visit_definition_list_item]
+\item[Term] (\textbf{classifier one})
+(\textbf{classifier two})
+%[visit_definition]
+
+Definition
+
+%[depart_definition]
+%[depart_definition_list_item]
 \end{description}
 
 
diff --git a/docutils/test/functional/input/data/standard.txt b/docutils/test/functional/input/data/standard.txt
index b07b2f338..838cfc0f5 100644
--- a/docutils/test/functional/input/data/standard.txt
+++ b/docutils/test/functional/input/data/standard.txt
@@ -174,6 +174,8 @@ Term : classifier
     Definition paragraph 2.
 Term
     Definition
+Term : classifier one  :  classifier two
+    Definition
 
 Field Lists
 -----------
diff --git a/docutils/test/test_parsers/test_rst/test_definition_lists.py b/docutils/test/test_parsers/test_rst/test_definition_lists.py
index 0ffee313e..ee7d070f6 100755
--- a/docutils/test/test_parsers/test_rst/test_definition_lists.py
+++ b/docutils/test/test_parsers/test_rst/test_definition_lists.py
@@ -370,6 +370,24 @@ Term `with *inline ``text **errors : classifier `with *errors ``too
                     <paragraph>
                         Inline strong start-string without end-string.
 """],
+["""\
+Term : classifier one  :  classifier two
+    Definition
+""",
+"""\
+<document source="test data">
+    <definition_list>
+        <definition_list_item>
+            <term>
+                Term
+            <classifier>
+                classifier one
+            <classifier>
+                classifier two
+            <definition>
+                <paragraph>
+                    Definition
+"""],
 ]
 
 if __name__ == '__main__':