Merge pull request #24 from OpenScienceFramework/issue_24

jlward · jlward · commit 1b3bb1396bdb · 2013-05-21T07:49:08.000-07:00
Having only one list item in the root that is not last creates invalid html
diff --git a/pydocx/DocxParser.py b/pydocx/DocxParser.py
@@ -461,10 +461,32 @@ def parse_list(self, el, text):
             return self.parse_table_cell_contents(el, parsed)
         return parsed
 
+    def _build_list(self, el, text):
+        # Get the list style for the pending list.
+        lst_style = self.get_list_style(
+            el.num_id.num_id,
+            el.ilvl,
+        )
+
+        parsed = text
+        # Create the actual list and return it.
+        if lst_style == 'bullet':
+            return self.unordered_list(parsed)
+        else:
+            return self.ordered_list(
+                parsed,
+                lst_style,
+            )
+
     def _parse_list(self, el, text):
         parsed = self.parse_list_item(el, text)
         num_id = el.num_id
         ilvl = el.ilvl
+        # Everything after this point assumes the first element is not also the
+        # last. If the first element is also the last then early return by
+        # building and returning the completed list.
+        if el.is_last_list_item_in_root:
+            return self._build_list(el, parsed)
         next_el = el.next
 
         def is_same_list(next_el, num_id, ilvl):
@@ -523,20 +545,7 @@ def should_parse_last_el(last_el, first_el):
         if parsed == '':
             return parsed
 
-        # Get the list style for the pending list.
-        lst_style = self.get_list_style(
-            el.num_id.num_id,
-            el.ilvl,
-        )
-
-        # Create the actual list and return it.
-        if lst_style == 'bullet':
-            return self.unordered_list(parsed)
-        else:
-            return self.ordered_list(
-                parsed,
-                lst_style,
-            )
+        return self._build_list(el, parsed)
 
     def parse_p(self, el, text):
         if text == '':
diff --git a/pydocx/parsers/Docx2Html.py b/pydocx/parsers/Docx2Html.py
@@ -147,16 +147,17 @@ def page_break(self):
     def indent(self, text, just='', firstLine='', left='', right=''):
         slug = '<div'
         if just:
-            slug += " class='%(just)s"
+            slug += " class='%(just)s'"
         if firstLine or left or right:
-            slug += "' style ="
-        if firstLine:
-            slug += "'text-indent:%(firstLine)spx;"
-        if left:
-            slug += "'margin-left:%(left)spx;"
-        if right:
-            slug += "'margin-right:%(right)spx;"
-        slug += "'>%(text)s</div>"
+            slug += " style='"
+            if firstLine:
+                slug += "text-indent:%(firstLine)spx;"
+            if left:
+                slug += "margin-left:%(left)spx;"
+            if right:
+                slug += "margin-right:%(right)spx;"
+            slug += "'"
+        slug += ">%(text)s</div>"
         return slug % {
             'text': text,
             'just': just,
diff --git a/pydocx/tests/test_docx.py b/pydocx/tests/test_docx.py
@@ -784,17 +784,32 @@ def test_justification():
     )
     actual_html = convert(file_path)
     assert_html_equal(actual_html, '''
-<html><body><p><div class='center'>Center Justified</div>
-</p><p><div class='right'>Right justified</div></p>
-<p><div class='right' style ='margin-right:96.0px;'>
-Right justified and pushed in from right</div></p>
-<p><div class='center' style ='margin-left:252.0px;'margin-right:96.0px;'>
-Center justified and pushed in from left and it is
-great and it is the coolest thing of all time and I like it and
-I think it is cool</div></p><p>
-<div' style ='margin-left:252.0px;'margin-right:96.0px;'>
-Left justified and pushed in from left</div></p></body></html>
-''')
+    <html><body>
+    <p>
+        <div class='center'>Center Justified</div>
+    </p>
+    <p>
+        <div class='right'>Right justified</div>
+    </p>
+    <p>
+        <div class='right' style='margin-right:96.0px;'>
+            Right justified and pushed in from right
+        </div>
+    </p>
+    <p>
+        <div class='center' style='margin-left:252.0px;margin-right:96.0px;'>
+            Center justified and pushed in from left and it is
+            great and it is the coolest thing of all time and I like it and
+            I think it is cool
+        </div>
+    </p>
+    <p>
+        <div style='margin-left:252.0px;margin-right:96.0px;'>
+            Left justified and pushed in from left
+        </div>
+    </p>
+    </body></html>
+    ''')
 
 
 def _converter(*args, **kwargs):
diff --git a/pydocx/tests/test_xml.py b/pydocx/tests/test_xml.py
@@ -718,6 +718,34 @@ def get_xml(self):
         return xml
 
 
+class SingleListItem(_TranslationTestCase):
+    expected_output = '''
+    <html><body>
+        <ol data-list-type="lower-alpha">
+            <li>AAA</li>
+        </ol>
+        <p>BBB</p>
+    </body></html>
+    '''
+
+    numbering_dict = {
+        '1': {
+            '0': 'lowerLetter',
+        }
+    }
+
+    def get_xml(self):
+        li = DXB.li(text='AAA', ilvl=0, numId=1)
+        p_tags = [
+            DXB.p_tag('BBB'),
+        ]
+        body = li
+        for p_tag in p_tags:
+            body += p_tag
+        xml = DXB.xml(body)
+        return xml
+
+
 class SimpleTableTest(_TranslationTestCase):
     expected_output = '''
         <html><body>
