X-Git-Url: https://git.madduck.net/etc/mutt.git/blobdiff_plain/3803d2cf1b594cc4d5001dea7a3c5b9dafaf0a2a..8be08dfe23a1020daa3f08b4ce31cef3d030cfed:/.mutt/markdown2html?ds=sidebyside diff --git a/.mutt/markdown2html b/.mutt/markdown2html index d4f5b13..8930c88 100755 --- a/.mutt/markdown2html +++ b/.mutt/markdown2html @@ -48,6 +48,11 @@ except ImportError: DEFAULT_CSS += ''' +.block { + padding: 0 0.5em; + margin: 0; + border-left: 2px solid #eee; +} .quote, blockquote { padding: 0 0.5em; margin: 0; @@ -102,7 +107,6 @@ HTML_DOCUMENT = ''' -HTML E-Mail {htmlbody} ''' @@ -112,6 +116,12 @@ SIGNATURE_HTML = \ '
-- {sig}
' +def _preprocess_signature(sig): + ''' + Preprocess the signature before markdown processing. + ''' + return sig + def _preprocess_markdown(mdwn): ''' Preprocess Markdown for handling by the converter. @@ -129,6 +139,13 @@ def _preprocess_markdown(mdwn): # text-mode HTML2text converters, and so it's left commented for now. #ret = re.sub(r'\n>', r' \n>[>]{.quotechar}', ret, flags=re.MULTILINE) + # With the autolink_bare_uris extension, we do not need to put links into + # angle brackets to have them converted, so let's conserve the brackets + # when used around email addresses. Note that this needs a postprocessing + # hack because the pandoc autolink converted includes the ambersand + # (https://github.com/jgm/pandoc/issues/7398). + ret = re.sub(r'<([^@]+@.+\.[^>]+)>', r'<\g<1> -PANDOC_BUG_7398->', ret) + return ret @@ -210,7 +227,7 @@ def _reformat_quotes(html): def _convert_with_pandoc(mdwn, inputfmt='markdown', outputfmt='html5', ext_enabled=None, ext_disabled=None, - standalone=True, title="HTML E-Mail"): + standalone=True, selfcontained=True, title=None): ''' Invoke pandoc to do the actual conversion of Markdown to HTML5. ''' @@ -253,6 +270,8 @@ def _convert_with_pandoc(mdwn, inputfmt='markdown', outputfmt='html5', args = [] if standalone: args.append('--standalone') + if selfcontained: + args.append('--self-contained') if title: args.append(f'--metadata=pagetitle:"{title}"') @@ -271,6 +290,10 @@ def _postprocess_html(html): ''' Postprocess the generated and styled HTML. ''' + + # Preprocessing leaves a sentinel to work around + # https://github.com/jgm/pandoc/issues/7398, and so we need to remove it: + html = html.replace(' -PANDOC_BUG_7398->', '>') return html @@ -290,12 +313,16 @@ def convert_markdown_to_html(mdwn): if body: body = _preprocess_markdown(body) body = _identify_quotes_for_later(body) - html = _convert_with_pandoc(body, standalone=False) + html = _convert_with_pandoc(body, standalone=True, selfcontained=True) html = _reformat_quotes(html) if sig: + sig = _preprocess_signature(sig) sig = _preprocess_markdown(sig) - html += SIGNATURE_HTML.format(sig='
'.join(sig.splitlines())) + sig = _convert_with_pandoc(sig, standalone=False, selfcontained=False) + sig = SIGNATURE_HTML.format(sig='
'.join(sig.splitlines())) + eob = html.find('') + html = f'{html[:eob]}{sig}\n{html[eob:]}' html = HTML_DOCUMENT.format(htmlbody=html) html = _apply_styling(html)