X-Git-Url: https://git.madduck.net/etc/mutt.git/blobdiff_plain/e90ca40d33d14a23aae53b74f9b35b37637d0c01..3803d2cf1b594cc4d5001dea7a3c5b9dafaf0a2a:/.mutt/markdown2html?ds=sidebyside

diff --git a/.mutt/markdown2html b/.mutt/markdown2html
index e3c2b30..d4f5b13 100755
--- a/.mutt/markdown2html
+++ b/.mutt/markdown2html
@@ -48,20 +48,19 @@ except ImportError:
 
 
 DEFAULT_CSS += '''
-.quote {
+.quote, blockquote {
     padding: 0 0.5em;
     margin: 0;
     font-style: italic;
-    border-left: 2px solid #ccc;
-    color: #999;
+    border-left: 2px solid #666;
+    color: #666;
     font-size: 80%;
 }
 .quotelead {
-    font-style: italic;
     margin-bottom: -1em;
-    color: #999;
     font-size: 80%;
 }
+.quotechar { display: none; }
 .footnote-ref, .footnote-back { text-decoration: none;}
 .signature {
     color: #999;
@@ -69,7 +68,29 @@ DEFAULT_CSS += '''
     white-space: pre;
     margin: 1em 0 0 0;
     font-size: 80%;
-}'''
+}
+table, th, td {
+    border-collapse: collapse;
+    border: 1px solid #999;
+}
+th, td { padding: 0.5em; }
+.header {
+    background: #eee;
+}
+.even { background: #eee; }
+h1, h2, h3, h4, h5, h6 {
+    color: #666;
+    background-color: #eee;
+    padding-left: 0.5em
+}
+h1 { font-size: 130%; }
+h2 { font-size: 120%; }
+h3 { font-size: 110%; }
+h4 { font-size: 107%; }
+h5 { font-size: 103%; }
+h6 { font-size: 100%; }
+p { padding: 0 0.5em; }
+'''
 
 STYLESHEET = os.path.join(os.path.expanduser('~/.mutt'),
                           'markdown2html.css')
@@ -100,6 +121,14 @@ def _preprocess_markdown(mdwn):
     # regexp will not match between paragraphs.
     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
 
 
@@ -208,10 +237,12 @@ def _convert_with_pandoc(mdwn, inputfmt='markdown', outputfmt='html5',
                        'inline_notes',
                        'emoji',
                        'tex_math_double_backslash',
+                       'autolink_bare_uris'
                       ]
     if not ext_disabled:
         ext_disabled = [ 'tex_math_single_backslash',
                          'tex_math_dollars',
+                         'smart',
                          'raw_html'
                        ]