indentation fix

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

diff --git a/.config/mutt/markdown2html b/.config/mutt/markdown2html
index 309c22e6a97926e43b8ed46af71dc2554172242c..6a4555859e6f96cf21fb93b7109a8380e67ef92f 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
 
 


@@ -218,35 +217,35 @@ def _reformat_quotes(html):
 
 def _convert_with_pandoc(mdwn, inputfmt='markdown', outputfmt='html5',
                          ext_enabled=None, ext_disabled=None,
 
 def _convert_with_pandoc(mdwn, inputfmt='markdown', outputfmt='html5',
                          ext_enabled=None, ext_disabled=None,

-                         standalone=True, selfcontained=True, title=None):
+                         standalone=True, selfcontained=True, title='Untitled'):

     '''
     Invoke pandoc to do the actual conversion of Markdown to HTML5.
     '''
     if not ext_enabled:
         ext_enabled = [ 'backtick_code_blocks',
     '''
     Invoke pandoc to do the actual conversion of Markdown to HTML5.
     '''
     if not ext_enabled:
         ext_enabled = [ 'backtick_code_blocks',

-                       'line_blocks',
-                       'fancy_lists',
-                       'startnum',
-                       'definition_lists',
-                       'example_lists',
-                       'table_captions',
-                       'simple_tables',
-                       'multiline_tables',
-                       'grid_tables',
-                       'pipe_tables',
-                       'all_symbols_escapable',
-                       'intraword_underscores',
-                       'strikeout',
-                       'superscript',
-                       'subscript',
-                       'fenced_divs',
-                       'bracketed_spans',
-                       'footnotes',
-                       'inline_notes',
-                       'emoji',
-                       'tex_math_double_backslash',
-                       'autolink_bare_uris'
-                      ]
+                        'line_blocks',
+                        'fancy_lists',
+                        'startnum',
+                        'definition_lists',
+                        'example_lists',
+                        'table_captions',
+                        'simple_tables',
+                        'multiline_tables',
+                        'grid_tables',
+                        'pipe_tables',
+                        'all_symbols_escapable',
+                        'intraword_underscores',
+                        'strikeout',
+                        'superscript',
+                        'subscript',
+                        'fenced_divs',
+                        'bracketed_spans',
+                        'footnotes',
+                        'inline_notes',
+                        'emoji',
+                        'tex_math_double_backslash',
+                        'autolink_bare_uris'
+                        ]

     if not ext_disabled:
         ext_disabled = [ 'tex_math_single_backslash',
                          'tex_math_dollars',
     if not ext_disabled:
         ext_disabled = [ 'tex_math_single_backslash',
                          'tex_math_dollars',


@@ -264,7 +263,7 @@ def _convert_with_pandoc(mdwn, inputfmt='markdown', outputfmt='html5',
     if selfcontained:
         args.append('--self-contained')
     if title:
     if selfcontained:
         args.append('--self-contained')
     if title:

-        args.append(f'--metadata=pagetitle:"{title}"')
+        args.append(f'--metadata=title:{title}')

 
     return pypandoc.convert_text(mdwn, format=inputfmt, to=outputfmt,
                                  extra_args=args)
 
     return pypandoc.convert_text(mdwn, format=inputfmt, to=outputfmt,
                                  extra_args=args)


@@ -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]


@@ -305,15 +304,16 @@ def convert_markdown_to_html(mdwn):
         body = _preprocess_markdown(body)
         body = _identify_quotes_for_later(body)
         html = _convert_with_pandoc(body, standalone=True, selfcontained=True,
         body = _preprocess_markdown(body)
         body = _identify_quotes_for_later(body)
         html = _convert_with_pandoc(body, standalone=True, selfcontained=True,

-                                    title=None)
-        html = html.replace('<title>Untitled</title>\n','')
+                                    title="Body")
+        html = html.replace('<title>Body</title>\n','')

         html = _reformat_quotes(html)
 
     if sig:
         sig = _preprocess_signature(sig)
         sig = _preprocess_markdown(sig)
         html = _reformat_quotes(html)
 
     if sig:
         sig = _preprocess_signature(sig)
         sig = _preprocess_markdown(sig)

-        sig = _convert_with_pandoc(sig, standalone=False, selfcontained=False)
-        sig = SIGNATURE_HTML.format(sig='<br/>'.join(sig.splitlines()))
+        sig = _convert_with_pandoc(sig, standalone=False, selfcontained=False,
+                                   title="Signature")
+        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:]}'