diff --git a/markdownify/__init__.py b/markdownify/__init__.py index da04ebf..6230fb8 100644 --- a/markdownify/__init__.py +++ b/markdownify/__init__.py @@ -85,9 +85,17 @@ class MarkdownConverter(object): convert_children_as_inline = True # Remove whitespace-only textnodes in lists - if node.name in ['ol', 'ul', 'li']: + def is_list_node(el): + return el and el.name in ['ol', 'ul', 'li'] + + if is_list_node(node): for el in node.children: - if isinstance(el, NavigableString) and six.text_type(el).strip() == '': + # Only extract (remove) whitespace-only text node if any of the conditions is true: + # - el is the first element in its parent + # - el is the last element in its parent + # - el is adjacent to an list node + can_extract = not el.previous_sibling or not el.next_sibling or is_list_node(el.previous_sibling) or is_list_node(el.next_sibling) + if isinstance(el, NavigableString) and six.text_type(el).strip() == '' and can_extract: el.extract() # Convert the children first @@ -108,7 +116,10 @@ class MarkdownConverter(object): def process_text(self, el): text = six.text_type(el) - if el.parent.name == 'li': + # remove trailing whitespaces if any of the following condition is true: + # - current text node is the last node in li + # - current text node is followed by an embedded list + if el.parent.name == 'li' and (not el.next_sibling or el.next_sibling.name in ['ul', 'ol']): return escape(all_whitespace_re.sub(' ', text or '')).rstrip() return escape(whitespace_re.sub(' ', text or '')) diff --git a/tests/test_conversions.py b/tests/test_conversions.py index caac0fd..6663204 100644 --- a/tests/test_conversions.py +++ b/tests/test_conversions.py @@ -308,6 +308,10 @@ def test_bullets(): assert md(nested_uls, bullets='-') == '\n- 1\n\t- a\n\t\t- I\n\t\t- II\n\t\t- III\n\t- b\n\t- c\n- 2\n- 3\n' +def test_li_text(): + assert md('') == '* foo [bar](#)\n* foo bar\n* foo **bar** *space*.\n' + + def test_img(): assert md('Alt text') == '![Alt text](/path/to/img.jpg "Optional title")' assert md('Alt text') == '![Alt text](/path/to/img.jpg)'