remove lbdbrc no longer in use

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

diff --git a/.mutt/markdown2html b/.mutt/markdown2html
index 44ec07c99cab6ae0fcd109dcac6375a853e93bcc..2813b37916ab173c0be0e9f8ce387d331dacfee9 100755 (executable)
--- a/.mutt/markdown2html
+++ b/.mutt/markdown2html
@@ -62,6 +62,7 @@ DEFAULT_CSS += '''
     color: #999;
     font-size: 80%;
 }
+.quotechar { display: none; }
 .footnote-ref, .footnote-back { text-decoration: none;}
 .signature {
     color: #999;
@@ -98,7 +99,15 @@ def _preprocess_markdown(mdwn):
     # convert hard line breaks within paragraphs to 2 trailing spaces, which
     # is the markdown way of representing hard line breaks. Note how the
     # regexp will not match between paragraphs.
-    ret = re.sub(r'(\S)\n(\s*\S)', r'\g<1>  \n\g<2>', mdwn, re.MULTILINE)
+    ret = re.sub(r'(\S)\n(\s*\S)', r'\g<1>  \n\g<2>', mdwn, flags=re.MULTILINE)
+
+    # Clients like Thunderbird need the leading '>' to be able to properly
+    # create nested quotes, so we duplicate the symbol, the first instance
+    # will tell pandoc to create a blockquote, while the second instance will
+    # be a <span> containing the character, along with a class that causes CSS
+    # to actually hide it from display. However, this does not work with the
+    # text-mode HTML2text converters, and so it's left commented for now.
+    #ret = re.sub(r'\n>', r'  \n>[>]{.quotechar}', ret, flags=re.MULTILINE)
 
     return ret
 
@@ -153,13 +162,13 @@ def _identify_quotes_for_later(mdwn):
         elif prev and re.match(r'^.+:\s*$', prev) and cur.startswith('>'):
             ret.append(re.sub(r'^(\s*>\s*)+(.+)',
                               r'\g<1>{.quoteinitial}\g<2>',
-                              cur, re.MULTILINE))
+                              cur, flags=re.MULTILINE))
 
         # All other occurrences of blockquotes get the "subsequent" marker:
-        elif cur.startswith('>') and not prev.startswith('>'):
+        elif cur.startswith('>') and prev and not prev.startswith('>'):
             ret.append(re.sub(r'^((?:\s*>\s*)+)(.+)',
                               r'\g<1>{.quotesubsequent}\g<2>',
-                              cur, re.MULTILINE))
+                              cur, flags=re.MULTILINE))
 
         else: # pass through everything else.
             ret.append(cur)
@@ -174,7 +183,7 @@ def _reformat_quotes(html):
     '''
     ret = html.replace('<p>{.quotelead}', '<p class="quotelead">')
     ret = re.sub(r'<blockquote>\n((?:<blockquote>\n)*)<p>(?:\{\.quote(\w+)\})',
-                 r'<blockquote class="quote \g<2>">\n\g<1><p>', ret, re.MULTILINE)
+                 r'<blockquote class="quote \g<2>">\n\g<1><p>', ret, flags=re.MULTILINE)
     return ret
 
 
@@ -212,6 +221,7 @@ def _convert_with_pandoc(mdwn, inputfmt='markdown', outputfmt='html5',
     if not ext_disabled:
         ext_disabled = [ 'tex_math_single_backslash',
                          'tex_math_dollars',
+                         'smart',
                          'raw_html'
                        ]