Do not require a space after commas in x-acked header

[etc/mutt.git] / .config / mutt / markdown2html

diff --git a/.config/mutt/markdown2html b/.config/mutt/markdown2html
index 309c22e6a97926e43b8ed46af71dc2554172242c..2431bb87b8b1fc94fd57f4b8a348390fa91ac444 100755 (executable)
--- a/.config/mutt/markdown2html
+++ b/.config/mutt/markdown2html
@@ -111,7 +111,7 @@ def _preprocess_signature(sig):
     '''
     Preprocess the signature before markdown processing.
     '''
     '''
     Preprocess the signature before markdown processing.
     '''

-    return sig
+    return f"```\n{sig}\n```"

 
 def _preprocess_markdown(mdwn):
     '''
 
 def _preprocess_markdown(mdwn):
     '''


@@ -135,8 +135,7 @@ def _preprocess_markdown(mdwn):
     # 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).
     # 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'&lt;\g<1> -PANDOC_BUG_7398-&gt;', ret)
-
+    ret = re.sub(r'<([^@]+@\S+)>', r'&lt;\g<1> PANDOC_BUG_7398 &gt;', ret)

     return ret
 
 
     return ret
 
 


@@ -284,7 +283,7 @@ def _postprocess_html(html):
 
     # Preprocessing leaves a sentinel to work around
     # https://github.com/jgm/pandoc/issues/7398, and so we need to remove it:
 
     # Preprocessing leaves a sentinel to work around
     # https://github.com/jgm/pandoc/issues/7398, and so we need to remove it:

-    html = html.replace('</a> -PANDOC_BUG_7398-&gt;', '</a>&gt;')
+    html = html.replace(' PANDOC_BUG_7398 ', '')

     return html
 
 
     return html
 
 


@@ -293,7 +292,7 @@ def convert_markdown_to_html(mdwn):
     Converts the input Markdown to HTML, handling separately the body, as well
     as an optional signature.
     '''
     Converts the input Markdown to HTML, handling separately the body, as well
     as an optional signature.
     '''

-    parts = re.split(r'^-- $', mdwn, 1, flags=re.MULTILINE)
+    parts = re.split(r'^-- \n', mdwn, 1, flags=re.MULTILINE)

     body = parts[0]
     if len(parts) == 2:
         sig = parts[1]
     body = parts[0]
     if len(parts) == 2:
         sig = parts[1]


@@ -312,8 +311,9 @@ def convert_markdown_to_html(mdwn):
     if sig:
         sig = _preprocess_signature(sig)
         sig = _preprocess_markdown(sig)
     if sig:
         sig = _preprocess_signature(sig)
         sig = _preprocess_markdown(sig)

+        print(sig, file=sys.stderr, end='')

         sig = _convert_with_pandoc(sig, standalone=False, selfcontained=False)
         sig = _convert_with_pandoc(sig, standalone=False, selfcontained=False)

-        sig = SIGNATURE_HTML.format(sig='<br/>'.join(sig.splitlines()))
+        sig = SIGNATURE_HTML.format(sig=sig)

         eob = html.find('</body>')
         html = f'{html[:eob]}{sig}\n{html[eob:]}'
 
         eob = html.find('</body>')
         html = f'{html[:eob]}{sig}\n{html[eob:]}'