support HTML definition lists (<dl>, <dt>, and <dd>)
Signed-off-by: chrispy <chrispy@synopsys.com>
This commit is contained in:
@@ -319,6 +319,38 @@ class MarkdownConverter(object):
|
||||
|
||||
convert_kbd = convert_code
|
||||
|
||||
def convert_dd(self, el, text, convert_as_inline):
|
||||
text = (text or '').strip()
|
||||
if convert_as_inline:
|
||||
return ' ' + text + ' '
|
||||
if not text:
|
||||
return '\n'
|
||||
|
||||
# indent definition content lines by four spaces
|
||||
def _indent_for_dd(match):
|
||||
line_content = match.group(1)
|
||||
return ' ' + line_content if line_content else ''
|
||||
text = line_with_content_re.sub(_indent_for_dd, text)
|
||||
|
||||
# insert definition marker into first-line indent whitespace
|
||||
text = ':' + text[1:]
|
||||
|
||||
return '%s\n' % text
|
||||
|
||||
def convert_dt(self, el, text, convert_as_inline):
|
||||
# remove newlines from term text
|
||||
text = (text or '').strip()
|
||||
text = all_whitespace_re.sub(' ', text)
|
||||
if convert_as_inline:
|
||||
return ' ' + text + ' '
|
||||
if not text:
|
||||
return '\n'
|
||||
|
||||
# TODO - format consecutive <dt> elements as directly adjacent lines):
|
||||
# https://michelf.ca/projects/php-markdown/extra/#def-list
|
||||
|
||||
return '\n%s\n' % text
|
||||
|
||||
def _convert_hn(self, n, el, text, convert_as_inline):
|
||||
""" Method name prefixed with _ to prevent <hn> to call this """
|
||||
if convert_as_inline:
|
||||
|
||||
@@ -104,6 +104,16 @@ def test_code():
|
||||
assert md('<code>foo<sub>bar</sub>baz</code>', sub_symbol='^') == '`foobarbaz`'
|
||||
|
||||
|
||||
def test_dl():
|
||||
assert md('<dl><dt>term</dt><dd>definition</dd></dl>') == '\nterm\n: definition\n'
|
||||
assert md('<dl><dt><p>te</p><p>rm</p></dt><dd>definition</dd></dl>') == '\nte rm\n: definition\n'
|
||||
assert md('<dl><dt>term</dt><dd><p>definition-p1</p><p>definition-p2</p></dd></dl>') == '\nterm\n: definition-p1\n\n definition-p2\n'
|
||||
assert md('<dl><dt>term</dt><dd><p>definition 1</p></dd><dd><p>definition 2</p></dd></dl>') == '\nterm\n: definition 1\n: definition 2\n'
|
||||
assert md('<dl><dt>term 1</dt><dd>definition 1</dd><dt>term 2</dt><dd>definition 2</dd></dl>') == '\nterm 1\n: definition 1\nterm 2\n: definition 2\n'
|
||||
assert md('<dl><dt>term</dt><dd><blockquote><p>line 1</p><p>line 2</p></blockquote></dd></dl>') == '\nterm\n: > line 1\n >\n > line 2\n'
|
||||
assert md('<dl><dt>term</dt><dd><ol><li><p>1</p><ul><li>2a</li><li>2b</li></ul></li><li><p>3</p></li></ol></dd></dl>') == '\nterm\n: 1. 1\n\n * 2a\n * 2b\n 2. 3\n'
|
||||
|
||||
|
||||
def test_del():
|
||||
inline_tests('del', '~~')
|
||||
|
||||
|
||||
Reference in New Issue
Block a user